diff --git a/.dir-locals.el b/.dir-locals.el
deleted file mode 100644
index a53c8aa6db5..00000000000
--- a/.dir-locals.el
+++ /dev/null
@@ -1,8 +0,0 @@
-;;; Directory Local Variables
-;;; For more information see (info "(emacs) Directory Variables")
-
-((nil
- (bug-reference-bug-regexp . "\\(\\(?:[Ii]ssue \\|[Ff]ixe[ds] \\|[Rr]esolve[ds]? \\|[Cc]lose[ds]? \\|[Pp]\\(?:ull [Rr]equest\\|[Rr]\\) \\|(\\)#\\([0-9]+\\))?\\)")
- (bug-reference-url-format . "https://github.com/NixOS/nixpkgs/issues/%s"))
- (nix-mode
- (tab-width . 2)))
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 576beb18de6..07eddc80c25 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -20,6 +20,8 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
(Motivation for change. Additional information.)
```
+ For consistency, there should not be a period at the end of the commit message's summary line (the first line of the commit message).
+
Examples:
* nginx: init at 2.0.1
diff --git a/.version b/.version
index 770bde1f44b..360de6347ae 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-18.09
+19.03
\ No newline at end of file
diff --git a/COPYING b/COPYING
index 198597a1b41..7c52fb76897 100644
--- a/COPYING
+++ b/COPYING
@@ -18,12 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-======================================================================
-
-Note: the license above does not apply to the packages built by the
-Nix Packages collection, merely to the package descriptions (i.e., Nix
-expressions, build scripts, etc.). It also might not apply to patches
-included in Nixpkgs, which may be derivative works of the packages to
-which they apply. The aforementioned artifacts are all covered by the
-licenses of the respective packages.
diff --git a/README.md b/README.md
index 004bba34530..278ef66cf7e 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@ build daemon as so-called channels. To get channel information via git, add
```
For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-18.03` for the latest
+custom changes on top of one of the channels, e.g. `nixos-18.09` for the latest
release and `nixos-unstable` for the latest successful build of master:
```
% git remote update channels
-% git rebase channels/nixos-18.03
+% git rebase channels/nixos-18.09
```
For pull-requests, please rebase onto nixpkgs `master`.
@@ -31,11 +31,17 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Community maintained wiki](https://nixos.wiki/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 18.03 release](https://hydra.nixos.org/jobset/nixos/release-18.03)
+* [Continuous package builds for 18.09 release](https://hydra.nixos.org/jobset/nixos/release-18.09)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 18.03 release](https://hydra.nixos.org/job/nixos/release-18.03/tested#tabs-constituents)
+* [Tests for 18.09 release](https://hydra.nixos.org/job/nixos/release-18.09/tested#tabs-constituents)
Communication:
* [Discourse Forum](https://discourse.nixos.org/)
* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
+
+Note: MIT license does not apply to the packages built by Nixpkgs, merely to
+the package descriptions (Nix expressions, build scripts, and so on). It also
+might not apply to patches included in Nixpkgs, which may be derivative works
+of the packages to which they apply. The aforementioned artifacts are all
+covered by the licenses of the respective packages.
diff --git a/default.nix b/default.nix
index f4b2640ac5a..a74a01719c7 100644
--- a/default.nix
+++ b/default.nix
@@ -18,7 +18,7 @@ if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.
For more information, please see the NixOS release notes at
https://nixos.org/nixos/manual or locally at
- ${toString ./doc/manual/release-notes}.
+ ${toString ./nixos/doc/manual/release-notes}.
If you need further help, see https://nixos.org/nixos/support.html
''
diff --git a/doc/.gitignore b/doc/.gitignore
index d0ba103fa9f..cb07135e685 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -4,3 +4,4 @@
out
manual-full.xml
highlightjs
+functions/library/locations.xml
diff --git a/doc/Makefile b/doc/Makefile
index ba77be6678c..c6aed62a939 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -19,7 +19,7 @@ fix-misc-xml:
.PHONY: clean
clean:
- rm -f ${MD_TARGETS} .version manual-full.xml
+ rm -f ${MD_TARGETS} .version manual-full.xml functions/library/locations.xml
rm -rf ./out/ ./highlightjs
.PHONY: validate
@@ -69,13 +69,17 @@ highlightjs:
cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
-manual-full.xml: ${MD_TARGETS} .version *.xml
+manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml *.xml **/*.xml **/**/*.xml
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
.version:
nix-instantiate --eval \
-E '(import ../lib).version' > .version
+functions/library/locations.xml:
+ nix-build ./lib-function-locations.nix \
+ --out-link ./functions/library/locations.xml
+
%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
-f markdown+smart \
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index b3f7f093835..3e8a0ea4a70 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -842,9 +842,12 @@ src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
- sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9";
+ sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc";
}
+ Find the value to put as sha256 by running
+ nix run -f '<nixpkgs>' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix
+ or nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz.
diff --git a/doc/configuration.xml b/doc/configuration.xml
index c91f38f3093..af74f3f9c01 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -325,7 +325,7 @@
};
};
}
-
+
To install it into our environment, you can just run nix-env -iA
@@ -347,7 +347,7 @@
};
};
}
-
+
pathsToLink tells Nixpkgs to only link the paths listed
@@ -383,7 +383,7 @@
};
};
}
-
+
This provides us with some useful documentation for using our packages.
@@ -395,15 +395,15 @@
{
packageOverrides = pkgs: with pkgs; rec {
myProfile = writeText "my-profile" ''
-export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
-export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
+ export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
+ export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
'';
myPackages = pkgs.buildEnv {
name = "my-packages";
paths = [
(runCommand "profile" {} ''
-mkdir -p $out/etc/profile.d
-cp ${myProfile} $out/etc/profile.d/my-profile.sh
+ mkdir -p $out/etc/profile.d
+ cp ${myProfile} $out/etc/profile.d/my-profile.sh
'')
aspell
bc
@@ -421,7 +421,7 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
};
};
}
-
+
For this to work fully, you must also have this script sourced when you are
@@ -438,7 +438,7 @@ if [ -d $HOME/.nix-profile/etc/profile.d ]; then
fi
done
fi
-
+
Now just run source $HOME/.profile and you can starting
@@ -459,16 +459,16 @@ fi
{
packageOverrides = pkgs: with pkgs; rec {
myProfile = writeText "my-profile" ''
-export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
-export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
-export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info
+ export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
+ export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
+ export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info
'';
myPackages = pkgs.buildEnv {
name = "my-packages";
paths = [
(runCommand "profile" {} ''
-mkdir -p $out/etc/profile.d
-cp ${myProfile} $out/etc/profile.d/my-profile.sh
+ mkdir -p $out/etc/profile.d
+ cp ${myProfile} $out/etc/profile.d/my-profile.sh
'')
aspell
bc
@@ -485,17 +485,17 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
pathsToLink = [ "/share/man" "/share/doc" "/share/info" "/bin" "/etc" ];
extraOutputsToInstall = [ "man" "doc" "info" ];
postBuild = ''
- if [ -x $out/bin/install-info -a -w $out/share/info ]; then
- shopt -s nullglob
- for i in $out/share/info/*.info $out/share/info/*.info.gz; do
- $out/bin/install-info $i $out/share/info/dir
- done
- fi
+ if [ -x $out/bin/install-info -a -w $out/share/info ]; then
+ shopt -s nullglob
+ for i in $out/share/info/*.info $out/share/info/*.info.gz; do
+ $out/bin/install-info $i $out/share/info/dir
+ done
+ fi
'';
};
};
}
-
+
postBuild tells Nixpkgs to run a command after building
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index c7187d86d1b..da664394f26 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -47,9 +47,10 @@
In Nixpkgs, these three platforms are defined as attribute sets under the
- names buildPlatform, hostPlatform, and
- targetPlatform. They are always defined as attributes in
- the standard environment. That means one can access them like:
+ names buildPlatform, hostPlatform,
+ and targetPlatform. They are always defined as
+ attributes in the standard environment. That means one can access them
+ like:
{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...
.
diff --git a/doc/default.nix b/doc/default.nix
index 4c04128052b..98b4b92be52 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -1,6 +1,7 @@
+{ pkgs ? (import ./.. { }), nixpkgs ? { }}:
let
- pkgs = import ./.. { };
lib = pkgs.lib;
+ locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; };
in
pkgs.stdenv.mkDerivation {
name = "nixpkgs-manual";
@@ -29,6 +30,8 @@ pkgs.stdenv.mkDerivation {
];
postPatch = ''
+ rm -rf ./functions/library/locations.xml
+ ln -s ${locationsXml} ./functions/library/locations.xml
echo ${lib.version} > .version
'';
diff --git a/doc/functions.xml b/doc/functions.xml
index ec188e23454..4193bb49f77 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -1,799 +1,17 @@
+ xml:id="chap-functions">
Functions reference
The nixpkgs repository has several utility functions to manipulate Nix
expressions.
-
- Overriding
-
-
- Sometimes one wants to override parts of nixpkgs, e.g.
- derivation attributes, the results of derivations or even the whole package
- set.
-
-
-
- <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; ... }
-import pkgs.path { overlays = [ (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
- overridden 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 ~/.config/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.
-
-
-
-
- Generators
-
-
- 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
-
-
-
- All generators follow a similar call interface: generatorName
- configFunctions data, where configFunctions is an
- attrset of user-defined functions that format nested 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 receives the
- name of a section and sanitizes it. The default
- mkSectionName escapes [ and
- ] with a backslash.
-
-
-
- Generators can be fine-tuned to produce exactly the file format required by
- your application/service. One example is an INI-file format which uses
- : as separator, the strings
- "yes"/"no" as boolean values and
- requires all string values to be quoted:
-
-
-
-with lib;
-let
- customToINI = generators.toINI {
- # specifies how to format a key/value pair
- mkKeyValue = generators.mkKeyValueDefault {
- # specifies the generated string for a subset of nix values
- mkValueString = v:
- if v == true then ''"yes"''
- else if v == false then ''"no"''
- else if isString v then ''"${v}"''
- # and delegats all other values to the default generator
- else generators.mkValueStringDefault {} v;
- } ":";
- };
-
-# the INI file can now be given as plain old nix values
-in customToINI {
- main = {
- pushinfo = true;
- autopush = false;
- host = "localhost";
- port = 42;
- };
- mergetool = {
- merge = "diff3";
- };
-}
-
-
-
- This will produce the following INI file as nix string:
-
-
-
-[main]
-autopush:"no"
-host:"localhost"
-port:42
-pushinfo:"yes"
-str\:ange:"very::strange"
-
-[mergetool]
-merge:"diff3"
-
-
-
-
- Nix store paths can be converted to strings by enclosing a derivation
- attribute like so: "${drv}".
-
-
-
-
- Detailed documentation for each generator can be found in
- lib/generators.nix.
-
-
-
- Debugging Nix Expressions
-
-
- Nix is a unityped, dynamic language, this means every value can potentially
- appear anywhere. Since it is also non-strict, evaluation order and what
- ultimately is evaluated might surprise you. Therefore it is important to be
- able to debug nix expressions.
-
-
-
- In the lib/debug.nix file you will find a number of
- functions that help (pretty-)printing values while evaluation is runnnig.
- You can even specify how deep these values should be printed recursively,
- and transform them on the fly. Please consult the docstrings in
- lib/debug.nix for usage information.
-
-
-
- buildFHSUserEnv
-
-
- buildFHSUserEnv provides a way to build and run
- FHS-compatible lightweight sandboxes. It creates an isolated root with bound
- /nix/store, so its footprint in terms of disk space
- needed is quite small. This allows one to run software which is hard or
- unfeasible to patch for NixOS -- 3rd-party source trees with FHS
- assumptions, games distributed as tarballs, software with integrity checking
- and/or external self-updated binaries. It uses Linux namespaces feature to
- create temporary lightweight environments which are destroyed after all
- child processes exit, without root user rights requirement. Accepted
- arguments are:
-
-
-
-
-
- name
-
-
-
- Environment name.
-
-
-
-
-
- targetPkgs
-
-
-
- Packages to be installed for the main host's architecture (i.e. x86_64 on
- x86_64 installations). Along with libraries binaries are also installed.
-
-
-
-
-
- multiPkgs
-
-
-
- Packages to be installed for all architectures supported by a host (i.e.
- i686 and x86_64 on x86_64 installations). Only libraries are installed by
- default.
-
-
-
-
-
- extraBuildCommands
-
-
-
- Additional commands to be executed for finalizing the directory
- structure.
-
-
-
-
-
- extraBuildCommandsMulti
-
-
-
- Like extraBuildCommands, but executed only on multilib
- architectures.
-
-
-
-
-
- extraOutputsToInstall
-
-
-
- Additional derivation outputs to be linked for both target and
- multi-architecture packages.
-
-
-
-
-
- extraInstallCommands
-
-
-
- Additional commands to be executed for finalizing the derivation with
- runner script.
-
-
-
-
-
- runScript
-
-
-
- A command that would be executed inside the sandbox and passed all the
- command line arguments. It defaults to bash.
-
-
-
-
-
-
- One can create a simple environment using a shell.nix
- like that:
-
-
- {} }:
-
-(pkgs.buildFHSUserEnv {
- name = "simple-x11-env";
- targetPkgs = pkgs: (with pkgs;
- [ udev
- alsaLib
- ]) ++ (with pkgs.xorg;
- [ libX11
- libXcursor
- libXrandr
- ]);
- multiPkgs = pkgs: (with pkgs;
- [ udev
- alsaLib
- ]);
- runScript = "bash";
-}).env
-]]>
-
-
- Running nix-shell would then drop you into a shell with
- these libraries and binaries available. You can use this to run
- closed-source applications which expect FHS structure without hassles:
- simply change runScript to the application path, e.g.
- ./bin/start.sh -- relative paths are supported.
-
-
-
-
- pkgs.dockerTools
-
-
- pkgs.dockerTools is a set of functions for creating and
- manipulating Docker images according to the
-
- Docker Image Specification v1.2.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.
-
-
-
-
- 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.
-
-
-
- The parameters of buildImage with relative example
- values are described below:
-
-
-
- Docker build
-
- buildImage {
- name = "redis";
- tag = "latest";
-
- fromImage = someBaseImage;
- fromImageName = null;
- fromImageTag = "latest";
-
- contents = pkgs.redis;
- runAsRoot = ''
- #!${stdenv.shell}
- mkdir -p /data
- '';
-
- config = {
- Cmd = [ "/bin/redis-server" ];
- WorkingDir = "/data";
- Volumes = {
- "/data" = {};
- };
- };
- }
-
-
-
-
- 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.
-
-
-
-
-
- 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 null, which indicates that the nix output
- hash will be used as tag.
-
-
-
-
- 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.
-
-
-
-
- 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.
-
-
-
-
-
-
- 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.2.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.
-
-
-
- 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.
-
-
-
- It is possible to inspect the arguments with which an image was built using
- its buildArgs attribute.
-
-
-
-
- If you see errors similar to getProtocolByName: does not exist
- (no such protocol name: tcp) you may need to add
- pkgs.iana-etc to contents.
-
-
-
-
-
- If you see errors similar to Error_Protocol ("certificate has
- unknown CA",True,UnknownCa) you may need to add
- pkgs.cacert to contents.
-
-
-
-
-
- pullImage
-
-
- This function is analogous to the docker pull command,
- in that can be used to pull a Docker image from a Docker registry. By
- default Docker Hub is
- used to pull images.
-
-
-
- Its parameters are described in the example below:
-
-
-
- Docker pull
-
- pullImage {
- imageName = "nixos/nix";
- imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
- finalImageTag = "1.11";
- sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
- os = "linux";
- arch = "x86_64";
- }
-
-
-
-
-
-
- imageName specifies the name of the image to be
- downloaded, which can also include the registry namespace (e.g.
- nixos). This argument is required.
-
-
-
-
- imageDigest specifies the digest of the image to be
- downloaded. Skopeo can be used to get the digest of an image, with its
- inspect subcommand. Since a given
- imageName may transparently refer to a manifest list
- of images which support multiple architectures and/or operating systems,
- supply the `--override-os` and `--override-arch` arguments to specify
- exactly which image you want. By default it will match the OS and
- architecture of the host the command is run on.
-
- $ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
- sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
-
- This argument is required.
-
-
-
-
- finalImageTag, if specified, this is the tag of the
- image to be created. Note it is never used to fetch the image since we
- prefer to rely on the immutable digest ID. By default it's
- latest.
-
-
-
-
- sha256 is the checksum of the whole fetched image.
- This argument is required.
-
-
-
-
- os, if specified, is the operating system of the
- fetched image. By default it's linux.
-
-
-
-
- arch, if specified, is the cpu architecture of the
- fetched image. By default it's x86_64.
-
-
-
-
-
-
- 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.
-
-
-
-
- Using this function requires the kvm device to be
- available.
-
-
-
-
- The parameters of exportImage are the following:
-
-
-
- Docker export
-
- exportImage {
- 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 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:
-
-
-
- Shadow base files
-
- buildImage {
- name = "shadow-basic";
-
- runAsRoot = ''
- #!${stdenv.shell}
- ${shadowSetup}
- groupadd -r redis
- useradd -r -g redis redis
- mkdir /data
- chown redis:redis /data
- '';
- }
-
-
-
-
- Creating base files like /etc/passwd or
- /etc/login.defs are necessary for shadow-utils to
- manipulate users and groups.
-
-
-
+
+
+
+
+
+
+
diff --git a/doc/functions/debug.xml b/doc/functions/debug.xml
new file mode 100644
index 00000000000..c6b3611eea5
--- /dev/null
+++ b/doc/functions/debug.xml
@@ -0,0 +1,21 @@
+
+ Debugging Nix Expressions
+
+
+ Nix is a unityped, dynamic language, this means every value can potentially
+ appear anywhere. Since it is also non-strict, evaluation order and what
+ ultimately is evaluated might surprise you. Therefore it is important to be
+ able to debug nix expressions.
+
+
+
+ In the lib/debug.nix file you will find a number of
+ functions that help (pretty-)printing values while evaluation is runnnig. You
+ can even specify how deep these values should be printed recursively, and
+ transform them on the fly. Please consult the docstrings in
+ lib/debug.nix for usage information.
+
+
diff --git a/doc/functions/dockertools.xml b/doc/functions/dockertools.xml
new file mode 100644
index 00000000000..501f46a967c
--- /dev/null
+++ b/doc/functions/dockertools.xml
@@ -0,0 +1,564 @@
+
+ pkgs.dockerTools
+
+
+ pkgs.dockerTools is a set of functions for creating and
+ manipulating Docker images according to the
+
+ Docker Image Specification v1.2.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.
+
+
+
+
+ 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.
+
+
+
+ The parameters of buildImage with relative example values
+ are described below:
+
+
+
+ Docker build
+
+buildImage {
+ name = "redis";
+ tag = "latest";
+
+ fromImage = someBaseImage;
+ fromImageName = null;
+ fromImageTag = "latest";
+
+ contents = pkgs.redis;
+ runAsRoot = ''
+ #!${stdenv.shell}
+ mkdir -p /data
+ '';
+
+ config = {
+ Cmd = [ "/bin/redis-server" ];
+ WorkingDir = "/data";
+ Volumes = {
+ "/data" = {};
+ };
+ };
+}
+
+
+
+
+ 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.
+
+
+
+
+
+ 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 null, which indicates that the nix output
+ hash will be used as tag.
+
+
+
+
+ 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.
+
+
+
+
+ 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.
+
+
+
+
+
+
+ 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.2.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.
+
+
+
+ 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.
+
+
+
+ It is possible to inspect the arguments with which an image was built using
+ its buildArgs attribute.
+
+
+
+
+ If you see errors similar to getProtocolByName: does not exist (no
+ such protocol name: tcp) you may need to add
+ pkgs.iana-etc to contents.
+
+
+
+
+
+ If you see errors similar to Error_Protocol ("certificate has
+ unknown CA",True,UnknownCa) you may need to add
+ pkgs.cacert to contents.
+
+
+
+
+ Impurely Defining a Docker Layer's Creation Date
+
+ By default buildImage will use a static date of one
+ second past the UNIX Epoch. This allows buildImage to
+ produce binary reproducible images. When listing images with
+ docker list images, the newly created images will be
+ listed like this:
+
+
+
+ You can break binary reproducibility but have a sorted, meaningful
+ CREATED column by setting created to
+ now.
+
+
+
+ and now the Docker CLI will display a reasonable date and sort the images
+ as expected:
+
+ however, the produced images will not be binary reproducible.
+
+
+
+
+
+ buildLayeredImage
+
+
+ Create a Docker image with many of the store paths being on their own layer
+ to improve sharing between images.
+
+
+
+
+
+ name
+
+
+
+ The name of the resulting image.
+
+
+
+
+
+ tag optional
+
+
+
+ Tag of the generated image.
+
+
+ Default: the output path's hash
+
+
+
+
+
+ contents optional
+
+
+
+ Top level paths in the container. Either a single derivation, or a list
+ of derivations.
+
+
+ Default: []
+
+
+
+
+
+ config optional
+
+
+
+ Run-time configuration of the container. A full list of the options are
+ available at in the
+
+ Docker Image Specification v1.2.0 .
+
+
+ Default: {}
+
+
+
+
+
+ created optional
+
+
+
+ Date and time the layers were created. Follows the same
+ now exception supported by
+ buildImage.
+
+
+ Default: 1970-01-01T00:00:01Z
+
+
+
+
+
+ maxLayers optional
+
+
+
+ Maximum number of layers to create.
+
+
+ Default: 24
+
+
+
+
+
+
+ Behavior of <varname>contents</varname> in the final image
+
+
+ Each path directly listed in contents will have a
+ symlink in the root of the image.
+
+
+
+ For example:
+
+ will create symlinks for all the paths in the hello
+ package:
+ /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello
+/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info
+/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo
+]]>
+
+
+
+
+ Automatic inclusion of <varname>config</varname> references
+
+
+ The closure of config is automatically included in the
+ closure of the final image.
+
+
+
+ This allows you to make very simple Docker images with very little code.
+ This container will start up and run hello:
+
+
+
+
+
+ Adjusting <varname>maxLayers</varname>
+
+
+ Increasing the maxLayers increases the number of layers
+ which have a chance to be shared between different images.
+
+
+
+ Modern Docker installations support up to 128 layers, however older
+ versions support as few as 42.
+
+
+
+ If the produced image will not be extended by other Docker builds, it is
+ safe to set maxLayers to 128. However
+ it will be impossible to extend the image further.
+
+
+
+ The first (maxLayers-2) most "popular" paths will have
+ their own individual layers, then layer #maxLayers-1
+ will contain all the remaining "unpopular" paths, and finally layer
+ #maxLayers will contain the Image configuration.
+
+
+
+ Docker's Layers are not inherently ordered, they are content-addressable
+ and are not explicitly layered until they are composed in to an Image.
+
+
+
+
+
+ pullImage
+
+
+ This function is analogous to the docker pull command, in
+ that can be used to pull a Docker image from a Docker registry. By default
+ Docker Hub is used to pull
+ images.
+
+
+
+ Its parameters are described in the example below:
+
+
+
+ Docker pull
+
+pullImage {
+ imageName = "nixos/nix";
+ imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
+ finalImageTag = "1.11";
+ sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
+ os = "linux";
+ arch = "x86_64";
+}
+
+
+
+
+
+
+ imageName specifies the name of the image to be
+ downloaded, which can also include the registry namespace (e.g.
+ nixos). This argument is required.
+
+
+
+
+ imageDigest specifies the digest of the image to be
+ downloaded. Skopeo can be used to get the digest of an image, with its
+ inspect subcommand. Since a given
+ imageName may transparently refer to a manifest list of
+ images which support multiple architectures and/or operating systems,
+ supply the `--override-os` and `--override-arch` arguments to specify
+ exactly which image you want. By default it will match the OS and
+ architecture of the host the command is run on.
+
+$ nix-shell --packages skopeo jq --command "skopeo --override-os linux --override-arch x86_64 inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'"
+sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
+
+ This argument is required.
+
+
+
+
+ finalImageTag, if specified, this is the tag of the
+ image to be created. Note it is never used to fetch the image since we
+ prefer to rely on the immutable digest ID. By default it's
+ latest.
+
+
+
+
+ sha256 is the checksum of the whole fetched image. This
+ argument is required.
+
+
+
+
+ os, if specified, is the operating system of the
+ fetched image. By default it's linux.
+
+
+
+
+ arch, if specified, is the cpu architecture of the
+ fetched image. By default it's x86_64.
+
+
+
+
+
+
+ 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.
+
+
+
+
+ Using this function requires the kvm device to be
+ available.
+
+
+
+
+ The parameters of exportImage are the following:
+
+
+
+ Docker export
+
+exportImage {
+ 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 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:
+
+
+
+ Shadow base files
+
+buildImage {
+ name = "shadow-basic";
+
+ runAsRoot = ''
+ #!${stdenv.shell}
+ ${shadowSetup}
+ groupadd -r redis
+ useradd -r -g redis redis
+ mkdir /data
+ chown redis:redis /data
+ '';
+}
+
+
+
+
+ Creating base files like /etc/passwd or
+ /etc/login.defs are necessary for shadow-utils to
+ manipulate users and groups.
+
+
+
diff --git a/doc/functions/fhs-environments.xml b/doc/functions/fhs-environments.xml
new file mode 100644
index 00000000000..79682080be3
--- /dev/null
+++ b/doc/functions/fhs-environments.xml
@@ -0,0 +1,142 @@
+
+ buildFHSUserEnv
+
+
+ buildFHSUserEnv provides a way to build and run
+ FHS-compatible lightweight sandboxes. It creates an isolated root with bound
+ /nix/store, so its footprint in terms of disk space
+ needed is quite small. This allows one to run software which is hard or
+ unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions,
+ games distributed as tarballs, software with integrity checking and/or
+ external self-updated binaries. It uses Linux namespaces feature to create
+ temporary lightweight environments which are destroyed after all child
+ processes exit, without root user rights requirement. Accepted arguments are:
+
+
+
+
+
+ name
+
+
+
+ Environment name.
+
+
+
+
+
+ targetPkgs
+
+
+
+ Packages to be installed for the main host's architecture (i.e. x86_64 on
+ x86_64 installations). Along with libraries binaries are also installed.
+
+
+
+
+
+ multiPkgs
+
+
+
+ Packages to be installed for all architectures supported by a host (i.e.
+ i686 and x86_64 on x86_64 installations). Only libraries are installed by
+ default.
+
+
+
+
+
+ extraBuildCommands
+
+
+
+ Additional commands to be executed for finalizing the directory structure.
+
+
+
+
+
+ extraBuildCommandsMulti
+
+
+
+ Like extraBuildCommands, but executed only on multilib
+ architectures.
+
+
+
+
+
+ extraOutputsToInstall
+
+
+
+ Additional derivation outputs to be linked for both target and
+ multi-architecture packages.
+
+
+
+
+
+ extraInstallCommands
+
+
+
+ Additional commands to be executed for finalizing the derivation with
+ runner script.
+
+
+
+
+
+ runScript
+
+
+
+ A command that would be executed inside the sandbox and passed all the
+ command line arguments. It defaults to bash.
+
+
+
+
+
+
+ One can create a simple environment using a shell.nix like
+ that:
+
+
+ {} }:
+
+(pkgs.buildFHSUserEnv {
+ name = "simple-x11-env";
+ targetPkgs = pkgs: (with pkgs;
+ [ udev
+ alsaLib
+ ]) ++ (with pkgs.xorg;
+ [ libX11
+ libXcursor
+ libXrandr
+ ]);
+ multiPkgs = pkgs: (with pkgs;
+ [ udev
+ alsaLib
+ ]);
+ runScript = "bash";
+}).env
+]]>
+
+
+ Running nix-shell would then drop you into a shell with
+ these libraries and binaries available. You can use this to run closed-source
+ applications which expect FHS structure without hassles: simply change
+ runScript to the application path, e.g.
+ ./bin/start.sh -- relative paths are supported.
+
+
diff --git a/doc/functions/generators.xml b/doc/functions/generators.xml
new file mode 100644
index 00000000000..e860b10e897
--- /dev/null
+++ b/doc/functions/generators.xml
@@ -0,0 +1,89 @@
+
+ Generators
+
+
+ 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
+
+
+
+ All generators follow a similar call interface: generatorName
+ configFunctions data, where configFunctions is an
+ attrset of user-defined functions that format nested 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 receives the name
+ of a section and sanitizes it. The default mkSectionName
+ escapes [ and ] with a backslash.
+
+
+
+ Generators can be fine-tuned to produce exactly the file format required by
+ your application/service. One example is an INI-file format which uses
+ : as separator, the strings
+ "yes"/"no" as boolean values and
+ requires all string values to be quoted:
+
+
+
+with lib;
+let
+ customToINI = generators.toINI {
+ # specifies how to format a key/value pair
+ mkKeyValue = generators.mkKeyValueDefault {
+ # specifies the generated string for a subset of nix values
+ mkValueString = v:
+ if v == true then ''"yes"''
+ else if v == false then ''"no"''
+ else if isString v then ''"${v}"''
+ # and delegats all other values to the default generator
+ else generators.mkValueStringDefault {} v;
+ } ":";
+ };
+
+# the INI file can now be given as plain old nix values
+in customToINI {
+ main = {
+ pushinfo = true;
+ autopush = false;
+ host = "localhost";
+ port = 42;
+ };
+ mergetool = {
+ merge = "diff3";
+ };
+}
+
+
+
+ This will produce the following INI file as nix string:
+
+
+
+[main]
+autopush:"no"
+host:"localhost"
+port:42
+pushinfo:"yes"
+str\:ange:"very::strange"
+
+[mergetool]
+merge:"diff3"
+
+
+
+
+ Nix store paths can be converted to strings by enclosing a derivation
+ attribute like so: "${drv}".
+
+
+
+
+ Detailed documentation for each generator can be found in
+ lib/generators.nix.
+
+
diff --git a/doc/functions/library.xml b/doc/functions/library.xml
new file mode 100644
index 00000000000..901423c52a1
--- /dev/null
+++ b/doc/functions/library.xml
@@ -0,0 +1,15 @@
+
+ Nixpkgs Library Functions
+
+
+ Nixpkgs provides a standard library at pkgs.lib, or
+ through import <nixpkgs/lib>.
+
+
+
+
+
+
diff --git a/doc/functions/library/asserts.xml b/doc/functions/library/asserts.xml
new file mode 100644
index 00000000000..437850e408b
--- /dev/null
+++ b/doc/functions/library/asserts.xml
@@ -0,0 +1,117 @@
+
+ Assert functions
+
+
+ <function>lib.asserts.assertMsg</function>
+
+ assertMsg :: Bool -> String -> Bool
+
+
+
+
+
+ Print a trace message if pred is false.
+
+
+
+ Intended to be used to augment asserts with helpful error messages.
+
+
+
+
+
+ pred
+
+
+
+ Condition under which the msg should
+ not be printed.
+
+
+
+
+
+ msg
+
+
+
+ Message to print.
+
+
+
+
+
+
+ Printing when the predicate is false
+ trace: foo is not bar, silly
+stderr> assert failed
+]]>
+
+
+
+
+ <function>lib.asserts.assertOneOf</function>
+
+ assertOneOf :: String -> String ->
+ StringList -> Bool
+
+
+
+
+
+ Specialized asserts.assertMsg for checking if
+ val is one of the elements of xs.
+ Useful for checking enums.
+
+
+
+
+
+ name
+
+
+
+ The name of the variable the user entered val into,
+ for inclusion in the error message.
+
+
+
+
+
+ val
+
+
+
+ The value of what the user provided, to be compared against the values in
+ xs.
+
+
+
+
+
+ xs
+
+
+
+ The list of valid values.
+
+
+
+
+
+
+ Ensuring a user provided a possible value
+ false
+stderr> trace: sslLibrary must be one of "openssl", "libressl", but is: "bearssl"
+ ]]>
+
+
+
diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
new file mode 100644
index 00000000000..65d0b40e2e8
--- /dev/null
+++ b/doc/functions/library/attrsets.xml
@@ -0,0 +1,1731 @@
+
+ Attribute-Set Functions
+
+
+ <function>lib.attrset.attrByPath</function>
+
+ attrByPath :: [String] -> Any -> AttrSet
+
+
+
+
+
+ Return an attribute from within nested attribute sets.
+
+
+
+
+
+ attrPath
+
+
+
+ A list of strings representing the path through the nested attribute set
+ set.
+
+
+
+
+
+ default
+
+
+
+ Default value if attrPath does not resolve to an
+ existing value.
+
+
+
+
+
+ set
+
+
+
+ The nested attributeset to select values from.
+
+
+
+
+
+
+ Extracting a value from a nested attribute set
+ 3
+]]>
+
+
+
+ No value at the path, instead using the default
+ 0
+]]>
+
+
+
+
+ <function>lib.attrsets.hasAttrByPath</function>
+
+ hasAttrByPath :: [String] -> AttrSet -> Bool
+
+
+
+
+
+ Determine if an attribute exists within a nested attribute set.
+
+
+
+
+
+ attrPath
+
+
+
+ A list of strings representing the path through the nested attribute set
+ set.
+
+
+
+
+
+ set
+
+
+
+ The nested attributeset to check.
+
+
+
+
+
+
+ A nested value does exist inside a set
+ true
+]]>
+
+
+
+
+ <function>lib.attrsets.setAttrByPath</function>
+
+ setAttrByPath :: [String] -> Any -> AttrSet
+
+
+
+
+
+ Create a new attribute set with value set at the nested
+ attribute location specified in attrPath.
+
+
+
+
+
+ attrPath
+
+
+
+ A list of strings representing the path through the nested attribute set.
+
+
+
+
+
+ value
+
+
+
+ The value to set at the location described by
+ attrPath.
+
+
+
+
+
+
+ Creating a new nested attribute set
+ { a = { b = 3; }; }
+]]>
+
+
+
+
+ <function>lib.attrsets.getAttrFromPath</function>
+
+ getAttrFromPath :: [String] -> AttrSet -> Value
+
+
+
+
+
+ Like except
+ without a default, and it will throw if the value doesn't exist.
+
+
+
+
+
+ attrPath
+
+
+
+ A list of strings representing the path through the nested attribute set
+ set.
+
+
+
+
+
+ set
+
+
+
+ The nested attribute set to find the value in.
+
+
+
+
+
+
+ Succesfully getting a value from an attribute set
+ 3
+]]>
+
+
+
+ Throwing after failing to get a value from an attribute set
+ error: cannot find attribute `x.y'
+]]>
+
+
+
+
+ <function>lib.attrsets.attrVals</function>
+
+ attrVals :: [String] -> AttrSet -> [Any]
+
+
+
+
+
+ Return the specified attributes from a set. All values must exist.
+
+
+
+
+
+ nameList
+
+
+
+ The list of attributes to fetch from set. Each
+ attribute name must exist on the attrbitue set.
+
+
+
+
+
+ set
+
+
+
+ The set to get attribute values from.
+
+
+
+
+
+
+ Getting several values from an attribute set
+ [ 1 2 3 ]
+]]>
+
+
+
+ Getting missing values from an attribute set
+
+
+
+
+
+ <function>lib.attrsets.attrValues</function>
+
+ attrValues :: AttrSet -> [Any]
+
+
+
+
+
+ Get all the attribute values from an attribute set.
+
+
+
+ Provides a backwards-compatible interface of
+ builtins.attrValues for Nix version older than 1.8.
+
+
+
+
+
+ attrs
+
+
+
+ The attribute set.
+
+
+
+
+
+
+
+ [ 1 2 3 ]
+]]>
+
+
+
+
+ <function>lib.attrsets.catAttrs</function>
+
+ catAttrs :: String -> AttrSet -> [Any]
+
+
+
+
+
+ Collect each attribute named `attr' from the list of attribute sets,
+ sets. Sets that don't contain the named attribute are
+ ignored.
+
+
+
+ Provides a backwards-compatible interface of
+ builtins.catAttrs for Nix version older than 1.9.
+
+
+
+
+
+ attr
+
+
+
+ Attribute name to select from each attribute set in
+ sets.
+
+
+
+
+
+ sets
+
+
+
+ The list of attribute sets to select attr from.
+
+
+
+
+
+
+ Collect an attribute from a list of attribute sets.
+
+ Attribute sets which don't have the attribute are ignored.
+
+ [ 1 2 ]
+ ]]>
+
+
+
+
+ <function>lib.attrsets.filterAttrs</function>
+
+ filterAttrs :: (String -> Any -> Bool) -> AttrSet -> AttrSet
+
+
+
+
+
+ Filter an attribute set by removing all attributes for which the given
+ predicate return false.
+
+
+
+
+
+ pred
+
+
+
+ String -> Any -> Bool
+
+
+ Predicate which returns true to include an attribute, or returns false to
+ exclude it.
+
+
+
+
+ name
+
+
+
+ The attribute's name
+
+
+
+
+
+ value
+
+
+
+ The attribute's value
+
+
+
+
+
+ Returns true to include the attribute,
+ false to exclude the attribute.
+
+
+
+
+
+ set
+
+
+
+ The attribute set to filter
+
+
+
+
+
+
+ Filtering an attributeset
+ { foo = 1; }
+]]>
+
+
+
+
+ <function>lib.attrsets.filterAttrsRecursive</function>
+
+ filterAttrsRecursive :: (String -> Any -> Bool) -> AttrSet -> AttrSet
+
+
+
+
+
+ Filter an attribute set recursively by removing all attributes for which the
+ given predicate return false.
+
+
+
+
+
+ pred
+
+
+
+ String -> Any -> Bool
+
+
+ Predicate which returns true to include an attribute, or returns false to
+ exclude it.
+
+
+
+
+ name
+
+
+
+ The attribute's name
+
+
+
+
+
+ value
+
+
+
+ The attribute's value
+
+
+
+
+
+ Returns true to include the attribute,
+ false to exclude the attribute.
+
+
+
+
+
+ set
+
+
+
+ The attribute set to filter
+
+
+
+
+
+
+ Recursively filtering an attribute set
+ {
+ levelA = {
+ example = "hi";
+ levelB = {
+ hello = "there";
+ this-one-is-present = { };
+ };
+ };
+ }
+ ]]>
+
+
+
+
+ <function>lib.attrsets.foldAttrs</function>
+
+ foldAttrs :: (Any -> Any -> Any) -> Any -> [AttrSets] -> Any
+
+
+
+
+
+ Apply fold function to values grouped by key.
+
+
+
+
+
+ op
+
+
+
+ Any -> Any -> Any
+
+
+ Given a value val and a collector
+ col, combine the two.
+
+
+
+
+ val
+
+
+
+ An attribute's value
+
+
+
+
+
+ col
+
+
+
+
+ The result of previous op calls with other values
+ and nul.
+
+
+
+
+
+
+
+
+ nul
+
+
+
+ The null-value, the starting value.
+
+
+
+
+
+ list_of_attrs
+
+
+
+ A list of attribute sets to fold together by key.
+
+
+
+
+
+
+ Combining an attribute of lists in to one attribute set
+ { a = [ 2 3 ]; b = [ 7 6 ]; }
+]]>
+
+
+
+
+ <function>lib.attrsets.collect</function>
+
+ collect :: (Any -> Bool) -> AttrSet -> [Any]
+
+
+
+
+
+ Recursively collect sets that verify a given predicate named
+ pred from the set attrs. The recursion
+ stops when pred returns true.
+
+
+
+
+
+ pred
+
+
+
+ Any -> Bool
+
+
+ Given an attribute's value, determine if recursion should stop.
+
+
+
+
+ value
+
+
+
+ The attribute set value.
+
+
+
+
+
+
+
+
+ attrs
+
+
+
+ The attribute set to recursively collect.
+
+
+
+
+
+
+ Collecting all lists from an attribute set
+ [["b"] [1]]
+]]>
+
+
+
+ Collecting all attribute-sets which contain the <literal>outPath</literal> attribute name.
+ [{ outPath = "a/"; } { outPath = "b/"; }]
+]]>
+
+
+
+
+ <function>lib.attrsets.nameValuePair</function>
+
+ nameValuePair :: String -> Any -> AttrSet
+
+
+
+
+
+ Utility function that creates a {name, value} pair as
+ expected by builtins.listToAttrs.
+
+
+
+
+
+ name
+
+
+
+ The attribute name.
+
+
+
+
+
+ value
+
+
+
+ The attribute value.
+
+
+
+
+
+
+ Creating a name value pair
+ { name = "some"; value = 6; }
+]]>
+
+
+
+
+ <function>lib.attrsets.mapAttrs</function>
+
+
+
+
+
+
+
+ Apply a function to each element in an attribute set, creating a new
+ attribute set.
+
+
+
+ Provides a backwards-compatible interface of
+ builtins.mapAttrs for Nix version older than 2.1.
+
+
+
+
+
+ fn
+
+
+
+ String -> Any -> Any
+
+
+ Given an attribute's name and value, return a new value.
+
+
+
+
+ name
+
+
+
+ The name of the attribute.
+
+
+
+
+
+ value
+
+
+
+ The attribute's value.
+
+
+
+
+
+
+
+
+
+ Modifying each value of an attribute set
+ { x = "x-foo"; y = "y-bar"; }
+]]>
+
+
+
+
+ <function>lib.attrsets.mapAttrs'</function>
+
+ mapAttrs' :: (String -> Any -> { name = String; value = Any }) -> AttrSet -> AttrSet
+
+
+
+
+
+ Like mapAttrs, but allows the name of each attribute to
+ be changed in addition to the value. The applied function should return both
+ the new name and value as a nameValuePair.
+
+
+
+
+
+ fn
+
+
+
+ String -> Any -> { name = String; value = Any }
+
+
+ Given an attribute's name and value, return a new
+ name
+ value pair.
+
+
+
+
+ name
+
+
+
+ The name of the attribute.
+
+
+
+
+
+ value
+
+
+
+ The attribute's value.
+
+
+
+
+
+
+
+
+ set
+
+
+
+ The attribute set to map over.
+
+
+
+
+
+
+ Change the name and value of each attribute of an attribute set
+ { foo_x = "bar-a"; foo_y = "bar-b"; }
+
+ ]]>
+
+
+
+
+ <function>lib.attrsets.mapAttrsToList</function>
+
+ mapAttrsToList :: (String -> Any -> Any) ->
+ AttrSet -> Any
+
+
+
+
+
+ Call fn for each attribute in the given
+ set and return the result in a list.
+
+
+
+
+
+ fn
+
+
+
+ String -> Any -> Any
+
+
+ Given an attribute's name and value, return a new value.
+
+
+
+
+ name
+
+
+
+ The name of the attribute.
+
+
+
+
+
+ value
+
+
+
+ The attribute's value.
+
+
+
+
+
+
+
+
+ set
+
+
+
+ The attribute set to map over.
+
+
+
+
+
+
+ Combine attribute values and names in to a list
+ [ "x=a" "y=b" ]
+]]>
+
+
+
+
+ <function>lib.attrsets.mapAttrsRecursive</function>
+
+ mapAttrsRecursive :: ([String] > Any -> Any) -> AttrSet -> AttrSet
+
+
+
+
+
+ Like mapAttrs, except that it recursively applies
+ itself to attribute sets. Also, the first argument of the argument function
+ is a list of the names of the containing attributes.
+
+
+
+
+
+ f
+
+
+
+ [ String ] -> Any -> Any
+
+
+ Given a list of attribute names and value, return a new value.
+
+
+
+
+ name_path
+
+
+
+ The list of attribute names to this value.
+
+
+ For example, the name_path for the
+ example string in the attribute set { foo
+ = { bar = "example"; }; } is [ "foo" "bar"
+ ].
+
+
+
+
+
+ value
+
+
+
+ The attribute's value.
+
+
+
+
+
+
+
+
+ set
+
+
+
+ The attribute set to recursively map over.
+
+
+
+
+
+
+ A contrived example of using <function>lib.attrsets.mapAttrsRecursive</function>
+ {
+ n = {
+ a = "n-a-A";
+ m = {
+ b = "n-m-b-B";
+ c = "n-m-c-C";
+ };
+ };
+ d = "d-D";
+ }
+ ]]>
+
+
+
+
+ <function>lib.attrsets.mapAttrsRecursiveCond</function>
+
+ mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([ String ] -> Any -> Any) -> AttrSet -> AttrSet
+
+
+
+
+
+ Like mapAttrsRecursive, but it takes an additional
+ predicate function that tells it whether to recursive into an attribute set.
+ If it returns false, mapAttrsRecursiveCond does not
+ recurse, but does apply the map function. It is returns true, it does
+ recurse, and does not apply the map function.
+
+
+
+
+
+ cond
+
+
+
+ (AttrSet -> Bool)
+
+
+ Determine if mapAttrsRecursive should recurse deeper
+ in to the attribute set.
+
+
+
+
+ attributeset
+
+
+
+ An attribute set.
+
+
+
+
+
+
+
+
+ f
+
+
+
+ [ String ] -> Any -> Any
+
+
+ Given a list of attribute names and value, return a new value.
+
+
+
+
+ name_path
+
+
+
+ The list of attribute names to this value.
+
+
+ For example, the name_path for the
+ example string in the attribute set { foo
+ = { bar = "example"; }; } is [ "foo" "bar"
+ ].
+
+
+
+
+
+ value
+
+
+
+ The attribute's value.
+
+
+
+
+
+
+
+
+ set
+
+
+
+ The attribute set to recursively map over.
+
+
+
+
+
+
+ Only convert attribute values to JSON if the containing attribute set is marked for recursion
+ {
+ dorecur = {
+ hello = "\"there\"";
+ recurse = "true";
+ };
+ dontrecur = "{\"converted-to\":\"json\"}";
+ }
+ ]]>
+
+
+
+
+ <function>lib.attrsets.genAttrs</function>
+
+ genAttrs :: [ String ] -> (String -> Any) -> AttrSet
+
+
+
+
+
+ Generate an attribute set by mapping a function over a list of attribute
+ names.
+
+
+
+
+
+ names
+
+
+
+ Names of values in the resulting attribute set.
+
+
+
+
+
+ f
+
+
+
+ String -> Any
+
+
+ Takes the name of the attribute and return the attribute's value.
+
+
+
+
+ name
+
+
+
+ The name of the attribute to generate a value for.
+
+
+
+
+
+
+
+
+
+ Generate an attrset based on names only
+ { foo = "x_foo"; bar = "x_bar"; }
+ ]]>
+
+
+
+
+ <function>lib.attrsets.isDerivation</function>
+
+ isDerivation :: Any -> Bool
+
+
+
+
+
+ Check whether the argument is a derivation. Any set with { type =
+ "derivation"; } counts as a derivation.
+
+
+
+
+
+ value
+
+
+
+ The value which is possibly a derivation.
+
+
+
+
+
+
+ A package is a derivation
+ {}).ruby
+=> true
+ ]]>
+
+
+
+ Anything else is not a derivation
+ false
+ ]]>
+
+
+
+
+ <function>lib.attrsets.toDerivation</function>
+
+ toDerivation :: Path -> Derivation
+
+
+
+
+
+ Converts a store path to a fake derivation.
+
+
+
+
+
+ path
+
+
+
+ A store path to convert to a derivation.
+
+
+
+
+
+
+
+ <function>lib.attrsets.optionalAttrs</function>
+
+ optionalAttrs :: Bool -> AttrSet
+
+
+
+
+
+ Conditionally return an attribute set or an empty attribute set.
+
+
+
+
+
+ cond
+
+
+
+ Condition under which the as attribute set is
+ returned.
+
+
+
+
+
+ as
+
+
+
+ The attribute set to return if cond is true.
+
+
+
+
+
+
+ Return the provided attribute set when <varname>cond</varname> is true
+ { my = "set"; }
+ ]]>
+
+
+
+ Return an empty attribute set when <varname>cond</varname> is false
+ { }
+ ]]>
+
+
+
+
+ <function>lib.attrsets.zipAttrsWithNames</function>
+
+ zipAttrsWithNames :: [ String ] -> (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet
+
+
+
+
+
+ Merge sets of attributes and use the function f to merge
+ attribute values where the attribute name is in names.
+
+
+
+
+
+ names
+
+
+
+ A list of attribute names to zip.
+
+
+
+
+
+ f
+
+
+
+ (String -> [ Any ] -> Any
+
+
+ Accepts an attribute name, all the values, and returns a combined value.
+
+
+
+
+ name
+
+
+
+ The name of the attribute each value came from.
+
+
+
+
+
+ vs
+
+
+
+ A list of values collected from the list of attribute sets.
+
+
+
+
+
+
+
+
+ sets
+
+
+
+ A list of attribute sets to zip together.
+
+
+
+
+
+
+ Summing a list of attribute sets of numbers
+ { a = "a 11"; b = "b 101"; }
+ ]]>
+
+
+
+
+ <function>lib.attrsets.zipAttrsWith</function>
+
+ zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet
+
+
+
+
+
+ Merge sets of attributes and use the function f to merge
+ attribute values. Similar to
+ where
+ all key names are passed for names.
+
+
+
+
+
+ f
+
+
+
+ (String -> [ Any ] -> Any
+
+
+ Accepts an attribute name, all the values, and returns a combined value.
+
+
+
+
+ name
+
+
+
+ The name of the attribute each value came from.
+
+
+
+
+
+ vs
+
+
+
+ A list of values collected from the list of attribute sets.
+
+
+
+
+
+
+
+
+ sets
+
+
+
+ A list of attribute sets to zip together.
+
+
+
+
+
+
+ Summing a list of attribute sets of numbers
+ { a = "a 11"; b = "b 101"; c = "c 1001"; }
+ ]]>
+
+
+
+
+ <function>lib.attrsets.zipAttrs</function>
+
+ zipAttrsWith :: [ AttrSet ] -> AttrSet
+
+
+
+
+
+ Merge sets of attributes and combine each attribute value in to a list.
+ Similar to
+ where the merge function returns a list of all values.
+
+
+
+
+
+ sets
+
+
+
+ A list of attribute sets to zip together.
+
+
+
+
+
+
+ Combining a list of attribute sets
+ { a = [ 1 10 ]; b = [ 1 100 ]; c = [ 1 1000 ]; }
+ ]]>
+
+
+
+
+ <function>lib.attrsets.recursiveUpdateUntil</function>
+
+ recursiveUpdateUntil :: ( [ String ] -> AttrSet -> AttrSet -> Bool ) -> AttrSet -> AttrSet -> AttrSet
+
+
+
+
+
+ Does the same as the update operator // except that
+ attributes are merged until the given predicate is verified. The predicate
+ should accept 3 arguments which are the path to reach the attribute, a part
+ of the first attribute set and a part of the second attribute set. When the
+ predicate is verified, the value of the first attribute set is replaced by
+ the value of the second attribute set.
+
+
+
+
+
+ pred
+
+
+
+ [ String ] -> AttrSet -> AttrSet -> Bool
+
+
+
+
+ path
+
+
+
+ The path to the values in the left and right hand sides.
+
+
+
+
+
+ l
+
+
+
+ The left hand side value.
+
+
+
+
+
+ r
+
+
+
+ The right hand side value.
+
+
+
+
+
+
+
+
+ lhs
+
+
+
+ The left hand attribute set of the merge.
+
+
+
+
+
+ rhs
+
+
+
+ The right hand attribute set of the merge.
+
+
+
+
+
+
+ Recursively merging two attribute sets
+ {
+ foo.bar = 1; # 'foo.*' from the second set
+ foo.quz = 2; #
+ bar = 3; # 'bar' from the first set
+ baz = 4; # 'baz' from the second set
+}
+ ]]>
+
+
+
+
+ <function>lib.attrsets.recursiveUpdate</function>
+
+ recursiveUpdate :: AttrSet -> AttrSet -> AttrSet
+
+
+
+
+
+ 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.
+
+
+
+
+
+ lhs
+
+
+
+ The left hand attribute set of the merge.
+
+
+
+
+
+ rhs
+
+
+
+ The right hand attribute set of the merge.
+
+
+
+
+
+
+ Recursively merging two attribute sets
+ {
+ boot.loader.grub.enable = true;
+ boot.loader.grub.device = "";
+}
+]]>
+
+
+
diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml
new file mode 100644
index 00000000000..1bd90d2a0c7
--- /dev/null
+++ b/doc/functions/overrides.xml
@@ -0,0 +1,212 @@
+
+ Overriding
+
+
+ Sometimes one wants to override parts of nixpkgs, e.g.
+ derivation attributes, the results of derivations.
+
+
+
+ These functions are used to make changes to packages, returning only single
+ packages. Overlays, on the other
+ hand, can be used to combine the overridden packages across the entire
+ package set of Nixpkgs.
+
+
+
+ <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; ... }
+
+
+import pkgs.path { overlays = [ (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
+ overridden 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 stdenv.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 it 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 ~/.config/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.
+
+
+
diff --git a/doc/functions/shell.xml b/doc/functions/shell.xml
new file mode 100644
index 00000000000..e5031c9463c
--- /dev/null
+++ b/doc/functions/shell.xml
@@ -0,0 +1,26 @@
+
+ pkgs.mkShell
+
+
+ pkgs.mkShell is a special kind of derivation that is
+ only useful when using it combined with nix-shell. It will
+ in fact fail to instantiate when invoked with nix-build.
+
+
+
+ Usage
+
+ {} }:
+pkgs.mkShell {
+ # this will make all the build inputs from hello and gnutar
+ # available to the shell environment
+ inputsFrom = with pkgs; [ hello gnutar ];
+ buildInputs = [ pkgs.gnumake ];
+}
+]]>
+
+
diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml
index d5f2574039f..4314df5c9df 100644
--- a/doc/languages-frameworks/coq.xml
+++ b/doc/languages-frameworks/coq.xml
@@ -11,10 +11,9 @@
- Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact
- versions that were used to build Coq are saved in the
- coq.ocaml and coq.camlp5 and
- coq.findlib attributes.
+ Some extensions (plugins) might require OCaml and sometimes other OCaml
+ packages. The coq.ocamlPackages attribute can be used to
+ depend on the same package set Coq was built against.
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 5eabb866654..e6c8ab37d68 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -186,7 +186,7 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
`toolz` package.
```nix
-{ # ...
+{ lib, buildPythonPackage, fetchPypi }:
toolz = buildPythonPackage rec {
pname = "toolz";
@@ -199,8 +199,8 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th
doCheck = false;
- meta = {
- homepage = "https://github.com/pytoolz/toolz/";
+ meta = with lib; {
+ homepage = https://github.com/pytoolz/toolz;
description = "List processing tools and functional utilities";
license = licenses.bsd3;
maintainers = with maintainers; [ fridh ];
@@ -267,12 +267,13 @@ that we introduced with the `let` expression.
#### Handling dependencies
-Our example, `toolz`, does not have any dependencies on other Python
-packages or system libraries. According to the manual, `buildPythonPackage`
-uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is
-exclusively a build-time dependency, then the dependency should be included as a
-`buildInput`, but if it is (also) a runtime dependency, then it should be added
-to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies.
+Our example, `toolz`, does not have any dependencies on other Python packages or
+system libraries. According to the manual, `buildPythonPackage` uses the
+arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If
+something is exclusively a build-time dependency, then the dependency should be
+included as a `buildInput`, but if it is (also) a runtime dependency, then it
+should be added to `propagatedBuildInputs`. Test dependencies are considered
+build-time dependencies and passed to `checkInputs`.
The following example shows which arguments are given to `buildPythonPackage` in
order to build [`datashape`](https://github.com/blaze/datashape).
@@ -292,7 +293,7 @@ order to build [`datashape`](https://github.com/blaze/datashape).
checkInputs = with self; [ pytest ];
propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
- meta = {
+ meta = with lib; {
homepage = https://github.com/ContinuumIO/datashape;
description = "A data description language";
license = licenses.bsd2;
@@ -326,7 +327,7 @@ when building the bindings and are therefore added as `buildInputs`.
buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];
- meta = {
+ meta = with lib; {
description = "Pythonic binding for the libxml2 and libxslt libraries";
homepage = https://lxml.de;
license = licenses.bsd3;
@@ -370,9 +371,9 @@ and `CFLAGS`.
export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"
'';
- meta = {
+ meta = with lib; {
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
- homepage = http://hgomersall.github.com/pyFFTW/;
+ homepage = http://hgomersall.github.com/pyFFTW;
license = with licenses; [ bsd2 bsd3 ];
maintainers = with maintainers; [ fridh ];
};
@@ -478,8 +479,6 @@ don't explicitly define which `python` derivation should be used. In the above
example we use `buildPythonPackage` that is part of the set `python35Packages`,
and in this case the `python35` interpreter is automatically used.
-
-
## Reference
### Interpreters
@@ -549,31 +548,31 @@ The `buildPythonPackage` function is implemented in
The following is an example:
```nix
+{ lib, buildPythonPackage, fetchPypi, hypothesis, setuptools_scm, attrs, py, setuptools, six, pluggy }:
buildPythonPackage rec {
- version = "3.3.1";
pname = "pytest";
-
- preCheck = ''
- # don't test bash builtins
- rm testing/test_argcomplete.py
- '';
+ version = "3.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93";
};
+ postPatch = ''
+ # don't test bash builtins
+ rm testing/test_argcomplete.py
+ '';
+
checkInputs = [ hypothesis ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy ];
- meta = with stdenv.lib; {
+ meta = with lib; {
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
description = "Framework for writing tests";
};
}
-
```
The `buildPythonPackage` mainly does four things:
@@ -655,6 +654,39 @@ Another difference is that `buildPythonPackage` by default prefixes the names of
the packages with the version of the interpreter. Because this is irrelevant for
applications, the prefix is omitted.
+When packaging a python application with `buildPythonApplication`, it should be
+called with `callPackage` and passed `python` or `pythonPackages` (possibly
+specifying an interpreter version), like this:
+
+```nix
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "luigi";
+ version = "2.7.9";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "035w8gqql36zlan0xjrzz9j4lh9hs0qrsgnbyw07qs7lnkvbdv9x";
+ };
+
+ propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ];
+
+ meta = with lib; {
+ ...
+ };
+}
+```
+
+This is then added to `all-packages.nix` just as any other application would be.
+
+```nix
+luigi = callPackage ../applications/networking/cluster/luigi { };
+```
+
+Since the package is an application, a consumer doesn't need to care about
+python versions or modules, which is why they don't go in `pythonPackages`.
+
#### `toPythonApplication` function
A distinction is made between applications and libraries, however, sometimes a
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 6588281878a..4549bbd1686 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -64,9 +64,6 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
added in `cargoPatches` will also be prepended to the patches in `patches` at
build-time.
-To install crates with nix there is also an experimental project called
-[nixcrates](https://github.com/fractalide/nixcrates).
-
## Compiling Rust crates using Nix instead of Cargo
### Simple operation
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 1d6a4fe8da8..2cec1543a24 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -5,11 +5,17 @@ date: 2016-06-25
---
# User's Guide to Vim Plugins/Addons/Bundles/Scripts in Nixpkgs
-You'll get a vim(-your-suffix) in PATH also loading the plugins you want.
+Both Neovim and Vim can be configured to include your favorite plugins
+and additional libraries.
+
Loading can be deferred; see examples.
-Vim packages, VAM (=vim-addon-manager) and Pathogen are supported to load
-packages.
+At the moment we support three different methods for managing plugins:
+
+- Vim packages (*recommend*)
+- VAM (=vim-addon-manager)
+- Pathogen
+- vim-plug
## Custom configuration
@@ -17,6 +23,7 @@ Adding custom .vimrc lines can be done using the following code:
```
vim_configurable.customize {
+ # `name` specifies the name of the executable and package
name = "vim-with-plugins";
vimrcConfig.customRC = ''
@@ -25,7 +32,21 @@ vim_configurable.customize {
}
```
-## Vim packages
+This configuration is used when vim is invoked with the command specified as name, in this case `vim-with-plugins`.
+
+For Neovim the `configure` argument can be overridden to achieve the same:
+
+```
+neovim.override {
+ configure = {
+ customRC = ''
+ # here your custom configuration goes!
+ '';
+ };
+}
+```
+
+## Managing plugins with Vim packages
To store you plugins in Vim packages the following example can be used:
@@ -38,13 +59,80 @@ vim_configurable.customize {
opt = [ phpCompletion elm-vim ];
# To automatically load a plugin when opening a filetype, add vimrc lines like:
# autocmd FileType php :packadd phpCompletion
- }
-};
+ };
+}
+```
+
+For Neovim the syntax is:
+
+```
+neovim.override {
+ configure = {
+ customRC = ''
+ # here your custom configuration goes!
+ '';
+ packages.myVimPackage = with pkgs.vimPlugins; {
+ # see examples below how to use custom packages
+ start = [ ];
+ opt = [ ];
+ };
+ };
+}
+```
+
+The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable:
+
+```
+{
+ packageOverrides = pkgs: with pkgs; {
+ myVim = vim_configurable.customize {
+ # `name` specifies the name of the executable and package
+ name = "vim-with-plugins";
+ # add here code from the example section
+ };
+ myNeovim = neovim.override {
+ configure = {
+ # add here code from the example section
+ };
+ };
+ };
+}
+```
+
+After that you can install your special grafted `myVim` or `myNeovim` packages.
+
+## Managing plugins with vim-plug
+
+To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim
+plugins the following example can be used:
+
+```
+vim_configurable.customize {
+ vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
+ # loaded on launch
+ plug.plugins = [ youcompleteme fugitive phpCompletion elm-vim ];
+ };
+}
+```
+
+For Neovim the syntax is:
+
+```
+neovim.override {
+ configure = {
+ customRC = ''
+ # here your custom configuration goes!
+ '';
+ plug.plugins = with pkgs.vimPlugins; [
+ vim-go
+ ];
+ };
+}
```
-## VAM
+## Managing plugins with VAM
-### dependencies by Vim plugins
+### Handling dependencies of Vim plugins
VAM introduced .json files supporting dependencies without versioning
assuming that "using latest version" is ok most of the time.
@@ -125,6 +213,18 @@ Sample output2:
]
+## Adding new plugins to nixpkgs
+
+In `pkgs/misc/vim-plugins/vim-plugin-names` we store the plugin names
+for all vim plugins we automatically generate plugins for.
+The format of this file `github username/github repository`:
+For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.
+After adding your plugin to this file run the `./update.py` in the same folder.
+This will updated a file called `generated.nix` and make your plugin accessible in the
+`vimPlugins` attribute set (`vimPlugins.nerdtree` in our example).
+If additional steps to the build process of the plugin are required, add an
+override to the `pkgs/misc/vim-plugins/default.nix` in the same directory.
+
## Important repositories
- [vim-pi](https://bitbucket.org/vimcommunity/vim-pi) is a plugin repository
diff --git a/doc/lib-function-locations.nix b/doc/lib-function-locations.nix
new file mode 100644
index 00000000000..ae7036e4626
--- /dev/null
+++ b/doc/lib-function-locations.nix
@@ -0,0 +1,85 @@
+{ pkgs ? (import ./.. { }), nixpkgs ? { }}:
+let
+ revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master");
+
+ libDefPos = set:
+ builtins.map
+ (name: {
+ name = name;
+ location = builtins.unsafeGetAttrPos name set;
+ })
+ (builtins.attrNames set);
+
+ libset = toplib:
+ builtins.map
+ (subsetname: {
+ subsetname = subsetname;
+ functions = libDefPos toplib."${subsetname}";
+ })
+ (builtins.filter
+ (name: builtins.isAttrs toplib."${name}")
+ (builtins.attrNames toplib));
+
+ nixpkgsLib = pkgs.lib;
+
+ flattenedLibSubset = { subsetname, functions }:
+ builtins.map
+ (fn: {
+ name = "lib.${subsetname}.${fn.name}";
+ value = fn.location;
+ })
+ functions;
+
+ locatedlibsets = libs: builtins.map flattenedLibSubset (libset libs);
+ removeFilenamePrefix = prefix: filename:
+ let
+ prefixLen = (builtins.stringLength prefix) + 1; # +1 to remove the leading /
+ filenameLen = builtins.stringLength filename;
+ substr = builtins.substring prefixLen filenameLen filename;
+ in substr;
+
+ removeNixpkgs = removeFilenamePrefix (builtins.toString pkgs.path);
+
+ liblocations =
+ builtins.filter
+ (elem: elem.value != null)
+ (nixpkgsLib.lists.flatten
+ (locatedlibsets nixpkgsLib));
+
+ fnLocationRelative = { name, value }:
+ {
+ inherit name;
+ value = value // { file = removeNixpkgs value.file; };
+ };
+
+ relativeLocs = (builtins.map fnLocationRelative liblocations);
+ sanitizeId = builtins.replaceStrings
+ [ "'" ]
+ [ "-prime" ];
+
+ urlPrefix = "https://github.com/NixOS/nixpkgs/blob/${revision}";
+ xmlstrings = (nixpkgsLib.strings.concatMapStrings
+ ({ name, value }:
+ ''
+ ${name}
+
+ Located at
+ ${value.file}:${builtins.toString value.line}
+ in <nixpkgs>.
+
+
+ '')
+ relativeLocs);
+
+in pkgs.writeText
+ "locations.xml"
+ ''
+
+ All the locations for every lib function
+ This file is only for inclusion by other files.
+ ${xmlstrings}
+
+ ''
diff --git a/doc/overlays.xml b/doc/overlays.xml
index 2decf9febe8..90dd163072d 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -17,91 +17,122 @@
Installing overlays
- The list of overlays is determined as follows.
+ The list of overlays can be set either explicitly in a Nix expression, or
+ through <nixpkgs-overlays> or user configuration
+ files.
-
- If the overlays argument is not provided explicitly, we
- look for overlays in a path. The path is determined as follows:
-
-
-
- First, if an overlays argument to the nixpkgs function
- itself is given, then that is used.
-
-
- This can be passed explicitly when importing nipxkgs, for example
- import <nixpkgs> { overlays = [ overlay1 overlay2 ];
- }.
-
-
-
-
- Otherwise, if the Nix path entry <nixpkgs-overlays>
- exists, we look for overlays at that path, as described below.
-
-
- See the section on NIX_PATH in the Nix manual for more
- details on how to set a value for
- <nixpkgs-overlays>.
-
-
-
-
- If one of ~/.config/nixpkgs/overlays.nix and
- ~/.config/nixpkgs/overlays/ exists, then we look for
- overlays at that path, as described below. It is an error if both exist.
-
-
-
-
+
+ Set overlays in NixOS or Nix expressions
-
- If we are looking for overlays at a path, then there are two cases:
-
-
-
- If the path is a file, then the file is imported as a Nix expression and
- used as the list of overlays.
-
-
-
-
- If the path is a directory, then we take the content of the directory,
- order it lexicographically, and attempt to interpret each as an overlay
- by:
-
-
-
- Importing the file, if it is a .nix file.
-
-
-
-
- Importing a top-level default.nix file, if it is
- a directory.
-
-
-
-
-
-
-
+
+ On a NixOS system the value of the nixpkgs.overlays
+ option, if present, is passed to the system Nixpkgs directly as an
+ argument. Note that this does not affect the overlays for non-NixOS
+ operations (e.g. nix-env), which are
+ looked up independently.
+
-
- On a NixOS system the value of the nixpkgs.overlays
- option, if present, is passed to the system Nixpkgs directly as an argument.
- Note that this does not affect the overlays for non-NixOS operations (e.g.
- nix-env), which are looked up independently.
-
+
+ The list of overlays can be passed explicitly when importing nixpkgs, for
+ example import <nixpkgs> { overlays = [ overlay1 overlay2 ];
+ }.
+
-
- The overlays.nix option therefore provides a convenient
- way to use the same overlays for a NixOS system configuration and user
- configuration: the same file can be used as
- overlays.nix and imported as the value of
- nixpkgs.overlays.
-
+
+ Further overlays can be added by calling the pkgs.extend
+ or pkgs.appendOverlays, although it is often preferable
+ to avoid these functions, because they recompute the Nixpkgs fixpoint,
+ which is somewhat expensive to do.
+
+
+
+
+ Install overlays via configuration lookup
+
+
+ The list of overlays is determined as follows.
+
+
+
+
+
+
+ First, if an
+ overlays
+ argument to the nixpkgs function itself is given, then that is
+ used and no path lookup will be performed.
+
+
+
+
+ Otherwise, if the Nix path entry
+ <nixpkgs-overlays> exists, we look for overlays at
+ that path, as described below.
+
+
+ See the section on NIX_PATH in the Nix manual for
+ more details on how to set a value for
+ <nixpkgs-overlays>.
+
+
+
+
+ If one of ~/.config/nixpkgs/overlays.nix and
+ ~/.config/nixpkgs/overlays/ exists, then we look
+ for overlays at that path, as described below. It is an error if both
+ exist.
+
+
+
+
+
+
+ If we are looking for overlays at a path, then there are two cases:
+
+
+
+ If the path is a file, then the file is imported as a Nix expression and
+ used as the list of overlays.
+
+
+
+
+ If the path is a directory, then we take the content of the directory,
+ order it lexicographically, and attempt to interpret each as an overlay
+ by:
+
+
+
+ Importing the file, if it is a .nix file.
+
+
+
+
+ Importing a top-level default.nix file, if it is
+ a directory.
+
+
+
+
+
+
+
+
+
+ Because overlays that are set in NixOS configuration do not affect
+ non-NixOS operations such as nix-env, the
+ overlays.nix option provides a convenient way to use
+ the same overlays for a NixOS system configuration and user configuration:
+ the same file can be used as overlays.nix and imported
+ as the value of nixpkgs.overlays.
+
+
+
+
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 7b8657fb4a1..49f94f3bd5d 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -413,11 +413,9 @@ packageOverrides = pkgs: {
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 use the Steam controller or other Steam supported controllers such as
+ the DualShock 4 or Nintendo Switch Pro, you need to add
+hardware.steam-hardware.enable = true;
to your configuration.
@@ -671,6 +669,9 @@ overrides = self: super: rec {
plugins = with availablePlugins; [ python perl ];
}
}
+ If the configure function returns an attrset without the
+ plugins attribute, availablePlugins
+ will be used automatically.
@@ -680,10 +681,10 @@ overrides = self: super: rec {
- The python plugin allows the addition of extra libraries. For instance, the
- inotify.py script in weechat-scripts requires D-Bus or
- libnotify, and the fish.py script requires pycrypto. To
- use these scripts, use the python plugin's
+ The python and perl plugins allows the addition of extra libraries. For
+ instance, the inotify.py script in weechat-scripts
+ requires D-Bus or libnotify, and the fish.py script
+ requires pycrypto. To use these scripts, use the plugin's
withPackages attribute:
weechat.override { configure = {availablePlugins, ...}: {
plugins = with availablePlugins; [
@@ -704,6 +705,61 @@ overrides = self: super: rec {
}; }
+
+
+ WeeChat allows to set defaults on startup using the
+ --run-command. The configure method
+ can be used to pass commands to the program:
+weechat.override {
+ configure = { availablePlugins, ... }: {
+ init = ''
+ /set foo bar
+ /server add freenode chat.freenode.org
+ '';
+ };
+}
+ Further values can be added to the list of commands when running
+ weechat --run-command "your-commands".
+
+
+
+ Additionally it's possible to specify scripts to be loaded when starting
+ weechat. These will be loaded before the commands from
+ init:
+weechat.override {
+ configure = { availablePlugins, ... }: {
+ scripts = with pkgs.weechatScripts; [
+ weechat-xmpp weechat-matrix-bridge wee-slack
+ ];
+ init = ''
+ /set plugins.var.python.jabber.key "val"
+ '':
+ };
+}
+
+
+
+ In nixpkgs there's a subpackage which contains
+ derivations for WeeChat scripts. Such derivations expect a
+ passthru.scripts attribute which contains a list of all
+ scripts inside the store path. Furthermore all scripts have to live in
+ $out/share. An exemplary derivation looks like this:
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+ name = "exemplary-weechat-script";
+ src = fetchurl {
+ url = "https://scripts.tld/your-scripts.tar.gz";
+ sha256 = "...";
+ };
+ passthru.scripts = [ "foo.py" "bar.lua" ];
+ installPhase = ''
+ mkdir $out/share
+ cp foo.py $out/share
+ cp bar.lua $out/share
+ '';
+}
+
Citrix Receiver
@@ -763,4 +819,75 @@ citrix_receiver.override {
+
+ ibus-engines.typing-booster
+
+
+ This package is an ibus-based completion method to speed up typing.
+
+
+
+ Activating the engine
+
+
+ IBus needs to be configured accordingly to activate
+ typing-booster. The configuration depends on the desktop
+ manager in use. For detailed instructions, please refer to the
+ upstream
+ docs.
+
+
+
+ On NixOS you need to explicitly enable ibus with given
+ engines before customizing your desktop to use
+ typing-booster. This can be achieved using the
+ ibus module:
+{ pkgs, ... }: {
+ i18n.inputMethod = {
+ enabled = "ibus";
+ ibus.engines = with pkgs.ibus-engines; [ typing-booster ];
+ };
+}
+
+
+
+
+ Using custom hunspell dictionaries
+
+
+ The IBus engine is based on hunspell to support
+ completion in many languages. By default the dictionaries
+ de-de, en-us,
+ es-es, it-it,
+ sv-se and sv-fi are in use. To add
+ another dictionary, the package can be overridden like this:
+ibus-engines.typing-booster.override {
+ langs = [ "de-at" "en-gb" ];
+}
+
+
+
+ Note: each language passed to langs must be an
+ attribute name in pkgs.hunspellDicts.
+
+
+
+
+ Built-in emoji picker
+
+
+ The ibus-engines.typing-booster package contains a
+ program named emoji-picker. To display all emojis
+ correctly, a special font such as noto-fonts-emoji is
+ needed:
+
+
+
+ On NixOS it can be installed using the following expression:
+{ pkgs, ... }: {
+ fonts.fonts = with pkgs; [ noto-fonts-emoji ];
+}
+
+
+
diff --git a/doc/shell.nix b/doc/shell.nix
index 24fe20e8105..8ac2019f9d6 100644
--- a/doc/shell.nix
+++ b/doc/shell.nix
@@ -1,5 +1,5 @@
{ pkgs ? import ../. {} }:
-(import ./default.nix).overrideAttrs (x: {
+(import ./default.nix {}).overrideAttrs (x: {
buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ];
})
diff --git a/doc/shell.section.md b/doc/shell.section.md
deleted file mode 100644
index cb8832a814f..00000000000
--- a/doc/shell.section.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: pkgs.mkShell
-author: zimbatm
-date: 2017-10-30
----
-
-# mkShell
-
-pkgs.mkShell is a special kind of derivation that is only useful when using
-it combined with nix-shell. It will in fact fail to instantiate when invoked
-with nix-build.
-
-## Usage
-
-```nix
-{ pkgs ? import {} }:
-pkgs.mkShell {
- # this will make all the build inputs from hello and gnutar available to the shell environment
- inputsFrom = with pkgs; [ hello gnutar ];
- buildInputs = [ pkgs.gnumake ];
-}
-```
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 7a0f8f270ba..b2f30bf08db 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -372,7 +372,7 @@ let f(h, h + 1, i) = i + h
They are programs/libraries used at build time that furthermore produce
programs/libraries also used at build time. If the dependency doesn't
care about the target platform (i.e. isn't a compiler or similar tool),
- put it in nativeBuildInputsinstead. The most common
+ put it in nativeBuildInputs instead. The most common
use for this buildPackages.stdenv.cc, the default C
compiler for this role. That example crops up more than one might think
in old commonly used C libraries.
@@ -2099,13 +2099,13 @@ someVar=$(stripHash $name)
- In order to alleviate this burden, the setup
- hook>mechanism was written, where any package can include a
- shell script that [by convention rather than enforcement by Nix], any
- downstream reverse-dependency will source as part of its build process. That
- allows the downstream dependency to merely specify its dependencies, and
- lets those dependencies effectively initialize themselves. No boilerplate
- mirroring the list of dependencies is needed.
+ In order to alleviate this burden, the setup hook
+ mechanism was written, where any package can include a shell script that [by
+ convention rather than enforcement by Nix], any downstream
+ reverse-dependency will source as part of its build process. That allows the
+ downstream dependency to merely specify its dependencies, and lets those
+ dependencies effectively initialize themselves. No boilerplate mirroring the
+ list of dependencies is needed.
@@ -2129,7 +2129,7 @@ someVar=$(stripHash $name)
The most typical use of the setup hook is actually to add other hooks which
are then run (i.e. after all the setup hooks) on each dependency. For
example, the C compiler wrapper's setup hook feeds itself flags for each
- dependency that contains relevant libaries and headers. This is done by
+ dependency that contains relevant libraries and headers. This is done by
defining a bash function, and appending its name to one of
envBuildBuildHooks`, envBuildHostHooks`,
envBuildTargetHooks`, envHostHostHooks`,
@@ -2445,6 +2445,28 @@ addEnvHooks "$hostOffset" myBashFunction
+
+
+ breakpointHook
+
+
+
+ This hook will make a build pause instead of stopping when a failure
+ happen. It prevents nix to cleanup the build environment immediatly and
+ allows the user to attach to a build environment using the
+ cntr command. On build error it will print the
+ instruction that are neccessary for cntr. Installing
+ cntr and running the command will provide shell access to the build
+ sandbox of failed build. At /var/lib/cntr the
+ sandbox filesystem is mounted. All commands and files of the system are
+ still accessible within the shell. To execute commands from the sandbox
+ use the cntr exec subcommand. Note that cntr also
+ needs to be executed on the machine that is doing the build, which might
+ be not the case when remote builders are enabled.
+ cntr is only supported on linux based platforms.
+
+
+
diff --git a/lib/asserts.nix b/lib/asserts.nix
new file mode 100644
index 00000000000..8a5f1fb3feb
--- /dev/null
+++ b/lib/asserts.nix
@@ -0,0 +1,44 @@
+{ lib }:
+
+rec {
+
+ /* Print a trace message if pred is false.
+ Intended to be used to augment asserts with helpful error messages.
+
+ Example:
+ assertMsg false "nope"
+ => false
+ stderr> trace: nope
+
+ assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); ""
+ stderr> trace: foo is not bar, silly
+ stderr> assert failed at …
+
+ Type:
+ assertMsg :: Bool -> String -> Bool
+ */
+ # TODO(Profpatsch): add tests that check stderr
+ assertMsg = pred: msg:
+ if pred
+ then true
+ else builtins.trace msg false;
+
+ /* Specialized `assertMsg` for checking if val is one of the elements
+ of a list. Useful for checking enums.
+
+ Example:
+ let sslLibrary = "libressl"
+ in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
+ => false
+ stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl"
+
+ Type:
+ assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
+ */
+ assertOneOf = name: val: xs: assertMsg
+ (lib.elem val xs)
+ "${name} must be one of ${
+ lib.generators.toPretty {} xs}, but is: ${
+ lib.generators.toPretty {} val}";
+
+}
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 1e4142562fa..2a1b866dbc5 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -435,12 +435,15 @@ rec {
useful for deep-overriding.
Example:
- x = { a = { b = 4; c = 3; }; }
- overrideExisting x { a = { b = 6; d = 2; }; }
- => { a = { b = 6; d = 2; }; }
+ overrideExisting {} { a = 1; }
+ => {}
+ overrideExisting { b = 2; } { a = 1; }
+ => { b = 2; }
+ overrideExisting { a = 3; b = 2; } { a = 1; }
+ => { a = 1; b = 2; }
*/
overrideExisting = old: new:
- old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] old.${attr} new)) (attrNames old));
+ mapAttrs (name: value: new.${name} or value) old;
/* Get a package output.
If no output is found, fallback to `.out` and then to the default.
diff --git a/lib/customisation.nix b/lib/customisation.nix
index df9d977e9ec..68062dd0daf 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -196,7 +196,7 @@ rec {
newScope = scope: newScope (self // scope);
callPackage = self.newScope {};
overrideScope = g: lib.warn
- "`overrideScope` (from `lib.makeScope`) is deprecated. Do `overrideScope' (self: self: { … })` instead of `overrideScope (super: self: { … })`. All other overrides have the parameters in that order, including other definitions of `overrideScope`. This was the only definition violating the pattern."
+ "`overrideScope` (from `lib.makeScope`) is deprecated. Do `overrideScope' (self: super: { … })` instead of `overrideScope (super: self: { … })`. All other overrides have the parameters in that order, including other definitions of `overrideScope`. This was the only definition violating the pattern."
(makeScope newScope (lib.fixedPoints.extends (lib.flip g) f));
overrideScope' = g: makeScope newScope (lib.fixedPoints.extends g f);
packages = f;
diff --git a/lib/debug.nix b/lib/debug.nix
index 383eb32d75d..2879f72ed2b 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -23,27 +23,54 @@ rec {
# -- TRACING --
- /* Trace msg, but only if pred is true.
+ /* Conditionally trace the supplied message, based on a predicate.
+
+ Type: traceIf :: bool -> string -> a -> a
Example:
traceIf true "hello" 3
trace: hello
=> 3
*/
- traceIf = pred: msg: x: if pred then trace msg x else x;
+ traceIf =
+ # Predicate to check
+ pred:
+ # Message that should be traced
+ msg:
+ # Value to return
+ x: if pred then trace msg x else x;
+
+ /* Trace the supplied value after applying a function to it, and
+ return the original value.
- /* Trace the value and also return it.
+ Type: traceValFn :: (a -> b) -> a -> a
Example:
traceValFn (v: "mystring ${v}") "foo"
trace: mystring foo
=> "foo"
*/
- traceValFn = f: x: trace (f x) x;
+ traceValFn =
+ # Function to apply
+ f:
+ # Value to trace and return
+ x: trace (f x) x;
+
+ /* Trace the supplied value and return it.
+
+ Type: traceVal :: a -> a
+
+ Example:
+ traceVal 42
+ # trace: 42
+ => 42
+ */
traceVal = traceValFn id;
/* `builtins.trace`, but the value is `builtins.deepSeq`ed first.
+ Type: traceSeq :: a -> b -> b
+
Example:
trace { a.b.c = 3; } null
trace: { a = ; }
@@ -52,7 +79,11 @@ rec {
trace: { a = { b = { c = 3; }; }; }
=> null
*/
- traceSeq = x: y: trace (builtins.deepSeq x x) y;
+ traceSeq =
+ # The value to trace
+ x:
+ # The value to return
+ y: trace (builtins.deepSeq x x) y;
/* Like `traceSeq`, but only evaluate down to depth n.
This is very useful because lots of `traceSeq` usages
@@ -76,27 +107,49 @@ rec {
in trace (generators.toPretty { allowPrettyValues = true; }
(modify depth snip x)) y;
- /* A combination of `traceVal` and `traceSeq` */
- traceValSeqFn = f: v: traceValFn f (builtins.deepSeq v v);
+ /* A combination of `traceVal` and `traceSeq` that applies a
+ provided function to the value to be traced after `deepSeq`ing
+ it.
+ */
+ traceValSeqFn =
+ # Function to apply
+ f:
+ # Value to trace
+ v: traceValFn f (builtins.deepSeq v v);
+
+ /* A combination of `traceVal` and `traceSeq`. */
traceValSeq = traceValSeqFn id;
+ /* A combination of `traceVal` and `traceSeqN` that applies a
+ provided function to the value to be traced. */
+ traceValSeqNFn =
+ # Function to apply
+ f:
+ depth:
+ # Value to trace
+ v: traceSeqN depth (f v) v;
+
/* A combination of `traceVal` and `traceSeqN`. */
- traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v;
traceValSeqN = traceValSeqNFn id;
# -- TESTING --
- /* Evaluate a set of tests. A test is an attribute set {expr,
- expected}, denoting an expression and its expected result. The
- result is a list of failed tests, each represented as {name,
- expected, actual}, denoting the attribute name of the failing
- test and its expected and actual results. Used for regression
- testing of the functions in lib; see tests.nix for an example.
- Only tests having names starting with "test" are run.
- Add attr { tests = ["testName"]; } to run these test only
+ /* Evaluate a set of tests. A test is an attribute set `{expr,
+ expected}`, denoting an expression and its expected result. The
+ result is a list of failed tests, each represented as `{name,
+ expected, actual}`, denoting the attribute name of the failing
+ test and its expected and actual results.
+
+ Used for regression testing of the functions in lib; see
+ tests.nix for an example. Only tests having names starting with
+ "test" are run.
+
+ Add attr { tests = ["testName"]; } to run these tests only.
*/
- runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
+ runTests =
+ # Tests to run
+ tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
let testsToRun = if tests ? tests then tests.tests else [];
in if (substring 0 4 name == "test" || elem name testsToRun)
&& ((testsToRun == []) || elem name tests.tests)
@@ -105,8 +158,11 @@ rec {
then [ { inherit name; expected = test.expected; result = test.expr; } ]
else [] ) tests));
- # create a test assuming that list elements are true
- # usage: { testX = allTrue [ true ]; }
+ /* Create a test assuming that list elements are `true`.
+
+ Example:
+ { testX = allTrue [ true ]; }
+ */
testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
diff --git a/lib/default.nix b/lib/default.nix
index dd6fcec75e2..d7a05fec833 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -38,10 +38,11 @@ let
systems = callLibs ./systems;
# misc
+ asserts = callLibs ./asserts.nix;
debug = callLibs ./debug.nix;
-
generators = callLibs ./generators.nix;
misc = callLibs ./deprecated.nix;
+
# domain-specific
fetchers = callLibs ./fetchers.nix;
@@ -60,7 +61,6 @@ let
boolToString mergeAttrs flip mapNullable inNixShell min max
importJSON warn info nixpkgsVersion version mod compare
splitByAndCompare functionArgs setFunctionArgs isFunction;
-
inherit (fixedPoints) fix fix' extends composeExtensions
makeExtensible makeExtensibleWithCustomName;
inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
@@ -117,6 +117,8 @@ let
unknownModule mkOption;
inherit (types) isType setType defaultTypeMerge defaultFunctor
isOptionType mkOptionType;
+ inherit (asserts)
+ assertMsg assertOneOf;
inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn
traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
diff --git a/lib/generators.nix b/lib/generators.nix
index f5faf700786..863ba847423 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -143,6 +143,7 @@ rec {
}@args: v: with builtins;
let isPath = v: typeOf v == "path";
in if isInt v then toString v
+ else if isFloat v then "~${toString v}"
else if isString v then ''"${libStr.escape [''"''] v}"''
else if true == v then "true"
else if false == v then "false"
diff --git a/lib/licenses.nix b/lib/licenses.nix
index c442d74c857..940baf53b7c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -309,6 +309,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "GNU General Public License v2.0 only";
};
+ gpl2Classpath = {
+ spdxId = "GPL-2.0-with-classpath-exception";
+ fullName = "GNU General Public License v2.0 only (with Classpath exception)";
+ url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
+ };
+
gpl2ClasspathPlus = {
fullName = "GNU General Public License v2.0 or later (with Classpath exception)";
url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
@@ -355,6 +361,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Independent JPEG Group License";
};
+ imagemagick = spdx {
+ fullName = "ImageMagick License";
+ spdxId = "imagemagick";
+ };
+
inria-compcert = {
fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler";
url = "http://compcert.inria.fr/doc/LICENSE";
@@ -382,6 +393,14 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "ISC License";
};
+ # Proprietary binaries; free to redistribute without modification.
+ issl = {
+ fullName = "Intel Simplified Software License";
+ url = https://software.intel.com/en-us/license/intel-simplified-software-license;
+ free = false;
+ };
+
+
lgpl2 = spdx {
spdxId = "LGPL-2.0";
fullName = "GNU Library General Public License v2 only";
@@ -495,6 +514,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Non-Profit Open Software License 3.0";
};
+ ocamlpro_nc = {
+ fullName = "OCamlPro Non Commercial license version 1";
+ url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf";
+ free = false;
+ };
+
ofl = spdx {
spdxId = "OFL-1.1";
fullName = "SIL Open Font License 1.1";
@@ -546,6 +571,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Public Domain";
};
+ purdueBsd = {
+ fullName = " Purdue BSD-Style License"; # also know as lsof license
+ url = https://enterprise.dejacode.com/licenses/public/purdue-bsd;
+ };
+
qpl = spdx {
spdxId = "QPL-1.0";
fullName = "Q Public License 1.0";
@@ -561,6 +591,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Ruby License";
};
+ sendmail = spdx {
+ spdxId = "Sendmail";
+ fullName = "Sendmail License";
+ };
+
sgi-b-20 = spdx {
spdxId = "SGI-B-2.0";
fullName = "SGI Free Software License B v2.0";
diff --git a/lib/lists.nix b/lib/lists.nix
index 288882924ff..be541427c24 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1,4 +1,5 @@
# General list operations.
+
{ lib }:
with lib.trivial;
let
@@ -8,21 +9,23 @@ rec {
inherit (builtins) head tail length isList elemAt concatLists filter elem genList;
- /* Create a list consisting of a single element. `singleton x' is
- sometimes more convenient with respect to indentation than `[x]'
+ /* Create a list consisting of a single element. `singleton x` is
+ sometimes more convenient with respect to indentation than `[x]`
when x spans multiple lines.
+ Type: singleton :: a -> [a]
+
Example:
singleton "foo"
=> [ "foo" ]
*/
singleton = x: [x];
- /* “right fold” a binary function `op' between successive elements of
- `list' with `nul' as the starting value, i.e.,
- `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'.
- Type:
- foldr :: (a -> b -> b) -> b -> [a] -> b
+ /* “right fold” a binary function `op` between successive elements of
+ `list` with `nul' as the starting value, i.e.,
+ `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))`.
+
+ Type: foldr :: (a -> b -> b) -> b -> [a] -> b
Example:
concat = foldr (a: b: a + b) "z"
@@ -42,16 +45,15 @@ rec {
else op (elemAt list n) (fold' (n + 1));
in fold' 0;
- /* `fold' is an alias of `foldr' for historic reasons */
+ /* `fold` is an alias of `foldr` for historic reasons */
# FIXME(Profpatsch): deprecate?
fold = foldr;
- /* “left fold”, like `foldr', but from the left:
+ /* “left fold”, like `foldr`, but from the left:
`foldl op nul [x_1 x_2 ... x_n] == op (... (op (op nul x_1) x_2) ... x_n)`.
- Type:
- foldl :: (b -> a -> b) -> b -> [a] -> b
+ Type: foldl :: (b -> a -> b) -> b -> [a] -> b
Example:
lconcat = foldl (a: b: a + b) "z"
@@ -70,16 +72,20 @@ rec {
else op (foldl' (n - 1)) (elemAt list n);
in foldl' (length list - 1);
- /* Strict version of `foldl'.
+ /* Strict version of `foldl`.
The difference is that evaluation is forced upon access. Usually used
with small whole results (in contract with lazily-generated list or large
lists where only a part is consumed.)
+
+ Type: foldl' :: (b -> a -> b) -> b -> [a] -> b
*/
foldl' = builtins.foldl' or foldl;
/* Map with index starting from 0
+ Type: imap0 :: (int -> a -> b) -> [a] -> [b]
+
Example:
imap0 (i: v: "${v}-${toString i}") ["a" "b"]
=> [ "a-0" "b-1" ]
@@ -88,6 +94,8 @@ rec {
/* Map with index starting from 1
+ Type: imap1 :: (int -> a -> b) -> [a] -> [b]
+
Example:
imap1 (i: v: "${v}-${toString i}") ["a" "b"]
=> [ "a-1" "b-2" ]
@@ -96,6 +104,8 @@ rec {
/* Map and concatenate the result.
+ Type: concatMap :: (a -> [b]) -> [a] -> [b]
+
Example:
concatMap (x: [x] ++ ["z"]) ["a" "b"]
=> [ "a" "z" "b" "z" ]
@@ -118,15 +128,21 @@ rec {
/* Remove elements equal to 'e' from a list. Useful for buildInputs.
+ Type: remove :: a -> [a] -> [a]
+
Example:
remove 3 [ 1 3 4 3 ]
=> [ 1 4 ]
*/
- remove = e: filter (x: x != e);
+ remove =
+ # Element to remove from the list
+ e: filter (x: x != e);
/* Find the sole element in the list matching the specified
- predicate, returns `default' if no such element exists, or
- `multiple' if there are multiple matching elements.
+ predicate, returns `default` if no such element exists, or
+ `multiple` if there are multiple matching elements.
+
+ Type: findSingle :: (a -> bool) -> a -> a -> [a] -> a
Example:
findSingle (x: x == 3) "none" "multiple" [ 1 3 3 ]
@@ -136,14 +152,24 @@ rec {
findSingle (x: x == 3) "none" "multiple" [ 1 9 ]
=> "none"
*/
- findSingle = pred: default: multiple: list:
+ findSingle =
+ # Predicate
+ pred:
+ # Default value to return if element was not found.
+ default:
+ # Default value to return if more than one element was found
+ multiple:
+ # Input list
+ list:
let found = filter pred list; len = length found;
in if len == 0 then default
else if len != 1 then multiple
else head found;
/* Find the first element in the list matching the specified
- predicate or returns `default' if no such element exists.
+ predicate or return `default` if no such element exists.
+
+ Type: findFirst :: (a -> bool) -> a -> [a] -> a
Example:
findFirst (x: x > 3) 7 [ 1 6 4 ]
@@ -151,12 +177,20 @@ rec {
findFirst (x: x > 9) 7 [ 1 6 4 ]
=> 7
*/
- findFirst = pred: default: list:
+ findFirst =
+ # Predicate
+ pred:
+ # Default value to return
+ default:
+ # Input list
+ list:
let found = filter pred list;
in if found == [] then default else head found;
- /* Return true iff function `pred' returns true for at least element
- of `list'.
+ /* Return true if function `pred` returns true for at least one
+ element of `list`.
+
+ Type: any :: (a -> bool) -> [a] -> bool
Example:
any isString [ 1 "a" { } ]
@@ -166,8 +200,10 @@ rec {
*/
any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false);
- /* Return true iff function `pred' returns true for all elements of
- `list'.
+ /* Return true if function `pred` returns true for all elements of
+ `list`.
+
+ Type: all :: (a -> bool) -> [a] -> bool
Example:
all (x: x < 3) [ 1 2 ]
@@ -177,19 +213,25 @@ rec {
*/
all = builtins.all or (pred: foldr (x: y: if pred x then y else false) true);
- /* Count how many times function `pred' returns true for the elements
- of `list'.
+ /* Count how many elements of `list` match the supplied predicate
+ function.
+
+ Type: count :: (a -> bool) -> [a] -> int
Example:
count (x: x == 3) [ 3 2 3 4 6 ]
=> 2
*/
- count = pred: foldl' (c: x: if pred x then c + 1 else c) 0;
+ count =
+ # Predicate
+ pred: foldl' (c: x: if pred x then c + 1 else c) 0;
/* Return a singleton list or an empty list, depending on a boolean
value. Useful when building lists with optional elements
(e.g. `++ optional (system == "i686-linux") flashplayer').
+ Type: optional :: bool -> a -> [a]
+
Example:
optional true "foo"
=> [ "foo" ]
@@ -200,13 +242,19 @@ rec {
/* Return a list or an empty list, depending on a boolean value.
+ Type: optionals :: bool -> [a] -> [a]
+
Example:
optionals true [ 2 3 ]
=> [ 2 3 ]
optionals false [ 2 3 ]
=> [ ]
*/
- optionals = cond: elems: if cond then elems else [];
+ optionals =
+ # Condition
+ cond:
+ # List to return if condition is true
+ elems: if cond then elems else [];
/* If argument is a list, return it; else, wrap it in a singleton
@@ -223,20 +271,28 @@ rec {
/* Return a list of integers from `first' up to and including `last'.
+ Type: range :: int -> int -> [int]
+
Example:
range 2 4
=> [ 2 3 4 ]
range 3 2
=> [ ]
*/
- range = first: last:
+ range =
+ # First integer in the range
+ first:
+ # Last integer in the range
+ last:
if first > last then
[]
else
genList (n: first + n) (last - first + 1);
- /* Splits the elements of a list in two lists, `right' and
- `wrong', depending on the evaluation of a predicate.
+ /* Splits the elements of a list in two lists, `right` and
+ `wrong`, depending on the evaluation of a predicate.
+
+ Type: (a -> bool) -> [a] -> { right :: [a], wrong :: [a] }
Example:
partition (x: x > 2) [ 5 1 2 3 4 ]
@@ -252,7 +308,7 @@ rec {
/* Splits the elements of a list into many lists, using the return value of a predicate.
Predicate should return a string which becomes keys of attrset `groupBy' returns.
- `groupBy'' allows to customise the combining function and initial value
+ `groupBy'` allows to customise the combining function and initial value
Example:
groupBy (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
@@ -268,10 +324,6 @@ rec {
xfce = [ { name = "xfce"; script = "xfce4-session &"; } ];
}
-
- groupBy' allows to customise the combining function and initial value
-
- Example:
groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]
=> { true = 12; false = 3; }
*/
@@ -289,17 +341,27 @@ rec {
the merging stops at the shortest. How both lists are merged is defined
by the first argument.
+ Type: zipListsWith :: (a -> b -> c) -> [a] -> [b] -> [c]
+
Example:
zipListsWith (a: b: a + b) ["h" "l"] ["e" "o"]
=> ["he" "lo"]
*/
- zipListsWith = f: fst: snd:
+ zipListsWith =
+ # Function to zip elements of both lists
+ f:
+ # First list
+ fst:
+ # Second list
+ snd:
genList
(n: f (elemAt fst n) (elemAt snd n)) (min (length fst) (length snd));
/* Merges two lists of the same size together. If the sizes aren't the same
the merging stops at the shortest.
+ Type: zipLists :: [a] -> [b] -> [{ fst :: a, snd :: b}]
+
Example:
zipLists [ 1 2 ] [ "a" "b" ]
=> [ { fst = 1; snd = "a"; } { fst = 2; snd = "b"; } ]
@@ -308,6 +370,8 @@ rec {
/* Reverse the order of the elements of a list.
+ Type: reverseList :: [a] -> [a]
+
Example:
reverseList [ "b" "o" "j" ]
@@ -321,8 +385,7 @@ rec {
`before a b == true` means that `b` depends on `a` (there's an
edge from `b` to `a`).
- Examples:
-
+ Example:
listDfs true hasPrefix [ "/home/user" "other" "/" "/home" ]
== { minimal = "/"; # minimal element
visited = [ "/home/user" ]; # seen elements (in reverse order)
@@ -336,7 +399,6 @@ rec {
rest = [ "/home" "other" ]; # everything else
*/
-
listDfs = stopOnCycles: before: list:
let
dfs' = us: visited: rest:
@@ -361,7 +423,7 @@ rec {
`before a b == true` means that `b` should be after `a`
in the result.
- Examples:
+ Example:
toposort hasPrefix [ "/home/user" "other" "/" "/home" ]
== { result = [ "/" "/home" "/home/user" "other" ]; }
@@ -376,7 +438,6 @@ rec {
toposort (a: b: a < b) [ 3 2 1 ] == { result = [ 1 2 3 ]; }
*/
-
toposort = before: list:
let
dfsthis = listDfs true before list;
@@ -467,26 +528,38 @@ rec {
/* Return the first (at most) N elements of a list.
+ Type: take :: int -> [a] -> [a]
+
Example:
take 2 [ "a" "b" "c" "d" ]
=> [ "a" "b" ]
take 2 [ ]
=> [ ]
*/
- take = count: sublist 0 count;
+ take =
+ # Number of elements to take
+ count: sublist 0 count;
/* Remove the first (at most) N elements of a list.
+ Type: drop :: int -> [a] -> [a]
+
Example:
drop 2 [ "a" "b" "c" "d" ]
=> [ "c" "d" ]
drop 2 [ ]
=> [ ]
*/
- drop = count: list: sublist count (length list) list;
+ drop =
+ # Number of elements to drop
+ count:
+ # Input list
+ list: sublist count (length list) list;
+
+ /* Return a list consisting of at most `count` elements of `list`,
+ starting at index `start`.
- /* Return a list consisting of at most ‘count’ elements of ‘list’,
- starting at index ‘start’.
+ Type: sublist :: int -> int -> [a] -> [a]
Example:
sublist 1 3 [ "a" "b" "c" "d" "e" ]
@@ -494,7 +567,13 @@ rec {
sublist 1 3 [ ]
=> [ ]
*/
- sublist = start: count: list:
+ sublist =
+ # Index at which to start the sublist
+ start:
+ # Number of elements to take
+ count:
+ # Input list
+ list:
let len = length list; in
genList
(n: elemAt list (n + start))
@@ -504,23 +583,34 @@ rec {
/* Return the last element of a list.
+ This function throws an error if the list is empty.
+
+ Type: last :: [a] -> a
+
Example:
last [ 1 2 3 ]
=> 3
*/
last = list:
- assert list != []; elemAt list (length list - 1);
+ assert lib.assertMsg (list != []) "lists.last: list must not be empty!";
+ elemAt list (length list - 1);
- /* Return all elements but the last
+ /* Return all elements but the last.
+
+ This function throws an error if the list is empty.
+
+ Type: init :: [a] -> [a]
Example:
init [ 1 2 3 ]
=> [ 1 2 ]
*/
- init = list: assert list != []; take (length list - 1) list;
+ init = list:
+ assert lib.assertMsg (list != []) "lists.init: list must not be empty!";
+ take (length list - 1) list;
- /* return the image of the cross product of some lists by a function
+ /* Return the image of the cross product of some lists by a function.
Example:
crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]]
@@ -531,8 +621,9 @@ rec {
/* Remove duplicate elements from the list. O(n^2) complexity.
- Example:
+ Type: unique :: [a] -> [a]
+ Example:
unique [ 3 2 3 4 ]
=> [ 3 2 4 ]
*/
diff --git a/lib/options.nix b/lib/options.nix
index 01160b48ec0..791930eafbd 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -8,33 +8,72 @@ with lib.strings;
rec {
+ /* Returns true when the given argument is an option
+
+ Type: isOption :: a -> bool
+
+ Example:
+ isOption 1 // => false
+ isOption (mkOption {}) // => true
+ */
isOption = lib.isType "option";
+
+ /* Creates an Option attribute set. mkOption accepts an attribute set with the following keys:
+
+ All keys default to `null` when not given.
+
+ Example:
+ mkOption { } // => { _type = "option"; }
+ mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; }
+ */
mkOption =
- { default ? null # Default value used when no definition is given in the configuration.
- , defaultText ? null # Textual representation of the default, for in the manual.
- , example ? null # Example value used in the manual.
- , description ? null # String describing the option.
- , relatedPackages ? null # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
- , type ? null # Option type, providing type-checking and value merging.
- , apply ? null # Function that converts the option value to something else.
- , internal ? null # Whether the option is for NixOS developers only.
- , visible ? null # Whether the option shows up in the manual.
- , readOnly ? null # Whether the option can be set only once
- , options ? null # Obsolete, used by types.optionSet.
+ {
+ # Default value used when no definition is given in the configuration.
+ default ? null,
+ # Textual representation of the default, for the manual.
+ defaultText ? null,
+ # Example value used in the manual.
+ example ? null,
+ # String describing the option.
+ description ? null,
+ # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix).
+ relatedPackages ? null,
+ # Option type, providing type-checking and value merging.
+ type ? null,
+ # Function that converts the option value to something else.
+ apply ? null,
+ # Whether the option is for NixOS developers only.
+ internal ? null,
+ # Whether the option shows up in the manual.
+ visible ? null,
+ # Whether the option can be set only once
+ readOnly ? null,
+ # Obsolete, used by types.optionSet.
+ options ? null
} @ attrs:
attrs // { _type = "option"; };
- mkEnableOption = name: mkOption {
+ /* Creates an Option attribute set for a boolean value option i.e an
+ option to be toggled on or off:
+
+ Example:
+ mkEnableOption "foo"
+ => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; }
+ */
+ mkEnableOption =
+ # Name for the created option
+ name: mkOption {
default = false;
example = true;
description = "Whether to enable ${name}.";
type = lib.types.bool;
};
- # This option accept anything, but it does not produce any result. This
- # is useful for sharing a module across different module sets without
- # having to implement similar features as long as the value of the options
- # are not expected.
+ /* This option accepts anything, but it does not produce any result.
+
+ This is useful for sharing a module across different module sets
+ without having to implement similar features as long as the
+ values of the options are not accessed. */
mkSinkUndeclaredOptions = attrs: mkOption ({
internal = true;
visible = false;
@@ -74,7 +113,24 @@ rec {
else
val) (head defs).value defs;
+ /* Extracts values of all "value" keys of the given list.
+
+ Type: getValues :: [ { value :: a } ] -> [a]
+
+ Example:
+ getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ]
+ getValues [ ] // => [ ]
+ */
getValues = map (x: x.value);
+
+ /* Extracts values of all "file" keys of the given list
+
+ Type: getFiles :: [ { file :: a } ] -> [a]
+
+ Example:
+ getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ]
+ getFiles [ ] // => [ ]
+ */
getFiles = map (x: x.file);
# Generate documentation template from the list of option declaration like
@@ -107,10 +163,13 @@ rec {
/* This function recursively removes all derivation attributes from
- `x' except for the `name' attribute. This is to make the
- generation of `options.xml' much more efficient: the XML
- representation of derivations is very large (on the order of
- megabytes) and is not actually used by the manual generator. */
+ `x` except for the `name` attribute.
+
+ This is to make the generation of `options.xml` much more
+ efficient: the XML representation of derivations is very large
+ (on the order of megabytes) and is not actually used by the
+ manual generator.
+ */
scrubOptionValue = x:
if isDerivation x then
{ type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
@@ -119,20 +178,21 @@ rec {
else x;
- /* For use in the ‘example’ option attribute. It causes the given
- text to be included verbatim in documentation. This is necessary
- for example values that are not simple values, e.g.,
- functions. */
+ /* For use in the `example` option attribute. It causes the given
+ text to be included verbatim in documentation. This is necessary
+ for example values that are not simple values, e.g., functions.
+ */
literalExample = text: { _type = "literalExample"; inherit text; };
+ # Helper functions.
- /* Helper functions. */
+ /* Convert an option, described as a list of the option parts in to a
+ safe, human readable version.
- # Convert an option, described as a list of the option parts in to a
- # safe, human readable version. ie:
- #
- # (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
- # (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
+ Example:
+ (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
+ (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
+ */
showOption = parts: let
escapeOptionPart = part:
let
diff --git a/lib/sources.nix b/lib/sources.nix
index 704711b20cd..e64b23414e8 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -26,6 +26,10 @@ rec {
(type == "symlink" && lib.hasPrefix "result" baseName)
);
+ # Filters a source tree removing version control files and directories using cleanSourceWith
+ #
+ # Example:
+ # cleanSource ./.
cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; };
# Like `builtins.filterSource`, except it will compose with itself,
diff --git a/lib/strings.nix b/lib/strings.nix
index af932ce6ecf..4d7fa1e774d 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -12,6 +12,8 @@ rec {
/* Concatenate a list of strings.
+ Type: concatStrings :: [string] -> string
+
Example:
concatStrings ["foo" "bar"]
=> "foobar"
@@ -20,15 +22,19 @@ rec {
/* Map a function over a list and concatenate the resulting strings.
+ Type: concatMapStrings :: (a -> string) -> [a] -> string
+
Example:
concatMapStrings (x: "a" + x) ["foo" "bar"]
=> "afooabar"
*/
concatMapStrings = f: list: concatStrings (map f list);
- /* Like `concatMapStrings' except that the f functions also gets the
+ /* Like `concatMapStrings` except that the f functions also gets the
position as a parameter.
+ Type: concatImapStrings :: (int -> a -> string) -> [a] -> string
+
Example:
concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"]
=> "1-foo2-bar"
@@ -37,17 +43,25 @@ rec {
/* Place an element between each element of a list
+ Type: intersperse :: a -> [a] -> [a]
+
Example:
intersperse "/" ["usr" "local" "bin"]
=> ["usr" "/" "local" "/" "bin"].
*/
- intersperse = separator: list:
+ intersperse =
+ # Separator to add between elements
+ separator:
+ # Input list
+ list:
if list == [] || length list == 1
then list
else tail (lib.concatMap (x: [separator x]) list);
/* Concatenate a list of strings with a separator between each element
+ Type: concatStringsSep :: string -> [string] -> string
+
Example:
concatStringsSep "/" ["usr" "local" "bin"]
=> "usr/local/bin"
@@ -55,43 +69,77 @@ rec {
concatStringsSep = builtins.concatStringsSep or (separator: list:
concatStrings (intersperse separator list));
- /* First maps over the list and then concatenates it.
+ /* Maps a function over a list of strings and then concatenates the
+ result with the specified separator interspersed between
+ elements.
+
+ Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string
Example:
concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"]
=> "FOO-BAR-BAZ"
*/
- concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list);
+ concatMapStringsSep =
+ # Separator to add between elements
+ sep:
+ # Function to map over the list
+ f:
+ # List of input strings
+ list: concatStringsSep sep (map f list);
- /* First imaps over the list and then concatenates it.
+ /* Same as `concatMapStringsSep`, but the mapping function
+ additionally receives the position of its argument.
- Example:
+ Type: concatMapStringsSep :: string -> (int -> string -> string) -> [string] -> string
+ Example:
concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]
=> "6-3-2"
*/
- concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap1 f list);
+ concatImapStringsSep =
+ # Separator to add between elements
+ sep:
+ # Function that receives elements and their positions
+ f:
+ # List of input strings
+ list: concatStringsSep sep (lib.imap1 f list);
- /* Construct a Unix-style search path consisting of each `subDir"
- directory of the given list of packages.
+ /* Construct a Unix-style, colon-separated search path consisting of
+ the given `subDir` appended to each of the given paths.
+
+ Type: makeSearchPath :: string -> [string] -> string
Example:
makeSearchPath "bin" ["/root" "/usr" "/usr/local"]
=> "/root/bin:/usr/bin:/usr/local/bin"
- makeSearchPath "bin" ["/"]
- => "//bin"
+ makeSearchPath "bin" [""]
+ => "/bin"
*/
- makeSearchPath = subDir: packages:
- concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages));
+ makeSearchPath =
+ # Directory name to append
+ subDir:
+ # List of base paths
+ paths:
+ concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) paths));
+
+ /* Construct a Unix-style search path by appending the given
+ `subDir` to the specified `output` of each of the packages. If no
+ output by the given name is found, fallback to `.out` and then to
+ the default.
- /* Construct a Unix-style search path, using given package output.
- If no output is found, fallback to `.out` and then to the default.
+ Type: string -> string -> [package] -> string
Example:
makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ]
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
*/
- makeSearchPathOutput = output: subDir: pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
+ makeSearchPathOutput =
+ # Package output to use
+ output:
+ # Directory name to append
+ subDir:
+ # List of packages
+ pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
/* Construct a library search path (such as RPATH) containing the
libraries for a set of packages
@@ -117,13 +165,12 @@ rec {
/* Construct a perl search path (such as $PERL5LIB)
- FIXME(zimbatm): this should be moved in perl-specific code
-
Example:
pkgs = import { }
makePerlPath [ pkgs.perlPackages.libnet ]
=> "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl"
*/
+ # FIXME(zimbatm): this should be moved in perl-specific code
makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl";
/* Construct a perl search path recursively including all dependencies (such as $PERL5LIB)
@@ -138,34 +185,51 @@ rec {
/* Depending on the boolean `cond', return either the given string
or the empty string. Useful to concatenate against a bigger string.
+ Type: optionalString :: bool -> string -> string
+
Example:
optionalString true "some-string"
=> "some-string"
optionalString false "some-string"
=> ""
*/
- optionalString = cond: string: if cond then string else "";
+ optionalString =
+ # Condition
+ cond:
+ # String to return if condition is true
+ string: if cond then string else "";
/* Determine whether a string has given prefix.
+ Type: hasPrefix :: string -> string -> bool
+
Example:
hasPrefix "foo" "foobar"
=> true
hasPrefix "foo" "barfoo"
=> false
*/
- hasPrefix = pref: str:
- substring 0 (stringLength pref) str == pref;
+ hasPrefix =
+ # Prefix to check for
+ pref:
+ # Input string
+ str: substring 0 (stringLength pref) str == pref;
/* Determine whether a string has given suffix.
+ Type: hasSuffix :: string -> string -> bool
+
Example:
hasSuffix "foo" "foobar"
=> false
hasSuffix "foo" "barfoo"
=> true
*/
- hasSuffix = suffix: content:
+ hasSuffix =
+ # Suffix to check for
+ suffix:
+ # Input string
+ content:
let
lenContent = stringLength content;
lenSuffix = stringLength suffix;
@@ -180,6 +244,8 @@ rec {
Also note that Nix treats strings as a list of bytes and thus doesn't
handle unicode.
+ Type: stringtoCharacters :: string -> [string]
+
Example:
stringToCharacters ""
=> [ ]
@@ -194,18 +260,25 @@ rec {
/* Manipulate a string character by character and replace them by
strings before concatenating the results.
+ Type: stringAsChars :: (string -> string) -> string -> string
+
Example:
stringAsChars (x: if x == "a" then "i" else x) "nax"
=> "nix"
*/
- stringAsChars = f: s:
- concatStrings (
+ stringAsChars =
+ # Function to map over each individual character
+ f:
+ # Input string
+ s: concatStrings (
map f (stringToCharacters s)
);
- /* Escape occurrence of the elements of ‘list’ in ‘string’ by
+ /* Escape occurrence of the elements of `list` in `string` by
prefixing it with a backslash.
+ Type: escape :: [string] -> string -> string
+
Example:
escape ["(" ")"] "(foo)"
=> "\\(foo\\)"
@@ -214,6 +287,8 @@ rec {
/* Quote string to be used safely within the Bourne shell.
+ Type: escapeShellArg :: string -> string
+
Example:
escapeShellArg "esc'ape\nme"
=> "'esc'\\''ape\nme'"
@@ -222,6 +297,8 @@ rec {
/* Quote all arguments to be safely passed to the Bourne shell.
+ Type: escapeShellArgs :: [string] -> string
+
Example:
escapeShellArgs ["one" "two three" "four'five"]
=> "'one' 'two three' 'four'\\''five'"
@@ -230,13 +307,15 @@ rec {
/* Turn a string into a Nix expression representing that string
+ Type: string -> string
+
Example:
escapeNixString "hello\${}\n"
=> "\"hello\\\${}\\n\""
*/
escapeNixString = s: escape ["$"] (builtins.toJSON s);
- /* Obsolete - use replaceStrings instead. */
+ # Obsolete - use replaceStrings instead.
replaceChars = builtins.replaceStrings or (
del: new: s:
let
@@ -256,6 +335,8 @@ rec {
/* Converts an ASCII string to lower-case.
+ Type: toLower :: string -> string
+
Example:
toLower "HOME"
=> "home"
@@ -264,6 +345,8 @@ rec {
/* Converts an ASCII string to upper-case.
+ Type: toUpper :: string -> string
+
Example:
toUpper "home"
=> "HOME"
@@ -273,7 +356,7 @@ rec {
/* Appends string context from another string. This is an implementation
detail of Nix.
- Strings in Nix carry an invisible `context' which is a list of strings
+ Strings in Nix carry an invisible `context` which is a list of strings
representing store paths. If the string is later used in a derivation
attribute, the derivation will properly populate the inputDrvs and
inputSrcs.
@@ -319,8 +402,9 @@ rec {
in
recurse 0 0;
- /* Return the suffix of the second argument if the first argument matches
- its prefix.
+ /* Return a string without the specified prefix, if the prefix matches.
+
+ Type: string -> string -> string
Example:
removePrefix "foo." "foo.bar.baz"
@@ -328,18 +412,23 @@ rec {
removePrefix "xxx" "foo.bar.baz"
=> "foo.bar.baz"
*/
- removePrefix = pre: s:
+ removePrefix =
+ # Prefix to remove if it matches
+ prefix:
+ # Input string
+ str:
let
- preLen = stringLength pre;
- sLen = stringLength s;
+ preLen = stringLength prefix;
+ sLen = stringLength str;
in
- if hasPrefix pre s then
- substring preLen (sLen - preLen) s
+ if hasPrefix prefix str then
+ substring preLen (sLen - preLen) str
else
- s;
+ str;
+
+ /* Return a string without the specified suffix, if the suffix matches.
- /* Return the prefix of the second argument if the first argument matches
- its suffix.
+ Type: string -> string -> string
Example:
removeSuffix "front" "homefront"
@@ -347,17 +436,21 @@ rec {
removeSuffix "xxx" "homefront"
=> "homefront"
*/
- removeSuffix = suf: s:
+ removeSuffix =
+ # Suffix to remove if it matches
+ suffix:
+ # Input string
+ str:
let
- sufLen = stringLength suf;
- sLen = stringLength s;
+ sufLen = stringLength suffix;
+ sLen = stringLength str;
in
- if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then
- substring 0 (sLen - sufLen) s
+ if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then
+ substring 0 (sLen - sufLen) str
else
- s;
+ str;
- /* Return true iff string v1 denotes a version older than v2.
+ /* Return true if string v1 denotes a version older than v2.
Example:
versionOlder "1.1" "1.2"
@@ -367,7 +460,7 @@ rec {
*/
versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
- /* Return true iff string v1 denotes a version equal to or newer than v2.
+ /* Return true if string v1 denotes a version equal to or newer than v2.
Example:
versionAtLeast "1.1" "1.0"
@@ -410,7 +503,7 @@ rec {
components = splitString "/" url;
filename = lib.last components;
name = builtins.head (splitString sep filename);
- in assert name != filename; name;
+ in assert name != filename; name;
/* Create an --{enable,disable}- string that can be passed to
standard GNU Autoconf scripts.
@@ -459,6 +552,11 @@ rec {
/* Create a fixed width string with additional prefix to match
required width.
+ This function will fail if the input string is longer than the
+ requested length.
+
+ Type: fixedWidthString :: int -> string -> string
+
Example:
fixedWidthString 5 "0" (toString 15)
=> "00015"
@@ -468,7 +566,10 @@ rec {
strw = lib.stringLength str;
reqWidth = width - (lib.stringLength filler);
in
- assert strw <= width;
+ assert lib.assertMsg (strw <= width)
+ "fixedWidthString: requested string length (${
+ toString width}) must not be shorter than actual length (${
+ toString strw})";
if strw == width then str else filler + fixedWidthString reqWidth filler str;
/* Format a number adding leading zeroes up to fixed width.
@@ -499,12 +600,16 @@ rec {
=> false
*/
isStorePath = x:
- isCoercibleToString x
- && builtins.substring 0 1 (toString x) == "/"
- && dirOf (builtins.toPath x) == builtins.storeDir;
+ if isCoercibleToString x then
+ let str = toString x; in
+ builtins.substring 0 1 str == "/"
+ && dirOf str == builtins.storeDir
+ else
+ false;
+
+ /* Parse a string string as an int.
- /* Convert string to int
- Obviously, it is a bit hacky to use fromJSON that way.
+ Type: string -> int
Example:
toInt "1337"
@@ -514,17 +619,18 @@ rec {
toInt "3.14"
=> error: floating point JSON numbers are not supported
*/
+ # Obviously, it is a bit hacky to use fromJSON this way.
toInt = str:
let may_be_int = builtins.fromJSON str; in
if builtins.isInt may_be_int
then may_be_int
else throw "Could not convert ${str} to int.";
- /* Read a list of paths from `file', relative to the `rootPath'. Lines
- beginning with `#' are treated as comments and ignored. Whitespace
- is significant.
+ /* Read a list of paths from `file`, relative to the `rootPath`.
+ Lines beginning with `#` are treated as comments and ignored.
+ Whitespace is significant.
- NOTE: this function is not performant and should be avoided
+ NOTE: This function is not performant and should be avoided.
Example:
readPathsFromFile /prefix
@@ -537,16 +643,17 @@ rec {
*/
readPathsFromFile = rootPath: file:
let
- root = toString rootPath;
lines = lib.splitString "\n" (builtins.readFile file);
removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line));
relativePaths = removeComments lines;
- absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths;
+ absolutePaths = builtins.map (path: rootPath + "/${path}") relativePaths;
in
absolutePaths;
/* Read the contents of a file removing the trailing \n
+ Type: fileContents :: path -> string
+
Example:
$ echo "1.0" > ./version
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 5eacc9eb23e..0b3475fefb9 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -32,6 +32,7 @@ rec {
else if final.isUClibc then "uclibc"
else if final.isAndroid then "bionic"
else if final.isLinux /* default */ then "glibc"
+ else if final.isAvr then "avrlibc"
# TODO(@Ericson2314) think more about other operating systems
else "native/impure";
extensions = {
@@ -46,6 +47,25 @@ rec {
# Misc boolean options
useAndroidPrebuilt = false;
useiOSPrebuilt = false;
+
+ # Output from uname
+ uname = {
+ # uname -s
+ system = {
+ "linux" = "Linux";
+ "windows" = "Windows";
+ "darwin" = "Darwin";
+ "netbsd" = "NetBSD";
+ "freebsd" = "FreeBSD";
+ "openbsd" = "OpenBSD";
+ }.${final.parsed.kernel.name} or null;
+
+ # uname -p
+ processor = final.parsed.cpu.name;
+
+ # uname -r
+ release = null;
+ };
} // mapAttrs (n: v: v final.parsed) inspect.predicates
// args;
in assert final.useAndroidPrebuilt -> final.isAndroid;
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index a00165db171..58677c0bdd9 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -15,6 +15,8 @@ let
"x86_64-cygwin" "x86_64-darwin" "x86_64-freebsd" "x86_64-linux"
"x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
+
+ "x86_64-windows" "i686-windows"
];
allParsed = map parse.mkSystemFromString all;
@@ -37,12 +39,13 @@ in rec {
darwin = filterDoubles predicates.isDarwin;
freebsd = filterDoubles predicates.isFreeBSD;
# Should be better, but MinGW is unclear.
- gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; });
+ gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; });
illumos = filterDoubles predicates.isSunOS;
linux = filterDoubles predicates.isLinux;
netbsd = filterDoubles predicates.isNetBSD;
openbsd = filterDoubles predicates.isOpenBSD;
unix = filterDoubles predicates.isUnix;
+ windows = filterDoubles predicates.isWindows;
mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "powerpc64le-linux"];
}
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index c2ee829529d..a40c3892424 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -28,7 +28,7 @@ rec {
};
armv7l-hf-multiplatform = rec {
- config = "armv7a-unknown-linux-gnueabihf";
+ config = "armv7l-unknown-linux-gnueabihf";
platform = platforms.armv7l-hf-multiplatform;
};
@@ -99,6 +99,34 @@ rec {
riscv64 = riscv "64";
riscv32 = riscv "32";
+ avr = {
+ config = "avr";
+ };
+
+ arm-embedded = {
+ config = "arm-none-eabi";
+ libc = "newlib";
+ };
+
+ aarch64-embedded = {
+ config = "aarch64-none-elf";
+ libc = "newlib";
+ };
+
+ ppc-embedded = {
+ config = "powerpc-none-eabi";
+ libc = "newlib";
+ };
+
+ i686-embedded = {
+ config = "i686-elf";
+ libc = "newlib";
+ };
+
+ x86_64-embedded = {
+ config = "x86_64-elf";
+ libc = "newlib";
+ };
#
# Darwin
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 65f560328af..2fcf1afe462 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -19,6 +19,7 @@ rec {
isRiscV = { cpu = { family = "riscv"; }; };
isSparc = { cpu = { family = "sparc"; }; };
isWasm = { cpu = { family = "wasm"; }; };
+ isAvr = { cpu = { family = "avr"; }; };
is32bit = { cpu = { bits = 32; }; };
is64bit = { cpu = { bits = 64; }; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index bb26c93f3d7..db97a5c4b33 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -101,6 +101,8 @@ rec {
wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
+
+ avr = { bits = 8; family = "avr"; };
};
################################################################################
@@ -117,6 +119,7 @@ rec {
apple = {};
pc = {};
+ none = {};
unknown = {};
};
@@ -200,6 +203,7 @@ rec {
cygnus = {};
msvc = {};
eabi = {};
+ elf = {};
androideabi = {};
android = {
@@ -255,9 +259,16 @@ rec {
setType "system" components;
mkSkeletonFromList = l: {
+ "1" = if elemAt l 0 == "avr"
+ then { cpu = elemAt l 0; kernel = "none"; abi = "unknown"; }
+ else throw "Target specification with 1 components is ambiguous";
"2" = # We only do 2-part hacks for things Nix already supports
if elemAt l 1 == "cygwin"
then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; }
+ else if (elemAt l 1 == "eabi")
+ then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; }
+ else if (elemAt l 1 == "elf")
+ then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; }
else { cpu = elemAt l 0; kernel = elemAt l 1; };
"3" = # Awkwards hacks, beware!
if elemAt l 1 == "apple"
@@ -268,6 +279,10 @@ rec {
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; }
else if hasPrefix "netbsd" (elemAt l 2)
then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
+ else if (elemAt l 2 == "eabi")
+ then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; }
+ else if (elemAt l 2 == "elf")
+ then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; }
else throw "Target specification with 3 components is ambiguous";
"4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
}.${toString (length l)}
diff --git a/lib/tests/check-eval.nix b/lib/tests/check-eval.nix
new file mode 100644
index 00000000000..8bd7b605a39
--- /dev/null
+++ b/lib/tests/check-eval.nix
@@ -0,0 +1,7 @@
+# Throws an error if any of our lib tests fail.
+
+let tests = [ "misc" "systems" ];
+ all = builtins.concatLists (map (f: import (./. + "/${f}.nix")) tests);
+in if all == []
+ then null
+ else throw (builtins.toJSON all)
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index cf99aca58c0..1604fbb39cb 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -112,7 +112,7 @@ runTests {
storePathAppendix = isStorePath
"${goodPath}/bin/python";
nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
- asPath = isStorePath (builtins.toPath goodPath);
+ asPath = isStorePath (/. + goodPath);
otherPath = isStorePath "/something/else";
otherVals = {
attrset = isStorePath {};
@@ -236,6 +236,20 @@ runTests {
};
};
+ testOverrideExistingEmpty = {
+ expr = overrideExisting {} { a = 1; };
+ expected = {};
+ };
+
+ testOverrideExistingDisjoint = {
+ expr = overrideExisting { b = 2; } { a = 1; };
+ expected = { b = 2; };
+ };
+
+ testOverrideExistingOverride = {
+ expr = overrideExisting { a = 3; b = 2; } { a = 1; };
+ expected = { a = 1; b = 2; };
+ };
# GENERATORS
# these tests assume attributes are converted to lists
@@ -355,9 +369,10 @@ runTests {
testToPretty = {
expr = mapAttrs (const (generators.toPretty {})) rec {
int = 42;
+ float = 0.1337;
bool = true;
string = ''fno"rd'';
- path = /. + "/foo"; # toPath returns a string
+ path = /. + "/foo";
null_ = null;
function = x: x;
functionArgs = { arg ? 4, foo }: arg;
@@ -367,6 +382,7 @@ runTests {
};
expected = rec {
int = "42";
+ float = "~0.133700";
bool = "true";
string = ''"fno\"rd"'';
path = "/foo";
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index 91604280e4e..5e129365821 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -12,20 +12,21 @@ let
expected = lib.sort lib.lessThan y;
};
in with lib.systems.doubles; lib.runTests {
- all = assertTrue (mseteq all (linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
+ testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ windows);
- arm = assertTrue (mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ]);
- i686 = assertTrue (mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" ]);
- mips = assertTrue (mseteq mips [ "mipsel-linux" ]);
- x86_64 = assertTrue (mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" ]);
+ testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
+ testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" ];
+ testmips = mseteq mips [ "mipsel-linux" ];
+ testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" ];
- cygwin = assertTrue (mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ]);
- darwin = assertTrue (mseteq darwin [ "x86_64-darwin" ]);
- freebsd = assertTrue (mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ]);
- gnu = assertTrue (mseteq gnu (linux /* ++ kfreebsd ++ ... */));
- illumos = assertTrue (mseteq illumos [ "x86_64-solaris" ]);
- linux = assertTrue (mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ]);
- netbsd = assertTrue (mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]);
- openbsd = assertTrue (mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]);
- unix = assertTrue (mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos));
+ testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
+ testdarwin = mseteq darwin [ "x86_64-darwin" ];
+ testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
+ testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
+ testillumos = mseteq illumos [ "x86_64-solaris" ];
+ testlinux = mseteq linux [ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mipsel-linux" ];
+ testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ];
+ testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ];
+ testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ];
+ testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin);
}
diff --git a/lib/trivial.nix b/lib/trivial.nix
index b75e81eb735..e31cf73d27c 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -9,23 +9,37 @@ rec {
Type: id :: a -> a
*/
- id = x: x;
+ id =
+ # The value to return
+ x: x;
/* The constant function
- Ignores the second argument.
- Or: Construct a function that always returns a static value.
+
+ Ignores the second argument. If called with only one argument,
+ constructs a function that always returns a static value.
Type: const :: a -> b -> a
Example:
let f = const 5; in f 10
=> 5
*/
- const = x: y: x;
+ const =
+ # Value to return
+ x:
+ # Value to ignore
+ y: x;
## Named versions corresponding to some builtin operators.
- /* Concatenate two lists */
+ /* Concatenate two lists
+
+ Type: concat :: [a] -> [a] -> [a]
+
+ Example:
+ concat [ 1 2 ] [ 3 4 ]
+ => [ 1 2 3 4 ]
+ */
concat = x: y: x ++ y;
/* boolean “or” */
@@ -36,44 +50,57 @@ rec {
/* bitwise “and” */
bitAnd = builtins.bitAnd
- or import ./zip-int-bits.nix
- (a: b: if a==1 && b==1 then 1 else 0);
+ or (import ./zip-int-bits.nix
+ (a: b: if a==1 && b==1 then 1 else 0));
/* bitwise “or” */
bitOr = builtins.bitOr
- or import ./zip-int-bits.nix
- (a: b: if a==1 || b==1 then 1 else 0);
+ or (import ./zip-int-bits.nix
+ (a: b: if a==1 || b==1 then 1 else 0));
/* bitwise “xor” */
bitXor = builtins.bitXor
- or import ./zip-int-bits.nix
- (a: b: if a!=b then 1 else 0);
+ or (import ./zip-int-bits.nix
+ (a: b: if a!=b then 1 else 0));
/* bitwise “not” */
bitNot = builtins.sub (-1);
/* Convert a boolean to a string.
- Note that toString on a bool returns "1" and "".
+
+ This function uses the strings "true" and "false" to represent
+ boolean values. Calling `toString` on a bool instead returns "1"
+ and "" (sic!).
+
+ Type: boolToString :: bool -> string
*/
boolToString = b: if b then "true" else "false";
/* Merge two attribute sets shallowly, right side trumps left
+ mergeAttrs :: attrs -> attrs -> attrs
+
Example:
mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; }
=> { a = 1; b = 3; c = 4; }
*/
- mergeAttrs = x: y: x // y;
+ mergeAttrs =
+ # Left attribute set
+ x:
+ # Right attribute set (higher precedence for equal keys)
+ y: x // y;
/* Flip the order of the arguments of a binary function.
+ Type: flip :: (a -> b -> c) -> (b -> a -> c)
+
Example:
flip concat [1] [2]
=> [ 2 1 ]
*/
flip = f: a: b: f b a;
- /* Apply function if argument is non-null.
+ /* Apply function if the supplied argument is non-null.
Example:
mapNullable (x: x+1) null
@@ -81,7 +108,11 @@ rec {
mapNullable (x: x+1) 22
=> 23
*/
- mapNullable = f: a: if isNull a then a else f a;
+ mapNullable =
+ # Function to call
+ f:
+ # Argument to check for null before passing it to `f`
+ a: if isNull a then a else f a;
# Pull in some builtins not included elsewhere.
inherit (builtins)
@@ -92,29 +123,51 @@ rec {
## nixpks version strings
- # The current full nixpkgs version number.
+ /* Returns the current full nixpkgs version number. */
version = release + versionSuffix;
- # The current nixpkgs version number as string.
+ /* Returns the current nixpkgs release number as string. */
release = lib.strings.fileContents ../.version;
- # The current nixpkgs version suffix as string.
+ /* Returns the current nixpkgs version suffix as string. */
versionSuffix =
let suffixFile = ../.version-suffix;
in if pathExists suffixFile
then lib.strings.fileContents suffixFile
else "pre-git";
+ /* Attempts to return the the current revision of nixpkgs and
+ returns the supplied default value otherwise.
+
+ Type: revisionWithDefault :: string -> string
+ */
+ revisionWithDefault =
+ # Default value to return if revision can not be determined
+ default:
+ let
+ revisionFile = "${toString ./..}/.git-revision";
+ gitRepo = "${toString ./..}/.git";
+ in if lib.pathIsDirectory gitRepo
+ then lib.commitIdFromGitRepo gitRepo
+ else if lib.pathExists revisionFile then lib.fileContents revisionFile
+ else default;
+
nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
- # Whether we're being called by nix-shell.
+ /* Determine whether the function is being called from inside a Nix
+ shell.
+
+ Type: inNixShell :: bool
+ */
inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";
## Integer operations
- # Return minimum/maximum of two numbers.
+ /* Return minimum of two numbers. */
min = x: y: if x < y then x else y;
+
+ /* Return maximum of two numbers. */
max = x: y: if x > y then x else y;
/* Integer modulus
@@ -148,8 +201,9 @@ rec {
second subtype, compare elements of a single subtype with `yes`
and `no` respectively.
- Example:
+ Type: (a -> bool) -> (a -> a -> int) -> (a -> a -> int) -> (a -> a -> int)
+ Example:
let cmp = splitByAndCompare (hasPrefix "foo") compare compare; in
cmp "a" "z" => -1
@@ -160,31 +214,44 @@ rec {
# while
compare "fooa" "a" => 1
*/
- splitByAndCompare = p: yes: no: a: b:
+ splitByAndCompare =
+ # Predicate
+ p:
+ # Comparison function if predicate holds for both values
+ yes:
+ # Comparison function if predicate holds for neither value
+ no:
+ # First value to compare
+ a:
+ # Second value to compare
+ b:
if p a
then if p b then yes a b else -1
else if p b then 1 else no a b;
- /* Reads a JSON file. */
+ /* Reads a JSON file.
+
+ Type :: path -> any
+ */
importJSON = path:
builtins.fromJSON (builtins.readFile path);
- ## Warnings and asserts
+ ## Warnings
- /* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
- to expand to Nix builtins that carry metadata so that Nix can filter out
- the INFO messages without parsing the message string.
+ # See https://github.com/NixOS/nix/issues/749. Eventually we'd like these
+ # to expand to Nix builtins that carry metadata so that Nix can filter out
+ # the INFO messages without parsing the message string.
+ #
+ # Usage:
+ # {
+ # foo = lib.warn "foo is deprecated" oldFoo;
+ # }
+ #
+ # TODO: figure out a clever way to integrate location information from
+ # something like __unsafeGetAttrPos.
- Usage:
- {
- foo = lib.warn "foo is deprecated" oldFoo;
- }
-
- TODO: figure out a clever way to integrate location information from
- something like __unsafeGetAttrPos.
- */
warn = msg: builtins.trace "WARNING: ${msg}";
info = msg: builtins.trace "INFO: ${msg}";
diff --git a/lib/types.nix b/lib/types.nix
index 4d6ac51c898..ca6794e274c 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -119,7 +119,9 @@ rec {
let
betweenDesc = lowest: highest:
"${toString lowest} and ${toString highest} (both inclusive)";
- between = lowest: highest: assert lowest <= highest;
+ between = lowest: highest:
+ assert lib.assertMsg (lowest <= highest)
+ "ints.between: lowest must be smaller than highest";
addCheck int (x: x >= lowest && x <= highest) // {
name = "intBetween";
description = "integer between ${betweenDesc lowest highest}";
@@ -192,7 +194,10 @@ rec {
# separator between the values).
separatedString = sep: mkOptionType rec {
name = "separatedString";
- description = "string";
+ description = if sep == ""
+ then "Concatenated string" # for types.string.
+ else "strings concatenated with ${builtins.toJSON sep}"
+ ;
check = isString;
merge = loc: defs: concatStringsSep sep (getValues defs);
functor = (defaultFunctor name) // {
@@ -439,7 +444,9 @@ rec {
# Either value of type `finalType` or `coercedType`, the latter is
# converted to `finalType` using `coerceFunc`.
coercedTo = coercedType: coerceFunc: finalType:
- assert coercedType.getSubModules == null;
+ assert lib.assertMsg (coercedType.getSubModules == null)
+ "coercedTo: coercedType must not have submodules (it’s a ${
+ coercedType.description})";
mkOptionType rec {
name = "coercedTo";
description = "${finalType.description} or ${coercedType.description} convertible to it";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6356c0c7cef..62c62ac5123 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18,6 +18,11 @@
for an example on how to work with this data.
*/
{
+ "1000101" = {
+ email = "jan.hrnko@satoshilabs.com";
+ github = "1000101";
+ name = "Jan Hrnko";
+ };
a1russell = {
email = "adamlr6+pub@gmail.com";
github = "a1russell";
@@ -138,6 +143,11 @@
github = "ahmedtd";
name = "Taahir Ahmed";
};
+ ahuzik = {
+ email = "ales.guzik@gmail.com";
+ github = "alesguzik";
+ name = "Ales Huzik";
+ };
aij = {
email = "aij+git@mrph.org";
github = "aij";
@@ -153,6 +163,11 @@
github = "alexanderkjeldaas";
name = "Alexander Kjeldaas";
};
+ akavel = {
+ email = "czapkofan@gmail.com";
+ github = "akavel";
+ name = "Mateusz Czapliński";
+ };
akaWolf = {
email = "akawolf0@gmail.com";
github = "akaWolf";
@@ -216,6 +231,11 @@
github = "amiloradovsky";
name = "Andrew Miloradovsky";
};
+ aminb = {
+ email = "amin@aminb.org";
+ github = "aminb";
+ name = "Amin Bandali";
+ };
aminechikhaoui = {
email = "amine.chikhaoui91@gmail.com";
github = "AmineChikhaoui";
@@ -227,7 +247,7 @@
name = "Andrew Morsillo";
};
AndersonTorres = {
- email = "torres.anderson.85@gmail.com";
+ email = "torres.anderson.85@protonmail.com";
github = "AndersonTorres";
name = "Anderson Torres";
};
@@ -376,6 +396,16 @@
github = "auntie";
name = "Jonathan Glines";
};
+ avaq = {
+ email = "avaq+nixos@xs4all.nl";
+ github = "avaq";
+ name = "Aldwin Vlasblom";
+ };
+ avery = {
+ email = "averyl+nixos@protonmail.com";
+ github = "AveryLychee";
+ name = "Avery Lychee";
+ };
avnik = {
email = "avn@avnik.info";
github = "avnik";
@@ -470,6 +500,11 @@
github = "bennofs";
name = "Benno Fünfstück";
};
+ benpye = {
+ email = "ben@curlybracket.co.uk";
+ github = "benpye";
+ name = "Ben Pye";
+ };
benwbooth = {
email = "benwbooth@gmail.com";
github = "benwbooth";
@@ -500,6 +535,11 @@
github = "bgamari";
name = "Ben Gamari";
};
+ bhall = {
+ email = "brendan.j.hall@bath.edu";
+ github = "brendan-hall";
+ name = "Brendan Hall";
+ };
bhipple = {
email = "bhipple@protonmail.com";
github = "bhipple";
@@ -678,6 +718,11 @@
github = "Chaddai";
name = "Chaddaï Fouché";
};
+ chaduffy = {
+ email = "charles@dyfis.net";
+ github = "charles-dyfis-net";
+ name = "Charles Duffy";
+ };
changlinli = {
email = "mail@changlinli.com";
github = "changlinli";
@@ -956,6 +1001,11 @@
github = "deepfire";
name = "Kosyrev Serge";
};
+ delroth = {
+ email = "delroth@gmail.com";
+ github = "delroth";
+ name = "Pierre Bourdon";
+ };
deltaevo = {
email = "deltaduartedavid@gmail.com";
github = "DeltaEvo";
@@ -1110,6 +1160,11 @@
github = "dtzWill";
name = "Will Dietz";
};
+ dysinger = {
+ email = "tim@dysinger.net";
+ github = "dysinger";
+ name = "Tim Dysinger";
+ };
dywedir = {
email = "dywedir@protonmail.ch";
github = "dywedir";
@@ -1165,6 +1220,11 @@
github = "eduarrrd";
name = "Eduard Bachmakov";
};
+ edude03 = {
+ email = "michael@melenion.com";
+ github = "edude03";
+ name = "Michael Francis";
+ };
edwtjo = {
email = "ed@cflags.cc";
github = "edwtjo";
@@ -1307,6 +1367,11 @@
github = "etu";
name = "Elis Hirwing";
};
+ evck = {
+ email = "eric@evenchick.com";
+ github = "ericevenchick";
+ name = "Eric Evenchick";
+ };
exfalso = {
email = "0slemi0@gmail.com";
github = "exfalso";
@@ -1327,6 +1392,11 @@
github = "expipiplus1";
name = "Joe Hermaszewski";
};
+ f--t = {
+ email = "git@f-t.me";
+ github = "f--t";
+ name = "f--t";
+ };
f-breidenstein = {
email = "mail@felixbreidenstein.de";
github = "f-breidenstein";
@@ -1610,6 +1680,11 @@
github = "hamhut1066";
name = "Hamish Hutchings";
};
+ haslersn = {
+ email = "haslersn@fius.informatik.uni-stuttgart.de";
+ github = "haslersn";
+ name = "Sebastian Hasler";
+ };
havvy = {
email = "ryan.havvy@gmail.com";
github = "havvy";
@@ -1832,6 +1907,11 @@
github = "jdagilliland";
name = "Jason Gilliland";
};
+ jdehaas = {
+ email = "qqlq@nullptr.club";
+ github = "jeroendehaas";
+ name = "Jeroen de Haas";
+ };
jefdaj = {
email = "jefdaj@gmail.com";
github = "jefdaj";
@@ -1847,6 +1927,16 @@
github = "jerith666";
name = "Matt McHenry";
};
+ jeschli = {
+ email = "jeschli@gmail.com";
+ github = "jeschli";
+ name = "Markus Hihn";
+ };
+ jethro = {
+ email = "jethrokuan95@gmail.com";
+ github = "jethrokuan";
+ name = "Jethro Kuan";
+ };
jfb = {
email = "james@yamtime.com";
github = "tftio";
@@ -2098,6 +2188,11 @@
github = "kiloreux";
name = "Kiloreux Emperex";
};
+ kimburgess = {
+ email = "kim@acaprojects.com";
+ github = "kimburgess";
+ name = "Kim Burgess";
+ };
kini = {
email = "keshav.kini@gmail.com";
github = "kini";
@@ -2154,6 +2249,11 @@
github = "krav";
name = "Kristoffer Thømt Ravneberg";
};
+ kroell = {
+ email = "nixosmainter@makroell.de";
+ github = "rokk4";
+ name = "Matthias Axel Kröll";
+ };
kristoff3r = {
email = "k.soeholm@gmail.com";
github = "kristoff3r";
@@ -2397,6 +2497,11 @@
github = "ma27";
name = "Maximilian Bosch";
};
+ ma9e = {
+ email = "sean@lfo.team";
+ github = "ma9e";
+ name = "Sean Haugh";
+ };
madjar = {
email = "georges.dubus@compiletoi.net";
github = "madjar";
@@ -2531,6 +2636,11 @@
github = "mdaiter";
name = "Matthew S. Daiter";
};
+ mdevlamynck = {
+ email = "matthias.devlamynck@mailoo.org";
+ github = "mdevlamynck";
+ name = "Matthias Devlamynck";
+ };
meditans = {
email = "meditans@gmail.com";
github = "meditans";
@@ -2808,6 +2918,11 @@
github = "muflax";
name = "Stefan Dorn";
};
+ mvnetbiz = {
+ email = "mvnetbiz@gmail.com";
+ github = "mvnetbiz";
+ name = "Matt Votava";
+ };
myrl = {
email = "myrl.0xf@gmail.com";
github = "myrl";
@@ -2862,6 +2977,11 @@
github = "nequissimus";
name = "Tim Steinbach";
};
+ nikitavoloboev = {
+ email = "nikita.voloboev@gmail.com";
+ github = "nikitavoloboev";
+ name = "Nikita Voloboev";
+ };
nfjinjing = {
email = "nfjinjing@gmail.com";
github = "nfjinjing";
@@ -2987,7 +3107,7 @@
name = "Oliver Dunkl";
};
offline = {
- email = "jakahudoklin@gmail.com";
+ email = "jaka@x-truder.net";
github = "offlinehacker";
name = "Jaka Hudoklin";
};
@@ -3015,6 +3135,11 @@
github = "olynch";
name = "Owen Lynch";
};
+ OPNA2608 = {
+ email = "christoph.neidahl@gmail.com";
+ github = "OPNA2608";
+ name = "Christoph Neidahl";
+ };
orbekk = {
email = "kjetil.orbekk@gmail.com";
github = "orbekk";
@@ -3050,6 +3175,16 @@
github = "oyren";
name = "Moritz Scheuren";
};
+ pacien = {
+ email = "b4gx3q.nixpkgs@pacien.net";
+ github = "pacien";
+ name = "Pacien Tran-Girard";
+ };
+ paddygord = {
+ email = "pgpatrickgordon@gmail.com";
+ github = "paddygord";
+ name = "Patrick Gordon";
+ };
paholg = {
email = "paho@paholg.com";
github = "paholg";
@@ -3224,6 +3359,11 @@
github = "pmyjavec";
name = "Pauly Myjavec";
};
+ pnelson = {
+ email = "me@pnelson.ca";
+ github = "pnelson";
+ name = "Philip Nelson";
+ };
pneumaticat = {
email = "kevin@potatofrom.space";
github = "pneumaticat";
@@ -3259,6 +3399,11 @@
github = "proglodyte";
name = "Proglodyte";
};
+ prusnak = {
+ email = "stick@gk2.sk";
+ github = "prusnak";
+ name = "Pavol Rusnak";
+ };
pshendry = {
email = "paul@pshendry.com";
github = "pshendry";
@@ -3396,6 +3541,11 @@
github = "relrod";
name = "Ricky Elrod";
};
+ renatoGarcia = {
+ email = "fgarcia.renato@gmail.com";
+ github = "renatoGarcia";
+ name = "Renato Garcia";
+ };
renzo = {
email = "renzocarbonara@gmail.com";
github = "k0001";
@@ -3506,6 +3656,11 @@
github = "roosemberth";
name = "Roosembert (Roosemberth) Palacios";
};
+ royneary = {
+ email = "christian@ulrich.earth";
+ github = "royneary";
+ name = "Christian Ulrich";
+ };
rprospero = {
email = "rprospero+nix@gmail.com";
github = "rprospero";
@@ -3888,6 +4043,11 @@
github = "StillerHarpo";
name = "Florian Engel";
};
+ stites = {
+ email = "sam@stites.io";
+ github = "stites";
+ name = "Sam Stites";
+ };
stumoss = {
email = "samoss@gmail.com";
github = "stumoss";
@@ -3953,6 +4113,11 @@
github = "sztupi";
name = "Attila Sztupak";
};
+ t184256 = {
+ email = "monk@unboiled.info";
+ github = "t184256";
+ name = "Alexander Sosedkin";
+ };
tadfisher = {
email = "tadfisher@gmail.com";
github = "tadfisher";
@@ -4008,11 +4173,6 @@
github = "tazjin";
name = "Vincent Ambo";
};
- TealG = {
- email = "~@Teal.Gr";
- github = "TealG";
- name = "Teal Gaure";
- };
teh = {
email = "tehunger@gmail.com";
github = "teh";
@@ -4153,6 +4313,11 @@
github = "tomsmeets";
name = "Tom Smeets";
};
+ toonn = {
+ email = "nnoot@toonn.io";
+ github = "toonn";
+ name = "Toon Nolten";
+ };
travisbhartwell = {
email = "nafai@travishartwell.net";
github = "travisbhartwell";
@@ -4237,6 +4402,11 @@
github = "uri-canva";
name = "Uri Baghin";
};
+ uskudnik = {
+ email = "urban.skudnik@gmail.com";
+ github = "uskudnik";
+ name = "Urban Skudnik";
+ };
utdemir = {
email = "me@utdemir.com";
github = "utdemir";
@@ -4381,6 +4551,11 @@
github = "vrthra";
name = "Rahul Gopinath";
};
+ vskilet = {
+ email = "victor@sene.ovh";
+ github = "vskilet";
+ name = "Victor SENE";
+ };
vyp = {
email = "elisp.vim@gmail.com";
github = "vyp";
@@ -4458,6 +4633,11 @@
github = "wucke13";
name = "Wucke";
};
+ wykurz = {
+ email = "wykurz@gmail.com";
+ github = "wykurz";
+ name = "Mateusz Wykurz";
+ };
wyvie = {
email = "elijahrum@gmail.com";
github = "wyvie";
@@ -4508,13 +4688,18 @@
github = "y0no";
name = "Yoann Ono";
};
+ yarny = {
+ email = "41838844+Yarny0@users.noreply.github.com";
+ github = "Yarny0";
+ name = "Yarny";
+ };
yarr = {
email = "savraz@gmail.com";
github = "Eternity-Yarr";
name = "Dmitry V.";
};
yegortimoshenko = {
- email = "yegortimoshenko@gmail.com";
+ email = "yegortimoshenko@riseup.net";
github = "yegortimoshenko";
name = "Yegor Timoshenko";
};
@@ -4563,6 +4748,11 @@
github = "maggesi";
name = "Marco Maggesi";
};
+ zachcoyle = {
+ email = "zach.coyle@gmail.com";
+ github = "zachcoyle";
+ name = "Zach Coyle";
+ };
zagy = {
email = "cz@flyingcircus.io";
github = "zagy";
diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
index 2e9adf70c39..b251a1f5e2c 100644
--- a/nixos/doc/manual/Makefile
+++ b/nixos/doc/manual/Makefile
@@ -4,7 +4,7 @@ all: manual-combined.xml format
.PHONY: debug
debug: generated manual-combined.xml
-manual-combined.xml: generated *.xml
+manual-combined.xml: generated *.xml **/*.xml
rm -f ./manual-combined.xml
nix-shell --packages xmloscopy \
--run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml"
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
index 4b977d1d82e..2ee8bfdd50f 100644
--- a/nixos/doc/manual/administration/container-networking.xml
+++ b/nixos/doc/manual/administration/container-networking.xml
@@ -52,4 +52,8 @@ $ ping -c1 10.233.4.2
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
+
+
+ You may need to restart your system for the changes to take effect.
+
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index 2a98fb12623..d03dbc4d705 100644
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@@ -15,7 +15,7 @@ containers.database =
{ config =
{ config, pkgs, ... }:
{ = true;
- = pkgs.postgresql96;
+ = pkgs.postgresql_9_6;
};
};
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 8a1a39c98c1..c77cfe137ba 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -197,10 +197,10 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
pkgs.emacs
];
- = pkgs.postgresql90;
+ = pkgs.postgresql_10;
The latter option definition changes the default PostgreSQL package used
- by NixOS’s PostgreSQL service to 9.0. For more information on packages,
+ by NixOS’s PostgreSQL service to 10.x. For more information on packages,
including how to add new ones, see .
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index b66adcedce6..47a19ac82c0 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -34,13 +34,4 @@
Similarly, UDP port ranges can be opened through
.
-
-
- Also of interest is
-
- = true;
-
- to allow the machine to respond to ping requests. (ICMPv6 pings are always
- allowed.)
-
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
index 2f766f2b32f..644d3a33ffd 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -84,18 +84,17 @@ nixpkgs.config.packageOverrides = pkgs:
allowImportFromDerivation = true;
};
]]>
-
-You can edit the config with this snippet (by default make menuconfig won't work
- out of the box on nixos):
- make
+ menuconfig won't work out of the box on nixos):
+ {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})'
]]>
-
-
- or you can let nixpkgs generate the configuration.
- Nixpkgs generates it via answering the interactive kernel utility make config.
- The answers depend on parameters passed to pkgs/os-specific/linux/kernel/generic.nix
- (which you can influence by overriding extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig).
+ or you can let nixpkgs generate the configuration. Nixpkgs generates it via
+ answering the interactive kernel utility make config. The
+ answers depend on parameters passed to
+ pkgs/os-specific/linux/kernel/generic.nix (which you
+ can influence by overriding extraConfig, autoModules,
+ modDirVersion, preferBuiltin, extraConfig).
> $out/nix-support/hydra-build-products
''; # */
+ # Alias for backward compatibility. TODO(@oxij): remove eventually.
+ manual = manualHTML;
+
+ # Index page of the NixOS manual.
+ manualHTMLIndex = "${manualHTML}/share/doc/nixos/index.html";
manualEpub = runCommand "nixos-manual-epub"
{ inherit sources;
diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml
index eaffc0ef47c..b4791b72970 100644
--- a/nixos/doc/manual/development/building-parts.xml
+++ b/nixos/doc/manual/development/building-parts.xml
@@ -34,7 +34,7 @@ $ nix-build -A system
- system.build.manual.manual
+ system.build.manual.manualHTML
diff --git a/nixos/doc/manual/development/debugging-nixos-tests.xml b/nixos/doc/manual/development/debugging-nixos-tests.xml
new file mode 100644
index 00000000000..30e58e1e355
--- /dev/null
+++ b/nixos/doc/manual/development/debugging-nixos-tests.xml
@@ -0,0 +1,37 @@
+
+ Debugging NixOS tests
+
+
+ Tests may fail and infrastructure offers access to inspect machine state.
+
+
+
+ To prevent test from stopping and cleaning up, insert a sleep command:
+
+
+
+$machine->succeed("sleep 84000");
+
+
+
+ As soon as machine starts run as root:
+
+
+
+nix-shell -p socat --run "socat STDIO,raw,echo=0,escape=0x11 UNIX:/tmp/nix-build-vm-test-run-*.drv-0/vm-state-machine/backdoor"
+
+
+
+ You may need to find the correct path, replacing /tmp,
+ * or machine.
+
+
+
+ Press "enter" to open up console and login as "root". After you're done,
+ press "ctrl-q" to exit the console.
+
+
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
index 2695082e386..d068887200a 100644
--- a/nixos/doc/manual/development/nixos-tests.xml
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -16,4 +16,5 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test
+
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index 862b364a6d7..b25d3dcb911 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
@@ -19,6 +19,7 @@ starting VDE switch for network 1
> startAll
> testScript
> $machine->succeed("touch /tmp/foo")
+> print($machine->succeed("pwd"), "\n") # Show stdout of command
The function testScript executes the entire test script
and drops you back into the test driver command line upon its completion.
@@ -33,8 +34,11 @@ $ nix-build nixos/tests/login.nix -A driver
$ ./result/bin/nixos-run-vms
The script nixos-run-vms starts the virtual machines
- defined by test. The root file system of the VMs is created on the fly and
- kept across VM restarts in
- ./hostname.qcow2.
+ defined by test.
+
+
+
+ The machine state is kept across VM restarts in
+ /tmp/vm-state-machinename.
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index 5935fbc049b..983f8f9cbe3 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -108,7 +108,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualis
$machine->start;
$machine->waitForUnit("default.target");
-$machine->succeed("uname") =~ /Linux/;
+die unless $machine->succeed("uname") =~ /Linux/;
The first line is actually unnecessary; machines are implicitly started when
you first execute an action on them (such as waitForUnit
diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
index c59d073c61c..8f9baff44b5 100644
--- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml
+++ b/nixos/doc/manual/installation/installing-behind-a-proxy.xml
@@ -5,28 +5,29 @@
xml:id="sec-installing-behind-proxy">
Installing behind a proxy
-
+
To install NixOS behind a proxy, do the following before running
nixos-install.
-
-
+
+
+
-
- Update proxy configuration in
- /mnt/etc/nixos/configuration.nix to keep the
- internet accessible after reboot.
-
-
+
+ Update proxy configuration in
+ /mnt/etc/nixos/configuration.nix to keep the internet
+ accessible after reboot.
+
+
networking.proxy.default = "http://user:password@proxy:port/";
networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
- Setup the proxy environment variables in the shell where you are
- running nixos-install.
-
-
+
+ Setup the proxy environment variables in the shell where you are running
+ nixos-install.
+
+
# proxy_url="http://user:password@proxy:port/"
# export http_proxy="$proxy_url"
# export HTTP_PROXY="$proxy_url"
@@ -34,14 +35,14 @@ networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# export HTTPS_PROXY="$proxy_url"
-
+
-
-
- If you are switching networks with different proxy configurations, use the
- nesting.clone option in
- configuration.nix to switch proxies at runtime.
- Refer to for more information.
-
-
+
+
+ If you are switching networks with different proxy configurations, use the
+ nesting.clone option in
+ configuration.nix to switch proxies at runtime. Refer to
+ for more information.
+
+
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index c5934111749..0b311189430 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -9,13 +9,12 @@
For systems without CD drive, the NixOS live CD can be booted from a USB
stick. You can use the dd utility to write the image:
dd if=path-to-image
- of=/dev/sdb. Be careful about specifying
+ of=/dev/sdX. Be careful about specifying
the correct drive; you can use the lsblk command to get a
list of block devices.
-
-
-
- On macOS:
+
+ On macOS
+
$ diskutil list
[..]
@@ -26,43 +25,16 @@ $ diskutil unmountDisk diskN
Unmount of all volumes on diskN was successful
$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
- Using the 'raw' rdiskN device instead of
- diskN completes in minutes instead of hours. After
- dd completes, a GUI dialog "The disk you inserted was not
- readable by this computer" will pop up, which can be ignored.
+ Using the 'raw' rdiskN device instead of
+ diskN completes in minutes instead of hours. After
+ dd completes, a GUI dialog "The disk you inserted was
+ not readable by this computer" will pop up, which can be ignored.
+
+
The dd utility will write the image verbatim to the drive,
making it the recommended option for both UEFI and non-UEFI installations.
- For non-UEFI installations, you can alternatively use
- unetbootin. If
- you cannot use dd for a UEFI installation, you can also
- mount the ISO, copy its contents verbatim to your drive, then either:
-
-
-
- Change the label of the disk partition to the label of the ISO (visible
- with the blkid command), or
-
-
-
-
- Edit loader/entries/nixos-livecd.conf on the drive
- and change the root= field in the
- options line to point to your drive (see the
- documentation on root= in
-
- the kernel documentation for more details).
-
-
-
-
- If you want to load the contents of the ISO to ram after bootin (So you
- can remove the stick after bootup) you can append the parameter
- copytoram to the options field.
-
-
-
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 916384559e2..8e94f946c5e 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -4,60 +4,46 @@
version="5.0"
xml:id="sec-installation">
Installing NixOS
-
- NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
- installation is by and large the same as a BIOS installation. The differences
- are mentioned in the steps that follow.
-
-
-
-
- Boot from the CD.
-
-
-
-
- UEFI systems
-
-
-
- You should boot the live CD in UEFI mode (consult your specific
- hardware's documentation for instructions). You may find the
- rEFInd boot
- manager useful.
-
-
-
-
-
-
-
- The CD contains a basic NixOS installation. (It also contains Memtest86+,
- useful if you want to test new hardware). When it’s finished booting, it
- should have detected most of your hardware.
-
-
-
-
- The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
- or by running nixos-help.
-
-
-
-
- You get logged in as root (with empty password).
-
-
-
-
- If you downloaded the graphical ISO image, you can run systemctl
- start display-manager to start KDE. If you want to continue on
- the terminal, you can use loadkeys to switch to your
- preferred keyboard layout. (We even provide neo2 via loadkeys de
- neo!)
-
-
-
+
+ Booting the system
+
+
+ NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
+ installation is by and large the same as a BIOS installation. The
+ differences are mentioned in the steps that follow.
+
+
+
+ The installation media can be burned to a CD, or now more commonly, "burned"
+ to a USB drive (see ).
+
+
+
+ The installation media contains a basic NixOS installation. When it’s
+ finished booting, it should have detected most of your hardware.
+
+
+
+ The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
+ or by running nixos-help.
+
+
+
+ You are logged-in automatically as root. (The
+ root user account has an empty password.)
+
+
+
+ If you downloaded the graphical ISO image, you can run systemctl
+ start display-manager to start KDE. If you want to continue on the
+ terminal, you can use loadkeys to switch to your
+ preferred keyboard layout. (We even provide neo2 via loadkeys de
+ neo!)
+
+
+
+ Networking in the installer
+
The boot process should have brought up networking (check ip
a). Networking is necessary for the installer, since it will
@@ -65,58 +51,165 @@
binaries). It’s best if you have a DHCP server on your network. Otherwise
configure networking manually using ifconfig.
+
To manually configure the network on the graphical installer, first disable
network-manager with systemctl stop network-manager.
+
To manually configure the wifi on the minimal installer, run
wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID'
'key').
-
-
+
If you would like to continue the installation from a different machine you
need to activate the SSH daemon via systemctl start
sshd. In order to be able to login you also need to set a
password for root using passwd.
-
-
+
+
+
+ Partitioning and formatting
+
+
+ The NixOS installer doesn’t do any partitioning or formatting, so you need
+ to do that yourself.
+
+
+
+ The NixOS installer ships with multiple partitioning tools. The examples
+ below use parted, but also provides
+ fdisk, gdisk,
+ cfdisk, and cgdisk.
+
+
+
+ The recommended partition scheme differs depending if the computer uses
+ Legacy Boot or UEFI.
+
+
+
+ UEFI (GPT)
+
- The NixOS installer doesn’t do any partitioning or formatting yet, so you
- need to do that yourself. Use the following commands:
-
+ Here's an example partition scheme for UEFI, using
+ /dev/sda as the device.
+
+
+ You can safely ignore parted's informational message
+ about needing to update /etc/fstab.
+
+
+
+
+
+
- For partitioning: fdisk.
-
-# fdisk /dev/sda # (or whatever device you want to install on)
--- for UEFI systems only
-> n # (create a new partition for /boot)
-> 3 # (make it a partition number 3)
-> # (press enter to accept the default)
-> +512M # (the size of the UEFI boot partition)
-> t # (change the partition type ...)
-> 3 # (... of the boot partition ...)
-> 1 # (... to 'UEFI System')
--- for BIOS or UEFI systems
-> n # (create a new partition for /swap)
-> 2 # (make it a partition number 2)
-> # (press enter to accept the default)
-> +8G # (the size of the swap partition, set to whatever you like)
-> n # (create a new partition for /)
-> 1 # (make it a partition number 1)
-> # (press enter to accept the default)
-> # (press enter to accept the default and use the rest of the remaining space)
-> a # (make the partition bootable)
-> x # (enter expert mode)
-> f # (fix up the partition ordering)
-> r # (exit expert mode)
-> w # (write the partition table to disk and exit)
+ Create a GPT partition table.
+# parted /dev/sda -- mklabel gpt
+
+
+ Add the root partition. This will fill the disk
+ except for the end part, where the swap will live, and the space left in
+ front (512MiB) which will be used by the boot partition.
+# parted /dev/sda -- mkpart primary 512MiB -8GiB
+
+
+
+
+ Next, add a swap partition. The size required will
+ vary according to needs, here a 8GiB one is created.
+# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
+
+
+ The swap partition size rules are no different than for other Linux
+ distributions.
+
+
+
+
+
+
+ Finally, the boot partition. NixOS by default uses
+ the ESP (EFI system partition) as its /boot
+ partition. It uses the initially reserved 512MiB at the start of the
+ disk.
+# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
+# parted /dev/sda -- set 3 boot on
+
+
+
+
+
+
+ Once complete, you can follow with
+ .
+
+
+
+
+ Legacy Boot (MBR)
+
+
+ Here's an example partition scheme for Legacy Boot, using
+ /dev/sda as the device.
+
+
+ You can safely ignore parted's informational message
+ about needing to update /etc/fstab.
+
+
+
+
+
+
+
+
+ Create a MBR partition table.
+# parted /dev/sda -- mklabel msdos
+
+
+
+
+ Add the root partition. This will fill the the disk
+ except for the end part, where the swap will live.
+# parted /dev/sda -- mkpart primary 1MiB -8GiB
+
+
+
+
+ Finally, add a swap partition. The size required
+ will vary according to needs, here a 8GiB one is created.
+# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
+
+
+ The swap partition size rules are no different than for other Linux
+ distributions.
+
+
+
+
+
+
+
+
+ Once complete, you can follow with
+ .
+
+
+
+
+ Formatting
+
+
+ Use the following commands:
+
For initialising Ext4 partitions: mkfs.ext4. It is
@@ -169,242 +262,249 @@
-
-
-
- Mount the target file system on which NixOS should be installed on
- /mnt, e.g.
+
+
+
+ Installing
+
+
+
+
+ Mount the target file system on which NixOS should be installed on
+ /mnt, e.g.
# mount /dev/disk/by-label/nixos /mnt
-
-
-
-
-
-
- UEFI systems
-
-
-
- Mount the boot file system on /mnt/boot, e.g.
+
+
+
+
+
+
+ UEFI systems
+
+
+
+ Mount the boot file system on /mnt/boot, e.g.
# mkdir -p /mnt/boot
# mount /dev/disk/by-label/boot /mnt/boot
-
-
-
-
-
-
-
- If your machine has a limited amount of memory, you may want to activate
- swap devices now (swapon
- device). The installer (or rather, the
- build actions that it may spawn) may need quite a bit of RAM, depending on
- your configuration.
+
+
+
+
+
+
+
+ If your machine has a limited amount of memory, you may want to activate
+ swap devices now (swapon
+ device). The installer (or rather,
+ the build actions that it may spawn) may need quite a bit of RAM,
+ depending on your configuration.
# swapon /dev/sda2
-
-
-
-
- You now need to create a file
- /mnt/etc/nixos/configuration.nix that specifies the
- intended configuration of the system. This is because NixOS has a
- declarative configuration model: you create or edit a
- description of the desired configuration of your system, and then NixOS
- takes care of making it happen. The syntax of the NixOS configuration file
- is described in , while a list of
- available configuration options appears in
-
+
+
+
+ You now need to create a file
+ /mnt/etc/nixos/configuration.nix that specifies the
+ intended configuration of the system. This is because NixOS has a
+ declarative configuration model: you create or edit a
+ description of the desired configuration of your system, and then NixOS
+ takes care of making it happen. The syntax of the NixOS configuration file
+ is described in , while a list
+ of available configuration options appears in
+ . A minimal example is shown in
- .
-
-
- The command nixos-generate-config can generate an
- initial configuration file for you:
+
+
+ The command nixos-generate-config can generate an
+ initial configuration file for you:
# nixos-generate-config --root /mnt
- You should then edit /mnt/etc/nixos/configuration.nix
- to suit your needs:
+ You should then edit /mnt/etc/nixos/configuration.nix
+ to suit your needs:
# nano /mnt/etc/nixos/configuration.nix
- If you’re using the graphical ISO image, other editors may be available
- (such as vim). If you have network access, you can also
- install other editors — for instance, you can install Emacs by running
- nix-env -i emacs.
-
-
-
-
- BIOS systems
-
-
-
- You must set the option
- to specify on which disk
- the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
-
-
-
-
-
- UEFI systems
-
-
-
- You must set the option
- to
- true. nixos-generate-config should
- do this automatically for new configurations when booted in UEFI mode.
-
-
- You may want to look at the options starting with
-
- and
-
- as well.
-
-
-
-
-
- If there are other operating systems running on the machine before
- installing NixOS, the
- option can be set to true to automatically add them to
- the grub menu.
-
-
- Another critical option is , specifying the
- file systems that need to be mounted by NixOS. However, you typically
- don’t need to set it yourself, because
- nixos-generate-config sets it automatically in
- /mnt/etc/nixos/hardware-configuration.nix from your
- currently mounted file systems. (The configuration file
- hardware-configuration.nix is included from
- configuration.nix and will be overwritten by future
- invocations of nixos-generate-config; thus, you
- generally should not modify it.)
-
-
+ If you’re using the graphical ISO image, other editors may be available
+ (such as vim). If you have network access, you can also
+ install other editors — for instance, you can install Emacs by running
+ nix-env -i emacs.
+
+
+
+
+ BIOS systems
+
+
+
+ You must set the option
+ to specify on which disk
+ the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
+
+
+
+
+
+ UEFI systems
+
+
+
+ You must set the option
+ to
+ true. nixos-generate-config
+ should do this automatically for new configurations when booted in UEFI
+ mode.
+
+
+ You may want to look at the options starting with
+
+ and
+
+ as well.
+
+
+
+
- Depending on your hardware configuration or type of file system, you may
- need to set the option to
- include the kernel modules that are necessary for mounting the root file
- system, otherwise the installed system will not be able to boot. (If this
- happens, boot from the CD again, mount the target file system on
- /mnt, fix
- /mnt/etc/nixos/configuration.nix and rerun
- nixos-install.) In most cases,
- nixos-generate-config will figure out the required
- modules.
+ If there are other operating systems running on the machine before
+ installing NixOS, the
+ option can be set to true to automatically add them to
+ the grub menu.
-
-
-
-
- Do the installation:
+
+ Another critical option is , specifying the
+ file systems that need to be mounted by NixOS. However, you typically
+ don’t need to set it yourself, because
+ nixos-generate-config sets it automatically in
+ /mnt/etc/nixos/hardware-configuration.nix from your
+ currently mounted file systems. (The configuration file
+ hardware-configuration.nix is included from
+ configuration.nix and will be overwritten by future
+ invocations of nixos-generate-config; thus, you
+ generally should not modify it.)
+
+
+
+ Depending on your hardware configuration or type of file system, you may
+ need to set the option to
+ include the kernel modules that are necessary for mounting the root file
+ system, otherwise the installed system will not be able to boot. (If this
+ happens, boot from the installation media again, mount the target file
+ system on /mnt, fix
+ /mnt/etc/nixos/configuration.nix and rerun
+ nixos-install.) In most cases,
+ nixos-generate-config will figure out the required
+ modules.
+
+
+
+
+
+ Do the installation:
# nixos-install
- Cross fingers. If this fails due to a temporary problem (such as a network
- issue while downloading binaries from the NixOS binary cache), you can just
- re-run nixos-install. Otherwise, fix your
- configuration.nix and then re-run
- nixos-install.
-
-
- As the last step, nixos-install will ask you to set the
- password for the root user, e.g.
+ Cross fingers. If this fails due to a temporary problem (such as a network
+ issue while downloading binaries from the NixOS binary cache), you can
+ just re-run nixos-install. Otherwise, fix your
+ configuration.nix and then re-run
+ nixos-install.
+
+
+ As the last step, nixos-install will ask you to set the
+ password for the root user, e.g.
setting root password...
Enter new UNIX password: ***
-Retype new UNIX password: ***
-
-
-
- For unattended installations, it is possible to use
- nixos-install --no-root-passwd
- in order to disable the password prompt entirely.
-
-
-
-
-
-
- If everything went well:
+Retype new UNIX password: ***
+
+
+ For unattended installations, it is possible to use
+ nixos-install --no-root-passwd in order to disable
+ the password prompt entirely.
+
+
+
+
+
+
+ If everything went well:
- # reboot
-
-
-
-
- You should now be able to boot into the installed NixOS. The GRUB boot menu
- shows a list of available configurations (initially
- just one). Every time you change the NixOS configuration (see
-
+
+
+
+
+ You should now be able to boot into the installed NixOS. The GRUB boot
+ menu shows a list of available configurations
+ (initially just one). Every time you change the NixOS configuration (see
+ Changing Configuration
- ), a new item is added to the menu. This allows you to easily roll back to
- a previous configuration if something goes wrong.
-
-
- You should log in and change the root password with
- passwd.
-
-
- You’ll probably want to create some user accounts as well, which can be
- done with useradd:
+ ), a new item is added to the menu. This allows you to easily roll back to
+ a previous configuration if something goes wrong.
+
+
+ You should log in and change the root password with
+ passwd.
+
+
+ You’ll probably want to create some user accounts as well, which can be
+ done with useradd:
$ useradd -c 'Eelco Dolstra' -m eelco
$ passwd eelco
-
-
- You may also want to install some software. For instance,
+
+
+ You may also want to install some software. For instance,
$ nix-env -qa \*
- shows what packages are available, and
+ shows what packages are available, and
$ nix-env -i w3m
- install the w3m browser.
-
-
-
-
- To summarise, shows a typical sequence
- of commands for installing NixOS on an empty hard drive (here
- /dev/sda). w3m browser.
+
+
+
+
+
+ Installation summary
+
+
+ To summarise, shows a typical
+ sequence of commands for installing NixOS on an empty hard drive (here
+ /dev/sda). shows a
- corresponding configuration Nix expression.
-
-
- Commands for Installing NixOS on <filename>/dev/sda</filename>
-
-# fdisk /dev/sda # (or whatever device you want to install on)
--- for UEFI systems only
-> n # (create a new partition for /boot)
-> 3 # (make it a partition number 3)
-> # (press enter to accept the default)
-> +512M # (the size of the UEFI boot partition)
-> t # (change the partition type ...)
-> 3 # (... of the boot partition ...)
-> 1 # (... to 'UEFI System')
--- for BIOS or UEFI systems
-> n # (create a new partition for /swap)
-> 2 # (make it a partition number 2)
-> # (press enter to accept the default)
-> +8G # (the size of the swap partition)
-> n # (create a new partition for /)
-> 1 # (make it a partition number 1)
-> # (press enter to accept the default)
-> # (press enter to accept the default and use the rest of the remaining space)
-> a # (make the partition bootable)
-> x # (enter expert mode)
-> f # (fix up the partition ordering)
-> r # (exit expert mode)
-> w # (write the partition table to disk and exit)
+ corresponding configuration Nix expression.
+
+
+
+ Example partition schemes for NixOS on <filename>/dev/sda</filename> (MBR)
+
+# parted /dev/sda -- mklabel msdos
+# parted /dev/sda -- mkpart primary 1MiB -8GiB
+# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
+
+
+
+ Example partition schemes for NixOS on <filename>/dev/sda</filename> (UEFI)
+
+# parted /dev/sda -- mklabel gpt
+# parted /dev/sda -- mkpart primary 512MiB -8GiB
+# parted /dev/sda -- mkpart primary linux-swap -8GiB 100%
+# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB
+# parted /dev/sda -- set 3 boot on
+
+
+
+ Commands for Installing NixOS on <filename>/dev/sda</filename>
+
+ With a partitioned disk.
+
# mkfs.ext4 -L nixos /dev/sda1
# mkswap -L swap /dev/sda2
# swapon /dev/sda2
@@ -416,9 +516,11 @@ $ nix-env -i w3m
# nano /mnt/etc/nixos/configuration.nix
# nixos-install
# reboot
-
-
- NixOS Configuration
+
+
+
+
+ NixOS Configuration
{ config, pkgs, ... }: {
imports = [
@@ -438,10 +540,19 @@ $ nix-env -i w3m
services.sshd.enable = true;
}
-
-
-
-
-
-
+
+
+
+ Additional installation notes
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 85e5082575d..69668b1d4bd 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -52,10 +52,13 @@
To see what channels are available, go to
- . (Note that the URIs of the
+ . (Note that the URIs of the
various channels redirect to a directory that contains the channel’s latest
- version and includes ISO images and VirtualBox appliances.)
+ version and includes ISO images and VirtualBox appliances.) Please note that
+ during the release process, channels that are not yet released will be
+ present here as well. See the Getting NixOS page
+ to find the newest
+ supported stable release.
When you first install NixOS, you’re automatically subscribed to the NixOS
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index a5efde32885..12f52e1997c 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -17,8 +17,8 @@
If you encounter problems, please report them on the
Discourse
- or on the Discourse or
+ on the
#nixos channel on Freenode. Bugs should be
reported in
diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 2038b0dff63..72ac89d4ff6 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -4,6 +4,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:nixos="tag:nixos.org"
xmlns="http://docbook.org/ns/docbook"
extension-element-prefixes="str"
>
@@ -30,10 +31,12 @@
-
-
-
+
+
+
+
+
diff --git a/nixos/doc/manual/postprocess-option-descriptions.xsl b/nixos/doc/manual/postprocess-option-descriptions.xsl
new file mode 100644
index 00000000000..1201c7612c2
--- /dev/null
+++ b/nixos/doc/manual/postprocess-option-descriptions.xsl
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 94f176186b6..a222bfa29d5 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -8,6 +8,7 @@
This section lists the release notes for each stable version of NixOS and
current unstable revision.
+
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 4eb2f9aa0a9..e500c9d6342 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -435,11 +435,11 @@ system.autoUpgrade.enable = true;
system.stateVersion = "14.12";
- The new option ensures that
- certain configuration changes that could break existing systems (such as
- the sshd host key setting) will maintain compatibility
- with the specified NixOS release. NixOps sets the state version of
- existing deployments automatically.
+ The new option ensures that certain
+ configuration changes that could break existing systems (such as the
+ sshd host key setting) will maintain compatibility with
+ the specified NixOS release. NixOps sets the state version of existing
+ deployments automatically.
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 92a7223e041..8715a05f508 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -3,7 +3,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-release-18.09">
- Release 18.09 (“Jellyfish”, 2018/09/??)
+ Release 18.09 (“Jellyfish”, 2018/10/05)
In addition to numerous new and upgraded packages, this release has the
- following highlights:
+ following notable updates:
-
- Support for wrapping binaries using firejail has been
- added through programs.firejail.wrappedBinaries.
-
-
- For example
-
+
+ End of support is planned for end of April 2019, handing over to 19.03.
+
+
+
+
+ Platform support: x86_64-linux and x86_64-darwin as always. Support for
+ aarch64-linux is as with the previous releases, not equivalent to the
+ x86-64-linux release, but with efforts to reach parity.
+
+
+
+
+ Nix has been updated to 2.1; see its
+ release
+ notes.
+
+
+
+
+ Core versions: linux: 4.14 LTS (unchanged), glibc: 2.26 → 2.27, gcc: 7
+ (unchanged), systemd: 237 → 239.
+
+
+
+
+ Desktop version changes: gnome: 3.26 → 3.28, (KDE) plasma-desktop: 5.12
+ → 5.13.
+
+
+
+
+
+ Notable changes and additions for 18.09 include:
+
+
+
+
+
+ Support for wrapping binaries using firejail has been
+ added through programs.firejail.wrappedBinaries.
+
+
+ For example
+
programs.firejail = {
enable = true;
@@ -35,9 +73,10 @@ programs.firejail = {
};
};
-
- This will place firefox and mpv binaries in the global path wrapped by firejail.
-
+
+ This will place firefox and mpv
+ binaries in the global path wrapped by firejail.
+
@@ -69,52 +108,355 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull'
New Services
- The following new services were added since the last release:
+ A curated selection of new services that were added since the last release:
- The services.cassandra module has been reworked and
- was rewritten from scratch. The service has succeeding tests for
- the versions 2.1, 2.2, 3.0 and 3.11 of Apache Cassandra.
+ The services.cassandra module has been reworked and was
+ rewritten from scratch. The service has succeeding tests for the versions
+ 2.1, 2.2, 3.0 and 3.11 of
+ Apache
+ Cassandra.
- There is a new services.foundationdb module for deploying
- FoundationDB clusters.
+ There is a new services.foundationdb module for
+ deploying
+ FoundationDB
+ clusters.
When enabled the iproute2 will copy the files expected
by ip route (e.g., rt_tables) in
- /run/iproute2. This allows to write aliases for
+ /etc/iproute2. This allows to write aliases for
routing tables for instance.
- services.strongswan-swanctl
- is a modern replacement for services.strongswan.
- You can use either one of them to setup IPsec VPNs but not both at the same time.
+ services.strongswan-swanctl is a modern replacement for
+ services.strongswan. You can use either one of them to
+ setup IPsec VPNs but not both at the same time.
- services.strongswan-swanctl uses the
- swanctl
- command which uses the modern
- vici
- Versatile IKE Configuration Interface.
- The deprecated ipsec command used in services.strongswan is using the legacy
- stroke configuration interface.
+ services.strongswan-swanctl uses the
+ swanctl
+ command which uses the modern
+ vici
+ Versatile IKE Configuration Interface. The deprecated
+ ipsec command used in
+ services.strongswan is using the legacy
+ stroke
+ configuration interface.
- The new services.elasticsearch-curator service
- periodically curates or manages, your Elasticsearch indices and snapshots.
+ The new services.elasticsearch-curator service
+ periodically curates or manages, your Elasticsearch indices and snapshots.
+
+
+
+
+
+ Every new services:
+
+
+
+
+
+ ./config/xdg/autostart.nix
+
+
+
+
+ ./config/xdg/icons.nix
+
+
+
+
+ ./config/xdg/menus.nix
+
+
+
+
+ ./config/xdg/mime.nix
+
+
+
+
+ ./hardware/brightnessctl.nix
+
+
+
+
+ ./hardware/onlykey.nix
+
+
+
+
+ ./hardware/video/uvcvideo/default.nix
+
+
+
+
+ ./misc/documentation.nix
+
+
+
+
+ ./programs/firejail.nix
+
+
+
+
+ ./programs/iftop.nix
+
+
+
+
+ ./programs/sedutil.nix
+
+
+
+
+ ./programs/singularity.nix
+
+
+
+
+ ./programs/xss-lock.nix
+
+
+
+
+ ./programs/zsh/zsh-autosuggestions.nix
+
+
+
+
+ ./services/admin/oxidized.nix
+
+
+
+
+ ./services/backup/duplicati.nix
+
+
+
+
+ ./services/backup/restic.nix
+
+
+
+
+ ./services/backup/restic-rest-server.nix
+
+
+
+
+ ./services/cluster/hadoop/default.nix
+
+
+
+
+ ./services/databases/aerospike.nix
+
+
+
+
+ ./services/databases/monetdb.nix
+
+
+
+
+ ./services/desktops/bamf.nix
+
+
+
+
+ ./services/desktops/flatpak.nix
+
+
+
+
+ ./services/desktops/zeitgeist.nix
+
+
+
+
+ ./services/development/bloop.nix
+
+
+
+
+ ./services/development/jupyter/default.nix
+
+
+
+
+ ./services/hardware/lcd.nix
+
+
+
+
+ ./services/hardware/undervolt.nix
+
+
+
+
+ ./services/misc/clipmenu.nix
+
+
+
+
+ ./services/misc/gitweb.nix
+
+
+
+
+ ./services/misc/serviio.nix
+
+
+
+
+ ./services/misc/safeeyes.nix
+
+
+
+
+ ./services/misc/sysprof.nix
+
+
+
+
+ ./services/misc/weechat.nix
+
+
+
+
+ ./services/monitoring/datadog-agent.nix
+
+
+
+
+ ./services/monitoring/incron.nix
+
+
+
+
+ ./services/networking/dnsdist.nix
+
+
+
+
+ ./services/networking/freeradius.nix
+
+
+
+
+ ./services/networking/hans.nix
+
+
+
+
+ ./services/networking/morty.nix
+
+
+
+
+ ./services/networking/ndppd.nix
+
+
+
+
+ ./services/networking/ocserv.nix
+
+
+
+
+ ./services/networking/owamp.nix
+
+
+
+
+ ./services/networking/quagga.nix
+
+
+
+
+ ./services/networking/shadowsocks.nix
+
+
+
+
+ ./services/networking/stubby.nix
+
+
+
+
+ ./services/networking/zeronet.nix
+
+
+
+
+ ./services/security/certmgr.nix
+
+
+
+
+ ./services/security/cfssl.nix
+
+
+
+
+ ./services/security/oauth2_proxy_nginx.nix
+
+
+
+
+ ./services/web-apps/virtlyst.nix
+
+
+
+
+ ./services/web-apps/youtrack.nix
+
+
+
+
+ ./services/web-servers/hitch/default.nix
+
+
+
+
+ ./services/web-servers/hydron.nix
+
+
+
+
+ ./services/web-servers/meguca.nix
+
+
+
+
+ ./services/web-servers/nginx/gitweb.nix
+
+
+
+
+ ./virtualisation/kvmgt.nix
+
+
+
+
+ ./virtualisation/qemu-guest-agent.nix
@@ -135,8 +477,50 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull'
- The deprecated services.cassandra module has
- seen a complete rewrite. (See above.)
+ Some licenses that were incorrectly not marked as unfree now are. This is
+ the case for:
+
+
+
+ cc-by-nc-sa-20: Creative Commons Attribution Non Commercial Share Alike
+ 2.0
+
+
+
+
+ cc-by-nc-sa-25: Creative Commons Attribution Non Commercial Share Alike
+ 2.5
+
+
+
+
+ cc-by-nc-sa-30: Creative Commons Attribution Non Commercial Share Alike
+ 3.0
+
+
+
+
+ cc-by-nc-sa-40: Creative Commons Attribution Non Commercial Share Alike
+ 4.0
+
+
+
+
+ cc-by-nd-30: Creative Commons Attribution-No Derivative Works v3.00
+
+
+
+
+ msrla: Microsoft Research License Agreement
+
+
+
+
+
+
+
+ The deprecated services.cassandra module has seen a
+ complete rewrite. (See above.)
@@ -186,41 +570,44 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull'
- services.munge now runs as user (and group) munge instead of root.
- Make sure the key file is accessible to the daemon.
+ services.munge now runs as user (and group)
+ munge instead of root. Make sure the key file is
+ accessible to the daemon.
- dockerTools.buildImage now uses null as default value for tag,
- which indicates that the nix output hash will be used as tag.
+ dockerTools.buildImage now uses null
+ as default value for tag, which indicates that the nix
+ output hash will be used as tag.
- The ELK stack: elasticsearch, logstash and kibana
- has been upgraded from 2.* to 6.3.*.
- The 2.* versions have been unsupported since last year
- so they have been removed. You can still use the 5.* versions under the names
- elasticsearch5, logstash5 and
- kibana5.
+ The ELK stack: elasticsearch,
+ logstash and kibana has been
+ upgraded from 2.* to 6.3.*. The 2.* versions have been
+ unsupported since
+ last year so they have been removed. You can still use the 5.*
+ versions under the names elasticsearch5,
+ logstash5 and kibana5.
- The elastic beats:
- filebeat, heartbeat,
- metricbeat and packetbeat
- have had the same treatment: they now target 6.3.* as well.
- The 5.* versions are available under the names:
+ The elastic beats: filebeat,
+ heartbeat, metricbeat and
+ packetbeat have had the same treatment: they now target
+ 6.3.* as well. The 5.* versions are available under the names:
filebeat5, heartbeat5,
metricbeat5 and packetbeat5
The ELK-6.3 stack now comes with
- X-Pack by default.
- Since X-Pack is licensed under the
- Elastic License
- the ELK packages now have an unfree license. To use them you need to specify
- allowUnfree = true; in your nixpkgs configuration.
+ X-Pack by
+ default. Since X-Pack is licensed under the
+ Elastic
+ License the ELK packages now have an unfree license. To use them
+ you need to specify allowUnfree = true; in your nixpkgs
+ configuration.
Fortunately there is also a free variant of the ELK stack without X-Pack.
@@ -231,20 +618,28 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull'
- Options
- boot.initrd.luks.devices.name.yubikey.ramfsMountPoint
- boot.initrd.luks.devices.name.yubikey.storage.mountPoint
- were removed. luksroot.nix module never supported more than one YubiKey at
- a time anyway, hence those options never had any effect. You should be able to remove them
- from your config without any issues.
+ Options
+ boot.initrd.luks.devices.name.yubikey.ramfsMountPoint
+ boot.initrd.luks.devices.name.yubikey.storage.mountPoint
+ were removed. luksroot.nix module never supported more
+ than one YubiKey at a time anyway, hence those options never had any
+ effect. You should be able to remove them from your config without any
+ issues.
+
+
+
+
+ stdenv.system and system in nixpkgs
+ now refer to the host platform instead of the build platform. For native
+ builds this is not change, let alone a breaking one. For cross builds, it
+ is a breaking change, and stdenv.buildPlatform.system
+ can be used instead for the old behavior. They should be using that
+ anyways for clarity.
- stdenv.system and system in nixpkgs now refer to the host platform instead of the build platform.
- For native builds this is not change, let alone a breaking one.
- For cross builds, it is a breaking change, and stdenv.buildPlatform.system can be used instead for the old behavior.
- They should be using that anyways for clarity.
+ Groups kvm and render are introduced now, as systemd requires them.
@@ -298,26 +693,33 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull'
- The pkgs argument to NixOS modules can now be set directly using nixpkgs.pkgs. Previously, only the system, config and overlays arguments could be used to influence pkgs.
+ The pkgs argument to NixOS modules can now be set
+ directly using nixpkgs.pkgs. Previously, only the
+ system, config and
+ overlays arguments could be used to influence
+ pkgs.
- A NixOS system can now be constructed more easily based on a preexisting invocation of Nixpkgs. For example:
-
+ A NixOS system can now be constructed more easily based on a preexisting
+ invocation of Nixpkgs. For example:
+
inherit (pkgs.nixos {
boot.loader.grub.enable = false;
fileSystems."/".device = "/dev/xvda1";
}) toplevel kernel initialRamdisk manual;
-
- This benefits evaluation performance, lets you write Nixpkgs packages that depend on NixOS images and is consistent with a deployment architecture that would be centered around Nixpkgs overlays.
+ This benefits evaluation performance, lets you write Nixpkgs packages that
+ depend on NixOS images and is consistent with a deployment architecture
+ that would be centered around Nixpkgs overlays.
- lib.traceValIfNot has been deprecated. Use
- if/then/else and lib.traceValSeq instead.
+ lib.traceValIfNot has been deprecated. Use
+ if/then/else and lib.traceValSeq
+ instead.
@@ -336,9 +738,9 @@ inherit (pkgs.nixos {
- lib.recursiveUpdateUntil was not acting according to its
- specification. It has been fixed to act according to the docstring, and a
- test has been added.
+ lib.recursiveUpdateUntil was not acting according to
+ its specification. It has been fixed to act according to the docstring,
+ and a test has been added.
@@ -408,11 +810,11 @@ inherit (pkgs.nixos {
-
- The Kubernetes package has been bumped to major version 1.11.
- Please consult the
- release notes
- for details on new features and api changes.
+
+ The Kubernetes package has been bumped to major version 1.11. Please
+ consult the
+ release
+ notes for details on new features and api changes.
@@ -432,8 +834,8 @@ inherit (pkgs.nixos {
- The option services.kubernetes.apiserver.address
- was renamed to services.kubernetes.apiserver.bindAddress.
+ The option services.kubernetes.apiserver.address was
+ renamed to services.kubernetes.apiserver.bindAddress.
Note that the default value has changed from 127.0.0.1 to 0.0.0.0.
@@ -445,76 +847,86 @@ inherit (pkgs.nixos {
- The option services.kubernetes.addons.dashboard.enableRBAC
- was renamed to services.kubernetes.addons.dashboard.rbac.enable.
+ The option
+ services.kubernetes.addons.dashboard.enableRBAC was
+ renamed to
+ services.kubernetes.addons.dashboard.rbac.enable.
The Kubernetes Dashboard now has only minimal RBAC permissions by default.
- If dashboard cluster-admin rights are desired,
- set services.kubernetes.addons.dashboard.rbac.clusterAdmin to true.
- On existing clusters, in order for the revocation of privileges to take effect,
- the current ClusterRoleBinding for kubernetes-dashboard must be manually removed:
- kubectl delete clusterrolebinding kubernetes-dashboard
+ If dashboard cluster-admin rights are desired, set
+ services.kubernetes.addons.dashboard.rbac.clusterAdmin
+ to true. On existing clusters, in order for the revocation of privileges
+ to take effect, the current ClusterRoleBinding for kubernetes-dashboard
+ must be manually removed: kubectl delete clusterrolebinding
+ kubernetes-dashboard
The programs.screen module provides allows to configure
- /etc/screenrc, however the module behaved fairly counterintuitive as
- the config exists, but the package wasn't available. Since 18.09 pkgs.screen
- will be added to environment.systemPackages.
+ /etc/screenrc, however the module behaved fairly
+ counterintuitive as the config exists, but the package wasn't available.
+ Since 18.09 pkgs.screen will be added to
+ environment.systemPackages.
- The module now uses WPA2 by default.
+ The module now uses WPA2 by
+ default.
- s6Dns, s6Networking,
- s6LinuxUtils and s6PortableUtils
- renamed to
- s6-dns, s6-networking,
- s6-linux-utils and s6-portable-utils respectively.
+ s6Dns, s6Networking,
+ s6LinuxUtils and s6PortableUtils
+ renamed to s6-dns, s6-networking,
+ s6-linux-utils and s6-portable-utils
+ respectively.
-
-
+
+
- The module option is now defaulted to true.
+ The module option is now defaulted to
+ true.
-
-
+
+
- The config activation script of nixos-rebuild now
- reloads
- all user units for each authenticated user.
+ The config activation script of nixos-rebuild now
+ reloads
+ all user units for each authenticated user.
-
-
+
+
- The default display manager is now LightDM.
- To use SLiM set services.xserver.displayManager.slim.enable
- to true.
+ The default display manager is now LightDM. To use SLiM set
+ services.xserver.displayManager.slim.enable to
+ true.
-
-
+
+
- NixOS option descriptions are now automatically broken up into individual
- paragraphs if the text contains two consecutive newlines, so it's no
- longer necessary to use </para><para> to start
- a new paragraph.
+ NixOS option descriptions are now automatically broken up into individual
+ paragraphs if the text contains two consecutive newlines, so it's no
+ longer necessary to use </para><para> to start a
+ new paragraph.
-
-
+
+
- Top-level buildPlatform, hostPlatform, and targetPlatform in Nixpkgs are deprecated.
- Please use their equivalents in stdenv instead:
- stdenv.buildPlatform, stdenv.hostPlatform, and stdenv.targetPlatform.
+ Top-level buildPlatform,
+ hostPlatform, and targetPlatform in
+ Nixpkgs are deprecated. Please use their equivalents in
+ stdenv instead:
+ stdenv.buildPlatform,
+ stdenv.hostPlatform, and
+ stdenv.targetPlatform.
-
+
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
new file mode 100644
index 00000000000..1d9b6ecc0e2
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -0,0 +1,204 @@
+
+ Release 19.03 (“Koi”, 2019/03/??)
+
+
+ Highlights
+
+
+ In addition to numerous new and upgraded packages, this release has the
+ following highlights:
+
+
+
+
+
+
+
+
+
+
+ New Services
+
+
+ The following new services were added since the last release:
+
+
+
+
+
+
+
+
+
+
+ Backward Incompatibilities
+
+
+ When upgrading from a previous release, please be aware of the following
+ incompatible changes:
+
+
+
+
+
+ The minimum version of Nix required to evaluate Nixpkgs is now 2.0.
+
+
+
+
+ For users of NixOS 18.03 and 19.03, NixOS defaults to Nix 2.0, but
+ supports using Nix 1.11 by setting nix.package =
+ pkgs.nix1;. If this option is set to a Nix 1.11 package, you
+ will need to either unset the option or upgrade it to Nix 2.0.
+
+
+
+
+ For users of NixOS 17.09, you will first need to upgrade Nix by setting
+ nix.package = pkgs.nixStable2; and run
+ nixos-rebuild switch as the root
+ user.
+
+
+
+
+ For users of a daemon-less Nix installation on Linux or macOS, you can
+ upgrade Nix by running curl https://nixos.org/nix/install |
+ sh, or prior to doing a channel update, running
+ nix-env -iA nix.
+
+
+ If you have already run a channel update and Nix is no longer able to
+ evaluate Nixpkgs, the error message printed should provide adequate
+ directions for upgrading Nix.
+
+
+
+
+ For users of the Nix daemon on macOS, you can upgrade Nix by running
+ sudo -i sh -c 'nix-channel --update && nix-env -iA
+ nixpkgs.nix'; sudo launchctl stop org.nixos.nix-daemon; sudo launchctl
+ start org.nixos.nix-daemon.
+
+
+
+
+
+
+ Package rabbitmq_server is renamed to
+ rabbitmq-server.
+
+
+
+
+ The light module no longer uses setuid binaries, but
+ udev rules. As a consequence users of that module have to belong to the
+ video group in order to use the executable (i.e.
+ users.users.yourusername.extraGroups = ["video"];).
+
+
+
+
+ Buildbot now supports Python 3 and its packages have been moved to
+ pythonPackages. The options
+ and
+ can be used to select
+ the Python 2 or 3 version of the package.
+
+
+
+
+ Options
+ services.znc.confOptions.networks.name.userName and
+ services.znc.confOptions.networks.name.modulePackages
+ were removed. They were never used for anything and can therefore safely be removed.
+
+
+
+
+ Package wasm has been renamed proglodyte-wasm. The package
+ wasm will be pointed to ocamlPackages.wasm in 19.09, so
+ make sure to update your configuration if you want to keep proglodyte-wasm
+
+
+
+
+ OpenSMTPD has been upgraded to version 6.4.0p1. This release makes
+ backwards-incompatible changes to the configuration file format. See
+ man smtpd.conf for more information on the new file
+ format.
+
+
+
+
+ The versioned postgresql have been renamed to use
+ underscore number seperators. For example, postgresql96
+ has been renamed to postgresql_9_6.
+
+
+
+
+ Slurm introduces the new option
+ services.slurm.stateSaveLocation,
+ which is now set to /var/spool/slurm by default
+ (instead of /var/spool).
+ Make sure to move all files to the new directory or to set the option accordingly.
+
+
+ The slurmctld now runs as user slurm instead of root.
+ If you want to keep slurmctld running as root, set
+ services.slurm.user = root.
+
+
+ The options services.slurm.nodeName and
+ services.slurm.partitionName are now sets of
+ strings to correctly reflect that fact that each of these
+ options can occour more than once in the configuration.
+
+
+
+
+
+
+ Other Notable Changes
+
+
+
+
+ The module gained the option
+ which determines the used
+ Matomo version.
+
+
+
+
+ The deprecated truecrypt package has been removed
+ and truecrypt attribute is now an alias for
+ veracrypt. VeraCrypt is backward-compatible with
+ TrueCrypt volumes. Note that cryptsetup also
+ supports loading TrueCrypt volumes.
+
+
+
+
+
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 48288cf5962..4f65501f89c 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -28,7 +28,7 @@ rec {
modules = configurations ++
[ ../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 = "no-manual"; documentation.nixos.enable = false; }
{ key = "qemu"; system.build.qemu = qemu; }
] ++ optional minimal ../modules/testing/minimal-kernel.nix;
extraArgs = { inherit nodes; };
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index ef685949ae1..5f05b037bdd 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -28,7 +28,7 @@
let extraArgs_ = extraArgs; pkgs_ = pkgs;
extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH";
- in if e == "" then [] else [(import (builtins.toPath e))];
+ in if e == "" then [] else [(import e)];
in
let
@@ -53,7 +53,8 @@ in rec {
inherit prefix check;
modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
args = extraArgs;
- specialArgs = { modulesPath = ../modules; } // specialArgs;
+ specialArgs =
+ { modulesPath = builtins.toString ../modules; } // specialArgs;
}) config options;
# These are the extra arguments passed to every module. In
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index b18f48464ce..abcc1c50d4d 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -155,8 +155,10 @@ sub start {
$ENV{USE_TMPDIR} = 1;
$ENV{QEMU_OPTS} =
($self->{allowReboot} ? "" : "-no-reboot ") .
- "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " .
- "-device virtio-serial -device virtconsole,chardev=shell " .
+ "-monitor unix:./monitor " .
+ "-chardev socket,id=shell,path=./shell -device virtio-serial -device virtconsole,chardev=shell " .
+ # socket backdoor, see "Debugging NixOS tests" section in NixOS manual
+ "-chardev socket,id=backdoor,path=./backdoor,server,nowait -device virtio-serial -device virtconsole,chardev=backdoor " .
"-device virtio-rng-pci " .
($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || "");
chdir $self->{stateDir} or die;
@@ -248,7 +250,8 @@ sub connect {
$self->start;
local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; };
- alarm 300;
+ # 50 minutes -- increased as a test, see #49441
+ alarm 3000;
readline $self->{socket} or die "the VM quit before connecting\n";
alarm 0;
diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix
index 881ad671a62..a1d9ebcec66 100644
--- a/nixos/modules/config/iproute2.nix
+++ b/nixos/modules/config/iproute2.nix
@@ -4,20 +4,29 @@ with lib;
let
cfg = config.networking.iproute2;
- confDir = "/run/iproute2";
in
{
- options.networking.iproute2.enable = mkEnableOption "copy IP route configuration files";
-
- config = mkMerge [
- ({ nixpkgs.config.iproute2.confDir = confDir; })
-
- (mkIf cfg.enable {
- system.activationScripts.iproute2 = ''
- cp -R ${pkgs.iproute}/etc/iproute2 ${confDir}
- chmod -R 664 ${confDir}
- chmod +x ${confDir}
+ options.networking.iproute2 = {
+ enable = mkEnableOption "copy IP route configuration files";
+ rttablesExtraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Verbatim lines to add to /etc/iproute2/rt_tables
'';
- })
- ];
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.etc."iproute2/bpf_pinning" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/bpf_pinning"; };
+ environment.etc."iproute2/ematch_map" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/ematch_map"; };
+ environment.etc."iproute2/group" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/group"; };
+ environment.etc."iproute2/nl_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/nl_protos"; };
+ environment.etc."iproute2/rt_dsfield" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_dsfield"; };
+ environment.etc."iproute2/rt_protos" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_protos"; };
+ environment.etc."iproute2/rt_realms" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_realms"; };
+ environment.etc."iproute2/rt_scopes" = { mode = "0644"; text = fileContents "${pkgs.iproute}/etc/iproute2/rt_scopes"; };
+ environment.etc."iproute2/rt_tables" = { mode = "0644"; text = (fileContents "${pkgs.iproute}/etc/iproute2/rt_tables")
+ + (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}"); };
+ };
}
diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix
index c22e99a0a2f..87021a27d34 100644
--- a/nixos/modules/config/krb5/default.nix
+++ b/nixos/modules/config/krb5/default.nix
@@ -79,7 +79,7 @@ in {
options = {
krb5 = {
- enable = mkEnableOption "Whether to enable Kerberos V.";
+ enable = mkEnableOption "building krb5.conf, configuration file for Kerberos V";
kerberos = mkOption {
type = types.package;
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 1ef5313d3fd..627cce67e97 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -16,6 +16,13 @@ let
resolvconfOptions = cfg.resolvconfOptions
++ optional cfg.dnsSingleRequest "single-request"
++ optional cfg.dnsExtensionMechanism "edns0";
+
+
+ localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1";
+ localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1";
+
+ localhostMultiple = any (elem "localhost") (attrValues (removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]));
+
in
{
@@ -23,8 +30,7 @@ in
options = {
networking.hosts = lib.mkOption {
- type = types.attrsOf ( types.listOf types.str );
- default = {};
+ type = types.attrsOf (types.listOf types.str);
example = literalExample ''
{
"127.0.0.1" = [ "foo.bar.baz" ];
@@ -192,6 +198,29 @@ in
config = {
+ assertions = [{
+ assertion = localhostMapped4;
+ message = ''`networking.hosts` doesn't map "127.0.0.1" to "localhost"'';
+ } {
+ assertion = !cfg.enableIPv6 || localhostMapped6;
+ message = ''`networking.hosts` doesn't map "::1" to "localhost"'';
+ } {
+ assertion = !localhostMultiple;
+ message = ''
+ `networking.hosts` maps "localhost" to something other than "127.0.0.1"
+ or "::1". This will break some applications. Please use
+ `networking.extraHosts` if you really want to add such a mapping.
+ '';
+ }];
+
+ networking.hosts = {
+ "127.0.0.1" = [ "localhost" ];
+ } // optionalAttrs (cfg.hostName != "") {
+ "127.0.1.1" = [ cfg.hostName ];
+ } // optionalAttrs cfg.enableIPv6 {
+ "::1" = [ "localhost" ];
+ };
+
environment.etc =
{ # /etc/services: TCP/UDP port assignments.
"services".source = pkgs.iana-etc + "/etc/services";
@@ -199,29 +228,14 @@ in
# /etc/protocols: IP protocol numbers.
"protocols".source = pkgs.iana-etc + "/etc/protocols";
- # /etc/rpc: RPC program numbers.
- "rpc".source = pkgs.glibc.out + "/etc/rpc";
-
# /etc/hosts: Hostname-to-IP mappings.
- "hosts".text =
- let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
- allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set );
- userLocalHosts = optionalString
- ( builtins.hasAttr "127.0.0.1" cfg.hosts )
- ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" ));
- userLocalHosts6 = optionalString
- ( builtins.hasAttr "::1" cfg.hosts )
- ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
- otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
- in
- ''
- 127.0.0.1 ${userLocalHosts} localhost
- ${optionalString cfg.enableIPv6 ''
- ::1 ${userLocalHosts6} localhost
- ''}
- ${otherHosts}
- ${cfg.extraHosts}
- '';
+ "hosts".text = let
+ oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
+ allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set);
+ in ''
+ ${allToString cfg.hosts}
+ ${cfg.extraHosts}
+ '';
# /etc/host.conf: resolver configuration file
"host.conf".text = cfg.hostConf;
@@ -251,6 +265,9 @@ in
"resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf";
} // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
"dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+ } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
+ # /etc/rpc: RPC program numbers.
+ "rpc".source = pkgs.glibc.out + "/etc/rpc";
};
networking.proxy.envVars =
@@ -296,4 +313,4 @@ in
};
- }
+}
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index e16a021ec20..d4aa5950629 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -154,6 +154,18 @@ in {
'';
};
+ extraModules = mkOption {
+ type = types.listOf types.package;
+ default = [];
+ example = literalExample "[ pkgs.pulseaudio-modules-bt ]";
+ description = ''
+ Extra pulseaudio modules to use. This is intended for out-of-tree
+ pulseaudio modules like extra bluetooth codecs.
+
+ Extra modules take precedence over built-in pulseaudio modules.
+ '';
+ };
+
daemon = {
logLevel = mkOption {
type = types.str;
@@ -236,6 +248,18 @@ in {
systemd.packages = [ overriddenPackage ];
})
+ (mkIf (cfg.extraModules != []) {
+ hardware.pulseaudio.daemon.config.dl-search-path = let
+ overriddenModules = builtins.map
+ (drv: drv.override { pulseaudio = overriddenPackage; })
+ cfg.extraModules;
+ modulePaths = builtins.map
+ (drv: "${drv}/lib/pulse-${overriddenPackage.version}/modules")
+ # User-provided extra modules take precedence
+ (overriddenModules ++ [ overriddenPackage ]);
+ in lib.concatStringsSep ":" modulePaths;
+ })
+
(mkIf hasZeroconf {
services.avahi.enable = true;
})
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 31adc9b8262..6379b52870e 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -108,14 +108,14 @@ in
};
environment.shellAliases = mkOption {
- default = {};
- example = { ll = "ls -l"; };
+ example = { l = null; ll = "ls -l"; };
description = ''
An attribute set that maps aliases (the top level attribute names in
this option) to command strings or directly to build outputs. The
aliases are added to all users' shells.
+ Aliases mapped to null are ignored.
'';
- type = types.attrs; # types.attrsOf types.stringOrPath;
+ type = with types; attrsOf (nullOr (either str path));
};
environment.binsh = mkOption {
@@ -157,21 +157,36 @@ in
# terminal instead of logging out of X11).
environment.variables = config.environment.sessionVariables;
+ environment.shellAliases = mapAttrs (name: mkDefault) {
+ ls = "ls --color=tty";
+ ll = "ls -l";
+ l = "ls -alh";
+ };
+
environment.etc."shells".text =
''
${concatStringsSep "\n" (map utils.toShellPath cfg.shells)}
/bin/sh
'';
+ # For resetting environment with `. /etc/set-environment` when needed
+ # and discoverability (see motivation of #30418).
+ environment.etc."set-environment".source = config.system.build.setEnvironment;
+
system.build.setEnvironment = pkgs.writeText "set-environment"
- ''
- ${exportedEnvVars}
+ ''
+ # DO NOT EDIT -- this file has been generated automatically.
+
+ # Prevent this file from being sourced by child shells.
+ export __NIXOS_SET_ENVIRONMENT_DONE=1
- ${cfg.extraInit}
+ ${exportedEnvVars}
- # ~/bin if it exists overrides other bin directories.
- export PATH="$HOME/bin:$PATH"
- '';
+ ${cfg.extraInit}
+
+ # ~/bin if it exists overrides other bin directories.
+ export PATH="$HOME/bin:$PATH"
+ '';
system.activationScripts.binsh = stringAfter [ "stdio" ]
''
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index ffb437491f6..1793dc628ed 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -13,13 +13,15 @@ let
pkgs.attr
pkgs.bashInteractive # bash with ncurses support
pkgs.bzip2
- pkgs.coreutils
+ pkgs.coreutils-full
pkgs.cpio
pkgs.curl
pkgs.diffutils
pkgs.findutils
pkgs.gawk
- pkgs.glibc # for ldd, getent
+ pkgs.stdenv.cc.libc
+ pkgs.getent
+ pkgs.getconf
pkgs.gnugrep
pkgs.gnupatch
pkgs.gnused
@@ -140,7 +142,7 @@ in
if [ -x $out/bin/glib-compile-schemas -a -w $out/share/glib-2.0/schemas ]; then
$out/bin/glib-compile-schemas $out/share/glib-2.0/schemas
fi
-
+
${config.environment.extraSetup}
'';
};
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 426e1666a81..137ee243813 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -266,7 +266,7 @@ let
(mkIf config.isNormalUser {
group = mkDefault "users";
createHome = mkDefault true;
- home = mkDefault "/home/${name}";
+ home = mkDefault "/home/${config.name}";
useDefaultShell = mkDefault true;
isSystemUser = mkDefault false;
})
diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index f1b672234a3..cd1064630fb 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -7,7 +7,7 @@ with lib;
type = types.bool;
default = true;
description = ''
- Whether to install files to support the
+ Whether to install files to support the
XDG Shared MIME-info specification and the
XDG MIME Applications specification.
'';
@@ -17,18 +17,18 @@ with lib;
config = mkIf config.xdg.mime.enable {
environment.pathsToLink = [ "/share/mime" ];
- environment.systemPackages = [
- # this package also installs some useful data, as well as its utilities
- pkgs.shared-mime-info
+ environment.systemPackages = [
+ # this package also installs some useful data, as well as its utilities
+ pkgs.shared-mime-info
];
environment.extraSetup = ''
- if [ -w $out/share/mime ]; then
- XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
+ if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then
+ XDG_DATA_DIRS=$out/share ${pkgs.buildPackages.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null
fi
if [ -w $out/share/applications ]; then
- ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications
+ ${pkgs.buildPackages.desktop-file-utils}/bin/update-desktop-database $out/share/applications
fi
'';
};
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index b371af353cf..46d06d71333 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -129,17 +129,17 @@ in
message = "Option driSupport32Bit only makes sense on a 64-bit system.";
};
- system.activationScripts.setup-opengl =
- ''
- ln -sfn ${package} /run/opengl-driver
- ${if pkgs.stdenv.isi686 then ''
- ln -sfn opengl-driver /run/opengl-driver-32
- '' else if cfg.driSupport32Bit then ''
- ln -sfn ${package32} /run/opengl-driver-32
- '' else ''
- rm -f /run/opengl-driver-32
- ''}
- '';
+ systemd.tmpfiles.rules = [
+ "L+ /run/opengl-driver - - - - ${package}"
+ (
+ if pkgs.stdenv.isi686 then
+ "L+ /run/opengl-driver-32 - - - - opengl-driver"
+ else if cfg.driSupport32Bit then
+ "L+ /run/opengl-driver-32 - - - - ${package32}"
+ else
+ "r /run/opengl-driver-32"
+ )
+ ];
environment.sessionVariables.LD_LIBRARY_PATH =
[ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib";
diff --git a/nixos/modules/hardware/steam-hardware.nix b/nixos/modules/hardware/steam-hardware.nix
new file mode 100644
index 00000000000..378aeffe71b
--- /dev/null
+++ b/nixos/modules/hardware/steam-hardware.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.hardware.steam-hardware;
+
+in
+
+{
+ options.hardware.steam-hardware = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable udev rules for Steam hardware such as the Steam Controller, other supported controllers and the HTC Vive";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.udev.packages = [
+ pkgs.steamPackages.steam
+ ];
+ };
+}
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index eb195228033..f8524ab99e8 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -1,6 +1,6 @@
# This module provides the proprietary NVIDIA X11 / OpenGL drivers.
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ stdenv, config, lib, pkgs, pkgs_i686, ... }:
with lib;
@@ -23,35 +23,149 @@ let
else null;
nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
- nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
+ nvidia_libs32 =
+ if versionOlder nvidia_x11.version "391" then
+ ((nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }).out
+ else
+ (nvidiaForKernel config.boot.kernelPackages).lib32;
enabled = nvidia_x11 != null;
+
+ cfg = config.hardware.nvidia;
+ optimusCfg = cfg.optimus_prime;
in
{
+ options = {
+ hardware.nvidia.modesetting.enable = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = ''
+ Enable kernel modesetting when using the NVIDIA proprietary driver.
+
+ Enabling this fixes screen tearing when using Optimus via PRIME (see
+ . This is not enabled
+ by default because it is not officially supported by NVIDIA and would not
+ work with SLI.
+ '';
+ };
+
+ hardware.nvidia.optimus_prime.enable = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description = ''
+ Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME.
+ If enabled, the NVIDIA GPU will be always on and used for all rendering,
+ while enabling output to displays attached only to the integrated Intel GPU
+ without a multiplexer.
+
+ Note that this option only has any effect if the "nvidia" driver is specified
+ in , and it should preferably
+ be the only driver there.
+
+ If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be
+ specified ( and
+ ).
+
+ If you enable this, you may want to also enable kernel modesetting for the
+ NVIDIA driver () in order
+ to prevent tearing.
+
+ Note that this configuration will only be successful when a display manager
+ for which the
+ option is supported is used; notably, SLiM is not supported.
+ '';
+ };
+
+ hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption {
+ type = lib.types.string;
+ default = "";
+ example = "PCI:1:0:0";
+ description = ''
+ Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci
+ shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0".
+ '';
+ };
+
+ hardware.nvidia.optimus_prime.intelBusId = lib.mkOption {
+ type = lib.types.string;
+ default = "";
+ example = "PCI:0:2:0";
+ description = ''
+ Bus ID of the Intel GPU. You can find it using lspci; for example if lspci
+ shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0".
+ '';
+ };
+ };
config = mkIf enabled {
assertions = [
{
assertion = config.services.xserver.displayManager.gdm.wayland;
- message = "NVidia drivers don't support wayland";
+ message = "NVIDIA drivers don't support wayland";
+ }
+ {
+ assertion = !optimusCfg.enable ||
+ (optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != "");
+ message = ''
+ When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.
+ '';
}
];
- services.xserver.drivers = singleton
- { name = "nvidia"; modules = [ nvidia_x11.bin ]; libPath = [ nvidia_x11 ]; };
+ # If Optimus/PRIME is enabled, we:
+ # - Specify the configured NVIDIA GPU bus ID in the Device section for the
+ # "nvidia" driver.
+ # - Add the AllowEmptyInitialConfiguration option to the Screen section for the
+ # "nvidia" driver, in order to allow the X server to start without any outputs.
+ # - Add a separate Device section for the Intel GPU, using the "modesetting"
+ # driver and with the configured BusID.
+ # - Reference that Device section from the ServerLayout section as an inactive
+ # device.
+ # - Configure the display manager to run specific `xrandr` commands which will
+ # configure/enable displays connected to the Intel GPU.
+
+ services.xserver.drivers = singleton {
+ name = "nvidia";
+ modules = [ nvidia_x11.bin ];
+ libPath = [ nvidia_x11 ];
+ deviceSection = optionalString optimusCfg.enable
+ ''
+ BusID "${optimusCfg.nvidiaBusId}"
+ '';
+ screenSection =
+ ''
+ Option "RandRRotation" "on"
+ ${optionalString optimusCfg.enable "Option \"AllowEmptyInitialConfiguration\""}
+ '';
+ };
- services.xserver.screenSection =
+ services.xserver.extraConfig = optionalString optimusCfg.enable
+ ''
+ Section "Device"
+ Identifier "nvidia-optimus-intel"
+ Driver "modesetting"
+ BusID "${optimusCfg.intelBusId}"
+ Option "AccelMethod" "none"
+ EndSection
+ '';
+ services.xserver.serverLayoutSection = optionalString optimusCfg.enable
''
- Option "RandRRotation" "on"
+ Inactive "nvidia-optimus-intel"
'';
+ services.xserver.displayManager.setupCommands = optionalString optimusCfg.enable ''
+ # Added by nvidia configuration module for Optimus/PRIME.
+ ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0
+ ${pkgs.xorg.xrandr}/bin/xrandr --auto
+ '';
+
environment.etc."nvidia/nvidia-application-profiles-rc" = mkIf nvidia_x11.useProfiles {
source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";
};
hardware.opengl.package = nvidia_x11.out;
- hardware.opengl.package32 = nvidia_libs32.out;
+ hardware.opengl.package32 = nvidia_libs32;
environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
@@ -62,6 +176,8 @@ in
boot.kernelModules = [ "nvidia-uvm" ] ++
lib.optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ];
+ # If requested enable modesetting via kernel parameter.
+ boot.kernelParams = optional cfg.modesetting.enable "nvidia-drm.modeset=1";
# Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
services.udev.extraRules =
diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml
index ab918a9fb23..117482fb0d5 100644
--- a/nixos/modules/i18n/input-method/default.xml
+++ b/nixos/modules/i18n/input-method/default.xml
@@ -3,32 +3,50 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-services-input-methods">
-
-Input Methods
-
-Input methods are an operating system component that allows any data, such
- as keyboard strokes or mouse movements, to be received as input. In this way
- users can enter characters and symbols not found on their input devices. Using
- an input method is obligatory for any language that has more graphemes than
- there are keys on the keyboard.
-
-The following input methods are available in NixOS:
-
-
- IBus: The intelligent input bus.
- Fcitx: A customizable lightweight input
- method.
- Nabi: A Korean input method based on XIM.
- Uim: The universal input method, is a library with a XIM
- bridge.
-
-
-IBus
-
-IBus is an Intelligent Input Bus. It provides full featured and user
- friendly input method user interface.
-
-The following snippet can be used to configure IBus:
+ Input Methods
+
+ Input methods are an operating system component that allows any data, such as
+ keyboard strokes or mouse movements, to be received as input. In this way
+ users can enter characters and symbols not found on their input devices.
+ Using an input method is obligatory for any language that has more graphemes
+ than there are keys on the keyboard.
+
+
+ The following input methods are available in NixOS:
+
+
+
+
+ IBus: The intelligent input bus.
+
+
+
+
+ Fcitx: A customizable lightweight input method.
+
+
+
+
+ Nabi: A Korean input method based on XIM.
+
+
+
+
+ Uim: The universal input method, is a library with a XIM bridge.
+
+
+
+
+ IBus
+
+
+ IBus is an Intelligent Input Bus. It provides full featured and user
+ friendly input method user interface.
+
+
+
+ The following snippet can be used to configure IBus:
+
i18n.inputMethod = {
@@ -37,57 +55,89 @@ i18n.inputMethod = {
};
-i18n.inputMethod.ibus.engines is optional and can be
- used to add extra IBus engines.
-
-Available extra IBus engines are:
-
-
- Anthy (ibus-engines.anthy): Anthy is a
- system for Japanese input method. It converts Hiragana text to Kana Kanji
- mixed text.
- Hangul (ibus-engines.hangul): Korean input
- method.
- m17n (ibus-engines.m17n): m17n is an input
- method that uses input methods and corresponding icons in the m17n
- database.
- mozc (ibus-engines.mozc): A Japanese input
- method from Google.
- Table (ibus-engines.table): An input method
- that load tables of input methods.
- table-others (ibus-engines.table-others):
- Various table-based input methods. To use this, and any other table-based
- input methods, it must appear in the list of engines along with
- table. For example:
+
+ i18n.inputMethod.ibus.engines is optional and can be used
+ to add extra IBus engines.
+
+
+
+ Available extra IBus engines are:
+
+
+
+
+
+ Anthy (ibus-engines.anthy): Anthy is a system for
+ Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
+
+
+
+
+ Hangul (ibus-engines.hangul): Korean input method.
+
+
+
+
+ m17n (ibus-engines.m17n): m17n is an input method that
+ uses input methods and corresponding icons in the m17n database.
+
+
+
+
+ mozc (ibus-engines.mozc): A Japanese input method from
+ Google.
+
+
+
+
+ Table (ibus-engines.table): An input method that load
+ tables of input methods.
+
+
+
+
+ table-others (ibus-engines.table-others): Various
+ table-based input methods. To use this, and any other table-based input
+ methods, it must appear in the list of engines along with
+ table. For example:
ibus.engines = with pkgs.ibus-engines; [ table table-others ];
-
-
-
-To use any input method, the package must be added in the configuration,
- as shown above, and also (after running nixos-rebuild) the
- input method must be added from IBus' preference dialog.
-
-
- Troubleshooting
- If IBus works in some applications but not others, a likely cause of
- this is that IBus is depending on a different version of
- glib to what the applications are depending on. This can
- be checked by running nix-store -q --requisites <path> | grep
- glib, where <path> is the path of either
- IBus or an application in the Nix store. The glib
- packages must match exactly. If they do not, uninstalling and reinstalling
- the application is a likely fix.
-
-
-
-Fcitx
-
-Fcitx is an input method framework with extension support. It has three
- built-in Input Method Engine, Pinyin, QuWei and Table-based input
- methods.
-The following snippet can be used to configure Fcitx:
+
+
+
+
+
+ To use any input method, the package must be added in the configuration, as
+ shown above, and also (after running nixos-rebuild) the
+ input method must be added from IBus' preference dialog.
+
+
+
+ Troubleshooting
+
+ If IBus works in some applications but not others, a likely cause of this
+ is that IBus is depending on a different version of glib
+ to what the applications are depending on. This can be checked by running
+ nix-store -q --requisites <path> | grep glib,
+ where <path> is the path of either IBus or an
+ application in the Nix store. The glib packages must
+ match exactly. If they do not, uninstalling and reinstalling the
+ application is a likely fix.
+
+
+
+
+ Fcitx
+
+
+ Fcitx is an input method framework with extension support. It has three
+ built-in Input Method Engine, Pinyin, QuWei and Table-based input methods.
+
+
+
+ The following snippet can be used to configure Fcitx:
+
i18n.inputMethod = {
@@ -96,51 +146,89 @@ i18n.inputMethod = {
};
-i18n.inputMethod.fcitx.engines is optional and can be
- used to add extra Fcitx engines.
-
-Available extra Fcitx engines are:
-
-
- Anthy (fcitx-engines.anthy): Anthy is a
- system for Japanese input method. It converts Hiragana text to Kana Kanji
- mixed text.
- Chewing (fcitx-engines.chewing): Chewing is
- an intelligent Zhuyin input method. It is one of the most popular input
- methods among Traditional Chinese Unix users.
- Hangul (fcitx-engines.hangul): Korean input
- method.
- Unikey (fcitx-engines.unikey): Vietnamese input
- method.
- m17n (fcitx-engines.m17n): m17n is an input
- method that uses input methods and corresponding icons in the m17n
- database.
- mozc (fcitx-engines.mozc): A Japanese input
- method from Google.
- table-others (fcitx-engines.table-others):
- Various table-based input methods.
-
-
-
-Nabi
-
-Nabi is an easy to use Korean X input method. It allows you to enter
- phonetic Korean characters (hangul) and pictographic Korean characters
- (hanja).
-The following snippet can be used to configure Nabi:
+
+ i18n.inputMethod.fcitx.engines is optional and can be
+ used to add extra Fcitx engines.
+
+
+
+ Available extra Fcitx engines are:
+
+
+
+
+
+ Anthy (fcitx-engines.anthy): Anthy is a system for
+ Japanese input method. It converts Hiragana text to Kana Kanji mixed text.
+
+
+
+
+ Chewing (fcitx-engines.chewing): Chewing is an
+ intelligent Zhuyin input method. It is one of the most popular input
+ methods among Traditional Chinese Unix users.
+
+
+
+
+ Hangul (fcitx-engines.hangul): Korean input method.
+
+
+
+
+ Unikey (fcitx-engines.unikey): Vietnamese input method.
+
+
+
+
+ m17n (fcitx-engines.m17n): m17n is an input method that
+ uses input methods and corresponding icons in the m17n database.
+
+
+
+
+ mozc (fcitx-engines.mozc): A Japanese input method from
+ Google.
+
+
+
+
+ table-others (fcitx-engines.table-others): Various
+ table-based input methods.
+
+
+
+
+
+ Nabi
+
+
+ Nabi is an easy to use Korean X input method. It allows you to enter
+ phonetic Korean characters (hangul) and pictographic Korean characters
+ (hanja).
+
+
+
+ The following snippet can be used to configure Nabi:
+
i18n.inputMethod = {
enabled = "nabi";
};
-
+
+
+ Uim
-Uim
+
+ Uim (short for "universal input method") is a multilingual input method
+ framework. Applications can use it through so-called bridges.
+
-Uim (short for "universal input method") is a multilingual input method
- framework. Applications can use it through so-called bridges.
-The following snippet can be used to configure uim:
+
+ The following snippet can be used to configure uim:
+
i18n.inputMethod = {
@@ -148,8 +236,9 @@ i18n.inputMethod = {
};
-Note: The option can be
- used to choose uim toolbar.
-
-
+
+ Note: The option can be
+ used to choose uim toolbar.
+
+
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
new file mode 100644
index 00000000000..228ef371d25
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -0,0 +1,49 @@
+# This module contains the basic configuration for building a graphical NixOS
+# installation CD.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ imports = [ ./installation-cd-base.nix ];
+
+ services.xserver = {
+ enable = true;
+
+ # Don't start the X server by default.
+ autorun = mkForce false;
+
+ # Automatically login as root.
+ displayManager.slim = {
+ enable = true;
+ defaultUser = "root";
+ autoLogin = true;
+ };
+
+ };
+
+ # Provide networkmanager for easy wireless configuration.
+ networking.networkmanager.enable = true;
+ networking.wireless.enable = mkForce false;
+
+ # KDE complains if power management is disabled (to be precise, if
+ # there is no power management backend such as upower).
+ powerManagement.enable = true;
+
+ environment.systemPackages = [
+ # Include gparted for partitioning disks.
+ pkgs.gparted
+
+ # Include some editors.
+ pkgs.vim
+ pkgs.bvi # binary editor
+ pkgs.joe
+
+ # Firefox for reading the manual.
+ pkgs.firefox
+
+ pkgs.glxinfo
+ ];
+
+}
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
index 4c4e69d60d9..42b5ec88227 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
@@ -6,47 +6,11 @@
with lib;
{
- imports = [ ./installation-cd-base.nix ];
+ imports = [ ./installation-cd-graphical-base.nix ];
- services.xserver = {
- enable = true;
- # GDM doesn't start in virtual machines with ISO
- displayManager.slim = {
- enable = true;
- defaultUser = "root";
- autoLogin = true;
- };
- desktopManager.gnome3 = {
- enable = true;
- extraGSettingsOverrides = ''
- [org.gnome.desktop.background]
- show-desktop-icons=true
-
- [org.gnome.nautilus.desktop]
- trash-icon-visible=false
- volumes-visible=false
- home-icon-visible=false
- network-icon-visible=false
- '';
-
- extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ];
- };
- };
-
- environment.systemPackages =
- [ # Include gparted for partitioning disks.
- pkgs.gparted
+ services.xserver.desktopManager.gnome3.enable = true;
- # Include some editors.
- pkgs.vim
- pkgs.bvi # binary editor
- pkgs.joe
-
- pkgs.glxinfo
- ];
-
- # Don't start the X server by default.
- services.xserver.autorun = mkForce false;
+ services.xserver.displayManager.slim.enable = mkForce false;
# Auto-login as root.
services.xserver.displayManager.gdm.autoLogin = {
@@ -54,25 +18,4 @@ with lib;
user = "root";
};
- system.activationScripts.installerDesktop = let
- # Must be executable
- desktopFile = pkgs.writeScript "nixos-manual.desktop" ''
- [Desktop Entry]
- Version=1.0
- Type=Link
- Name=NixOS Manual
- URL=${config.system.build.manual.manual}/share/doc/nixos/index.html
- Icon=system-help
- '';
-
- # use cp and chmod +x, we must be sure the apps are in the nix store though
- in ''
- mkdir -p /root/Desktop
- ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
- cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
- chmod a+rx /root/Desktop/gnome-terminal.desktop
- cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
- chmod a+rx /root/Desktop/gparted.desktop
- '';
-
}
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 63227d57349..1c3c9cb30b4 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -1,23 +1,14 @@
# This module defines a NixOS installation CD that contains X11 and
-# KDE 5.
+# Plasma5.
{ config, lib, pkgs, ... }:
with lib;
{
- imports = [ ./installation-cd-base.nix ];
+ imports = [ ./installation-cd-graphical-base.nix ];
services.xserver = {
- enable = true;
-
- # Automatically login as root.
- displayManager.slim = {
- enable = true;
- defaultUser = "root";
- autoLogin = true;
- };
-
desktopManager.plasma5 = {
enable = true;
enableQt4Support = false;
@@ -27,45 +18,25 @@ with lib;
synaptics.enable = true;
};
- environment.systemPackages =
- [ 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
- pkgs.joe
- ];
-
- # Provide networkmanager for easy wireless configuration.
- networking.networkmanager.enable = true;
- networking.wireless.enable = mkForce false;
-
- # KDE complains if power management is disabled (to be precise, if
- # there is no power management backend such as upower).
- powerManagement.enable = true;
-
- # Don't start the X server by default.
- services.xserver.autorun = mkForce false;
+ environment.systemPackages = with pkgs; [
+ # Graphical text editor
+ kate
+ ];
system.activationScripts.installerDesktop = let
- desktopFile = pkgs.writeText "nixos-manual.desktop" ''
+
+ manualDesktopFile = pkgs.writeScript "nixos-manual.desktop" ''
[Desktop Entry]
Version=1.0
Type=Application
Name=NixOS Manual
- Exec=firefox ${config.system.build.manual.manual}/share/doc/nixos/index.html
+ Exec=firefox ${config.system.build.manual.manualHTMLIndex}
Icon=text-html
'';
in ''
mkdir -p /root/Desktop
- ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
+ ln -sfT ${manualDesktopFile} /root/Desktop/nixos-manual.desktop
ln -sfT ${pkgs.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
'';
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
index 3dc0f606bf6..bcdbffdc20b 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
@@ -7,4 +7,6 @@
imports =
[ ./installation-cd-base.nix
];
+
+ fonts.fontconfig.enable = false;
}
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 98712f0759a..96fdb997b2c 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -233,7 +233,7 @@ let
"
# Make our own efi program, we can't rely on "grub-install" since it seems to
# probe for devices, even with --skip-fs-probe.
- ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootx32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
+ ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \
$MODULES
cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 7ec09acd591..90a5128c02a 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -137,7 +137,7 @@ in
# Setting vesa, we don't get the nvidia driver, which can't work in arm.
services.xserver.videoDrivers = [ "vesa" ];
- services.nixosManual.enable = false;
+ documentation.nixos.enable = false;
# Include the firmware for various wireless cards.
networking.enableRalinkFirmware = true;
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 7c5414257b4..1cfc8ff8612 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
{
- x86_64-linux = "/nix/store/0d60i73mcv8z1m8d2m74yfn84980gfsa-nix-2.0.4";
- i686-linux = "/nix/store/6ssafj2s5a2g9x28yld7b70vwd6vw6lb-nix-2.0.4";
- aarch64-linux = "/nix/store/3wwch7bp7n7xsl8apgy2a4b16yzyij1z-nix-2.0.4";
- x86_64-darwin = "/nix/store/771l8i0mz4c8kry8cz3sz8rr3alalckg-nix-2.0.4";
+ x86_64-linux = "/nix/store/cdcia67siabmj6li7vyffgv2cry86fq8-nix-2.1.3";
+ i686-linux = "/nix/store/6q3xi6y5qnsv7d62b8n00hqfxi8rs2xs-nix-2.1.3";
+ aarch64-linux = "/nix/store/2v93d0vimlm28jg0ms6v1i6lc0fq13pn-nix-2.1.3";
+ x86_64-darwin = "/nix/store/dkjlfkrknmxbjmpfk3dg4q3nmb7m3zvk-nix-2.1.3";
}
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 359caad89a7..b70faa380e5 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -277,8 +277,7 @@ if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") {
# Also for Hyper-V.
if ($virt eq "microsoft") {
- push @initrdAvailableKernelModules, "hv_storvsc";
- $videoDriver = "fbdev";
+ push @attrs, "virtualisation.hypervGuest.enable = true;"
}
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 22c1e0fe9a3..defc46ad2a7 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -13,6 +13,7 @@ extraBuildFlags=()
mountPoint=/mnt
channelPath=
+system=
while [ "$#" -gt 0 ]; do
i="$1"; shift 1
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 3f1e591b97b..327e3e6989f 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -82,7 +82,7 @@ evalNix(){
set -e
if test $exit_code -eq 0; then
- cat <&2 <
+ This includes man pages like
+ configuration.nix
+ 5 if is
+ set.
+ This includes the HTML manual and the nixos-help command if
+ is set.
+
+ '';
+ };
+
};
};
@@ -86,7 +166,7 @@ let cfg = config.documentation; in
if [ -w $out/share/info ]; then
shopt -s nullglob
for i in $out/share/info/*.info $out/share/info/*.info.gz; do
- ${pkgs.texinfo}/bin/install-info $i $out/share/info/dir
+ ${pkgs.buildPackages.texinfo}/bin/install-info $i $out/share/info/dir
done
fi
'';
@@ -99,6 +179,21 @@ let cfg = config.documentation; in
environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc";
})
+ (mkIf cfg.nixos.enable {
+ system.build.manual = manual;
+
+ environment.systemPackages = []
+ ++ optional cfg.man.enable manual.manpages
+ ++ optionals cfg.doc.enable ([ manual.manualHTML helpScript ]
+ ++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]);
+
+ services.mingetty.helpLine = mkIf cfg.doc.enable (
+ "\nRun `nixos-help` "
+ + optionalString config.services.nixosManual.showManual "or press "
+ + "for the NixOS manual."
+ );
+ })
+
]);
}
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 8292cdc995e..a32e4fe3f7c 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -53,7 +53,7 @@
tomcat = 16;
#audio = 17; # unused
#floppy = 18; # unused
- #uucp = 19; # unused
+ uucp = 19;
#lp = 20; # unused
#proc = 21; # unused
pulseaudio = 22; # must match `pulseaudio' GID
@@ -289,7 +289,7 @@
stanchion = 262;
riak-cs = 263;
infinoted = 264;
- # keystone = 265; # unused, removed 2017-12-13
+ sickbeard = 265;
# glance = 266; # unused, removed 2017-12-13
couchpotato = 267;
gogs = 268;
@@ -329,6 +329,9 @@
# kvm = 302; # unused
# render = 303; # unused
zeronet = 304;
+ lirc = 305;
+ lidarr = 306;
+ slurm = 307;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -383,7 +386,7 @@
virtuoso = 44;
#rtkit = 45; # unused
dovecot2 = 46;
- #dovenull = 47; # unused
+ dovenull2 = 47;
prayer = 49;
mpd = 50;
clamav = 51;
@@ -579,7 +582,7 @@
stanchion = 262;
riak-cs = 263;
infinoted = 264;
- # keystone = 265; # unused, removed 2017-12-13
+ sickbeard = 265;
# glance = 266; # unused, removed 2017-12-13
couchpotato = 267;
gogs = 268;
@@ -618,6 +621,9 @@
kvm = 302; # default udev rules from systemd requires these
render = 303; # default udev rules from systemd requires these
zeronet = 304;
+ lirc = 305;
+ lidarr = 306;
+ slurm = 307;
# 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/misc/version.nix b/nixos/modules/misc/version.nix
index 63717e0c6a8..6d78b7c593f 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -5,7 +5,6 @@ with lib;
let
cfg = config.system.nixos;
- revisionFile = "${toString pkgs.path}/.git-revision";
gitRepo = "${toString pkgs.path}/.git";
gitCommitId = lib.substring 0 7 (commitIdFromGitRepo gitRepo);
in
@@ -37,9 +36,7 @@ in
nixos.revision = mkOption {
internal = true;
type = types.str;
- default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo
- else if pathExists revisionFile then fileContents revisionFile
- else "master";
+ default = lib.trivial.revisionWithDefault "master";
description = "The Git revision from which this NixOS configuration was built.";
};
@@ -84,7 +81,7 @@ in
versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
# Note: the first letter is bumped on every release. It's an animal.
- codeName = "Jellyfish";
+ codeName = "Koi";
};
# Generate /etc/os-release. See
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4795922abcf..660644eade8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -46,6 +46,7 @@
./hardware/opengl.nix
./hardware/pcmcia.nix
./hardware/raid/hpsa.nix
+ ./hardware/steam-hardware.nix
./hardware/usb-wwan.nix
./hardware/onlykey.nix
./hardware/video/amdgpu.nix
@@ -107,7 +108,6 @@
./programs/oblogout.nix
./programs/plotinus.nix
./programs/qt5ct.nix
- ./programs/rootston.nix
./programs/screen.nix
./programs/sedutil.nix
./programs/slock.nix
@@ -120,11 +120,13 @@
./programs/sysdig.nix
./programs/systemtap.nix
./programs/sway.nix
+ ./programs/sway-beta.nix
./programs/thefuck.nix
./programs/tmux.nix
./programs/udevil.nix
./programs/venus.nix
./programs/vim.nix
+ ./programs/wavemon.nix
./programs/way-cooler.nix
./programs/wireshark.nix
./programs/xfs_quota.nix
@@ -148,6 +150,7 @@
./security/duosec.nix
./security/hidepid.nix
./security/lock-kernel-modules.nix
+ ./security/misc.nix
./security/oath.nix
./security/pam.nix
./security/pam_usb.nix
@@ -232,6 +235,7 @@
./services/desktops/dleyna-server.nix
./services/desktops/flatpak.nix
./services/desktops/geoclue2.nix
+ ./services/desktops/gsignond.nix
./services/desktops/pipewire.nix
./services/desktops/gnome3/at-spi2-core.nix
./services/desktops/gnome3/chrome-gnome-shell.nix
@@ -245,6 +249,7 @@
./services/desktops/gnome3/gnome-user-share.nix
./services/desktops/gnome3/gpaste.nix
./services/desktops/gnome3/gvfs.nix
+ ./services/desktops/gnome3/rygel.nix
./services/desktops/gnome3/seahorse.nix
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
@@ -271,15 +276,18 @@
./services/hardware/interception-tools.nix
./services/hardware/irqbalance.nix
./services/hardware/lcd.nix
+ ./services/hardware/lirc.nix
./services/hardware/nvidia-optimus.nix
./services/hardware/pcscd.nix
./services/hardware/pommed.nix
+ ./services/hardware/ratbagd.nix
./services/hardware/sane.nix
./services/hardware/sane_extra_backends/brscan4.nix
./services/hardware/tcsd.nix
./services/hardware/tlp.nix
./services/hardware/thinkfan.nix
./services/hardware/trezord.nix
+ ./services/hardware/triggerhappy.nix
./services/hardware/u2f.nix
./services/hardware/udev.nix
./services/hardware/udisks2.nix
@@ -362,6 +370,7 @@
./services/misc/jackett.nix
./services/misc/logkeys.nix
./services/misc/leaps.nix
+ ./services/misc/lidarr.nix
./services/misc/mantisbt.nix
./services/misc/mathics.nix
./services/misc/matrix-synapse.nix
@@ -392,6 +401,7 @@
./services/misc/rogue.nix
./services/misc/serviio.nix
./services/misc/safeeyes.nix
+ ./services/misc/sickbeard.nix
./services/misc/siproxd.nix
./services/misc/snapper.nix
./services/misc/sonarr.nix
@@ -406,6 +416,7 @@
./services/misc/taskserver
./services/misc/tzupdate.nix
./services/misc/uhub.nix
+ ./services/misc/weechat.nix
./services/misc/xmr-stak.nix
./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
@@ -494,6 +505,8 @@
./services/networking/dnsdist.nix
./services/networking/dnsmasq.nix
./services/networking/ejabberd.nix
+ ./services/networking/epmd.nix
+ ./services/networking/eternal-terminal.nix
./services/networking/fakeroute.nix
./services/networking/ferm.nix
./services/networking/firefox/sync-server.nix
@@ -515,9 +528,11 @@
./services/networking/heyefi.nix
./services/networking/hostapd.nix
./services/networking/htpdate.nix
+ ./services/networking/hylafax/default.nix
./services/networking/i2pd.nix
./services/networking/i2p.nix
./services/networking/iodine.nix
+ ./services/networking/iperf3.nix
./services/networking/ircd-hybrid/default.nix
./services/networking/iwd.nix
./services/networking/keepalived/default.nix
@@ -552,6 +567,7 @@
./services/networking/nsd.nix
./services/networking/ntopng.nix
./services/networking/ntpd.nix
+ ./services/networking/nullidentdmod.nix
./services/networking/nylon.nix
./services/networking/ocserv.nix
./services/networking/oidentd.nix
@@ -622,7 +638,7 @@
./services/networking/zerobin.nix
./services/networking/zeronet.nix
./services/networking/zerotierone.nix
- ./services/networking/znc.nix
+ ./services/networking/znc/default.nix
./services/printing/cupsd.nix
./services/scheduling/atd.nix
./services/scheduling/chronos.nix
@@ -676,8 +692,10 @@
./services/web-apps/atlassian/confluence.nix
./services/web-apps/atlassian/crowd.nix
./services/web-apps/atlassian/jira.nix
+ ./services/web-apps/codimd.nix
./services/web-apps/frab.nix
./services/web-apps/mattermost.nix
+ ./services/web-apps/nextcloud.nix
./services/web-apps/nexus.nix
./services/web-apps/pgpkeyserver-lite.nix
./services/web-apps/matomo.nix
@@ -721,12 +739,14 @@
./services/x11/display-managers/lightdm.nix
./services/x11/display-managers/sddm.nix
./services/x11/display-managers/slim.nix
+ ./services/x11/display-managers/startx.nix
./services/x11/display-managers/xpra.nix
./services/x11/fractalart.nix
./services/x11/hardware/libinput.nix
./services/x11/hardware/multitouch.nix
./services/x11/hardware/synaptics.nix
./services/x11/hardware/wacom.nix
+ ./services/x11/gdk-pixbuf.nix
./services/x11/redshift.nix
./services/x11/urxvtd.nix
./services/x11/window-managers/awesome.nix
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 5aaffa4f1f2..7e14b0e2114 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-nox # needed for the manual anyway
+ pkgs.w3m-nographics # needed for the manual anyway
pkgs.testdisk # useful for repairing boot problems
pkgs.ms-sys # for writing Microsoft boot sectors / MBRs
pkgs.efibootmgr
@@ -19,6 +19,9 @@
pkgs.cryptsetup # needed for dm-crypt volumes
pkgs.mkpasswd # for generating password files
+ # Some text editors.
+ pkgs.vim
+
# Some networking tools.
pkgs.fuse
pkgs.fuse3
diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index 99d4774584f..3f669ba7d2e 100644
--- a/nixos/modules/profiles/clone-config.nix
+++ b/nixos/modules/profiles/clone-config.nix
@@ -48,6 +48,8 @@ let
{
imports = [ ${toString config.installer.cloneConfigIncludes} ];
+
+ ${config.installer.cloneConfigExtra}
}
'';
@@ -73,6 +75,13 @@ in
'';
};
+ installer.cloneConfigExtra = mkOption {
+ default = "";
+ description = ''
+ Extra text to include in the cloned configuration.nix included in this
+ installer.
+ '';
+ };
};
config = {
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 332cf58aa53..fba756391b1 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -7,9 +7,12 @@
services.xserver = {
enable = true;
displayManager.sddm.enable = true;
- desktopManager.plasma5.enable = true;
+ desktopManager.plasma5 = {
+ enable = true;
+ enableQt4Support = false;
+ };
libinput.enable = true; # for touchpad support on many laptops
};
- environment.systemPackages = [ pkgs.glxinfo ];
+ environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ];
}
diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 2af8bf1f8e3..d712fb2514b 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -6,12 +6,18 @@
with lib;
{
+ meta = {
+ maintainers = [ maintainers.joachifm ];
+ };
+
boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened;
security.hideProcessInformation = mkDefault true;
security.lockKernelModules = mkDefault true;
+ security.allowUserNamespaces = mkDefault false;
+
security.apparmor.enable = mkDefault true;
boot.kernelParams = [
@@ -55,18 +61,6 @@ with lib;
# ... or at least apply some hardening to it
boot.kernel.sysctl."net.core.bpf_jit_harden" = mkDefault true;
- # A recurring problem with user namespaces is that there are
- # still code paths where the kernel's permission checking logic
- # fails to account for namespacing, instead permitting a
- # namespaced process to act outside the namespace with the
- # same privileges as it would have inside it. This is particularly
- # bad in the common case of running as root within the namespace.
- #
- # Setting the number of allowed user namespaces to 0 effectively disables
- # the feature at runtime. Attempting to create a user namespace
- # with unshare will then fail with "no space left on device".
- boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0;
-
# Raise ASLR entropy for 64bit & 32bit, respectively.
#
# Note: mmap_rnd_compat_bits may not exist on 64bit.
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index ff4a23a18d0..580ea4a58e5 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -22,9 +22,10 @@ with lib;
config = {
# Enable in installer, even if the minimal profile disables it.
- services.nixosManual.enable = mkForce true;
+ documentation.enable = mkForce true;
# Show the manual.
+ documentation.nixos.enable = mkForce true;
services.nixosManual.showManual = true;
# Let the user play Rogue on TTY 8 during the installation.
@@ -62,7 +63,7 @@ with lib;
# Tell the Nix evaluator to garbage collect more aggressively.
# This is desirable in memory-constrained environments that don't
# (yet) have swap set up.
- environment.variables.GC_INITIAL_HEAP_SIZE = "100000";
+ environment.variables.GC_INITIAL_HEAP_SIZE = "1M";
# Make the installer more likely to succeed in low memory
# environments. The kernel's overcommit heustistics bite us
@@ -86,9 +87,6 @@ with lib;
# console less cumbersome if the machine has a public IP.
networking.firewall.logRefusedConnections = mkDefault false;
- environment.systemPackages = [ pkgs.vim ];
-
-
# Allow the user to log in as root without a password.
users.users.root.initialHashedPassword = "";
};
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index ed04e46c77d..138eda117c7 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -12,7 +12,6 @@ with lib;
i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ];
documentation.enable = mkDefault false;
- services.nixosManual.enable = mkDefault false;
sound.enable = mkDefault false;
}
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 69a1a482d07..0fbc77ea44c 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -33,7 +33,8 @@ let
'';
bashAliases = concatStringsSep "\n" (
- mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
+ mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
+ (filterAttrs (k: v: !isNull v) cfg.shellAliases)
);
in
@@ -59,12 +60,12 @@ in
*/
shellAliases = mkOption {
- default = config.environment.shellAliases;
+ default = {};
description = ''
- Set of aliases for bash shell. See
- for an option format description.
+ Set of aliases for bash shell, which overrides .
+ See for an option format description.
'';
- type = types.attrs; # types.attrsOf types.stringOrPath;
+ type = with types; attrsOf (nullOr (either str path));
};
shellInit = mkOption {
@@ -125,8 +126,12 @@ in
programs.bash = {
+ shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
+
shellInit = ''
- ${config.system.build.setEnvironment.text}
+ if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+ . ${config.system.build.setEnvironment}
+ fi
${cfge.shellInit}
'';
@@ -166,11 +171,11 @@ in
# Read system-wide modifications.
if test -f /etc/profile.local; then
- . /etc/profile.local
+ . /etc/profile.local
fi
if [ -n "''${BASH_VERSION:-}" ]; then
- . /etc/bashrc
+ . /etc/bashrc
fi
'';
@@ -191,12 +196,12 @@ in
# We are not always an interactive shell.
if [ -n "$PS1" ]; then
- ${cfg.interactiveShellInit}
+ ${cfg.interactiveShellInit}
fi
# Read system-wide modifications.
if test -f /etc/bashrc.local; then
- . /etc/bashrc.local
+ . /etc/bashrc.local
fi
'';
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix
index b7d8a345e65..9c9765b06b6 100644
--- a/nixos/modules/programs/dconf.nix
+++ b/nixos/modules/programs/dconf.nix
@@ -32,6 +32,8 @@ in
environment.etc = optionals (cfg.profiles != {})
(mapAttrsToList mkDconfProfile cfg.profiles);
+ services.dbus.packages = [ pkgs.gnome3.dconf ];
+
environment.variables.GIO_EXTRA_MODULES = optional cfg.enable
"${pkgs.gnome3.dconf.lib}/lib/gio/modules";
# https://github.com/NixOS/nixpkgs/pull/31891
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml
index a26653dda53..c63201628db 100644
--- a/nixos/modules/programs/digitalbitbox/doc.xml
+++ b/nixos/modules/programs/digitalbitbox/doc.xml
@@ -3,75 +3,64 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-programs-digitalbitbox">
-
- Digital Bitbox
-
-
- Digital Bitbox is a hardware wallet and second-factor authenticator.
-
-
-
- The digitalbitbox programs module may be
- installed by setting programs.digitalbitbox
- to true in a manner similar to
-
+ Digital Bitbox
+
+ Digital Bitbox is a hardware wallet and second-factor authenticator.
+
+
+ The digitalbitbox programs module may be installed by
+ setting programs.digitalbitbox to true
+ in a manner similar to
= true;
-
- and bundles the digitalbitbox package (see digitalbitbox package (see
+ ), which contains the
- dbb-app and dbb-cli binaries,
- along with the hardware module (see dbb-app and dbb-cli binaries, along
+ with the hardware module (see
+ ) which sets up the
- necessary udev rules to access the device.
-
-
-
- Enabling the digitalbitbox module is pretty much the easiest way to
- get a Digital Bitbox device working on your system.
-
+ necessary udev rules to access the device.
+
+
+ Enabling the digitalbitbox module is pretty much the easiest way to get a
+ Digital Bitbox device working on your system.
+
+
+ For more information, see
+ .
+
+
+ Package
- For more information, see
- .
-
-
-
- Package
-
-
- The binaries, dbb-app (a GUI tool) and
- dbb-cli (a CLI tool), are available through the
- digitalbitbox package which could be installed
- as follows:
-
+ The binaries, dbb-app (a GUI tool) and
+ dbb-cli (a CLI tool), are available through the
+ digitalbitbox package which could be installed as
+ follows:
= [
pkgs.digitalbitbox
];
-
-
-
-
-
- Hardware
-
-
- The digitalbitbox hardware package enables the udev rules for
- Digital Bitbox devices and may be installed as follows:
+
+
+
+ Hardware
+
+ The digitalbitbox hardware package enables the udev rules for Digital Bitbox
+ devices and may be installed as follows:
= true;
-
-
-
- In order to alter the udev rules, one may provide different values for
- the udevRule51 and udevRule52
- attributes by means of overriding as follows:
+
+
+ In order to alter the udev rules, one may provide different values for the
+ udevRule51 and udevRule52 attributes
+ by means of overriding as follows:
programs.digitalbitbox = {
enable = true;
@@ -80,6 +69,6 @@ programs.digitalbitbox = {
};
};
-
-
+
+
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index c8d94a47be2..b38af07b92c 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -9,7 +9,8 @@ let
cfg = config.programs.fish;
fishAliases = concatStringsSep "\n" (
- mapAttrsFlatten (k: v: "alias ${k} '${v}'") cfg.shellAliases
+ mapAttrsFlatten (k: v: "alias ${k} ${escapeShellArg v}")
+ (filterAttrs (k: v: !isNull v) cfg.shellAliases)
);
in
@@ -27,7 +28,7 @@ in
'';
type = types.bool;
};
-
+
vendor.config.enable = mkOption {
type = types.bool;
default = true;
@@ -43,7 +44,7 @@ in
Whether fish should use completion files provided by other packages.
'';
};
-
+
vendor.functions.enable = mkOption {
type = types.bool;
default = true;
@@ -53,12 +54,12 @@ in
};
shellAliases = mkOption {
- default = config.environment.shellAliases;
+ default = {};
description = ''
- Set of aliases for fish shell. See
- for an option format description.
+ Set of aliases for fish shell, which overrides .
+ See for an option format description.
'';
- type = types.attrs;
+ type = with types; attrsOf (nullOr (either str path));
};
shellInit = mkOption {
@@ -99,6 +100,8 @@ in
config = mkIf cfg.enable {
+ programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
+
environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit;
environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;
environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit;
@@ -107,9 +110,11 @@ in
# This happens before $__fish_datadir/config.fish sets fish_function_path, so it is currently
# unset. We set it and then completely erase it, leaving its configuration to $__fish_datadir/config.fish
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $__fish_datadir/functions
-
+
# source the NixOS environment config
- fenv source ${config.system.build.setEnvironment}
+ if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]
+ fenv source ${config.system.build.setEnvironment}
+ end
# clear fish_function_path so that it will be correctly set when we return to $__fish_datadir/config.fish
set -e fish_function_path
@@ -123,7 +128,7 @@ in
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/shellInit > /dev/null
set -e fish_function_path[1]
-
+
${cfg.shellInit}
# and leave a note so we don't source this config section again from
@@ -137,7 +142,7 @@ in
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/loginShellInit > /dev/null
set -e fish_function_path[1]
-
+
${cfg.loginShellInit}
# and leave a note so we don't source this config section again from
@@ -149,12 +154,11 @@ in
status --is-interactive; and not set -q __fish_nixos_interactive_config_sourced
and begin
${fishAliases}
-
set fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions $fish_function_path
fenv source /etc/fish/foreign-env/interactiveShellInit > /dev/null
set -e fish_function_path[1]
-
+
${cfg.promptInit}
${cfg.interactiveShellInit}
@@ -170,7 +174,7 @@ in
++ optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
++ optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
++ optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
-
+
environment.systemPackages = [ pkgs.fish ];
environment.shells = [
diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix
index 6f8c389acc9..9f2a03e7e76 100644
--- a/nixos/modules/programs/light.nix
+++ b/nixos/modules/programs/light.nix
@@ -13,7 +13,8 @@ in
default = false;
type = types.bool;
description = ''
- Whether to install Light backlight control with setuid wrapper.
+ Whether to install Light backlight control command
+ and udev rules granting access to members of the "video" group.
'';
};
};
@@ -21,6 +22,6 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.light ];
- security.wrappers.light.source = "${pkgs.light.out}/bin/light";
+ services.udev.packages = [ pkgs.light ];
};
}
diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml
index 91740ee16ec..902cd89e0c4 100644
--- a/nixos/modules/programs/plotinus.xml
+++ b/nixos/modules/programs/plotinus.xml
@@ -3,23 +3,28 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-program-plotinus">
-
-Plotinus
-
-Source: modules/programs/plotinus.nix
-
-Upstream documentation:
-
-Plotinus is a searchable command palette in every modern GTK+ application.
-
-When in a GTK+3 application and Plotinus is enabled, you can press Ctrl+Shift+P to open the command palette. The command palette provides a searchable list of of all menu items in the application.
-
-To enable Plotinus, add the following to your configuration.nix:
-
+ Plotinus
+
+ Source:
+ modules/programs/plotinus.nix
+
+
+ Upstream documentation:
+
+
+
+ Plotinus is a searchable command palette in every modern GTK+ application.
+
+
+ When in a GTK+3 application and Plotinus is enabled, you can press
+ Ctrl+Shift+P to open the command palette. The command
+ palette provides a searchable list of of all menu items in the application.
+
+
+ To enable Plotinus, add the following to your
+ configuration.nix:
= true;
-
-
-
+
diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix
deleted file mode 100644
index 842d9e6cfb4..00000000000
--- a/nixos/modules/programs/rootston.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.programs.rootston;
-
- rootstonWrapped = pkgs.writeScriptBin "rootston" ''
- #! ${pkgs.runtimeShell}
- if [[ "$#" -ge 1 ]]; then
- exec ${pkgs.rootston}/bin/rootston "$@"
- else
- ${cfg.extraSessionCommands}
- exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile}
- fi
- '';
-in {
- options.programs.rootston = {
- enable = mkEnableOption ''
- rootston, the reference compositor for wlroots. The purpose of rootston
- is to test and demonstrate the features of wlroots (if you want a real
- Wayland compositor you should e.g. use Sway instead). You can manually
- start the compositor by running "rootston" from a terminal'';
-
- extraSessionCommands = mkOption {
- type = types.lines;
- default = "";
- example = ''
- # Define a keymap (US QWERTY is the default)
- export XKB_DEFAULT_LAYOUT=de,us
- export XKB_DEFAULT_VARIANT=nodeadkeys
- export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
- '';
- description = ''
- Shell commands executed just before rootston is started.
- '';
- };
-
- extraPackages = mkOption {
- type = with types; listOf package;
- default = with pkgs; [
- westonLite xwayland rofi
- ];
- defaultText = literalExample ''
- with pkgs; [
- westonLite xwayland rofi
- ]
- '';
- example = literalExample "[ ]";
- description = ''
- Extra packages to be installed system wide.
- '';
- };
-
- config = mkOption {
- type = types.str;
- default = ''
- [keyboard]
- meta-key = Logo
-
- # Sway/i3 like Keybindings
- # Maps key combinations with commands to execute
- # Commands include:
- # - "exit" to stop the compositor
- # - "exec" to execute a shell command
- # - "close" to close the current view
- # - "next_window" to cycle through windows
- [bindings]
- Logo+Shift+e = exit
- Logo+q = close
- Logo+m = maximize
- Alt+Tab = next_window
- Logo+Return = exec weston-terminal
- Logo+d = exec rofi -show run
- '';
- description = ''
- Default configuration for rootston (used when called without any
- parameters).
- '';
- };
-
- configFile = mkOption {
- type = types.path;
- default = "/etc/rootston.ini";
- example = literalExample "${pkgs.rootston}/etc/rootston.ini";
- description = ''
- Path to the default rootston configuration file (the "config" option
- will have no effect if you change the path).
- '';
- };
- };
-
- config = mkIf cfg.enable {
- environment.etc."rootston.ini".text = cfg.config;
- environment.systemPackages = [ rootstonWrapped ] ++ cfg.extraPackages;
-
- hardware.opengl.enable = mkDefault true;
- fonts.enableDefaultFonts = mkDefault true;
- programs.dconf.enable = mkDefault true;
- };
-
- meta.maintainers = with lib.maintainers; [ primeos gnidorah ];
-}
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 944a8bdf16f..9842e2bef64 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -8,18 +8,12 @@ with lib;
config = {
- environment.shellAliases =
- { ls = "ls --color=tty";
- ll = "ls -l";
- l = "ls -alh";
- };
-
environment.shellInit =
''
# Set up the per-user profile.
mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then
- echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR, should be $(id -u)" >&2
+ echo "WARNING: the per-user profile dir $NIX_USER_PROFILE_DIR should belong to user id $(id -u)" >&2
fi
if [ -w "$HOME" ]; then
@@ -41,7 +35,7 @@ with lib;
NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR"
if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then
- echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR, should be $(id -u)" >&2
+ echo "WARNING: the per-user gcroots dir $NIX_USER_GCROOTS_DIR should belong to user id $(id -u)" >&2
fi
# Set up a default Nix expression from which to install stuff.
diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix
new file mode 100644
index 00000000000..04f2e0662b8
--- /dev/null
+++ b/nixos/modules/programs/sway-beta.nix
@@ -0,0 +1,54 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.sway-beta;
+ swayPackage = cfg.package;
+in {
+ options.programs.sway-beta = {
+ enable = mkEnableOption ''
+ Sway, the i3-compatible tiling Wayland compositor. This module will be removed after the final release of Sway 1.0
+ '';
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.sway-beta;
+ defaultText = "pkgs.sway-beta";
+ description = ''
+ The package to be used for `sway`.
+ '';
+ };
+
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [
+ xwayland dmenu
+ ];
+ defaultText = literalExample ''
+ with pkgs; [ xwayland dmenu ];
+ '';
+ example = literalExample ''
+ with pkgs; [
+ xwayland
+ i3status i3status-rust
+ termite rofi light
+ ]
+ '';
+ description = ''
+ Extra packages to be installed system wide.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ swayPackage ] ++ cfg.extraPackages;
+ security.pam.services.swaylock = {};
+ hardware.opengl.enable = mkDefault true;
+ fonts.enableDefaultFonts = mkDefault true;
+ programs.dconf.enable = mkDefault true;
+ };
+
+ meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];
+}
+
diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
index f4ae5293476..21ed6603c1b 100644
--- a/nixos/modules/programs/thefuck.nix
+++ b/nixos/modules/programs/thefuck.nix
@@ -29,8 +29,8 @@ in
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ thefuck ];
- environment.shellInit = initScript;
+ programs.bash.interactiveShellInit = initScript;
programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;
programs.fish.interactiveShellInit = mkIf prg.fish.enable ''
${pkgs.thefuck}/bin/thefuck --alias | source
diff --git a/nixos/modules/programs/wavemon.nix b/nixos/modules/programs/wavemon.nix
new file mode 100644
index 00000000000..ac665fe4a02
--- /dev/null
+++ b/nixos/modules/programs/wavemon.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.wavemon;
+in {
+ options = {
+ programs.wavemon = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to add wavemon to the global environment and configure a
+ setcap wrapper for it.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = with pkgs; [ wavemon ];
+ security.wrappers.wavemon = {
+ source = "${pkgs.wavemon}/bin/wavemon";
+ capabilities = "cap_net_admin+ep";
+ };
+ };
+}
diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix
index a01083c3ace..db085211366 100644
--- a/nixos/modules/programs/yabar.nix
+++ b/nixos/modules/programs/yabar.nix
@@ -44,10 +44,23 @@ in
enable = mkEnableOption "yabar";
package = mkOption {
- default = pkgs.yabar;
- example = literalExample "pkgs.yabar-unstable";
+ default = pkgs.yabar-unstable;
+ example = literalExample "pkgs.yabar";
type = types.package;
+ # `yabar-stable` segfaults under certain conditions.
+ apply = x: if x == pkgs.yabar-unstable then x else flip warn x ''
+ It's not recommended to use `yabar' with `programs.yabar', the (old) stable release
+ tends to segfault under certain circumstances:
+
+ * https://github.com/geommer/yabar/issues/86
+ * https://github.com/geommer/yabar/issues/68
+ * https://github.com/geommer/yabar/issues/143
+
+ Most of them don't occur on master anymore, until a new release is published, it's recommended
+ to use `yabar-unstable'.
+ '';
+
description = ''
The package which contains the `yabar` binary.
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml
index 6567d4a42fa..5cf690c1a56 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.xml
+++ b/nixos/modules/programs/zsh/oh-my-zsh.xml
@@ -3,18 +3,20 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-programs-zsh-ohmyzsh">
-
-Oh my ZSH
-
-oh-my-zsh is a framework
-to manage your ZSH configuration
-including completion scripts for several CLI tools or custom prompt themes.
-
-Basic usage
-The module uses the oh-my-zsh package with all available features. The
-initial setup using Nix expressions is fairly similar to the configuration format
-of oh-my-zsh.
-
+ Oh my ZSH
+
+ oh-my-zsh is a
+ framework to manage your ZSH
+ configuration including completion scripts for several CLI tools or custom
+ prompt themes.
+
+
+ Basic usage
+
+
+ The module uses the oh-my-zsh package with all available
+ features. The initial setup using Nix expressions is fairly similar to the
+ configuration format of oh-my-zsh.
{
programs.ohMyZsh = {
@@ -24,39 +26,50 @@ of oh-my-zsh.
};
}
-
-For a detailed explanation of these arguments please refer to the
-oh-my-zsh docs.
-
-The expression generates the needed
-configuration and writes it into your /etc/zshrc.
-
-
-Custom additions
-
-Sometimes third-party or custom scripts such as a modified theme may be needed.
-oh-my-zsh provides the
-ZSH_CUSTOM
-environment variable for this which points to a directory with additional scripts.
-
-The module can do this as well:
-
+ For a detailed explanation of these arguments please refer to the
+ oh-my-zsh
+ docs.
+
+
+
+ The expression generates the needed configuration and writes it into your
+ /etc/zshrc.
+
+
+
+ Custom additions
+
+
+ Sometimes third-party or custom scripts such as a modified theme may be
+ needed. oh-my-zsh provides the
+ ZSH_CUSTOM
+ environment variable for this which points to a directory with additional
+ scripts.
+
+
+
+ The module can do this as well:
{
programs.ohMyZsh.custom = "~/path/to/custom/scripts";
}
-
-
-Custom environments
-
-There are several extensions for oh-my-zsh packaged in nixpkgs.
-One of them is nix-zsh-completions
-which bundles completion scripts and a plugin for oh-my-zsh.
-
-Rather than using a single mutable path for ZSH_CUSTOM, it's also possible to
-generate this path from a list of Nix packages:
-
+
+
+
+ Custom environments
+
+
+ There are several extensions for oh-my-zsh packaged in
+ nixpkgs. One of them is
+ nix-zsh-completions
+ which bundles completion scripts and a plugin for
+ oh-my-zsh.
+
+
+
+ Rather than using a single mutable path for ZSH_CUSTOM,
+ it's also possible to generate this path from a list of Nix packages:
{ pkgs, ... }:
{
@@ -66,42 +79,59 @@ generate this path from a list of Nix packages:
];
}
-
-Internally a single store path will be created using buildEnv.
-Please refer to the docs of
-buildEnv
-for further reference.
-
-Please keep in mind that this is not compatible with programs.ohMyZsh.custom
-as it requires an immutable store path while custom shall remain mutable! An evaluation failure
-will be thrown if both custom and customPkgs are set.
-
-
-Package your own customizations
-
-If third-party customizations (e.g. new themes) are supposed to be added to oh-my-zsh
-there are several pitfalls to keep in mind:
-
-
-
- To comply with the default structure of ZSH the entire output needs to be written to
- $out/share/zsh.
-
-
- Completion scripts are supposed to be stored at $out/share/zsh/site-functions. This directory
- is part of the fpath
- and the package should be compatible with pure ZSH setups. The module will automatically link
- the contents of site-functions to completions directory in the proper store path.
-
-
- The plugins directory needs the structure pluginname/pluginname.plugin.zsh
- as structured in the upstream repo.
+ Internally a single store path will be created using
+ buildEnv. Please refer to the docs of
+ buildEnv
+ for further reference.
+
+
+
+ Please keep in mind that this is not compatible with
+ programs.ohMyZsh.custom as it requires an immutable store
+ path while custom shall remain mutable! An evaluation
+ failure will be thrown if both custom and
+ customPkgs are set.
+
+
+
+ Package your own customizations
+
+
+ If third-party customizations (e.g. new themes) are supposed to be added to
+ oh-my-zsh there are several pitfalls to keep in mind:
+
+
+
+
+
+ To comply with the default structure of ZSH the entire
+ output needs to be written to $out/share/zsh.
+
+
+
+
+ Completion scripts are supposed to be stored at
+ $out/share/zsh/site-functions. This directory is part
+ of the
+ fpath
+ and the package should be compatible with pure ZSH
+ setups. The module will automatically link the contents of
+ site-functions to completions directory in the proper
+ store path.
+
+
+
+
+ The plugins directory needs the structure
+ pluginname/pluginname.plugin.zsh as structured in the
+ upstream
+ repo.
-
-
+
+
-
-A derivation for oh-my-zsh may look like this:
+
+ A derivation for oh-my-zsh may look like this:
{ stdenv, fetchFromGitHub }:
@@ -120,6 +150,6 @@ stdenv.mkDerivation rec {
'';
}
-
-
+
+
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index d30b3415411..164d8db5859 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -11,7 +11,8 @@ let
cfg = config.programs.zsh;
zshAliases = concatStringsSep "\n" (
- mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases
+ mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}")
+ (filterAttrs (k: v: !isNull v) cfg.shellAliases)
);
in
@@ -34,13 +35,12 @@ in
};
shellAliases = mkOption {
- default = config.environment.shellAliases;
+ default = {};
description = ''
- Set of aliases for zsh shell. Overrides the default value taken from
- .
+ Set of aliases for zsh shell, which overrides .
See for an option format description.
'';
- type = types.attrs; # types.attrsOf types.stringOrPath;
+ type = with types; attrsOf (nullOr (either str path));
};
shellInit = mkOption {
@@ -70,7 +70,7 @@ in
promptInit = mkOption {
default = ''
if [ "$TERM" != dumb ]; then
- autoload -U promptinit && promptinit && prompt walters
+ autoload -U promptinit && promptinit && prompt walters
fi
'';
description = ''
@@ -106,6 +106,8 @@ in
config = mkIf cfg.enable {
+ programs.zsh.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases;
+
environment.etc."zshenv".text =
''
# /etc/zshenv: DO NOT EDIT -- this file has been generated automatically.
@@ -116,7 +118,9 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
- ${config.system.build.setEnvironment.text}
+ if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
+ . ${config.system.build.setEnvironment}
+ fi
${cfge.shellInit}
@@ -124,7 +128,7 @@ in
# Read system-wide modifications.
if test -f /etc/zshenv.local; then
- . /etc/zshenv.local
+ . /etc/zshenv.local
fi
'';
@@ -143,7 +147,7 @@ in
# Read system-wide modifications.
if test -f /etc/zprofile.local; then
- . /etc/zprofile.local
+ . /etc/zprofile.local
fi
'';
@@ -169,7 +173,7 @@ in
# Tell zsh how to find installed completions
for p in ''${(z)NIX_PROFILES}; do
- fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
+ fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
done
${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"}
@@ -184,7 +188,7 @@ in
# Read system-wide modifications.
if test -f /etc/zshrc.local; then
- . /etc/zshrc.local
+ . /etc/zshrc.local
fi
'';
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 4a6bdfe83dd..aa2b5c0b2df 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -28,7 +28,10 @@ with lib;
(config:
let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
in if enabled then [ pkgs.gutenprint ] else [ ]))
- (mkRenamedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ])
+ (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]
+ (config:
+ let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
+ in if value != "" then [ value ] else []))
(mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
(mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
(mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
@@ -39,6 +42,7 @@ with lib;
(mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
(mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
(mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ])
+ (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
(mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
(mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ])
@@ -276,6 +280,7 @@ with lib;
(mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])
(mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ])
+ (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])
] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
"jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 946da92d80e..092704c6fc3 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -302,15 +302,15 @@ in
workdir="$(mktemp -d)"
# Create CA
- openssl genrsa -des3 -passout pass:x -out $workdir/ca.pass.key 2048
- openssl rsa -passin pass:x -in $workdir/ca.pass.key -out $workdir/ca.key
+ openssl genrsa -des3 -passout pass:xxxx -out $workdir/ca.pass.key 2048
+ openssl rsa -passin pass:xxxx -in $workdir/ca.pass.key -out $workdir/ca.key
openssl req -new -key $workdir/ca.key -out $workdir/ca.csr \
-subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=Security Department/CN=example.com"
openssl x509 -req -days 1 -in $workdir/ca.csr -signkey $workdir/ca.key -out $workdir/ca.crt
# Create key
- openssl genrsa -des3 -passout pass:x -out $workdir/server.pass.key 2048
- openssl rsa -passin pass:x -in $workdir/server.pass.key -out $workdir/server.key
+ openssl genrsa -des3 -passout pass:xxxx -out $workdir/server.pass.key 2048
+ openssl rsa -passin pass:xxxx -in $workdir/server.pass.key -out $workdir/server.key
openssl req -new -key $workdir/server.key -out $workdir/server.csr \
-subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com"
openssl x509 -req -days 1 -in $workdir/server.csr -CA $workdir/ca.crt \
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index b4cd83f6632..ef71fe53d0c 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -3,23 +3,25 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-security-acme">
-
-SSL/TLS Certificates with ACME
-
-NixOS supports automatic domain validation & certificate
-retrieval and renewal using the ACME protocol. This is currently only
-implemented by and for Let's Encrypt. The alternative ACME client
-simp_le is used under the hood.
-
-Prerequisites
-
-You need to have a running HTTP server for verification. The server must
-have a webroot defined that can serve
-.well-known/acme-challenge. This directory must be
-writeable by the user that will run the ACME client.
-
-For instance, this generic snippet could be used for Nginx:
-
+ SSL/TLS Certificates with ACME
+
+ NixOS supports automatic domain validation & certificate retrieval and
+ renewal using the ACME protocol. This is currently only implemented by and
+ for Let's Encrypt. The alternative ACME client simp_le is
+ used under the hood.
+
+
+ Prerequisites
+
+
+ You need to have a running HTTP server for verification. The server must
+ have a webroot defined that can serve
+ .well-known/acme-challenge. This directory must be
+ writeable by the user that will run the ACME client.
+
+
+
+ For instance, this generic snippet could be used for Nginx:
http {
server {
@@ -37,43 +39,47 @@ http {
}
}
-
-
-
-
-Configuring
-
-To enable ACME certificate retrieval & renewal for a certificate for
-foo.example.com, add the following in your
-configuration.nix:
-
+
+
+
+ Configuring
+
+
+ To enable ACME certificate retrieval & renewal for a certificate for
+ foo.example.com, add the following in your
+ configuration.nix:
."foo.example.com" = {
webroot = "/var/www/challenges";
email = "foo@example.com";
};
-
-
-The private key key.pem and certificate
-fullchain.pem will be put into
-/var/lib/acme/foo.example.com. The target directory can
-be configured with the option .
-
-
-Refer to for all available configuration
-options for the security.acme module.
-
-
-
-Using ACME certificates in Nginx
-NixOS supports fetching ACME certificates for you by setting
- enableACME = true; in a virtualHost config. We
-first create self-signed placeholder certificates in place of the
-real ACME certs. The placeholder certs are overwritten when the ACME
-certs arrive. For foo.example.com the config would
-look like.
-
+
+
+
+ The private key key.pem and certificate
+ fullchain.pem will be put into
+ /var/lib/acme/foo.example.com. The target directory can
+ be configured with the option .
+
+
+
+ Refer to for all available configuration
+ options for the security.acme
+ module.
+
+
+
+ Using ACME certificates in Nginx
+
+
+ NixOS supports fetching ACME certificates for you by setting
+ enableACME
+ = true; in a virtualHost config. We first create self-signed
+ placeholder certificates in place of the real ACME certs. The placeholder
+ certs are overwritten when the ACME certs arrive. For
+ foo.example.com the config would look like.
+
services.nginx = {
@@ -89,5 +95,5 @@ services.nginx = {
};
}
-
+
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index dfbf5d859ba..498c2f25d1c 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -28,7 +28,7 @@ with lib;
capability setuid,
network inet raw,
- ${pkgs.glibc.out}/lib/*.so mr,
+ ${pkgs.stdenv.cc.libc.out}/lib/*.so mr,
${pkgs.libcap.lib}/lib/libcap.so* mr,
${pkgs.attr.out}/lib/libattr.so* mr,
diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index e2b84c3e3b3..62a499ea624 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -170,4 +170,6 @@ in {
'';
}) cfg.params;
};
+
+ meta.maintainers = with lib.maintainers; [ ekleog ];
}
diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml
index d69341eb3cd..5a17cb1da41 100644
--- a/nixos/modules/security/hidepid.xml
+++ b/nixos/modules/security/hidepid.xml
@@ -3,31 +3,26 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-hidepid">
-
- Hiding process information
-
-
- Setting
+ Hiding process information
+
+ Setting
= true;
- ensures that access to process information is restricted to the
- owning user. This implies, among other things, that command-line
- arguments remain private. Unless your deployment relies on unprivileged
- users being able to inspect the process information of other users, this
- option should be safe to enable.
-
-
-
- Members of the proc group are exempt from process
- information hiding.
-
-
-
- To allow a service foo to run without process information hiding, set
+ ensures that access to process information is restricted to the owning user.
+ This implies, among other things, that command-line arguments remain private.
+ Unless your deployment relies on unprivileged users being able to inspect the
+ process information of other users, this option should be safe to enable.
+
+
+ Members of the proc group are exempt from process
+ information hiding.
+
+
+ To allow a service foo to run without process
+ information hiding, set
systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ];
-
-
+
diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix
index c81521ed9b0..fc9e7939d81 100644
--- a/nixos/modules/security/lock-kernel-modules.nix
+++ b/nixos/modules/security/lock-kernel-modules.nix
@@ -3,6 +3,10 @@
with lib;
{
+ meta = {
+ maintainers = [ maintainers.joachifm ];
+ };
+
options = {
security.lockKernelModules = mkOption {
type = types.bool;
diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix
new file mode 100644
index 00000000000..42f872b7b08
--- /dev/null
+++ b/nixos/modules/security/misc.nix
@@ -0,0 +1,39 @@
+{ config, lib, ... }:
+
+with lib;
+
+{
+ meta = {
+ maintainers = [ maintainers.joachifm ];
+ };
+
+ options = {
+ security.allowUserNamespaces = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to allow creation of user namespaces. A recurring problem
+ with user namespaces is the presence of code paths where the kernel's
+ permission checking logic fails to account for namespacing, instead
+ permitting a namespaced process to act outside the namespace with the
+ same privileges as it would have inside it. This is particularly
+ damaging in the common case of running as root within the namespace.
+ When user namespace creation is disallowed, attempting to create
+ a user namespace fails with "no space left on device" (ENOSPC).
+ '';
+ };
+ };
+
+ config = mkIf (!config.security.allowUserNamespaces) {
+ # Setting the number of allowed user namespaces to 0 effectively disables
+ # the feature at runtime. Note that root may raise the limit again
+ # at any time.
+ boot.kernel.sysctl."user.max_user_namespaces" = 0;
+
+ assertions = [
+ { assertion = config.nix.useSandbox -> config.security.allowUserNamespaces;
+ message = "`nix.useSandbox = true` conflicts with `!security.allowUserNamespaces`.";
+ }
+ ];
+ };
+}
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index bef10b4fe61..926c6d77d3b 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -548,6 +548,13 @@ in
environment.etc =
mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
+ systemd.tmpfiles.rules = optionals
+ (any (s: s.updateWtmp) (attrValues config.security.pam.services))
+ [
+ "f /var/log/wtmp"
+ "f /var/log/lastlog"
+ ];
+
security.pam.services =
{ other.text =
''
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 04685f2c9ea..7f1de81d5b7 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -88,11 +88,11 @@ in
"polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
};
- system.activationScripts.polkit =
- ''
- # Probably no more needed, clean up
- rm -rf /var/lib/{polkit-1,PolicyKit}
- '';
+ systemd.tmpfiles.rules = [
+ # Probably no more needed, clean up
+ "R /var/lib/polkit-1"
+ "R /var/lib/PolicyKit"
+ ];
users.users.polkituser = {
description = "PolKit daemon";
diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index 3a1ffc55e5f..63e00b54812 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -20,7 +20,6 @@ with lib;
KERNEL=="random", TAG+="systemd"
SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
- ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''}
'';
systemd.services.rngd = {
@@ -30,8 +29,7 @@ with lib;
description = "Hardware RNG Entropy Gatherer Daemon";
- serviceConfig.ExecStart = "${pkgs.rng_tools}/sbin/rngd -f -v" +
- (if config.services.tcsd.enable then " --no-tpm=1" else "");
+ serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v";
};
};
}
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 77e4b2a616d..dcb9c8d4ed5 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -180,35 +180,6 @@ in
# programs to be wrapped.
WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
- # Remove the old /var/setuid-wrappers path from the system...
- #
- # TODO: this is only necessary for upgrades 16.09 => 17.x;
- # this conditional removal block needs to be removed after
- # the release.
- if [ -d /var/setuid-wrappers ]; then
- rm -rf /var/setuid-wrappers
- ln -s /run/wrappers/bin /var/setuid-wrappers
- fi
-
- # Remove the old /run/setuid-wrappers-dir path from the
- # system as well...
- #
- # TODO: this is only necessary for upgrades 16.09 => 17.x;
- # this conditional removal block needs to be removed after
- # the release.
- if [ -d /run/setuid-wrapper-dirs ]; then
- rm -rf /run/setuid-wrapper-dirs
- ln -s /run/wrappers/bin /run/setuid-wrapper-dirs
- fi
-
- # TODO: this is only necessary for upgrades 16.09 => 17.x;
- # this conditional removal block needs to be removed after
- # the release.
- if readlink -f /run/booted-system | grep nixos-17 > /dev/null; then
- rm -rf /run/setuid-wrapper-dirs
- rm -rf /var/setuid-wrappers
- fi
-
# We want to place the tmpdirs for the wrappers to the parent dir.
wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
chmod a+rx $wrapperDir
diff --git a/nixos/modules/services/admin/salt/master.nix b/nixos/modules/services/admin/salt/master.nix
index 165580b9783..c6b1b0cc0bd 100644
--- a/nixos/modules/services/admin/salt/master.nix
+++ b/nixos/modules/services/admin/salt/master.nix
@@ -53,6 +53,9 @@ in
Type = "notify";
NotifyAccess = "all";
};
+ restartTriggers = [
+ config.environment.etc."salt/master".source
+ ];
};
};
diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix
index 9ecefb32cfa..c8fa9461a20 100644
--- a/nixos/modules/services/admin/salt/minion.nix
+++ b/nixos/modules/services/admin/salt/minion.nix
@@ -15,7 +15,6 @@ let
# Default is in /etc/salt/pki/minion
pki_dir = "/var/lib/salt/pki/minion";
} cfg.configuration;
- configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig);
in
@@ -28,15 +27,24 @@ in
default = {};
description = ''
Salt minion configuration as Nix attribute set.
- See
- for details.
+ See
+ for details.
'';
};
};
};
config = mkIf cfg.enable {
- environment.systemPackages = with pkgs; [ salt ];
+ environment = {
+ # Set this up in /etc/salt/minion so `salt-call`, etc. work.
+ # The alternatives are
+ # - passing --config-dir to all salt commands, not just the minion unit,
+ # - setting aglobal environment variable.
+ etc."salt/minion".source = pkgs.writeText "minion" (
+ builtins.toJSON fullConfig
+ );
+ systemPackages = with pkgs; [ salt ];
+ };
systemd.services.salt-minion = {
description = "Salt Minion";
wantedBy = [ "multi-user.target" ];
@@ -45,11 +53,14 @@ in
utillinux
];
serviceConfig = {
- ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}";
+ ExecStart = "${pkgs.salt}/bin/salt-minion";
LimitNOFILE = 8192;
Type = "notify";
NotifyAccess = "all";
};
+ restartTriggers = [
+ config.environment.etc."salt/minion".source
+ ];
};
};
}
diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index bb6fc0a104d..c6878dd67db 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -4,14 +4,18 @@ with lib;
let
cfg = config.services.rabbitmq;
- config_file = pkgs.writeText "rabbitmq.config" cfg.config;
- config_file_wo_suffix = builtins.substring 0 ((builtins.stringLength config_file) - 7) config_file;
+
+ inherit (builtins) concatStringsSep;
+
+ config_file_content = lib.generators.toKeyValue {} cfg.configItems;
+ config_file = pkgs.writeText "rabbitmq.conf" config_file_content;
+
+ advanced_config_file = pkgs.writeText "advanced.config" cfg.config;
in {
###### interface
options = {
services.rabbitmq = {
-
enable = mkOption {
default = false;
description = ''
@@ -20,6 +24,15 @@ in {
'';
};
+ package = mkOption {
+ default = pkgs.rabbitmq-server;
+ type = types.package;
+ defaultText = "pkgs.rabbitmq-server";
+ description = ''
+ Which rabbitmq package to use.
+ '';
+ };
+
listenAddress = mkOption {
default = "127.0.0.1";
example = "";
@@ -30,6 +43,10 @@ in {
guest with password
guest by default, so you should delete
this user if you intend to allow external access.
+
+ Together with 'port' setting it's mostly an alias for
+ configItems."listeners.tcp.1" and it's left for backwards
+ compatibility with previous version of this module.
'';
type = types.str;
};
@@ -60,11 +77,29 @@ in {
'';
};
+ configItems = mkOption {
+ default = {};
+ type = types.attrsOf types.str;
+ example = ''
+ {
+ "auth_backends.1.authn" = "rabbit_auth_backend_ldap";
+ "auth_backends.1.authz" = "rabbit_auth_backend_internal";
+ }
+ '';
+ description = ''
+ New style config options.
+
+ See http://www.rabbitmq.com/configure.html
+ '';
+ };
+
config = mkOption {
default = "";
type = types.str;
description = ''
- Verbatim configuration file contents.
+ Verbatim advanced configuration file contents.
+ Prefered way is to use configItems.
+
See http://www.rabbitmq.com/configure.html
'';
};
@@ -74,6 +109,12 @@ in {
type = types.listOf types.str;
description = "The names of plugins to enable";
};
+
+ pluginDirs = mkOption {
+ default = [];
+ type = types.listOf types.path;
+ description = "The list of directories containing external plugins";
+ };
};
};
@@ -81,7 +122,10 @@ in {
###### implementation
config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs.rabbitmq_server ];
+ # This is needed so we will have 'rabbitmqctl' in our PATH
+ environment.systemPackages = [ cfg.package ];
+
+ services.epmd.enable = true;
users.users.rabbitmq = {
description = "RabbitMQ server user";
@@ -93,44 +137,54 @@ in {
users.groups.rabbitmq.gid = config.ids.gids.rabbitmq;
+ services.rabbitmq.configItems = {
+ "listeners.tcp.1" = mkDefault "${cfg.listenAddress}:${toString cfg.port}";
+ };
+
systemd.services.rabbitmq = {
description = "RabbitMQ Server";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
+ after = [ "network.target" "epmd.socket" ];
+ wants = [ "network.target" "epmd.socket" ];
- path = [ pkgs.rabbitmq_server pkgs.procps ];
+ path = [ cfg.package pkgs.procps ];
environment = {
RABBITMQ_MNESIA_BASE = "${cfg.dataDir}/mnesia";
- RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
- RABBITMQ_NODE_PORT = toString cfg.port;
RABBITMQ_LOGS = "-";
- RABBITMQ_SASL_LOGS = "-";
- RABBITMQ_PID_FILE = "${cfg.dataDir}/pid";
SYS_PREFIX = "";
+ RABBITMQ_CONFIG_FILE = config_file;
+ RABBITMQ_PLUGINS_DIR = concatStringsSep ":" cfg.pluginDirs;
RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" ''
[ ${concatStringsSep "," cfg.plugins} ].
'';
- } // optionalAttrs (cfg.config != "") { RABBITMQ_CONFIG_FILE = config_file_wo_suffix; };
+ } // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; };
serviceConfig = {
- ExecStart = "${pkgs.rabbitmq_server}/sbin/rabbitmq-server";
- ExecStop = "${pkgs.rabbitmq_server}/sbin/rabbitmqctl stop";
+ PermissionsStartOnly = true; # preStart must be run as root
+ ExecStart = "${cfg.package}/sbin/rabbitmq-server";
+ ExecStop = "${cfg.package}/sbin/rabbitmqctl shutdown";
User = "rabbitmq";
Group = "rabbitmq";
WorkingDirectory = cfg.dataDir;
+ Type = "notify";
+ NotifyAccess = "all";
+ UMask = "0027";
+ LimitNOFILE = "100000";
+ Restart = "on-failure";
+ RestartSec = "10";
+ TimeoutStartSec = "3600";
};
- postStart = ''
- rabbitmqctl wait ${cfg.dataDir}/pid
- '';
-
preStart = ''
${optionalString (cfg.cookie != "") ''
echo -n ${cfg.cookie} > ${cfg.dataDir}/.erlang.cookie
+ chown rabbitmq:rabbitmq ${cfg.dataDir}/.erlang.cookie
chmod 600 ${cfg.dataDir}/.erlang.cookie
''}
+ mkdir -p /var/log/rabbitmq
+ chown rabbitmq:rabbitmq /var/log/rabbitmq
'';
};
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index aeaa6bd66c9..e63d91eb9ac 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -622,13 +622,6 @@ in {
type = types.bool;
};
- # TODO: remove this deprecated flag
- cadvisorPort = mkOption {
- description = "Kubernetes kubelet local cadvisor port.";
- default = 4194;
- type = types.int;
- };
-
clusterDns = mkOption {
description = "Use alternative DNS.";
default = "10.1.0.1";
@@ -862,7 +855,6 @@ in {
--hostname-override=${cfg.kubelet.hostname} \
--allow-privileged=${boolToString cfg.kubelet.allowPrivileged} \
--root-dir=${cfg.dataDir} \
- --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \
${optionalString (cfg.kubelet.clusterDns != "")
"--cluster-dns=${cfg.kubelet.clusterDns}"} \
${optionalString (cfg.kubelet.clusterDomain != "")
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 1e1c5bc9f03..cd481212db2 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -6,12 +6,18 @@ let
cfg = config.services.slurm;
# configuration file can be generated by http://slurm.schedmd.com/configurator.html
+
+ defaultUser = "slurm";
+
configFile = pkgs.writeTextDir "slurm.conf"
''
+ ClusterName=${cfg.clusterName}
+ StateSaveLocation=${cfg.stateSaveLocation}
+ SlurmUser=${cfg.user}
${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
- ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
- ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''}
+ ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)}
+ ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)}
PlugStackConfig=${plugStackConfig}
ProctrackType=${cfg.procTrackType}
${cfg.extraConfig}
@@ -23,12 +29,19 @@ let
${cfg.extraPlugstackConfig}
'';
-
cgroupConfig = pkgs.writeTextDir "cgroup.conf"
''
${cfg.extraCgroupConfig}
'';
+ slurmdbdConf = pkgs.writeTextDir "slurmdbd.conf"
+ ''
+ DbdHost=${cfg.dbdserver.dbdHost}
+ SlurmUser=${cfg.user}
+ StorageType=accounting_storage/mysql
+ ${cfg.dbdserver.extraConfig}
+ '';
+
# slurm expects some additional config files to be
# in the same directory as slurm.conf
etcSlurm = pkgs.symlinkJoin {
@@ -42,6 +55,8 @@ in
###### interface
+ meta.maintainers = [ maintainers.markuskowa ];
+
options = {
services.slurm = {
@@ -59,6 +74,27 @@ in
};
};
+ dbdserver = {
+ enable = mkEnableOption "SlurmDBD service";
+
+ dbdHost = mkOption {
+ type = types.str;
+ default = config.networking.hostName;
+ description = ''
+ Hostname of the machine where slurmdbd
+ is running (i.e. name returned by hostname -s).
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Extra configuration for slurmdbd.conf
+ '';
+ };
+ };
+
client = {
enable = mkEnableOption "slurm client daemon";
};
@@ -105,10 +141,19 @@ in
'';
};
+ clusterName = mkOption {
+ type = types.str;
+ default = "default";
+ example = "myCluster";
+ description = ''
+ Necessary to distinguish accounting records in a multi-cluster environment.
+ '';
+ };
+
nodeName = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "linux[1-32] CPUs=1 State=UNKNOWN";
+ type = types.listOf types.str;
+ default = [];
+ example = literalExample ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];'';
description = ''
Name that SLURM uses to refer to a node (or base partition for BlueGene
systems). Typically this would be the string that "/bin/hostname -s"
@@ -117,9 +162,9 @@ in
};
partitionName = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP";
+ type = types.listOf types.str;
+ default = [];
+ example = literalExample ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];'';
description = ''
Name by which the partition may be referenced. Note that now you have
to write the partition's parameters after the name.
@@ -140,7 +185,7 @@ in
};
procTrackType = mkOption {
- type = types.string;
+ type = types.str;
default = "proctrack/linuxproc";
description = ''
Plugin to be used for process tracking on a job step basis.
@@ -149,6 +194,25 @@ in
'';
};
+ stateSaveLocation = mkOption {
+ type = types.str;
+ default = "/var/spool/slurmctld";
+ description = ''
+ Directory into which the Slurm controller, slurmctld, saves its state.
+ '';
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = defaultUser;
+ description = ''
+ Set this option when you want to run the slurmctld daemon
+ as something else than the default slurm user "slurm".
+ Note that the UID of this user needs to be the same
+ on all nodes.
+ '';
+ };
+
extraConfig = mkOption {
default = "";
type = types.lines;
@@ -174,6 +238,8 @@ in
used when procTrackType=proctrack/cgroup.
'';
};
+
+
};
};
@@ -210,12 +276,24 @@ in
'';
};
- in mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable) {
+ in mkIf ( cfg.enableStools ||
+ cfg.client.enable ||
+ cfg.server.enable ||
+ cfg.dbdserver.enable ) {
environment.systemPackages = [ wrappedSlurm ];
services.munge.enable = mkDefault true;
+ # use a static uid as default to ensure it is the same on all nodes
+ users.users.slurm = mkIf (cfg.user == defaultUser) {
+ name = defaultUser;
+ group = "slurm";
+ uid = config.ids.uids.slurm;
+ };
+
+ users.groups.slurm.gid = config.ids.uids.slurm;
+
systemd.services.slurmd = mkIf (cfg.client.enable) {
path = with pkgs; [ wrappedSlurm coreutils ]
++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
@@ -251,6 +329,29 @@ in
PIDFile = "/run/slurmctld.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
+
+ preStart = ''
+ mkdir -p ${cfg.stateSaveLocation}
+ chown -R ${cfg.user}:slurm ${cfg.stateSaveLocation}
+ '';
+ };
+
+ systemd.services.slurmdbd = mkIf (cfg.dbdserver.enable) {
+ path = with pkgs; [ wrappedSlurm munge coreutils ];
+
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" "munged.service" "mysql.service" ];
+ requires = [ "munged.service" "mysql.service" ];
+
+ # slurm strips the last component off the path
+ environment.SLURM_CONF = "${slurmdbdConf}/slurm.conf";
+
+ serviceConfig = {
+ Type = "forking";
+ ExecStart = "${cfg.package}/bin/slurmdbd";
+ PIDFile = "/run/slurmdbd.pid";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ };
};
};
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 8d767de37f0..0f07e6133bb 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -6,8 +6,12 @@ with lib;
let
cfg = config.services.buildbot-master;
+
+ python = cfg.package.pythonModule;
+
escapeStr = s: escape ["'"] s;
- masterCfg = if cfg.masterCfg == null then pkgs.writeText "master.cfg" ''
+
+ defaultMasterCfg = pkgs.writeText "master.cfg" ''
from buildbot.plugins import *
factory = util.BuildFactory()
c = BuildmasterConfig = dict(
@@ -27,8 +31,28 @@ let
factory.addStep(step)
${cfg.extraConfig}
- ''
- else cfg.masterCfg;
+ '';
+
+ tacFile = pkgs.writeText "buildbot-master.tac" ''
+ import os
+
+ from twisted.application import service
+ from buildbot.master import BuildMaster
+
+ basedir = '${cfg.buildbotDir}'
+
+ configfile = '${cfg.masterCfg}'
+
+ # Default umask for server
+ umask = None
+
+ # note: this line is matched against to check that this is a buildmaster
+ # directory; do not edit it.
+ application = service.Application('buildmaster')
+
+ m = BuildMaster(basedir, configfile, umask)
+ m.setServiceParent(application)
+ '';
in {
options = {
@@ -66,9 +90,9 @@ in {
};
masterCfg = mkOption {
- type = types.nullOr types.path;
+ type = types.path;
description = "Optionally pass master.cfg path. Other options in this configuration will be ignored.";
- default = null;
+ default = defaultMasterCfg;
example = "/etc/nixos/buildbot/master.cfg";
};
@@ -175,18 +199,25 @@ in {
package = mkOption {
type = types.package;
- default = pkgs.buildbot-full;
- defaultText = "pkgs.buildbot-full";
+ default = pkgs.pythonPackages.buildbot-full;
+ defaultText = "pkgs.pythonPackages.buildbot-full";
description = "Package to use for buildbot.";
- example = literalExample "pkgs.buildbot-full";
+ example = literalExample "pkgs.python3Packages.buildbot-full";
};
packages = mkOption {
- default = with pkgs; [ python27Packages.twisted git ];
+ default = [ pkgs.git ];
example = literalExample "[ pkgs.git ]";
type = types.listOf types.package;
description = "Packages to add to PATH for the buildbot process.";
};
+
+ pythonPackages = mkOption {
+ default = pythonPackages: with pythonPackages; [ ];
+ defaultText = "pythonPackages: with pythonPackages; [ ]";
+ description = "Packages to add the to the PYTHONPATH of the buildbot process.";
+ example = literalExample "pythonPackages: with pythonPackages; [ requests ]";
+ };
};
};
@@ -210,14 +241,15 @@ in {
description = "Buildbot Continuous Integration Server.";
after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
- path = cfg.packages;
+ path = cfg.packages ++ cfg.pythonPackages python.pkgs;
+ environment.PYTHONPATH = "${python.withPackages (self: cfg.pythonPackages self ++ [ cfg.package ])}/${python.sitePackages}";
preStart = ''
- env > envvars
- mkdir -vp ${cfg.buildbotDir}
- ln -sfv ${masterCfg} ${cfg.buildbotDir}/master.cfg
- rm -fv $cfg.buildbotDir}/buildbot.tac
- ${cfg.package}/bin/buildbot create-master ${cfg.buildbotDir}
+ mkdir -vp "${cfg.buildbotDir}"
+ # Link the tac file so buildbot command line tools recognize the directory
+ ln -sf "${tacFile}" "${cfg.buildbotDir}/buildbot.tac"
+ ${cfg.package}/bin/buildbot create-master --db "${cfg.dbUrl}" "${cfg.buildbotDir}"
+ rm -f buildbot.tac.new master.cfg.sample
'';
serviceConfig = {
@@ -225,12 +257,11 @@ in {
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.home;
- ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}";
+ # NOTE: call twistd directly with stdout logging for systemd
+ ExecStart = "${python.pkgs.twisted}/bin/twistd -o --nodaemon --pidfile= --logfile - --python ${tacFile}";
};
-
};
};
meta.maintainers = with lib.maintainers; [ nand0p mic92 ];
-
}
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index 67c541570b9..4130ec918a7 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -7,6 +7,40 @@ with lib;
let
cfg = config.services.buildbot-worker;
+ python = cfg.package.pythonModule;
+
+ tacFile = pkgs.writeText "aur-buildbot-worker.tac" ''
+ import os
+ from io import open
+
+ from buildbot_worker.bot import Worker
+ from twisted.application import service
+
+ basedir = '${cfg.buildbotDir}'
+
+ # note: this line is matched against to check that this is a worker
+ # directory; do not edit it.
+ application = service.Application('buildbot-worker')
+
+ master_url_split = '${cfg.masterUrl}'.split(':')
+ buildmaster_host = master_url_split[0]
+ port = int(master_url_split[1])
+ workername = '${cfg.workerUser}'
+
+ with open('${cfg.workerPassFile}', 'r', encoding='utf-8') as passwd_file:
+ passwd = passwd_file.read().strip('\r\n')
+ keepalive = 600
+ umask = None
+ maxdelay = 300
+ numcpus = None
+ allow_shutdown = None
+
+ s = Worker(buildmaster_host, port, workername, passwd, basedir,
+ keepalive, umask=umask, maxdelay=maxdelay,
+ numcpus=numcpus, allow_shutdown=allow_shutdown)
+ s.setServiceParent(application)
+ '';
+
in {
options = {
services.buildbot-worker = {
@@ -59,6 +93,23 @@ in {
description = "Specifies the Buildbot Worker password.";
};
+ workerPassFile = mkOption {
+ type = types.path;
+ description = "File used to store the Buildbot Worker password";
+ };
+
+ hostMessage = mkOption {
+ default = null;
+ type = types.nullOr types.str;
+ description = "Description of this worker";
+ };
+
+ adminMessage = mkOption {
+ default = null;
+ type = types.nullOr types.str;
+ description = "Name of the administrator of this worker";
+ };
+
masterUrl = mkOption {
default = "localhost:9989";
type = types.str;
@@ -67,23 +118,24 @@ in {
package = mkOption {
type = types.package;
- default = pkgs.buildbot-worker;
- defaultText = "pkgs.buildbot-worker";
+ default = pkgs.pythonPackages.buildbot-worker;
+ defaultText = "pkgs.pythonPackages.buildbot-worker";
description = "Package to use for buildbot worker.";
- example = literalExample "pkgs.buildbot-worker";
+ example = literalExample "pkgs.python3Packages.buildbot-worker";
};
packages = mkOption {
- default = with pkgs; [ python27Packages.twisted git ];
+ default = with pkgs; [ git ];
example = literalExample "[ pkgs.git ]";
type = types.listOf types.package;
description = "Packages to add to PATH for the buildbot process.";
};
-
};
};
config = mkIf cfg.enable {
+ services.buildbot-worker.workerPassFile = mkDefault (pkgs.writeText "buildbot-worker-password" cfg.workerPass);
+
users.groups = optional (cfg.group == "bbworker") {
name = "bbworker";
};
@@ -104,11 +156,16 @@ in {
after = [ "network.target" "buildbot-master.service" ];
wantedBy = [ "multi-user.target" ];
path = cfg.packages;
+ environment.PYTHONPATH = "${python.withPackages (p: [ cfg.package ])}/${python.sitePackages}";
preStart = ''
- mkdir -vp ${cfg.buildbotDir}
- rm -fv $cfg.buildbotDir}/buildbot.tac
- ${cfg.package}/bin/buildbot-worker create-worker ${cfg.buildbotDir} ${cfg.masterUrl} ${cfg.workerUser} ${cfg.workerPass}
+ mkdir -vp "${cfg.buildbotDir}/info"
+ ${optionalString (cfg.hostMessage != null) ''
+ ln -sf "${pkgs.writeText "buildbot-worker-host" cfg.hostMessage}" "${cfg.buildbotDir}/info/host"
+ ''}
+ ${optionalString (cfg.adminMessage != null) ''
+ ln -sf "${pkgs.writeText "buildbot-worker-admin" cfg.adminMessage}" "${cfg.buildbotDir}/info/admin"
+ ''}
'';
serviceConfig = {
@@ -116,11 +173,9 @@ in {
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.home;
- Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages";
# NOTE: call twistd directly with stdout logging for systemd
- #ExecStart = "${cfg.package}/bin/buildbot-worker start --nodaemon ${cfg.buildbotDir}";
- ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac";
+ ExecStart = "${python.pkgs.twisted}/bin/twistd --nodaemon --pidfile= --logfile - --python ${tacFile}";
};
};
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index 7883680d46c..bf4b644c9b8 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -3,42 +3,50 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-services-foundationdb">
-
-FoundationDB
-
-Source: modules/services/databases/foundationdb.nix
-
-Upstream documentation:
-
-Maintainer: Austin Seipp
-
-Available version(s): 5.1.x, 5.2.x, 6.0.x
-
-FoundationDB (or "FDB") is an open source, distributed, transactional
-key-value store.
-
-Configuring and basic setup
-
-To enable FoundationDB, add the following to your
-configuration.nix:
-
+ FoundationDB
+
+ Source:
+ modules/services/databases/foundationdb.nix
+
+
+ Upstream documentation:
+
+
+
+ Maintainer: Austin Seipp
+
+
+ Available version(s): 5.1.x, 5.2.x, 6.0.x
+
+
+ FoundationDB (or "FDB") is an open source, distributed, transactional
+ key-value store.
+
+
+ Configuring and basic setup
+
+
+ To enable FoundationDB, add the following to your
+ configuration.nix:
services.foundationdb.enable = true;
services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
-
-
-The option is required,
-and must always be specified. Due to the fact FoundationDB network protocols and
-on-disk storage formats may change between (major) versions, and upgrades must
-be explicitly handled by the user, you must always manually specify this
-yourself so that the NixOS module will use the proper version. Note that minor,
-bugfix releases are always compatible.
-
-After running nixos-rebuild, you can verify whether
-FoundationDB is running by executing fdbcli (which is added
-to ):
-
+
+
+
+ The option is required, and
+ must always be specified. Due to the fact FoundationDB network protocols and
+ on-disk storage formats may change between (major) versions, and upgrades
+ must be explicitly handled by the user, you must always manually specify
+ this yourself so that the NixOS module will use the proper version. Note
+ that minor, bugfix releases are always compatible.
+
+
+
+ After running nixos-rebuild, you can verify whether
+ FoundationDB is running by executing fdbcli (which is
+ added to ):
$ sudo -u foundationdb fdbcli
Using cluster file `/etc/foundationdb/fdb.cluster'.
@@ -66,14 +74,14 @@ Cluster:
fdb>
-
-
-You can also write programs using the available client libraries.
-For example, the following Python program can be run in order to grab the
-cluster status, as a quick example. (This example uses
-nix-shell shebang support to automatically supply the
-necessary Python modules).
-
+
+
+
+ You can also write programs using the available client libraries. For
+ example, the following Python program can be run in order to grab the
+ cluster status, as a quick example. (This example uses
+ nix-shell shebang support to automatically supply the
+ necessary Python modules).
a@link> cat fdb-status.py
#! /usr/bin/env nix-shell
@@ -100,255 +108,336 @@ a@link> ./fdb-status.py
FoundationDB available: True
a@link>
-
-
-FoundationDB is run under the foundationdb user and
-group by default, but this may be changed in the NixOS configuration. The
-systemd unit foundationdb.service controls the
-fdbmonitor process.
-
-By default, the NixOS module for FoundationDB creates a single
-SSD-storage based database for development and basic usage. This storage engine
-is designed for SSDs and will perform poorly on HDDs; however it can handle far
-more data than the alternative "memory" engine and is a better default choice
-for most deployments. (Note that you can change the storage backend on-the-fly
-for a given FoundationDB cluster using fdbcli.)
-
-Furthermore, only 1 server process and 1 backup agent are started in the
-default configuration. See below for more on scaling to increase this.
-
-FoundationDB stores all data for all server processes under
-/var/lib/foundationdb. You can override this using
-, e.g.
-
+
+
+
+ FoundationDB is run under the foundationdb user and group
+ by default, but this may be changed in the NixOS configuration. The systemd
+ unit foundationdb.service controls the
+ fdbmonitor process.
+
+
+
+ By default, the NixOS module for FoundationDB creates a single SSD-storage
+ based database for development and basic usage. This storage engine is
+ designed for SSDs and will perform poorly on HDDs; however it can handle far
+ more data than the alternative "memory" engine and is a better default
+ choice for most deployments. (Note that you can change the storage backend
+ on-the-fly for a given FoundationDB cluster using
+ fdbcli.)
+
+
+
+ Furthermore, only 1 server process and 1 backup agent are started in the
+ default configuration. See below for more on scaling to increase this.
+
+
+
+ FoundationDB stores all data for all server processes under
+ /var/lib/foundationdb. You can override this using
+ , e.g.
services.foundationdb.dataDir = "/data/fdb";
-
-
-
-Similarly, logs are stored under
-/var/log/foundationdb by default, and there is a
-corresponding as well.
-
-
-
-Scaling processes and backup agents
-
-Scaling the number of server processes is quite easy; simply specify
- to be the number of
-FoundationDB worker processes that should be started on the machine.
-
-FoundationDB worker processes typically require 4GB of RAM per-process at
-minimum for good performance, so this option is set to 1 by default since the
-maximum amount of RAM is unknown. You're advised to abide by this restriction,
-so pick a number of processes so that each has 4GB or more.
-
-A similar option exists in order to scale backup agent processes,
-. Backup agents are not
-as performance/RAM sensitive, so feel free to experiment with the number of
-available backup processes.
-
-
-
-Clustering
-
-FoundationDB on NixOS works similarly to other Linux systems, so this
-section will be brief. Please refer to the full FoundationDB documentation for
-more on clustering.
-
-FoundationDB organizes clusters using a set of
-coordinators, which are just specially-designated worker
-processes. By default, every installation of FoundationDB on NixOS will start
-as its own individual cluster, with a single coordinator: the first worker
-process on localhost.
-
-Coordinators are specified globally using the
-/etc/foundationdb/fdb.cluster file, which all servers and
-client applications will use to find and join coordinators. Note that this file
-can not be managed by NixOS so easily: FoundationDB is
-designed so that it will rewrite the file at runtime for all clients and nodes
-when cluster coordinators change, with clients transparently handling this
-without intervention. It is fundamentally a mutable file, and you should not
-try to manage it in any way in NixOS.
-
-When dealing with a cluster, there are two main things you want to
-do:
-
-
- Add a node to the cluster for storage/compute.
- Promote an ordinary worker to a coordinator.
-
-
-A node must already be a member of the cluster in order to properly be
-promoted to a coordinator, so you must always add it first if you wish to
-promote it.
-
-To add a machine to a FoundationDB cluster:
-
-
- Choose one of the servers to start as the initial coordinator.
-
- Copy the /etc/foundationdb/fdb.cluster file
- from this server to all the other servers. Restart FoundationDB on all of
- these other servers, so they join the cluster.
- All of these servers are now connected and working together
- in the cluster, under the chosen coordinator.
-
-
-At this point, you can add as many nodes as you want by just repeating
-the above steps. By default there will still be a single coordinator: you can
-use fdbcli to change this and add new coordinators.
-
-As a convenience, FoundationDB can automatically assign coordinators
-based on the redundancy mode you wish to achieve for the cluster. Once all the
-nodes have been joined, simply set the replication policy, and then issue the
-coordinators auto command
-
-For example, assuming we have 3 nodes available, we can enable double
-redundancy mode, then auto-select coordinators. For double redundancy, 3
-coordinators is ideal: therefore FoundationDB will make
-every node a coordinator automatically:
+
+
+
+ Similarly, logs are stored under /var/log/foundationdb
+ by default, and there is a corresponding
+ as well.
+
+
+
+ Scaling processes and backup agents
+
+
+ Scaling the number of server processes is quite easy; simply specify
+ to be the number of
+ FoundationDB worker processes that should be started on the machine.
+
+
+
+ FoundationDB worker processes typically require 4GB of RAM per-process at
+ minimum for good performance, so this option is set to 1 by default since
+ the maximum amount of RAM is unknown. You're advised to abide by this
+ restriction, so pick a number of processes so that each has 4GB or more.
+
+
+
+ A similar option exists in order to scale backup agent processes,
+ . Backup agents are
+ not as performance/RAM sensitive, so feel free to experiment with the number
+ of available backup processes.
+
+
+
+ Clustering
+
+
+ FoundationDB on NixOS works similarly to other Linux systems, so this
+ section will be brief. Please refer to the full FoundationDB documentation
+ for more on clustering.
+
+
+
+ FoundationDB organizes clusters using a set of
+ coordinators, which are just specially-designated
+ worker processes. By default, every installation of FoundationDB on NixOS
+ will start as its own individual cluster, with a single coordinator: the
+ first worker process on localhost.
+
+
+
+ Coordinators are specified globally using the
+ /etc/foundationdb/fdb.cluster file, which all servers and
+ client applications will use to find and join coordinators. Note that this
+ file can not be managed by NixOS so easily:
+ FoundationDB is designed so that it will rewrite the file at runtime for all
+ clients and nodes when cluster coordinators change, with clients
+ transparently handling this without intervention. It is fundamentally a
+ mutable file, and you should not try to manage it in any way in NixOS.
+
+
+
+ When dealing with a cluster, there are two main things you want to do:
+
+
+
+
+
+ Add a node to the cluster for storage/compute.
+
+
+
+
+ Promote an ordinary worker to a coordinator.
+
+
+
+
+
+ A node must already be a member of the cluster in order to properly be
+ promoted to a coordinator, so you must always add it first if you wish to
+ promote it.
+
+
+
+ To add a machine to a FoundationDB cluster:
+
+
+
+
+
+ Choose one of the servers to start as the initial coordinator.
+
+
+
+
+ Copy the /etc/foundationdb/fdb.cluster file from this
+ server to all the other servers. Restart FoundationDB on all of these
+ other servers, so they join the cluster.
+
+
+
+
+ All of these servers are now connected and working together in the
+ cluster, under the chosen coordinator.
+
+
+
+
+
+ At this point, you can add as many nodes as you want by just repeating the
+ above steps. By default there will still be a single coordinator: you can
+ use fdbcli to change this and add new coordinators.
+
+
+
+ As a convenience, FoundationDB can automatically assign coordinators based
+ on the redundancy mode you wish to achieve for the cluster. Once all the
+ nodes have been joined, simply set the replication policy, and then issue
+ the coordinators auto command
+
+
+
+ For example, assuming we have 3 nodes available, we can enable double
+ redundancy mode, then auto-select coordinators. For double redundancy, 3
+ coordinators is ideal: therefore FoundationDB will make
+ every node a coordinator automatically:
+
fdbcli> configure double ssd
fdbcli> coordinators auto
-This will transparently update all the servers within seconds, and
-appropriately rewrite the fdb.cluster file, as well as
-informing all client processes to do the same.
-
-
-
-Client connectivity
-
-By default, all clients must use the current
-fdb.cluster file to access a given FoundationDB cluster.
-This file is located by default in
-/etc/foundationdb/fdb.cluster on all machines with the
-FoundationDB service enabled, so you may copy the active one from your cluster
-to a new node in order to connect, if it is not part of the cluster.
-
-
-
-Client authorization and TLS
-
-By default, any user who can connect to a FoundationDB process with the
-correct cluster configuration can access anything. FoundationDB uses a
-pluggable design to transport security, and out of the box it supports a
-LibreSSL-based plugin for TLS support. This plugin not only does in-flight
-encryption, but also performs client authorization based on the given
-endpoint's certificate chain. For example, a FoundationDB server may be
-configured to only accept client connections over TLS, where the client TLS
-certificate is from organization Acme Co in the
-Research and Development unit.
-
-Configuring TLS with FoundationDB is done using the
- options in order to control the peer
-verification string, as well as the certificate and its private key.
-
-Note that the certificate and its private key must be accessible to the
-FoundationDB user account that the server runs under. These files are also NOT
-managed by NixOS, as putting them into the store may reveal private
-information.
-
-After you have a key and certificate file in place, it is not enough to
-simply set the NixOS module options -- you must also configure the
-fdb.cluster file to specify that a given set of coordinators
-use TLS. This is as simple as adding the suffix :tls to your
-cluster coordinator configuration, after the port number. For example, assuming
-you have a coordinator on localhost with the default configuration, simply
-specifying:
+
+ This will transparently update all the servers within seconds, and
+ appropriately rewrite the fdb.cluster file, as well as
+ informing all client processes to do the same.
+
+
+
+ Client connectivity
+
+
+ By default, all clients must use the current fdb.cluster
+ file to access a given FoundationDB cluster. This file is located by default
+ in /etc/foundationdb/fdb.cluster on all machines with the
+ FoundationDB service enabled, so you may copy the active one from your
+ cluster to a new node in order to connect, if it is not part of the cluster.
+
+
+
+ Client authorization and TLS
+
+
+ By default, any user who can connect to a FoundationDB process with the
+ correct cluster configuration can access anything. FoundationDB uses a
+ pluggable design to transport security, and out of the box it supports a
+ LibreSSL-based plugin for TLS support. This plugin not only does in-flight
+ encryption, but also performs client authorization based on the given
+ endpoint's certificate chain. For example, a FoundationDB server may be
+ configured to only accept client connections over TLS, where the client TLS
+ certificate is from organization Acme Co in the
+ Research and Development unit.
+
+
+
+ Configuring TLS with FoundationDB is done using the
+ options in order to control the
+ peer verification string, as well as the certificate and its private key.
+
+
+
+ Note that the certificate and its private key must be accessible to the
+ FoundationDB user account that the server runs under. These files are also
+ NOT managed by NixOS, as putting them into the store may reveal private
+ information.
+
+
+
+ After you have a key and certificate file in place, it is not enough to
+ simply set the NixOS module options -- you must also configure the
+ fdb.cluster file to specify that a given set of
+ coordinators use TLS. This is as simple as adding the suffix
+ :tls to your cluster coordinator configuration, after the
+ port number. For example, assuming you have a coordinator on localhost with
+ the default configuration, simply specifying:
+
XXXXXX:XXXXXX@127.0.0.1:4500:tls
-will configure all clients and server processes to use TLS from now
-on.
-
-
-
-Backups and Disaster Recovery
-
-The usual rules for doing FoundationDB backups apply on NixOS as written
-in the FoundationDB manual. However, one important difference is the security
-profile for NixOS: by default, the foundationdb systemd unit
-uses Linux namespaces to restrict write access to the
-system, except for the log directory, data directory, and the
-/etc/foundationdb/ directory. This is enforced by default
-and cannot be disabled.
-
-However, a side effect of this is that the fdbbackup
-command doesn't work properly for local filesystem backups: FoundationDB uses a
-server process alongside the database processes to perform backups and copy the
-backups to the filesystem. As a result, this process is put under the
-restricted namespaces above: the backup process can only write to a limited
-number of paths.
-
-In order to allow flexible backup locations on local disks, the
-FoundationDB NixOS module supports a
- option. This option
-takes a list of paths, and adds them to the systemd unit, allowing the
-processes inside the service to write (and read) the specified
-directories.
-
-For example, to create backups in /opt/fdb-backups,
-first set up the paths in the module options:
+
+ will configure all clients and server processes to use TLS from now on.
+
+
+
+ Backups and Disaster Recovery
+
+
+ The usual rules for doing FoundationDB backups apply on NixOS as written in
+ the FoundationDB manual. However, one important difference is the security
+ profile for NixOS: by default, the foundationdb systemd
+ unit uses Linux namespaces to restrict write access to
+ the system, except for the log directory, data directory, and the
+ /etc/foundationdb/ directory. This is enforced by default
+ and cannot be disabled.
+
+
+
+ However, a side effect of this is that the fdbbackup
+ command doesn't work properly for local filesystem backups: FoundationDB
+ uses a server process alongside the database processes to perform backups
+ and copy the backups to the filesystem. As a result, this process is put
+ under the restricted namespaces above: the backup process can only write to
+ a limited number of paths.
+
+
+
+ In order to allow flexible backup locations on local disks, the FoundationDB
+ NixOS module supports a
+ option. This
+ option takes a list of paths, and adds them to the systemd unit, allowing
+ the processes inside the service to write (and read) the specified
+ directories.
+
+
+
+ For example, to create backups in /opt/fdb-backups, first
+ set up the paths in the module options:
+
services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
-Restart the FoundationDB service, and it will now be able to write to
-this directory (even if it does not yet exist.) Note: this path
-must exist before restarting the unit. Otherwise, systemd
-will not include it in the private FoundationDB namespace (and it will not add
-it dynamically at runtime).
+
+ Restart the FoundationDB service, and it will now be able to write to this
+ directory (even if it does not yet exist.) Note: this path
+ must exist before restarting the unit. Otherwise,
+ systemd will not include it in the private FoundationDB namespace (and it
+ will not add it dynamically at runtime).
+
-You can now perform a backup:
+
+ You can now perform a backup:
+
$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups
$ sudo -u foundationdb fdbbackup status -t default
-
-
-
-Known limitations
-
-The FoundationDB setup for NixOS should currently be considered beta.
-FoundationDB is not new software, but the NixOS compilation and integration has
-only undergone fairly basic testing of all the available functionality.
-
-
- There is no way to specify individual parameters for
- individual fdbserver processes. Currently, all server
- processes inherit all the global fdbmonitor settings.
-
- Ruby bindings are not currently installed.
- Go bindings are not currently installed.
-
-
-
-
-Options
-
-NixOS's FoundationDB module allows you to configure all of the most
-relevant configuration options for fdbmonitor, matching it
-quite closely. A complete list of options for the FoundationDB module may be
-found here. You should
-also read the FoundationDB documentation as well.
-
-
-
-Full documentation
-
-FoundationDB is a complex piece of software, and requires careful
-administration to properly use. Full documentation for administration can be
-found here: .
-
-
-
+
+
+ Known limitations
+
+
+ The FoundationDB setup for NixOS should currently be considered beta.
+ FoundationDB is not new software, but the NixOS compilation and integration
+ has only undergone fairly basic testing of all the available functionality.
+
+
+
+
+
+ There is no way to specify individual parameters for individual
+ fdbserver processes. Currently, all server processes
+ inherit all the global fdbmonitor settings.
+
+
+
+
+ Ruby bindings are not currently installed.
+
+
+
+
+ Go bindings are not currently installed.
+
+
+
+
+
+ Options
+
+
+ NixOS's FoundationDB module allows you to configure all of the most relevant
+ configuration options for fdbmonitor, matching it quite
+ closely. A complete list of options for the FoundationDB module may be found
+ here. You should
+ also read the FoundationDB documentation as well.
+
+
+
+ Full documentation
+
+
+ FoundationDB is a complex piece of software, and requires careful
+ administration to properly use. Full documentation for administration can be
+ found here: .
+
+
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index f59fb1c8177..6edb1503c23 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -55,7 +55,7 @@ in
package = mkOption {
type = types.package;
- example = literalExample "pkgs.postgresql96";
+ example = literalExample "pkgs.postgresql_9_6";
description = ''
PostgreSQL package to use.
'';
@@ -118,7 +118,7 @@ in
extraPlugins = mkOption {
type = types.listOf types.path;
default = [];
- example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]";
+ example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_4; }) ]";
description = ''
When this list contains elements a new store path is created.
PostgreSQL and the elements are symlinked into it. Then pg_config,
@@ -167,9 +167,9 @@ in
# Note: when changing the default, make it conditional on
# ‘system.stateVersion’ to maintain compatibility with existing
# systems!
- mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96
- else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95
- else pkgs.postgresql94);
+ mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6
+ else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5
+ else pkgs.postgresql_9_4);
services.postgresql.dataDir =
mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
@@ -188,6 +188,8 @@ in
uid = config.ids.uids.postgres;
group = "postgres";
description = "PostgreSQL server user";
+ home = "${cfg.dataDir}";
+ useDefaultShell = true;
};
users.groups.postgres.gid = config.ids.gids.postgres;
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index 1aaf3396324..14f4d4909bc 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -3,36 +3,39 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-postgresql">
-
-PostgreSQL
-
+ PostgreSQL
-
-Source: modules/services/databases/postgresql.nix
-
-Upstream documentation:
-
+
+ Source:
+ modules/services/databases/postgresql.nix
+
+
+ Upstream documentation:
+
+
-
-PostgreSQL is an advanced, free relational database.
-
-Configuring
-
-To enable PostgreSQL, add the following to your
-configuration.nix:
-
+
+ PostgreSQL is an advanced, free relational database.
+
+
+
+ Configuring
+
+
+ To enable PostgreSQL, add the following to your
+ configuration.nix:
= true;
- = pkgs.postgresql94;
+ = pkgs.postgresql_9_4;
-
-Note that you are required to specify the desired version of
-PostgreSQL (e.g. pkgs.postgresql94). Since
-upgrading your PostgreSQL version requires a database dump and reload
-(see below), NixOS cannot provide a default value for
- such as the most recent
-release of PostgreSQL.
+ Note that you are required to specify the desired version of PostgreSQL
+ (e.g. pkgs.postgresql_9_4). Since upgrading your
+ PostgreSQL version requires a database dump and reload (see below), NixOS
+ cannot provide a default value for
+ such as the most recent
+ release of PostgreSQL.
+
-By default, PostgreSQL stores its databases in
-/var/db/postgresql. You can override this using
-, e.g.
-
+
+ By default, PostgreSQL stores its databases in
+ /var/db/postgresql. You can override this using
+ , e.g.
= "/data/postgresql";
-
-
-
-
-
-
-Upgrading
-
-FIXME: document dump/upgrade/load cycle.
-
-
-
-
-Options
-
- A complete list of options for the PostgreSQL module may be found here.
-
-
-
-
+
+
+
+ Upgrading
+
+
+ FIXME: document dump/upgrade/load cycle.
+
+
+
+ Options
+
+
+ A complete list of options for the PostgreSQL module may be found
+ here.
+
+
diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml
index d9c8b711c45..8045d5fa14f 100644
--- a/nixos/modules/services/desktops/flatpak.xml
+++ b/nixos/modules/services/desktops/flatpak.xml
@@ -3,51 +3,54 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-services-flatpak">
-
-Flatpak
-
-Source: modules/services/desktop/flatpak.nix
-
-Upstream documentation:
-
-Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.
-
-
- To enable Flatpak, add the following to your configuration.nix:
-
-
+ Flatpak
+
+ Source:
+ modules/services/desktop/flatpak.nix
+
+
+ Upstream documentation:
+
+
+
+ Flatpak is a system for building, distributing, and running sandboxed desktop
+ applications on Linux.
+
+
+ To enable Flatpak, add the following to your
+ configuration.nix:
+
= true;
-
-
-
- For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your configuration.nix:
-
-
+
+
+ For the sandboxed apps to work correctly, desktop integration portals need to
+ be installed. If you run GNOME, this will be handled automatically for you;
+ in other cases, you will need to add something like the following to your
+ configuration.nix:
+
= [ pkgs.xdg-desktop-portal-gtk ];
-
-
-
- Then, you will need to add a repository, for example, Flathub, either using the following commands:
-
-
+
+
+ Then, you will need to add a repository, for example,
+ Flathub,
+ either using the following commands:
+
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak update
-
- or by opening the repository file in GNOME Software.
-
-
-
+ or by opening the
+ repository
+ file in GNOME Software.
+
+
Finally, you can search and install programs:
-
-
+
flatpak search bustle
flatpak install flathub org.freedesktop.Bustle
flatpak run org.freedesktop.Bustle
-
Again, GNOME Software offers graphical interface for these tasks.
-
+
diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix
new file mode 100644
index 00000000000..55d5e703aa1
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/rygel.nix
@@ -0,0 +1,30 @@
+# rygel service.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ ###### interface
+ options = {
+ services.gnome3.rygel = {
+ enable = mkOption {
+ default = false;
+ description = ''
+ Whether to enable Rygel UPnP Mediaserver.
+
+ You will need to also allow UPnP connections in firewall, see the following comment.
+ '';
+ type = types.bool;
+ };
+ };
+ };
+
+ ###### implementation
+ config = mkIf config.services.gnome3.rygel.enable {
+ environment.systemPackages = [ pkgs.gnome3.rygel ];
+
+ services.dbus.packages = [ pkgs.gnome3.rygel ];
+
+ systemd.packages = [ pkgs.gnome3.rygel ];
+ };
+}
diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix
new file mode 100644
index 00000000000..cf26e05d5c1
--- /dev/null
+++ b/nixos/modules/services/desktops/gsignond.nix
@@ -0,0 +1,43 @@
+# Accounts-SSO gSignOn daemon
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ package = pkgs.gsignond.override { plugins = config.services.gsignond.plugins; };
+in
+{
+
+ ###### interface
+
+ options = {
+
+ services.gsignond = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable gSignOn daemon, a DBus service
+ which performs user authentication on behalf of its clients.
+ '';
+ };
+
+ plugins = mkOption {
+ type = types.listOf types.package;
+ default = [];
+ description = ''
+ What plugins to use with the gSignOn daemon.
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+ config = mkIf config.services.gsignond.enable {
+ environment.etc."gsignond.conf".source = "${package}/etc/gsignond.conf";
+ services.dbus.packages = [ package ];
+ };
+
+}
diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix
index e3f74df3e57..e4e47cfbd43 100644
--- a/nixos/modules/services/desktops/profile-sync-daemon.nix
+++ b/nixos/modules/services/desktops/profile-sync-daemon.nix
@@ -4,22 +4,7 @@ with lib;
let
cfg = config.services.psd;
-
- configFile = ''
- ${optionalString (cfg.users != [ ]) ''
- USERS="${concatStringsSep " " cfg.users}"
- ''}
-
- ${optionalString (cfg.browsers != [ ]) ''
- BROWSERS="${concatStringsSep " " cfg.browsers}"
- ''}
-
- ${optionalString (cfg.volatile != "") "VOLATILE=${cfg.volatile}"}
- ${optionalString (cfg.daemonFile != "") "DAEMON_FILE=${cfg.daemonFile}"}
- '';
-
in {
-
options.services.psd = with types; {
enable = mkOption {
type = bool;
@@ -28,32 +13,6 @@ in {
Whether to enable the Profile Sync daemon.
'';
};
-
- users = mkOption {
- type = listOf str;
- default = [ ];
- example = [ "demo" ];
- description = ''
- A list of users whose browser profiles should be sync'd to tmpfs.
- '';
- };
-
- browsers = mkOption {
- type = listOf str;
- default = [ ];
- example = [ "chromium" "firefox" ];
- description = ''
- A list of browsers to sync. Available choices are:
-
- chromium chromium-dev conkeror.mozdev.org epiphany firefox
- firefox-trunk google-chrome google-chrome-beta google-chrome-unstable
- heftig-aurora icecat luakit midori opera opera-developer opera-beta
- qupzilla palemoon rekonq seamonkey
-
- An empty list will enable all browsers.
- '';
- };
-
resyncTimer = mkOption {
type = str;
default = "1h";
@@ -66,80 +25,53 @@ in {
omitted.
'';
};
-
- volatile = mkOption {
- type = str;
- default = "/run/psd-profiles";
- description = ''
- The directory where browser profiles should reside(this should be
- mounted as a tmpfs). Do not include a trailing backslash.
- '';
- };
-
- daemonFile = mkOption {
- type = str;
- default = "/run/psd";
- description = ''
- Where the pid and backup configuration files will be stored.
- '';
- };
};
config = mkIf cfg.enable {
- assertions = [
- { assertion = cfg.users != [];
- message = "services.psd.users must contain at least one user";
- }
- ];
-
systemd = {
- services = {
- psd = {
- description = "Profile Sync daemon";
- wants = [ "psd-resync.service" "local-fs.target" ];
- wantedBy = [ "multi-user.target" ];
- preStart = "mkdir -p ${cfg.volatile}";
-
- path = with pkgs; [ glibc rsync gawk ];
-
- unitConfig = {
- RequiresMountsFor = [ "/home/" ];
+ user = {
+ services = {
+ psd = {
+ enable = true;
+ description = "Profile Sync daemon";
+ wants = [ "psd-resync.service" "local-fs.target" ];
+ wantedBy = [ "default.target" ];
+ path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
+ unitConfig = {
+ RequiresMountsFor = [ "/home/" ];
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = "yes";
+ ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon sync";
+ ExecStop = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon unsync";
+ };
};
- serviceConfig = {
- Type = "oneshot";
- RemainAfterExit = "yes";
- ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon sync";
- ExecStop = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon unsync";
+ psd-resync = {
+ enable = true;
+ description = "Timed profile resync";
+ after = [ "psd.service" ];
+ wants = [ "psd-resync.timer" ];
+ partOf = [ "psd.service" ];
+ wantedBy = [ "default.target" ];
+ path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ];
+ serviceConfig = {
+ Type = "oneshot";
+ ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync";
+ };
};
};
- psd-resync = {
- description = "Timed profile resync";
- after = [ "psd.service" ];
- wants = [ "psd-resync.timer" ];
- partOf = [ "psd.service" ];
-
- path = with pkgs; [ glibc rsync gawk ];
+ timers.psd-resync = {
+ description = "Timer for profile sync daemon - ${cfg.resyncTimer}";
+ partOf = [ "psd-resync.service" "psd.service" ];
- serviceConfig = {
- Type = "oneshot";
- ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync";
+ timerConfig = {
+ OnUnitActiveSec = "${cfg.resyncTimer}";
};
};
};
-
- timers.psd-resync = {
- description = "Timer for profile sync daemon - ${cfg.resyncTimer}";
- partOf = [ "psd-resync.service" "psd.service" ];
-
- timerConfig = {
- OnUnitActiveSec = "${cfg.resyncTimer}";
- };
- };
};
-
- environment.etc."psd.conf".text = configFile;
-
};
}
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 94eb2e6a77b..6cf20cf4aa7 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -3,150 +3,148 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-services-emacs">
-
- Emacs
-
-
+
+ Emacs is an
+ extensible, customizable, self-documenting real-time display editor — and
+ more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp
+ programming language with extensions to support text editing.
+
+
+ Emacs runs within a graphical desktop environment using the X Window System,
+ but works equally well on a text terminal. Under
+ macOS, a "Mac port" edition is available, which
+ uses Apple's native GUI frameworks.
+
+
+ Nixpkgs provides a superior environment for
+ running Emacs. It's simple to create custom builds
+ by overriding the default packages. Chaotic collections of Emacs Lisp code
+ and extensions can be brought under control using declarative package
+ management. NixOS even provides a
+ systemd user service for automatically starting the Emacs
+ daemon.
+
+
+ Installing <application>Emacs</application>
- Emacs
- is an extensible, customizable, self-documenting real-time display
- editor — and more. At its core is an interpreter for Emacs Lisp, a
- dialect of the Lisp programming language with extensions to
- support text editing.
+ Emacs can be installed in the normal way for Nix (see
+ ). In addition, a NixOS
+ service can be enabled.
-
- Emacs runs within a graphical desktop environment using the X
- Window System, but works equally well on a text terminal. Under
- macOS, a "Mac port" edition is
- available, which uses Apple's native GUI frameworks.
-
+
+ The Different Releases of Emacs
+
+
+ Nixpkgs defines several basic Emacs packages.
+ The following are attributes belonging to the pkgs set:
+
+
+
+ emacs
+
+
+ emacs25
+
+
+
+ The latest stable version of Emacs 25 using the
+ GTK+ 2
+ widget toolkit.
+
+
+
+
+
+ emacs25-nox
+
+
+
+ Emacs 25 built without any dependency on X11 libraries.
+
+
+
+
+
+ emacsMacport
+
+
+ emacs25Macport
+
+
+
+ Emacs 25 with the "Mac port" patches, providing a more native look and
+ feel under macOS.
+
+
+
+
+
+
+
+ If those aren't suitable, then the following imitation Emacs editors are
+ also available in Nixpkgs:
+ Zile,
+ mg,
+ Yi.
+
+
-
- Nixpkgs provides a superior environment
- for running Emacs. It's simple to
- create custom builds by overriding the default packages. Chaotic
- collections of Emacs Lisp code and extensions can be brought under
- control using declarative package
- management. NixOS even provides a
- systemd user service for automatically
- starting the Emacs daemon.
-
+
+ Adding Packages to Emacs
-
- Installing <application>Emacs</application>
+
+ Emacs includes an entire ecosystem of functionality beyond text editing,
+ including a project planner, mail and news reader, debugger interface,
+ calendar, and more.
+
+
+ Most extensions are gotten with the Emacs packaging system
+ (package.el) from
+ Emacs Lisp Package Archive
+ (ELPA),
+ MELPA,
+ MELPA Stable, and
+ Org ELPA. Nixpkgs is
+ regularly updated to mirror all these archives.
+
+
+
+ Under NixOS, you can continue to use
+ package-list-packages and
+ package-install to install packages. You can also
+ declare the set of Emacs packages you need using the derivations from
+ Nixpkgs. The rest of this section discusses declarative installation of
+ Emacs packages through nixpkgs.
+
+
+
- Emacs can be installed in the normal way for Nix (see
- ).
- In addition, a NixOS service
- can be enabled.
+ This documentation describes the new Emacs packages framework in NixOS
+ 16.03 (emacsPackagesNg) which should not be confused
+ with the previous and deprecated framework
+ (emacs24Packages).
-
-
- The Different Releases of Emacs
-
-
- Nixpkgs defines several basic Emacs
- packages. The following are attributes belonging to the
- pkgs set:
-
-
-
- emacs
- emacs25
-
-
- The latest stable version of Emacs 25 using the GTK+ 2 widget
- toolkit.
-
-
-
-
- emacs25-nox
-
-
- Emacs 25 built without any dependency on X11
- libraries.
-
-
-
-
- emacsMacport
- emacs25Macport
-
-
- Emacs 25 with the "Mac port" patches, providing a more
- native look and feel under macOS.
-
-
-
-
-
-
-
- If those aren't suitable, then the following imitation Emacs
- editors are also available in Nixpkgs:
- Zile,
- mg,
- Yi.
-
-
-
-
- Adding Packages to Emacs
-
- Emacs includes an entire ecosystem of functionality beyond
- text editing, including a project planner, mail and news
- reader, debugger interface, calendar, and more.
-
-
-
- Most extensions are gotten with the Emacs packaging system
- (package.el) from Emacs Lisp Package Archive
- (ELPA),
- MELPA,
- MELPA Stable,
- and Org ELPA.
- Nixpkgs is regularly updated to mirror all these archives.
-
-
-
- Under NixOS, you can continue to use
- package-list-packages and
- package-install to install packages. You
- can also declare the set of Emacs packages you need using the
- derivations from Nixpkgs. The rest of this section discusses
- declarative installation of Emacs packages through nixpkgs.
-
-
-
-
- This documentation describes the new Emacs packages
- framework in NixOS 16.03
- (emacsPackagesNg) which should not be
- confused with the previous and deprecated framework
- (emacs24Packages).
-
-
-
-
- The first step to declare the list of packages you want in
- your Emacs installation is to create a dedicated
- derivation. This can be done in a dedicated
- emacs.nix file such as:
-
-
- Nix expression to build Emacs with packages (<filename>emacs.nix</filename>)
-
+
+
+
+ The first step to declare the list of packages you want in your Emacs
+ installation is to create a dedicated derivation. This can be done in a
+ dedicated emacs.nix file such as:
+
+ Nix expression to build Emacs with packages (<filename>emacs.nix</filename>)
+
/*
This is a nix expression to build Emacs and some Emacs packages I like
from source on any distribution where Nix is installed. This will install
@@ -181,119 +179,104 @@ in
pkgs.notmuch # From main packages set
])
-
-
-
-
-
- The first non-comment line in this file
- ({ pkgs ? ... })
- indicates that the whole file represents a function.
-
-
-
-
-
- The let expression below defines a
- myEmacs binding pointing to the current
- stable version of Emacs. This binding is here to separate the
- choice of the Emacs binary from the specification of the
- required packages.
-
-
-
-
-
- This generates an emacsWithPackages
- function. It takes a single argument: a function from a
- package set to a list of packages (the packages that will
- be available in Emacs).
-
-
-
-
-
- The rest of the file specifies the list of packages to
- install. In the example, two packages
- (magit and
- zerodark-theme) are taken from MELPA
- stable.
-
-
-
-
-
- Two packages (undo-tree and
- zoom-frm) are taken from MELPA.
-
-
-
-
- Three packages are taken from GNU ELPA.
-
-
-
-
- notmuch is taken from a nixpkgs derivation
- which contains an Emacs mode.
-
-
-
-
+
+
+
+
+ The first non-comment line in this file ({ pkgs ? ...
+ }) indicates that the whole file represents a function.
-
+
+
- The result of this configuration will be an
- emacs command which launches Emacs with all
- of your chosen packages in the load-path.
+ The let expression below defines a
+ myEmacs binding pointing to the current stable
+ version of Emacs. This binding is here to separate the choice of the
+ Emacs binary from the specification of the required packages.
-
+
+
- You can check that it works by executing this in a terminal:
-
+ This generates an emacsWithPackages function. It
+ takes a single argument: a function from a package set to a list of
+ packages (the packages that will be available in Emacs).
+
+
+
+
+ The rest of the file specifies the list of packages to install. In the
+ example, two packages (magit and
+ zerodark-theme) are taken from MELPA stable.
+
+
+
+
+ Two packages (undo-tree and
+ zoom-frm) are taken from MELPA.
+
+
+
+
+ Three packages are taken from GNU ELPA.
+
+
+
+
+ notmuch is taken from a nixpkgs derivation which
+ contains an Emacs mode.
+
+
+
+
+
+
+ The result of this configuration will be an emacs
+ command which launches Emacs with all of your chosen packages in the
+ load-path.
+
+
+
+ You can check that it works by executing this in a terminal:
$ nix-build emacs.nix
$ ./result/bin/emacs -q
+ and then typing M-x package-initialize. Check that you
+ can use all the packages you want in this Emacs instance. For example, try
+ switching to the zerodark theme through M-x load-theme <RET>
+ zerodark <RET> y.
+
- and then typing M-x package-initialize.
- Check that you can use all the packages you want in this
- Emacs instance. For example, try switching to the zerodark
- theme through
- M-x load-theme <RET> zerodark <RET> y.
-
-
-
-
- A few popular extensions worth checking out are: auctex,
- company, edit-server, flycheck, helm, iedit, magit,
- multiple-cursors, projectile, and yasnippet.
-
-
-
-
- The list of available packages in the various ELPA
- repositories can be seen with the following commands:
-
- Querying Emacs packages
-
+
+ A few popular extensions worth checking out are: auctex, company,
+ edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile,
+ and yasnippet.
+
+
+
+
+ The list of available packages in the various ELPA repositories can be seen
+ with the following commands:
+
+ Querying Emacs packages
+" -qaP -A emacsPackagesNg.elpaPackages
nix-env -f "" -qaP -A emacsPackagesNg.melpaPackages
nix-env -f "" -qaP -A emacsPackagesNg.melpaStablePackages
nix-env -f "" -qaP -A emacsPackagesNg.orgPackages
]]>
-
-
-
-
- If you are on NixOS, you can install this particular Emacs for
- all users by adding it to the list of system packages
- (see ). Simply
- modify your file configuration.nix to
- make it contain:
-
- Custom Emacs in <filename>configuration.nix</filename>
-
+
+
+
+ If you are on NixOS, you can install this particular Emacs for all users by
+ adding it to the list of system packages (see
+ ). Simply modify your file
+ configuration.nix to make it contain:
+
+ Custom Emacs in <filename>configuration.nix</filename>
+" -qaP -A emacsPackagesNg.orgPackages
];
}
]]>
-
-
+
+
-
- In this case, the next nixos-rebuild switch
- will take care of adding your emacs to the
- PATH environment variable
- (see ).
-
+
+ In this case, the next nixos-rebuild switch will take
+ care of adding your emacs to the PATH
+ environment variable (see ).
+
-
- If you are not on NixOS or want to install this particular
- Emacs only for yourself, you can do so by adding it to your
- ~/.config/nixpkgs/config.nix
- (see Nixpkgs manual):
-
- Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename>
-
+ If you are not on NixOS or want to install this particular Emacs only for
+ yourself, you can do so by adding it to your
+ ~/.config/nixpkgs/config.nix (see
+ Nixpkgs
+ manual):
+
+ Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename>
+
-
-
-
-
- In this case, the next
- nix-env -f '<nixpkgs>' -iA myemacs
- will take care of adding your emacs to the
- PATH environment variable.
-
-
-
-
- Advanced Emacs Configuration
+
+
-
- If you want, you can tweak the Emacs package itself from your
- emacs.nix. For example, if you want to
- have a GTK+3-based Emacs instead of the default GTK+2-based
- binary and remove the automatically generated
- emacs.desktop (useful is you only use
- emacsclient), you can change your file
- emacs.nix in this way:
-
+
+ In this case, the next nix-env -f '<nixpkgs>' -iA
+ myemacs will take care of adding your emacs to the
+ PATH environment variable.
+
+
-
- Custom Emacs build
-
+ Advanced Emacs Configuration
+
+
+ If you want, you can tweak the Emacs package itself from your
+ emacs.nix. For example, if you want to have a
+ GTK+3-based Emacs instead of the default GTK+2-based binary and remove the
+ automatically generated emacs.desktop (useful is you
+ only use emacsclient), you can change your file
+ emacs.nix in this way:
+
+
+
+ Custom Emacs build
+ {} }:
let
myEmacs = (pkgs.emacs.override {
@@ -370,161 +352,143 @@ let
});
in [...]
]]>
-
+
-
- After building this file as shown in ,
- you will get an GTK3-based Emacs binary pre-loaded with your
- favorite packages.
-
-
+
+ After building this file as shown in , you
+ will get an GTK3-based Emacs binary pre-loaded with your favorite packages.
+
-
-
+
Running Emacs as a Service
+
- NixOS provides an optional
- systemd service which launches
-
- Emacs daemon
-
- with the user's login session.
+ NixOS provides an optional
+ systemd service which launches
+
+ Emacs daemon with the user's login session.
- Source:
- modules/services/editors/emacs.nix
+ Source:
+ modules/services/editors/emacs.nix
- Enabling the Service
-
-
- To install and enable the systemd
- user service for Emacs daemon, add the following to your
- configuration.nix:
+ Enabling the Service
+
+ To install and enable the systemd user service for Emacs
+ daemon, add the following to your configuration.nix:
= true;
= import /home/cassou/.emacs.d { pkgs = pkgs; };
-
-
-
- The services.emacs.package option allows a
- custom derivation to be used, for example, one created by
- emacsWithPackages.
-
-
-
- Ensure that the Emacs server is enabled for your user's Emacs
- configuration, either by customizing the
- server-mode variable, or by adding
- (server-start) to
- ~/.emacs.d/init.el.
-
-
-
- To start the daemon, execute the following:
-
+
+
+
+ The services.emacs.package option allows a custom
+ derivation to be used, for example, one created by
+ emacsWithPackages.
+
+
+
+ Ensure that the Emacs server is enabled for your user's Emacs
+ configuration, either by customizing the server-mode
+ variable, or by adding (server-start) to
+ ~/.emacs.d/init.el.
+
+
+
+ To start the daemon, execute the following:
$ nixos-rebuild switch # to activate the new configuration.nix
$ systemctl --user daemon-reload # to force systemd reload
$ systemctl --user start emacs.service # to start the Emacs daemon
-
- The server should now be ready to serve Emacs clients.
-
-
+ The server should now be ready to serve Emacs clients.
+
- Starting the client
-
- Ensure that the emacs server is enabled, either by customizing
- the server-mode variable, or by adding
- (server-start) to
- ~/.emacs.
-
+ Starting the client
-
- To connect to the emacs daemon, run one of the following:
-
+ Ensure that the emacs server is enabled, either by customizing the
+ server-mode variable, or by adding
+ (server-start) to ~/.emacs.
+
+
+
+ To connect to the emacs daemon, run one of the following:
+
-
+
- Configuring the <varname>EDITOR</varname> variable
-
-
-
- If is
- true, the EDITOR variable
- will be set to a wrapper script which launches
- emacsclient.
-
-
-
- Any setting of EDITOR in the shell config
- files will override
- services.emacs.defaultEditor.
- To make sure EDITOR refers to the Emacs
- wrapper script, remove any existing EDITOR
- assignment from .profile,
- .bashrc, .zshenv or
- any other shell config file.
-
-
-
- If you have formed certain bad habits when editing files,
- these can be corrected with a shell alias to the wrapper
- script:
- alias vi=$EDITOR
-
+ Configuring the <varname>EDITOR</varname> variable
+
+
+
+
+ If is
+ true, the EDITOR variable will be set
+ to a wrapper script which launches emacsclient.
+
+
+
+ Any setting of EDITOR in the shell config files will
+ override services.emacs.defaultEditor. To make sure
+ EDITOR refers to the Emacs wrapper script, remove any
+ existing EDITOR assignment from
+ .profile, .bashrc,
+ .zshenv or any other shell config file.
+
+
+
+ If you have formed certain bad habits when editing files, these can be
+ corrected with a shell alias to the wrapper script:
+alias vi=$EDITOR
+
- Per-User Enabling of the Service
-
-
- In general, systemd user services
- are globally enabled by symlinks in
- /etc/systemd/user. In the case where
- Emacs daemon is not wanted for all users, it is possible to
- install the service but not globally enable it:
+ Per-User Enabling of the Service
+
+ In general, systemd user services are globally enabled
+ by symlinks in /etc/systemd/user. In the case where
+ Emacs daemon is not wanted for all users, it is possible to install the
+ service but not globally enable it:
= false;
= true;
-
-
-
- To enable the systemd user service for just
- the currently logged in user, run:
-
- systemctl --user enable emacs
-
- This will add the symlink
- ~/.config/systemd/user/emacs.service.
-
+
+
+
+ To enable the systemd user service for just the
+ currently logged in user, run:
+systemctl --user enable emacs
+ This will add the symlink
+ ~/.config/systemd/user/emacs.service.
+
-
-
-
+
Configuring Emacs
- The Emacs init file should be changed to load the extension
- packages at startup:
-
-
- Package initialization in <filename>.emacs</filename>
-
+ Package initialization in <filename>.emacs</filename>
+
-
+
- After the declarative emacs package configuration has been
- tested, previously downloaded packages can be cleaned up by
- removing ~/.emacs.d/elpa (do make a backup
- first, in case you forgot a package).
+ After the declarative emacs package configuration has been tested,
+ previously downloaded packages can be cleaned up by removing
+ ~/.emacs.d/elpa (do make a backup first, in case you
+ forgot a package).
-
- A Major Mode for Nix Expressions
+ A Major Mode for Nix Expressions
-
- Of interest may be melpaPackages.nix-mode,
- which provides syntax highlighting for the Nix language. This is
- particularly convenient if you regularly edit Nix files.
-
+
+ Of interest may be melpaPackages.nix-mode, which
+ provides syntax highlighting for the Nix language. This is particularly
+ convenient if you regularly edit Nix files.
+
- Accessing man pages
-
- You can use woman to get completion of all
- available man pages. For example, type M-x woman
- <RET> nixos-rebuild <RET>.
-
+ Accessing man pages
+
+
+ You can use woman to get completion of all available
+ man pages. For example, type M-x woman <RET> nixos-rebuild
+ <RET>.
+
- Editing DocBook 5 XML Documents
-
- Emacs includes nXML,
- a major-mode for validating and editing XML documents.
- When editing DocBook 5.0 documents, such as
- this one,
- nXML needs to be configured with the relevant schema, which is
- not included.
-
+ Editing DocBook 5 XML Documents
-
- To install the DocBook 5.0 schemas, either add
- pkgs.docbook5 to
- (
+ Emacs includes
+ nXML,
+ a major-mode for validating and editing XML documents. When editing DocBook
+ 5.0 documents, such as this one,
+ nXML needs to be configured with the relevant schema, which is not
+ included.
+
+
+
+ To install the DocBook 5.0 schemas, either add
+ pkgs.docbook5 to
+
+ (NixOS), or run
- nix-env -i pkgs.docbook5
- (Nix).
-
-
-
- Then customize the variable rng-schema-locating-files to include ~/.emacs.d/schemas.xml and put the following text into that file:
-
- nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>)
- nix-env -i pkgs.docbook5
+ (Nix).
+
+
+
+ Then customize the variable rng-schema-locating-files to
+ include ~/.emacs.d/schemas.xml and put the following
+ text into that file:
+
+ nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>)
+
-
--
-+
-
--
-+
-
-
-
-@@ -707,9 +707,9 @@
- key files for mime detection, etc
- -->
-
--
-+
-
--
-+
-
-
-
diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix
deleted file mode 100644
index ec5e08ffda4..00000000000
--- a/pkgs/development/compilers/boo/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant
-, shared-mime-info, gtksourceview, gtk2 }:
-
-let
- release = "alpha";
-in stdenv.mkDerivation rec {
- name = "boo-${version}";
- version = "2013-10-21";
-
- src = fetchFromGitHub {
- owner = "boo-lang";
- repo = "boo";
-
- rev = "${release}";
- sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- mono makeWrapper nant shared-mime-info gtksourceview
- gtk2
- ];
-
- patches = [ ./config.patch ];
-
- postPatch = ''
- sed -e 's|\$out|'$out'|' -i default.build
- '';
-
- buildPhase = ''
- nant -t:mono-4.5
- '';
-
- installPhase = ''
- nant install
- cp $out/lib/mono/boo/*.dll $out/lib/boo/
- '';
-
- dontStrip = true;
-
- meta = with stdenv.lib; {
- description = "The Boo Programming Language";
- platforms = platforms.linux;
- broken = true;
- };
-}
diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix
new file mode 100644
index 00000000000..65f0481a801
--- /dev/null
+++ b/pkgs/development/compilers/carp/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
+
+haskellPackages.mkDerivation rec {
+
+ pname = "carp";
+ version = "unstable-2018-09-15";
+
+ src = fetchFromGitHub {
+ owner = "carp-lang";
+ repo = "Carp";
+ rev = "cf9286c35cab1c170aa819f7b30b5871b9e812e6";
+ sha256 = "1k6kdxbbaclhi40b9p3fgbkc1x6pc4v0029xjm6gny6pcdci2cli";
+ };
+
+ buildDepends = [ makeWrapper ];
+
+ executableHaskellDepends = with haskellPackages; [
+ HUnit blaze-markup blaze-html split cmdargs
+ ];
+
+ isExecutable = true;
+
+ # The carp executable must know where to find its core libraries and other
+ # files. Set the environment variable CARP_DIR so that it points to the root
+ # of the Carp repo. See:
+ # https://github.com/carp-lang/Carp/blob/master/docs/Install.md#setting-the-carp_dir
+ #
+ # Also, clang must be available run-time because carp is compiled to C which
+ # is then compiled with clang.
+ postInstall = ''
+ wrapProgram $out/bin/carp \
+ --set CARP_DIR $src \
+ --prefix PATH : ${clang}/bin
+ wrapProgram $out/bin/carp-header-parse \
+ --set CARP_DIR $src \
+ --prefix PATH : ${clang}/bin
+ '';
+
+ description = "A statically typed lisp, without a GC, for real-time applications";
+ homepage = https://github.com/carp-lang/Carp;
+ license = stdenv.lib.licenses.asl20;
+ maintainers = with stdenv.lib.maintainers; [ jluttine ];
+
+ # Windows not (yet) supported.
+ platforms = with stdenv.lib.platforms; unix ++ darwin;
+
+}
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix
index 6ff2028e3c1..2c260e110d6 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = "https://github.com/drmeister/clasp";
+ broken = true; # 2018-09-08, no successful build since 2018-01-03
};
}
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 63b31c60d98..d26f731c21f 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "closure-compiler-${version}";
- version = "20180805";
+ version = "20180910";
src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
- sha256 = "1jis9ykbbynq6pa8sl1jy8888l2bk9g4xsiiiab51zn62shqnq26";
+ sha256 = "12k4cp9f8g03k3zf2g70pn6ybx8gk0hfh81ypiyb5hkfij95bi9k";
};
sourceRoot = ".";
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 631179c483b..a0058242bad 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch
-, coq, ocamlPackages
+, coq, ocamlPackages, coq2html
, tools ? stdenv.cc
}:
@@ -7,23 +7,18 @@ assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02";
stdenv.mkDerivation rec {
name = "compcert-${version}";
- version = "3.3";
+ version = "3.4";
src = fetchurl {
url = "http://compcert.inria.fr/release/${name}.tgz";
- sha256 = "16xrqcwak1v1fk5ndx6jf1yvxv3adsr7p7z34gfm2mpggxnq0xwn";
+ sha256 = "12gchwvkzhd2bhrnwzfb4a06wc4hgv98z987k06vj7ga31ii763h";
};
- buildInputs = [ coq ]
+ buildInputs = [ coq coq2html ]
++ (with ocamlPackages; [ ocaml findlib menhir ]);
enableParallelBuilding = true;
- patches = [ (fetchpatch {
- url = "https://github.com/AbsInt/CompCert/commit/679ecfeaa24c0615fa1999e9582bf2af6a9f35e7.patch";
- sha256 = "04yrn6dp57aw6lmlr4yssjlx9cxix0mlmaw7gfhwyz5bzqc2za1a";
- })];
-
configurePhase = ''
substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 3861501d399..05958d52336 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://dotnet.github.io/core/;
+ homepage = https://github.com/dotnet/core/;
description = ".NET is a general purpose development platform";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ kuznero ];
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index aa1c85ebcb0..51cea9810bc 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,93 +1,142 @@
-{ stdenv, fetchurl, makeWrapper
-, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }:
+{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
+, gmp, openssl, readline, tzdata, libxml2, libyaml
+, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }:
-stdenv.mkDerivation rec {
- name = "crystal-${version}";
- version = "0.26.0";
+let
+ binaryVersion = "0.26.0";
+ releaseDate = "2018-08-29";
- src = fetchurl {
- url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
- sha256 = "18vv47xvnf3hl5js5sk58wj2khqq36kcs851i3lgr0ji7m0g3379";
- };
-
- prebuiltName = "crystal-0.26.0-1";
- prebuiltSrc = let arch = {
- "x86_64-linux" = "linux-x86_64";
- "i686-linux" = "linux-i686";
+ arch = {
+ "x86_64-linux" = "linux-x86_64";
+ "i686-linux" = "linux-i686";
"x86_64-darwin" = "darwin-x86_64";
- }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported");
- in fetchurl {
- url = "https://github.com/crystal-lang/crystal/releases/download/0.26.0/${prebuiltName}-${arch}.tar.gz";
- sha256 = {
- "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
- "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
- "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k";
- }."${stdenv.hostPlatform.system}";
+ }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
+
+ checkInputs = [ gmp openssl readline libxml2 libyaml tzdata ];
+
+ # we could turn this into a function instead in case we cannot use the same
+ # binary to build multiple versions
+ binary = stdenv.mkDerivation rec {
+ name = "crystal-binary-${binaryVersion}";
+
+ src = fetchurl {
+ url = "https://github.com/crystal-lang/crystal/releases/download/${binaryVersion}/crystal-${binaryVersion}-1-${arch}.tar.gz";
+ sha256 = {
+ "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
+ "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
+ "x86_64-darwin" = "0hzc65ccajr0yhmvi5vbdgbzbp1gbjy56da24ds3zwwkam1ddk0k";
+ }."${stdenv.system}";
+ };
+
+ buildCommand = ''
+ mkdir -p $out
+ tar --strip-components=1 -C $out -xf ${src}
+ '';
};
- unpackPhase = ''
- mkdir ${prebuiltName}
- tar --strip-components=1 -C ${prebuiltName} -xf ${prebuiltSrc}
- tar xf ${src}
- '';
-
- # crystal on Darwin needs libiconv to build
- libs = [
- boehmgc libatomic_ops pcre libevent
- ] ++ stdenv.lib.optionals stdenv.isDarwin [
- libiconv
- ];
-
- nativeBuildInputs = [ which makeWrapper ];
-
- buildInputs = libs ++ [ llvm ];
-
- libPath = stdenv.lib.makeLibraryPath libs;
-
- sourceRoot = "${name}";
-
- preBuild = ''
- patchShebangs bin/crystal
- patchShebangs ../${prebuiltName}/bin/crystal
- export PATH="$(pwd)/../${prebuiltName}/bin:$PATH"
- '';
-
- makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}"
- "FLAGS=--no-debug"
- "release=1"
- "all" "docs"
- ];
-
- installPhase = ''
- install -Dm755 .build/crystal $out/bin/crystal
- wrapProgram $out/bin/crystal \
- --suffix PATH : ${clang}/bin \
- --suffix CRYSTAL_PATH : lib:$out/lib/crystal \
- --suffix LIBRARY_PATH : $libPath
- install -dm755 $out/lib/crystal
- cp -r src/* $out/lib/crystal/
-
- install -dm755 $out/share/doc/crystal/api
- cp -r docs/* $out/share/doc/crystal/api/
- cp -r samples $out/share/doc/crystal/
-
- install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
- install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
-
- install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
-
- install -Dm644 LICENSE $out/share/licenses/crystal/LICENSE
- '';
-
- dontStrip = true;
+ generic = { version, sha256, doCheck ? true }:
+ stdenv.mkDerivation rec {
+ inherit doCheck;
+ name = "crystal-${version}";
+
+ src = fetchFromGitHub {
+ owner = "crystal-lang";
+ repo = "crystal";
+ rev = version;
+ inherit sha256;
+ };
+
+ # the first bit can go when https://github.com/crystal-lang/crystal/pull/6788 is merged
+ postPatch = ''
+ substituteInPlace src/compiler/crystal/config.cr \
+ --replace '{{ `date "+%Y-%m-%d"`.stringify.chomp }}' '"${releaseDate}"'
+ ln -s spec/compiler spec/std
+ substituteInPlace spec/std/process_spec.cr \
+ --replace /bin/ /run/current-system/sw/bin
+ '';
+
+ buildInputs = [
+ boehmgc libatomic_ops pcre libevent
+ llvm zlib openssl
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ libiconv
+ ];
+
+ nativeBuildInputs = [ binary makeWrapper which ];
+
+
+ makeFlags = [
+ "CRYSTAL_CONFIG_BUILD_DATE=${releaseDate}"
+ "CRYSTAL_CONFIG_VERSION=${version}"
+ ];
+
+ buildFlags = [
+ "all" "docs"
+ ];
+
+ FLAGS = [
+ "--release"
+ "--single-module" # needed for deterministic builds
+ ];
+
+ # We *have* to add `which` to the PATH or crystal is unable to build stuff
+ # later if which is not available.
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 .build/crystal $out/bin/crystal
+ wrapProgram $out/bin/crystal \
+ --suffix PATH : ${lib.makeBinPath [ clang which ]} \
+ --suffix CRYSTAL_PATH : lib:$out/lib/crystal \
+ --suffix LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}
+ install -dm755 $out/lib/crystal
+ cp -r src/* $out/lib/crystal/
+
+ install -dm755 $out/share/doc/crystal/api
+ cp -r docs/* $out/share/doc/crystal/api/
+ cp -r samples $out/share/doc/crystal/
+
+ install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
+ install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
+
+ install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
+
+ install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
+
+ runHook postInstall
+ '';
+
+ enableParallelBuilding = true;
+
+ dontStrip = true;
+
+ checkTarget = "spec";
+
+ preCheck = ''
+ export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH
+ '';
+
+ meta = with lib; {
+ description = "A compiled language with Ruby like syntax and type inference";
+ homepage = https://crystal-lang.org/;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ manveru david50407 peterhoeg ];
+ platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ };
+ };
- enableParallelBuilding = false;
+in rec {
+ crystal_0_25 = generic {
+ version = "0.25.1";
+ sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl";
+ doCheck = false;
+ };
- meta = {
- description = "A compiled language with Ruby like syntax and type inference";
- homepage = https://crystal-lang.org/;
- license = stdenv.lib.licenses.asl20;
- maintainers = with stdenv.lib.maintainers; [ manveru david50407 ];
- platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+ crystal_0_26 = generic {
+ version = "0.26.1";
+ sha256 = "0jwxrqm99zcjj82gyl6bzvnfj79nwzqf8sa1q3f66q9p50v44f84";
+ doCheck = false; # about 20 tests out of more than 14000 are failing
};
+
+ crystal = crystal_0_26;
}
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index e44c21abe94..7a062a55215 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -149,8 +149,7 @@ let
};
};
-in {
-
+in rec {
cudatoolkit_6 = common {
version = "6.0.37";
url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run";
@@ -199,8 +198,8 @@ in {
gcc = gcc6;
};
- cudatoolkit_9 = common {
- version = "9.1.85.1";
+ cudatoolkit_9_1 = common {
+ version = "9.1.85.3";
url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux";
sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4";
runPatches = [
@@ -208,9 +207,40 @@ in {
url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/1/cuda_9.1.85.1_linux";
sha256 = "1f53ij5nb7g0vb5pcpaqvkaj1x4mfq3l0mhkfnqbk8sfrvby775g";
})
+ (fetchurl {
+ url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/2/cuda_9.1.85.2_linux";
+ sha256 = "16g0w09h3bqmas4hy1m0y6j5ffyharslw52fn25gql57bfihg7ym";
+ })
+ (fetchurl {
+ url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/patches/3/cuda_9.1.85.3_linux";
+ sha256 = "12mcv6f8z33z8y41ja8bv5p5iqhv2vx91mv3b5z6fcj7iqv98422";
+ })
];
gcc = gcc6;
};
-}
+ cudatoolkit_9_2 = common {
+ version = "9.2.148.1";
+ url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux";
+ sha256 = "04c6v9b50l4awsf9w9zj5vnxvmc0hk0ypcfjksbh4vnzrz14wigm";
+ runPatches = [
+ (fetchurl {
+ url = "https://developer.nvidia.com/compute/cuda/9.2/Prod2/patches/1/cuda_9.2.148.1_linux";
+ sha256 = "1kx6l4yzsamk6q1f4vllcpywhbfr2j5wfl4h5zx8v6dgfpsjm2lw";
+ })
+ ];
+ gcc = gcc6;
+ };
+
+ cudatoolkit_9 = cudatoolkit_9_2;
+
+ cudatoolkit_10_0 = common {
+ version = "10.0.130";
+ url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux";
+ sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj";
+ gcc = gcc6;
+ };
+
+ cudatoolkit_10 = cudatoolkit_10_0;
+}
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index 50057f91e80..9970fd9b33d 100644
--- a/pkgs/development/compilers/dotnet/sdk/default.nix
+++ b/pkgs/development/compilers/dotnet/sdk/default.nix
@@ -12,15 +12,21 @@ let
rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ];
in
stdenv.mkDerivation rec {
- version = "2.1.302";
+ version = "2.1.403";
+ netCoreVersion = "2.1.5";
name = "dotnet-sdk-${version}";
src = fetchurl {
url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz";
- sha256 = "1a8z9q69cd9a33j7fr7907abm5z4qiivw5k379cgsjmmvxwyvjia";
+ # use sha512 from the download page
+ sha512 = "903a8a633aea9211ba36232a2decb3b34a59bb62bc145a0e7a90ca46dd37bb6c2da02bcbe2c50c17e08cdff8e48605c0f990786faf1f06be1ea4a4d373beb8a9";
};
- unpackPhase = "tar xvzf $src";
+ unpackPhase = ''
+ mkdir src
+ cd src
+ tar xvzf $src
+ '';
buildPhase = ''
runHook preBuild
@@ -44,7 +50,7 @@ in
meta = with stdenv.lib; {
homepage = https://dotnet.github.io/;
- description = ".NET Core SDK 2.0.2 with .NET Core 2.0.0";
+ description = ".NET Core SDK ${version} with .NET Core ${netCoreVersion}";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ kuznero ];
license = licenses.mit;
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 93deb4a90af..e9678ddc4ca 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, buildEnv, haskell, nodejs, fetchurl, makeWrapper, git }:
+{ lib, stdenv, buildEnv
+, haskell, nodejs
+, fetchurl, fetchpatch, makeWrapper, git }:
# To update:
@@ -90,6 +92,12 @@ let
export ELM_HOME=`pwd`/.elm
'' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/elm/compiler/pull/1784/commits/78d2d8eab310552b1b877a3e90e1e57e7a09ddec.patch";
+ sha256 = "0vdhk16xqm2hxw12s1b91a0bmi8w4wsxc086qlzglgnjxrl5b3w4";
+ })
+ ];
postInstall = ''
wrapProgram $out/bin/elm \
--prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
@@ -99,26 +107,10 @@ let
/*
- This is not a core Elm package, and it's hosted on GitHub.
- To update, run:
-
- cabal2nix --jailbreak --revision refs/tags/foo http://github.com/avh4/elm-format > packages/elm-format.nix
-
- where foo is a tag for a new version, for example "0.8.0".
+ The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
+ `pacakge/nix/build.sh`
*/
- elm-format = overrideCabal (self.callPackage ./packages/elm-format.nix { }) (drv: {
- # https://github.com/avh4/elm-format/issues/529
- patchPhase = ''
- cat >Setup.hs < packages/elm.nix
-cabal2nix --no-check cabal://indents-0.3.3 > packages/indents.nix
-cabal2nix --no-haddock --no-check --jailbreak --revision refs/tags/0.8.0 http://github.com/avh4/elm-format > packages/elm-format.nix
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index 4dab2e06f48..65fb8a9c82d 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -1,57 +1,58 @@
-{ stdenv, fetchurl, fetchFromGitHub, glib, git,
+{ stdenv, fetchurl, glib, glibc, git,
rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
- libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext,
- libGLU, libXmu, libXt, libICE, libSM }:
+ pango, cairo, gtk2, gdk_pixbuf, gtkglext,
+ mesa, xorg, openssl, unzip }:
-stdenv.mkDerivation rec {
+let
+ inherit (stdenv.lib) optional;
+
+in stdenv.mkDerivation rec {
name = "factor-lang-${version}";
- version = "0.97";
- rev = "eb3ca179740e6cfba696b55a999caa13369e6182";
-
- src = fetchFromGitHub {
- owner = "factor";
- repo = "factor";
- rev = rev;
- sha256 = "16zlbxbad3d19jq01nk824i19bypqzn8l3yfxys40z06vjjncapd";
- };
+ version = "0.98";
+ rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
- factorimage = fetchurl {
- url = http://downloads.factorcode.org/releases/0.97/factor-linux-x86-64-0.97.tar.gz;
- sha256 = "06y125c8vbng54my5fxdr3crpxkvhhcng2n35cxddd3wcg6vhxhp";
- name = "factorimage";
+ src = fetchurl {
+ url = http://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip;
+ sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ git rlwrap curl perl makeWrapper
+ patches = [
+ ./staging-command-line-0.98-pre.patch
+ ./workdir-0.98-pre.patch
+ ./fuel-dir.patch
+ ];
+
+ buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper
libX11 pango cairo gtk2 gdk_pixbuf gtkglext
- libGLU libXmu libXt libICE libSM ];
+ mesa libXmu libXt libICE libSM openssl unzip ];
buildPhase = ''
- make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev}
+ sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
+ make linux-x86-64
+ # De-memoize xdg-* functions, otherwise they break the image.
+ sed -ie 's/^MEMO:/:/' basis/xdg/xdg.factor
'';
installPhase = ''
mkdir -p $out/bin $out/lib/factor
- # First, get a workable image. Unfortunately, no boot-image
- # is available with release info. So fetch a released image.
# The released image has library path info embedded, so we
- # have to first recreate the boot image with Nix paths, and
+ # first have to recreate the boot image with Nix paths, and
# then use it to build the Nix release image.
- zcat ${factorimage} | (cd $out/lib && tar -xvpf - factor/factor.image )
+ cp boot.unix-x86.64.image $out/lib/factor/factor.image
- cp -r basis core extra unmaintained $out/lib/factor
+ cp -r basis core extra $out/lib/factor
- # Factor uses the home directory for cache during compilation.
- # We cant have that. So set it to $TMPDIR/.home
- export HOME=$TMPDIR/.home && mkdir -p $HOME
+ # Factor uses XDG_CACHE_HOME for cache during compilation.
+ # We can't have that. So set it to $TMPDIR/.cache
+ export XDG_CACHE_HOME=$TMPDIR/.cache && mkdir -p $XDG_CACHE_HOME
- # there is no ld.so.cache in NixOS so we construct one
+ # There is no ld.so.cache in NixOS so we construct one
# out of known libraries. The side effect is that find-lib
# will work only on the known libraries. There does not seem
# to be a generic solution here.
- find $(echo ${stdenv.lib.makeLibraryPath [
+ find $(echo ${stdenv.lib.makeLibraryPath (with xorg; [
glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext
- libGLU libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
+ mesa libXmu libXt libICE libSM ])} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
(echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
for l in $(<$TMPDIR/so.lst);
@@ -70,18 +71,29 @@ stdenv.mkDerivation rec {
cp ./factor $out/bin
wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
- "${stdenv.lib.makeLibraryPath [ glib
+ "${stdenv.lib.makeLibraryPath (with xorg; [ glib
libX11 pango cairo gtk2 gdk_pixbuf gtkglext
- libGLU libXmu libXt libICE libSM ]}"
+ mesa libXmu libXt libICE libSM openssl])}"
sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor
mv $out/bin/.factor-wrapped $out/lib/factor/factor
- # make a new bootstrap image
+ # build full factor image from boot image
(cd $out/bin && ./factor -script -e='"unix-x86.64" USING: system bootstrap.image memory ; make-image save 0 exit' )
- mv $out/lib/factor/boot.unix-x86.64.image $out/lib/factor/factor.image
- # now make the full system image, it overwrites $out/lib/factor/factor.image
- $out/bin/factor -i=$out/lib/factor/factor.image
+
+ # make a new bootstrap image
+ (cd $out/bin && ./factor -script -e='"unix-x86.64" USING: system tools.deploy.backend ; make-boot-image 0 exit' )
+
+ # rebuild final full factor image to include all patched sources
+ (cd $out/lib/factor && ./factor -i=boot.unix-x86.64.image)
+
+ # install fuel mode for emacs
+ mkdir -p $out/share/emacs/site-lisp
+ # update default paths in factor-listener.el for fuel mode
+ substituteInPlace misc/fuel/fuel-listener.el \
+ --subst-var-by fuel_factor_root_dir $out/lib/factor \
+ --subst-var-by fuel_listener_factor_binary $out/bin/factor
+ cp misc/fuel/*.el $out/share/emacs/site-lisp/
'';
meta = with stdenv.lib; {
@@ -89,7 +101,7 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
description = "A concatenative, stack-based programming language";
- maintainers = [ maintainers.vrthra ];
+ maintainers = [ maintainers.vrthra maintainers.spacefrogg ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/development/compilers/factor-lang/fuel-dir.patch b/pkgs/development/compilers/factor-lang/fuel-dir.patch
new file mode 100644
index 00000000000..8f45b037246
--- /dev/null
+++ b/pkgs/development/compilers/factor-lang/fuel-dir.patch
@@ -0,0 +1,20 @@
+diff --git a/misc/fuel/fuel-listener.el b/misc/fuel/fuel-listener.el
+index 2d1b182a75..bf2e573425 100644
+--- a/misc/fuel/fuel-listener.el
++++ b/misc/fuel/fuel-listener.el
+@@ -30,13 +30,13 @@
+ "Interacting with a Factor listener inside Emacs."
+ :group 'fuel)
+
+-(defcustom fuel-factor-root-dir nil
++(defcustom fuel-factor-root-dir "@fuel_factor_root_dir@"
+ "Full path to the factor root directory when starting a listener."
+ :type 'directory
+ :group 'fuel-listener)
+
+ ;;; Is factor.com still valid on Windows...?
+-(defcustom fuel-listener-factor-binary nil
++(defcustom fuel-listener-factor-binary "@fuel_listener_factor_binary@"
+ "Full path to the factor executable to use when starting a listener."
+ :type '(file :must-match t)
+ :group 'fuel-listener)
diff --git a/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch b/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch
new file mode 100644
index 00000000000..57fc657ddcf
--- /dev/null
+++ b/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch
@@ -0,0 +1,13 @@
+diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
+index ec86089dbe..b146168ec9 100644
+--- a/basis/tools/deploy/backend/backend.factor
++++ b/basis/tools/deploy/backend/backend.factor
+@@ -69,7 +69,7 @@ ERROR: can't-deploy-library-file library ;
+ [ staging-image-name "-output-image=" prepend , ]
+ [ " " join "-include=" prepend , ] bi
+ ] [
+- input-image-name "-i=" prepend ,
++ input-image-name resource-path "-i=" prepend ,
+ "-resource-path=" "" resource-path append ,
+ "-run=tools.deploy.restage" ,
+ ] bi
diff --git a/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch b/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch
new file mode 100644
index 00000000000..f1498743dd6
--- /dev/null
+++ b/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch
@@ -0,0 +1,24 @@
+diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor
+index 2d382e49d1..d4d9228d6c 100644
+--- a/core/io/pathnames/pathnames.factor
++++ b/core/io/pathnames/pathnames.factor
+@@ -144,7 +144,10 @@ GENERIC: vocab-path ( path -- newpath )
+ GENERIC: absolute-path ( path -- path' )
+
+ M: string absolute-path
+- "resource:" ?head [
++ "resource:work" ?head [
++ trim-head-separators "/var/lib/factor" prepend-path
++ absolute-path ]
++ [ "resource:" ?head [
+ trim-head-separators resource-path
+ absolute-path
+ ] [
+@@ -158,6 +161,7 @@ M: string absolute-path
+ ] [
+ current-directory get prepend-path
+ ] if ] if
++ ] if
+ ] if ;
+
+ M: object normalize-path ( path -- path' )
diff --git a/pkgs/development/compilers/futhark/default.nix b/pkgs/development/compilers/futhark/default.nix
new file mode 100644
index 00000000000..890be3431c3
--- /dev/null
+++ b/pkgs/development/compilers/futhark/default.nix
@@ -0,0 +1,55 @@
+# Generated using `cabal2nix --hpack .`, then replace src
+{ mkDerivation, alex, array, base, bifunctors, binary, blaze-html
+, bytestring, containers, data-binary-ieee754, directory
+, directory-tree, dlist, extra, file-embed, filepath, gitrev, happy
+, haskeline, hpack, HUnit, json, language-c-quote, mainland-pretty
+, markdown, mtl, neat-interpolation, parallel, parsec, process
+, process-extras, QuickCheck, random, raw-strings-qq, regex-tdfa
+, srcloc, stdenv, template-haskell, temporary, test-framework
+, test-framework-hunit, test-framework-quickcheck2, text
+, th-lift-instances, transformers, vector, vector-binary-instances
+, zlib, fetchFromGitHub
+}:
+mkDerivation {
+ pname = "futhark";
+ version = "0.6.2";
+ src = fetchFromGitHub {
+ owner = "diku-dk";
+ repo = "futhark";
+ rev = "v0.6.2";
+ sha256 = "0yj7n01swpvqblybdnks3mjf0mzf1gdg2b2cpxdpxnrjw5j0pnq2";
+ };
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bifunctors binary blaze-html bytestring containers
+ data-binary-ieee754 directory directory-tree dlist extra file-embed
+ filepath gitrev language-c-quote mainland-pretty markdown mtl
+ neat-interpolation parallel parsec process raw-strings-qq
+ regex-tdfa srcloc template-haskell text th-lift-instances
+ transformers vector vector-binary-instances zlib
+ ];
+ libraryToolDepends = [ alex happy hpack ];
+ executableHaskellDepends = [
+ array base bifunctors binary blaze-html bytestring containers
+ data-binary-ieee754 directory directory-tree dlist extra file-embed
+ filepath gitrev haskeline json language-c-quote mainland-pretty
+ markdown mtl neat-interpolation parallel parsec process
+ process-extras random raw-strings-qq regex-tdfa srcloc
+ template-haskell temporary text th-lift-instances transformers
+ vector vector-binary-instances zlib
+ ];
+ testHaskellDepends = [
+ array base bifunctors binary blaze-html bytestring containers
+ data-binary-ieee754 directory directory-tree dlist extra file-embed
+ filepath gitrev HUnit language-c-quote mainland-pretty markdown mtl
+ neat-interpolation parallel parsec process QuickCheck
+ raw-strings-qq regex-tdfa srcloc template-haskell test-framework
+ test-framework-hunit test-framework-quickcheck2 text
+ th-lift-instances transformers vector vector-binary-instances zlib
+ ];
+ preConfigure = "hpack";
+ homepage = "https://futhark-lang.org";
+ description = "An optimising compiler for a functional, array-oriented language";
+ license = stdenv.lib.licenses.isc;
+}
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 36aa73f7274..812b8338960 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -1,11 +1,11 @@
{ stdenv, callPackage, fetchurl }:
callPackage ./build.nix {
- version = "4.8.9";
+ version = "4.9.0";
SRC = fetchurl {
- url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz";
- sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p";
+ url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_0-devel.tgz";
+ sha256 = "0wyfpjs244zrbrdil9rfkdgcawvms84z0r77qwhwadghma4dqgjf";
};
inherit stdenv;
}
diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix
index 41d0ee930bf..067a409ac1c 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@@ -1,12 +1,12 @@
{ stdenv, callPackage, fetchgit }:
callPackage ./build.nix {
- version = "unstable-2018-08-06";
-# git-version = "4.8.9-77-g91a4ad2c";
+ version = "unstable-2018-09-03";
+# git-version = "4.9.0";
SRC = fetchgit {
url = "https://github.com/feeley/gambit.git";
- rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f";
- sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p";
+ rev = "7cdc7e7b9194b2c088c0667efaf7686a4ffd0d8a";
+ sha256 = "06mmi8jkinihfirz4gjfw2lhxhskiqf3d47sihzx10r60asyqcxg";
};
inherit stdenv;
}
diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
deleted file mode 100644
index 945649b2978..00000000000
--- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, ncurses5, python27 }:
-
-stdenv.mkDerivation rec {
- name = "gcc-arm-embedded-${version}";
- version = "6-2017-q2-update";
- subdir = "6-2017q2";
-
- platformString =
- if stdenv.isLinux then "linux"
- else if stdenv.isDarwin then "mac"
- else throw "unsupported platform";
-
- urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${platformString}.tar.bz2";
-
- src =
- if stdenv.isLinux then fetchurl { url=urlString; sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; }
- else if stdenv.isDarwin then fetchurl { url=urlString; sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; }
- else throw "unsupported platform";
-
- phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
- installPhase = ''
- mkdir -p $out
- cp -r * $out
- '';
-
- dontPatchELF = true;
- dontStrip = true;
-
- preFixup = ''
- find $out -type f | while read f; do
- patchelf $f > /dev/null 2>&1 || continue
- patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
- patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true
- done
- '';
-
- meta = {
- description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)";
- homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm;
- license = with stdenv.lib.licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
- maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
- platforms = with stdenv.lib.platforms; linux ++ darwin;
- };
-}
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
deleted file mode 100644
index 7908d6d06ef..00000000000
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256, ncurses
-, dirName ? null, subdirName ? null }:
-with stdenv.lib;
-let
- versionParts = splitString "-" version; # 4.7 2013q3 20130916
- majorVersion = elemAt versionParts 0; # 4.7
- yearQuarter = elemAt versionParts 1; # 2013q3
- underscoreVersion = replaceChars ["."] ["_"] version; # 4_7-2013q3-20130916
- yearQuarterParts = splitString "q" yearQuarter; # 2013 3
- year = elemAt yearQuarterParts 0; # 2013
- quarter = elemAt yearQuarterParts 1; # 3
- dirName_ = if dirName != null then dirName else majorVersion;
- subdirName_ = if subdirName != null then subdirName
- else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update
-in
-stdenv.mkDerivation {
- name = "gcc-arm-embedded-${version}";
-
- src = fetchurl {
- url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2";
- sha256 = sha256;
- };
-
- buildInputs = [ bzip2 patchelf ];
-
- dontPatchELF = true;
-
- phases = "unpackPhase patchPhase installPhase";
-
- installPhase = ''
- mkdir -pv $out
- cp -r ./* $out
-
- for f in $(find $out); do
- if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
- patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \
- --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \
- "$f" || true
- fi
- done
- '';
-
- meta = with stdenv.lib; {
- description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)";
- homepage = https://launchpad.net/gcc-arm-embedded;
- license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
- maintainers = [ maintainers.rasendubi ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 60db368c403..e585f296e87 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -130,7 +130,7 @@ let version = "4.8.5";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -148,10 +148,15 @@ let version = "4.8.5";
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -201,9 +206,7 @@ stdenv.mkDerivation ({
''
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler langJava
+ inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -272,7 +275,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -362,20 +365,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${libcCross.dev}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru = {
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 361db92cb76..9dae061ecbb 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -135,7 +135,7 @@ let version = "4.9.4";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -156,10 +156,15 @@ let version = "4.9.4";
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -210,9 +215,7 @@ stdenv.mkDerivation ({
''
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler langJava
+ inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -294,7 +297,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -383,20 +386,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 2e51e9c0506..fbc192752c7 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -60,6 +60,7 @@ let version = "5.5.0";
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
+ ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
++ optional stdenv.hostPlatform.isMusl (fetchpatch {
url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff;
sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm";
@@ -121,7 +122,7 @@ let version = "5.5.0";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -142,10 +143,15 @@ let version = "5.5.0";
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -215,9 +221,7 @@ stdenv.mkDerivation ({
)
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler langJava
+ inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -297,7 +301,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -331,7 +335,12 @@ stdenv.mkDerivation ({
# On Illumos/Solaris GNU as is preferred
"--with-gnu-as" "--without-gnu-ld"
]
- ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+ ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+ "--disable-libsanitizer"
+ "--disable-symvers"
+ "libat_cv_have_ifunc=no"
+ "--disable-gnu-indirect-function"
+ ]
;
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
@@ -383,20 +392,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index e6825afcfa8..793752dee19 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -61,6 +61,7 @@ let version = "6.4.0";
++ optional langFortran ../gfortran-driving.patch
++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26
+ ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
;
javaEcj = fetchurl {
@@ -119,7 +120,7 @@ let version = "6.4.0";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -142,10 +143,15 @@ let version = "6.4.0";
"--disable-libgomp"
# musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
"--disable-libmpx"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -216,9 +222,7 @@ stdenv.mkDerivation ({
)
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler langJava
+ inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -302,7 +306,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -336,7 +340,12 @@ stdenv.mkDerivation ({
# On Illumos/Solaris GNU as is preferred
"--with-gnu-as" "--without-gnu-ld"
]
- ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+ ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+ "--disable-libsanitizer"
+ "--disable-symvers"
+ "libat_cv_have_ifunc=no"
+ "--disable-gnu-indirect-function"
+ ]
;
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
@@ -387,20 +396,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 4dfbcf0f545..c75a6c6e68f 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -56,7 +56,8 @@ let version = "7.3.0";
sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";
})
++ optional langFortran ../gfortran-driving.patch
- ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;
+ ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
+ ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch;
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
@@ -66,7 +67,7 @@ let version = "7.3.0";
[ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
"--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
(if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
+ "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}"
"--with-gcc"
"--with-gnu-as"
"--with-gnu-ld"
@@ -91,7 +92,7 @@ let version = "7.3.0";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -114,11 +115,17 @@ let version = "7.3.0";
"--disable-libgomp"
# musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
"--disable-libmpx"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ # No final libdecnumber (it may work only in 386)
+ "--disable-decimal-float"
+ ]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
@@ -187,11 +194,14 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
''
)
- else "");
+ else "")
+ + stdenv.lib.optionalString targetPlatform.isAvr ''
+ makeFlagsArray+=(
+ 'LIMITS_H_TEST=false'
+ )
+ '';
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler
+ inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -219,9 +229,7 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
- # TODO: Use optionalString with next rebuild.
- ${if (stdenv.cc.isClang && langFortran) then "NIX_CFLAGS_COMPILE" else null} = "-Wno-unused-command-line-argument";
-
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
@@ -270,7 +278,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -292,7 +300,12 @@ stdenv.mkDerivation ({
# On Illumos/Solaris GNU as is preferred
"--with-gnu-as" "--without-gnu-ld"
]
- ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+ ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+ "--disable-libsanitizer"
+ "--disable-symvers"
+ "libat_cv_have_ifunc=no"
+ "--disable-gnu-indirect-function"
+ ]
++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
;
@@ -332,20 +345,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 04054df8bf8..bcac577712a 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -51,7 +51,8 @@ let version = "8.2.0";
sha256 = ""; # TODO: uncomment and check hash when available.
}) */
++ optional langFortran ../gfortran-driving.patch
- ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;
+ ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
+ ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch;
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
@@ -86,7 +87,7 @@ let version = "8.2.0";
"--disable-libmpx" # requires libc
] else [
(if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
+ else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
"--enable-__cxa_atexit"
"--enable-long-long"
] ++
@@ -109,10 +110,15 @@ let version = "8.2.0";
"--disable-libgomp"
# musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
"--disable-libmpx"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
@@ -184,9 +190,7 @@ stdenv.mkDerivation ({
)
else "");
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler
+ inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -262,7 +266,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -284,7 +288,12 @@ stdenv.mkDerivation ({
# On Illumos/Solaris GNU as is preferred
"--with-gnu-as" "--without-gnu-ld"
]
- ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+ ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+ "--disable-libsanitizer"
+ "--disable-symvers"
+ "libat_cv_have_ifunc=no"
+ "--disable-gnu-indirect-function"
+ ]
;
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
@@ -318,23 +327,16 @@ stdenv.mkDerivation ({
LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}/include"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
- ]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index a3250f4021a..75e70006d74 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -131,7 +131,7 @@ if test "$noSysDirs" = "1"; then
)
fi
- if test -n "${targetConfig-}" -a "$crossStageStatic" == 1; then
+ if test "$crossStageStatic" == 1; then
# We don't want the gcc build to assume there will be a libc providing
# limits.h in this stagae
makeFlagsArray+=(
diff --git a/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch b/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch
new file mode 100644
index 00000000000..afd1f7456d3
--- /dev/null
+++ b/pkgs/development/compilers/gcc/libgomp-dont-force-initial-exec.patch
@@ -0,0 +1,40 @@
+From 01c433f4788441c0963005b9d3fad5b2865e6651 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Mon, 24 Sep 2018 19:57:50 -0500
+Subject: [PATCH] libgomp/configure.tgt: don't force initial-exec tls-model
+
+---
+ libgomp/configure.tgt | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
+index 74d95a570c7..b608c55f0c1 100644
+--- a/libgomp/configure.tgt
++++ b/libgomp/configure.tgt
+@@ -10,23 +10,6 @@
+ # XCFLAGS Add extra compile flags to use.
+ # XLDFLAGS Add extra link flags to use.
+
+-# Optimize TLS usage by avoiding the overhead of dynamic allocation.
+-if test $gcc_cv_have_tls = yes ; then
+- case "${target}" in
+-
+- *-*-k*bsd*-gnu*)
+- ;;
+-
+- *-*-linux* | *-*-gnu*)
+- XCFLAGS="${XCFLAGS} -ftls-model=initial-exec"
+- ;;
+-
+- *-*-rtems*)
+- XCFLAGS="${XCFLAGS} -ftls-model=local-exec"
+- ;;
+- esac
+-fi
+-
+ # Since we require POSIX threads, assume a POSIX system by default.
+ config_path="posix"
+
+--
+2.19.0
+
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 230409e9753..a308abd9c16 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -104,10 +104,15 @@ let version = "7-20170409";
# In uclibc cases, libgomp needs an additional '-ldl'
# and as I don't know how to pass it, I disable libgomp.
"--disable-libgomp"
- ] ++ [
- "--enable-threads=posix"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ]
+ ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ ++ [
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "win32"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
]));
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
@@ -154,9 +159,7 @@ stdenv.mkDerivation ({
''
else null;
- # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
- crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
- inherit noSysDirs staticCompiler
+ inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -292,20 +295,20 @@ stdenv.mkDerivation ({
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-idirafter ${getDev libcCross}/include"
+ "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);
EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
- "-Wl,-L${libcCross.out}/lib"
+ "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
] ++ (if crossStageStatic then [
- "-B${libcCross.out}/lib"
+ "-B${libcCross.out}${libcCross.libdir or "/lib"}"
] else [
- "-Wl,-rpath,${libcCross.out}/lib"
- "-Wl,-rpath-link,${libcCross.out}/lib"
+ "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
+ "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index 6fa9fcc3de8..e0f4ca4324f 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -1,12 +1,12 @@
{ stdenv, callPackage, fetchurl, gambit }:
callPackage ./build.nix {
- version = "0.12-RELEASE";
- git-version = "0.12";
+ version = "0.13";
+ git-version = "0.13";
GAMBIT = gambit;
SRC = fetchurl {
- url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz";
- sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq";
+ url = "https://github.com/vyzo/gerbil/archive/v0.13.tar.gz";
+ sha256 = "1qs0vdq2lgxlpw20s8jzw2adx1xk9wb3w2m4a8vp6bb8hagmfr5l";
};
inherit stdenv;
}
diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix
index 66ead04b542..bd9c3994dd4 100644
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/pkgs/development/compilers/gerbil/unstable.nix
@@ -1,13 +1,13 @@
{ stdenv, callPackage, fetchgit, gambit-unstable }:
callPackage ./build.nix {
- version = "unstable-2018-08-11";
- git-version = "0.13-DEV-542-g274e1a22";
+ version = "unstable-2018-09-06";
+ git-version = "0.14-DEV";
GAMBIT = gambit-unstable;
SRC = fetchgit {
url = "https://github.com/vyzo/gerbil.git";
- rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686";
- sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s";
+ rev = "184cb635c82517d5d75d7966dcdf1d25ad863dac";
+ sha256 = "1ljzbpc36i9zpzfwra5hpfbgzj1dyzzp50h5jf976n8qr9x4l7an";
};
inherit stdenv;
}
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index a4374a45240..b69ae80d0db 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -15,7 +15,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(gmp.meta.available or false), gmp
+ enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 0946db71378..f7422d150ac 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -14,7 +14,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(gmp.meta.available or false), gmp
+ enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix
index bfb9c4cd616..6caeaf20f64 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix
@@ -169,6 +169,5 @@ stdenv.mkDerivation rec {
};
meta.license = stdenv.lib.licenses.bsd3;
- # AArch64 should work in theory but eventually some builds start segfaulting
- meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" /* "aarch64-linux" */];
+ meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"];
}
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 124e0e1fe1f..b548b05339e 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -15,7 +15,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(gmp.meta.available or false), gmp
+ enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
index 7028a78eb21..e43f9a57d0a 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -14,7 +14,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(gmp.meta.available or false), gmp
+ enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -99,6 +99,10 @@ stdenv.mkDerivation (rec {
sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
extraPrefix = "utils/hsc2hs/";
stripLen = 1;
+ }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
+ url = "http://tarballs.nixos.org/sha256/${sha256}";
+ name = "D5123.diff";
+ sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
})] ++ stdenv.lib.optional deterministicProfiling
(fetchpatch rec {
url = "http://tarballs.nixos.org/sha256/${sha256}";
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
new file mode 100644
index 00000000000..0588d7fba92
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -0,0 +1,247 @@
+{ stdenv, targetPackages
+
+# build-tools
+, bootPkgs
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
+
+, libiconv ? null, ncurses
+
+, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
+, # LLVM is conceptually a run-time-only depedendency, but for
+ # non-x86, we need LLVM to bootstrap later stages, so it becomes a
+ # build-time dependency too.
+ buildLlvmPackages, llvmPackages
+
+, # If enabled, GHC will be built with the GPL-free but slower integer-simple
+ # library instead of the faster but GPLed integer-gmp library.
+ enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+
+, # If enabled, use -fPIC when compiling static libs.
+ enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+
+, # Whether to build dynamic libs for the standard library (on the target
+ # platform). Static libs are always built.
+ enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
+
+, # Whetherto build terminfo.
+ enableTerminfo ? !stdenv.targetPlatform.isWindows
+
+, # What flavour to build. An empty string indicates no
+ # specific flavour and falls back to ghc default values.
+ ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross"
+, # Whether to backport https://phabricator.haskell.org/D4388 for
+ # deterministic profiling symbol names, at the cost of a slightly
+ # non-standard GHC API
+ deterministicProfiling ? false
+}:
+
+assert !enableIntegerSimple -> gmp != null;
+
+let
+ inherit (stdenv) buildPlatform hostPlatform targetPlatform;
+
+ inherit (bootPkgs) ghc;
+
+ # TODO(@Ericson2314) Make unconditional
+ targetPrefix = stdenv.lib.optionalString
+ (targetPlatform != hostPlatform)
+ "${targetPlatform.config}-";
+
+ buildMK = ''
+ BuildFlavour = ${ghcFlavour}
+ ifneq \"\$(BuildFlavour)\" \"\"
+ include mk/flavours/\$(BuildFlavour).mk
+ endif
+ DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+ INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
+ '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+ Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+ CrossCompilePrefix = ${targetPrefix}
+ HADDOCK_DOCS = NO
+ BUILD_SPHINX_HTML = NO
+ BUILD_SPHINX_PDF = NO
+ '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+ GhcLibHcOpts += -fPIC
+ GhcRtsHcOpts += -fPIC
+ '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+ EXTRA_CC_OPTS += -std=gnu99
+ '';
+
+ # Splicer will pull out correct variations
+ libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+ ++ stdenv.lib.optional (!enableIntegerSimple) gmp
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+ toolsForTarget =
+ if hostPlatform == buildPlatform then
+ [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
+ else assert targetPlatform == hostPlatform; # build != host == target
+ [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+
+ targetCC = builtins.head toolsForTarget;
+
+in
+stdenv.mkDerivation (rec {
+ version = "8.4.4";
+ name = "${targetPrefix}ghc-${version}";
+
+ src = fetchurl {
+ url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+ sha256 = "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i";
+ };
+
+ enableParallelBuilding = true;
+
+ outputs = [ "out" "doc" ];
+
+ patches = [(fetchpatch {
+ url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
+ sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
+ extraPrefix = "utils/hsc2hs/";
+ stripLen = 1;
+ }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
+ url = "http://tarballs.nixos.org/sha256/${sha256}";
+ name = "D5123.diff";
+ sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
+ })] ++ stdenv.lib.optional deterministicProfiling
+ (fetchpatch rec {
+ url = "http://tarballs.nixos.org/sha256/${sha256}";
+ name = "D4388.diff";
+ sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
+ })
+ ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
+
+ postPatch = "patchShebangs .";
+
+ # GHC is a bit confused on its cross terminology.
+ preConfigure = ''
+ for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+ export "''${env#TARGET_}=''${!env}"
+ done
+ # GHC is a bit confused on its cross terminology, as these would normally be
+ # the *host* tools.
+ export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
+ export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
+ # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+ export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
+ export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
+ export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
+ export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
+ export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
+ export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
+ echo -n "${buildMK}" > mk/build.mk
+ sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+ '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+ export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ export NIX_LDFLAGS+=" -no_dtrace_dof"
+ '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+ sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+ '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+ echo "patching llvm-targets for musl targets..."
+ echo "Cloning these existing '*-linux-gnu*' targets:"
+ grep linux-gnu llvm-targets | sed 's/^/ /'
+ echo "(go go gadget sed)"
+ sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+ echo "llvm-targets now contains these '*-linux-musl*' targets:"
+ grep linux-musl llvm-targets | sed 's/^/ /'
+
+ echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+ # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+ for x in configure aclocal.m4; do
+ substituteInPlace $x \
+ --replace '*-android*|*-gnueabi*)' \
+ '*-android*|*-gnueabi*|*-musleabi*)'
+ done
+ '';
+
+ # TODO(@Ericson2314): Always pass "--target" and always prefix.
+ configurePlatforms = [ "build" "host" ]
+ ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+ # `--with` flags for libraries needed for RTS linker
+ configureFlags = [
+ "--datadir=$doc/share/doc/ghc"
+ "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+ ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+ ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+ ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+ "--enable-bootstrap-with-devel-snapshot"
+ ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+ "CFLAGS=-fuse-ld=gold"
+ "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+ "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+ ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
+ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+ "--disable-large-address-space"
+ ];
+
+ # Make sure we never relax`$PATH` and hooks support for compatability.
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ perl autoconf automake m4 python3
+ ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+ ];
+
+ # For building runtime libs
+ depsBuildTarget = toolsForTarget;
+
+ buildInputs = libDeps hostPlatform;
+
+ propagatedBuildInputs = [ targetPackages.stdenv.cc ]
+ ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+
+ depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
+ depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+
+ # required, because otherwise all symbols from HSffi.o are stripped, and
+ # that in turn causes GHCi to abort
+ stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+ checkTarget = "test";
+
+ hardeningDisable = [ "format" ];
+
+ postInstall = ''
+ for bin in "$out"/lib/${name}/bin/*; do
+ isELF "$bin" || continue
+ paxmark m "$bin"
+ done
+
+ # Install the bash completion file.
+ install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}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 [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+ done
+ '';
+
+ passthru = {
+ inherit bootPkgs targetPrefix;
+
+ inherit llvmPackages;
+ inherit enableShared;
+
+ # Our Cabal compiler name
+ haskellCompilerName = "ghc-8.4.4";
+ };
+
+ meta = {
+ homepage = http://haskell.org/ghc;
+ description = "The Glasgow Haskell Compiler";
+ maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+ inherit (ghc.meta) license platforms;
+ };
+
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+ dontStrip = true;
+ dontPatchELF = true;
+ noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 3722b16f657..2363953e35b 100644
--- a/pkgs/development/compilers/ghc/8.6.1.nix
+++ b/pkgs/development/compilers/ghc/8.6.1.nix
@@ -2,7 +2,7 @@
# build-tools
, bootPkgs
-, autoconf, automake, coreutils, fetchurl, perl, python3, m4
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, libiconv ? null, ncurses
@@ -14,7 +14,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(gmp.meta.available or false), gmp
+ enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
@@ -78,18 +78,24 @@ let
in
stdenv.mkDerivation (rec {
- version = "8.6.0.20180810";
+ version = "8.6.1";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
- url = "https://downloads.haskell.org/~ghc/8.6.1-beta1/ghc-${version}-src.tar.xz";
- sha256 = "0b3nyjs4lsh67lfw7wh7r7kkf4g2xiypdxd77aycmwd3pdxj09yw";
+ url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+ sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c";
};
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
+ patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123
+ url = "http://tarballs.nixos.org/sha256/${sha256}";
+ name = "D5123.diff";
+ sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
+ })];
+
postPatch = "patchShebangs .";
# GHC is a bit confused on its cross terminology.
@@ -209,7 +215,7 @@ stdenv.mkDerivation (rec {
inherit enableShared;
# Our Cabal compiler name
- haskellCompilerName = "ghc-8.4.3";
+ haskellCompilerName = "ghc-8.6.1";
};
meta = {
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 1339edf0afd..6546959e0a2 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -14,7 +14,7 @@
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
- enableIntegerSimple ? !(gmp.meta.available or false), gmp
+ enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index 21c0a5ede91..39d1652fc70 100644
--- a/pkgs/development/compilers/gnu-smalltalk/default.nix
+++ b/pkgs/development/compilers/gnu-smalltalk/default.nix
@@ -34,6 +34,8 @@ in stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs";
+ hardeningDisable = [ "format" ];
+
installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
# For some reason the tests fail if executated with nix-build, but pass if
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index fa4b4abafde..16357793583 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps
-, pcre, cacert, llvm
-, Security, Foundation
-, makeWrapper, git, subversion, mercurial, bazaar }:
+, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
let
@@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
GOCACHE = "off";
# perl is used for testing go vet
- nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
+ nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -165,9 +162,6 @@ stdenv.mkDerivation rec {
installPhase = ''
cp -r . $GOROOT
( cd $GOROOT/src && ./all.bash )
-
- # (https://github.com/golang/go/wiki/GoGetTools)
- wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
'';
preFixup = ''
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 55cc654b0aa..f58e0801030 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps
-, pcre, cacert, llvm
-, Security, Foundation
-, makeWrapper, git, subversion, mercurial, bazaar }:
+, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
let
@@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
GOCACHE = "off";
# perl is used for testing go vet
- nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
+ nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -125,6 +122,8 @@ stdenv.mkDerivation rec {
./remove-fhs-test-references.patch
./skip-external-network-tests.patch
./skip-nohup-tests.patch
+ # breaks under load: https://github.com/golang/go/issues/25628
+ ./skip-test-extra-files-on-386.patch
];
postPatch = optionalString stdenv.isDarwin ''
@@ -139,7 +138,7 @@ stdenv.mkDerivation rec {
else if stdenv.targetPlatform.isAarch32 then "arm"
else if stdenv.targetPlatform.isAarch64 then "arm64"
else throw "Unsupported system";
- GOARM = stdenv.targetPlatform.parsed.cpu.version or "";
+ GOARM = toString (stdenv.lib.intersectLists [(stdenv.targetPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
GO386 = 387; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
@@ -169,13 +168,11 @@ stdenv.mkDerivation rec {
installPhase = ''
cp -r . $GOROOT
( cd $GOROOT/src && ./all.bash )
-
- # (https://github.com/golang/go/wiki/GoGetTools)
- wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
'';
preFixup = ''
rm -r $out/share/go/pkg/bootstrap
+ rm -r $out/share/go/pkg/obj
ln -s $out/share/go/bin $out/bin
'';
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 48f16c3ffa5..d6ae163813f 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps
-, pcre, cacert, llvm
-, Security, Foundation
-, makeWrapper, git, subversion, mercurial, bazaar }:
+, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
let
@@ -35,7 +32,7 @@ stdenv.mkDerivation rec {
};
# perl is used for testing go vet
- nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
+ nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -165,9 +162,6 @@ stdenv.mkDerivation rec {
installPhase = ''
cp -r . $GOROOT
( cd $GOROOT/src && ./all.bash )
-
- # (https://github.com/golang/go/wiki/GoGetTools)
- wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
'';
preFixup = ''
diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
new file mode 100644
index 00000000000..afe5aea3d91
--- /dev/null
+++ b/pkgs/development/compilers/go/skip-test-extra-files-on-386.patch
@@ -0,0 +1,15 @@
+diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
+index 558345ff63..22129bf022 100644
+--- a/src/os/exec/exec_test.go
++++ b/src/os/exec/exec_test.go
+@@ -593,6 +593,10 @@ func TestExtraFiles(t *testing.T) {
+ t.Skipf("skipping test on %q", runtime.GOOS)
+ }
+
++ if runtime.GOOS == "linux" && runtime.GOARCH == "386" {
++ t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS)
++ }
++
+ // Ensure that file descriptors have not already been leaked into
+ // our environment.
+ if !testedAlreadyLeaked {
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 4a520471f86..15eec4134ac 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,10 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, emscripten }:
+{ stdenv, lib, fetchFromGitHub }:
-let version = "0.11.2"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "jsonnet-${version}";
- version = version;
+ version = "0.11.2";
src = fetchFromGitHub {
rev = "v${version}";
@@ -13,18 +11,18 @@ stdenv.mkDerivation {
sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym";
};
- buildInputs = [ emscripten ];
-
enableParallelBuilding = true;
- makeFlags = [''EM_CACHE=$(TMPDIR)/.em_cache'' ''all''];
+ makeFlags = [
+ "jsonnet"
+ "libjsonnet.so"
+ ];
installPhase = ''
- mkdir -p $out/bin $out/lib $out/share/
+ mkdir -p $out/bin $out/lib $out/include
cp jsonnet $out/bin/
- cp libjsonnet.so $out/lib/
- cp -a doc $out/share/doc
- cp -a include $out/include
+ cp libjsonnet*.so $out/lib/
+ cp -a include/*.h $out/include/
'';
meta = {
diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index 2301d0c1f43..528a0d26d05 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -1,6 +1,6 @@
import ./shared.nix {
majorVersion = "1";
minorVersion = "0";
- maintenanceVersion = "0";
- src_sha256 = "083277z90m1jxr2d1ysb96rgjj9h5q97l6h54mx3pb3f38ykshz2";
+ maintenanceVersion = "1";
+ src_sha256 = "0bqb5c63c7jnb753nplqj5v4k9pvh792k8y4b1n5pq8jiibr86i0";
}
diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix
index 41c9c57bd03..70ff40cd7ec 100644
--- a/pkgs/development/compilers/julia/shared.nix
+++ b/pkgs/development/compilers/julia/shared.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation rec {
touch test/$i.jl
done
rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl
+ rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl
sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl
sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl
'';
@@ -211,7 +212,7 @@ stdenv.mkDerivation rec {
description = "High-level performance-oriented dynamical language for technical computing";
homepage = https://julialang.org/;
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ raskin rob ];
+ maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.isi686;
};
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 757773eed52..7b88efd1e61 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
let
- version = "1.2.61";
+ version = "1.2.71";
in stdenv.mkDerivation rec {
inherit version;
name = "kotlin-${version}";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
- sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy";
+ sha256 = "0yzanv2jkjx3vfixzvjsihfi00khs7zr47y01cil8bylzvyr50p4";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/llvm/3.5/default.nix b/pkgs/development/compilers/llvm/3.5/default.nix
index f588eb4407b..b87fa747f14 100644
--- a/pkgs/development/compilers/llvm/3.5/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/default.nix
@@ -6,7 +6,7 @@ let
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
- url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
+ url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz";
inherit sha256;
};
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index f176894dedb..3c557711449 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -9,7 +9,7 @@ let
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
- url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
+ url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz";
inherit sha256;
};
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index 99869e6e80a..a848c8b9252 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -8,7 +8,7 @@ let
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
- url = "http://llvm.org/releases/${ver}/${name}-${ver}.src.tar.xz";
+ url = "https://releases.llvm.org/${ver}/${name}-${ver}.src.tar.xz";
inherit sha256;
};
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index 01c08f4bd20..752790cdd85 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -8,7 +8,7 @@ let
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
- url = "http://llvm.org/releases/${version}/${name}-${ver}.src.tar.xz";
+ url = "https://releases.llvm.org/${version}/${name}-${ver}.src.tar.xz";
inherit sha256;
};
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 38d2b0d461d..68ee80fa7a6 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -9,7 +9,7 @@ let
version = release_version; # differentiating these is important for rc's
fetch = name: sha256: fetchurl {
- url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz";
+ url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
inherit sha256;
};
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index c7b4615e374..b182f1250e7 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -10,11 +10,9 @@ stdenv.mkDerivation rec {
export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
'';
- # on next rebuild, this can be replaced with optionals; for now set to null to avoid
- # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
- patches = if stdenv.hostPlatform.isMusl then [
+ patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
- ] else null;
+ ];
prePatch = ''
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index 3abba0ed340..6dae8be97c8 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -119,12 +119,14 @@ in stdenv.mkDerivation (rec {
+ stdenv.lib.optionalString enableSharedLibraries ''
moveToOutput "lib/libLLVM-*" "$lib"
moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+ moveToOutput "lib/libLTO${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
''
+ stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
- --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \
+ --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib"
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
'';
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 831e4b65344..5ee551f6b6b 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -9,7 +9,7 @@ let
version = release_version; # differentiating these is important for rc's
fetch = name: sha256: fetchurl {
- url = "http://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
+ url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
inherit sha256;
};
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 1f87cb83ab0..3a165e9da7b 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -10,11 +10,9 @@ stdenv.mkDerivation rec {
export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
'';
- # on next rebuild, this can be replaced with optionals; for now set to null to avoid
- # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
- patches = if stdenv.hostPlatform.isMusl then [
+ patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
../../libcxx-0001-musl-hacks.patch
- ] else null;
+ ];
prePatch = ''
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
new file mode 100644
index 00000000000..e1f4eb30360
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -0,0 +1,106 @@
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python
+, fixDarwinDylibNames
+, enableManpages ? false
+}:
+
+let
+ gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+ self = stdenv.mkDerivation ({
+ name = "clang-${version}";
+
+ unpackPhase = ''
+ unpackFile ${fetch "cfe" "0mdsbgj3p7mayhzm8hclzl3i46r2lwa8fr1cz399f9km3iqi40jm"}
+ mv cfe-${version}* clang
+ sourceRoot=$PWD/clang
+ unpackFile ${clang-tools-extra_src}
+ mv clang-tools-extra-* $sourceRoot/tools/extra
+ '';
+
+ nativeBuildInputs = [ cmake python ]
+ ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
+
+ buildInputs = [ libxml2 llvm ]
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ cmakeFlags = [
+ "-DCMAKE_CXX_FLAGS=-std=c++11"
+ ] ++ stdenv.lib.optionals enableManpages [
+ "-DCLANG_INCLUDE_DOCS=ON"
+ "-DLLVM_ENABLE_SPHINX=ON"
+ "-DSPHINX_OUTPUT_MAN=ON"
+ "-DSPHINX_OUTPUT_HTML=OFF"
+ "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+ ];
+
+ patches = [ ./purity.patch ];
+
+ postPatch = ''
+ sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
+ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
+ lib/Driver/ToolChains/*.cpp
+
+ # Patch for standalone doc building
+ sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+ sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
+ '';
+
+ outputs = [ "out" "lib" "python" ];
+
+ # Clang expects to find LLVMgold in its own prefix
+ postInstall = ''
+ if [ -e ${llvm}/lib/LLVMgold.so ]; then
+ ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+ fi
+
+ ln -sv $out/bin/clang $out/bin/cpp
+
+ # Move libclang to 'lib' output
+ moveToOutput "lib/libclang.*" "$lib"
+ substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
+ --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang."
+
+ mkdir -p $python/bin $python/share/clang/
+ mv $out/bin/{git-clang-format,scan-view} $python/bin
+ if [ -e $out/bin/set-xcode-analyzer ]; then
+ mv $out/bin/set-xcode-analyzer $python/bin
+ fi
+ mv $out/share/clang/*.py $python/share/clang
+ rm $out/bin/c-index-test
+ '';
+
+ enableParallelBuilding = true;
+
+ passthru = {
+ isClang = true;
+ inherit llvm;
+ } // stdenv.lib.optionalAttrs stdenv.targetPlatform.isLinux {
+ inherit gcc;
+ };
+
+ meta = {
+ description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+ homepage = http://llvm.org/;
+ license = stdenv.lib.licenses.ncsa;
+ platforms = stdenv.lib.platforms.all;
+ };
+ } // stdenv.lib.optionalAttrs enableManpages {
+ name = "clang-manpages-${version}";
+
+ buildPhase = ''
+ make docs-clang-man
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/man/man1
+ # Manually install clang manpage
+ cp docs/man/*.1 $out/share/man/man1/
+ '';
+
+ outputs = [ "out" ];
+
+ doCheck = false;
+
+ meta.description = "man page for Clang ${version}";
+ });
+in self
diff --git a/pkgs/development/compilers/llvm/7/clang/purity.patch b/pkgs/development/compilers/llvm/7/clang/purity.patch
new file mode 100644
index 00000000000..b30d0d0b5d5
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/clang/purity.patch
@@ -0,0 +1,30 @@
+From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Thu, 18 May 2017 11:56:12 -0500
+Subject: [PATCH] "purity" patch for 5.0
+
+---
+ lib/Driver/ToolChains/Gnu.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index fe3c0191bb..c6a482bece 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+ if (!Args.hasArg(options::OPT_static)) {
+ if (Args.hasArg(options::OPT_rdynamic))
+ CmdArgs.push_back("-export-dynamic");
+-
+- if (!Args.hasArg(options::OPT_shared)) {
+- const std::string Loader =
+- D.DyldPrefix + ToolChain.getDynamicLinker(Args);
+- CmdArgs.push_back("-dynamic-linker");
+- CmdArgs.push_back(Args.MakeArgString(Loader));
+- }
+ }
+
+ CmdArgs.push_back("-o");
+--
+2.11.0
+
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
new file mode 100644
index 00000000000..3cc12b94b20
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/compiler-rt-codesign.patch
@@ -0,0 +1,33 @@
+From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Tue, 19 Sep 2017 13:13:06 -0500
+Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that
+ needs it
+
+---
+ cmake/Modules/AddCompilerRT.cmake | 8 ------
+ test/asan/CMakeLists.txt | 52 ---------------------------------------
+ test/tsan/CMakeLists.txt | 47 -----------------------------------
+ 3 files changed, 107 deletions(-)
+
+diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
+index bc5fb9ff7..b64eb4246 100644
+--- a/cmake/Modules/AddCompilerRT.cmake
++++ b/cmake/Modules/AddCompilerRT.cmake
+@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)
+ set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
+ set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
+ endif()
+- if(APPLE)
+- # Ad-hoc sign the dylibs
+- add_custom_command(TARGET ${libname}
+- POST_BUILD
+- COMMAND codesign --sign - $
+- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}
+- )
+- endif()
+ endif()
+ install(TARGETS ${libname}
+ ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
+2.14.1
+
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
new file mode 100644
index 00000000000..ec739d22dd7
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -0,0 +1,37 @@
+{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }:
+with stdenv.lib;
+stdenv.mkDerivation rec {
+ name = "compiler-rt-${version}";
+ inherit version;
+ src = fetch "compiler-rt" "1mkhqvs8cxbfmprkzwyq7lmnzr1sv45znzf0arbgb19crzipzv5x";
+
+ nativeBuildInputs = [ cmake python llvm ];
+ buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+
+ configureFlags = [
+ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+ ];
+
+ outputs = [ "out" "dev" ];
+
+ patches = [
+ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+ ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
+
+ # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+ # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+ # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+ # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+ # a flag and turn the flag off during the stdenv build.
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace cmake/config-ix.cmake \
+ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+ '';
+
+ # Hack around weird upsream RPATH bug
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ ln -s "$out/lib"/*/* "$out/lib"
+ '';
+
+ enableParallelBuilding = true;
+}
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
new file mode 100644
index 00000000000..5446f1b362a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -0,0 +1,92 @@
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
+}:
+
+let
+ release_version = "7.0.0";
+ version = release_version; # differentiating these is important for rc's
+
+ fetch = name: sha256: fetchurl {
+ url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz";
+ inherit sha256;
+ };
+
+ clang-tools-extra_src = fetch "clang-tools-extra" "1glxl7bnr4k3j16s8xy8r9cl0llyg524f50591g1ig23ij65lz4k";
+
+ tools = stdenv.lib.makeExtensible (tools: let
+ callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
+ mkExtraBuildCommands = cc: ''
+ rsrc="$out/resource-root"
+ mkdir "$rsrc"
+ ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+ ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+ echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+ '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+ echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+ '';
+ in {
+
+ llvm = callPackage ./llvm.nix { };
+
+ clang-unwrapped = callPackage ./clang {
+ inherit clang-tools-extra_src;
+ };
+
+ llvm-manpages = lowPrio (tools.llvm.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
+ });
+
+ clang-manpages = lowPrio (tools.clang-unwrapped.override {
+ enableManpages = true;
+ python = pkgs.python; # don't use python-boot
+ });
+
+ libclang = tools.clang-unwrapped.lib;
+
+ clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
+
+ libstdcxxClang = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ extraPackages = [
+ libstdcxxHook
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = mkExtraBuildCommands cc;
+ };
+
+ libcxxClang = wrapCCWith rec {
+ cc = tools.clang-unwrapped;
+ extraPackages = [
+ targetLlvmLibraries.libcxx
+ targetLlvmLibraries.libcxxabi
+ targetLlvmLibraries.compiler-rt
+ ];
+ extraBuildCommands = mkExtraBuildCommands cc;
+ };
+
+ lld = callPackage ./lld.nix {};
+
+ lldb = callPackage ./lldb.nix {};
+ });
+
+ libraries = stdenv.lib.makeExtensible (libraries: let
+ callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
+ in {
+
+ compiler-rt = callPackage ./compiler-rt.nix {};
+
+ stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+ libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
+
+ libcxx = callPackage ./libc++ {};
+
+ libcxxabi = callPackage ./libc++abi.nix {};
+
+ openmp = callPackage ./openmp.nix {};
+ });
+
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
new file mode 100644
index 00000000000..76bfb34975e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -0,0 +1,50 @@
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
+
+stdenv.mkDerivation rec {
+ name = "libc++-${version}";
+
+ src = fetch "libcxx" "1w1l472p03csgz76p70pn9yk7h0nw5hj1av44ysnakigp8jjcd4v";
+
+ postUnpack = ''
+ unpackFile ${libcxxabi.src}
+ export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
+ '';
+
+ patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+
+ prePatch = ''
+ substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
+ '';
+
+ preConfigure = ''
+ # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
+ cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
+ '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+ patchShebangs utils/cat_files.py
+ '';
+ nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python;
+
+ buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ cmakeFlags = [
+ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+ "-DLIBCXX_LIBCPPABI_VERSION=2"
+ "-DLIBCXX_CXX_ABI=libcxxabi"
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
+
+ enableParallelBuilding = true;
+
+ linkCxxAbi = stdenv.isLinux;
+
+ setupHooks = [
+ ../../../../../build-support/setup-hooks/role.bash
+ ./setup-hook.sh
+ ];
+
+ meta = {
+ homepage = http://libcxx.llvm.org/;
+ description = "A new implementation of the C++ standard library, targeting C++11";
+ license = with stdenv.lib.licenses; [ ncsa mit ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
new file mode 100644
index 00000000000..6611259165a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh
@@ -0,0 +1,6 @@
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
+
+linkCxxAbi="@linkCxxAbi@"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
new file mode 100644
index 00000000000..7dbda6c365e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -0,0 +1,49 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+
+stdenv.mkDerivation {
+ name = "libc++abi-${version}";
+
+ src = fetch "libcxxabi" "0pr4xfx61r5mwmvhg4j9pb6df6vvha1gyf6rwkm14x9rzxcwficv";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+
+ postUnpack = ''
+ unpackFile ${libcxx.src}
+ unpackFile ${llvm.src}
+ export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ export TRIPLE=x86_64-apple-darwin
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+ patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
+ '';
+
+ installPhase = if stdenv.isDarwin
+ then ''
+ for file in lib/*.dylib; do
+ # this should be done in CMake, but having trouble figuring out
+ # the magic combination of necessary CMake variables
+ # if you fancy a try, take a look at
+ # http://www.cmake.org/Wiki/CMake_RPATH_handling
+ install_name_tool -id $out/$file $file
+ done
+ make install
+ install -d 755 $out/include
+ install -m 644 ../include/*.h $out/include
+ ''
+ else ''
+ install -d -m 755 $out/include $out/lib
+ install -m 644 lib/libc++abi.so.1.0 $out/lib
+ install -m 644 ../include/cxxabi.h $out/include
+ ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+ ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+ '';
+
+ meta = {
+ homepage = http://libcxxabi.llvm.org/;
+ description = "A new implementation of low level support for a standard C++ library";
+ license = with stdenv.lib.licenses; [ ncsa mit ];
+ maintainers = with stdenv.lib.maintainers; [ vlstill ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix
new file mode 100644
index 00000000000..f6ce768d648
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/lld.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetch
+, cmake
+, libxml2
+, llvm
+, version
+}:
+
+stdenv.mkDerivation {
+ name = "lld-${version}";
+
+ src = fetch "lld" "173z50vx5mlsaiqmbz7asxy2297z4xivrfxrdfncvx23wp2lgkzv";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ llvm libxml2 ];
+
+ outputs = [ "out" "dev" ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ moveToOutput include "$dev"
+ moveToOutput lib "$dev"
+ '';
+
+ meta = {
+ description = "The LLVM Linker";
+ homepage = http://lld.llvm.org/;
+ license = stdenv.lib.licenses.ncsa;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix
new file mode 100644
index 00000000000..6c3f0699978
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/lldb.nix
@@ -0,0 +1,56 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, libxml2
+, llvm
+, clang-unwrapped
+, python
+, version
+, darwin
+}:
+
+stdenv.mkDerivation {
+ name = "lldb-${version}";
+
+ src = fetch "lldb" "0cmah36ybyfws0z2ikq9fqn5k4kvjci7vgk97ddx4xwrwkzdixkz";
+
+ postPatch = ''
+ # Fix up various paths that assume llvm and clang are installed in the same place
+ sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
+ cmake/modules/LLDBStandalone.cmake
+ sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \
+ cmake/modules/LLDBStandalone.cmake
+ sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \
+ cmake/modules/LLDBStandalone.cmake
+ '';
+
+ nativeBuildInputs = [ cmake python which swig ];
+ buildInputs = [ ncurses zlib libedit libxml2 llvm ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
+
+ CXXFLAGS = "-fno-rtti";
+ hardeningDisable = [ "format" ];
+
+ cmakeFlags = [
+ "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+ ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ mkdir -p $out/share/man/man1
+ cp ../docs/lldb.1 $out/share/man/man1/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A next-generation high-performance debugger";
+ homepage = http://llvm.org/;
+ license = licenses.ncsa;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/7/llvm-outputs.patch b/pkgs/development/compilers/llvm/7/llvm-outputs.patch
new file mode 100644
index 00000000000..40096fa3497
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/llvm-outputs.patch
@@ -0,0 +1,26 @@
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 94d426b..37f7794 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
+ ActiveIncludeOption = "-I" + ActiveIncludeDir;
+ }
+
++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
++ if (!IsInDevelopmentTree) {
++ bool WantShared = true;
++ for (int i = 1; i < argc; ++i) {
++ StringRef Arg = argv[i];
++ if (Arg == "--link-shared")
++ WantShared = true;
++ else if (Arg == "--link-static")
++ WantShared = false; // the last one wins
++ }
++
++ if (WantShared)
++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
++ }
++
+ /// We only use `shared library` mode in cases where the static library form
+ /// of the components provided are not available; note however that this is
+ /// skipped if we're run from within the build dir. However, once installed,
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
new file mode 100644
index 00000000000..67bde813fee
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -0,0 +1,174 @@
+{ stdenv
+, fetch
+, cmake
+, python
+, libffi
+, libbfd
+, libpfm
+, libxml2
+, ncurses
+, version
+, release_version
+, zlib
+, debugVersion ? false
+, enableManpages ? false
+, enableSharedLibraries ? true
+, enableWasm ? true
+, enablePFM ? !stdenv.isDarwin
+}:
+
+let
+ src = fetch "llvm" "08p27wv1pr9ql2zc3f3qkkymci46q7myvh8r5ijippnbwr2gihcb";
+
+ # Used when creating a version-suffixed symlink of libLLVM.dylib
+ shortVersion = with stdenv.lib;
+ concatStringsSep "." (take 1 (splitString "." release_version));
+in stdenv.mkDerivation (rec {
+ name = "llvm-${version}";
+
+ unpackPhase = ''
+ unpackFile ${src}
+ mv llvm-${version}* llvm
+ sourceRoot=$PWD/llvm
+ '';
+
+ outputs = [ "out" "python" ]
+ ++ stdenv.lib.optional enableSharedLibraries "lib";
+
+ nativeBuildInputs = [ cmake python ]
+ ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
+
+ buildInputs = [ libxml2 libffi ]
+ ++ stdenv.lib.optional enablePFM libpfm; # exegesis
+
+ propagatedBuildInputs = [ ncurses zlib ];
+
+ postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+ substituteInPlace cmake/modules/AddLLVM.cmake \
+ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \
+ --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
+ ''
+ # Patch llvm-config to return correct library path based on --link-{shared,static}.
+ + stdenv.lib.optionalString (enableSharedLibraries) ''
+ substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
+ patch -p1 < ./llvm-outputs.patch
+ '' + ''
+ # FileSystem permissions tests fail with various special bits
+ substituteInPlace unittests/Support/CMakeLists.txt \
+ --replace "Path.cpp" ""
+ rm unittests/Support/Path.cpp
+ '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+ patch -p1 -i ${../TLI-musl.patch}
+ substituteInPlace unittests/Support/CMakeLists.txt \
+ --replace "add_subdirectory(DynamicLibrary)" ""
+ rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+ '' + ''
+ patchShebangs test/BugPoint/compile-custom.ll.py
+ '';
+
+ # hacky fix: created binaries need to be run before installation
+ preBuild = ''
+ mkdir -p $out/
+ ln -sv $PWD/lib $out
+ '';
+
+ cmakeFlags = with stdenv; [
+ "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
+ "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc
+ "-DLLVM_BUILD_TESTS=ON"
+ "-DLLVM_ENABLE_FFI=ON"
+ "-DLLVM_ENABLE_RTTI=ON"
+
+ "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+ "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+ "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}"
+
+ "-DLLVM_ENABLE_DUMP=ON"
+ ]
+ ++ stdenv.lib.optional enableSharedLibraries
+ "-DLLVM_LINK_LLVM_DYLIB=ON"
+ ++ stdenv.lib.optionals enableManpages [
+ "-DLLVM_BUILD_DOCS=ON"
+ "-DLLVM_ENABLE_SPHINX=ON"
+ "-DSPHINX_OUTPUT_MAN=ON"
+ "-DSPHINX_OUTPUT_HTML=OFF"
+ "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+ ]
+ ++ stdenv.lib.optional (!isDarwin)
+ "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
+ ++ stdenv.lib.optionals (isDarwin) [
+ "-DLLVM_ENABLE_LIBCXX=ON"
+ "-DCAN_TARGET_i386=false"
+ ]
+ ++ stdenv.lib.optional enableWasm
+ "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
+ ;
+
+ postBuild = ''
+ rm -fR $out
+
+ paxmark m bin/{lli,llvm-rtdyld}
+ paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
+ paxmark m unittests/ExecutionEngine/Orc/OrcJITTests
+ paxmark m unittests/Support/SupportTests
+ paxmark m bin/lli-child-target
+ '';
+
+ preCheck = ''
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+ '';
+
+ postInstall = ''
+ mkdir -p $python/share
+ mv $out/share/opt-viewer $python/share/opt-viewer
+ ''
+ + stdenv.lib.optionalString enableSharedLibraries ''
+ moveToOutput "lib/libLLVM-*" "$lib"
+ moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+ substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
+ ''
+ + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+ substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+ '';
+
+ doCheck = stdenv.isLinux && (!stdenv.isi686);
+
+ checkTarget = "check-all";
+
+ enableParallelBuilding = true;
+
+ passthru.src = src;
+
+ meta = {
+ description = "Collection of modular and reusable compiler and toolchain technologies";
+ homepage = http://llvm.org/;
+ license = stdenv.lib.licenses.ncsa;
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
+ platforms = stdenv.lib.platforms.all;
+ };
+} // stdenv.lib.optionalAttrs enableManpages {
+ name = "llvm-manpages-${version}";
+
+ buildPhase = ''
+ make docs-llvm-man
+ '';
+
+ propagatedBuildInputs = [];
+
+ installPhase = ''
+ make -C docs install
+ '';
+
+ postPatch = null;
+ postInstall = null;
+
+ outputs = [ "out" ];
+
+ doCheck = false;
+
+ meta.description = "man pages for LLVM ${version}";
+})
diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix
new file mode 100644
index 00000000000..31059b7c4c0
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/openmp.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, fetch
+, cmake
+, llvm
+, perl
+, version
+}:
+
+stdenv.mkDerivation {
+ name = "openmp-${version}";
+
+ src = fetch "openmp" "1zrqlaxr954sp8lcr7g8m0z0pr8xyq4i6p11x6gcamjm5xijnrih";
+
+ nativeBuildInputs = [ cmake perl ];
+ buildInputs = [ llvm ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "Components required to build an executable OpenMP program";
+ homepage = http://openmp.llvm.org/;
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
new file mode 100644
index 00000000000..1f2ac97818e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/7/sanitizers-nongnu.patch
@@ -0,0 +1,412 @@
+From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Mon, 24 Sep 2018 11:17:25 -0500
+Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
+
+------
+Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc | 4 +-
+ lib/interception/interception_linux.cc | 2 +-
+ lib/interception/interception_linux.h | 2 +-
+ lib/msan/msan_linux.cc | 2 +-
+ lib/sanitizer_common/sanitizer_allocator.cc | 2 +-
+ .../sanitizer_common_interceptors_ioctl.inc | 4 +-
+ .../sanitizer_common_syscalls.inc | 2 +-
+ lib/sanitizer_common/sanitizer_linux.cc | 8 +++-
+ .../sanitizer_linux_libcdep.cc | 10 ++---
+ lib/sanitizer_common/sanitizer_platform.h | 6 +++
+ .../sanitizer_platform_interceptors.h | 4 +-
+ .../sanitizer_platform_limits_posix.cc | 37 +++++++++++--------
+ lib/tsan/rtl/tsan_platform_linux.cc | 2 +-
+ 13 files changed, 51 insertions(+), 34 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 625f32d40..73cf77aca 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -46,7 +46,7 @@
+ #include
+ #endif
+
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #include
+ extern "C" void* _DYNAMIC;
+ #elif SANITIZER_NETBSD
+@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+ UNIMPLEMENTED();
+ }
+
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index 26bfcd8f6..529b234f7 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+ }
+
+ // Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+ return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 942c25609..24a4d5080 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+ (::__interception::uptr) & WRAP(func))
+
+ // Android, Solaris and OpenBSD do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+ (::__interception::real_##func = (func##_f)( \
+ unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 385a650c4..6e30a8ce9 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
+
+ #include "msan.h"
+ #include "msan_report.h"
+diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
+index 6bfd5e5ee..048f6154f 100644
+--- a/lib/sanitizer_common/sanitizer_allocator.cc
++++ b/lib/sanitizer_common/sanitizer_allocator.cc
+@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
+
+ // ThreadSanitizer for Go uses libc malloc/free.
+ #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
+-# if SANITIZER_LINUX && !SANITIZER_ANDROID
++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ extern "C" void *__libc_malloc(uptr size);
+ # if !SANITIZER_GO
+ extern "C" void *__libc_memalign(uptr alignment, uptr size);
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 2d633c173..b6eb23116 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
+ _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ // Conflicting request ids.
+ // _(CDROMAUDIOBUFSIZ, NONE, 0);
+ // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
+ _(VT_WAITACTIVE, NONE, 0);
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+ _(CYGETDEFTHRESH, WRITE, sizeof(int));
+ _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+ }
+ }
+
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+ void *old_rlim) {
+ if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
+index 96d6c1eff..9e2b7fb9d 100644
+--- a/lib/sanitizer_common/sanitizer_linux.cc
++++ b/lib/sanitizer_common/sanitizer_linux.cc
+@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
+ #endif
+ }
+
+-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ extern "C" {
+ SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
+ }
+ #endif
+
+-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
+ !SANITIZER_OPENBSD
+ static void ReadNullSepFileToArray(const char *path, char ***arr,
+ int arr_size) {
+@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
+ #elif SANITIZER_NETBSD
+ *argv = __ps_strings->ps_argvstr;
+ *envp = __ps_strings->ps_envstr;
++#elif SANITIZER_NONGNU
++ static const int kMaxArgv = 2000, kMaxEnvp = 2000;
++ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
++ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
+ #else // SANITIZER_FREEBSD
+ #if !SANITIZER_GO
+ if (&__libc_stack_end) {
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 4962ff832..438f94dbe 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
+ }
+
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \
+- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
++ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+
+ #ifdef __i386__
+@@ -261,7 +261,7 @@ void InitTlsSize() { }
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \
+ defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \
+ defined(__arm__)) && \
+- SANITIZER_LINUX && !SANITIZER_ANDROID
++ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t thread_descriptor_size;
+
+@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+ *addr = ThreadSelf();
+ *size = GetTlsSize();
+@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #elif SANITIZER_OPENBSD
+ *addr = 0;
+ *size = 0;
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+ *addr = 0;
+ *size = 0;
+ #elif SANITIZER_SOLARIS
+@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \
+- SANITIZER_OPENBSD || SANITIZER_SOLARIS
++ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ uptr addr, size;
+ GetTls(&addr, &size);
+ return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index d81e25580..e10680ac8 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -208,6 +208,12 @@
+ # define SANITIZER_SOLARIS32 0
+ #endif
+
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ #if defined(__myriad2__)
+ # define SANITIZER_MYRIAD2 1
+ #else
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index f95539a73..6c53b3415 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -39,7 +39,7 @@
+ # include "sanitizer_platform_limits_solaris.h"
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+@@ -322,7 +322,7 @@
+ #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_SHMCTL \
+ (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
+- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+ SANITIZER_WORDSIZE == 64)) // NOLINT
+ #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 54da635d7..2f6ff69c3 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+
+ #include "sanitizer_platform.h"
+
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include
+-#include
++# if !SANITIZER_NONGNU
++# include
++# endif
+ #include
+-#include
+-#include
+-#include
+-#include
++#include
++#include
++#include
++#include
+ #if HAVE_RPC_XDR_H
+ # include
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -251,7 +256,7 @@ namespace __sanitizer {
+ unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // Use pre-computed size of struct ustat to avoid which
+ // has been removed from glibc 2.28.
+ #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
+@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ int glob_nomatch = GLOB_NOMATCH;
+ int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned struct_termios_sz = sizeof(struct termios);
+ unsigned struct_winsize_sz = sizeof(struct winsize);
+
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ unsigned struct_arpreq_sz = sizeof(struct arpreq);
+ unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+ unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+ unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+ unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+ unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+
+ CHECK_TYPE_SIZE(ether_addr);
+
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+
+@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index de989b780..51a97b554 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -294,7 +294,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ int cnt = 0;
+ struct __res_state *statp = (struct __res_state*)state;
+ for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+--
+2.19.0
+
diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix
deleted file mode 100644
index 7cd3c179366..00000000000
--- a/pkgs/development/compilers/mentor/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-# Sourcery CodeBench Lite toolchain(s) (GCC) from Mentor Graphics
-
-{ stdenv, fetchurl, patchelf, ncurses }:
-
-let
-
- buildToolchain =
- { name, src, description }:
-
- stdenv.mkDerivation rec {
- inherit name src;
-
- buildInputs = [ patchelf ];
-
- buildCommand = ''
- # Unpack tarball
- mkdir -p "$out"
- tar --strip-components=1 -xjf "$src" -C "$out"
-
- # Patch binaries
- interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
- for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do
- # Skip non-executable files
- case "$file" in
- *README.txt) echo "skipping $file"; continue;;
- *liblto_plugin.so*) echo "skipping $file"; continue;;
- esac
-
- # Skip directories
- test -d "$file" && continue
-
- echo "patchelf'ing $file"
- patchelf --set-interpreter "$interpreter" "$file"
-
- # GDB needs ncurses
- case "$file" in
- *gdb) patchelf --set-rpath "${ncurses.out}/lib" "$file";;
- esac
- done
-
- # Manpages
- mkdir -p "$out/share/man"
- ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1"
- ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7"
- '';
-
- meta = with stdenv.lib; {
- inherit description;
- homepage = https://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/;
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = [ maintainers.bjornfor ];
- };
- };
-
-in
-
-{
-
- armLinuxGnuEabi = let version = "2013.05-24"; in buildToolchain rec {
- name = "sourcery-codebench-lite-arm-linux-gnueabi-${version}";
- description = "Sourcery CodeBench Lite toolchain (GCC) for ARM GNU/Linux, from Mentor Graphics";
- src = fetchurl {
- url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${version}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2";
- sha256 = "1xb075ia61c59cya2jl8zp4fvqpfnwkkc5330shvgdlg9981qprr";
- };
- };
-
- armEabi = let version = "2013.05-23"; in buildToolchain rec {
- name = "sourcery-codebench-lite-arm-eabi-${version}";
- description = "Sourcery CodeBench Lite toolchain (GCC) for ARM EABI, from Mentor Graphics";
- src = fetchurl {
- url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-${version}-arm-none-eabi-i686-pc-linux-gnu.tar.bz2";
- sha256 = "0nbvdwj3kcv9scx808gniqp0ncdiy2i7afmdvribgkz1lsfin923";
- };
- };
-
- # TODO: Sourcery CodeBench is also available for MIPS, Power, SuperH,
- # ColdFire (and more).
-}
diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix
index cfee1b0d863..f15a7624327 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/pkgs/development/compilers/microscheme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, vim, avrdude, avrbinutils, avrgcc, avrlibc, makeWrapper }:
+{ stdenv, fetchzip, vim, makeWrapper }:
stdenv.mkDerivation rec {
name = "microscheme-${version}";
@@ -10,15 +10,10 @@ stdenv.mkDerivation rec {
sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976";
};
- # Just a guess
- propagatedBuildInputs = [ avrlibc ];
buildInputs = [ makeWrapper vim ];
installPhase = ''
make install PREFIX=$out
-
- wrapProgram $out/bin/microscheme \
- --prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcc avrbinutils ]}"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 2896c0c0913..de7e3bd6a07 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -1,9 +1,9 @@
# Updating the dependencies for this package:
#
-# wget https://github.com/mint-lang/mint/blob/0.2.1/shard.lock
+# wget https://raw.githubusercontent.com/mint-lang/mint/0.3.1/shard.lock
# nix-shell -p crystal libyaml --run 'crystal run crystal2nix.cr'
#
-{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which }:
+{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }:
let
crystalPackages = lib.mapAttrs (name: src:
stdenv.mkDerivation {
@@ -33,17 +33,16 @@ let
};
in
stdenv.mkDerivation rec {
- version = "0.2.1";
+ version = "0.3.1";
name = "mint-${version}";
src = fetchFromGitHub {
owner = "mint-lang";
repo = "mint";
rev = version;
- sha256 = "0r8hv2j5yz0rlvrbpnybihj44562pkmsssa8f0hjs45m1ifvf4b1";
+ sha256 = "1f49ax045zdjj0ypc2j4ms9gx80rl63qcsfzm3r0k0lcavfp57zr";
};
- nativeBuildInputs = [ which ];
- buildInputs = [ crystal zlib openssl duktape ];
+ nativeBuildInputs = [ which crystal zlib openssl duktape libyaml ];
buildPhase = ''
mkdir -p $out/bin tmp
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
index 069df52ba12..fbf85ef8042 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -8,8 +8,8 @@
ameba = {
owner = "veelenga";
repo = "ameba";
- rev = "v0.7.0";
- sha256 = "01h0a1ba5l254r04mgkqhjdfn21cs0q7fmvk4gj35cj5lpr2bp17";
+ rev = "v0.8.0";
+ sha256 = "0i9vc5xy05kzxgjid2rnvc7ksvxm9gba25qqi6939q2m1s07qjka";
};
baked_file_system = {
owner = "schovi";
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
new file mode 100644
index 00000000000..f495be8a93e
--- /dev/null
+++ b/pkgs/development/compilers/mlton/20130715.nix
@@ -0,0 +1,118 @@
+{ stdenv, fetchurl, patchelf, gmp }:
+
+let
+ version = "20130715";
+
+ usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
+
+ dynamic_linker = stdenv.cc.bintools.dynamicLinker;
+in
+
+stdenv.mkDerivation rec {
+ name = "mlton-${version}";
+
+ binSrc =
+ if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
+ url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz";
+ sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
+ })
+ else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
+ url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz";
+ sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
+ })
+ else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
+ url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
+ sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
+ })
+ else throw "Architecture not supported";
+
+ codeSrc =
+ fetchurl {
+ url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz";
+ sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
+ };
+
+ srcs = [ binSrc codeSrc ];
+
+ sourceRoot = name;
+
+ buildInputs = [ gmp ];
+ nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
+
+ makeFlags = [ "all-no-docs" ];
+
+ configurePhase = ''
+ # Fix paths in the source.
+ find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
+
+ substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)
+ substituteInPlace bin/mlton-script --replace gcc cc
+ substituteInPlace bin/regression --replace gcc cc
+ substituteInPlace lib/mlnlffi-lib/Makefile --replace gcc cc
+ substituteInPlace mlnlffigen/gen-cppcmd --replace gcc cc
+ substituteInPlace runtime/Makefile --replace gcc cc
+ substituteInPlace ../${usr_prefix}/bin/mlton --replace gcc cc
+
+ # Fix paths in the binary distribution.
+ BIN_DIST_DIR="$(pwd)/../${usr_prefix}"
+ for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do
+ substituteInPlace "$BIN_DIST_DIR/$f" --replace '/${usr_prefix}/bin/env bash' $(type -p bash)
+ done
+
+ substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
+ '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+ sed -i "s_ patch -s -p0 /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+ exes=$(file $out/lib/openjdk/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
echo "to mark: *$exes*"
for file in $exes; do
echo "marking *$file*"
paxmark ${paxflags} "$file"
done
- # Remove duplicate binaries.
- for i in $(cd $out/lib/openjdk/bin && echo *); do
- if [ "$i" = java ]; then continue; fi
- if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then
- ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i
- fi
- done
-
ln -s $out/lib/openjdk/bin $out/bin
- ln -s $jre/lib/openjdk/jre/bin $jre/bin
- ln -s $jre/lib/openjdk/jre $out/jre
'';
- # FIXME: this is unnecessary once the multiple-outputs branch is merged.
preFixup = ''
- prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}"
- patchELF $jre
- propagatedBuildInputs+=" $jre"
-
- # Propagate the setJavaClassPath setup hook from the JRE so that
- # any package that depends on the JRE has $CLASSPATH set up
- # properly.
- mkdir -p $jre/nix-support
+ # Propagate the setJavaClassPath setup hook so that any package
+ # that depends on the JDK has $CLASSPATH set up properly.
+ mkdir -p $out/nix-support
#TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
- echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs
+ echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
@@ -196,7 +166,7 @@ let
passthru = {
inherit architecture;
- home = "${openjdk10}/lib/openjdk";
+ home = "${openjdk}/lib/openjdk";
};
};
-in openjdk10
+in openjdk
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 612f0db0582..1b20ca6cc60 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -16,12 +16,12 @@ let
src = if stdenv.hostPlatform.system == "x86_64-linux" then
(if version == "10" then fetchboot "10" "x86_64" "08085fsxc1qhqiv3yi38w8lrg3vm7s0m2yvnwr1c92v019806yq2"
else if version == "8" then fetchboot "8" "x86_64" "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"
- else throw "No bootstrap for version")
+ else throw "No bootstrap jdk for version ${version}")
else if stdenv.hostPlatform.system == "i686-linux" then
(if version == "10" then fetchboot "10" "i686" "1blb9gyzp8gfyggxvggqgpcgfcyi00ndnnskipwgdm031qva94p7"
else if version == "8" then fetchboot "8" "i686" "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"
else throw "No bootstrap for version")
- else throw "No bootstrap for system";
+ else throw "No bootstrap jdk for system ${stdenv.hostPlatform.system}";
bootstrap = runCommand "openjdk-bootstrap" {
passthru.home = "${bootstrap}/lib/openjdk";
diff --git a/pkgs/development/compilers/openjdk/darwin/10.nix b/pkgs/development/compilers/openjdk/darwin/11.nix
similarity index 79%
rename from pkgs/development/compilers/openjdk/darwin/10.nix
rename to pkgs/development/compilers/openjdk/darwin/11.nix
index 4969c12bff2..61c2d57423e 100644
--- a/pkgs/development/compilers/openjdk/darwin/10.nix
+++ b/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -6,13 +6,13 @@ let
sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
};
- jdk = stdenv.mkDerivation {
- name = "zulu10.3+5-jdk10";
+ jdk = stdenv.mkDerivation rec {
+ name = "zulu11.2.3-jdk11.0.1";
src = fetchurl {
- url = https://cdn.azul.com/zulu/bin/zulu10.3+5-jdk10.0.2-macosx_x64.zip;
- sha256 = "05pxfjn8fqw6ddr8m5hzyphwzqgrq8w6b4h3lwc1s7ymh05xmspz";
- curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
+ url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
+ sha256 = "1jxnxmy79inwf3146ygry1mzv3dj6yrzqll16j7dpr91x1p3dpqy";
+ curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-mac/";
};
buildInputs = [ unzip freetype ];
@@ -34,8 +34,8 @@ let
'';
preFixup = ''
- # Propagate the setJavaClassPath setup hook from the JRE so that
- # any package that depends on the JRE has $CLASSPATH set up
+ # Propagate the setJavaClassPath setup hook from the JDK so that
+ # any package that depends on the JDK has $CLASSPATH set up
# properly.
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
@@ -49,7 +49,6 @@ let
'';
passthru = {
- jre = jdk;
home = jdk;
};
diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix
new file mode 100644
index 00000000000..71bda3e03d9
--- /dev/null
+++ b/pkgs/development/compilers/openspin/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "openspin-${version}";
+ version = "unstable-2018-10-02";
+
+ src = fetchFromGitHub {
+ owner = "parallaxinc";
+ repo = "OpenSpin";
+ rev = "f3a587ed3e4f6a50b3c8d2022bbec5676afecedb";
+ sha256 = "1knkbzdanb60cwp7mggymkhd0167lh2sb1c00d1vhw7s0s1rj96n";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mv build/openspin $out/bin/openspin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU";
+ homepage = https://github.com/parallaxinc/OpenSpin;
+ license = licenses.mit;
+ maintainers = [ maintainers.redvers ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
index de063500b70..23f44331dd8 100644
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
@@ -150,6 +150,7 @@ let result = stdenv.mkDerivation rec {
meta = with stdenv.lib; {
license = licenses.unfree;
platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
+ knownVulnerabilities = [ "Support ended in September 2018. Use OpenJDK or JDK 8." ];
};
}; in result
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 55faf277b15..48304b6af26 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
@@ -1,11 +1,11 @@
import ./jdk-linux-base.nix {
productVersion = "8";
- patchVersion = "181";
+ patchVersion = "191";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
- sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
- sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
- sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
- sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
+ sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
+ sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
+ sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
+ sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 55faf277b15..48304b6af26 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,11 +1,11 @@
import ./jdk-linux-base.nix {
productVersion = "8";
- patchVersion = "181";
+ patchVersion = "191";
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
- sha256.i686-linux = "0159q5wrlp24v8rc6m1cr3kq8nddpdjdprj3vsmf8z7vpwx052np";
- sha256.x86_64-linux = "1lwiz44vlxn4hc5b43r9arad15lpjfbr7l6h5vafpgxzjmq5ci8q";
- sha256.armv7l-linux = "0zpgb1hqf9zazic66c7nim036ac6ld3dhnsanx4ijlrl7kd3fbn7";
- sha256.aarch64-linux = "191r926501cm6mz8p93ljdfxi0dgzw7ljjsrzsbmmxn4k0q2j0ad";
+ sha256.i686-linux = "1dmnv3x28l0rdi92gpmcp38gpy3lf4pl441bijvjhi7j97kk60v4";
+ sha256.x86_64-linux = "0r8dvb0hahfybvf9wiv7904rn22n93bfc9x6pgypynj0w83rbhjk";
+ sha256.armv7l-linux = "0wgdr9ainzc2yc5qp6ncflnsdygpgrmv2af522djkc83skp5g70v";
+ sha256.aarch64-linux = "1rgwf0i9ikcjqbxkvr4x94y62m1kklfdhgqscxil479d5mg6akqz";
jceName = "jce_policy-8.zip";
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 09677a47ab2..d90ddcaacfb 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.24.4";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "ponylang";
repo = "ponyc";
rev = version;
- sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6";
+ sha256 = "0ghmjp03q7k58yzfkvnl05xc2i2gmgnzpj3hs6g7ls4ny8n3i6hv";
};
buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index f4cc1cf2b65..0832d14992d 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,28 +1,30 @@
-{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, jbuilder
+{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
, menhir, merlin_extend, ppx_tools_versioned, utop
}:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-reason-${version}";
- version = "3.3.3";
+ version = "3.3.7";
src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
- rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9";
- sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18";
+ rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a";
+ sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk";
};
+ nativeBuildInputs = [ makeWrapper ];
+
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
- buildInputs = [ makeWrapper ocaml findlib jbuilder utop menhir ];
+ buildInputs = [ ocaml findlib dune utop menhir ];
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
installPhase = ''
for p in reason rtop
do
- ${jbuilder.installPhase} $p.install
+ ${dune.installPhase} $p.install
done
wrapProgram $out/bin/rtop \
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 901675ff31b..e738dd7acae 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
- version = "1.26.2";
+ version = "1.29.2";
- # fetch hashes by running `print-hashes.sh 1.24.1`
+ # fetch hashes by running `print-hashes.sh 1.29.2`
hashes = {
- i686-unknown-linux-gnu = "e22286190a074bfb6d47c9fde236d712a53675af1563ba85ea33e0d40165f755";
- x86_64-unknown-linux-gnu = "d2b4fb0c544874a73c463993bde122f031c34897bb1eeb653d2ba2b336db83e6";
- armv7-unknown-linux-gnueabihf = "1140387a61083e3ef10e7a097269200fc7e9db6f6cc9f270e04319b3b429c655";
- aarch64-unknown-linux-gnu = "3dfad0dc9c795f7ee54c2099c9b7edf06b942adbbf02e9ed9e5d4b5e3f1f3759";
- i686-apple-darwin = "3a5de30f3e334a66bd320ec0e954961d348434da39a826284e00d55ea60f8370";
- x86_64-apple-darwin = "f193705d4c0572a358670dbacbf0ffadcd04b3989728b442f4680fa1e065fa72";
+ i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e";
+ x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8";
+ armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0";
+ aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f";
+ i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f";
+ x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2";
};
platform =
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 34932c911eb..02ea7ebbbfb 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,13 +1,10 @@
{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib
-, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2, darwin
+, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
+, CoreFoundation, Security
, version
, patches ? []
, src }:
-let
- inherit (darwin.apple_sdk.frameworks) CoreFoundation;
-in
-
rustPlatform.buildRustPackage rec {
name = "cargo-${version}";
inherit version src patches;
@@ -24,10 +21,13 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
LIBGIT2_SYS_USE_PKG_CONFIG=1;
+ # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
+ RUSTC_BOOTSTRAP=1;
+
# FIXME: Use impure version of CoreFoundation because of missing symbols.
# CFURLSetResourcePropertyForKey is defined in the headers but there's no
# corresponding implementation in the sources from opensource.apple.com.
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index d368c977f8f..a925127596d 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,4 +1,5 @@
{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
+, CoreFoundation, Security
, targets ? []
, targetToolchains ? []
, targetPatches ? []
@@ -6,11 +7,11 @@
let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
- version = "1.27.0";
- cargoVersion = "1.27.0";
+ version = "1.30.0";
+ cargoVersion = "1.30.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
- sha256 = "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c";
+ sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd";
};
in rec {
rustc = callPackage ./rustc.nix {
@@ -44,8 +45,7 @@ in rec {
cargo = callPackage ./cargo.nix rec {
version = cargoVersion;
- inherit src;
- inherit stdenv;
+ inherit src stdenv CoreFoundation Security;
inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo
};
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 9c9788ff483..decf14a3294 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -92,37 +92,42 @@ stdenv.mkDerivation {
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
# Disable fragile tests.
- rm -vr src/test/run-make/linker-output-non-utf8 || true
- rm -vr src/test/run-make/issue-26092 || true
+ rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true
+ rm -vr src/test/run-make-fulldeps/issue-26092 || 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 || true
+ rm -vr src/test/ui/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
+ rm -vr src/test/ui/run-pass/issue-36474.rs || true
# On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
+ # https://github.com/rust-lang/rust/issues/39522
+ echo removing gdb-version-sensitive tests...
+ find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete
+ rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs}
+
# Useful debugging parameter
# export VERBOSE=1
'' + optionalString stdenv.isDarwin ''
# Disable all lldb tests.
# error: Can't run LLDB test because LLDB's python path is not set
rm -vr src/test/debuginfo/*
- rm -v src/test/run-pass/backtrace-debuginfo.rs
+ rm -v src/test/run-pass/backtrace-debuginfo.rs || true
# error: No such file or directory
- rm -v src/test/run-pass/issue-45731.rs
+ rm -v src/test/ui/run-pass/issues/issue-45731.rs || true
# Disable tests that fail when sandboxing is enabled.
substituteInPlace src/libstd/sys/unix/ext/net.rs \
--replace '#[test]' '#[test] #[ignore]'
substituteInPlace src/test/run-pass/env-home-dir.rs \
--replace 'home_dir().is_some()' true
- rm -v src/test/run-pass/fds-are-cloexec.rs # FIXME: pipes?
- rm -v src/test/run-pass/sync-send-in-std.rs # FIXME: ???
+ rm -v src/test/run-pass/fds-are-cloexec.rs || true # FIXME: pipes?
+ rm -v src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs || true # FIXME: ???
'';
# rustc unfortunately need cmake for compiling llvm-rt but doesn't
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index a860aa7dc73..1ef6dd06570 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -5,17 +5,20 @@
# Note that the created binaries still need `patchelf --set-interpreter ...`
# to get rid of ${glibc} dependency.
, purgeNixReferences ? false
+, texinfo
}:
stdenv.mkDerivation rec {
name = "sbcl-${version}";
- version = "1.4.7";
+ version = "1.4.13";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
- sha256 = "1wmxly94pn8527092hyzg5mq58mg7qlc46nm31f268wb2dm67rvm";
+ sha256 = "120rnnz8367lk7ljqlf8xidm4b0d738xqsib4kq0q5ms5r7fzgvm";
};
+ buildInputs = [texinfo];
+
patchPhase = ''
echo '"${version}.nixos"' > version.lisp-expr
echo "
@@ -46,11 +49,6 @@ stdenv.mkDerivation rec {
'/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))'
# Fix the tests
- sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp
- sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp
- sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp
- sed -e '/deftest \(pw\|gr\)ent/,+3d' -i contrib/sb-posix/posix-tests.lisp
-
sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp
sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp
@@ -83,19 +81,28 @@ stdenv.mkDerivation rec {
buildPhase = ''
sh make.sh --prefix=$out --xc-host="${sbclBootstrapHost}"
+ (cd doc/manual ; make info)
'';
installPhase = ''
INSTALL_ROOT=$out sh install.sh
+ ''
+ + stdenv.lib.optionalString (!purgeNixReferences) ''
+ cp -r src $out/lib/sbcl
+ cp -r contrib $out/lib/sbcl
+ cat >$out/lib/sbcl/sbclrc <.
phash = markBroken super.phash;
@@ -703,9 +703,6 @@ self: super: {
then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
else super.gtk;
- # vaultenv is not available from Hackage.
- vaultenv = self.callPackage ../tools/haskell/vaultenv { };
-
# https://github.com/Philonous/hs-stun/pull/1
# Remove if a version > 0.1.0.1 ever gets released.
stunclient = overrideCabal super.stunclient (drv: {
@@ -926,16 +923,14 @@ self: super: {
text-icu = dontCheck super.text-icu;
# https://github.com/haskell/cabal/issues/4969
- haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4;
- haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };
+ # haddock-api = (super.haddock-api.overrideScope (self: super: {
+ # haddock-library = self.haddock-library_1_6_0;
+ # })).override { hspec = self.hspec_2_4_8; };
# Jailbreak "unix-compat >=0.1.2 && <0.5".
# Jailbreak "graphviz >=2999.18.1 && <2999.20".
darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' -e 's/graphviz .*,/graphviz,/' darcs.cabal"; });
- # https://github.com/Twinside/Juicy.Pixels/issues/149
- JuicyPixels = dontHaddock super.JuicyPixels;
-
# aarch64 and armv7l fixes.
happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
@@ -948,19 +943,9 @@ self: super: {
# Tries to read a file it is not allowed to in the test suite
load-env = dontCheck super.load-env;
- # Add support for https://github.com/haskell-hvr/multi-ghc-travis.
- multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis {};
-
# https://github.com/yesodweb/Shelly.hs/issues/162
shelly = dontCheck super.shelly;
- # https://github.com/simonmichael/hledger/issues/852
- hledger-lib = appendPatch super.hledger-lib (pkgs.fetchpatch {
- url = "https://github.com/simonmichael/hledger/commit/007b9f8caaf699852511634752a7d7c86f6adc67.patch";
- sha256 = "1lfp29mi1qyrcr9nfjigbyric0xb9n4ann5w6sr0g5sanr4maqs2";
- stripLen = 1;
- });
-
# Copy hledger man pages from data directory into the proper place. This code
# should be moved into the cabal2nix generator.
hledger = overrideCabal super.hledger (drv: {
@@ -1000,6 +985,9 @@ self: super: {
'';
});
+ # https://github.com/haskell-rewriting/term-rewriting/issues/11
+ term-rewriting = dontCheck (doJailbreak super.term-rewriting);
+
# https://github.com/nick8325/twee/pull/1
twee-lib = dontHaddock super.twee-lib;
@@ -1072,22 +1060,17 @@ self: super: {
# The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
haddock-library = doJailbreak (dontCheck super.haddock-library);
- haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
+ # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
- # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
- # Lets remove this once the LTS has upraded to 0.29.6.
- hpack = super.hpack_0_29_7;
-
- # The test suite does not know how to find the 'cabal2nix' binary.
- cabal2nix = overrideCabal super.cabal2nix (drv: {
- preCheck = ''
- export PATH="$PWD/dist/build/cabal2nix:$PATH"
- export HOME="$TMPDIR/home"
- '';
+ # The tool needs a newer hpack version than the one mandated by LTS-12.x.
+ cabal2nix = super.cabal2nix.overrideScope (self: super: {
+ hpack = self.hpack_0_31_0;
+ yaml = self.yaml_0_11_0_0;
+ });
+ stack2nix = super.stack2nix.overrideScope (self: super: {
+ hpack = self.hpack_0_31_0;
+ yaml = self.yaml_0_11_0_0;
});
-
- # Break out of "aeson <1.3, temporary <1.3".
- stack = doJailbreak super.stack;
# https://github.com/pikajude/stylish-cabal/issues/11
stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; };
@@ -1120,14 +1103,51 @@ self: super: {
})) ./patches/sexpr-0.2.1.patch;
# Can be removed once yi-language >= 0.18 is in the LTS
- yi-core = super.yi-core.override { yi-language = self.yi-language_0_18_0; };
-
- # https://github.com/MarcWeber/hasktags/issues/52
- hasktags = dontCheck super.hasktags;
+ yi-core = super.yi-core.overrideScope (self: super: { yi-language = self.yi-language_0_18_0; });
# https://github.com/haskell/hoopl/issues/50
hoopl = dontCheck super.hoopl;
# https://github.com/snapframework/xmlhtml/pull/37
xmlhtml = doJailbreak super.xmlhtml;
+
+ # https://github.com/NixOS/nixpkgs/issues/46467
+ safe-money-aeson = super.safe-money-aeson.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+ safe-money-store = super.safe-money-store.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+ safe-money-cereal = super.safe-money-cereal.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+ safe-money-serialise = super.safe-money-serialise.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+ safe-money-xmlbf = super.safe-money-xmlbf.overrideScope (self: super: { safe-money = self.safe-money_0_7; });
+
+ # https://github.com/adinapoli/mandrill/pull/52
+ mandrill = appendPatch super.mandrill (pkgs.fetchpatch {
+ url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch;
+ sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv";
+ });
+
+ # Can be removed once vinyl >= 0.10 is in the LTS.
+ Frames = super.Frames.overrideScope (self: super: { vinyl = self.vinyl_0_10_0; });
+
+ # https://github.com/Euterpea/Euterpea2/pull/22
+ Euterpea = overrideSrc super.Euterpea {
+ src = pkgs.fetchFromGitHub {
+ owner = "Euterpea";
+ repo = "Euterpea2";
+ rev = "6f49b790adfb8b65d95a758116c20098fb0cd34c";
+ sha256 = "0qz1svb96n42nmig16vyphwxas34hypgayvwc91ri7w7xd6yi1ba";
+ };
+ };
+
+ # https://github.com/kcsongor/generic-lens/pull/60
+ generic-lens = appendPatch super.generic-lens (pkgs.fetchpatch {
+ url = https://github.com/kcsongor/generic-lens/commit/d9af1ec22785d6c21e928beb88fc3885c6f05bed.patch;
+ sha256 = "0ljwcha9l52gs5bghxq3gbzxfqmfz3hxxcg9arjsjw8f7kw946xq";
+ });
+
+ xmonad-extras = doJailbreak super.xmonad-extras;
+
+ arbtt = doJailbreak super.arbtt;
+
+ # https://github.com/danfran/cabal-macosx/issues/13
+ cabal-macosx = dontCheck super.cabal-macosx;
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
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 9bd45c9887f..85efecc8ed3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -40,8 +40,8 @@ self: super: {
mtl = self.mtl_2_2_2;
parsec = self.parsec_3_1_13_0;
parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
- stm = self.stm_2_4_5_0;
- text = self.text_1_2_3_0;
+ stm = self.stm_2_5_0_0;
+ text = self.text_1_2_3_1;
# Build jailbreak-cabal with the latest version of Cabal.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index f475512a8da..43f769ff6fd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -39,8 +39,8 @@ self: super: {
# These are now core libraries in GHC 8.4.x.
mtl = self.mtl_2_2_2;
parsec = self.parsec_3_1_13_0;
- stm = self.stm_2_4_5_0;
- text = self.text_1_2_3_0;
+ stm = self.stm_2_5_0_0;
+ text = self.text_1_2_3_1;
# https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
@@ -81,4 +81,11 @@ self: super: {
haddock-library = self.haddock-library_1_4_3;
haddock-api = self.haddock-api_2_17_4;
haddock = self.haddock_2_17_5;
+
+ # GHC 8.0 doesn't have semigroups included by default
+ ListLike = addBuildDepend super.ListLike self.semigroups;
+
+ # Add missing build depedency for this compiler.
+ base-compat-batteries = addBuildDepend super.base-compat-batteries self.bifunctors;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index f73172e02d3..7a5b78ba74c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -39,8 +39,8 @@ self: super: {
# These are now core libraries in GHC 8.4.x.
mtl = self.mtl_2_2_2;
parsec = self.parsec_3_1_13_0;
- stm = self.stm_2_4_5_0;
- text = self.text_1_2_3_0;
+ stm = self.stm_2_5_0_0;
+ text = self.text_1_2_3_1;
# Make sure we can still build Cabal 1.x.
Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: {
@@ -96,4 +96,7 @@ self: super: {
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
}));
+ # GHC 8.2 doesn't have semigroups included by default
+ ListLike = addBuildDepend super.ListLike self.semigroups;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 49c3623d5d6..213651405f3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -56,4 +56,19 @@ self: super: {
};
in appendPatch super.hadoop-rpc patch;
+ # stack-1.9.1 needs Cabal 2.4.x, a recent version of hpack, and a non-recent
+ # version of yaml. Go figure. We avoid overrideScope here because using it to
+ # change Cabal would re-compile every single package instead of just those
+ # that have it as an actual library dependency. The explicit overrides are
+ # more verbose but friendlier for Hydra.
+ stack = (doJailbreak super.stack).override {
+ Cabal = self.Cabal_2_4_0_1;
+ hpack = self.hpack_0_31_0.override { Cabal = self.Cabal_2_4_0_1; };
+ yaml = self.yaml_0_11_0_0;
+ hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; };
+ };
+ hpack_0_31_0 = super.hpack_0_31_0.override {
+ yaml = self.yaml_0_11_0_0;
+ };
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 42712df3295..b9277727650 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -44,17 +44,71 @@ self: super: {
# Use to be a core-library, but no longer is since GHC 8.4.x.
hoopl = self.hoopl_3_10_2_2;
- # lts-12.x versions do not compile.
+ # LTS-12.x versions do not compile.
+ base-orphans = self.base-orphans_0_8;
+ brick = doJailbreak super.brick_0_41_2; # https://github.com/jtdaugherty/brick/pull/188
+ cassava-megaparsec = doJailbreak super.cassava-megaparsec;
+ config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18
+ contravariant = self.contravariant_1_5;
+ free = self.free_5_1;
+ haddock-library = dontCheck super.haddock-library_1_7_0;
+ HaTeX = doJailbreak super.HaTeX;
+ hledger = doJailbreak super.hledger;
+ hledger-lib = doJailbreak super.hledger-lib;
+ hledger-ui = doJailbreak super.hledger-ui;
+ hpack = self.hpack_0_31_0;
+ hslua = self.hslua_1_0_1;
+ hslua-module-text = self.hslua-module-text_0_2_0;
+ hspec = self.hspec_2_5_8;
+ hspec-core = self.hspec-core_2_5_8;
+ hspec-discover = self.hspec-discover_2_5_8;
+ hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
+ hspec-meta = self.hspec-meta_2_5_6;
+ JuicyPixels = self.JuicyPixels_3_3_2;
+ lens = self.lens_4_17;
+ megaparsec = dontCheck (doJailbreak super.megaparsec);
+ neat-interpolation = dontCheck super.neat-interpolation; # test suite depends on broken HTF
+ patience = markBrokenVersion "0.1.1" super.patience;
primitive = self.primitive_0_6_4_0;
+ QuickCheck = self.QuickCheck_2_12_6_1;
+ semigroupoids = self.semigroupoids_5_3_1;
tagged = self.tagged_0_8_6;
+ vty = self.vty_5_25;
+ wizards = doJailbreak super.wizards;
+ wl-pprint-extras = doJailbreak super.wl-pprint-extras;
+ yaml = self.yaml_0_11_0_0;
- # Over-specified constraints.
- async = doJailbreak super.async; # base >=4.3 && <4.12, stm >=2.2 && <2.5
- ChasingBottoms = doJailbreak super.ChasingBottoms; # base >=4.2 && <4.12, containers >=0.3 && <0.6
- hashable = doJailbreak super.hashable; # base >=4.4 && <4.1
- hashable-time = doJailbreak super.hashable-time; # base >=4.7 && <4.12
- integer-logarithms = doJailbreak super.integer-logarithms; # base >=4.3 && <4.12
- tar = doJailbreak super.tar; # containers >=0.2 && <0.6
- test-framework = doJailbreak super.test-framework; # containers >=0.1 && <0.6
+ # https://github.com/tibbe/unordered-containers/issues/214
+ unordered-containers = dontCheck super.unordered-containers;
+
+ # https://github.com/haskell/fgl/issues/79
+ # https://github.com/haskell/fgl/issues/81
+ fgl = appendPatch (overrideCabal super.fgl (drv: { editedCabalFile = null; })) ./patches/fgl-monad-fail.patch;
+
+ # Test suite does not compile.
+ cereal = dontCheck super.cereal;
+ data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x
+ Diff = dontCheck super.Diff;
+ http-api-data = doJailbreak super.http-api-data;
+ persistent-sqlite = dontCheck super.persistent-sqlite;
+ psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
+ system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
+ unicode-transforms = dontCheck super.unicode-transforms;
+ monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66
+
+ # https://github.com/bmillwood/haskell-src-meta/pull/80
+ haskell-src-meta = doJailbreak super.haskell-src-meta;
+
+ # https://github.com/skogsbaer/HTF/issues/69
+ HTF = markBrokenVersion "0.13.2.4" super.HTF;
+
+ # https://github.com/jgm/skylighting/issues/55
+ skylighting-core = dontCheck super.skylighting-core;
+
+ # https://github.com/jgm/pandoc/issues/4974
+ pandoc = doJailbreak super.pandoc_2_3_1;
+
+ # Break out of "yaml >=0.10.4.0 && <0.11".
+ stack = doJailbreak super.stack;
}
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index c79406a9472..489f363db6a 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -25,7 +25,7 @@ self: super:
# GHCJS does not ship with the same core packages as GHC.
# https://github.com/ghcjs/ghcjs/issues/676
- stm = self.stm_2_4_5_0;
+ stm = self.stm_2_5_0_0;
ghc-compact = self.ghc-compact_0_1_0_0;
network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv);
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3aee4857f99..1b85a564e31 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,9 @@ core-packages:
default-package-overrides:
# Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
- base-compat-batteries ==0.10.1
- # LTS Haskell 12.7
+ # Newer versions don't work in LTS-12.x
+ - cassava-megaparsec < 2
+ # LTS Haskell 12.16
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -60,10 +62,10 @@ default-package-overrides:
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.1.0.5
- - aeson-compat ==0.3.8
+ - aeson-compat ==0.3.9
- aeson-diff ==1.1.0.5
- aeson-extra ==0.4.1.1
- - aeson-generic-compat ==0.0.1.2
+ - aeson-generic-compat ==0.0.1.3
- aeson-iproute ==0.2
- aeson-picker ==0.1.0.4
- aeson-pretty ==0.8.7
@@ -76,12 +78,13 @@ default-package-overrides:
- alarmclock ==0.5.0.2
- alerts ==0.1.0.0
- alex ==3.2.4
- - alg ==0.2.6.0
+ - alg ==0.2.8.0
- algebra ==4.3.1
+ - algebraic-graphs ==0.2
- Allure ==0.8.3.0
- almost-fix ==0.0.2
- alsa-core ==0.5.0.1
- - alsa-pcm ==0.6.1
+ - alsa-pcm ==0.6.1.1
- alsa-seq ==0.6.0.7
- alternative-vector ==0.0.0
- alternators ==1.0.0.0
@@ -177,15 +180,15 @@ default-package-overrides:
- amazonka-xray ==1.6.0
- amqp ==0.18.1
- annotated-wl-pprint ==0.7.0
- - ansi-terminal ==0.8.0.4
+ - ansi-terminal ==0.8.2
- ansi-wl-pprint ==0.6.8.2
- ANum ==0.2.0.2
- api-field-json-th ==0.1.0.2
- appar ==0.1.4
- apply-refact ==0.5.0.0
- - apportionment ==0.0.0.2
+ - apportionment ==0.0.0.3
- approximate ==0.3.1
- - app-settings ==0.2.0.11
+ - app-settings ==0.2.0.12
- arithmoi ==0.7.0.0
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
@@ -210,19 +213,19 @@ default-package-overrides:
- attoparsec-binary ==0.2
- attoparsec-expr ==0.1.1.2
- attoparsec-ip ==0.0.1
- - attoparsec-iso8601 ==1.0.0.0
+ - attoparsec-iso8601 ==1.0.1.0
- attoparsec-path ==0.0.0.1
- attoparsec-uri ==0.0.4
- audacity ==0.0.2
- authenticate ==1.3.4
- authenticate-oauth ==1.6
- auto ==0.4.3.1
- - autoexporter ==1.1.10
+ - autoexporter ==1.1.13
- auto-update ==0.1.4
- - avro ==0.3.4.2
+ - avro ==0.3.5.1
- avwx ==0.3.0.2
- backprop ==0.2.5.0
- - bank-holidays-england ==0.1.0.7
+ - bank-holidays-england ==0.1.0.8
- barrier ==0.1.1
- base16-bytestring ==0.1.1.6
- base32string ==0.9.1
@@ -230,7 +233,7 @@ default-package-overrides:
- base64-bytestring ==1.0.0.1
- base64-bytestring-type ==1
- base64-string ==0.2
- - base-compat ==0.10.4
+ - base-compat ==0.10.5
- base-compat-batteries ==0.10.1
- basement ==0.0.8
- base-orphans ==0.7
@@ -241,7 +244,7 @@ default-package-overrides:
- bcrypt ==0.0.11
- beam-core ==0.7.2.2
- beam-migrate ==0.3.2.1
- - bench ==1.0.11
+ - bench ==1.0.12
- bencode ==0.6.0.0
- between ==0.11.0.0
- bhoogle ==0.1.3.5
@@ -250,7 +253,7 @@ default-package-overrides:
- bimap ==0.3.3
- bimap-server ==0.1.0.1
- binary-bits ==0.5
- - binary-conduit ==1.3
+ - binary-conduit ==1.3.1
- binary-ext ==2.0.4
- binary-ieee754 ==0.1.0.0
- binary-list ==1.1.1.2
@@ -259,7 +262,7 @@ default-package-overrides:
- binary-parsers ==0.2.3.0
- binary-search ==1.0.0.3
- binary-shared ==0.8.3
- - binary-tagged ==0.1.5
+ - binary-tagged ==0.1.5.1
- bindings-DSL ==1.0.25
- bindings-GLFW ==3.2.1.1
- bindings-libzip ==1.0.1
@@ -286,7 +289,7 @@ default-package-overrides:
- blaze-builder ==0.4.1.0
- blaze-colonnade ==1.2.2
- blaze-html ==0.9.1.1
- - blaze-markup ==0.8.2.1
+ - blaze-markup ==0.8.2.2
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- bmp ==1.2.6.3
@@ -306,38 +309,38 @@ default-package-overrides:
- brick ==0.37.2
- brittany ==0.11.0.0
- broadcast-chan ==0.1.1
- - bsb-http-chunked ==0.0.0.2
+ - bsb-http-chunked ==0.0.0.4
- bson ==0.3.2.6
- bson-lens ==0.1.1
- btrfs ==0.1.2.3
- - buffer-builder ==0.2.4.6
+ - buffer-builder ==0.2.4.7
- buffer-pipe ==0.0
- - butcher ==1.3.1.1
+ - butcher ==1.3.2.0
- butter ==0.1.0.6
- bv ==0.5
- - bv-little ==0.1.1
+ - bv-little ==0.1.2
- byteable ==0.1.1
- bytedump ==1.0
- byteorder ==1.0.4
- bytes ==0.15.5
- byteset ==0.1.1.0
- - bytestring-builder ==0.10.8.1.0
+ - bytestring-builder ==0.10.8.2.0
- bytestring-conversion ==0.3.1
- bytestring-lexing ==0.5.0.2
- bytestring-strict-builder ==0.4.5.1
- bytestring-tree-builder ==0.2.7.2
- bzlib ==0.5.0.5
- bzlib-conduit ==0.3.0.1
- - c2hs ==0.28.5
+ - c2hs ==0.28.6
- Cabal ==2.2.0.1
- cabal2spec ==2.1.1
- cabal-doctest ==1.0.6
- - cabal-rpm ==0.12.5
+ - cabal-rpm ==0.12.6
- cache ==0.1.1.1
- - cachix ==0.1.1
- - cachix-api ==0.1.0.1
+ - cachix ==0.1.2
+ - cachix-api ==0.1.0.2
- cairo ==0.13.5.0
- - calendar-recycling ==0.0
+ - calendar-recycling ==0.0.0.1
- call-stack ==0.1.0
- capataz ==0.2.0.0
- carray ==0.1.6.8
@@ -350,7 +353,8 @@ default-package-overrides:
- cassava-records ==0.1.0.4
- cast ==0.1.0.2
- category ==0.2.0.1
- - cborg ==0.2.0.0
+ - cayley-client ==0.4.7
+ - cborg ==0.2.1.0
- cereal ==0.5.7.0
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
@@ -363,7 +367,7 @@ default-package-overrides:
- charsetdetect-ae ==1.1.0.4
- chart-unit ==0.7.0.0
- chaselev-deque ==0.5.0.5
- - ChasingBottoms ==1.3.1.4
+ - ChasingBottoms ==1.3.1.5
- chatwork ==0.1.3.5
- cheapskate ==0.1.1
- cheapskate-highlight ==0.1.0.0
@@ -396,11 +400,11 @@ default-package-overrides:
- clock ==0.7.2
- clock-extras ==0.1.0.2
- closed ==0.2.0
- - clr-host ==0.2.0.1
+ - clr-host ==0.2.1.0
- clr-marshal ==0.2.0.0
- clumpiness ==0.17.0.0
- ClustalParser ==1.2.3
- - cmark-gfm ==0.1.4
+ - cmark-gfm ==0.1.6
- cmdargs ==0.10.20
- code-builder ==0.1.3
- codec ==0.2.1
@@ -413,8 +417,8 @@ default-package-overrides:
- colorful-monoids ==0.2.1.2
- colorize-haskell ==1.0.1
- colour ==2.3.4
- - combinatorial ==0.1
- - comfort-graph ==0.0.3
+ - combinatorial ==0.1.0.1
+ - comfort-graph ==0.0.3.1
- commutative ==0.0.1.4
- comonad ==5.0.4
- compactmap ==0.1.4.2.1
@@ -426,17 +430,17 @@ default-package-overrides:
- composable-associations-aeson ==0.1.0.0
- composition ==1.0.2.1
- composition-extra ==2.0.0
- - composition-prelude ==1.5.0.8
+ - composition-prelude ==1.5.3.1
- compressed ==3.11
- concise ==0.1.0.1
- - concurrency ==1.6.0.0
+ - concurrency ==1.6.1.0
- concurrent-extra ==0.7.0.12
- - concurrent-output ==1.10.6
- - concurrent-split ==0.0.1
+ - concurrent-output ==1.10.7
+ - concurrent-split ==0.0.1.1
- concurrent-supply ==0.1.8
- cond ==0.4.1.1
- - conduit ==1.3.0.3
- - conduit-algorithms ==0.0.8.1
+ - conduit ==1.3.1
+ - conduit-algorithms ==0.0.8.2
- conduit-combinators ==1.3.0
- conduit-connection ==0.1.0.4
- conduit-extra ==1.3.0
@@ -457,7 +461,8 @@ default-package-overrides:
- contravariant ==1.4.1
- contravariant-extras ==0.3.4
- control-bool ==0.2.1
- - control-monad-free ==0.6.1
+ - control-dsl ==0.2.1.3
+ - control-monad-free ==0.6.2
- control-monad-omega ==0.3.1
- convertible ==1.1.1.0
- cookie ==0.4.4
@@ -470,7 +475,7 @@ default-package-overrides:
- cpu ==0.1.2
- cpuinfo ==0.1.0.1
- cql ==4.0.1
- - cql-io ==1.0.1
+ - cql-io ==1.0.1.1
- credential-store ==0.1.2
- criterion ==1.4.1.0
- criterion-measurement ==0.1.1.0
@@ -481,7 +486,7 @@ default-package-overrides:
- crypto-cipher-tests ==0.0.11
- crypto-cipher-types ==0.0.9
- cryptocompare ==0.1.1
- - crypto-enigma ==0.0.2.12
+ - crypto-enigma ==0.0.2.14
- cryptohash ==0.11.9
- cryptohash-cryptoapi ==0.1.4
- cryptohash-md5 ==0.11.100.1
@@ -497,9 +502,9 @@ default-package-overrides:
- crypto-random ==0.0.9
- crypto-random-api ==0.2.0
- crypt-sha512 ==0
- - csg ==0.1.0.4
+ - csg ==0.1.0.5
- csp ==1.4.0
- - css-syntax ==0.0.7
+ - css-syntax ==0.0.8
- css-text ==0.1.3.0
- csv ==0.1.2
- ctrie ==0.2
@@ -512,11 +517,11 @@ default-package-overrides:
- currency ==0.2.0.0
- cutter ==0.0
- cyclotomic ==0.5.1
- - czipwith ==1.0.1.0
+ - czipwith ==1.0.1.1
- darcs ==2.14.1
- - data-accessor ==0.2.2.7
+ - data-accessor ==0.2.2.8
- data-accessor-mtl ==0.2.0.4
- - data-accessor-template ==0.2.1.15
+ - data-accessor-template ==0.2.1.16
- data-accessor-transformers ==0.2.1.7
- data-binary-ieee754 ==0.4.4
- data-bword ==0.1.0.1
@@ -542,18 +547,18 @@ default-package-overrides:
- data-msgpack-types ==0.0.2
- data-or ==1.0.0.5
- data-ordlist ==0.4.7.0
- - data-ref ==0.0.1.1
+ - data-ref ==0.0.1.2
- data-reify ==0.6.1
- data-serializer ==0.3.4
- datasets ==0.2.5
- data-textual ==0.3.0.2
- - data-tree-print ==0.1.0.1
+ - data-tree-print ==0.1.0.2
- dataurl ==0.1.0.0
- DAV ==1.3.2
- dawg-ord ==0.5.1.0
- dbcleaner ==0.1.3
- dbus ==1.0.1
- - debian-build ==0.10.1.1
+ - debian-build ==0.10.1.2
- debug ==0.1.1
- debug-trace-var ==0.2.0
- Decimal ==0.5.1
@@ -564,14 +569,14 @@ default-package-overrides:
- dependent-sum ==0.4
- dependent-sum-template ==0.0.0.6
- deque ==0.2.1
- - deriving-compat ==0.5.1
- - derulo ==1.0.3
+ - deriving-compat ==0.5.2
+ - derulo ==1.0.5
- detour-via-sci ==1.0.0
- df1 ==0.1.1
- dhall ==1.15.1
- - dhall-bash ==1.0.14
- - dhall-json ==1.2.2
- - dhall-text ==1.0.11
+ - dhall-bash ==1.0.15
+ - dhall-json ==1.2.3
+ - dhall-text ==1.0.13
- di ==1.0.1
- diagrams ==1.4
- diagrams-builder ==0.8.0.3
@@ -583,7 +588,7 @@ default-package-overrides:
- diagrams-html5 ==1.4.1
- diagrams-lib ==1.4.2.3
- diagrams-postscript ==1.4.1
- - diagrams-rasterific ==1.4.1
+ - diagrams-rasterific ==1.4.1.1
- diagrams-solve ==0.1.1
- diagrams-svg ==1.4.2
- di-core ==1.0.3
@@ -600,10 +605,10 @@ default-package-overrides:
- discount ==0.1.1
- discrimination ==0.3
- disk-free-space ==0.1.0.1
- - distributed-closure ==0.4.0
+ - distributed-closure ==0.4.1
- distributed-static ==0.3.8
- distributive ==0.5.3
- - dlist ==0.8.0.4
+ - dlist ==0.8.0.5
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
- dns ==3.0.4
@@ -611,9 +616,9 @@ default-package-overrides:
- dockerfile ==0.1.0.1
- docopt ==0.7.0.5
- doctemplates ==0.2.2.1
- - doctest ==0.16.0
+ - doctest ==0.16.0.1
- doctest-discover ==0.1.0.9
- - doctest-driver-gen ==0.2.0.3
+ - doctest-driver-gen ==0.2.0.4
- do-list ==1.0.1
- dom-parser ==3.1.0
- dotenv ==0.5.2.5
@@ -624,7 +629,7 @@ default-package-overrides:
- DRBG ==0.5.5
- drifter ==0.2.3
- drifter-postgresql ==0.2.1
- - dsp ==0.2.4
+ - dsp ==0.2.4.1
- dual-tree ==0.2.2
- dublincore-xml-conduit ==0.1.0.2
- dunai ==0.4.0.0
@@ -633,7 +638,7 @@ default-package-overrides:
- dyre ==0.8.12
- Earley ==0.12.1.0
- easy-file ==0.2.2
- - easytest ==0.2
+ - easytest ==0.2.1
- Ebnf2ps ==1.0.15
- echo ==0.1.3
- ed25519 ==0.0.5.0
@@ -654,9 +659,9 @@ default-package-overrides:
- eliminators ==0.4.1
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- - email-validate ==2.3.2.6
+ - email-validate ==2.3.2.8
- enclosed-exceptions ==1.0.3
- - entropy ==0.4.1.1
+ - entropy ==0.4.1.3
- enummapset ==0.5.2.2
- enumset ==0.0.4.1
- enum-subset-generate ==0.1.0.0
@@ -665,13 +670,13 @@ default-package-overrides:
- epub-metadata ==4.5
- eq ==4.2
- equal-files ==0.0.5.3
- - equivalence ==0.3.2
+ - equivalence ==0.3.3
- erf ==2.0.0.0
- errors ==2.3.0
- errors-ext ==0.4.2
- error-util ==0.0.1.2
- ersatz ==0.4.4
- - etc ==0.4.0.3
+ - etc ==0.4.1.0
- event ==0.1.4
- eventful-core ==0.2.0
- eventful-memory ==0.2.0
@@ -679,7 +684,7 @@ default-package-overrides:
- eventful-sqlite ==0.2.0
- eventful-test-helpers ==0.2.0
- event-list ==0.1.2
- - eventstore ==1.1.5
+ - eventstore ==1.1.6
- every ==0.0.1
- exact-combinatorics ==0.2.0.8
- exact-pi ==0.4.1.4
@@ -697,9 +702,9 @@ default-package-overrides:
- exp-pairs ==0.1.6.0
- extensible ==0.4.9
- extensible-exceptions ==0.1.1.4
- - extra ==1.6.9
+ - extra ==1.6.13
- extractable-singleton ==0.0.1
- - extrapolate ==0.3.1
+ - extrapolate ==0.3.3
- facts ==0.0.1.0
- fail ==4.9.0.0
- farmhash ==0.1.0.5
@@ -726,8 +731,8 @@ default-package-overrides:
- fileplow ==0.1.0.0
- filter-logger ==0.6.0.0
- filtrable ==0.1.1.0
+ - Fin ==0.2.6.0
- fin ==0.0.1
- - Fin ==0.2.3.0
- FindBin ==0.0.5
- find-clumpiness ==0.2.3.1
- fingertree ==0.1.4.1
@@ -743,15 +748,16 @@ default-package-overrides:
- flay ==0.4
- flexible-defaults ==0.0.2
- floatshow ==0.2.4
- - flow ==1.0.14
+ - flow ==1.0.17
- fmlist ==0.9.2
- fn ==0.3.0.2
- focus ==0.1.5.2
- - fold-debounce ==0.2.0.7
- - fold-debounce-conduit ==0.2.0.1
- - foldl ==1.4.3
+ - foldable1 ==0.1.0.0
+ - fold-debounce ==0.2.0.8
+ - fold-debounce-conduit ==0.2.0.3
+ - foldl ==1.4.5
- folds ==0.7.4
- - FontyFruity ==0.5.3.3
+ - FontyFruity ==0.5.3.4
- force-layout ==0.4.0.6
- foreign-store ==0.2
- ForestStructures ==0.0.0.2
@@ -778,7 +784,7 @@ default-package-overrides:
- fuzzcheck ==0.1.1
- fuzzy-dates ==0.1.1.1
- fuzzyset ==0.1.0.6
- - gauge ==0.2.3
+ - gauge ==0.2.4
- gc ==0.0.2
- gd ==3000.7.3
- gdax ==0.6.0.0
@@ -798,17 +804,17 @@ default-package-overrides:
- genvalidity ==0.5.1.0
- genvalidity-aeson ==0.2.0.2
- genvalidity-bytestring ==0.2.0.2
- - genvalidity-containers ==0.5.0.0
- - genvalidity-hspec ==0.6.1.1
+ - genvalidity-containers ==0.5.1.0
+ - genvalidity-hspec ==0.6.2.0
- genvalidity-hspec-aeson ==0.3.0.0
- genvalidity-hspec-binary ==0.2.0.2
- genvalidity-hspec-cereal ==0.2.0.2
- genvalidity-hspec-hashable ==0.2.0.2
- genvalidity-path ==0.3.0.2
- - genvalidity-property ==0.2.1.0
- - genvalidity-scientific ==0.2.0.1
- - genvalidity-text ==0.5.0.2
- - genvalidity-time ==0.2.1.0
+ - genvalidity-property ==0.2.1.1
+ - genvalidity-scientific ==0.2.1.0
+ - genvalidity-text ==0.5.1.0
+ - genvalidity-time ==0.2.1.1
- genvalidity-unordered-containers ==0.2.0.3
- genvalidity-uuid ==0.1.0.2
- genvalidity-vector ==0.2.0.2
@@ -816,12 +822,12 @@ default-package-overrides:
- getopt-generics ==0.13.0.2
- ghc-core ==0.5.6
- ghc-exactprint ==0.5.6.1
- - ghcid ==0.7
+ - ghcid ==0.7.1
- ghcjs-base-stub ==0.2.0.0
- ghcjs-codemirror ==0.0.0.2
- ghc-parser ==0.2.0.2
- ghc-paths ==0.1.0.9
- - ghc-prof ==1.4.1.3
+ - ghc-prof ==1.4.1.4
- ghc-syntax-highlighter ==0.0.2.0
- ghc-tcplugins-extra ==0.3
- ghc-typelits-extra ==0.2.6
@@ -835,8 +841,8 @@ default-package-overrides:
- gi-gio ==2.0.18
- gi-glib ==2.0.17
- gi-gobject ==2.0.16
- - gi-gtk ==3.0.24
- - gi-gtk-hs ==0.3.6.1
+ - gi-gtk ==3.0.25
+ - gi-gtk-hs ==0.3.6.2
- gi-gtksource ==3.0.16
- gi-javascriptcore ==4.0.15
- gio ==0.13.5.0
@@ -854,13 +860,13 @@ default-package-overrides:
- glazier ==1.0.0.0
- GLFW-b ==3.2.1.0
- glib ==0.13.6.0
- - Glob ==0.9.2
+ - Glob ==0.9.3
- gloss ==1.12.0.0
- gloss-raster ==1.12.0.0
- gloss-rendering ==1.12.0.0
- GLURaw ==2.0.0.4
- GLUT ==2.7.0.14
- - gnuplot ==0.5.5.2
+ - gnuplot ==0.5.5.3
- goggles ==0.3.2
- google-oauth2-jwt ==0.3.0
- gpolyline ==0.1.0.1
@@ -870,10 +876,16 @@ default-package-overrides:
- graph-wrapper ==0.2.5.1
- gravatar ==0.8.0
- graylog ==0.1.0.1
- - greskell ==0.2.1.0
- - greskell-core ==0.1.2.2
- - greskell-websocket ==0.1.1.0
+ - greskell ==0.2.1.1
+ - greskell-core ==0.1.2.4
+ - greskell-websocket ==0.1.1.2
- groom ==0.1.2.1
+ - groundhog ==0.9.0
+ - groundhog-inspector ==0.9.0
+ - groundhog-mysql ==0.9.0
+ - groundhog-postgresql ==0.9.0.1
+ - groundhog-sqlite ==0.9.0
+ - groundhog-th ==0.9.0.1
- groups ==0.4.1.0
- gtk ==0.14.10
- gtk2hs-buildtools ==0.13.4.0
@@ -884,13 +896,13 @@ default-package-overrides:
- hackage-security ==0.5.3.0
- haddock-library ==1.5.0.1
- hailgun ==0.4.1.8
- - hakyll ==4.12.3.0
+ - hakyll ==4.12.4.0
- half ==0.3
- hamilton ==0.1.0.3
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3
- - hapistrano ==0.3.5.9
+ - hapistrano ==0.3.7.0
- happstack-server ==7.5.1.1
- happy ==1.19.9
- hasbolt ==0.1.3.0
@@ -900,17 +912,17 @@ default-package-overrides:
- hashmap ==1.3.3
- hashtables ==1.2.3.1
- haskeline ==0.7.4.3
- - haskell-gi ==0.21.4
- - haskell-gi-base ==0.21.1
+ - haskell-gi ==0.21.5
+ - haskell-gi-base ==0.21.4
- haskell-gi-overloading ==1.0
- - haskell-lexer ==1.0.1
+ - haskell-lexer ==1.0.2
- haskell-lsp ==0.2.2.0
- haskell-lsp-types ==0.2.2.0
- HaskellNet ==0.5.1
- HaskellNet-SSL ==0.3.4.0
- haskell-spacegoo ==0.2.0.1
- haskell-src ==1.0.3.0
- - haskell-src-exts ==1.20.2
+ - haskell-src-exts ==1.20.3
- haskell-src-exts-simple ==1.20.0.0
- haskell-src-exts-util ==0.2.3
- haskell-src-meta ==0.8.0.3
@@ -932,7 +944,7 @@ default-package-overrides:
- hasql-transaction ==0.7
- hasty-hamiltonian ==1.3.2
- HaTeX ==3.19.0.0
- - haxl ==2.0.1.0
+ - haxl ==2.0.1.1
- hbeanstalk ==0.2.4
- HCodecs ==0.5.1
- hdaemonize ==0.5.5
@@ -942,14 +954,14 @@ default-package-overrides:
- heap ==1.0.4
- heaps ==0.3.6
- hebrew-time ==0.1.1
- - hedgehog ==0.6
+ - hedgehog ==0.6.1
- hedgehog-corpus ==0.1.0
- - hedis ==0.10.3
+ - hedis ==0.10.4
- here ==1.2.13
- heredoc ==0.2.0.0
- heterocephalus ==1.0.5.2
- hex ==0.1.2
- - hexml ==0.3.3
+ - hexml ==0.3.4
- hexml-lens ==0.2.1
- hexpat ==0.20.13
- hexstring ==0.11.1
@@ -958,11 +970,11 @@ default-package-overrides:
- hidden-char ==0.1.0.2
- hierarchical-clustering ==0.4.6
- hierarchy ==1.0.2
- - higher-leveldb ==0.5.0.1
+ - higher-leveldb ==0.5.0.2
- highlighting-kate ==0.6.4
- hinotify ==0.3.10
- hint ==0.8.0
- - histogram-fill ==0.9.0.0
+ - histogram-fill ==0.9.1.0
- hjsmin ==0.2.0.2
- hlibgit2 ==0.18.0.16
- hlibsass ==0.1.7.0
@@ -976,12 +988,12 @@ default-package-overrides:
- hmpfr ==0.4.4
- Hoed ==0.5.1
- hoopl ==3.10.2.2
- - hOpenPGP ==2.7.2
+ - hOpenPGP ==2.7.4.1
- hopenpgp-tools ==0.21.2
- hopfli ==0.2.2.1
- hostname ==1.0
- hostname-validate ==1.0.0
- - hourglass ==0.2.11
+ - hourglass ==0.2.12
- hourglass-orphans ==0.1.0.0
- hp2pretty ==0.8.0.2
- hpack ==0.28.2
@@ -991,26 +1003,26 @@ default-package-overrides:
- hquantlib ==0.0.4.0
- hreader ==1.1.0
- hreader-lens ==0.1.3.0
- - hruby ==0.3.5.4
+ - hruby ==0.3.6
- hsass ==0.7.0
- hs-bibutils ==6.6.0.0
- hscolour ==1.24.4
- hsdns ==1.7.1
- hsebaysdk ==0.4.0.0
- hsemail ==2
- - HSet ==0.0.1
- hset ==2.2.0
- - hsexif ==0.6.1.5
- - hs-functors ==0.1.2.0
+ - HSet ==0.0.1
+ - hsexif ==0.6.1.6
+ - hs-functors ==0.1.3.0
- hs-GeoIP ==0.3
- hsini ==0.5.1.2
- hsinstall ==1.6
- HSlippyMap ==3.0.1
- - hslogger ==1.2.10
+ - hslogger ==1.2.12
- hslua ==0.9.5.2
- hslua-aeson ==0.3.0.2
- hslua-module-text ==0.1.2.1
- - HsOpenSSL ==0.11.4.14
+ - HsOpenSSL ==0.11.4.15
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- hspec ==2.5.5
@@ -1038,7 +1050,7 @@ default-package-overrides:
- htaglib ==1.2.0
- HTF ==0.13.2.4
- html ==1.0.1.2
- - html-conduit ==1.3.1
+ - html-conduit ==1.3.2
- html-email-validate ==0.2.0.0
- html-entities ==1.1.4.2
- html-entity-map ==0.1.0.0
@@ -1054,10 +1066,10 @@ default-package-overrides:
- http-date ==0.0.8
- httpd-shed ==0.4.0.3
- http-link-header ==1.0.3.1
- - http-media ==0.7.1.2
+ - http-media ==0.7.1.3
- http-reverse-proxy ==0.6.0
- http-streams ==0.8.6.1
- - http-types ==0.12.1
+ - http-types ==0.12.2
- human-readable-duration ==0.2.0.3
- HUnit ==1.6.0.0
- HUnit-approx ==1.1.1.1
@@ -1066,7 +1078,7 @@ default-package-overrides:
- hvega ==0.1.0.3
- hw-balancedparens ==0.2.0.2
- hw-bits ==0.7.0.3
- - hw-conduit ==0.2.0.3
+ - hw-conduit ==0.2.0.5
- hw-diagnostics ==0.0.0.5
- hweblib ==0.6.3
- hw-excess ==0.2.0.2
@@ -1079,7 +1091,7 @@ default-package-overrides:
- hw-mquery ==0.1.0.1
- hworker ==0.1.0.1
- hw-parser ==0.0.0.3
- - hw-prim ==0.6.2.9
+ - hw-prim ==0.6.2.17
- hw-rankselect ==0.10.0.3
- hw-rankselect-base ==0.3.2.1
- hw-string-parse ==0.0.0.4
@@ -1112,13 +1124,13 @@ default-package-overrides:
- Imlib ==0.1.2
- immortal ==0.3
- include-file ==0.1.0.3
- - incremental-parser ==0.3.1.1
- - indentation-core ==0.0.0.1
- - indentation-parsec ==0.0.0.1
+ - incremental-parser ==0.3.2
+ - indentation-core ==0.0.0.2
+ - indentation-parsec ==0.0.0.2
- indents ==0.5.0.0
- - indexed-list-literals ==0.2.1.1
+ - indexed-list-literals ==0.2.1.2
- inflections ==0.4.0.3
- - influxdb ==1.6.0.7
+ - influxdb ==1.6.0.9
- ini ==0.3.6
- inline-c ==0.6.1.0
- inline-java ==0.8.4
@@ -1126,12 +1138,12 @@ default-package-overrides:
- insert-ordered-containers ==0.2.1.0
- inspection-testing ==0.2.0.1
- instance-control ==0.1.2.0
- - integer-logarithms ==1.0.2.1
+ - integer-logarithms ==1.0.2.2
- integration ==0.2.1
- intern ==0.9.2
- interpolate ==0.2.0
- - interpolatedstring-perl6 ==1.0.0
- - interpolation ==0.1.0.2
+ - interpolatedstring-perl6 ==1.0.1
+ - interpolation ==0.1.0.3
- IntervalMap ==0.6.0.0
- intervals ==0.8.1
- intro ==0.3.2.0
@@ -1148,11 +1160,12 @@ default-package-overrides:
- io-streams-haproxy ==1.0.0.2
- ip ==1.3.0
- ip6addr ==1.0.0
- - iproute ==1.7.5
- - IPv6Addr ==1.1.0
+ - iproute ==1.7.6
+ - IPv6Addr ==1.1.1
+ - IPv6DB ==0.3.1
- ipython-kernel ==0.9.1.0
- irc ==0.6.1.0
- - irc-client ==1.1.0.4
+ - irc-client ==1.1.0.5
- irc-conduit ==0.3.0.1
- irc-ctcp ==0.1.3.0
- irc-dcc ==2.0.1
@@ -1161,9 +1174,9 @@ default-package-overrides:
- iso639 ==0.1.0.3
- iso8601-time ==0.1.5
- iterable ==3.0
- - ixset-typed ==0.4
+ - ixset-typed ==0.4.0.1
- ix-shapable ==0.1.0
- - jack ==0.7.1.3
+ - jack ==0.7.1.4
- jmacro ==0.6.15
- jmacro-rpc ==0.3.3
- jmacro-rpc-snap ==0.3
@@ -1175,7 +1188,7 @@ default-package-overrides:
- json ==0.9.2
- json-feed ==1.0.3
- json-rpc-client ==0.2.5.0
- - json-rpc-generic ==0.2.1.4
+ - json-rpc-generic ==0.2.1.5
- json-rpc-server ==0.2.6.0
- json-schema ==0.7.4.2
- JuicyPixels ==3.2.9.5
@@ -1203,35 +1216,35 @@ default-package-overrides:
- lackey ==1.0.5
- LambdaHack ==0.8.3.0
- lame ==0.1.1
- - language-c ==0.8.1
+ - language-c ==0.8.2
- language-c-quote ==0.12.2
- language-docker ==6.0.4
- language-ecmascript ==0.19
- language-haskell-extract ==0.2.4
- language-java ==0.2.9
- language-javascript ==0.6.0.11
- - language-puppet ==1.3.20
+ - language-puppet ==1.3.20.1
- lapack-carray ==0.0.2
- lapack-ffi ==0.0.2
- - lapack-ffi-tools ==0.1.0.1
+ - lapack-ffi-tools ==0.1.1
- large-hashable ==0.1.0.4
- largeword ==1.2.5
- - latex ==0.1.0.3
+ - latex ==0.1.0.4
- lattices ==1.7.1.1
- lawful ==0.1.0.0
- lazyio ==0.1.0.4
- lca ==0.3.1
- - leancheck ==0.7.1
+ - leancheck ==0.7.7
- leapseconds-announced ==2017.1.0.1
- - learn-physics ==0.6.2
+ - learn-physics ==0.6.3
- lens ==4.16.1
- lens-action ==0.2.3
- lens-aeson ==1.0.2
- lens-datetime ==0.3
- - lens-family ==1.2.2
- - lens-family-core ==1.2.2
+ - lens-family ==1.2.3
+ - lens-family-core ==1.2.3
- lens-family-th ==0.5.0.2
- - lens-labels ==0.2.0.1
+ - lens-labels ==0.2.0.2
- lens-misc ==0.0.2.0
- lens-properties ==4.11.1
- lens-regex ==0.1.0
@@ -1241,10 +1254,10 @@ default-package-overrides:
- libffi ==0.1
- libgit ==0.3.1
- libgraph ==1.14
- - libmpd ==0.9.0.8
+ - libmpd ==0.9.0.9
- libxml-sax ==0.7.5
- LibZip ==1.0.1
- - lifted-async ==0.10.0.2
+ - lifted-async ==0.10.0.3
- lifted-base ==0.2.3.12
- lift-generics ==0.1.2
- line ==4.0.1
@@ -1260,7 +1273,7 @@ default-package-overrides:
- llvm-hs-pretty ==0.5.0.0
- llvm-hs-pure ==6.2.1
- lmdb ==0.2.5
- - load-env ==0.2.0.1
+ - load-env ==0.2.0.2
- locators ==0.2.4.4
- loch-th ==0.2.2
- lockfree-queue ==0.2.3.1
@@ -1268,7 +1281,7 @@ default-package-overrides:
- log-domain ==0.12
- logfloat ==0.13.3.3
- logger-thread ==0.1.0.2
- - logging-effect ==1.3.2
+ - logging-effect ==1.3.3
- logging-facade ==0.3.0
- logging-facade-syslog ==1
- logict ==0.6.0.2
@@ -1276,7 +1289,7 @@ default-package-overrides:
- loop ==0.3.0
- lrucache ==1.2.0.0
- lrucaching ==0.3.3
- - lucid ==2.9.10
+ - lucid ==2.9.11
- lucid-extras ==0.1.0.1
- lxd-client-config ==0.1.0.1
- lz4 ==0.2.3.1
@@ -1292,11 +1305,11 @@ default-package-overrides:
- makefile ==1.1.0.0
- managed ==1.0.6
- mapquest-api ==0.3.1
- - markdown ==0.1.17.1
+ - markdown ==0.1.17.4
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- marvin-interpolate ==1.1.2
- - massiv ==0.2.0.0
+ - massiv ==0.2.2.0
- massiv-io ==0.1.4.0
- mathexpr ==0.3.0.0
- math-functions ==0.2.1.0
@@ -1313,7 +1326,7 @@ default-package-overrides:
- med-module ==0.1.1
- megaparsec ==6.5.0
- mega-sdist ==0.3.3.1
- - memory ==0.14.16
+ - memory ==0.14.18
- MemoTrie ==0.6.9
- mercury-api ==0.1.0.1
- mersenne-random-pure64 ==0.2.2.0
@@ -1324,16 +1337,16 @@ default-package-overrides:
- microformats2-parser ==1.0.1.9
- microlens ==0.4.9.1
- microlens-aeson ==2.3.0
- - microlens-contra ==0.1.0.1
- - microlens-ghc ==0.4.9
+ - microlens-contra ==0.1.0.2
+ - microlens-ghc ==0.4.9.1
- microlens-mtl ==0.1.11.1
- microlens-platform ==0.3.10
- - microlens-th ==0.4.2.1
+ - microlens-th ==0.4.2.3
- microspec ==0.1.0.0
- microstache ==1.0.1.1
- midi ==0.2.2.2
- mighty-metropolis ==1.2.0
- - milena ==0.5.2.2
+ - milena ==0.5.2.3
- mime-mail ==0.4.14
- mime-mail-ses ==0.4.1
- mime-types ==0.1.0.8
@@ -1342,9 +1355,9 @@ default-package-overrides:
- minisat-solver ==0.1
- miniutter ==0.4.7.0
- mintty ==0.1.2
- - miso ==0.21.1.0
+ - miso ==0.21.2.0
- missing-foreign ==0.1.1
- - MissingH ==1.4.0.1
+ - MissingH ==1.4.1.0
- mixed-types-num ==0.3.1.4
- mltool ==0.2.0.1
- mmap ==0.5.9
@@ -1363,7 +1376,7 @@ default-package-overrides:
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
- monadlist ==0.0.2
- - monad-logger ==0.3.29
+ - monad-logger ==0.3.30
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.10
- monad-logger-syslog ==0.1.4.0
@@ -1387,7 +1400,7 @@ default-package-overrides:
- mongoDB ==2.4.0.0
- monoidal-containers ==0.3.1.0
- monoid-extras ==0.5
- - monoid-subclasses ==0.4.6
+ - monoid-subclasses ==0.4.6.1
- monoid-transformer ==0.0.4
- mono-traversable ==1.0.9.0
- mono-traversable-instances ==0.1.0.0
@@ -1400,9 +1413,9 @@ default-package-overrides:
- multiarg ==0.30.0.10
- multimap ==1.2.1
- multipart ==0.1.3
- - multistate ==0.8.0.0
+ - multistate ==0.8.0.1
- murmur-hash ==0.1.0.9
- - MusicBrainz ==0.4
+ - MusicBrainz ==0.4.1
- mustache ==2.3.0
- mutable-containers ==0.3.4
- mwc-probability ==2.0.4
@@ -1441,8 +1454,8 @@ default-package-overrides:
- network-ip ==0.3.0.2
- network-multicast ==0.2.0
- Network-NineP ==0.4.3
- - network-simple ==0.4.2
- - network-simple-tls ==0.3
+ - network-simple ==0.4.3
+ - network-simple-tls ==0.3.1
- network-transport ==0.5.2
- network-transport-composed ==0.2.1
- network-transport-inmemory ==0.5.2
@@ -1460,23 +1473,24 @@ default-package-overrides:
- non-empty ==0.3.0.1
- non-empty-sequence ==0.2.0.2
- non-negative ==0.1.2
+ - not-gloss ==0.7.7.0
- nsis ==0.3.2
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- - numeric-prelude ==0.4.3
+ - numeric-prelude ==0.4.3.1
- numhask ==0.2.3.1
- numhask-prelude ==0.1.0.1
- numhask-range ==0.2.3.1
- numhask-test ==0.1.0.0
- NumInstances ==1.4
- numtype-dk ==0.5.0.2
- - nvim-hs ==1.0.0.2
+ - nvim-hs ==1.0.0.3
- nvim-hs-contrib ==1.0.0.0
- oauthenticated ==0.2.1.0
- objective ==1.1.2
- ObjectName ==1.1.0.1
- - o-clock ==1.0.0
- - odbc ==0.2.0
+ - o-clock ==1.0.0.1
+ - odbc ==0.2.2
- oeis ==0.3.9
- ofx ==0.4.2.0
- old-locale ==1.0.0.7
@@ -1491,11 +1505,11 @@ default-package-overrides:
- oo-prototypes ==0.1.0.0
- OpenAL ==1.7.0.4
- open-browser ==0.2.1.0
- - openexr-write ==0.1.0.1
+ - openexr-write ==0.1.0.2
- OpenGL ==3.0.2.2
- OpenGLRaw ==3.3.1.0
- openpgp-asciiarmor ==0.1.1
- - opensource ==0.1.0.0
+ - opensource ==0.1.1.0
- openssl-streams ==1.2.1.3
- open-witness ==0.4.0.1
- operational ==0.2.3.5
@@ -1503,7 +1517,7 @@ default-package-overrides:
- opml-conduit ==0.6.0.4
- optional-args ==1.0.2
- options ==1.2.1.1
- - optparse-applicative ==0.14.2.0
+ - optparse-applicative ==0.14.3.0
- optparse-generic ==1.3.0
- optparse-simple ==0.1.0
- optparse-text ==0.1.1.0
@@ -1514,8 +1528,8 @@ default-package-overrides:
- pagination ==0.2.1
- palette ==0.3.0.1
- pandoc ==2.2.1
- - pandoc-citeproc ==0.14.3.1
- - pandoc-types ==1.17.5.1
+ - pandoc-citeproc ==0.14.8
+ - pandoc-types ==1.17.5.4
- pango ==0.13.5.0
- papillon ==0.1.0.6
- parallel ==3.2.2.0
@@ -1552,10 +1566,10 @@ default-package-overrides:
- persistent ==2.8.2
- persistent-iproute ==0.2.3
- persistent-mysql ==2.8.1
- - persistent-mysql-haskell ==0.4.1
+ - persistent-mysql-haskell ==0.4.2
- persistent-postgresql ==2.8.2.0
- persistent-refs ==0.4
- - persistent-sqlite ==2.8.1.2
+ - persistent-sqlite ==2.8.2
- persistent-template ==2.5.4
- pgp-wordlist ==0.1.0.2
- pg-transact ==0.1.0.1
@@ -1569,7 +1583,7 @@ default-package-overrides:
- pipes-binary ==0.4.2
- pipes-bytestring ==2.1.6
- pipes-category ==0.3.0.0
- - pipes-concurrency ==2.0.11
+ - pipes-concurrency ==2.0.12
- pipes-csv ==1.4.3
- pipes-extras ==1.0.15
- pipes-fastx ==0.3.0.0
@@ -1594,10 +1608,10 @@ default-package-overrides:
- poly-arity ==0.1.0
- polynomials-bernstein ==1.1.2
- polyparse ==1.12
- - pooled-io ==0.0.2.1
+ - pooled-io ==0.0.2.2
- portable-lines ==0.1
- postgresql-binary ==0.12.1.1
- - postgresql-libpq ==0.9.4.1
+ - postgresql-libpq ==0.9.4.2
- postgresql-schema ==0.1.14
- postgresql-simple ==0.5.4.0
- postgresql-simple-migration ==0.1.12.0
@@ -1607,7 +1621,7 @@ default-package-overrides:
- postgresql-typed ==0.5.3.0
- post-mess-age ==0.2.1.0
- pptable ==0.3.0.0
- - pqueue ==1.4.1.1
+ - pqueue ==1.4.1.2
- prefix-units ==0.2.0
- prelude-compat ==0.0.0.1
- prelude-extras ==0.4.0.3
@@ -1628,9 +1642,9 @@ default-package-overrides:
- primes ==0.2.1.0
- primitive ==0.6.3.0
- prim-uniq ==0.1.0.1
- - probability ==0.2.5.1
+ - probability ==0.2.5.2
- process-extras ==0.7.4
- - product-isomorphic ==0.0.3.2
+ - product-isomorphic ==0.0.3.3
- product-profunctors ==0.10.0.0
- profiterole ==0.1
- profunctors ==5.2.2
@@ -1640,17 +1654,17 @@ default-package-overrides:
- promises ==0.3
- prompt ==0.1.1.2
- protobuf ==0.2.1.2
- - protobuf-simple ==0.1.0.5
+ - protobuf-simple ==0.1.1.0
- protocol-buffers ==2.4.11
- protocol-buffers-descriptor ==2.4.11
- - protocol-radius ==0.0.1.0
+ - protocol-radius ==0.0.1.1
- protocol-radius-test ==0.0.1.0
- proto-lens ==0.3.1.0
- - proto-lens-arbitrary ==0.1.2.1
- - proto-lens-combinators ==0.1.0.10
- - proto-lens-optparse ==0.1.1.1
+ - proto-lens-arbitrary ==0.1.2.2
+ - proto-lens-combinators ==0.1.0.11
+ - proto-lens-optparse ==0.1.1.4
- proto-lens-protobuf-types ==0.3.0.1
- - proto-lens-protoc ==0.3.1.0
+ - proto-lens-protoc ==0.3.1.2
- protolude ==0.2.2
- proxied ==0.3
- psql-helpers ==0.1.0.0
@@ -1667,7 +1681,7 @@ default-package-overrides:
- QuickCheck ==2.11.3
- quickcheck-arbitrary-adt ==0.3.1.0
- quickcheck-assertions ==0.3.0
- - quickcheck-instances ==0.3.18
+ - quickcheck-instances ==0.3.19
- quickcheck-io ==0.2.0
- quickcheck-simple ==0.1.0.4
- quickcheck-special ==0.1.0.6
@@ -1688,7 +1702,7 @@ default-package-overrides:
- rank1dynamic ==0.4.0
- rank2classes ==1.1.0.1
- Rasterific ==0.7.4
- - rasterific-svg ==0.3.3.1
+ - rasterific-svg ==0.3.3.2
- ratel ==1.0.5
- ratel-wai ==1.0.3
- ratio-int ==0.1.2
@@ -1704,7 +1718,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- rebase ==1.2.4
- - record-dot-preprocessor ==0.1.3
+ - record-dot-preprocessor ==0.1.4
- recursion-schemes ==5.0.3
- reducers ==3.12.3
- refact ==0.3.0.2
@@ -1731,21 +1745,22 @@ default-package-overrides:
- relational-schemas ==0.1.6.2
- relude ==0.1.1
- renderable ==0.2.0.1
- - repa ==3.4.1.3
+ - repa ==3.4.1.4
- repline ==0.1.7.0
- req ==1.1.0
- req-conduit ==1.0.0
- require ==0.2.1
- req-url-extra ==0.1.0.0
- - resolv ==0.1.1.1
+ - reroute ==0.5.0.0
+ - resolv ==0.1.1.2
- resource-pool ==0.2.3.2
- - resourcet ==1.2.1
+ - resourcet ==1.2.2
- rest-stringmap ==0.2.0.7
- result ==0.2.6.0
- rethinkdb-client-driver ==0.0.25
- - retry ==0.7.6.3
+ - retry ==0.7.7.0
- rev-state ==0.1.2
- - rfc5051 ==0.1.0.3
+ - rfc5051 ==0.1.0.4
- rhine ==0.4.0.1
- riak ==1.1.2.5
- riak-protobuf ==0.23.0.0
@@ -1767,8 +1782,8 @@ default-package-overrides:
- safeio ==0.0.5.0
- safe-money ==0.6
- SafeSemaphore ==0.10.1
- - saltine ==0.1.0.1
- - salve ==1.0.4
+ - saltine ==0.1.0.2
+ - salve ==1.0.6
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.3
@@ -1807,7 +1822,7 @@ default-package-overrides:
- servant-auth ==0.3.2.0
- servant-auth-client ==0.3.3.0
- servant-auth-docs ==0.2.10.0
- - servant-auth-server ==0.4.0.0
+ - servant-auth-server ==0.4.0.1
- servant-auth-swagger ==0.2.10.0
- servant-blaze ==0.8
- servant-cassava ==0.10
@@ -1826,13 +1841,13 @@ default-package-overrides:
- servant-lucid ==0.8.1
- servant-mock ==0.8.4
- servant-pandoc ==0.5.0.0
- - servant-ruby ==0.8.0.1
+ - servant-ruby ==0.8.0.2
- servant-server ==0.14.1
- servant-static-th ==0.2.2.0
- servant-streaming ==0.3.0.0
- servant-streaming-client ==0.3.0.0
- servant-streaming-server ==0.3.0.0
- - servant-swagger ==1.1.5
+ - servant-swagger ==1.1.6
- servant-swagger-ui ==0.3.0.3.13.2
- servant-swagger-ui-core ==0.3.1
- servant-tracing ==0.1.0.2
@@ -1845,12 +1860,12 @@ default-package-overrides:
- ses-html ==0.4.0.0
- set-cover ==0.0.9
- setenv ==0.1.1.3
- - setlocale ==1.0.0.6
+ - setlocale ==1.0.0.8
- sexp-grammar ==2.0.1
- SHA ==1.6.4.4
- shake ==0.16.4
- shake-language-c ==0.12.0
- - shakespeare ==2.0.15
+ - shakespeare ==2.0.19
- shell-conduit ==4.7.0
- shell-escape ==0.2.0
- shelltestrunner ==1.9
@@ -1862,20 +1877,21 @@ default-package-overrides:
- siggy-chardust ==1.0.0
- signal ==0.1.0.4
- silently ==1.2.5
+ - simple-cmd ==0.1.1
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.27
- simplest-sqlite ==0.1.0.0
- simple-vec3 ==0.4.0.8
- since ==0.0.0
- singleton-bool ==0.1.4
- - singleton-nats ==0.4.1
+ - singleton-nats ==0.4.2
- singletons ==2.4.1
- siphash ==1.0.3
- - size-based ==0.1.1.0
+ - size-based ==0.1.2.0
- skein ==1.0.9.4
- - skylighting ==0.7.2
- - skylighting-core ==0.7.2
- - slack-web ==0.2.0.6
+ - skylighting ==0.7.4
+ - skylighting-core ==0.7.4
+ - slack-web ==0.2.0.7
- slave-thread ==1.0.2
- smallcheck ==1.1.5
- smoothie ==0.4.2.9
@@ -1893,12 +1909,13 @@ default-package-overrides:
- sort ==1.0.0.0
- sorted-list ==0.2.1.0
- sourcemap ==0.1.6
- - sox ==0.2.3
- - soxlib ==0.0.3
+ - sox ==0.2.3.1
+ - soxlib ==0.0.3.1
- sparkle ==0.7.4
- sparse-linear-algebra ==0.3.1
+ - spatial-math ==0.5.0.1
- special-values ==0.1.0.0
- - speculate ==0.3.2
+ - speculate ==0.3.5
- speculation ==1.5.0.3
- speedy-slice ==0.3.0
- sphinx ==0.6.0.2
@@ -1906,8 +1923,10 @@ default-package-overrides:
- splice ==0.6.1.1
- split ==0.2.3.3
- splitmix ==0.0.1
+ - Spock ==0.13.0.0
+ - Spock-core ==0.13.0.0
- spoon ==0.3.1
- - spreadsheet ==0.1.3.7
+ - spreadsheet ==0.1.3.8
- sqlite-simple ==0.4.16.0
- sqlite-simple-errors ==0.6.1.0
- sql-words ==0.1.6.2
@@ -1920,18 +1939,18 @@ default-package-overrides:
- statestack ==0.2.0.5
- StateVar ==1.1.1.1
- static-canvas ==0.2.0.3
- - static-text ==0.2.0.2
+ - static-text ==0.2.0.3
- statistics ==0.14.0.2
- stb-image-redux ==0.2.1.2
- step-function ==0.2
- - stm ==2.4.5.0
+ - stm ==2.4.5.1
- stm-chans ==3.0.0.4
- - stm-conduit ==4.0.0
+ - stm-conduit ==4.0.1
- stm-containers ==0.2.16
- stm-delay ==0.1.1.1
- stm-extras ==0.1.0.3
- STMonadTrans ==0.4.3
- - stm-split ==0.0.2
+ - stm-split ==0.0.2.1
- stm-stats ==0.2.0.0
- stopwatch ==0.1.0.5
- storable-complex ==0.2.2
@@ -1939,11 +1958,11 @@ default-package-overrides:
- storable-record ==0.0.4
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13
- - store ==0.5.0
+ - store ==0.5.0.1
- store-core ==0.4.4
- Strafunski-StrategyLib ==5.0.1.0
- stratosphere ==0.24.4
- - streaming ==0.2.1.0
+ - streaming ==0.2.2.0
- streaming-attoparsec ==1.0.0
- streaming-bytestring ==0.1.6
- streaming-commons ==0.2.1.0
@@ -1953,7 +1972,7 @@ default-package-overrides:
- streams ==3.3
- strict ==0.3.2
- strict-base-types ==0.6.1
- - strict-concurrency ==0.2.4.2
+ - strict-concurrency ==0.2.4.3
- stringbuilder ==0.5.1
- string-class ==0.1.7.0
- string-combinators ==0.6.0.5
@@ -1965,13 +1984,12 @@ default-package-overrides:
- strive ==5.0.6
- structs ==0.1.1
- stylish-haskell ==0.9.2.0
- - summoner ==1.0.6
- sum-type-boilerplate ==0.1.1
- sundown ==0.6
- superbuffer ==0.3.1.1
- svg-builder ==0.1.1
- SVGFonts ==1.7
- - svg-tree ==0.6.2.2
+ - svg-tree ==0.6.2.3
- swagger ==0.3.0
- swagger2 ==2.2.2
- swish ==0.9.2.1
@@ -1980,23 +1998,23 @@ default-package-overrides:
- symengine ==0.1.2.0
- sysinfo ==0.1.1
- system-argv0 ==0.1.1
- - system-fileio ==0.3.16.3
+ - system-fileio ==0.3.16.4
- system-filepath ==0.4.14
- tabular ==0.2.2.7
- - tagchup ==0.4.1
+ - tagchup ==0.4.1.1
- tagged ==0.8.5
- tagged-binary ==0.2.0.1
- tagged-identity ==0.1.2
- tagged-transformer ==0.8.1
- tagshare ==0.0
- - tagsoup ==0.14.6
+ - tagsoup ==0.14.7
- tagstream-conduit ==0.5.5.3
- tao ==1.0.0
- tao-example ==1.0.0
- tar ==0.5.1.0
- - tar-conduit ==0.2.3.1
+ - tar-conduit ==0.2.5
- tardis ==0.4.1.0
- - tasty ==1.1.0.3
+ - tasty ==1.1.0.4
- tasty-ant-xml ==1.1.4
- tasty-dejafu ==1.2.0.7
- tasty-discover ==4.2.1
@@ -2008,7 +2026,7 @@ default-package-overrides:
- tasty-kat ==0.0.3
- tasty-program ==1.0.5
- tasty-quickcheck ==0.10
- - tasty-silver ==3.1.11
+ - tasty-silver ==3.1.12
- tasty-smallcheck ==0.8.1
- tasty-stats ==0.2.0.4
- tasty-th ==0.1.7
@@ -2025,19 +2043,19 @@ default-package-overrides:
- terminal-size ==0.3.2.1
- test-framework ==0.8.2.0
- test-framework-hunit ==0.3.0.2
- - test-framework-quickcheck2 ==0.3.0.4
+ - test-framework-quickcheck2 ==0.3.0.5
- test-framework-smallcheck ==0.2
- test-framework-th ==0.2.4
- testing-feat ==1.1.0.0
- testing-type-modifiers ==0.1.0.1
- - texmath ==0.11.0.1
- - text ==1.2.3.0
+ - texmath ==0.11.1.2
+ - text ==1.2.3.1
- text-binary ==0.2.1.1
- - text-builder ==0.5.3.1
+ - text-builder ==0.5.4.3
- text-conversions ==0.3.0
- text-icu ==0.7.0.1
- text-latin1 ==0.3.1
- - text-ldap ==0.1.1.12
+ - text-ldap ==0.1.1.13
- textlocal ==0.1.0.5
- text-manipulate ==0.2.0.1
- text-metrics ==0.3.0
@@ -2050,12 +2068,12 @@ default-package-overrides:
- tfp ==1.0.0.2
- tf-random ==0.5
- th-abstraction ==0.2.8.0
- - th-data-compat ==0.0.2.6
+ - th-data-compat ==0.0.2.7
- th-desugar ==1.8
- - these ==0.7.4
+ - these ==0.7.5
- th-expand-syns ==0.4.4.0
- th-extras ==0.0.0.4
- - th-lift ==0.7.10
+ - th-lift ==0.7.11
- th-lift-instances ==0.1.11
- th-nowq ==0.1.0.2
- th-orphans ==0.13.6
@@ -2064,8 +2082,8 @@ default-package-overrides:
- thread-local-storage ==0.2
- threads ==0.5.1.6
- threads-extras ==0.1.0.2
- - threepenny-gui ==0.8.2.4
- - th-reify-compat ==0.0.1.4
+ - threepenny-gui ==0.8.3.0
+ - th-reify-compat ==0.0.1.5
- th-reify-many ==0.1.8
- throttle-io-stream ==0.2.0.1
- through-text ==0.1.0.0
@@ -2078,7 +2096,7 @@ default-package-overrides:
- timeit ==2.0
- timelens ==0.2.0.2
- time-lens ==0.4.0.2
- - time-locale-compat ==0.1.1.4
+ - time-locale-compat ==0.1.1.5
- time-locale-vietnamese ==1.0.0.0
- time-parsers ==0.1.2.0
- timerep ==2.0.0.2
@@ -2112,35 +2130,36 @@ default-package-overrides:
- tuples-homogenous-h98 ==0.1.1.0
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- - turtle ==1.5.10
+ - turtle ==1.5.12
+ - TypeCompose ==0.9.13
- typed-process ==0.2.3.0
- type-fun ==0.1.1
- type-hint ==0.1
- type-level-integers ==0.0.1
- type-level-kv-list ==1.1.0
- type-level-numbers ==0.1.1.1
- - typelits-witnesses ==0.3.0.2
- - typenums ==0.1.2
+ - typelits-witnesses ==0.3.0.3
+ - typenums ==0.1.2.1
- type-of-html ==1.4.0.1
- type-of-html-static ==0.1.0.2
- type-operators ==0.1.0.4
- type-spec ==0.3.0.1
- typography-geometry ==1.0.0.1
- tz ==0.1.3.1
- - tzdata ==0.1.20180122.0
+ - tzdata ==0.1.20180501.0
- uglymemo ==0.1.0.1
- unbounded-delays ==0.1.1.0
- - unbound-generics ==0.3.3
+ - unbound-generics ==0.3.4
- unboxed-ref ==0.4.0.0
- uncertain ==0.3.1.0
- unconstrained ==0.1.0.2
- unfoldable ==0.9.6
- unfoldable-restricted ==0.0.3
- - unicode ==0.0.1
+ - unicode ==0.0.1.1
- unicode-show ==0.1.0.3
- unicode-transforms ==0.3.4
- unification-fd ==0.10.0.1
- - union ==0.1.1.2
+ - union ==0.1.2
- union-find ==0.2
- uniplate ==1.6.12
- uniprot-kb ==0.1.2.0
@@ -2155,15 +2174,15 @@ default-package-overrides:
- universe-reverse-instances ==1.0
- universum ==1.2.0
- unix-bytestring ==0.3.7.3
- - unix-compat ==0.5.0.1
+ - unix-compat ==0.5.1
- unix-time ==0.3.8
- - unliftio ==0.2.7.0
- - unliftio-core ==0.1.1.0
+ - unliftio ==0.2.8.1
+ - unliftio-core ==0.1.2.0
- unlit ==0.4.0.0
- unordered-containers ==0.2.9.0
- unordered-intmap ==0.1.1
- unsafe ==0.0
- - uri-bytestring ==0.3.2.0
+ - uri-bytestring ==0.3.2.1
- uri-encode ==1.5.0.5
- uri-templater ==0.3.1.0
- urlpath ==9.0.0
@@ -2172,7 +2191,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- - util ==0.1.10.1
+ - util ==0.1.11.0
- utility-ht ==0.0.14
- uuid ==1.3.13
- uuid-types ==1.0.3
@@ -2181,19 +2200,19 @@ default-package-overrides:
- validity-aeson ==0.2.0.2
- validity-bytestring ==0.3.0.2
- validity-containers ==0.3.1.0
- - validity-path ==0.3.0.1
- - validity-scientific ==0.2.0.1
- - validity-text ==0.3.0.1
- - validity-time ==0.2.0.1
- - validity-unordered-containers ==0.2.0.1
- - validity-uuid ==0.1.0.1
- - validity-vector ==0.2.0.1
+ - validity-path ==0.3.0.2
+ - validity-scientific ==0.2.0.2
+ - validity-text ==0.3.1.0
+ - validity-time ==0.2.0.2
+ - validity-unordered-containers ==0.2.0.2
+ - validity-uuid ==0.1.0.2
+ - validity-vector ==0.2.0.2
- valor ==0.1.0.0
- vault ==0.3.1.2
- vec ==0.1
- vector ==0.12.0.1
- - vector-algorithms ==0.7.0.1
- - vector-binary-instances ==0.2.4
+ - vector-algorithms ==0.7.0.4
+ - vector-binary-instances ==0.2.5
- vector-buffer ==0.4.1
- vector-builder ==0.3.6
- vector-bytes-instances ==0.1.1
@@ -2207,7 +2226,7 @@ default-package-overrides:
- verbosity ==0.2.3.0
- versions ==3.4.0.1
- ViennaRNAParser ==1.3.3
- - viewprof ==0.0.0.22
+ - viewprof ==0.0.0.23
- vinyl ==0.8.1.1
- vivid ==0.3.0.2
- vivid-osc ==0.3.0.0
@@ -2220,7 +2239,7 @@ default-package-overrides:
- wai-conduit ==3.0.0.4
- wai-cors ==0.2.6
- wai-eventsource ==3.0.0
- - wai-extra ==3.0.24.1
+ - wai-extra ==3.0.24.3
- wai-handler-launch ==3.0.2.4
- wai-logger ==2.3.2
- wai-middleware-caching ==0.1.0.2
@@ -2236,7 +2255,7 @@ default-package-overrides:
- wai-slack-middleware ==0.2.0
- wai-transformers ==0.1.0
- wai-websockets ==3.0.1.2
- - warp ==3.2.23
+ - warp ==3.2.25
- warp-tls ==3.2.4.3
- warp-tls-uid ==0.2.0.5
- wave ==0.1.5
@@ -2251,13 +2270,13 @@ default-package-overrides:
- web-routes-hsp ==0.24.6.1
- web-routes-wai ==0.24.3.1
- webrtc-vad ==0.1.0.3
- - websockets ==0.12.5.1
+ - websockets ==0.12.5.2
- websockets-snap ==0.10.3.0
- weigh ==0.0.12
- wide-word ==0.1.0.6
- wikicfp-scraper ==0.1.0.9
- - wild-bind ==0.1.2.1
- - wild-bind-x11 ==0.2.0.4
+ - wild-bind ==0.1.2.3
+ - wild-bind-x11 ==0.2.0.6
- Win32-notify ==0.3.0.3
- wire-streams ==0.1.1.0
- withdependencies ==0.2.4.2
@@ -2288,7 +2307,7 @@ default-package-overrides:
- X11 ==1.9
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
- - x509 ==1.7.3
+ - x509 ==1.7.4
- x509-store ==1.6.6
- x509-system ==1.6.6
- x509-validation ==1.6.10
@@ -2300,10 +2319,10 @@ default-package-overrides:
- xls ==0.1.1
- xlsx ==0.7.2
- xml ==1.3.14
- - xml-basic ==0.1.3
+ - xml-basic ==0.1.3.1
- xmlbf ==0.4.1
- xmlbf-xeno ==0.1.1
- - xml-conduit ==1.8.0
+ - xml-conduit ==1.8.0.1
- xml-conduit-parse ==0.3.1.2
- xml-conduit-writer ==0.1.1.2
- xmlgen ==0.6.2.2
@@ -2320,36 +2339,36 @@ default-package-overrides:
- xxhash-ffi ==0.2.0.0
- yaml ==0.8.32
- yeshql ==4.1.0.1
- - yeshql-core ==4.1.0.1
- - yeshql-hdbc ==4.1.0.1
+ - yeshql-core ==4.1.0.2
+ - yeshql-hdbc ==4.1.0.2
- yesod ==1.6.0
- yesod-alerts ==0.1.2.0
- - yesod-auth ==1.6.4.1
- - yesod-auth-fb ==1.9.0
+ - yesod-auth ==1.6.5
+ - yesod-auth-fb ==1.9.1
- yesod-auth-hashdb ==1.7
- yesod-bin ==1.6.0.3
- - yesod-core ==1.6.6
+ - yesod-core ==1.6.8.1
- yesod-csp ==0.2.4.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
- - yesod-form ==1.6.2
+ - yesod-form ==1.6.3
- yesod-form-bootstrap4 ==1.0.2
- yesod-gitrepo ==0.3.0
- yesod-gitrev ==0.2.0.0
- yesod-newsfeed ==1.6.1.0
- - yesod-paginator ==1.1.0.0
- - yesod-persistent ==1.6.0
+ - yesod-paginator ==1.1.0.1
+ - yesod-persistent ==1.6.0.1
- yesod-recaptcha2 ==0.2.4
- yesod-sitemap ==1.6.0
- - yesod-static ==1.6.0
- - yesod-test ==1.6.5
+ - yesod-static ==1.6.0.1
+ - yesod-test ==1.6.5.1
- yesod-text-markdown ==0.1.10
- yesod-websockets ==0.3.0.1
- yes-precure5-command ==5.5.3
- yi-language ==0.17.1
- yi-rope ==0.11
- yjtools ==0.9.18
- - yoga ==0.0.0.2
+ - yoga ==0.0.0.5
- youtube ==0.2.1.1
- zero ==0.1.4
- zeromq4-haskell ==0.7.0
@@ -2377,6 +2396,7 @@ extra-packages:
- Cabal == 1.18.* # required for cabal-install et al on old GHC versions
- Cabal == 1.20.* # required for cabal-install et al on old GHC versions
- Cabal == 1.24.* # required for jailbreak-cabal etc.
+ - Cabal == 2.2.* # required for jailbreak-cabal etc.
- colour < 2.3.4 # newer versions don't support GHC 7.10.x
- conduit >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227
- conduit-extra >=1.1 && <1.3 # pre-lts-11.x versions neeed by git-annex 6.20180227
@@ -2393,7 +2413,6 @@ extra-packages:
- haddock-api == 2.17.* # required on GHC 8.0.x
- haddock-library == 1.2.* # required for haddock-api-2.16.x
- haddock-library == 1.4.3 # required for haddock-api-2.17.x
- - haddock-library == 1.4.4 # required for haddock-api-2.18.x
- haddock-library == 1.5.* # required for stylish-cabal-0.4.0.1
- happy <1.19.6 # newer versions break Agda
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
@@ -2567,6 +2586,7 @@ dont-distribute-packages:
fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ]
fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ]
fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ fltkhs-themes: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghcjs-dom-hello: [ i686-linux, x86_64-linux, x86_64-darwin ]
ghcjs-dom-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ]
gi-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2800,6 +2820,7 @@ dont-distribute-packages:
anticiv: [ i686-linux, x86_64-linux, x86_64-darwin ]
antigate: [ i686-linux, x86_64-linux, x86_64-darwin ]
antimirov: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ antiope-contract: [ i686-linux, x86_64-linux, x86_64-darwin ]
antiope-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
antiope-dynamodb: [ i686-linux, x86_64-linux, x86_64-darwin ]
antiope-messages: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2844,6 +2865,7 @@ dont-distribute-packages:
ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ]
arbb-vm: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ arbor-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ]
arbtt: [ i686-linux, x86_64-linux, x86_64-darwin ]
archiver: [ i686-linux, x86_64-linux, x86_64-darwin ]
archlinux-web: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2872,12 +2894,14 @@ dont-distribute-packages:
ArrowVHDL: [ i686-linux, x86_64-linux, x86_64-darwin ]
artery: [ i686-linux, x86_64-linux, x86_64-darwin ]
ascii-flatten: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ ascii-string: [ i686-linux, x86_64-linux, x86_64-darwin ]
ascii-table: [ i686-linux, x86_64-linux, x86_64-darwin ]
ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ]
ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
ascii: [ i686-linux, x86_64-linux, x86_64-darwin ]
asciidiagram: [ i686-linux, x86_64-linux, x86_64-darwin ]
asic: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ asif: [ i686-linux, x86_64-linux, x86_64-darwin ]
asil: [ i686-linux, x86_64-linux, x86_64-darwin ]
asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ]
asn: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2890,6 +2914,7 @@ dont-distribute-packages:
ast-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
astrds: [ i686-linux, x86_64-linux, x86_64-darwin ]
astview: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ async-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ]
async-dejafu: [ i686-linux, x86_64-linux, x86_64-darwin ]
async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ]
asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2915,11 +2940,13 @@ dont-distribute-packages:
attoparsec-csv: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ attoparsec-ip: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-time: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ attoparsec-uri: [ i686-linux, x86_64-linux, x86_64-darwin ]
attoparsec-varword: [ i686-linux, x86_64-linux, x86_64-darwin ]
attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ]
Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2929,6 +2956,7 @@ dont-distribute-packages:
augur: [ i686-linux, x86_64-linux, x86_64-darwin ]
aur-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
aur: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ aura: [ i686-linux, x86_64-linux, x86_64-darwin ]
Aurochs: [ i686-linux, x86_64-linux, x86_64-darwin ]
authenticate-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ]
authoring: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2970,6 +2998,7 @@ dont-distribute-packages:
aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ axel: [ i686-linux, x86_64-linux, x86_64-darwin ]
axiom: [ i686-linux, x86_64-linux, x86_64-darwin ]
azubi: [ i686-linux, x86_64-linux, x86_64-darwin ]
azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3006,6 +3035,7 @@ dont-distribute-packages:
base-feature-macros: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ]
base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
baserock-schema: [ i686-linux, x86_64-linux, x86_64-darwin ]
basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3032,6 +3062,7 @@ dont-distribute-packages:
bein: [ i686-linux, x86_64-linux, x86_64-darwin ]
belka: [ i686-linux, x86_64-linux, x86_64-darwin ]
bench-graph: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ bench-show: [ i686-linux, x86_64-linux, x86_64-darwin ]
BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ]
benchpress: [ i686-linux, x86_64-linux, x86_64-darwin ]
bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3178,6 +3209,7 @@ dont-distribute-packages:
Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ]
bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ]
bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ blunk-hask-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
blunt: [ i686-linux, x86_64-linux, x86_64-darwin ]
BNFC-meta: [ i686-linux, x86_64-linux, x86_64-darwin ]
BNFC: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3202,10 +3234,12 @@ dont-distribute-packages:
bowntz: [ i686-linux, x86_64-linux, x86_64-darwin ]
braid: [ i686-linux, x86_64-linux, x86_64-darwin ]
brain-bleep: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ brainheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ]
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-skylighting: [ i686-linux, x86_64-linux, x86_64-darwin ]
bricks-internal-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
bricks-internal: [ i686-linux, x86_64-linux, x86_64-darwin ]
bricks-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3213,6 +3247,10 @@ dont-distribute-packages:
bricks-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ]
bricks: [ i686-linux, x86_64-linux, x86_64-darwin ]
brillig: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ brittany: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ broadcast-chan-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ broadcast-chan-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ broadcast-chan-tests: [ 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 ]
bronyradiogermany-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3225,6 +3263,7 @@ dont-distribute-packages:
buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
buffer: [ i686-linux, x86_64-linux, x86_64-darwin ]
buffon: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ bugsnag-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
bugzilla: [ i686-linux, x86_64-linux, x86_64-darwin ]
build: [ i686-linux, x86_64-linux, x86_64-darwin ]
buildable: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3261,6 +3300,7 @@ dont-distribute-packages:
c2ats: [ i686-linux, x86_64-linux, x86_64-darwin ]
c2hsc: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cabal-cargs: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal-db: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3329,6 +3369,8 @@ dont-distribute-packages:
cao: [ i686-linux, x86_64-linux, x86_64-darwin ]
cap: [ i686-linux, x86_64-linux, x86_64-darwin ]
Capabilities: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ capability: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ capnp: [ i686-linux, x86_64-linux, x86_64-darwin ]
capped-list: [ i686-linux, x86_64-linux, x86_64-darwin ]
capri: [ i686-linux, x86_64-linux, x86_64-darwin ]
car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3472,6 +3514,7 @@ dont-distribute-packages:
clash-verilog: [ i686-linux, x86_64-linux, x86_64-darwin ]
clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ]
clash: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ classify-frog: [ i686-linux, x86_64-linux, x86_64-darwin ]
ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ]
classy-miso: [ i686-linux, x86_64-linux, x86_64-darwin ]
classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3533,6 +3576,7 @@ dont-distribute-packages:
CMQ: [ i686-linux, x86_64-linux, x86_64-darwin ]
cmv: [ i686-linux, x86_64-linux, x86_64-darwin ]
cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ co-log: [ i686-linux, x86_64-linux, x86_64-darwin ]
Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ]
coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ]
codec-beam: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3613,6 +3657,7 @@ dont-distribute-packages:
concrete-haskell-autogen: [ 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 ]
+ concurrency-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ]
concurrent-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ]
Concurrent-Cache: [ i686-linux, x86_64-linux, x86_64-darwin ]
concurrent-dns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3674,6 +3719,7 @@ dont-distribute-packages:
context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ]
ContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ]
contiguous-checked: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ contiguous-fft: [ i686-linux, x86_64-linux, x86_64-darwin ]
contiguous: [ i686-linux, x86_64-linux, x86_64-darwin ]
continue: [ i686-linux, x86_64-linux, x86_64-darwin ]
continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3799,6 +3845,8 @@ dont-distribute-packages:
CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
curryrs: [ i686-linux, x86_64-linux, x86_64-darwin ]
cursedcsv: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cursor-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cursor: [ i686-linux, x86_64-linux, x86_64-darwin ]
curve25519: [ i686-linux, x86_64-linux, x86_64-darwin ]
curves: [ i686-linux, x86_64-linux, x86_64-darwin ]
custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3886,6 +3934,7 @@ dont-distribute-packages:
datetime: [ i686-linux, x86_64-linux, x86_64-darwin ]
dawdle: [ i686-linux, x86_64-linux, x86_64-darwin ]
dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ DBFunctor: [ i686-linux, x86_64-linux, x86_64-darwin ]
dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ]
DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ]
dbm: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3956,6 +4005,7 @@ dont-distribute-packages:
delude: [ i686-linux, x86_64-linux, x86_64-darwin ]
demarcate: [ i686-linux, x86_64-linux, x86_64-darwin ]
denominate: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ dense-int-set: [ i686-linux, x86_64-linux, x86_64-darwin ]
dependent-monoidal-map: [ i686-linux, x86_64-linux, x86_64-darwin ]
dependent-state: [ i686-linux, x86_64-linux, x86_64-darwin ]
dependent-sum-aeson-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3982,6 +4032,7 @@ dont-distribute-packages:
dgim: [ i686-linux, x86_64-linux, x86_64-darwin ]
dgs: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ dhall-lex: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhall-to-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
di-df1: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4034,6 +4085,7 @@ dont-distribute-packages:
dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ]
discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
discord-gateway: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ discord-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
discord-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
discord-rest: [ i686-linux, x86_64-linux, x86_64-darwin ]
discord-types: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4081,6 +4133,7 @@ dont-distribute-packages:
doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ]
doccheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
docidx: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ docker-build-cacher: [ i686-linux, x86_64-linux, x86_64-darwin ]
doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ]
doctest-driver-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4213,6 +4266,7 @@ dont-distribute-packages:
email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ]
email-validator: [ i686-linux, x86_64-linux, x86_64-darwin ]
email: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ emailaddress: [ i686-linux, x86_64-linux, x86_64-darwin ]
emailparse: [ i686-linux, x86_64-linux, x86_64-darwin ]
embeddock-example: [ i686-linux, x86_64-linux, x86_64-darwin ]
embeddock: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4231,6 +4285,7 @@ dont-distribute-packages:
engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
entangle: [ i686-linux, x86_64-linux, x86_64-darwin ]
EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ entwine: [ i686-linux, x86_64-linux, x86_64-darwin ]
EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ]
enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ]
enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4317,8 +4372,10 @@ dont-distribute-packages:
exif: [ i686-linux, x86_64-linux, x86_64-darwin ]
exinst-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
exinst-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ exinst-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ]
exinst-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ]
exinst-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ exinst-serialise: [ i686-linux, x86_64-linux, x86_64-darwin ]
exists: [ i686-linux, x86_64-linux, x86_64-darwin ]
exitcode: [ i686-linux, x86_64-linux, x86_64-darwin ]
expand: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4333,6 +4390,8 @@ dont-distribute-packages:
explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ]
explore: [ i686-linux, x86_64-linux, x86_64-darwin ]
exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ expressions-z3: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ expressions: [ i686-linux, x86_64-linux, x86_64-darwin ]
extcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
extemp: [ i686-linux, x86_64-linux, x86_64-darwin ]
extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4341,6 +4400,7 @@ dont-distribute-packages:
extract-dependencies: [ i686-linux, x86_64-linux, x86_64-darwin ]
extractelf: [ i686-linux, x86_64-linux, x86_64-darwin ]
ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ f-ree-hack-cheats-free-v-bucks-generator: [ i686-linux, x86_64-linux, x86_64-darwin ]
Facebook-Password-Hacker-Online-Latest-Version: [ i686-linux, x86_64-linux, x86_64-darwin ]
faceted: [ i686-linux, x86_64-linux, x86_64-darwin ]
factory: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4503,6 +4563,7 @@ dont-distribute-packages:
foldl-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ]
folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
follow-file: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ follow: [ i686-linux, x86_64-linux, x86_64-darwin ]
follower: [ i686-linux, x86_64-linux, x86_64-darwin ]
foma: [ i686-linux, x86_64-linux, x86_64-darwin ]
font-opengl-basic4x6: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4542,6 +4603,8 @@ dont-distribute-packages:
Fractaler: [ i686-linux, x86_64-linux, x86_64-darwin ]
fractals: [ i686-linux, x86_64-linux, x86_64-darwin ]
frag: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ Frames-beam: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ Frames-dsv: [ i686-linux, x86_64-linux, x86_64-darwin ]
Frames: [ i686-linux, x86_64-linux, x86_64-darwin ]
franchise: [ i686-linux, x86_64-linux, x86_64-darwin ]
Frank: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4556,6 +4619,8 @@ dont-distribute-packages:
free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ]
free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ]
free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ free-v-bucks-generator-no-survey: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ free-v-bucks-generator-ps4-no-survey: [ i686-linux, x86_64-linux, x86_64-darwin ]
free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ]
freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ]
freelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4658,6 +4723,7 @@ dont-distribute-packages:
generic-accessors: [ i686-linux, x86_64-linux, x86_64-darwin ]
generic-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ generic-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
generic-enum: [ i686-linux, x86_64-linux, x86_64-darwin ]
generic-lens-labels: [ i686-linux, x86_64-linux, x86_64-darwin ]
generic-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4800,8 +4866,12 @@ dont-distribute-packages:
glome-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ]
GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gloss-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gloss-game: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ gloss-juicy: [ i686-linux, x86_64-linux, x86_64-darwin ]
gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ]
glpk-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5012,6 +5082,7 @@ dont-distribute-packages:
graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ]
graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ]
graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ graphmod-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ]
graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ]
graql: [ i686-linux, x86_64-linux, x86_64-darwin ]
grasp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5046,6 +5117,8 @@ dont-distribute-packages:
Grow: [ i686-linux, x86_64-linux, x86_64-darwin ]
growler: [ i686-linux, x86_64-linux, x86_64-darwin ]
GrowlNotify: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ grpc-api-etcd: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ grpc-etcd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
gruff-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
gruff: [ i686-linux, x86_64-linux, x86_64-darwin ]
gsl-random-fu: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5152,6 +5225,7 @@ dont-distribute-packages:
hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hakyll-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ]
hakyll-shortcode: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5164,6 +5238,7 @@ dont-distribute-packages:
halma-telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ]
halma: [ i686-linux, x86_64-linux, x86_64-darwin ]
halves: [ 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 ]
@@ -5267,6 +5342,8 @@ dont-distribute-packages:
haskell-abci: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-aliyun: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-awk: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-bitmex-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-bitmex-rest: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5290,11 +5367,13 @@ dont-distribute-packages:
haskell-names: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-neo4j-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-overridez: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-packages: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-pdf-presenter: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-platform-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-player: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-plot: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-postal: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-read-editor: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-rules: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5349,11 +5428,13 @@ dont-distribute-packages:
haskheap: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskmon: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskoin-bitcoind: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskoin-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskoin-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskoin-node: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskoin-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskoin-script: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskoin-store: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskoin-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskoin-wallet: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskoin: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5463,6 +5544,8 @@ dont-distribute-packages:
hdr-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ]
HDRUtils: [ i686-linux, x86_64-linux, x86_64-darwin ]
headergen: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ heatitup-complete: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ heatitup: [ i686-linux, x86_64-linux, x86_64-darwin ]
heavy-logger-amazon: [ i686-linux, x86_64-linux, x86_64-darwin ]
heavy-logger-instances: [ i686-linux, x86_64-linux, x86_64-darwin ]
heavy-logger: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5517,6 +5600,7 @@ dont-distribute-packages:
heterolist: [ i686-linux, x86_64-linux, x86_64-darwin ]
hetris: [ i686-linux, x86_64-linux, x86_64-darwin ]
heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hevm: [ i686-linux, x86_64-linux, x86_64-darwin ]
hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ]
hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ]
hexchat: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5641,6 +5725,8 @@ dont-distribute-packages:
HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ]
HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ]
hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hledger-iadd: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hledger-irr: [ 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 ]
@@ -5665,6 +5751,8 @@ dont-distribute-packages:
hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ]
hmatrix-sundials: [ 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 ]
+ hmatrix-vector-sized: [ 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 ]
@@ -5789,6 +5877,7 @@ dont-distribute-packages:
HRay: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hricket: [ i686-linux, x86_64-linux, x86_64-darwin ]
hricket: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hriemann: [ i686-linux, x86_64-linux, x86_64-darwin ]
HROOT-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
HROOT-graf: [ i686-linux, x86_64-linux, x86_64-darwin ]
HROOT-hist: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5903,6 +5992,7 @@ dont-distribute-packages:
hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ]
HsParrot: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspear: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hspec-dirstream: [ i686-linux, x86_64-linux, x86_64-darwin ]
hspec-expectations-match: [ 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 ]
@@ -5971,6 +6061,7 @@ dont-distribute-packages:
html-kure: [ i686-linux, x86_64-linux, x86_64-darwin ]
html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ]
html-tokenizer: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ htoml-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
hts: [ i686-linux, x86_64-linux, x86_64-darwin ]
htsn-import: [ i686-linux, x86_64-linux, x86_64-darwin ]
htsn: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6027,6 +6118,7 @@ dont-distribute-packages:
hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-dsv: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hw-prim-bits: [ i686-linux, x86_64-linux, x86_64-darwin ]
hw-simd: [ i686-linux, x86_64-linux, x86_64-darwin ]
hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ]
hweblib: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6203,6 +6295,8 @@ dont-distribute-packages:
introduction: [ i686-linux, x86_64-linux, x86_64-darwin ]
intset: [ i686-linux, x86_64-linux, x86_64-darwin ]
invertible-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ invertible-hxt: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ invertible: [ i686-linux, x86_64-linux, x86_64-darwin ]
io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ]
io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ]
IOR: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6211,6 +6305,7 @@ dont-distribute-packages:
iothread: [ i686-linux, x86_64-linux, x86_64-darwin ]
iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ]
ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ ip: [ i686-linux, x86_64-linux, x86_64-darwin ]
ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ]
ipc: [ i686-linux, x86_64-linux, x86_64-darwin ]
ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6237,6 +6332,7 @@ dont-distribute-packages:
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 ]
+ itcli: [ 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 ]
@@ -6282,6 +6378,7 @@ dont-distribute-packages:
jenga: [ i686-linux, x86_64-linux, x86_64-darwin ]
jenkinsPlugins2nix: [ i686-linux, x86_64-linux, x86_64-darwin ]
jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ jinquantities: [ i686-linux, x86_64-linux, x86_64-darwin ]
jml-web-service: [ i686-linux, x86_64-linux, x86_64-darwin ]
jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ]
join-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6371,6 +6468,7 @@ dont-distribute-packages:
katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ]
katt: [ i686-linux, x86_64-linux, x86_64-darwin ]
kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ]
kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
keccak: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6419,6 +6517,7 @@ dont-distribute-packages:
krpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
KSP: [ i686-linux, x86_64-linux, x86_64-darwin ]
ktx: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ Kulitta: [ i686-linux, x86_64-linux, x86_64-darwin ]
kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ]
kure: [ i686-linux, x86_64-linux, x86_64-darwin ]
KyotoCabinet: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6494,6 +6593,7 @@ dont-distribute-packages:
language-ninja: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-oberon: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ language-ocaml: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-openscad: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ]
language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6578,6 +6678,7 @@ dont-distribute-packages:
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 ]
+ libnix: [ i686-linux, x86_64-linux, x86_64-darwin ]
liboath-hs: [ 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 ]
@@ -6590,6 +6691,8 @@ dont-distribute-packages:
libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ]
licensor: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ life-sync: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lifted-base-tf: [ i686-linux, x86_64-linux, x86_64-darwin ]
lifted-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ]
lifter: [ i686-linux, x86_64-linux, x86_64-darwin ]
ligature: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6733,6 +6836,7 @@ dont-distribute-packages:
ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ]
lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lsp-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ]
ltext: [ i686-linux, x86_64-linux, x86_64-darwin ]
ltk: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6812,6 +6916,7 @@ dont-distribute-packages:
markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ]
marked-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
markov-processes: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ markup: [ i686-linux, x86_64-linux, x86_64-darwin ]
marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ]
marquise: [ i686-linux, x86_64-linux, x86_64-darwin ]
mars: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6902,6 +7007,7 @@ dont-distribute-packages:
MHask: [ i686-linux, x86_64-linux, x86_64-darwin ]
mi: [ i686-linux, x86_64-linux, x86_64-darwin ]
Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ miconix-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
microaeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ]
microgroove: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6932,15 +7038,20 @@ dont-distribute-packages:
minirotate: [ i686-linux, x86_64-linux, x86_64-darwin ]
ministg: [ i686-linux, x86_64-linux, x86_64-darwin ]
minst-idx: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mios: [ i686-linux, x86_64-linux, x86_64-darwin ]
mirror-tweet: [ i686-linux, x86_64-linux, x86_64-darwin ]
missing-py2: [ i686-linux, x86_64-linux, x86_64-darwin ]
MissingPy: [ i686-linux, x86_64-linux, x86_64-darwin ]
mixed-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mixpanel-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ]
mkcabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ]
mlist: [ i686-linux, x86_64-linux, x86_64-darwin ]
mltool: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mmark-cli: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mmark-ext: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mmark: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6994,6 +7105,7 @@ dont-distribute-packages:
MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ]
MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ]
monadiccp-gecode: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ monadIO: [ i686-linux, x86_64-linux, x86_64-darwin ]
Monadius: [ i686-linux, x86_64-linux, x86_64-darwin ]
MonadLab: [ i686-linux, x86_64-linux, x86_64-darwin ]
monadLib-compose: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7031,6 +7143,8 @@ dont-distribute-packages:
morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ]
morph: [ i686-linux, x86_64-linux, x86_64-darwin ]
mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ moto-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ moto: [ i686-linux, x86_64-linux, x86_64-darwin ]
motor-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
motor-reflection: [ i686-linux, x86_64-linux, x86_64-darwin ]
motor: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7203,6 +7317,7 @@ dont-distribute-packages:
network-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-hans: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-interfacerequest: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ network-messagepack-rpc-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
network-netpacket: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7345,6 +7460,7 @@ dont-distribute-packages:
opaleye-classy: [ i686-linux, x86_64-linux, x86_64-darwin ]
opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ]
opaleye-trans: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ opaleye: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
open-signals: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7372,6 +7488,7 @@ dont-distribute-packages:
opensoundcontrol-ht: [ i686-linux, x86_64-linux, x86_64-darwin ]
openssh-github-keys: [ i686-linux, x86_64-linux, x86_64-darwin ]
opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ opentok: [ 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 ]
@@ -7379,11 +7496,13 @@ dont-distribute-packages:
Operads: [ i686-linux, x86_64-linux, x86_64-darwin ]
operational-extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
opml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ optima: [ i686-linux, x86_64-linux, x86_64-darwin ]
optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ]
optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ]
optional: [ i686-linux, x86_64-linux, x86_64-darwin ]
optparse-applicative-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
optparse-helper: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ orc: [ i686-linux, x86_64-linux, x86_64-darwin ]
orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ]
OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7404,6 +7523,7 @@ dont-distribute-packages:
OrPatterns: [ i686-linux, x86_64-linux, x86_64-darwin ]
osc: [ i686-linux, x86_64-linux, x86_64-darwin ]
oscpacking: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ Oslo-Vectize: [ i686-linux, x86_64-linux, x86_64-darwin ]
osm-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
osm-download: [ i686-linux, x86_64-linux, x86_64-darwin ]
OSM: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7536,6 +7656,7 @@ dont-distribute-packages:
perhaps: [ i686-linux, x86_64-linux, x86_64-darwin ]
periodic: [ i686-linux, x86_64-linux, x86_64-darwin ]
perm: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ permutations: [ i686-linux, x86_64-linux, x86_64-darwin ]
permute: [ i686-linux, x86_64-linux, x86_64-darwin ]
PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ]
persist2er: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7548,6 +7669,7 @@ dont-distribute-packages:
persistent-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ persistent-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-relational-record: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-vector: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7624,6 +7746,7 @@ dont-distribute-packages:
pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ]
pivotal-tracker: [ i686-linux, x86_64-linux, x86_64-darwin ]
pixelated-avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ piyo: [ i686-linux, x86_64-linux, x86_64-darwin ]
pkcs10: [ i686-linux, x86_64-linux, x86_64-darwin ]
pkcs7: [ i686-linux, x86_64-linux, x86_64-darwin ]
pkggraph: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7632,10 +7755,12 @@ dont-distribute-packages:
plan-b: [ i686-linux, x86_64-linux, x86_64-darwin ]
planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ]
planb-token-introspection: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ planet-mitchell: [ i686-linux, x86_64-linux, x86_64-darwin ]
plankton: [ i686-linux, x86_64-linux, x86_64-darwin ]
plat: [ i686-linux, x86_64-linux, x86_64-darwin ]
platinum-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ]
PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ plex: [ i686-linux, x86_64-linux, x86_64-darwin ]
plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ]
plivo: [ i686-linux, x86_64-linux, x86_64-darwin ]
plocketed: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7702,6 +7827,7 @@ dont-distribute-packages:
postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-simple-url: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ postgresql-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ]
postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7745,6 +7871,7 @@ dont-distribute-packages:
pretty-sop: [ i686-linux, x86_64-linux, x86_64-darwin ]
prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ]
preview: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ prim-instances: [ i686-linux, x86_64-linux, x86_64-darwin ]
primes-type: [ i686-linux, x86_64-linux, x86_64-darwin ]
primesieve: [ i686-linux, x86_64-linux, x86_64-darwin ]
primitive-checked: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7763,6 +7890,7 @@ dont-distribute-packages:
priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ]
priority-sync: [ i686-linux, x86_64-linux, x86_64-darwin ]
PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ prizm: [ i686-linux, x86_64-linux, x86_64-darwin ]
ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ]
proc: [ i686-linux, x86_64-linux, x86_64-darwin ]
process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7804,6 +7932,8 @@ dont-distribute-packages:
prosper: [ i686-linux, x86_64-linux, x86_64-darwin ]
proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ]
proto-lens-descriptors: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ proto-lens-runtime: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ proto-lens-setup: [ i686-linux, x86_64-linux, x86_64-darwin ]
protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ]
protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ]
protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7835,6 +7965,7 @@ dont-distribute-packages:
pure-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ purescript-iso: [ i686-linux, x86_64-linux, x86_64-darwin ]
purescript-tsd-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
purescript: [ i686-linux, x86_64-linux, x86_64-darwin ]
push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7898,6 +8029,7 @@ dont-distribute-packages:
quickcheck-state-machine-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ]
quickcheck-state-machine: [ i686-linux, x86_64-linux, x86_64-darwin ]
quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ quickcheck-with-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ]
QuickCheckVariant: [ i686-linux, x86_64-linux, x86_64-darwin ]
QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ]
quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7922,6 +8054,7 @@ dont-distribute-packages:
rad: [ i686-linux, x86_64-linux, x86_64-darwin ]
radium-formula-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
radium: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ radix-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
radix: [ i686-linux, x86_64-linux, x86_64-darwin ]
rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
raft: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8113,6 +8246,7 @@ dont-distribute-packages:
reproject: [ i686-linux, x86_64-linux, x86_64-darwin ]
req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ rerebase: [ i686-linux, x86_64-linux, x86_64-darwin ]
reserve: [ i686-linux, x86_64-linux, x86_64-darwin ]
reservoir: [ i686-linux, x86_64-linux, x86_64-darwin ]
resin: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8157,6 +8291,7 @@ dont-distribute-packages:
rfc-servant: [ i686-linux, x86_64-linux, x86_64-darwin ]
rfc3339: [ i686-linux, x86_64-linux, x86_64-darwin ]
rfc: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ rhine-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ]
rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ]
RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ]
ridley-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8326,9 +8461,11 @@ dont-distribute-packages:
scrape-changes: [ i686-linux, x86_64-linux, x86_64-darwin ]
ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ]
script-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ SCRIPTWriter: [ i686-linux, x86_64-linux, x86_64-darwin ]
scrobble: [ i686-linux, x86_64-linux, x86_64-darwin ]
scrz: [ i686-linux, x86_64-linux, x86_64-darwin ]
Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ scythe: [ i686-linux, x86_64-linux, x86_64-darwin ]
scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ]
sde-solver: [ i686-linux, x86_64-linux, x86_64-darwin ]
sdl2-cairo-image: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8405,6 +8542,7 @@ dont-distribute-packages:
servant-generic: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-github: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-hmac-auth: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-iCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-js: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8566,6 +8704,7 @@ dont-distribute-packages:
skeletons: [ i686-linux, x86_64-linux, x86_64-darwin ]
skell: [ i686-linux, x86_64-linux, x86_64-darwin ]
skemmtun: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ skews: [ i686-linux, x86_64-linux, x86_64-darwin ]
skulk: [ i686-linux, x86_64-linux, x86_64-darwin ]
skylark-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8686,6 +8825,7 @@ dont-distribute-packages:
socketson: [ i686-linux, x86_64-linux, x86_64-darwin ]
sodium: [ i686-linux, x86_64-linux, x86_64-darwin ]
soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ softfloat-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
solga-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ]
solga: [ i686-linux, x86_64-linux, x86_64-darwin ]
solr: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8779,6 +8919,7 @@ dont-distribute-packages:
stack-network: [ i686-linux, x86_64-linux, x86_64-darwin ]
stack-run-auto: [ i686-linux, x86_64-linux, x86_64-darwin ]
stack-run: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ stack2nix: [ i686-linux, x86_64-linux, x86_64-darwin ]
stackage-build-plan: [ i686-linux, x86_64-linux, x86_64-darwin ]
stackage-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
stackage-cli: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8854,6 +8995,7 @@ dont-distribute-packages:
streaming-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ]
streaming-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ]
streaming-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ streaming-fft: [ i686-linux, x86_64-linux, x86_64-darwin ]
streaming-osm: [ i686-linux, x86_64-linux, x86_64-darwin ]
streaming-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ]
streaming-png: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8895,6 +9037,7 @@ dont-distribute-packages:
suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ]
SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ]
suitable: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ summoner: [ i686-linux, x86_64-linux, x86_64-darwin ]
sump: [ i686-linux, x86_64-linux, x86_64-darwin ]
sunlight: [ i686-linux, x86_64-linux, x86_64-darwin ]
sunroof-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9054,18 +9197,11 @@ dont-distribute-packages:
temporary-resourcet: [ i686-linux, x86_64-linux, x86_64-darwin ]
tempus: [ i686-linux, x86_64-linux, x86_64-darwin ]
tensor: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-core-ops: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-logging: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-opgen: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-ops: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow-proto: [ i686-linux, x86_64-linux, x86_64-darwin ]
- tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ]
termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ]
termcolor: [ i686-linux, x86_64-linux, x86_64-darwin ]
terminal-text: [ i686-linux, x86_64-linux, x86_64-darwin ]
termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ]
- termonad: [ i686-linux, x86_64-linux, x86_64-darwin ]
termplot: [ i686-linux, x86_64-linux, x86_64-darwin ]
terntup: [ i686-linux, x86_64-linux, x86_64-darwin ]
terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9099,6 +9235,7 @@ dont-distribute-packages:
text-format-heavy: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-icu-normalized: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ text-icu-translit: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-locale-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9150,6 +9287,7 @@ dont-distribute-packages:
thrift: [ i686-linux, x86_64-linux, x86_64-darwin ]
thrist: [ i686-linux, x86_64-linux, x86_64-darwin ]
throttled-io-loop: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ throwable-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ]
thumbnail-plus: [ i686-linux, x86_64-linux, x86_64-darwin ]
tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ]
tickle: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9208,12 +9346,14 @@ dont-distribute-packages:
toilet: [ i686-linux, x86_64-linux, x86_64-darwin ]
tokenify: [ i686-linux, x86_64-linux, x86_64-darwin ]
tokenizer-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tokstyle: [ i686-linux, x86_64-linux, x86_64-darwin ]
toktok: [ i686-linux, x86_64-linux, x86_64-darwin ]
tokyocabinet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
tokyotyrant-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
tomato-rubato-openal: [ i686-linux, x86_64-linux, x86_64-darwin ]
toml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
toml: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tomlcheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
Top: [ i686-linux, x86_64-linux, x86_64-darwin ]
top: [ i686-linux, x86_64-linux, x86_64-darwin ]
topkata: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9233,6 +9373,7 @@ dont-distribute-packages:
traced: [ i686-linux, x86_64-linux, x86_64-darwin ]
tracker: [ i686-linux, x86_64-linux, x86_64-darwin ]
trackit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ traction: [ i686-linux, x86_64-linux, x86_64-darwin ]
tracy: [ i686-linux, x86_64-linux, x86_64-darwin ]
traildb: [ i686-linux, x86_64-linux, x86_64-darwin ]
trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9251,6 +9392,7 @@ dont-distribute-packages:
translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ]
translate-cli: [ i686-linux, x86_64-linux, x86_64-darwin ]
translate: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ trasa-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
trasa-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ]
travis: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9300,6 +9442,7 @@ dont-distribute-packages:
turtle-options: [ i686-linux, x86_64-linux, x86_64-darwin ]
TV: [ i686-linux, x86_64-linux, x86_64-darwin ]
tweak: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ twee: [ i686-linux, x86_64-linux, x86_64-darwin ]
tweet-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
twentefp-eventloop-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ]
twentefp-eventloop-trees: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9364,6 +9507,7 @@ dont-distribute-packages:
types-compat: [ i686-linux, x86_64-linux, x86_64-darwin ]
typesafe-precure: [ i686-linux, x86_64-linux, x86_64-darwin ]
typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ typograffiti: [ i686-linux, x86_64-linux, x86_64-darwin ]
tyro: [ i686-linux, x86_64-linux, x86_64-darwin ]
u2f: [ i686-linux, x86_64-linux, x86_64-darwin ]
uAgda: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9384,6 +9528,7 @@ dont-distribute-packages:
unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ]
unexceptionalio-trans: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ unfix-binders: [ i686-linux, x86_64-linux, x86_64-darwin ]
uni-events: [ i686-linux, x86_64-linux, x86_64-darwin ]
uni-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ]
uni-htk: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9436,6 +9581,7 @@ dont-distribute-packages:
uri-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
uri-parse: [ i686-linux, x86_64-linux, x86_64-darwin ]
uri-template: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ uri: [ i686-linux, x86_64-linux, x86_64-darwin ]
url-decoders: [ i686-linux, x86_64-linux, x86_64-darwin ]
url-generic: [ i686-linux, x86_64-linux, x86_64-darwin ]
URLb: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9443,6 +9589,7 @@ dont-distribute-packages:
urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ]
urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ]
UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ urlpath: [ i686-linux, x86_64-linux, x86_64-darwin ]
URLT: [ i686-linux, x86_64-linux, x86_64-darwin ]
urn-random: [ i686-linux, x86_64-linux, x86_64-darwin ]
urn: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9457,6 +9604,9 @@ dont-distribute-packages:
utf8-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
utf8-validator: [ i686-linux, x86_64-linux, x86_64-darwin ]
UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ util-exception: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ util-primitive-control: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ util-primitive: [ i686-linux, x86_64-linux, x86_64-darwin ]
uu-cco-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
uu-cco-hut-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ]
uu-cco-uu-parsinglib: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9491,6 +9641,7 @@ dont-distribute-packages:
varying: [ i686-linux, x86_64-linux, x86_64-darwin ]
vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
vault-tool: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ vault-trans: [ i686-linux, x86_64-linux, x86_64-darwin ]
vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ]
vcard: [ i686-linux, x86_64-linux, x86_64-darwin ]
vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9506,6 +9657,7 @@ dont-distribute-packages:
vector-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-clock: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ vector-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-functorlazy: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-heterogenous: [ i686-linux, x86_64-linux, x86_64-darwin ]
vector-instances-collections: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9586,6 +9738,7 @@ dont-distribute-packages:
wai-middleware-headers: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-middleware-hmac-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ wai-middleware-prometheus: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-middleware-rollbar: [ 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 ]
@@ -9612,10 +9765,12 @@ dont-distribute-packages:
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 ]
+ weak-bag: [ i686-linux, x86_64-linux, x86_64-darwin ]
weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-css: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-output: [ i686-linux, x86_64-linux, x86_64-darwin ]
web-page: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9670,6 +9825,7 @@ dont-distribute-packages:
winio: [ i686-linux, x86_64-linux, x86_64-darwin ]
wire-streams: [ i686-linux, x86_64-linux, x86_64-darwin ]
wiring: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ wkt-geom: [ i686-linux, x86_64-linux, x86_64-darwin ]
wkt: [ i686-linux, x86_64-linux, x86_64-darwin ]
wl-pprint-ansiterm: [ i686-linux, x86_64-linux, x86_64-darwin ]
WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9698,9 +9854,11 @@ dont-distribute-packages:
wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ]
wreq-sb: [ i686-linux, x86_64-linux, x86_64-darwin ]
wright: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ ws: [ i686-linux, x86_64-linux, x86_64-darwin ]
wsdl: [ i686-linux, x86_64-linux, x86_64-darwin ]
wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ]
wsjtx-udp: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ wss-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ]
wtk: [ i686-linux, x86_64-linux, x86_64-darwin ]
wumpus-basic: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9807,6 +9965,7 @@ dont-distribute-packages:
yahoo-web-search: [ i686-linux, x86_64-linux, x86_64-darwin ]
yajl-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ]
yajl: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yak: [ i686-linux, x86_64-linux, x86_64-darwin ]
yam-servant: [ i686-linux, x86_64-linux, x86_64-darwin ]
yam-transaction-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ]
yam-web: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9948,6 +10107,7 @@ dont-distribute-packages:
zeromq4-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
zeromq4-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
zeromq4-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zeromq4-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
zeroth: [ i686-linux, x86_64-linux, x86_64-darwin ]
ZFS: [ i686-linux, x86_64-linux, x86_64-darwin ]
zifter-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index cf53f9e2b51..590f7f0d971 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -131,8 +131,16 @@ self: super: builtins.intersectAttrs super {
x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
then let inherit (pkgs.darwin) security_tool;
in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
+ # darwin.security_tool is broken in Mojave (#45042)
+
+ # We will use the system provided security for now.
+ # Beware this WILL break in sandboxes!
+
+ # TODO(matthewbauer): If someone really needs this to work in sandboxes,
+ # I think we can add a propagatedImpureHost dep here, but I’m hoping to
+ # get a proper fix available soonish.
postPatch = (drv.postPatch or "") + ''
- substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security
+ substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
'';
})
else super.x509-system;
@@ -314,9 +322,6 @@ self: super: builtins.intersectAttrs super {
# https://github.com/bos/pcap/issues/5
pcap = addExtraLibrary super.pcap pkgs.libpcap;
- # https://github.com/snoyberg/yaml/issues/106
- yaml = disableCabalFlag super.yaml "system-libyaml";
-
# The cabal files for these libraries do not list the required system dependencies.
miniball = overrideCabal super.miniball (drv: {
librarySystemDepends = [ pkgs.miniball ];
@@ -510,4 +515,36 @@ self: super: builtins.intersectAttrs super {
LDAP = dontCheck (overrideCabal super.LDAP (drv: {
librarySystemDepends = drv.librarySystemDepends or [] ++ [ pkgs.cyrus_sasl.dev ];
}));
+
+ # Doctests hang only when compiling with nix.
+ # https://github.com/cdepillabout/termonad/issues/15
+ termonad = dontCheck super.termonad;
+
+ # Expects z3 to be on path so we replace it with a hard
+ sbv = overrideCabal super.sbv (drv: {
+ postPatch = ''
+ sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs'';
+ });
+
+ # The test-suite requires a running PostgreSQL server.
+ Frames-beam = dontCheck super.Frames-beam;
+
+ futhark = with pkgs;
+ let path = stdenv.lib.makeBinPath [ gcc ];
+ in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: {
+ postInstall = ''
+ wrapProgram $out/bin/futhark-c \
+ --prefix PATH : "${path}"
+
+ wrapProgram $out/bin/futhark-opencl \
+ --prefix PATH : "${path}" \
+ --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \
+ --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \
+ --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib"
+ '';
+ });
+
+ # The test suite has undeclared dependencies on git.
+ githash = dontCheck super.githash;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix
index dfc93686405..43a3b82923b 100644
--- a/pkgs/development/haskell-modules/configuration-tensorflow.nix
+++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix
@@ -55,13 +55,29 @@ in
tensorflow-logging = super.tensorflow-logging.override {
inherit proto-lens;
};
- tensorflow-mnist = super.tensorflow-mnist.override {
+ tensorflow-mnist = overrideCabal (super.tensorflow-mnist.override {
inherit proto-lens;
- };
+ # https://github.com/tensorflow/haskell/issues/215
+ tensorflow-mnist-input-data = self.tensorflow-mnist-input-data;
+ }) (_drv: { broken = false; });
tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage (
{ mkDerivation, base, bytestring, Cabal, cryptonite, directory
, filepath, HTTP, network-uri, stdenv
}:
+
+ let
+ fileInfos = {
+ "train-images-idx3-ubyte.gz" = "440fcabf73cc546fa21475e81ea370265605f56be210a4024d2ca8f203523609";
+ "train-labels-idx1-ubyte.gz" = "3552534a0a558bbed6aed32b30c495cca23d567ec52cac8be1a0730e8010255c";
+ "t10k-images-idx3-ubyte.gz" = "8d422c7b0a1c1c79245a5bcf07fe86e33eeafee792b84584aec276f5a2dbc4e6";
+ "t10k-labels-idx1-ubyte.gz" = "f7ae60f92e00ec6debd23a6088c31dbd2371eca3ffa0defaefb259924204aec6";
+ };
+ downloads = with pkgs.lib; flip mapAttrsToList fileInfos (name: sha256:
+ pkgs.fetchurl {
+ url = "http://yann.lecun.com/exdb/mnist/${name}";
+ inherit sha256;
+ });
+ in
mkDerivation {
pname = "tensorflow-mnist-input-data";
version = "0.1.0.0";
@@ -71,6 +87,9 @@ in
base bytestring Cabal cryptonite directory filepath HTTP
network-uri
];
+ preConfigure = pkgs.lib.strings.concatStringsSep "\n" (
+ map (x: "ln -s ${x} data/$(stripHash ${x})") downloads
+ );
libraryHaskellDepends = [ base ];
homepage = "https://github.com/tensorflow/haskell#readme";
description = "Downloader of input data for training MNIST";
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index b8943a55394..a4f0399cf3c 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -4,6 +4,7 @@
, packageSetConfig ? (self: super: {})
, overrides ? (self: super: {})
, initialPackages ? import ./initial-packages.nix
+, nonHackagePackages ? import ./non-hackage-packages.nix
, configurationCommon ? import ./configuration-common.nix
, configurationNix ? import ./configuration-nix.nix
}:
@@ -26,7 +27,9 @@ let
(extends packageSetConfig
(extends compilerConfig
(extends commonConfiguration
- (extends nixConfiguration haskellPackages)))));
+ (extends nixConfiguration
+ (extends nonHackagePackages
+ haskellPackages))))));
in
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index be104a82fd7..8f230c92aaa 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
{ stdenv, buildPackages, buildHaskellPackages, ghc
-, jailbreak-cabal, hscolour, cpphs, nodejs
+, jailbreak-cabal, hscolour, cpphs, nodejs, shellFor
}:
let
@@ -26,7 +26,7 @@ in
, editedCabalFile ? null
, enableLibraryProfiling ? true
, enableExecutableProfiling ? false
-, profilingDetail ? "all-functions"
+, profilingDetail ? "exported-functions"
# TODO enable shared libs for cross-compiling
, enableSharedExecutables ? false
, enableSharedLibraries ? (ghc.enableShared or false)
@@ -48,7 +48,9 @@ in
# We cannot enable -j parallelism for libraries because GHC is far more
# likely to generate a non-determistic library ID in that case. Further
# details are at .
-, enableParallelBuilding ? (stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version
+#
+# Currently disabled for aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449.
+, enableParallelBuilding ? ((stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version) && !(stdenv.buildPlatform.isAarch64)
, maintainers ? []
, doCoverage ? false
, doHaddock ? !(ghc.isHaLVM or false)
@@ -135,7 +137,7 @@ let
buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
defaultConfigureFlags = [
- "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
+ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname"
(optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
(optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
"--with-gcc=$CC" # Clang won't work without that extra information.
@@ -153,6 +155,7 @@ let
(optionalString (versionOlder "8.4" ghc.version) (enableFeature enableStaticLibraries "static"))
(optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
(optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
+ (enableFeature doBenchmark "benchmarks")
"--enable-library-vanilla" # TODO: Should this be configurable?
"--enable-library-for-ghci" # TODO: Should this be configurable?
] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
@@ -173,8 +176,7 @@ let
(optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded")
];
- isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env);
- isSystemPkg = x: !isHaskellPkg x;
+ isHaskellPkg = x: x ? isHaskellLibrary;
allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
@@ -191,20 +193,15 @@ let
optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testFrameworkDepends) ++
optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkFrameworkDepends);
- allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
- haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
- systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs;
-
- # When not cross compiling, also include Setup.hs dependencies.
- ghcEnv = ghc.withPackages (p:
- haskellBuildInputs ++ stdenv.lib.optional (!isCross) setupHaskellDepends);
+ allBuildInputs = propagatedBuildInputs ++ otherBuildInputs ++ depsBuildBuild ++ nativeBuildInputs;
+ isHaskellPartition =
+ stdenv.lib.partition isHaskellPkg allBuildInputs;
setupCommand = "./Setup";
ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
- ghcCommandCaps= toUpper ghcCommand';
nativeGhcCommand = "${nativeGhc.targetPrefix}ghc";
@@ -214,8 +211,7 @@ let
continue
fi
'';
-
-in
+in stdenv.lib.fix (drv:
assert allPkgconfigDepends != [] -> pkgconfig != null;
@@ -428,6 +424,13 @@ stdenv.mkDerivation ({
compiler = ghc;
+
+ getBuildInputs = {
+ inherit propagatedBuildInputs otherBuildInputs allPkgconfigDepends;
+ haskellBuildInputs = isHaskellPartition.right;
+ systemBuildInputs = isHaskellPartition.wrong;
+ };
+
isHaskellLibrary = isLibrary;
# TODO: ask why the split outputs are configurable at all?
@@ -438,23 +441,10 @@ stdenv.mkDerivation ({
# TODO: fetch the self from the fixpoint instead
haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null;
- env = stdenv.mkDerivation {
- name = "interactive-${pname}-${version}-environment";
- buildInputs = systemBuildInputs;
- nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs;
- LANG = "en_US.UTF-8";
- LOCALE_ARCHIVE = optionalString (stdenv.hostPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
- shellHook = ''
- export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
- export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
- # TODO: is this still valid?
- export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html"
- ${if isHaLVM
- then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"''
- else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"''}
- ${shellHook}
- '';
+ env = shellFor {
+ packages = p: [ drv ];
};
+
};
meta = { inherit homepage license platforms; }
@@ -488,3 +478,4 @@ stdenv.mkDerivation ({
// optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; }
// optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
)
+)
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c1fb70ee2e6..bb6e6da1e0c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -139,6 +139,8 @@ self: {
pname = "AC-HalfInteger";
version = "1.2.1";
sha256 = "0wwnb7a6dmzgh122qg322mi3vpyk93xw52cql6dx18sqdbxyxdbb";
+ revision = "1";
+ editedCabalFile = "02k1fg86iyzbb0bxfn8r6s7z8bkahr8y02wps1l5j958jpckd6c9";
libraryHaskellDepends = [ base ];
description = "Efficient half-integer type";
license = stdenv.lib.licenses.bsd3;
@@ -151,6 +153,8 @@ self: {
pname = "AC-MiniTest";
version = "1.1.1";
sha256 = "0ish59q50npljgmfrcffcyx6scf99xdncmy1kpwy1i5622r1kcps";
+ revision = "1";
+ editedCabalFile = "0faw83njfarccnad1hgy1cf3wmihfghk3qhw2s7zf6p84v6zc27y";
libraryHaskellDepends = [ base transformers ];
description = "A simple test framework";
license = stdenv.lib.licenses.bsd3;
@@ -185,6 +189,8 @@ self: {
pname = "AC-Terminal";
version = "1.0";
sha256 = "0d0vdqf7i49d2hsdm7x9ad88l7kfc1wvkzppzhs8k9xf4gbrvl43";
+ revision = "1";
+ editedCabalFile = "1i9bjryhccdp8gfm9xs5bbfsy32hpyv2zckd95m7g6bc4jvp8cjm";
libraryHaskellDepends = [ ansi-terminal base ];
description = "Trivial wrapper over ansi-terminal";
license = stdenv.lib.licenses.bsd3;
@@ -209,6 +215,8 @@ self: {
pname = "AC-Vector";
version = "2.3.2";
sha256 = "04ahf6ldfhvzbml9xd6yplygn8ih7b8zz7cw03hkr053g5kzylay";
+ revision = "1";
+ editedCabalFile = "05l4sk0lz9iml7282zh9pxqr538s6kjhhl6zrbdwlry21sn14pc0";
libraryHaskellDepends = [ base ];
description = "Efficient geometric vectors and transformations";
license = stdenv.lib.licenses.bsd3;
@@ -758,6 +766,50 @@ self: {
maintainers = with stdenv.lib.maintainers; [ abbradar ];
}) {inherit (pkgs) emacs;};
+ "Agda_2_5_4_2" = callPackage
+ ({ mkDerivation, alex, array, async, base, binary, blaze-html
+ , boxes, bytestring, Cabal, containers, data-hash, deepseq
+ , directory, EdisonCore, edit-distance, emacs, equivalence
+ , filemanip, filepath, geniplate-mirror, gitrev, happy, hashable
+ , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
+ , regex-tdfa, stm, strict, template-haskell, text, time
+ , transformers, unordered-containers, uri-encode, zlib
+ }:
+ mkDerivation {
+ pname = "Agda";
+ version = "2.5.4.2";
+ sha256 = "07wvawpfjhx3gw2w53v27ncv1bl0kkx08wkm6wzxldbslkcasign";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal filemanip filepath process ];
+ libraryHaskellDepends = [
+ array async base binary blaze-html boxes bytestring containers
+ data-hash deepseq directory EdisonCore edit-distance equivalence
+ filepath geniplate-mirror gitrev hashable hashtables haskeline
+ ieee754 mtl murmur-hash pretty process regex-tdfa stm strict
+ template-haskell text time transformers unordered-containers
+ uri-encode zlib
+ ];
+ libraryToolDepends = [ alex happy ];
+ executableHaskellDepends = [ base directory filepath process ];
+ executableToolDepends = [ emacs ];
+ postInstall = ''
+ files=("$data/share/ghc-"*"/"*"-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
+ '';
+ 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 {
@@ -2469,6 +2521,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "Cabal_2_4_0_1" = callPackage
+ ({ mkDerivation, array, base, base-compat, base-orphans, binary
+ , bytestring, containers, deepseq, Diff, directory, filepath
+ , integer-logarithms, mtl, optparse-applicative, parsec, pretty
+ , process, QuickCheck, tagged, tar, tasty, tasty-golden
+ , tasty-hunit, tasty-quickcheck, temporary, text, time
+ , transformers, tree-diff, unix
+ }:
+ mkDerivation {
+ pname = "Cabal";
+ version = "2.4.0.1";
+ sha256 = "161l9lgayzpb3wrp9bcp8k0a3rq5dpyiyrxjb87dhximi2mc16rv";
+ setupHaskellDepends = [ mtl parsec ];
+ libraryHaskellDepends = [
+ array base binary bytestring containers deepseq directory filepath
+ mtl parsec pretty process text time transformers unix
+ ];
+ testHaskellDepends = [
+ array base base-compat base-orphans bytestring containers deepseq
+ Diff directory filepath integer-logarithms optparse-applicative
+ pretty process QuickCheck tagged tar tasty tasty-golden tasty-hunit
+ tasty-quickcheck temporary text tree-diff
+ ];
+ doCheck = false;
+ description = "A framework for packaging Haskell software";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Cabal-ide-backend" = callPackage
({ mkDerivation, array, base, binary, bytestring, Cabal, containers
, deepseq, directory, extensible-exceptions, filepath, HUnit
@@ -2729,8 +2810,8 @@ self: {
}:
mkDerivation {
pname = "ChasingBottoms";
- version = "1.3.1.4";
- sha256 = "06cynx6hcbfpky7qq3b3mjjgwbnaxkwin3znbwq4b9ikiw0ng633";
+ version = "1.3.1.5";
+ sha256 = "0hfk2cb9da5fvr96x8lzij93yl3rvax2id9a8gihd5j5aq4kxx30";
libraryHaskellDepends = [
base containers mtl QuickCheck random syb
];
@@ -3478,6 +3559,36 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "DBFunctor" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, cereal, containers
+ , deepseq, either, MissingH, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "DBFunctor";
+ version = "0.1.0.0";
+ sha256 = "0add2hbk8jz8pmmk1in7z3rc4r7xgks0b5xqz113lzf4abnpiac7";
+ revision = "1";
+ editedCabalFile = "1gfadkmnf1c151kkcq41ca2vx36drp2kfhq74ybhvdz32kbrvwq3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring cassava cereal containers deepseq either MissingH
+ text transformers unordered-containers vector
+ ];
+ executableHaskellDepends = [
+ base bytestring cassava cereal containers deepseq either MissingH
+ text transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base bytestring cassava cereal containers deepseq either MissingH
+ text transformers unordered-containers vector
+ ];
+ description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"DBlimited" = callPackage
({ mkDerivation, base, containers, parsec }:
mkDerivation {
@@ -4969,10 +5080,8 @@ self: {
}:
mkDerivation {
pname = "Euterpea";
- version = "2.0.5";
- sha256 = "186r8a2829sqx4l6n80vifc7g8b5ap66jl3hnqdwzg7s2c0r9saq";
- revision = "1";
- editedCabalFile = "1fy3f610i8nwfipfm1dxgb8807k1vix9d65rgn59k579390xfvw8";
+ version = "2.0.6";
+ sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw";
libraryHaskellDepends = [
array arrows base bytestring containers deepseq ghc-prim HCodecs
heap PortMidi random stm
@@ -5391,28 +5500,18 @@ self: {
}) {};
"Fin" = callPackage
- ({ mkDerivation, base, natural-induction, peano }:
- mkDerivation {
- pname = "Fin";
- version = "0.2.3.0";
- sha256 = "1cjsp6i1ak2icjmg0xrprn2xminz35mxb4dj1nsvjvs2qqgjvl1g";
- libraryHaskellDepends = [ base natural-induction peano ];
- description = "Finite totally-ordered sets";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "Fin_0_2_5_0" = callPackage
- ({ mkDerivation, alg, base, foldable1, natural-induction, peano }:
+ ({ mkDerivation, alg, base, foldable1, natural-induction, peano
+ , universe-base
+ }:
mkDerivation {
pname = "Fin";
- version = "0.2.5.0";
- sha256 = "0jh64an111k7a3limqc03irk914s8asy6h4iik7layw4pagpsiyc";
+ version = "0.2.6.0";
+ sha256 = "18qc3ih3l9zd13knxxsh657iq3c742pfaz4i45bq1ir60qwjqmhw";
libraryHaskellDepends = [
- alg base foldable1 natural-induction peano
+ alg base foldable1 natural-induction peano universe-base
];
description = "Finite totally-ordered sets";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Finance-Quote-Yahoo" = callPackage
@@ -5555,8 +5654,8 @@ self: {
}:
mkDerivation {
pname = "FontyFruity";
- version = "0.5.3.3";
- sha256 = "0p02w0v93y11f7rzsc1im2rvld6h0pgrhmd827ypzamibry6xl5h";
+ version = "0.5.3.4";
+ sha256 = "0gavpjv83vg5q2x254d3zi3kw5aprl6z8ifcn0vs6hymaj0qgls3";
libraryHaskellDepends = [
base binary bytestring containers deepseq directory filepath text
vector xml
@@ -5768,27 +5867,30 @@ self: {
}) {};
"Frames" = callPackage
- ({ mkDerivation, base, contravariant, criterion, deepseq, directory
- , discrimination, ghc-prim, hashable, hspec, htoml, HUnit, pipes
- , pipes-bytestring, pipes-group, pipes-parse, pipes-safe
- , pipes-text, pretty, primitive, readable, regex-applicative
- , template-haskell, temporary, text, transformers
- , unordered-containers, vector, vinyl
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , contravariant, criterion, deepseq, directory, discrimination
+ , foldl, ghc-prim, hashable, hspec, htoml, HUnit, lens, pipes
+ , pipes-bytestring, pipes-group, pipes-parse, pipes-safe, pretty
+ , primitive, readable, regex-applicative, template-haskell
+ , temporary, text, transformers, unordered-containers, vector
+ , vector-th-unbox, vinyl
}:
mkDerivation {
pname = "Frames";
- version = "0.4.0";
- sha256 = "06yh8vl3s5543nxhndjd2wsbclka4in4nsbjqzbpcg9g8s8x3z20";
+ version = "0.6.0";
+ sha256 = "0ri1x80za9gjcv44xk9kgx5w5jczr2p26jlpwhmn1sgmjdyc2m02";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base contravariant deepseq discrimination ghc-prim hashable pipes
- pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text
- primitive readable template-haskell text transformers vector vinyl
+ base bytestring containers contravariant deepseq discrimination
+ ghc-prim hashable pipes pipes-bytestring pipes-group pipes-parse
+ pipes-safe primitive readable template-haskell text transformers
+ vector vector-th-unbox vinyl
];
testHaskellDepends = [
- base directory hspec htoml HUnit pipes pretty regex-applicative
- template-haskell temporary text unordered-containers vinyl
+ attoparsec base directory foldl hspec htoml HUnit lens pipes pretty
+ regex-applicative template-haskell temporary text
+ unordered-containers vinyl
];
benchmarkHaskellDepends = [ base criterion pipes transformers ];
description = "Data frames For working with tabular data files";
@@ -5804,8 +5906,8 @@ self: {
}:
mkDerivation {
pname = "Frames-beam";
- version = "0.1.0.1";
- sha256 = "12n3pyr88ihgkfwynhvjx3m9fr1fbznpkgx9ihf7mqar9d8wnywj";
+ version = "0.2.0.0";
+ sha256 = "1fzd41zwx5zmbysk49z2r9ga11z8c0vqqfvb4zgbcm3ivhkn48yi";
libraryHaskellDepends = [
base beam-core beam-migrate beam-postgres bytestring conduit Frames
generics-sop monad-control postgresql-simple process scientific
@@ -5817,6 +5919,25 @@ self: {
];
description = "A library for accessing Postgres tables as in-memory data structures";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "Frames-dsv" = callPackage
+ ({ mkDerivation, base, bytestring, Frames, hspec, hw-dsv, pipes
+ , template-haskell, text, vector, vinyl
+ }:
+ mkDerivation {
+ pname = "Frames-dsv";
+ version = "0.1.1";
+ sha256 = "0932k8aqn9c08ijbs29g04gcka441gg424g90cqd4ky9b3yxzm7w";
+ libraryHaskellDepends = [
+ base bytestring Frames hw-dsv pipes template-haskell text vector
+ vinyl
+ ];
+ testHaskellDepends = [ base Frames hspec pipes ];
+ description = "Alternative CSV parser for the Frames package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Frank" = callPackage
@@ -6083,8 +6204,8 @@ self: {
}:
mkDerivation {
pname = "GLUtil";
- version = "0.10.1";
- sha256 = "08qsa22xhw4cdhdzc8ixlwjazi9s0n48395g4vf5qwfap9r8rdq3";
+ version = "0.10.2";
+ sha256 = "05x733nk3dbla4y6p7b1nx4pv3b0wm6idhsm7p30z2f968k3hyv9";
libraryHaskellDepends = [
array base bytestring containers directory filepath hpp JuicyPixels
linear OpenGL OpenGLRaw transformers vector
@@ -6546,8 +6667,8 @@ self: {
}:
mkDerivation {
pname = "Glob";
- version = "0.9.2";
- sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg";
+ version = "0.9.3";
+ sha256 = "1s69lk3ic6zlkikhvb78ly9wl3g70a1h1m6ndhsca01pp8z8axrs";
libraryHaskellDepends = [
base containers directory dlist filepath transformers
transformers-compat
@@ -7235,15 +7356,18 @@ self: {
}) {inherit (pkgs) unixODBC;};
"HDBC-postgresql" = callPackage
- ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time
- , parsec, postgresql, time, utf8-string
+ ({ mkDerivation, base, bytestring, Cabal, convertible, HDBC, mtl
+ , old-time, parsec, postgresql, time, utf8-string
}:
mkDerivation {
pname = "HDBC-postgresql";
version = "2.3.2.5";
sha256 = "0l9i7mkdcch7f1ajl0fma7rra3dc0llmlia0iqhqb4k0gcrpy7l8";
+ revision = "1";
+ editedCabalFile = "1myhqsn3kk21pchlwf9s6vxggl59s6vmhmbx2539ad4jvnfy2ijx";
isLibrary = true;
isExecutable = true;
+ setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
base bytestring convertible HDBC mtl old-time parsec time
utf8-string
@@ -8552,6 +8676,8 @@ self: {
pname = "HTTP";
version = "4000.3.12";
sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3";
+ revision = "2";
+ editedCabalFile = "1gw6xzp1n4gsqwnbfr29ds8v4wpk78b2bha8i108dqav97viwm8c";
libraryHaskellDepends = [
array base bytestring mtl network network-uri parsec time
];
@@ -8869,10 +8995,8 @@ self: {
}:
mkDerivation {
pname = "HaXml";
- version = "1.25.4";
- sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p";
- revision = "1";
- editedCabalFile = "1vnil3xdyhr48f0nxcaljbl1k5ibg5g5gghvrhykg447b0jvp922";
+ version = "1.25.5";
+ sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -9842,8 +9966,8 @@ self: {
({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
mkDerivation {
pname = "HsOpenSSL";
- version = "0.11.4.14";
- sha256 = "12blnh5x69wvhw1lx3vk14lm1klhqblgd539ffqnrg2dn9qh4ga4";
+ version = "0.11.4.15";
+ sha256 = "0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base bytestring network time ];
librarySystemDepends = [ openssl ];
@@ -10129,6 +10253,8 @@ self: {
pname = "IORefCAS";
version = "0.2.0.1";
sha256 = "06vfck59x30mqa9h2ljd4r2cx1ks91b9gwcr928brp7filsq9fdb";
+ revision = "1";
+ editedCabalFile = "0s01hpvl0dqb6lszp1s76li1i1k57j1bzhwhfwz552w85pxpv7ib";
libraryHaskellDepends = [ base bits-atomic ghc-prim ];
testHaskellDepends = [
base bits-atomic ghc-prim HUnit QuickCheck time
@@ -10142,8 +10268,8 @@ self: {
({ mkDerivation, base, mtl, QuickCheck, Stream }:
mkDerivation {
pname = "IOSpec";
- version = "0.3";
- sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy";
+ version = "0.3.1";
+ sha256 = "1xfhsj8r2gf9wynsihls255qqwqj8vrjyn56rk60xvm27ya4f1d3";
libraryHaskellDepends = [ base mtl QuickCheck Stream ];
description = "A pure specification of the IO monad";
license = stdenv.lib.licenses.bsd3;
@@ -10155,8 +10281,8 @@ self: {
}:
mkDerivation {
pname = "IPv6Addr";
- version = "1.1.0";
- sha256 = "0f7dckgiv5yq87gb7fd31k0h4adqi6xmdc010rdb6yfgpbk10k29";
+ version = "1.1.1";
+ sha256 = "0l2yfn46xyv0ib30k0kmhw3vl4vfmziqinhbynpi4yrmy6lmj29v";
libraryHaskellDepends = [
aeson attoparsec base iproute network network-info random text
];
@@ -10175,8 +10301,8 @@ self: {
}:
mkDerivation {
pname = "IPv6DB";
- version = "0.3.0";
- sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa";
+ version = "0.3.1";
+ sha256 = "06240z3nbjkf0rgwhvajjw28lckgpsfz5nbzzdqyfzgyg2r4wdcn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -10598,14 +10724,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "JuicyPixels_3_3_1" = callPackage
+ "JuicyPixels_3_3_2" = callPackage
({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
, primitive, transformers, vector, zlib
}:
mkDerivation {
pname = "JuicyPixels";
- version = "3.3.1";
- sha256 = "0k60hc156pj7dj9qqcwi1v3vibfsszccll96fbmn4hrkcqgn1aza";
+ version = "3.3.2";
+ sha256 = "120jlrqwa7i32yddwbyl6iyx99gx1fvrizb5lybj87p4fr7cxj6z";
libraryHaskellDepends = [
base binary bytestring containers deepseq mtl primitive
transformers vector zlib
@@ -10704,8 +10830,8 @@ self: {
pname = "JuicyPixels-scale-dct";
version = "0.1.2";
sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p";
- revision = "1";
- editedCabalFile = "1snx05qpllybd9yvy03p0lpnmimj0m24x1bxa4svxcsiv56yv9w8";
+ revision = "2";
+ editedCabalFile = "0pp67ygrd3m6q8ry5229m1b2rhy401gb74368h09bqc6wa3g7ygv";
libraryHaskellDepends = [
base base-compat carray fft JuicyPixels
];
@@ -10977,6 +11103,7 @@ self: {
];
description = "Library for automated composition and musical learning";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"KyotoCabinet" = callPackage
@@ -11313,8 +11440,8 @@ self: {
}:
mkDerivation {
pname = "Lattices";
- version = "0.0.2";
- sha256 = "0c04nhcsqqja84bnha065k914rplffy7pawxijdnf9zvan3xpswf";
+ version = "0.0.3";
+ sha256 = "08v41np4v4v7dcv5959vvrg0l60xqk5wzi6y1gnm9q1i641r129k";
libraryHaskellDepends = [ array base HaskellForMaths ];
testHaskellDepends = [
array base HaskellForMaths HUnit test-framework
@@ -11787,8 +11914,8 @@ self: {
({ mkDerivation, base, containers, mtl }:
mkDerivation {
pname = "MASMGen";
- version = "0.5.0.0";
- sha256 = "1fdskc92m5bv5m19irhv3b8mr4wyzv1xnwaxgnd3ynmjgrrb127c";
+ version = "0.7.0.0";
+ sha256 = "0b5vscpdf252gqi7qpsz9ia4101iik3bgrcdawz1mlinlv1zaccv";
libraryHaskellDepends = [ base containers mtl ];
testHaskellDepends = [ base containers mtl ];
description = "Generate MASM code from haskell";
@@ -12205,7 +12332,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "MissingH" = callPackage
+ "MissingH_1_4_0_1" = callPackage
({ mkDerivation, array, base, containers, directory
, errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
, old-locale, old-time, parsec, process, QuickCheck, random
@@ -12228,6 +12355,30 @@ self: {
];
description = "Large utility library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "MissingH" = callPackage
+ ({ mkDerivation, array, base, containers, directory
+ , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
+ , old-locale, old-time, parsec, process, QuickCheck, random
+ , regex-compat, testpack, time, unix
+ }:
+ mkDerivation {
+ pname = "MissingH";
+ version = "1.4.1.0";
+ sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29";
+ libraryHaskellDepends = [
+ array base containers directory filepath hslogger HUnit mtl network
+ old-locale old-time parsec process random regex-compat time unix
+ ];
+ testHaskellDepends = [
+ array base containers directory errorcall-eq-instance filepath
+ hslogger HUnit mtl network old-locale old-time parsec process
+ QuickCheck random regex-compat testpack time unix
+ ];
+ description = "Large utility library";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"MissingK" = callPackage
@@ -12672,8 +12823,8 @@ self: {
}:
mkDerivation {
pname = "MusicBrainz";
- version = "0.4";
- sha256 = "0aanc1c43di5wq9c2w0b5lw3p24cwpaksgxy79lqm8qxj8qd3jxr";
+ version = "0.4.1";
+ sha256 = "0mydq3bjf15ksfrh4lf947ka43i3978q58y2aij3aqd763v2jb16";
libraryHaskellDepends = [
aeson base bytestring conduit conduit-extra HTTP http-conduit
http-types monad-control resourcet text time time-locale-compat
@@ -12838,8 +12989,10 @@ self: {
({ mkDerivation, base, containers, random }:
mkDerivation {
pname = "NameGenerator";
- version = "0.0.1";
- sha256 = "1zzc944xdfxlqld6fnn6fiqrd9rs2cdzqv5jc8jx7azbvspq6y9f";
+ version = "0.0.2";
+ sha256 = "1rnn3i9rvb9z7iqd0hx730gv3n5hc1gbsdqsa0hlq3qxffg3sr8x";
+ revision = "1";
+ editedCabalFile = "01ma6068mnwn9f7jpa5g8kkl7lyhl5wnpw9ad44zz9gki1mrw37i";
libraryHaskellDepends = [ base containers random ];
description = "A name generator written in Haskell";
license = stdenv.lib.licenses.gpl3;
@@ -13089,8 +13242,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "NoTrace";
- version = "0.3.0.2";
- sha256 = "0nqjjhfycvalva0l660cxgqj793kcsyb75rd3dlp58d2i947isir";
+ version = "0.3.0.3";
+ sha256 = "0cdva0d5xp0fw4jfwmhaz8m4pm1d00wazg32hcqjli4blc9s1hvf";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Remove all the functions come from Debug.Trace after debugging";
@@ -13395,6 +13548,8 @@ self: {
pname = "OTP";
version = "0.1.0.0";
sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
+ revision = "1";
+ editedCabalFile = "1bcp6mixf0yxn6qmql3zhyshpa55mkrfnxdb1ma6gvbs7h28lnin";
libraryHaskellDepends = [
base bytestring cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
time
@@ -13550,6 +13705,8 @@ self: {
pname = "OneTuple";
version = "0.2.2";
sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq";
+ revision = "1";
+ editedCabalFile = "07jd23glblzmnlw7sn565sk9gm7vj9h459j46bkbcrrxnp0n0myq";
libraryHaskellDepends = [ base ];
description = "Singleton Tuple";
license = stdenv.lib.licenses.bsd3;
@@ -13871,6 +14028,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "Oslo-Vectize" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "Oslo-Vectize";
+ version = "0.2";
+ sha256 = "05lgpaw6glwflczsa3400fhih717ry4sikhs9ypyd7xlqvraad57";
+ revision = "2";
+ editedCabalFile = "0axdqcpl3rl9lh9rvd5cn4llvglca8y82p1l3rvka97b33lfj8ky";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base ];
+ description = "spam";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"PArrows" = callPackage
({ mkDerivation, base, containers, ghc-prim, mtl }:
mkDerivation {
@@ -14348,8 +14521,8 @@ self: {
}:
mkDerivation {
pname = "Persistence";
- version = "1.1.3";
- sha256 = "1v3agyf5dw7dckn3c8lww135dqyyrgb6mws4sy51lqm8zbqdnqb3";
+ version = "1.1.4.2";
+ sha256 = "0lvzzcmsmpmsj63ysf3ad6a2v14cf61daz767fxkcf7b7cl50cjp";
libraryHaskellDepends = [
base containers maximal-cliques parallel vector
];
@@ -14549,12 +14722,12 @@ self: {
}) {};
"Prelude" = callPackage
- ({ mkDerivation, base-noprelude }:
+ ({ mkDerivation, base }:
mkDerivation {
pname = "Prelude";
- version = "0.1.0.0";
- sha256 = "0wcacpbqphb635pblqzbv44fhjwdnv0l90zr5i6c8x7mymqpcixj";
- libraryHaskellDepends = [ base-noprelude ];
+ version = "0.1.0.1";
+ sha256 = "14p4jkhzdh618r7gvj6dd4w1zj4b032g4nx43bihnnaf2dqyppy6";
+ libraryHaskellDepends = [ base ];
description = "A Prelude module replacement";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -14936,6 +15109,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "QuickCheck_2_12_6_1" = callPackage
+ ({ mkDerivation, base, containers, deepseq, erf, process, random
+ , template-haskell, tf-random, transformers
+ }:
+ mkDerivation {
+ pname = "QuickCheck";
+ version = "2.12.6.1";
+ sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb";
+ libraryHaskellDepends = [
+ base containers deepseq erf random template-haskell tf-random
+ transformers
+ ];
+ testHaskellDepends = [ base deepseq process ];
+ description = "Automatic testing of Haskell programs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"QuickCheck-GenT" = callPackage
({ mkDerivation, base, mtl, QuickCheck, random }:
mkDerivation {
@@ -14948,12 +15139,12 @@ self: {
}) {};
"QuickCheck-safe" = callPackage
- ({ mkDerivation, base, QuickCheck }:
+ ({ mkDerivation, base, containers, QuickCheck }:
mkDerivation {
pname = "QuickCheck-safe";
- version = "0.1.0.4";
- sha256 = "0ixizi0cshqqczm86rnibas8zygf8i29l3i0jivvb81zi89rscl7";
- libraryHaskellDepends = [ base QuickCheck ];
+ version = "0.1.0.5";
+ sha256 = "0l8wp2np4mlbybzwcz8g4r9d8c65yljnvizs3g1rvig4b65j283l";
+ libraryHaskellDepends = [ base containers QuickCheck ];
description = "Safe reimplementation of QuickCheck's core";
license = stdenv.lib.licenses.mit;
}) {};
@@ -14980,6 +15171,8 @@ self: {
pname = "QuickPlot";
version = "0.1.0.1";
sha256 = "1d9zllxl8vyjmb9m9kdgrv9v9hwnspyiqhjnb5ds5kmby6r4r1h2";
+ revision = "1";
+ editedCabalFile = "0ykvkbrf5mavrk9jdl5w01dldwi3x2dwg89hiin95vi8ay0r02gq";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -15293,8 +15486,8 @@ self: {
}:
mkDerivation {
pname = "Raincat";
- version = "1.2";
- sha256 = "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk";
+ version = "1.2.1";
+ sha256 = "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -15430,6 +15623,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "Rasterific_0_7_4_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+ , free, JuicyPixels, mtl, primitive, transformers, vector
+ , vector-algorithms
+ }:
+ mkDerivation {
+ pname = "Rasterific";
+ version = "0.7.4.1";
+ sha256 = "1d0j7xf2xbgrlny30qwm52wby51ic2cqlhb867a7a03k02p7ib2b";
+ revision = "1";
+ editedCabalFile = "1lz8b9xcfcv0a762zvaksh7c80yryc9yhap198dlm60i0znpjdg2";
+ libraryHaskellDepends = [
+ base bytestring containers dlist FontyFruity free JuicyPixels mtl
+ primitive transformers vector vector-algorithms
+ ];
+ description = "A pure haskell drawing engine";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ReadArgs" = callPackage
({ mkDerivation, base, hspec, system-filepath, text }:
mkDerivation {
@@ -15523,8 +15736,8 @@ self: {
}:
mkDerivation {
pname = "RepLib";
- version = "0.5.4";
- sha256 = "13c34k78fqvr3h1lvsa0kkwk2bv1cv3m27spp4429cafgbi4fr4q";
+ version = "0.5.4.1";
+ sha256 = "064avhz0x77yd5irvvs4sa1fcn8srb3n5sqbd4vmsjva6514jr9y";
libraryHaskellDepends = [
base containers mtl template-haskell transformers
];
@@ -15677,6 +15890,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "SCRIPTWriter" = callPackage
+ ({ mkDerivation, array, base, binary, bitcoin-hs, bitcoin-script
+ , bytestring, containers, mtl, uu-tc
+ }:
+ mkDerivation {
+ pname = "SCRIPTWriter";
+ version = "1.0.1";
+ sha256 = "0sipk7brfw42zq4ksp7gz23ghia9faffshc5zh8j0zb4f1497mwi";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base binary bitcoin-hs bitcoin-script bytestring containers
+ mtl uu-tc
+ ];
+ executableHaskellDepends = [ base ];
+ description = "ESCRIPT: a human friendly language for programming Bitcoin scripts";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"SCalendar" = callPackage
({ mkDerivation, base, containers, hspec, QuickCheck, scalendar
, text, time
@@ -15711,8 +15944,8 @@ self: {
({ mkDerivation, base, Cabal, SDL, SDL_gfx }:
mkDerivation {
pname = "SDL-gfx";
- version = "0.6.2.0";
- sha256 = "1y49wzy71ns7gwczmwvrx8d026y5nabqzvh8ymxxcy3brhay0shr";
+ version = "0.7.0.0";
+ sha256 = "1pmhbgdp4f9nz9mpxckx0mrhphccqsfcwfpflxmph5gx4mxk4xb2";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base SDL ];
@@ -16656,8 +16889,8 @@ self: {
}:
mkDerivation {
pname = "Slides";
- version = "0.1.0.9";
- sha256 = "0jfhbgk1i8gbpi2ka33r23q7336xnf6y4bxfszhs09bhvhsr95ia";
+ version = "0.1.0.10";
+ sha256 = "0w60zffs83d5xmhz0d12aip5xqgih495wfrah25d64f9fh6j4j0i";
libraryHaskellDepends = [
base colour diagrams-lib diagrams-svg file-embed regex-applicative
];
@@ -17193,6 +17426,8 @@ self: {
pname = "Strafunski-StrategyLib";
version = "5.0.1.0";
sha256 = "15d2m7ahb3jwriariaff0yz93mmrhpv579wink9838w9091cf650";
+ revision = "1";
+ editedCabalFile = "1hngxq1f7fybg6ixkdhmvgsw608mhnxkwbw04ql5zspcfl78v6l2";
libraryHaskellDepends = [ base directory mtl syb transformers ];
description = "Library for strategic programming";
license = stdenv.lib.licenses.bsd3;
@@ -17257,15 +17492,15 @@ self: {
}:
mkDerivation {
pname = "StrictCheck";
- version = "0.1.0";
- sha256 = "1psnawzf9ym1gz6i6qi5rpx8sm7idi30wryb2hq39flqjxviqk0z";
+ version = "0.2.0";
+ sha256 = "11gr15c17134fddh3ms9m1z0hjsf8dqhk2z7vvd61gfzzpcx5xms";
libraryHaskellDepends = [
base bifunctors containers generics-sop QuickCheck template-haskell
];
testHaskellDepends = [
base deepseq generics-sop HUnit QuickCheck
];
- description = "StrictCheck: Keep Your Laziness In Check";
+ description = "Keep Your Laziness In Check";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -18072,10 +18307,10 @@ self: {
({ mkDerivation, base, base-orphans }:
mkDerivation {
pname = "TypeCompose";
- version = "0.9.12";
- sha256 = "1qikwd8cq7pywz5j86hwc21ak15a3w5jrhyzmsrr30izr4n2q61s";
- revision = "1";
- editedCabalFile = "0j27xdfim7a6a16v834n3jdp1j7bsr3yn19bnfwni3xsvrc732q3";
+ version = "0.9.13";
+ sha256 = "0cmlldr665mzi0jsb567pn6qbqxr6cyq9ky3mfh1sfls5yhwr5hc";
+ revision = "2";
+ editedCabalFile = "026h1zgp7fj8ccq8rpzcq0s4wdbw2v7fskcj73n40mfhv0gx26y0";
libraryHaskellDepends = [ base base-orphans ];
description = "Type composition classes & instances";
license = stdenv.lib.licenses.bsd3;
@@ -18483,8 +18718,8 @@ self: {
}:
mkDerivation {
pname = "Villefort";
- version = "0.1.2.14";
- sha256 = "0hwlm91dlhbl0g6axpqx3pbr89icaqmrgnnn6lhcwd7sd8rzycbg";
+ version = "0.1.2.17";
+ sha256 = "17ga54kclbcr6vpiy6q5yws9535j9sg6isqggx05kz3hsa7nllbz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -18494,7 +18729,7 @@ self: {
transformers unix uri-encode
];
executableHaskellDepends = [
- base HDBC HDBC-sqlite3 random scotty split text time
+ base HDBC HDBC-sqlite3 mtl random scotty split text time
];
testHaskellDepends = [
base concurrent-extra HDBC HDBC-sqlite3 hspec mtl QuickCheck
@@ -19441,8 +19676,8 @@ self: {
({ mkDerivation, base, deepseq, random }:
mkDerivation {
pname = "Yampa";
- version = "0.11.1";
- sha256 = "0zzhp0h9z9xz7ipiyd6ygnhb6h50dwh268zamx6qdf6zzpywsya1";
+ version = "0.12";
+ sha256 = "077fnazzcv7gckpklmdgk4hz6nnfnims11c1r4dwpnb0z6n31wcg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base deepseq random ];
@@ -19863,8 +20098,8 @@ self: {
}:
mkDerivation {
pname = "accelerate";
- version = "1.2.0.0";
- sha256 = "0y8wx09smrcxkyyklrf4lrilqasbmaw1w1ga9y110bqgywkw4pmj";
+ version = "1.2.0.1";
+ sha256 = "0vglmasqgq0h8fvm9z8l2b3sygqvix8vr6c3n357gkr2mpz6gq8h";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base base-orphans bytestring
@@ -20159,6 +20394,8 @@ self: {
pname = "accelerate-io";
version = "1.2.0.0";
sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf";
+ revision = "2";
+ editedCabalFile = "0w8y40p71c6c7cj49n4kanwmsa53s2nydigiiidqp93yxhw0virq";
libraryHaskellDepends = [
accelerate array base bmp bytestring primitive repa vector
];
@@ -20892,11 +21129,11 @@ self: {
({ mkDerivation, base, hspec }:
mkDerivation {
pname = "acme-smuggler";
- version = "0.1.0.1";
- sha256 = "1ivajii0gji1inc9qmli3ri3kyzcxyw90m469gs7a16kbprcs3kl";
+ version = "1.1.1.0";
+ sha256 = "0w4m213dcn07hxbnmkbrg2xgfdv9hlfz72ax9pcinswc10zwph1q";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
- description = "Smuggle arbitrary values in ()";
+ description = "Smuggle arbitrary values in arbitrary types";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -20918,6 +21155,8 @@ self: {
pname = "acme-stringly-typed";
version = "1.0.0.0";
sha256 = "18wvsvdmbwh9dcawiy4f9pn4vg98kdq9zxc37sz7dpmaigimw16f";
+ revision = "1";
+ editedCabalFile = "0i5hark97zl45iyiijxj07d2pg112kh3jcmjmscpbss5l5n02h23";
libraryHaskellDepends = [ base ];
description = "Stringly Typed Programming";
license = stdenv.lib.licenses.bsd3;
@@ -20989,6 +21228,8 @@ self: {
pname = "acquire";
version = "0.2.0.1";
sha256 = "0l6c3kdvg71z6pfjg71jgaffb403w8y8lixw4dhi7phhhb91phn2";
+ revision = "1";
+ editedCabalFile = "1ihmdh0dpppgshsh7mxdz6bm9kn632xxd3g6nkigpjpfrb372q7z";
libraryHaskellDepends = [ base ];
description = "Abstraction over management of resources";
license = stdenv.lib.licenses.mit;
@@ -21013,8 +21254,8 @@ self: {
pname = "active";
version = "0.2.0.13";
sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx";
- revision = "6";
- editedCabalFile = "0zq9j2hgapb9blvmd9y8kmczizw4a18kksnfqd1py1jzx7hr46n3";
+ revision = "7";
+ editedCabalFile = "0z4l6j1q3y5zq4941bsb6ypkhfg3pyvb5gcmasymh2nj9g952xkd";
libraryHaskellDepends = [
base lens linear semigroupoids semigroups vector
];
@@ -21068,6 +21309,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "activitypub" = callPackage
+ ({ mkDerivation, aeson, base, network-uri, text, time }:
+ mkDerivation {
+ pname = "activitypub";
+ version = "0.1.0.0";
+ sha256 = "1a9x42x0bysia00672qala6q6g5dgdfzwlzk2969c7q9gsxf63y9";
+ libraryHaskellDepends = [ aeson base network-uri text time ];
+ description = "ActivityPub Haskell Library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"activitystreams-aeson" = callPackage
({ mkDerivation, aeson, base, text, time, unordered-containers }:
mkDerivation {
@@ -21429,22 +21681,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "aeson_1_4_0_0" = callPackage
+ "aeson_1_4_1_0" = callPackage
({ mkDerivation, attoparsec, base, base-compat, base-orphans
, base16-bytestring, bytestring, containers, deepseq, directory
, dlist, filepath, generic-deriving, ghc-prim, hashable
- , hashable-time, integer-logarithms, QuickCheck
+ , hashable-time, integer-logarithms, primitive, QuickCheck
, quickcheck-instances, scientific, tagged, tasty, tasty-hunit
, tasty-quickcheck, template-haskell, text, th-abstraction, time
, time-locale-compat, unordered-containers, uuid-types, vector
}:
mkDerivation {
pname = "aeson";
- version = "1.4.0.0";
- sha256 = "042phqkabjrlrl3azr3ba9q7naz4c2cjl5nplbfz8iidpf6j0sli";
+ version = "1.4.1.0";
+ sha256 = "1mf29mxdqkpgbvqx1acbbv75wpzhwpnnf4iapmm5v3zg2k7g3hyi";
+ revision = "1";
+ editedCabalFile = "12zvcm121dc0fpyzm1wr0b9k5lwyca298vgvf192sp2dykxkj9m7";
libraryHaskellDepends = [
attoparsec base base-compat bytestring containers deepseq dlist
- ghc-prim hashable scientific tagged template-haskell text
+ ghc-prim hashable primitive scientific tagged template-haskell text
th-abstraction time time-locale-compat unordered-containers
uuid-types vector
];
@@ -21555,10 +21809,8 @@ self: {
}:
mkDerivation {
pname = "aeson-compat";
- version = "0.3.8";
- sha256 = "0j4v13pgk21zy8hqkbx8hw0n05jdl17qphxz9rj4h333pr547r3i";
- revision = "1";
- editedCabalFile = "0ayf5hkhl63lmlxpl7w5zvnz0lvpxb2rwmf0wbslff0y2s449mbf";
+ version = "0.3.9";
+ sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0";
libraryHaskellDepends = [
aeson attoparsec attoparsec-iso8601 base base-compat bytestring
containers exceptions hashable scientific tagged text time
@@ -21651,8 +21903,8 @@ self: {
pname = "aeson-extra";
version = "0.4.1.1";
sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl";
- revision = "1";
- editedCabalFile = "14blp4jmcd81ipxany6q7x706xj8fhy019a73c391n767r1nwpq1";
+ revision = "2";
+ editedCabalFile = "1iiibpr8pcdr0bjp0rhf1sxvs0kv66jm01nwlhj4243864qx476r";
libraryHaskellDepends = [
aeson aeson-compat attoparsec attoparsec-iso8601 base
base-compat-batteries bytestring containers deepseq exceptions
@@ -21738,17 +21990,6 @@ self: {
}) {};
"aeson-generic-compat" = callPackage
- ({ mkDerivation, aeson, base }:
- mkDerivation {
- pname = "aeson-generic-compat";
- version = "0.0.1.2";
- sha256 = "08h4r8ni7i9x0fqx5gizv6fpwrq84lv8m4c3w6g2hirs0iscw233";
- libraryHaskellDepends = [ aeson base ];
- description = "Compatible generic class names of Aeson";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "aeson-generic-compat_0_0_1_3" = callPackage
({ mkDerivation, aeson, base }:
mkDerivation {
pname = "aeson-generic-compat";
@@ -21757,7 +21998,6 @@ self: {
libraryHaskellDepends = [ aeson base ];
description = "Compatible generic class names of Aeson";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"aeson-injector" = callPackage
@@ -21768,8 +22008,8 @@ self: {
}:
mkDerivation {
pname = "aeson-injector";
- version = "1.1.0.0";
- sha256 = "1dkl7sgzi9hzc86a27wfch7p33sj1h8zh7xsah3fbqjbz4y8z9wf";
+ version = "1.1.1.0";
+ sha256 = "04hg0vdrfb7x6qxwcifsayc6z5vhc1l96ahvswg8q5wddc00ypzp";
libraryHaskellDepends = [
aeson base bifunctors deepseq hashable lens servant-docs swagger2
text unordered-containers
@@ -21851,8 +22091,8 @@ self: {
({ mkDerivation, aeson, base }:
mkDerivation {
pname = "aeson-options";
- version = "0.0.0";
- sha256 = "0z2r1rnh819wms8l1scv18l178i2y1ixcjm6ir59vir5bl19wxm0";
+ version = "0.1.0";
+ sha256 = "0d5wfcgsjrpmangknmrr2lxvr3h96d65y3vkkas6m9aqi1rrkqv4";
libraryHaskellDepends = [ aeson base ];
description = "Options to derive FromJSON/ToJSON instances";
license = stdenv.lib.licenses.mit;
@@ -21987,7 +22227,7 @@ self: {
"aeson-schema" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, containers
- , directory, filepath, ghc-prim, hashable, hint, HUnit, mtl
+ , directory, fail, filepath, ghc-prim, hashable, hint, HUnit, mtl
, QuickCheck, regex-base, regex-compat, regex-pcre, scientific, syb
, template-haskell, temporary, test-framework, test-framework-hunit
, test-framework-quickcheck2, text, th-lift, transformers
@@ -21995,15 +22235,14 @@ self: {
}:
mkDerivation {
pname = "aeson-schema";
- version = "0.4.1.1";
- sha256 = "1idw9bb1miw61vvyacrlnx98rl4p0wx750gnhc4blx4a07i5vs9h";
- revision = "1";
- editedCabalFile = "1rl9hm85r607iwigzg5y1rki8vl7943ws4j1zsz0hq8g3mcb5alf";
+ version = "0.4.1.3";
+ sha256 = "17w0hih9l7x9r14s2mxywjzysm00f6bz6rqsgknvv9injakpscn3";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
- regex-base regex-compat regex-pcre scientific syb template-haskell
- text th-lift transformers unordered-containers vector
+ aeson attoparsec base bytestring containers fail ghc-prim mtl
+ QuickCheck regex-base regex-compat regex-pcre scientific syb
+ template-haskell text th-lift transformers unordered-containers
+ vector
];
testHaskellDepends = [
aeson attoparsec base bytestring containers directory filepath
@@ -22186,16 +22425,17 @@ self: {
"affection" = callPackage
({ mkDerivation, base, bytestring, clock, containers, glib, linear
, monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid
+ , vector
}:
mkDerivation {
pname = "affection";
- version = "0.0.0.7";
- sha256 = "0qnlh1ny4cysxzh45vsh1d49gk4kc2kzpdjrqnn3mh66wz2fc177";
+ version = "0.0.0.9";
+ sha256 = "0knb8j96nn2gh1dbyavcqi6wnn8rfvw0lmmw3vk2mbalxlzfvznr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring clock containers glib linear monad-loops
- monad-parallel mtl OpenGL sdl2 stm text uuid
+ monad-parallel mtl OpenGL sdl2 stm text uuid vector
];
description = "A simple Game Engine using SDL";
license = stdenv.lib.licenses.lgpl3;
@@ -22405,28 +22645,28 @@ self: {
}) {};
"aip" = callPackage
- ({ mkDerivation, base, bytestring, digit, directory, doctest
- , filepath, HTTP, lens, network-uri, papa, parsec, parsers
- , QuickCheck, quickcheck-text, tagsoup, tagsoup-selection
- , template-haskell, transformers
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, checkers
+ , Crypto, directory, exceptions, filepath, HTTP, lens, network-uri
+ , optparse-applicative, parsec, parsers, process, QuickCheck
+ , semigroupoids, semigroups, tagsoup, tagsoup-selection, tasty
+ , tasty-hunit, tasty-quickcheck, time, transformers
+ , unordered-containers, utf8-string
}:
mkDerivation {
pname = "aip";
- version = "0.0.1";
- sha256 = "162mmwniiwlyi3h7d4xxmk2a8pr3ldnl1mx9m9yjpl5vy0926lyd";
+ version = "0.1.1";
+ sha256 = "05pv8m5wjzpj5wxsad6rzka9fcch5aakd73697ndaiwasqajvx3d";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring digit directory filepath HTTP lens network-uri papa
- parsec parsers tagsoup tagsoup-selection transformers
- ];
- executableHaskellDepends = [
- base bytestring digit directory filepath HTTP lens network-uri papa
- parsec parsers tagsoup tagsoup-selection transformers
+ aeson aeson-pretty base bytestring Crypto directory exceptions
+ filepath HTTP lens network-uri optparse-applicative parsec parsers
+ process semigroupoids semigroups tagsoup tagsoup-selection time
+ transformers unordered-containers utf8-string
];
+ executableHaskellDepends = [ base ];
testHaskellDepends = [
- base directory doctest filepath parsec QuickCheck quickcheck-text
- template-haskell
+ base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
];
description = "Aeronautical Information Package (AIP)";
license = stdenv.lib.licenses.bsd3;
@@ -22793,6 +23033,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "alarmclock_0_6_0_2" = callPackage
+ ({ mkDerivation, async, base, clock, hspec, stm, time
+ , unbounded-delays
+ }:
+ mkDerivation {
+ pname = "alarmclock";
+ version = "0.6.0.2";
+ sha256 = "1zhq3sx6x54v7cjzmjvcs7pzqyql3x4vk3b5n4x7xhgxs54xdasc";
+ libraryHaskellDepends = [
+ async base clock stm time unbounded-delays
+ ];
+ testHaskellDepends = [
+ async base clock hspec stm time unbounded-delays
+ ];
+ description = "Wake up and perform an action at a certain time";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"alea" = callPackage
({ mkDerivation, base, optparse-applicative, random, text }:
mkDerivation {
@@ -22893,6 +23152,8 @@ self: {
pname = "alex-tools";
version = "0.4";
sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi";
+ revision = "1";
+ editedCabalFile = "1dwr1w2zhbvwnjc65zzmwfmwb1yxxyyfrjypvqp3m7fpc7dg1nxg";
libraryHaskellDepends = [ base deepseq template-haskell text ];
description = "A set of functions for a common use case of Alex";
license = stdenv.lib.licenses.isc;
@@ -22921,8 +23182,8 @@ self: {
({ mkDerivation, base, util }:
mkDerivation {
pname = "alg";
- version = "0.2.6.0";
- sha256 = "0y0qhhmyjzd8sf6v74066yx41nl1zsnsmk8scjvdym8j8k8mvrpk";
+ version = "0.2.8.0";
+ sha256 = "1zw50da4wz8qdc62qlvg74k3g5n48xlzda2k7c3y9zb8xb2xbfrr";
libraryHaskellDepends = [ base util ];
description = "Algebraic structures";
license = stdenv.lib.licenses.bsd3;
@@ -23033,8 +23294,8 @@ self: {
({ mkDerivation, base, syb, template-haskell }:
mkDerivation {
pname = "algebraic-classes";
- version = "0.9.1";
- sha256 = "129s5690wc4w92sg246pcmnradzgfdddqpv961a53k2cx9ynmvc6";
+ version = "0.9.2";
+ sha256 = "131rd3liqkdp146fyc8b0mcbkn08mib9iljyjj3mp40fs64sy1c9";
libraryHaskellDepends = [ base syb template-haskell ];
description = "Conversions between algebraic classes and F-algebras";
license = stdenv.lib.licenses.bsd3;
@@ -23042,20 +23303,17 @@ self: {
"algebraic-graphs" = callPackage
({ mkDerivation, array, base, base-compat, base-orphans, containers
- , criterion, deepseq, extra, QuickCheck
+ , deepseq, extra, mtl, QuickCheck
}:
mkDerivation {
pname = "algebraic-graphs";
- version = "0.1.1.1";
- sha256 = "0c8jrp0z3ibla7isbn1v5nhfka56hwq8h10r7h3vca53yzbafiw7";
+ version = "0.2";
+ sha256 = "0rfs58z60nn041ymi7lilc7dyijka30l4hhdznfaz9sfzx4f8yl8";
libraryHaskellDepends = [
- array base base-compat containers deepseq
+ array base base-compat containers deepseq mtl
];
testHaskellDepends = [
- base base-compat base-orphans containers extra QuickCheck
- ];
- benchmarkHaskellDepends = [
- base base-compat containers criterion
+ array base base-compat base-orphans containers extra QuickCheck
];
description = "A library for algebraic graph construction and transformation";
license = stdenv.lib.licenses.mit;
@@ -23263,6 +23521,8 @@ self: {
pname = "alphachar";
version = "0.0.3";
sha256 = "1wrd881kwzzfnjkp9ajy1gaxizd17zb60f7sbalwg4n38lk7qvhx";
+ revision = "1";
+ editedCabalFile = "06pnq2fvz02i6dhx2rq1p63jp3pqvxy15n2vs6696ry5mkq1zjkc";
libraryHaskellDepends = [ base lens parsers semigroups ];
testHaskellDepends = [
ansi-wl-pprint base hedgehog lens parsec parsers pretty tasty
@@ -23385,8 +23645,8 @@ self: {
}:
mkDerivation {
pname = "alsa-pcm";
- version = "0.6.1";
- sha256 = "0pafjds9xrhzwv3xz9qcknm9f2plz3bvqqjlznss1alhgf7pcga5";
+ version = "0.6.1.1";
+ sha256 = "1mllr9nbm3qb837zgvd6mrpr6f8i272wflv0a45rrpsq50zgcj33";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -26684,8 +26944,8 @@ self: {
pname = "ansi-pretty";
version = "0.1.2.1";
sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h";
- revision = "5";
- editedCabalFile = "18vg7p8ymwk3kfhvg8cn8vq574x52n8a2c7ihrg4jg1gdsdrn0vi";
+ revision = "6";
+ editedCabalFile = "1j2iyzf61wmwdrb8i3xynins7shjv89y4028sy13rfywsbqpjg4s";
libraryHaskellDepends = [
aeson ansi-wl-pprint array base bytestring containers generics-sop
nats scientific semigroups tagged text time unordered-containers
@@ -26699,8 +26959,8 @@ self: {
({ mkDerivation, base, colour }:
mkDerivation {
pname = "ansi-terminal";
- version = "0.8.0.4";
- sha256 = "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b";
+ version = "0.8.2";
+ sha256 = "147ss9wz03ww6ypbv6yh5vi1wfrfcaqm8r6nxh50vnp7254359wh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base colour ];
@@ -26863,8 +27123,8 @@ self: {
}:
mkDerivation {
pname = "antiope-athena";
- version = "6.0.1";
- sha256 = "0y8a3rs5sy2qv2pwqb6ap6bl64qhp7x0jqqy1q237vfm2w6vrj6v";
+ version = "6.1.1";
+ sha256 = "1scshv7whw3ylp9nq8zgz12rbkvwq6hmcwn04s8h7ygnb9k3zy21";
libraryHaskellDepends = [
amazonka amazonka-athena amazonka-core base lens resourcet text
unliftio-core
@@ -26876,6 +27136,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "antiope-contract" = callPackage
+ ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
+ mkDerivation {
+ pname = "antiope-contract";
+ version = "6.1.1";
+ sha256 = "14nvb786w4cqam3nd3wjfr7m0ysbr07vjm0ivwsxyvda3mwkn7pz";
+ libraryHaskellDepends = [
+ aeson antiope-s3 avro base bytestring text
+ ];
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"antiope-core" = callPackage
({ mkDerivation, amazonka, amazonka-core, base, bytestring
, generic-lens, http-client, lens, monad-logger, mtl, resourcet
@@ -26883,8 +27156,8 @@ self: {
}:
mkDerivation {
pname = "antiope-core";
- version = "6.0.1";
- sha256 = "1h7yd3p5dqkq118xvmp9ifydgak311pfibkpgy3il0qj4gj2g8sa";
+ version = "6.1.1";
+ sha256 = "0vmqyhxwfs45x3cqrlm1nij0cfnw2bk6sq3ldq6vrfpzm892g6py";
libraryHaskellDepends = [
amazonka amazonka-core base bytestring generic-lens http-client
lens monad-logger mtl resourcet transformers unliftio-core
@@ -26904,8 +27177,8 @@ self: {
}:
mkDerivation {
pname = "antiope-dynamodb";
- version = "6.0.1";
- sha256 = "1f8ixkvh7f5dgxl76823f275c3r6f1xmwhx4rfcmd6z90dn8damm";
+ version = "6.1.1";
+ sha256 = "1kjsqka70bnkjzgdi427jqihlnm997ii147nzj8w04w5d6ynm2ly";
libraryHaskellDepends = [
amazonka amazonka-core amazonka-dynamodb antiope-core base
generic-lens lens text unliftio-core unordered-containers
@@ -26925,8 +27198,8 @@ self: {
}:
mkDerivation {
pname = "antiope-messages";
- version = "6.0.1";
- sha256 = "1ib2j0jlcfzq89a4vs7r282hpmqnqg2gw8l1ibfiahl4ac91z7zn";
+ version = "6.1.1";
+ sha256 = "0nklh0wi1y6drpm7i4ssjc8xx4b20knpnghn2yv839ph6w0f0r13";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
base generic-lens lens lens-aeson monad-loops network-uri text
@@ -26942,24 +27215,26 @@ self: {
}) {};
"antiope-s3" = callPackage
- ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
- , bytestring, conduit, conduit-extra, exceptions, generic-lens
- , http-types, lens, monad-logger, network-uri, resourcet, text
+ ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, antiope-core
+ , base, bytestring, conduit, conduit-extra, exceptions
+ , generic-lens, hedgehog, hspec, http-types, hw-hspec-hedgehog
+ , lens, monad-logger, mtl, network-uri, resourcet, text
, unliftio-core
}:
mkDerivation {
pname = "antiope-s3";
- version = "6.0.1";
- sha256 = "1cjvzd47vprn916d1fks6lf08plns326xircfhc69qblkzvqzljs";
+ version = "6.1.1";
+ sha256 = "0aq0qk377wvxm3kgy63zk382rnvjxx8csxj63vnmc5gikz5i2ya7";
libraryHaskellDepends = [
- amazonka amazonka-core amazonka-s3 base bytestring conduit
- conduit-extra exceptions generic-lens http-types lens monad-logger
- network-uri resourcet text unliftio-core
+ amazonka amazonka-core amazonka-s3 antiope-core base bytestring
+ conduit conduit-extra exceptions generic-lens http-types lens
+ monad-logger mtl network-uri resourcet text unliftio-core
];
testHaskellDepends = [
- amazonka amazonka-core amazonka-s3 base bytestring conduit
- conduit-extra exceptions generic-lens http-types lens monad-logger
- network-uri resourcet text unliftio-core
+ amazonka amazonka-core amazonka-s3 antiope-core base bytestring
+ conduit conduit-extra exceptions generic-lens hedgehog hspec
+ http-types hw-hspec-hedgehog lens monad-logger mtl network-uri
+ resourcet text unliftio-core
];
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -26971,8 +27246,8 @@ self: {
}:
mkDerivation {
pname = "antiope-sns";
- version = "6.0.1";
- sha256 = "0hqvh3vzpdr9g6v778qn17nfrqvg8i2lszqgss9fb8290mlm8x01";
+ version = "6.1.1";
+ sha256 = "0jdlm3sl7w5cq2hpikm73763np56g16z48b34wavg9yblrdfvvn7";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-sns base generic-lens lens
text unliftio-core
@@ -26992,8 +27267,8 @@ self: {
}:
mkDerivation {
pname = "antiope-sqs";
- version = "6.0.1";
- sha256 = "0pfhhgc7dkp4dn2k0dxy2pkmbml9js351ab2y2hln5jpsni9qfc0";
+ version = "6.1.1";
+ sha256 = "189wgl3qpmf4amgc571zv88zpdblaqcbcnw93a6lk6i7rzc6h40r";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
antiope-messages antiope-s3 base generic-lens lens lens-aeson
@@ -27085,6 +27360,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "aos-signature" = callPackage
+ ({ mkDerivation, base, bytestring, cryptonite, memory, mtl
+ , protolude, QuickCheck, random, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "aos-signature";
+ version = "0.1.0";
+ sha256 = "1nyizswc7jc6hylb57nsmpqndvqm8mk1wi2fi1l1cqgbkisrxmy5";
+ libraryHaskellDepends = [
+ base bytestring cryptonite memory mtl protolude random
+ ];
+ testHaskellDepends = [
+ base bytestring cryptonite memory mtl protolude QuickCheck random
+ tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "An implementation of the AOS signatures";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"aosd" = callPackage
({ mkDerivation, base, bindings-DSL, cairo, colour
, language-haskell-extract, libaosd, monad-control, pango
@@ -27104,7 +27399,7 @@ self: {
description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {libaosd = null;};
+ }) {inherit (pkgs) libaosd;};
"ap-reflect" = callPackage
({ mkDerivation, base }:
@@ -27149,8 +27444,8 @@ self: {
}:
mkDerivation {
pname = "apart";
- version = "0.1.1";
- sha256 = "1xrmdzaf56gzmrg596kfkp01pvn9m9w2mvz58z3zhx6jda1zvaan";
+ version = "0.1.3";
+ sha256 = "16y5k372kmqsn81bksl9j01nbfhsk0cwriwpfycjsnzgmg8wnkpb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -27168,15 +27463,15 @@ self: {
}) {};
"apecs" = callPackage
- ({ mkDerivation, async, base, containers, criterion, linear, mtl
+ ({ mkDerivation, base, containers, criterion, linear, mtl
, QuickCheck, template-haskell, vector
}:
mkDerivation {
pname = "apecs";
- version = "0.4.1.1";
- sha256 = "0ybw09hpjfjm22bza74n57aarv6nhwf5zi27q7q7a6yf5jpa5ccg";
+ version = "0.6.0.0";
+ sha256 = "03k752lws5whcr2kiiljhfvz9y7xiqp9a1y2hnhgh5sjwckpjyn9";
libraryHaskellDepends = [
- async base containers mtl template-haskell vector
+ base containers mtl template-haskell vector
];
testHaskellDepends = [
base containers criterion linear QuickCheck vector
@@ -27186,6 +27481,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "apecs-physics" = callPackage
+ ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear
+ , template-haskell, vector
+ }:
+ mkDerivation {
+ pname = "apecs-physics";
+ version = "0.2.0.0";
+ sha256 = "17mbf06785mdn8pmy90hw92240zq889rh2dlv1sh45p44grr2h5c";
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [
+ apecs base containers inline-c linear template-haskell vector
+ ];
+ description = "2D physics for apecs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "apecs-physics-gloss" = callPackage
+ ({ mkDerivation, apecs, apecs-physics, base, gloss }:
+ mkDerivation {
+ pname = "apecs-physics-gloss";
+ version = "0.1.0.0";
+ sha256 = "075rpm4l1na7j79vkh7n5c806zj7vvj2qxrxq6pkb6k6364ff249";
+ libraryHaskellDepends = [ apecs apecs-physics base gloss ];
+ description = "Gloss rendering for apecs-physics";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"apelsin" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
, directory, filepath, glib, gtk, HTTP, mtl, network, process
@@ -27679,8 +28001,8 @@ self: {
}:
mkDerivation {
pname = "app-settings";
- version = "0.2.0.11";
- sha256 = "1cahrpf42g5ids4k6hlzys1kmbgy1ypgax9ljckwymafradcc53a";
+ version = "0.2.0.12";
+ sha256 = "1nncn8vmq55m4b6zh77mdmx19d1s7z0af4pmz1v082bpf2wril9b";
libraryHaskellDepends = [
base containers directory mtl parsec text
];
@@ -27729,13 +28051,13 @@ self: {
}) {};
"appendmap" = callPackage
- ({ mkDerivation, base, containers, hspec }:
+ ({ mkDerivation, base, containers, hspec, QuickCheck }:
mkDerivation {
pname = "appendmap";
- version = "0.1.3";
- sha256 = "1jssrwbsk0z9y4ialw9ly7vc95jrc64dr1idycwz1spgvn03adp6";
+ version = "0.1.5";
+ sha256 = "03mr60hgb5593s9vhc5890xwd2pdyismfkvnvw5hxhq26wda5grd";
libraryHaskellDepends = [ base containers ];
- testHaskellDepends = [ base containers hspec ];
+ testHaskellDepends = [ base containers hspec QuickCheck ];
description = "Map with a Semigroup and Monoid instances delegating to Semigroup of the elements";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -27895,8 +28217,8 @@ self: {
({ mkDerivation, base, containers, utility-ht }:
mkDerivation {
pname = "apportionment";
- version = "0.0.0.2";
- sha256 = "0azqr4c1zz19rba2gg2w31w38jslvjxgi1qh58qx60fvzxj9ab9m";
+ version = "0.0.0.3";
+ sha256 = "062v4a1ip7zy20b03z1jajqy2ylx5fl74p7px54b1vajf6vx0wcg";
libraryHaskellDepends = [ base containers utility-ht ];
description = "Round a set of numbers while maintaining its sum";
license = stdenv.lib.licenses.bsd3;
@@ -28021,6 +28343,80 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {arbb_dev = null;};
+ "arbor-datadog" = callPackage
+ ({ mkDerivation, aeson, auto-update, base, buffer-builder
+ , bytestring, Cabal, dlist, generic-lens, hspec, lens, mtl, network
+ , random, resourcet, text, time, transformers, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "arbor-datadog";
+ version = "0.0.0.1";
+ sha256 = "0lc3c2jnn2kmfyg7xgsnkgzkfir1ycn6qyq1z44501g360wrq0cv";
+ libraryHaskellDepends = [
+ aeson auto-update base buffer-builder bytestring dlist generic-lens
+ lens mtl network random resourcet text time transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base Cabal generic-lens hspec lens network resourcet time
+ transformers
+ ];
+ description = "Datadog client for Haskell";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "arbor-lru-cache" = callPackage
+ ({ mkDerivation, base, containers, generic-lens, hedgehog, hspec
+ , hw-hspec-hedgehog, lens, stm
+ }:
+ mkDerivation {
+ pname = "arbor-lru-cache";
+ version = "0.1.1.0";
+ sha256 = "0npyc9knih4qpxayz6wpsgw83rlv4bdw6d2jksrsh7rdxhidyiwg";
+ libraryHaskellDepends = [ base containers generic-lens lens stm ];
+ testHaskellDepends = [
+ base containers generic-lens hedgehog hspec hw-hspec-hedgehog lens
+ stm
+ ];
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "arbor-monad-counter" = callPackage
+ ({ mkDerivation, base, containers, generic-lens, hedgehog, hspec
+ , hw-hspec-hedgehog, lens, mtl, resourcet, stm, transformers
+ }:
+ mkDerivation {
+ pname = "arbor-monad-counter";
+ version = "2.0.0";
+ sha256 = "1pzgqxrsfaq9l6400ykv8gz34z90r0lwq93pzadsq5qpkhk55053";
+ libraryHaskellDepends = [
+ base containers generic-lens lens mtl resourcet stm transformers
+ ];
+ testHaskellDepends = [
+ base containers generic-lens hedgehog hspec hw-hspec-hedgehog lens
+ mtl resourcet stm transformers
+ ];
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "arbor-postgres" = callPackage
+ ({ mkDerivation, base, bytestring, generic-lens, lens, network-uri
+ , optparse-applicative, postgresql-simple, text
+ }:
+ mkDerivation {
+ pname = "arbor-postgres";
+ version = "0.0.2";
+ sha256 = "04fly3bwzkv30j79rzm5mk5af3j28z6grnixl2ll3nnqmbwkwr2n";
+ libraryHaskellDepends = [
+ base bytestring generic-lens lens network-uri optparse-applicative
+ postgresql-simple text
+ ];
+ description = "Convenience types and functions for postgresql-simple";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"arbtt" = callPackage
({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
, bytestring-progress, conduit, containers, deepseq, directory
@@ -28435,8 +28831,8 @@ self: {
pname = "arithmoi";
version = "0.7.0.0";
sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb";
- revision = "2";
- editedCabalFile = "1db2pcwip682f4zs1qnqzqqdswhqzbsxydy89m6zqm5ddlgrw5sq";
+ revision = "3";
+ editedCabalFile = "1s0jm2y0jhfrj7af80csckiizkfq5h0v4zb92mkwh1pkfi763fha";
configureFlags = [ "-f-llvm" ];
libraryHaskellDepends = [
array base containers exact-pi ghc-prim integer-gmp
@@ -28453,6 +28849,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "arithmoi_0_8_0_0" = callPackage
+ ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge
+ , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random
+ , smallcheck, tasty, tasty-hunit, tasty-quickcheck
+ , tasty-smallcheck, transformers, vector
+ }:
+ mkDerivation {
+ pname = "arithmoi";
+ version = "0.8.0.0";
+ sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2";
+ revision = "1";
+ editedCabalFile = "00s941gdf4y04sf0jxl329mnpcpa6cydmsa6l4mja8sdv6akzq52";
+ configureFlags = [ "-f-llvm" ];
+ libraryHaskellDepends = [
+ array base containers deepseq exact-pi ghc-prim integer-gmp
+ integer-logarithms random transformers vector
+ ];
+ testHaskellDepends = [
+ base containers exact-pi integer-gmp QuickCheck smallcheck tasty
+ tasty-hunit tasty-quickcheck tasty-smallcheck transformers vector
+ ];
+ benchmarkHaskellDepends = [
+ base containers deepseq gauge integer-logarithms random vector
+ ];
+ description = "Efficient basic number-theoretic functions";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"armada" = callPackage
({ mkDerivation, base, GLUT, mtl, OpenGL, stm }:
mkDerivation {
@@ -28531,8 +28956,8 @@ self: {
pname = "array";
version = "0.5.2.0";
sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj";
- revision = "1";
- editedCabalFile = "195c914pc0vk1ya6lz42kb4gmhkam7s0xi7x0dgzhpb5gkcrs5qx";
+ revision = "2";
+ editedCabalFile = "1irpwz3spy3yy27kzw8sklhcvxz3mx9fkgqia7r9m069w5wid9kg";
libraryHaskellDepends = [ base ];
description = "Mutable and immutable arrays";
license = stdenv.lib.licenses.bsd3;
@@ -28604,6 +29029,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "arraylist" = callPackage
+ ({ mkDerivation, base, hashable, initialize, MonadRandom, primitive
+ , smallcheck, tasty, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "arraylist";
+ version = "0.1.0.0";
+ sha256 = "1swvn9k7j2pwcln4znzrszgwgdi4f26q9qlaz2fi8jixc089v91g";
+ libraryHaskellDepends = [ base initialize primitive ];
+ testHaskellDepends = [
+ base hashable MonadRandom primitive smallcheck tasty
+ tasty-smallcheck
+ ];
+ description = "Memory-efficient ArrayList implementation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"arrow-extras" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -28762,16 +29204,17 @@ self: {
"ascii" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
- , hashable, text
+ , hashable, semigroups, text
}:
mkDerivation {
pname = "ascii";
- version = "0.0.4.1";
- sha256 = "1xpw2n3gskndg74ilrq8zngawlvc3mbsji3nx2aprar96hdlpvpv";
+ version = "0.0.5.2";
+ sha256 = "1kbf6iml4nvkzf78xqvxy67469vznd05ig8aprq7zx5vr9njliby";
libraryHaskellDepends = [
- base blaze-builder bytestring case-insensitive hashable text
+ base blaze-builder bytestring case-insensitive hashable semigroups
+ text
];
- description = "Type-safe, bytestring-based ASCII values. (deprecated)";
+ description = "Type-safe, bytestring-based ASCII values";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -28845,8 +29288,8 @@ self: {
}:
mkDerivation {
pname = "ascii-string";
- version = "1.0.1";
- sha256 = "0br053njgnfqwgmk7zz0fayiyycqq3sw8kxjpb2s9wx17arnq5kz";
+ version = "1.0.1.3";
+ sha256 = "1m11ms0x5di5qbckh2n7vnqqh94wv9p6zzynglg4ngijqhn4qjls";
libraryHaskellDepends = [
base bytestring cereal deepseq deferred-folds foldl hashable
primitive primitive-extras
@@ -28857,6 +29300,7 @@ self: {
];
description = "Compact representation of ASCII strings";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ascii-table" = callPackage
@@ -28933,8 +29377,8 @@ self: {
}:
mkDerivation {
pname = "asciidiagram";
- version = "1.3.3.1";
- sha256 = "194jdii485z0fif07nvjcj5468m53zgm2v9x1h3pj8xlmfh9rrly";
+ version = "1.3.3.2";
+ sha256 = "0kbf4jswdyvd0x4yk00ss4yjqla852rd64081lkf1xn7yi0k8d1b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -28965,41 +29409,41 @@ self: {
}) {};
"asif" = callPackage
- ({ mkDerivation, arbor-ip, attoparsec, base, binary, bytestring
- , conduit, conduit-combinators, conduit-extra, containers, cpu
- , directory, either, exceptions, generic-lens, hedgehog, hspec
- , hw-bits, hw-hspec-hedgehog, iproute, lens, old-locale
+ ({ mkDerivation, attoparsec, base, binary, bytestring, conduit
+ , conduit-combinators, conduit-extra, containers, cpu, directory
+ , either, exceptions, generic-lens, hedgehog, hspec, hw-bits
+ , hw-hspec-hedgehog, hw-ip, iproute, lens, network, old-locale
, optparse-applicative, resourcet, temporary-resourcet, text, thyme
, vector
}:
mkDerivation {
pname = "asif";
- version = "2.0.0";
- sha256 = "1wp3g3nmymw9zkfyhi2jc7qqcb14v9pp788xg77acsx4i83ca5fm";
+ version = "3.1.0";
+ sha256 = "0z9i40xz7hnhqnxv79saj9wsigi25bxkn0v4p5fhvfqj3r06ms2l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
attoparsec base binary bytestring conduit conduit-combinators
conduit-extra containers cpu either exceptions generic-lens hw-bits
- iproute lens old-locale resourcet temporary-resourcet text thyme
- vector
+ hw-ip iproute lens network old-locale resourcet temporary-resourcet
+ text thyme vector
];
executableHaskellDepends = [
attoparsec base binary bytestring conduit conduit-combinators
conduit-extra containers cpu directory either exceptions
- generic-lens hw-bits iproute lens old-locale optparse-applicative
- resourcet temporary-resourcet text thyme vector
+ generic-lens hw-bits hw-ip iproute lens network old-locale
+ optparse-applicative resourcet temporary-resourcet text thyme
+ vector
];
testHaskellDepends = [
- arbor-ip attoparsec base binary bytestring conduit
- conduit-combinators conduit-extra containers cpu either exceptions
- generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog iproute lens
+ attoparsec base binary bytestring conduit conduit-combinators
+ conduit-extra containers cpu either exceptions generic-lens
+ hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens network
old-locale resourcet temporary-resourcet text thyme vector
];
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {arbor-ip = null;};
+ }) {};
"asil" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
@@ -29045,6 +29489,8 @@ self: {
pname = "asn1-codec";
version = "0.2.0";
sha256 = "03c5dknklv8zj69fyhkdfvb7abcp68byhv2h8mmlnfwd9nz8fsrg";
+ revision = "1";
+ editedCabalFile = "0d1m0i06i0agh64hbc182yrmd4lfwi6kwmms0gh2yh91ympmyd89";
libraryHaskellDepends = [
base bytestring containers contravariant cryptonite hashable
integer-gmp memory network pretty stm text vector
@@ -29208,8 +29654,8 @@ self: {
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
pname = "asset-bundle";
- version = "0.1.0.0";
- sha256 = "0fdl3dgnc5q9mv8w5g3qrhyprqhbyp4jrr5gimf9xzd67fwsnf86";
+ version = "0.1.0.1";
+ sha256 = "0wf0xnf4ljihzvbz8pkaiqwhvp00bwnyx0334s4757z6lsc2hsrw";
libraryHaskellDepends = [ base Cabal directory filepath ];
description = "A build-time Cabal library that bundles executables with assets";
license = stdenv.lib.licenses.bsd3;
@@ -29247,14 +29693,39 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) assimp;};
+ "assoc-list" = callPackage
+ ({ mkDerivation, base, contravariant, doctest, hedgehog }:
+ mkDerivation {
+ pname = "assoc-list";
+ version = "0.1.0.0";
+ sha256 = "13n847aypm39djgpyrkr428y11xj7glpwavp5qxfd49n93ii8zy3";
+ libraryHaskellDepends = [ base contravariant ];
+ testHaskellDepends = [ base contravariant doctest hedgehog ];
+ description = "Association lists (lists of tuples)";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "assoc-listlike" = callPackage
+ ({ mkDerivation, base, contravariant, doctest, hedgehog, ListLike
+ }:
+ mkDerivation {
+ pname = "assoc-listlike";
+ version = "0.1.0.0";
+ sha256 = "0nph5yvawxk1afnlqm0vizg8dv53wl1cziqqnnlqgv45yimp4fbz";
+ libraryHaskellDepends = [ base contravariant ListLike ];
+ testHaskellDepends = [ base contravariant doctest hedgehog ];
+ description = "Association lists (list-like collections of tuples)";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ast-monad" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "ast-monad";
version = "0.1.0.0";
sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i";
- revision = "3";
- editedCabalFile = "0lj9g3vhlx42hsirxcwfjksy5w6981gpyms7r5xpih7bnz91cxk7";
+ revision = "4";
+ editedCabalFile = "131ynmpy5y0c4maj0cp0n3sbbs4k40j7dybgcsad5kv58i63kw23";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "A library for constructing AST by using do-notation";
@@ -29367,6 +29838,8 @@ self: {
pname = "async";
version = "2.2.1";
sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
+ revision = "1";
+ editedCabalFile = "0lg8c3iixm7vjjq2nydkqswj78i4iyx2k83hgs12z829yj196y31";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base hashable stm ];
@@ -29407,6 +29880,7 @@ self: {
testToolDepends = [ tasty-discover ];
description = "Async combinators";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"async-dejafu" = callPackage
@@ -29808,8 +30282,8 @@ self: {
({ mkDerivation, base, stm }:
mkDerivation {
pname = "atomic-modify";
- version = "0.1.0.1";
- sha256 = "0kkfbm7jkarzj42ja7093i1j1h4klg362pfz1cvldvdhzjgs009r";
+ version = "0.1.0.2";
+ sha256 = "0j4zhr02bmkpar80vzxxj91qyz97wi7kia79q20a1y3sqbmx2sk5";
libraryHaskellDepends = [ base stm ];
description = "A typeclass for mutable references that have an atomic modify operation";
license = stdenv.lib.licenses.asl20;
@@ -29935,19 +30409,20 @@ self: {
"ats-format" = callPackage
({ mkDerivation, ansi-wl-pprint, base, Cabal, cli-setup, directory
- , file-embed, htoml-megaparsec, language-ats, optparse-applicative
- , process, text, unordered-containers
+ , file-embed, filepath, htoml-megaparsec, language-ats, megaparsec
+ , optparse-applicative, process, text, unordered-containers
}:
mkDerivation {
pname = "ats-format";
- version = "0.2.0.28";
- sha256 = "0s538j8v0n8sdfi9pbykk2avbi3vg35iw2c9h6vmiyy3zszflqc4";
+ version = "0.2.0.30";
+ sha256 = "19i3g3njmmhkhyx02q37r7n373n6h0yha6g5hrx0ix5nn8bp4k4w";
isLibrary = false;
isExecutable = true;
- setupHaskellDepends = [ base Cabal cli-setup ];
+ setupHaskellDepends = [ base Cabal cli-setup filepath ];
executableHaskellDepends = [
ansi-wl-pprint base directory file-embed htoml-megaparsec
- language-ats optparse-applicative process text unordered-containers
+ language-ats megaparsec optparse-applicative process text
+ unordered-containers
];
description = "A source-code formatter for ATS";
license = stdenv.lib.licenses.bsd3;
@@ -29956,16 +30431,16 @@ self: {
"ats-pkg" = callPackage
({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
- , Cabal, cli-setup, composition-prelude, containers, cpphs
- , dependency, dhall, directory, file-embed, filemanip, filepath
- , http-client, http-client-tls, lzma, microlens, mtl
- , optparse-applicative, parallel-io, process, shake, shake-ats
- , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib
+ , Cabal, cli-setup, composition-prelude, containers, dependency
+ , dhall, directory, file-embed, filemanip, filepath, http-client
+ , http-client-tls, lzma, microlens, mtl, optparse-applicative
+ , parallel-io, process, shake, shake-ats, shake-c, shake-ext, tar
+ , temporary, text, unix, zip-archive, zlib
}:
mkDerivation {
pname = "ats-pkg";
- version = "3.2.1.8";
- sha256 = "183gdyivl6kab2k3z0jm6dk0wh83qwz3zvai7ayfkq3rjc6lb8ms";
+ version = "3.2.3.0";
+ sha256 = "0yirmngvkmkxdbhh3r6b1j9385hhwnqpr6mmw9kf50axd7czx421";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -29976,7 +30451,6 @@ self: {
microlens mtl parallel-io process shake shake-ats shake-c shake-ext
tar text unix zip-archive zlib
];
- libraryToolDepends = [ cpphs ];
executableHaskellDepends = [
base bytestring cli-setup dependency directory microlens
optparse-applicative parallel-io shake shake-ats temporary text
@@ -30062,8 +30536,10 @@ self: {
}:
mkDerivation {
pname = "atto-lisp";
- version = "0.2.2.2";
- sha256 = "0rh01bxqsny73b4dgssv87flq9asjd5z6cyba3gqmvp3hvlcvfi4";
+ version = "0.2.2.3";
+ sha256 = "00a7w4jysx55y5xxmgm09akvhxxa3fs68wqn6mp789bvhvdk9khd";
+ revision = "1";
+ editedCabalFile = "0im8kc54hkfj578ck79j0ijc3iaigvx06pgj4sk8za26ryy7v46q";
libraryHaskellDepends = [
attoparsec base blaze-builder blaze-textual bytestring containers
deepseq text
@@ -30110,6 +30586,8 @@ self: {
pname = "attoparsec";
version = "0.13.2.2";
sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx";
+ revision = "2";
+ editedCabalFile = "1j06na26rsahrbkzrs71nl7ym8fk390pnvh577wlxs4ik6hsn2va";
libraryHaskellDepends = [
array base bytestring containers deepseq scientific text
transformers
@@ -30236,16 +30714,17 @@ self: {
testHaskellDepends = [ base ];
description = "Parse IP data types with attoparsec";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "attoparsec-ip_0_0_3" = callPackage
+ "attoparsec-ip_0_0_4" = callPackage
({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty
, tasty-quickcheck, text, vector
}:
mkDerivation {
pname = "attoparsec-ip";
- version = "0.0.3";
- sha256 = "02d66mm1rc00dswkl9ink4pxwy8h7lyi2k9zcqda6ywa7cllhgl0";
+ version = "0.0.4";
+ sha256 = "1q3nrr8ps5wsqq2bahx9wy7924ccq110wwlwkiycsz32pflcamr7";
libraryHaskellDepends = [ attoparsec base ip vector ];
testHaskellDepends = [
attoparsec base ip QuickCheck tasty tasty-quickcheck text vector
@@ -30259,10 +30738,8 @@ self: {
({ mkDerivation, attoparsec, base, base-compat, text, time }:
mkDerivation {
pname = "attoparsec-iso8601";
- version = "1.0.0.0";
- sha256 = "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a";
- revision = "1";
- editedCabalFile = "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4";
+ version = "1.0.1.0";
+ sha256 = "0hj10w15qp2z5bz2v4xahhmbgzclpyfi5l2sv97wqycysg9gp7s9";
libraryHaskellDepends = [ attoparsec base base-compat text time ];
description = "Parsing of ISO 8601 dates, originally from aeson";
license = stdenv.lib.licenses.bsd3;
@@ -30387,6 +30864,7 @@ self: {
];
description = "URI parser / printer using attoparsec";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"attoparsec-uri_0_0_6" = callPackage
@@ -30540,15 +31018,15 @@ self: {
}) {};
"aur" = callPackage
- ({ mkDerivation, aeson, base, http-client, http-client-tls, servant
- , servant-client, tasty, tasty-hunit, text
+ ({ mkDerivation, aeson, base, errors, http-client, http-client-tls
+ , servant, servant-client, tasty, tasty-hunit, text
}:
mkDerivation {
pname = "aur";
- version = "6.0.0.1";
- sha256 = "1ip97gnny26h5ayq7x0yx4afls3nhd1kfhqz3l3bsjq7fvkn8jx0";
+ version = "6.1.0";
+ sha256 = "1wgff9vbp8sxqa0hyd6ifkld6yly20qijm15dfk72wpcsia86jx6";
libraryHaskellDepends = [
- aeson base http-client servant servant-client text
+ aeson base errors http-client servant servant-client text
];
testHaskellDepends = [
base http-client http-client-tls tasty tasty-hunit
@@ -30575,6 +31053,53 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "aura" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, array
+ , async, aur, base, base-prelude, bytestring, compactable
+ , containers, directory, errors, filepath, freer-simple
+ , generic-lens, http-client, http-client-tls, http-types
+ , language-bash, megaparsec, microlens, microlens-ghc, mtl
+ , mwc-random, network-uri, non-empty-containers
+ , optparse-applicative, paths, pretty-simple, prettyprinter
+ , prettyprinter-ansi-terminal, semigroupoids, stm, tasty
+ , tasty-hunit, text, throttled, time, transformers, typed-process
+ , versions, witherable
+ }:
+ mkDerivation {
+ pname = "aura";
+ version = "2.0.0";
+ sha256 = "1k53r44kxy7p23nsjbx12mvn7nkl8j3h9fzy4v3dxyqkd4jz0996";
+ revision = "1";
+ editedCabalFile = "1z73n5fcrp23hms0l6r45p1knqqlng8g4gfb44a4raqj7da823zj";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty algebraic-graphs array async aur base
+ base-prelude bytestring compactable containers directory errors
+ filepath freer-simple generic-lens http-client http-types
+ language-bash megaparsec microlens microlens-ghc mtl mwc-random
+ network-uri non-empty-containers paths pretty-simple prettyprinter
+ prettyprinter-ansi-terminal semigroupoids stm text throttled time
+ transformers typed-process versions witherable
+ ];
+ executableHaskellDepends = [
+ base base-prelude bytestring containers errors freer-simple
+ http-client http-client-tls language-bash microlens
+ non-empty-containers optparse-applicative paths pretty-simple
+ prettyprinter prettyprinter-ansi-terminal text transformers
+ typed-process versions
+ ];
+ testHaskellDepends = [
+ base base-prelude bytestring containers errors freer-simple
+ http-client language-bash megaparsec microlens non-empty-containers
+ paths pretty-simple prettyprinter prettyprinter-ansi-terminal tasty
+ tasty-hunit text transformers typed-process versions
+ ];
+ description = "A secure package manager for Arch Linux and the AUR, written in Haskell";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"authenticate" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
, case-insensitive, conduit, containers, http-conduit, http-types
@@ -30700,8 +31225,8 @@ self: {
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
pname = "autoexporter";
- version = "1.1.10";
- sha256 = "0rf28h7nzm5ngcrj1900d0vgwbfr1y3s4q7wwbvdw2mg29rw4f0r";
+ version = "1.1.13";
+ sha256 = "05mgvif7wiq0vplk92kp8qn4a5wfma1gwdihqlz5lspmczszpdkv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -30824,12 +31349,15 @@ self: {
}) {};
"avahi" = callPackage
- ({ mkDerivation, base, dbus-core, text }:
+ ({ mkDerivation, base, bytestring, dbus, text }:
mkDerivation {
pname = "avahi";
- version = "0.1.1";
- sha256 = "0b2bw0rp33g8s1y6hyqji3ycv26a4ixgjmkph93isnjxglfl6ah0";
- libraryHaskellDepends = [ base dbus-core text ];
+ version = "0.2.0";
+ sha256 = "1l1z1yvldhdw36ar40ca9y5zpjfahspv40cbq8kgn2246gcgc8am";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bytestring dbus text ];
+ executableHaskellDepends = [ base bytestring dbus text ];
description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -30873,8 +31401,8 @@ self: {
pname = "avers";
version = "0.0.17.1";
sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
- revision = "22";
- editedCabalFile = "040kvq16wknnjq0kr5j6y17xvjfh87y22hska3whs3ci6zw1fr30";
+ revision = "28";
+ editedCabalFile = "1x653r0x4frpp78jncvr91kc7g41i9c3s561cizyh518318lvsnr";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock containers cryptonite
filepath inflections memory MonadRandom mtl network network-uri
@@ -30935,20 +31463,18 @@ self: {
"avers-server" = callPackage
({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
, bytestring, bytestring-conversion, containers, cookie, cryptonite
- , http-types, memory, mtl, resource-pool, rethinkdb-client-driver
- , servant, servant-server, stm, text, time, transformers, wai
- , wai-websockets, websockets
+ , http-types, memory, mtl, resource-pool, servant, servant-server
+ , stm, text, time, transformers, wai, wai-websockets, websockets
}:
mkDerivation {
pname = "avers-server";
- version = "0.1.0";
- sha256 = "0m809p50l1bfhnmbwl3ncav8lz7xh38yakqa35z65afb6k1g900z";
+ version = "0.1.0.1";
+ sha256 = "13jic248m2307r84acv4b4xlh7pvx4kxm6gp0nhvz1ds0bbrdkdy";
libraryHaskellDepends = [
aeson avers avers-api base base64-bytestring bytestring
bytestring-conversion containers cookie cryptonite http-types
- memory mtl resource-pool rethinkdb-client-driver servant
- servant-server stm text time transformers wai wai-websockets
- websockets
+ memory mtl resource-pool servant servant-server stm text time
+ transformers wai wai-websockets websockets
];
description = "Server implementation of the Avers API";
license = stdenv.lib.licenses.mit;
@@ -31020,8 +31546,34 @@ self: {
}:
mkDerivation {
pname = "avro";
- version = "0.3.4.2";
- sha256 = "0g6y8f6j38n52vqwj185lyqc666cqrmgd6pn3427cqlhcj927b7v";
+ version = "0.3.5.1";
+ sha256 = "147w9a30z2vxjf8lsmf4vy0p9dvc8c3lla45b42sinr9916m61f8";
+ libraryHaskellDepends = [
+ aeson array base base16-bytestring binary bytestring containers
+ data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
+ semigroups tagged template-haskell text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson array base base16-bytestring binary bytestring containers
+ directory entropy extra fail hashable hspec lens lens-aeson mtl
+ pure-zlib QuickCheck scientific semigroups tagged template-haskell
+ text transformers unordered-containers vector
+ ];
+ description = "Avro serialization support for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "avro_0_3_6_1" = callPackage
+ ({ mkDerivation, aeson, array, base, base16-bytestring, binary
+ , bytestring, containers, data-binary-ieee754, directory, entropy
+ , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
+ , QuickCheck, scientific, semigroups, tagged, template-haskell
+ , text, transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "avro";
+ version = "0.3.6.1";
+ sha256 = "0b1pj47nfpbqvcp5vzraa1przq1c9ll8n76qbyg05fjfvamycbq3";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -31035,6 +31587,7 @@ self: {
];
description = "Avro serialization support for Haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"avwx" = callPackage
@@ -31126,6 +31679,8 @@ self: {
pname = "aws";
version = "0.18";
sha256 = "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj";
+ revision = "1";
+ editedCabalFile = "0y3xkhnaksj926khsy1d8gks2jzphkaibi97h98l47nbh962ickj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -31743,26 +32298,36 @@ self: {
}) {};
"axel" = callPackage
- ({ mkDerivation, base, directory, filepath, lens, lens-aeson
- , monad-control, mtl, parsec, process, regex-pcre, split, strict
- , text, typed-process, vector, yaml
+ ({ mkDerivation, base, bytestring, directory, filepath
+ , freer-simple, haskell-src-exts, hedgehog, lens, lens-aeson
+ , optparse-applicative, parsec, process, regex-pcre, singletons
+ , split, strict, tasty, tasty-discover, tasty-golden
+ , tasty-hedgehog, tasty-hspec, template-haskell, text, transformers
+ , typed-process, vector, yaml
}:
mkDerivation {
pname = "axel";
- version = "0.0.4";
- sha256 = "0gg1q7nfwsdh0wr5mqyrjcrfga4i87j8q2f4n9nvpq6hmwnphpc3";
- revision = "1";
- editedCabalFile = "0ff8pi6x26wv6bp2hx92h3cs9iln1yj6230am1c2ygjhr16wfwna";
+ version = "0.0.8";
+ sha256 = "16fkrc87yirzha3fgdcbidi7k9xkmb5y5w1i4i10rlikhszfr2b9";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base directory filepath lens lens-aeson monad-control mtl parsec
- process regex-pcre split strict text typed-process vector yaml
+ base bytestring directory filepath freer-simple haskell-src-exts
+ lens lens-aeson optparse-applicative parsec process regex-pcre
+ singletons strict template-haskell text typed-process vector yaml
];
- executableHaskellDepends = [ base directory ];
+ executableHaskellDepends = [
+ base freer-simple optparse-applicative
+ ];
+ testHaskellDepends = [
+ base bytestring filepath freer-simple hedgehog lens split tasty
+ tasty-discover tasty-golden tasty-hedgehog tasty-hspec transformers
+ ];
+ testToolDepends = [ tasty-discover ];
description = "The Axel programming language";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"axiom" = callPackage
@@ -31916,8 +32481,8 @@ self: {
pname = "b-tree";
version = "0.1.3";
sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb";
- revision = "2";
- editedCabalFile = "04is4fc308f1achbdxvqq9rg4v8c02f1w88wysp318dbhhmwgggh";
+ revision = "3";
+ editedCabalFile = "1i9qadxdq215j6dimyrmdkzl3d95l4gb65d2visf8rq1jfmdz62n";
libraryHaskellDepends = [
base binary bytestring containers directory errors exceptions
filepath lens mmap mtl pipes pipes-interleave transformers vector
@@ -31941,8 +32506,8 @@ self: {
}:
mkDerivation {
pname = "b9";
- version = "0.5.49";
- sha256 = "0n9vci1wc2ws4nyzmmqi2npwkd3zz28znyqj4905y1hc126x0yi3";
+ version = "0.5.50";
+ sha256 = "1wsspzkcydad9akqj6n8s9xpm7id49dll5h12vv3xbmgjgj0pdhr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -32336,8 +32901,8 @@ self: {
({ mkDerivation, base, containers, hspec, QuickCheck, time }:
mkDerivation {
pname = "bank-holidays-england";
- version = "0.1.0.7";
- sha256 = "196ldac7aljysw8m4nzdyf5mygswbckkvd6axm8a9yw4vchzcjks";
+ version = "0.1.0.8";
+ sha256 = "0ak7m4xaymbh3cyhddj45p0pcazf79lnp63wvh4kh2f4fwh4f69j";
libraryHaskellDepends = [ base containers time ];
testHaskellDepends = [ base containers hspec QuickCheck time ];
description = "Calculation of bank holidays in England and Wales";
@@ -32365,15 +32930,17 @@ self: {
}) {};
"barbies" = callPackage
- ({ mkDerivation, base, bifunctors, QuickCheck, tasty
+ ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit
, tasty-quickcheck
}:
mkDerivation {
pname = "barbies";
- version = "0.1.3.1";
- sha256 = "0jddnjygqmcczhg2s1ifqgmbd1liqrkhnza4bmcplwmqkg4bkbr5";
+ version = "1.0.0.0";
+ sha256 = "05bbn1aqa6r9392fffgjgdl4m8nnagjx27aps5xrcf5x45kk88ci";
libraryHaskellDepends = [ base bifunctors ];
- testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
description = "Classes for working with types that can change clothes";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -32487,12 +33054,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "base_4_11_1_0" = callPackage
+ "base_4_12_0_0" = callPackage
({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
mkDerivation {
pname = "base";
- version = "4.11.1.0";
- sha256 = "0q2ygfqy4qim8h9fmlb5iwfnf2lrly27bqqvnckdlmh775fmq07g";
+ version = "4.12.0.0";
+ sha256 = "0ka18cvw1cjvjdd20n03rjmxfm10083mh19wxwz1f1kqiyc92g3w";
libraryHaskellDepends = [
ghc-prim invalid-cabal-flag-settings rts
];
@@ -32506,8 +33073,8 @@ self: {
({ mkDerivation, base, unix }:
mkDerivation {
pname = "base-compat";
- version = "0.10.4";
- sha256 = "0ksp990gxs731mq19rzbxrbs43nazfljjc8krlx5bjqblw3kfs8d";
+ version = "0.10.5";
+ sha256 = "0hgvlqcr852hfp52jp99snhbj550mvxxpi8qn15d8ml9aqhyl2lr";
libraryHaskellDepends = [ base unix ];
description = "A compatibility layer for base";
license = stdenv.lib.licenses.mit;
@@ -32528,14 +33095,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "base-compat-batteries_0_10_4" = callPackage
+ "base-compat-batteries_0_10_5" = callPackage
({ mkDerivation, base, base-compat, contravariant, hspec
, hspec-discover, QuickCheck
}:
mkDerivation {
pname = "base-compat-batteries";
- version = "0.10.4";
- sha256 = "11k4k2n88kyaa41431cmjwmnlnhjbqx95r67mgrdxfyqxxwnxwp8";
+ version = "0.10.5";
+ sha256 = "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p";
libraryHaskellDepends = [ base base-compat contravariant ];
testHaskellDepends = [ base hspec QuickCheck ];
testToolDepends = [ hspec-discover ];
@@ -32566,6 +33133,8 @@ self: {
pname = "base-encoding";
version = "0.1.0.0";
sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si";
+ revision = "1";
+ editedCabalFile = "0miysladpqwm5qhphv23qhvambd7245n14qbkgvp664xj56y6df1";
libraryHaskellDepends = [
base base16-bytestring base64-bytestring bytestring text
];
@@ -32614,12 +33183,13 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "base-noprelude";
- version = "4.11.1.0";
- sha256 = "19d1x487kwhc60qjix7xx53dlszbx08rdhxd2zab1pwjw62ws3c8";
+ version = "4.12.0.0";
+ sha256 = "1hb25nj49k4lcxi4w33qvcy8izkgsvls5kasmva6hjlvg8b35ymb";
libraryHaskellDepends = [ base ];
doHaddock = false;
description = "\"base\" package sans \"Prelude\" module";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"base-orphans" = callPackage
@@ -32788,8 +33358,8 @@ self: {
pname = "base64-bytestring-type";
version = "1";
sha256 = "0h74c0qhf4n0pamrl29ha5hgf940bay0dhl8rifaw4l03z8rn0bl";
- revision = "3";
- editedCabalFile = "18p6iz3b73qyf76azhfpcpgsc1fb2qhv889l0cj1niqlyp7kw69s";
+ revision = "4";
+ editedCabalFile = "0yfhy4a9n67l9w3amqrzzy79q47yyj6qbv5i5lqym5z7ygwmlzn6";
libraryHaskellDepends = [
aeson base base-compat base64-bytestring binary bytestring cereal
deepseq hashable QuickCheck text
@@ -32991,6 +33561,8 @@ self: {
pname = "basic-sop";
version = "0.2.0.2";
sha256 = "0cd5zlv3w3r99ck5cz43kppand0n9vx26g4d4fqqcmvjxk8zwhy7";
+ revision = "1";
+ editedCabalFile = "0rvhcbywgpidnq1vg79a9scq6hraqdyv67j63vyidm0q20ml5mpv";
libraryHaskellDepends = [
base deepseq generics-sop QuickCheck text
];
@@ -33145,8 +33717,8 @@ self: {
}:
mkDerivation {
pname = "battleship-combinatorics";
- version = "0.0.0.1";
- sha256 = "00zr3798y5h640rdhls4xkaqmj6n90qnxglq7bq8bvxl68a8ibxd";
+ version = "0.0.0.2";
+ sha256 = "1vja3z9xna06cyb3xlx2p7z4drbglbyahr8fs3337phynv2h0v0g";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -33472,8 +34044,8 @@ self: {
}:
mkDerivation {
pname = "beam-sqlite";
- version = "0.3.2.2";
- sha256 = "1k33bbh6zhhm7h88q9rwigrj5fisfgbwza6mfrhbygdpzck473hp";
+ version = "0.3.2.3";
+ sha256 = "01pz1i4k9pqya569kp7xic0g1lilwrjf0yvijq7bwgpara20y7ji";
libraryHaskellDepends = [
aeson attoparsec base beam-core beam-migrate bytestring dlist free
hashable mtl network-uri scientific sqlite-simple text time unix
@@ -33557,20 +34129,18 @@ self: {
}) {};
"bed-and-breakfast" = callPackage
- ({ mkDerivation, array, base, binary, deepseq, QuickCheck
+ ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck
, template-haskell
}:
mkDerivation {
pname = "bed-and-breakfast";
- version = "0.4.3";
- sha256 = "0183770vkb5r9srxqr3fa4s601g10bx07b05hjr3b3nvc0ab9f6z";
- revision = "1";
- editedCabalFile = "0kqdmq6y2fgbknx2lsn1jx2g2n7yizdpzn6wvnnvjaqi945yvyry";
+ version = "0.5";
+ sha256 = "0dj1vvb9j55psp6yra72wk0k3k6ggvarmzj7zjgr8z3npv5mqmar";
libraryHaskellDepends = [
- array base binary deepseq template-haskell
+ array base binary cpphs deepseq template-haskell
];
testHaskellDepends = [ base QuickCheck ];
- description = "Efficient Matrix operations in 100% Haskell";
+ description = "Efficient Matrix and Vector operations in 100% Haskell";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -33653,23 +34223,6 @@ self: {
}) {};
"bench" = callPackage
- ({ mkDerivation, base, criterion, optparse-applicative, process
- , silently, text, turtle
- }:
- mkDerivation {
- pname = "bench";
- version = "1.0.11";
- sha256 = "15rv999kajlmhvd1cajcn8vir3r950c1v2njyywpqaz6anm6ykm8";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- base criterion optparse-applicative process silently text turtle
- ];
- description = "Command-line benchmark tool";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "bench_1_0_12" = callPackage
({ mkDerivation, base, criterion, optparse-applicative, process
, silently, text, turtle
}:
@@ -33684,7 +34237,6 @@ self: {
];
description = "Command-line benchmark tool";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bench-graph" = callPackage
@@ -33693,8 +34245,8 @@ self: {
}:
mkDerivation {
pname = "bench-graph";
- version = "0.1.3";
- sha256 = "15xsaqxms61p8d5r0lsxhlrdfh451ha6fpldcmh8vcw0q4yb1q47";
+ version = "0.1.4";
+ sha256 = "144al44v3m00lh1rrhjyah0gacbi2n6hjlqvml3yqwf8j9c37wnw";
libraryHaskellDepends = [
base Chart Chart-diagrams csv directory filepath transformers
];
@@ -33704,6 +34256,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "bench-show" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, Chart, Chart-diagrams, csv
+ , directory, filepath, mwc-random, split, statistics, text
+ , transformers, vector
+ }:
+ mkDerivation {
+ pname = "bench-show";
+ version = "0.2.2";
+ sha256 = "12fi59j9a98n4q6gjvjsf0hjc2rsy33b7kzjiqxy5wzh8isciaa4";
+ libraryHaskellDepends = [
+ ansi-wl-pprint base Chart Chart-diagrams csv directory filepath
+ mwc-random split statistics transformers vector
+ ];
+ testHaskellDepends = [ base split text ];
+ description = "Show, plot and compare benchmark results";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"benchmark-function" = callPackage
({ mkDerivation, base, process, random, time }:
mkDerivation {
@@ -33719,8 +34290,8 @@ self: {
({ mkDerivation, base, bytestring, mtl, time }:
mkDerivation {
pname = "benchpress";
- version = "0.2.2.10";
- sha256 = "1irrdx2l6pj96cc983jvpkfnkg43zrz1rk1qnin8c2l8kvpwbc76";
+ version = "0.2.2.12";
+ sha256 = "0r5b1mdjm08nsxni1qzwq3kap13jflcq7ksd30zl7vaxgz9yhwfm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl time ];
@@ -33897,22 +34468,24 @@ self: {
}) {};
"betris" = callPackage
- ({ mkDerivation, base, containers, lens, linear, random, stm
- , stm-chans, vty
+ ({ mkDerivation, base, containers, lens, linear
+ , optparse-applicative, random, stm, time-units, vty
}:
mkDerivation {
pname = "betris";
- version = "0.1.0.0";
- sha256 = "1qn326s4xydvvgmrhqi48cc2pl9b3mp7swc82qk59gj7cx4dx222";
+ version = "0.1.1.1";
+ sha256 = "0ggmy2rwwsgq54j29b2a5dkafalww0nrzz89j08wf3gsg90g9p9i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers lens linear random stm stm-chans vty
+ base containers lens linear optparse-applicative random stm
+ time-units vty
];
executableHaskellDepends = [
- base containers lens linear random stm stm-chans vty
+ base containers lens linear optparse-applicative random stm
+ time-units vty
];
- description = "Braille friendly vertical version of tetris";
+ description = "A horizontal version of tetris for braille users";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -34386,10 +34959,8 @@ self: {
}:
mkDerivation {
pname = "binary-conduit";
- version = "1.3";
- sha256 = "1kfc421r8p0zxn5dkm9kzj4n9pharnl809hkjnr55dbrnr3vvya3";
- revision = "1";
- editedCabalFile = "0y08nw3y5jgrw5waa25b75iwsibnd1m9rbpqrvz5j4xq6baqw6kx";
+ version = "1.3.1";
+ sha256 = "17yj8rn6fwzbv0z6lczrddv7mkr8906xg2pf2dlvmnwb97zw7004";
libraryHaskellDepends = [
base binary bytestring conduit exceptions vector
];
@@ -34542,8 +35113,8 @@ self: {
pname = "binary-orphans";
version = "0.1.8.0";
sha256 = "1k6067wn9zki7xvbslvxx8cq1wrmz3kjb3q3x8mxycc9v765fxgi";
- revision = "4";
- editedCabalFile = "1hsp8y26g51rjskmgfkgmggzpdg5y30sv8g7rb3id9r43w37zj1q";
+ revision = "5";
+ editedCabalFile = "1dny1jvwwcyrbzhqvymmn6n7ib48bpy0nasbrcrdrpzjypkmg500";
libraryHaskellDepends = [
aeson base binary case-insensitive hashable scientific tagged text
text-binary time unordered-containers vector
@@ -34659,8 +35230,8 @@ self: {
({ mkDerivation, base, bytestring, cborg, serialise }:
mkDerivation {
pname = "binary-serialise-cbor";
- version = "0.2.0.0";
- sha256 = "1kcqmxz77jmdkknpbjr860xmqrib3adh9rm99agidicg66ilsavv";
+ version = "0.2.1.0";
+ sha256 = "0qdbz2qvvqiaqp859fn00470gzxpvw8k3v0wqclgqps3zj9g9854";
libraryHaskellDepends = [ base bytestring cborg serialise ];
description = "Yet Another Binary Serialisation Library (compatibility shim)";
license = stdenv.lib.licenses.bsd3;
@@ -34751,10 +35322,10 @@ self: {
}:
mkDerivation {
pname = "binary-tagged";
- version = "0.1.5";
- sha256 = "1s05hrak9mg8klid5jsdqh1i7d1zyzkpdbdc969g2s9h06lk7dyl";
+ version = "0.1.5.1";
+ sha256 = "196msm7v0r41d7gx8aghl0c1gvir60sf0w9sfpcz2dq9akzqzjvh";
revision = "1";
- editedCabalFile = "0vddb305g3455f0rh0xs6c9i2vllnf83y0pbp53wjwb3l575bqyp";
+ editedCabalFile = "1z612d3wbrlywcx96lc52svi9b2s6nskdnwnwm3d5mylcqaqckcx";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
generics-sop hashable scientific SHA tagged text time
@@ -35403,8 +35974,8 @@ self: {
({ mkDerivation, base, monetdb-mapi }:
mkDerivation {
pname = "bindings-monetdb-mapi";
- version = "0.1.0.0";
- sha256 = "12i1sn508m0vcm6d34l32h8x77ik63l64ix4vmn6c91jbhgakvv3";
+ version = "0.1.0.1";
+ sha256 = "0ghl73n679y5srg4b2jwy6xgnd4lbv7wad8k133k6c7k70zq89hl";
libraryHaskellDepends = [ base ];
libraryPkgconfigDepends = [ monetdb-mapi ];
description = "Low-level bindings for the MonetDB API (mapi)";
@@ -35700,8 +36271,8 @@ self: {
}:
mkDerivation {
pname = "bins";
- version = "0.1.1.0";
- sha256 = "067df9dpb7kvn7v9y2mw0y3zb4jmxas27yd3ybrb9h94f9j8p9jk";
+ version = "0.1.1.1";
+ sha256 = "1v585ppm5g424jn2bkq7ydsdd6bds7gak53288vn4vclnw2rswr8";
libraryHaskellDepends = [
base containers finite-typelits ghc-typelits-knownnat
ghc-typelits-natnormalise math-functions profunctors reflection
@@ -35819,8 +36390,8 @@ self: {
}:
mkDerivation {
pname = "biohazard";
- version = "1.0.3";
- sha256 = "19pk2c52w300jxcnrxlnvc6m8qr4jj19vwppdz37c9nppm6q2252";
+ version = "1.1.1";
+ sha256 = "1b9jba89l4jsyzxn3s40qp0njq4b5hdgvbs07vsrrbnlwlvshb7a";
libraryHaskellDepends = [
async attoparsec base base-prelude bytestring containers exceptions
hashable primitive stm text transformers unix unordered-containers
@@ -36642,6 +37213,8 @@ self: {
pname = "bitwise";
version = "1.0.0.1";
sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn";
+ revision = "1";
+ editedCabalFile = "1h6dbjmznd3pvz7j5f8xwaaxxhx57fxszli2k430wcn65bc9y0zs";
libraryHaskellDepends = [ array base bytestring ];
testHaskellDepends = [ base QuickCheck ];
benchmarkHaskellDepends = [ array base bytestring criterion ];
@@ -36673,13 +37246,15 @@ self: {
}) {};
"bizzlelude" = callPackage
- ({ mkDerivation, base-noprelude, containers, directory, text }:
+ ({ mkDerivation, base-noprelude, containers, directory, regexpr
+ , text
+ }:
mkDerivation {
pname = "bizzlelude";
- version = "1.2.0";
- sha256 = "1yqp46blrllx5irn1vvvx1v2n06pdfdfmhcng8hvs7q43fcsfgcr";
+ version = "1.5.0";
+ sha256 = "1mjy5hlszj85wvxwr7fza5wa004xjcg434kwzxzjmmlcvkgh2ybr";
libraryHaskellDepends = [
- base-noprelude containers directory text
+ base-noprelude containers directory regexpr text
];
description = "A lousy Prelude replacement by a lousy dude";
license = stdenv.lib.licenses.bsd3;
@@ -37186,8 +37761,8 @@ self: {
}:
mkDerivation {
pname = "blaze-markup";
- version = "0.8.2.1";
- sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh";
+ version = "0.8.2.2";
+ sha256 = "1qc2mn2zb2sdj3xvv73asibqnb11l7b5l30ff05qrfh7sy7wzw66";
libraryHaskellDepends = [ base blaze-builder bytestring text ];
testHaskellDepends = [
base blaze-builder bytestring containers HUnit QuickCheck tasty
@@ -37670,6 +38245,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "blunk-hask-tests" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "blunk-hask-tests";
+ version = "0.2";
+ sha256 = "10x4xjlp1mj9gmsibvd21k76gj97prdsgwxxpg39425xgrzph6ll";
+ revision = "1";
+ editedCabalFile = "0wnp6rzq3iisi9vfk0nci4cb8kdwijdyv60f6kg0bhz1xzn7i6ww";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base ];
+ description = "spam";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"blunt" = callPackage
({ mkDerivation, aeson, base, bytestring, clay, flow, http-types
, jmacro, lucid, pointfree, pointful, text, wai, wai-extra
@@ -37719,23 +38310,26 @@ self: {
"board-games" = callPackage
({ mkDerivation, array, base, cgi, containers, html, httpd-shed
- , network-uri, QuickCheck, random, transformers, utility-ht
+ , network-uri, non-empty, QuickCheck, random, transformers
+ , utility-ht
}:
mkDerivation {
pname = "board-games";
- version = "0.1.0.6";
- sha256 = "0qry0kacwaiwdcc2wxz08qimvzj9y0vmyc0cc5yq1lyx1sx6wghp";
+ version = "0.2";
+ sha256 = "1plgnwlpx0bw0wjwd0dxbh616vy37frclwir692x1fr2lq85y98c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base cgi containers html random transformers utility-ht
+ array base cgi containers html non-empty random transformers
+ utility-ht
];
executableHaskellDepends = [
- array base cgi containers html httpd-shed network-uri random
- transformers utility-ht
+ array base cgi containers html httpd-shed network-uri non-empty
+ random transformers utility-ht
];
testHaskellDepends = [
- array base containers QuickCheck random transformers utility-ht
+ array base containers non-empty QuickCheck random transformers
+ utility-ht
];
description = "Three games for inclusion in a web server";
license = "GPL";
@@ -38056,6 +38650,8 @@ self: {
pname = "boolean-normal-forms";
version = "0.0.1";
sha256 = "12i0jarbv7gq2p8zw0jgh2gq3wqk6s0vsc9rd0g7c36srcmr944b";
+ revision = "1";
+ editedCabalFile = "1p31kqxp77xdhkszppmnzqgxp883vasrh5910qfif50lch39myfm";
libraryHaskellDepends = [ base cond containers deepseq ];
testHaskellDepends = [
base cond containers QuickCheck tasty tasty-quickcheck
@@ -38071,8 +38667,8 @@ self: {
}:
mkDerivation {
pname = "boolector";
- version = "0.0.0.4";
- sha256 = "0f5yfkkgarwkbdkxkjj8fsd7fgq683qjxyv88wqk724dx6wv3yn7";
+ version = "0.0.0.7";
+ sha256 = "1mb897br307c84p0aj8r20qjwryinhy0bxgm62hphz7mvxlak1pb";
libraryHaskellDepends = [
base containers directory mtl temporary
];
@@ -38264,6 +38860,8 @@ self: {
pname = "boring";
version = "0.1";
sha256 = "0r263cc8bdwsaw33x96fgd8npsma9a2ffv6mfz9z72d7qclhimkk";
+ revision = "2";
+ editedCabalFile = "1jxaby4cagbhii194x9x0j75ms1v5bm14sx7d19zz3844mh9qyci";
libraryHaskellDepends = [
adjunctions base base-compat constraints fin generics-sop streams
tagged transformers transformers-compat vec
@@ -38372,6 +38970,8 @@ self: {
pname = "bound-extras";
version = "0";
sha256 = "0j010sbdm0bc9dq4lsyw1vb2x0j6gcjxp7ywjn8izdh6yqr2r3qq";
+ revision = "1";
+ editedCabalFile = "0qcxcpn8hdmkg3mqz80i0j9jrym2pk11k5hyjhqbmrqlhf3fr7qw";
libraryHaskellDepends = [
base bound deepseq hashable transformers
];
@@ -38394,6 +38994,17 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "bounded-array" = callPackage
+ ({ mkDerivation, array, base }:
+ mkDerivation {
+ pname = "bounded-array";
+ version = "0.1.0.0";
+ sha256 = "0zv5a82rm6hwikgls2hw9d18igvfgw655s5pw5h1xbwcv1d8d0ji";
+ libraryHaskellDepends = [ array base ];
+ description = "Arrays with a value for every index";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bounded-tchan" = callPackage
({ mkDerivation, base, stm }:
mkDerivation {
@@ -38456,8 +39067,8 @@ self: {
({ mkDerivation, base, ghc-prim }:
mkDerivation {
pname = "box-tuples";
- version = "0.1.0.0";
- sha256 = "1mksy2kiai1vwigpf45zxsq54wjwibib7974ydsv0sp1dhag6gki";
+ version = "0.1.1.0";
+ sha256 = "1j0s7pb9milrz5spqsxwwhva1zwa7ywwd8nbb5y0z97p84wvyy7k";
libraryHaskellDepends = [ base ghc-prim ];
description = "A hack to use GHC.Prim primitives in GHCi";
license = stdenv.lib.licenses.mit;
@@ -38568,8 +39179,8 @@ self: {
}:
mkDerivation {
pname = "brainheck";
- version = "0.1.0.9";
- sha256 = "0wmkkamgzassvc63wrk7bmm3ljq056zbxqbgs223454iswk35hc8";
+ version = "0.1.0.10";
+ sha256 = "10j3wncbdgxz2cb1v6sm6dr7z8jdh7xax8dwsj151sgxjw5n35xm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -38579,6 +39190,7 @@ self: {
benchmarkHaskellDepends = [ base criterion text ];
description = "Brainh*ck interpreter in haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"break" = callPackage
@@ -38654,6 +39266,8 @@ self: {
pname = "brick";
version = "0.37.2";
sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
+ revision = "1";
+ editedCabalFile = "0cj98cjlr400yf47lg50syj5zpvh6q9mm1hp4blns6ndz2xys5rz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -38666,7 +39280,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "brick_0_40" = callPackage
+ "brick_0_41_2" = callPackage
({ mkDerivation, base, config-ini, containers, contravariant
, data-clist, deepseq, dlist, microlens, microlens-mtl
, microlens-th, QuickCheck, stm, template-haskell, text
@@ -38674,8 +39288,10 @@ self: {
}:
mkDerivation {
pname = "brick";
- version = "0.40";
- sha256 = "12bd0acbczcrr7mlpfrpjm9qq2ll2rbmgskpdw6lfaxz1iz75cad";
+ version = "0.41.2";
+ sha256 = "04b4gyzb0c66idl19k0v3g9z48bcii728ivbpvm8zjkzq2m2hqix";
+ revision = "1";
+ editedCabalFile = "00z07bkarxqv517aq95gib864z9mrq9j86zh6jdxybf2v4fwh04s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -38689,6 +39305,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "brick-dropdownmenu" = callPackage
+ ({ mkDerivation, base, brick, containers, microlens, microlens-ghc
+ , microlens-th, pointedlist, vector, vty
+ }:
+ mkDerivation {
+ pname = "brick-dropdownmenu";
+ version = "0.1.0";
+ sha256 = "1801l15xrl5a822v0cdrf8d41iklfqlp6gzkyj14a7fqf3ycc7rw";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base brick containers microlens microlens-ghc microlens-th
+ pointedlist vector vty
+ ];
+ description = "A drop-down menu widget for brick";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"brick-skylighting" = callPackage
({ mkDerivation, base, brick, containers, skylighting-core, text
, vty
@@ -38704,6 +39338,7 @@ self: {
];
description = "Show syntax-highlighted text in your Brick UI";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bricks" = callPackage
@@ -38888,6 +39523,7 @@ self: {
];
description = "Haskell source code formatter";
license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"broadcast-chan" = callPackage
@@ -38896,11 +39532,89 @@ self: {
pname = "broadcast-chan";
version = "0.1.1";
sha256 = "1wl5x7qi00z7q9k6rbmzszzbrqycfcpg04a1ikrnvzqs61ddcnxd";
+ revision = "1";
+ editedCabalFile = "03bmddz9bryh3viskh2nldj4hbzl5b9xkkx2pml73vq9bn2aq5s4";
libraryHaskellDepends = [ base ];
description = "Broadcast channel type that avoids 0 reader space leaks";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "broadcast-chan_0_2_0_1" = callPackage
+ ({ mkDerivation, async, base, criterion, deepseq, stm
+ , unliftio-core
+ }:
+ mkDerivation {
+ pname = "broadcast-chan";
+ version = "0.2.0.1";
+ sha256 = "0kbs3yz53x7117fykapy70qlmaxkj9zr5r4n9wf126n4g0i6gcpf";
+ revision = "2";
+ editedCabalFile = "1vvs1m5n6lflmp8hdxksxa4ibllfx609y791wg21lvyz5m208hp9";
+ libraryHaskellDepends = [ base unliftio-core ];
+ benchmarkHaskellDepends = [ async base criterion deepseq stm ];
+ description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "broadcast-chan-conduit" = callPackage
+ ({ mkDerivation, base, broadcast-chan, broadcast-chan-tests
+ , conduit, containers, resourcet, transformers, unliftio-core
+ }:
+ mkDerivation {
+ pname = "broadcast-chan-conduit";
+ version = "0.2.0.1";
+ sha256 = "0q3kikryj38macxnwmlk6xijcmvxys0acryj419n7749n7bpc59s";
+ libraryHaskellDepends = [
+ base broadcast-chan conduit resourcet transformers unliftio-core
+ ];
+ testHaskellDepends = [
+ base broadcast-chan-tests conduit containers
+ ];
+ description = "Conduit-based parallel streaming code for broadcast-chan";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "broadcast-chan-pipes" = callPackage
+ ({ mkDerivation, base, broadcast-chan, broadcast-chan-tests
+ , containers, foldl, pipes, pipes-safe
+ }:
+ mkDerivation {
+ pname = "broadcast-chan-pipes";
+ version = "0.2.0.1";
+ sha256 = "0m2g14rlqladhwfvphmnpsddlbc5bhsjdsb4a9r475vkib30gdp2";
+ libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ];
+ testHaskellDepends = [
+ base broadcast-chan-tests containers foldl pipes pipes-safe
+ ];
+ description = "Pipes-based parallel streaming code for broadcast-chan";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "broadcast-chan-tests" = callPackage
+ ({ mkDerivation, async, base, broadcast-chan, clock, containers
+ , foldl, monad-loops, optparse-applicative, paramtree, random, stm
+ , tagged, tasty, tasty-golden, tasty-hunit, tasty-travis, temporary
+ , text
+ }:
+ mkDerivation {
+ pname = "broadcast-chan-tests";
+ version = "0.2.0.1";
+ sha256 = "1l3zqc693jmvxmb5lln6fmwn01rjpwhvlllkrn3v6hs2bwibrp5n";
+ libraryHaskellDepends = [
+ async base broadcast-chan clock containers optparse-applicative
+ paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis
+ temporary text
+ ];
+ testHaskellDepends = [
+ base broadcast-chan containers foldl monad-loops random
+ ];
+ description = "Helpers for generating tests for broadcast-chan";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"broccoli" = callPackage
({ mkDerivation, base, containers, stm, time }:
mkDerivation {
@@ -38979,12 +39693,22 @@ self: {
}) {};
"bsb-http-chunked" = callPackage
- ({ mkDerivation, base, bytestring, bytestring-builder }:
+ ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+ , deepseq, doctest, gauge, hedgehog, semigroups, tasty
+ , tasty-hedgehog, tasty-hunit
+ }:
mkDerivation {
pname = "bsb-http-chunked";
- version = "0.0.0.2";
- sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8";
- libraryHaskellDepends = [ base bytestring bytestring-builder ];
+ version = "0.0.0.4";
+ sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql";
+ libraryHaskellDepends = [ base bytestring ];
+ testHaskellDepends = [
+ attoparsec base blaze-builder bytestring doctest hedgehog tasty
+ tasty-hedgehog tasty-hunit
+ ];
+ benchmarkHaskellDepends = [
+ base blaze-builder bytestring deepseq gauge semigroups
+ ];
description = "Chunked HTTP transfer encoding for bytestring builders";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -39107,8 +39831,8 @@ self: {
}:
mkDerivation {
pname = "btree";
- version = "0.3";
- sha256 = "058pry7g9sbmd0crd1gdpsj9ynvyfcyyvlna1wb49my9m5qmxp79";
+ version = "0.3.1";
+ sha256 = "071ghhjzg7c6m87nh2q53kqbff9hx782h6c1z5s9pwl2b7r8cc7g";
libraryHaskellDepends = [ base ghc-prim primitive ];
testHaskellDepends = [
base containers hashable MonadRandom primitive smallcheck tasty
@@ -39149,6 +39873,8 @@ self: {
pname = "btrfs";
version = "0.1.2.3";
sha256 = "13dq5xdzny1c0yih67r3yhnsr9vxxim8kbqbj5hcygb2cmf0pz3y";
+ revision = "1";
+ editedCabalFile = "1py88k9sjmx9x41l0wmp19a52ng9fdf66rmd0n9404gxxbqd5jxv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring time unix ];
@@ -39156,6 +39882,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "btrfs_0_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, time, unix }:
+ mkDerivation {
+ pname = "btrfs";
+ version = "0.2.0.0";
+ sha256 = "1h56yb4a3i1c452splxj06c8harrcws2pg86rx7jz6b804ncrzr2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bytestring time unix ];
+ 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, cassava, containers, data-default, Decimal, deepseq
@@ -39222,8 +39962,8 @@ self: {
}:
mkDerivation {
pname = "buffer-builder";
- version = "0.2.4.6";
- sha256 = "0r2xn5rc9kg99zcx5x8p15mm6isk0vdr4szc0vyywbj1k96kwf2l";
+ version = "0.2.4.7";
+ sha256 = "0n1zb12zm86rm3jqpdh7j15w6dd1mii0fmaihkdqm0b1rv2zm2dk";
libraryHaskellDepends = [
base bytestring mtl text unordered-containers vector
];
@@ -39311,26 +40051,28 @@ self: {
"bugsnag-haskell" = callPackage
({ mkDerivation, aeson, aeson-qq, base, bytestring
- , case-insensitive, doctest, hspec, http-client, http-client-tls
- , http-conduit, http-types, iproute, network, parsec
- , template-haskell, text, th-lift-instances, time, ua-parser, wai
+ , case-insensitive, containers, doctest, Glob, hspec, http-client
+ , http-client-tls, http-conduit, http-types, iproute, network
+ , parsec, template-haskell, text, th-lift-instances, time
+ , ua-parser, unliftio, wai
}:
mkDerivation {
pname = "bugsnag-haskell";
- version = "0.0.1.3";
- sha256 = "07z2gw0p6cswzr22378z07jdyrww56mby3bfdlc7gxarxyfzsf9f";
+ version = "0.0.2.1";
+ sha256 = "09vvckg6advf47ciq3cv2g06g13d2az1kinby5fpfz1wma7s1zjg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring case-insensitive http-client http-client-tls
- http-conduit http-types iproute network parsec template-haskell
- text th-lift-instances time ua-parser wai
+ aeson base bytestring case-insensitive containers Glob http-client
+ http-client-tls http-conduit http-types iproute network parsec
+ template-haskell text th-lift-instances time ua-parser wai
];
testHaskellDepends = [
- aeson aeson-qq base doctest hspec text time
+ aeson aeson-qq base doctest hspec text time unliftio
];
description = "Bugsnag error reporter for Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bugzilla" = callPackage
@@ -39390,8 +40132,8 @@ self: {
}:
mkDerivation {
pname = "buildbox";
- version = "2.2.1.1";
- sha256 = "19kyi8w3z3k3ydbzw5y57j6m4ffg6y9pachwzsfzjpkfczi7ds7z";
+ version = "2.2.1.2";
+ sha256 = "10kasyr2rk8zm1dh7c2ka1djlxmb20lriphd9sm18z4fw3w82cxz";
libraryHaskellDepends = [
base bytestring containers directory exceptions mtl old-locale
process stm temporary text time
@@ -39468,21 +40210,21 @@ self: {
"bulletproofs" = callPackage
({ mkDerivation, arithmoi, base, containers, cryptonite, memory
- , protolude, QuickCheck, tasty, tasty-discover, tasty-hunit
- , tasty-quickcheck, text
+ , MonadRandom, protolude, QuickCheck, random-shuffle, tasty
+ , tasty-discover, tasty-hunit, tasty-quickcheck, text
}:
mkDerivation {
pname = "bulletproofs";
- version = "0.2.0";
- sha256 = "0njc7wd1vn6i9zw35vjzm73gzv20b6qn3zci61lpnp3zclbclnmb";
- revision = "1";
- editedCabalFile = "0im8y3699rvl0ak3smwry3rafyvrypxan9jb5d39xanwmny2qnky";
+ version = "0.3.0";
+ sha256 = "10ga057zp6sgc177difnb1jjvrsq2d083jchgry7xha2yn0cq0r7";
libraryHaskellDepends = [
- arithmoi base containers cryptonite memory protolude text
+ arithmoi base containers cryptonite memory MonadRandom protolude
+ random-shuffle text
];
testHaskellDepends = [
- arithmoi base containers cryptonite memory protolude QuickCheck
- tasty tasty-discover tasty-hunit tasty-quickcheck text
+ arithmoi base containers cryptonite memory MonadRandom protolude
+ QuickCheck random-shuffle tasty tasty-discover tasty-hunit
+ tasty-quickcheck text
];
testToolDepends = [ tasty-discover ];
license = stdenv.lib.licenses.asl20;
@@ -39661,10 +40403,31 @@ self: {
}:
mkDerivation {
pname = "butcher";
- version = "1.3.1.1";
- sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z";
- revision = "2";
- editedCabalFile = "0r600p7pd4l4p75igklwfqqxp2jyl2ghqc3y6jhn473rrw31g36m";
+ version = "1.3.2.0";
+ sha256 = "06pas8iq0qvvraidjid9m85z7wx8cy017xhyqralxz67alirmchc";
+ revision = "1";
+ editedCabalFile = "1r4v2biwd0hp6v1jgx7zngh0hqlsk8ia3bvggbxxn5sp5x7ika1m";
+ libraryHaskellDepends = [
+ base bifunctors containers deque extra free microlens microlens-th
+ mtl multistate pretty transformers unsafe void
+ ];
+ testHaskellDepends = [
+ base containers deque extra free hspec microlens microlens-th mtl
+ multistate pretty transformers unsafe
+ ];
+ description = "Chops a command or program invocation into digestable pieces";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "butcher_1_3_2_1" = callPackage
+ ({ mkDerivation, base, bifunctors, containers, deque, extra, free
+ , hspec, microlens, microlens-th, mtl, multistate, pretty
+ , transformers, unsafe, void
+ }:
+ mkDerivation {
+ pname = "butcher";
+ version = "1.3.2.1";
+ sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda";
libraryHaskellDepends = [
base bifunctors containers deque extra free microlens microlens-th
mtl multistate pretty transformers unsafe void
@@ -39675,6 +40438,7 @@ self: {
];
description = "Chops a command or program invocation into digestable pieces";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"butter" = callPackage
@@ -39739,8 +40503,8 @@ self: {
}:
mkDerivation {
pname = "bv-little";
- version = "0.1.1";
- sha256 = "153bd5y55scp6qd9q7vnkhp8zwj3qssyr4qy8wpfj8k9xp8xdrk8";
+ version = "0.1.2";
+ sha256 = "0xscq4qjwisqiykdhiirxc58gsrmabvxmxwxw80f2m6ia103k3cc";
libraryHaskellDepends = [
base deepseq hashable integer-gmp mono-traversable primitive
QuickCheck
@@ -39780,8 +40544,8 @@ self: {
}:
mkDerivation {
pname = "byline";
- version = "0.3.1.0";
- sha256 = "11kchyzm908ld3s3k8jh8phbryhp4zj5d3aq4sflfd8pkrns321d";
+ version = "0.3.2.0";
+ sha256 = "100s2f4w0lgnsjgjazck7hnbk3k9ibg1i4rdcyza9jphp67vjgar";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -39925,8 +40689,8 @@ self: {
({ mkDerivation, base, bytestring, deepseq }:
mkDerivation {
pname = "bytestring-builder";
- version = "0.10.8.1.0";
- sha256 = "1hnvjac28y44yn78c9vdp1zvrknvlw98ky3g4n5vivr16rvh8x3d";
+ version = "0.10.8.2.0";
+ sha256 = "0grcrgwwwcvwrs9az7l4d3kf0lsqfa9qpmjzf6iyanvwn9nyzyi7";
libraryHaskellDepends = [ base bytestring deepseq ];
doHaddock = false;
description = "The new bytestring builder, packaged outside of GHC";
@@ -40011,13 +40775,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "bytestring-encoding" = callPackage
+ ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-th, text
+ }:
+ mkDerivation {
+ pname = "bytestring-encoding";
+ version = "0.1.0.0";
+ sha256 = "05pjx59xxpi27j3qfh2cwy9ibfdsc7g0zcsfkdhsj33yxpls363d";
+ libraryHaskellDepends = [ base bytestring text ];
+ testHaskellDepends = [
+ base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+ tasty-th text
+ ];
+ description = "ByteString ↔ Text converter based on GHC.IO.Encoding";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bytestring-encodings" = callPackage
({ mkDerivation, base, bytestring, gauge, ghc-prim, hedgehog, text
}:
mkDerivation {
pname = "bytestring-encodings";
- version = "0.2.0.1";
- sha256 = "0qjqbffp4fa7a95mfsgzhibqblxrxl4qa8kb0yhyb8c1r47r5nn7";
+ version = "0.2.0.2";
+ sha256 = "1x239ihnxxmbfcpm9v79snpdafhammqdsm19pdlnrg02m0ia59pn";
libraryHaskellDepends = [ base bytestring ghc-prim ];
testHaskellDepends = [ base bytestring hedgehog ];
benchmarkHaskellDepends = [ base bytestring gauge text ];
@@ -40202,6 +40983,8 @@ self: {
pname = "bytestring-strict-builder";
version = "0.4.5.1";
sha256 = "17n6ll8k26312fgxbhws1yrswvy5dbsgyf57qksnj0akdssysy8q";
+ revision = "1";
+ editedCabalFile = "1snn8qb17maa76zji75i4yfz9x8ci16xp6zwg6kgwb33lf06imnd";
libraryHaskellDepends = [
base base-prelude bytestring semigroups
];
@@ -40504,8 +41287,8 @@ self: {
}:
mkDerivation {
pname = "c2hs";
- version = "0.28.5";
- sha256 = "1xid997cc38rym6hsgv8xz5dg8jcsh8hs5rrwaxkij7mc09an45x";
+ version = "0.28.6";
+ sha256 = "1nplgxfin139x12sb656f5870rpdclrhzi8mq8pry035qld15pci";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -40658,12 +41441,12 @@ self: {
}:
mkDerivation {
pname = "cabal-cargs";
- version = "1.0.0";
- sha256 = "025cdf78kg572b8bk5xxz4qxibjn4c72x2d3rxn6crz722139rf0";
+ version = "1.1.0";
+ sha256 = "0lrhgbzkswjm4abffacyw6zp4s3na3vp0vkprpxcygm6yjs7db2q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring Cabal cabal-lenses cmdargs directory lens
+ base bytestring Cabal cabal-lenses cmdargs directory filepath lens
system-fileio system-filepath text transformers
unordered-containers
];
@@ -40671,6 +41454,7 @@ self: {
testHaskellDepends = [ base filepath tasty tasty-golden ];
description = "A command line program for extracting compiler arguments from a cabal file";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cabal-constraints" = callPackage
@@ -40717,8 +41501,8 @@ self: {
}:
mkDerivation {
pname = "cabal-debian";
- version = "4.38.1";
- sha256 = "1sniyy2pappjjhvw1bma593gxdcjlg3j2afx8jgb70h6cbl3769n";
+ version = "4.38.2";
+ sha256 = "1hr2y1jymi835pwm17z4fc0r58fkx3h8vxb03qp4fiadily0lg3s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -40795,8 +41579,8 @@ self: {
pname = "cabal-doctest";
version = "1.0.6";
sha256 = "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny";
- revision = "1";
- editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld";
+ revision = "2";
+ editedCabalFile = "1kbiwqm4fxrsdpcqijdq98h8wzmxydcvxd03f1z8dliqzyqsbd60";
libraryHaskellDepends = [ base Cabal directory filepath ];
description = "A Setup.hs helper for doctests running";
license = stdenv.lib.licenses.bsd3;
@@ -40925,23 +41709,25 @@ self: {
({ mkDerivation, array, async, base, base16-bytestring, binary
, bytestring, Cabal, containers, cryptohash-sha256, deepseq
, directory, echo, edit-distance, filepath, hackage-security
- , hashable, HTTP, mtl, network, network-uri, pretty, process
- , random, resolv, stm, tar, time, unix, zlib
+ , hashable, HTTP, mtl, network, network-uri, parsec, pretty
+ , process, random, resolv, stm, tar, text, time, unix, zip-archive
+ , zlib
}:
mkDerivation {
pname = "cabal-install";
- version = "2.2.0.0";
- sha256 = "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8";
+ version = "2.4.0.0";
+ sha256 = "1xmyl0x8wqfrnray6ky5wy0g0samv4264fbdlzxhqsvk9dbfja8k";
revision = "1";
- editedCabalFile = "0f1svlhh4cpj3p5fs9bcjpv15qp291lnvlaxxcw7aib8a1gn3wim";
- isLibrary = true;
+ editedCabalFile = "0cni9i6f6kbfl6f5gypb9ky94ib1w6d0nkd05j4lmrjadnxss49a";
+ isLibrary = false;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath process ];
executableHaskellDepends = [
array async base base16-bytestring binary bytestring Cabal
containers cryptohash-sha256 deepseq directory echo edit-distance
filepath hackage-security hashable HTTP mtl network network-uri
- pretty process random resolv stm tar time unix zlib
+ parsec pretty process random resolv stm tar text time unix
+ zip-archive zlib
];
doCheck = false;
postInstall = ''
@@ -41021,6 +41807,8 @@ self: {
pname = "cabal-lenses";
version = "0.8.0";
sha256 = "1xz28mj98qfqra4kb7lwjkwa5ail0pn1fvia916wp6005mgvsh60";
+ revision = "1";
+ editedCabalFile = "1ij976phgmx7y7v9kbbwqqfkm8vnrggh1qry6wsbbq7f6qb0c0dq";
libraryHaskellDepends = [
base Cabal lens strict system-fileio system-filepath text
transformers unordered-containers
@@ -41124,6 +41912,8 @@ self: {
pname = "cabal-plan";
version = "0.4.0.0";
sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1";
+ revision = "1";
+ editedCabalFile = "161vgfbwm8psqa6ncs12j7sn5lqjag1xi62vllvp8xbz9lcvbchb";
configureFlags = [ "-fexe" ];
isLibrary = true;
isExecutable = true;
@@ -41174,17 +41964,18 @@ self: {
"cabal-rpm" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
- , http-client, http-client-tls, http-conduit, process, time, unix
+ , http-client, http-client-tls, http-conduit, process, simple-cmd
+ , time, unix
}:
mkDerivation {
pname = "cabal-rpm";
- version = "0.12.5";
- sha256 = "0xz2qjj52m8pkazy3dbkh0pqhsg3727x9blka24naibgfl1h7vaa";
+ version = "0.12.6";
+ sha256 = "1k602v7v87w6xcd9a5m8n5grnjbkyn79rdi9azl7djna0rs129ns";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base bytestring Cabal directory filepath http-client
- http-client-tls http-conduit process time unix
+ http-client-tls http-conduit process simple-cmd time unix
];
description = "RPM packaging tool for Haskell Cabal-based packages";
license = stdenv.lib.licenses.gpl3;
@@ -41324,10 +42115,8 @@ self: {
({ mkDerivation, base, Cabal, QuickCheck }:
mkDerivation {
pname = "cabal-test-quickcheck";
- version = "0.1.8.1";
- sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn";
- revision = "1";
- editedCabalFile = "1rq6l86sndcv8nb5nl9rki2kmblrarj9cbra0i6kixa5n1wbcmv6";
+ version = "0.1.8.2";
+ sha256 = "04fdfxvgp518x7n6d74l92qh67z94pay4wldy8dv4n51zhkgk8bf";
libraryHaskellDepends = [ base Cabal QuickCheck ];
description = "QuickCheck for Cabal";
license = stdenv.lib.licenses.mit;
@@ -41455,8 +42244,8 @@ self: {
}:
mkDerivation {
pname = "cabal2nix";
- version = "2.11";
- sha256 = "1wsxris61139j0bvrmzjmjqn186nmr5gvpddv098154d2w8hqn41";
+ version = "2.11.1";
+ sha256 = "16ghy26lzf756197xdm8i3lg5qd8bgzjv80llbkpayibh55rkq72";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -41474,6 +42263,10 @@ self: {
base Cabal containers directory filepath language-nix lens pretty
process tasty tasty-golden
];
+ preCheck = ''
+ export PATH="$PWD/dist/build/cabal2nix:$PATH"
+ export HOME="$TMPDIR/home"
+ '';
description = "Convert Cabal files into Nix build instructions";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -41499,14 +42292,14 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "cabal2spec_2_2_1" = callPackage
+ "cabal2spec_2_2_2" = callPackage
({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty
, tasty-golden, time
}:
mkDerivation {
pname = "cabal2spec";
- version = "2.2.1";
- sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6";
+ version = "2.2.2";
+ sha256 = "1rb7z4lslqsf8ipsyy7nc3mz4ixz5f5cv5jn5nidj0pc5rl16sxw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base Cabal filepath time ];
@@ -41715,50 +42508,50 @@ self: {
"cachix" = callPackage
({ mkDerivation, async, base, base16-bytestring, base64-bytestring
, bifunctors, bytestring, cachix-api, conduit, conduit-extra
- , cookie, cryptonite, dhall, directory, ed25519, fsnotify, here
- , hspec, hspec-discover, http-client, http-client-tls, http-conduit
- , http-types, lzma-conduit, megaparsec, memory, mmorph
- , optparse-applicative, process, protolude, resourcet, servant
- , servant-auth, servant-auth-client, servant-client
- , servant-client-core, servant-streaming-client, streaming, text
- , unix, uri-bytestring, versions
+ , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify
+ , here, hspec, hspec-discover, http-client, http-client-tls
+ , http-conduit, http-types, lzma-conduit, megaparsec, memory
+ , mmorph, optparse-applicative, process, protolude, resourcet
+ , safe-exceptions, servant, servant-auth, servant-auth-client
+ , servant-client, servant-client-core, servant-streaming-client
+ , streaming, text, unix, uri-bytestring, versions
}:
mkDerivation {
pname = "cachix";
- version = "0.1.1";
- sha256 = "0jhjan72dp18dblrb7v4h4h4ffvii7n4dwmpgfyjn8kndmxkaqbd";
+ version = "0.1.2";
+ sha256 = "1pm2cjlllg1sq7vkig8lr9y1gsxa9w4h61rzq47w1mnhn476gv67";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
async base base16-bytestring base64-bytestring bifunctors
bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
- directory ed25519 fsnotify here http-client http-client-tls
- http-conduit http-types lzma-conduit megaparsec memory mmorph
- optparse-applicative process protolude resourcet servant
- servant-auth servant-auth-client servant-client servant-client-core
- servant-streaming-client streaming text unix uri-bytestring
- versions
+ directory ed25519 filepath fsnotify here http-client
+ http-client-tls http-conduit http-types lzma-conduit megaparsec
+ memory mmorph optparse-applicative process protolude resourcet
+ safe-exceptions servant servant-auth servant-auth-client
+ servant-client servant-client-core servant-streaming-client
+ streaming text unix uri-bytestring versions
];
executableHaskellDepends = [
async base base16-bytestring base64-bytestring bifunctors
bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
- directory ed25519 fsnotify here http-client http-client-tls
- http-conduit http-types lzma-conduit megaparsec memory mmorph
- optparse-applicative process protolude resourcet servant
- servant-auth servant-auth-client servant-client servant-client-core
- servant-streaming-client streaming text unix uri-bytestring
- versions
+ directory ed25519 filepath fsnotify here http-client
+ http-client-tls http-conduit http-types lzma-conduit megaparsec
+ memory mmorph optparse-applicative process protolude resourcet
+ safe-exceptions servant servant-auth servant-auth-client
+ servant-client servant-client-core servant-streaming-client
+ streaming text unix uri-bytestring versions
];
executableToolDepends = [ hspec-discover ];
testHaskellDepends = [
async base base16-bytestring base64-bytestring bifunctors
bytestring cachix-api conduit conduit-extra cookie cryptonite dhall
- directory ed25519 fsnotify here hspec http-client http-client-tls
- http-conduit http-types lzma-conduit megaparsec memory mmorph
- optparse-applicative process protolude resourcet servant
- servant-auth servant-auth-client servant-client servant-client-core
- servant-streaming-client streaming text unix uri-bytestring
- versions
+ directory ed25519 filepath fsnotify here hspec http-client
+ http-client-tls http-conduit http-types lzma-conduit megaparsec
+ memory mmorph optparse-applicative process protolude resourcet
+ safe-exceptions servant servant-auth servant-auth-client
+ servant-client servant-client-core servant-streaming-client
+ streaming text unix uri-bytestring versions
];
description = "Command line client for Nix binary cache hosting https://cachix.org";
license = stdenv.lib.licenses.asl20;
@@ -41767,40 +42560,38 @@ self: {
"cachix-api" = callPackage
({ mkDerivation, aeson, amazonka, base, base16-bytestring
- , bytestring, conduit, conduit-combinators, cookie, cryptonite
- , hspec, hspec-discover, http-api-data, http-media, lens, memory
- , protolude, servant, servant-auth, servant-auth-server
- , servant-auth-swagger, servant-streaming, servant-swagger
- , servant-swagger-ui-core, string-conv, swagger2, text
- , transformers
+ , bytestring, conduit, cookie, cryptonite, hspec, hspec-discover
+ , http-api-data, http-media, lens, memory, protolude, servant
+ , servant-auth, servant-auth-server, servant-auth-swagger
+ , servant-streaming, servant-swagger, servant-swagger-ui-core
+ , string-conv, swagger2, text, transformers
}:
mkDerivation {
pname = "cachix-api";
- version = "0.1.0.1";
- sha256 = "0z9dbci88qyyqc4b8kl6ab3k8yvgnmswi590qwyjvhc6va2fn3y6";
+ version = "0.1.0.2";
+ sha256 = "0jqak93ixqzr76lm0mgn9fqfsmkz1ik41j5l629d3hbl7sah15gn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson amazonka base base16-bytestring bytestring conduit
- conduit-combinators cookie cryptonite http-api-data http-media lens
- memory servant servant-auth servant-auth-server
- servant-auth-swagger servant-streaming servant-swagger
- servant-swagger-ui-core string-conv swagger2 text transformers
+ aeson amazonka base base16-bytestring bytestring conduit cookie
+ cryptonite http-api-data http-media lens memory servant
+ servant-auth servant-auth-server servant-auth-swagger
+ servant-streaming servant-swagger servant-swagger-ui-core
+ string-conv swagger2 text transformers
];
executableHaskellDepends = [
- aeson amazonka base base16-bytestring bytestring conduit
- conduit-combinators cookie cryptonite http-api-data http-media lens
- memory servant servant-auth servant-auth-server
- servant-auth-swagger servant-streaming servant-swagger
- servant-swagger-ui-core string-conv swagger2 text transformers
+ aeson amazonka base base16-bytestring bytestring conduit cookie
+ cryptonite http-api-data http-media lens memory servant
+ servant-auth servant-auth-server servant-auth-swagger
+ servant-streaming servant-swagger servant-swagger-ui-core
+ string-conv swagger2 text transformers
];
testHaskellDepends = [
- aeson amazonka base base16-bytestring bytestring conduit
- conduit-combinators cookie cryptonite hspec http-api-data
- http-media lens memory protolude servant servant-auth
- servant-auth-server servant-auth-swagger servant-streaming
- servant-swagger servant-swagger-ui-core string-conv swagger2 text
- transformers
+ aeson amazonka base base16-bytestring bytestring conduit cookie
+ cryptonite hspec http-api-data http-media lens memory protolude
+ servant servant-auth servant-auth-server servant-auth-swagger
+ servant-streaming servant-swagger servant-swagger-ui-core
+ string-conv swagger2 text transformers
];
testToolDepends = [ hspec-discover ];
description = "Servant HTTP API specification for https://cachix.org";
@@ -41815,10 +42606,8 @@ self: {
}:
mkDerivation {
pname = "cacophony";
- version = "0.10.0";
- sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv";
- revision = "2";
- editedCabalFile = "0w7nq4c5i89vmslxhvzw8299gig2wrr0ayddqjk5dxghmmly3hdw";
+ version = "0.10.1";
+ sha256 = "1w9v04mdyzvwndqfb8my9a82b51avgwfnl6g7w89xj37ax9ariaj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -42112,8 +42901,8 @@ self: {
({ mkDerivation, base, containers, html, old-time, utility-ht }:
mkDerivation {
pname = "calendar-recycling";
- version = "0.0";
- sha256 = "0qvrxq3pgbbska0mqw9wk7wpsiln0i8rbdxnj4jfiv5vpp2n4gm3";
+ version = "0.0.0.1";
+ sha256 = "0afmnii65axpqk3x50wj1d17942m1kyhwka3bn78ylxy9z7rrlwc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -42274,6 +43063,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "canonical-json" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, parsec
+ , pretty, QuickCheck, tasty, tasty-quickcheck, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "canonical-json";
+ version = "0.5.0.1";
+ sha256 = "1r52f69afsnl6kmn0h2rl6wp21jjain4kz6123a1haacfm2f2hwj";
+ libraryHaskellDepends = [
+ base bytestring containers parsec pretty
+ ];
+ testHaskellDepends = [
+ aeson base bytestring QuickCheck tasty tasty-quickcheck
+ unordered-containers vector
+ ];
+ description = "Canonical JSON for signing and hashing JSON values";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"canteven-config" = callPackage
({ mkDerivation, base, unix, yaml }:
mkDerivation {
@@ -42427,6 +43236,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "capability" = callPackage
+ ({ mkDerivation, base, containers, dlist, exceptions, generic-lens
+ , hspec, lens, monad-control, monad-unlift, mtl, mutable-containers
+ , primitive, safe-exceptions, silently, streaming, temporary, text
+ , transformers, unliftio, unliftio-core
+ }:
+ mkDerivation {
+ pname = "capability";
+ version = "0.1.0.0";
+ sha256 = "1aif560z65hmq0pyf6b30nj73685r85vgq440pmzgfhidbn4lf51";
+ libraryHaskellDepends = [
+ base dlist exceptions generic-lens lens monad-control monad-unlift
+ mtl mutable-containers primitive safe-exceptions streaming
+ transformers unliftio unliftio-core
+ ];
+ testHaskellDepends = [
+ base containers hspec lens mtl silently streaming temporary text
+ unliftio
+ ];
+ description = "Extensional capabilities and deriving combinators";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"capataz" = callPackage
({ mkDerivation, async, base, bytestring, pretty-show
, prettyprinter, rio, tasty, tasty-hunit, tasty-smallcheck
@@ -42459,8 +43292,10 @@ self: {
}:
mkDerivation {
pname = "capnp";
- version = "0.1.0.0";
- sha256 = "14my9py7vjvxq51cd7sys8bxzyvwm2196qwjp2027daqbh7975vl";
+ version = "0.3.0.0";
+ sha256 = "17i7m168bqp57m5lb04sbfh2amc1sicv2jajkl61jb1gsidwdkrz";
+ revision = "1";
+ editedCabalFile = "0faisbw98h1zjsqja57c0xac6hhnhb4sghzh9a3225pp8wxnbjr7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -42482,6 +43317,7 @@ self: {
];
description = "Cap'n Proto for Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"capped-list" = callPackage
@@ -43167,6 +44003,8 @@ self: {
pname = "cassava";
version = "0.5.1.0";
sha256 = "0xs2c5lpy0g5lsmp2cx0dm5lnxij7cgry6xd5gsn3bfdlap8lb3n";
+ revision = "1";
+ editedCabalFile = "1brz20js95synh0yw942ihy4y9y6nk4xnsqcjqi9580y24zcigkl";
configureFlags = [ "-f-bytestring--lt-0_10_4" ];
libraryHaskellDepends = [
array attoparsec base bytestring containers deepseq hashable Only
@@ -43240,6 +44078,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "cassava-megaparsec_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec
+ , megaparsec, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "cassava-megaparsec";
+ version = "2.0.0";
+ sha256 = "0jwhvgfkgxpxp6cci9ahp3kryr4vaxbpqgjzf8ylr2592dm2irnf";
+ libraryHaskellDepends = [
+ base bytestring cassava megaparsec unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base bytestring cassava hspec hspec-megaparsec vector
+ ];
+ description = "Megaparsec parser of CSV files that plays nicely with Cassava";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cassava-records" = callPackage
({ mkDerivation, attoparsec, base, bytestring, cassava, containers
, foldl, HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -43268,8 +44125,8 @@ self: {
}:
mkDerivation {
pname = "cassava-streams";
- version = "0.3.0.2";
- sha256 = "09aiwcc9q768jz7xd7hxymrj3hw6g21imsh6ka4rrw059hi4lzna";
+ version = "0.3.0.3";
+ sha256 = "01s0h2mi9b4h3jy405jvz2an8w6fdvg370mizfk910anx7wsa3ix";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -43568,8 +44425,8 @@ self: {
}:
mkDerivation {
pname = "cayley-client";
- version = "0.4.6";
- sha256 = "1wyf6bz87b83lxcdbm84db7ziv3ggb3zbj4qd2cvfc7m4wr9a0v6";
+ version = "0.4.7";
+ sha256 = "13jrmlci29hdx0mxs4lzd9xdrdn9qga4891p49nhfpfiz4gch6xs";
libraryHaskellDepends = [
aeson attoparsec base binary bytestring exceptions http-client
http-conduit lens lens-aeson mtl text transformers
@@ -43623,10 +44480,8 @@ self: {
}:
mkDerivation {
pname = "cbor-tool";
- version = "0.2.0.0";
- sha256 = "0m8ic53vbzk06xw8rxs9vndnmbdjmcslc8zqa7lafhnl3lgqaybp";
- revision = "1";
- editedCabalFile = "08yd8qv9kalgr6hn2kwwzmqzaq4i05fp7d7pfmnkfm7jg6zm8kwy";
+ version = "0.2.1.0";
+ sha256 = "0cjgkl8az6qnq0b48ljw5yshkzq7lb7c6mb0gm07z2dpaxsk0rwm";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -43638,19 +44493,24 @@ self: {
}) {};
"cborg" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, ghc-prim
- , half, integer-gmp, primitive, text
+ ({ mkDerivation, aeson, array, base, base16-bytestring
+ , base64-bytestring, bytestring, containers, deepseq, fail
+ , ghc-prim, half, integer-gmp, primitive, QuickCheck, scientific
+ , tasty, tasty-hunit, tasty-quickcheck, text, vector
}:
mkDerivation {
pname = "cborg";
- version = "0.2.0.0";
- sha256 = "1dvzqzk68ym1v1gxrx8kc59hj4jd2l0c8f2bqf67jgm5ld0bv340";
- revision = "2";
- editedCabalFile = "1fim6qbzimff8hpzv6bw558pzkh65cql8gdjinghc7w9c5my6y7l";
+ version = "0.2.1.0";
+ sha256 = "10vlv5mwg9625rmir7mi0zj5ygs3j3vlhm2h8lilkbj5frgp764i";
libraryHaskellDepends = [
- array base bytestring containers ghc-prim half integer-gmp
+ array base bytestring containers deepseq ghc-prim half integer-gmp
primitive text
];
+ testHaskellDepends = [
+ aeson array base base16-bytestring base64-bytestring bytestring
+ deepseq fail half QuickCheck scientific tasty tasty-hunit
+ tasty-quickcheck text vector
+ ];
description = "Concise Binary Object Representation";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -43661,10 +44521,8 @@ self: {
}:
mkDerivation {
pname = "cborg-json";
- version = "0.2.0.0";
- sha256 = "09ps2lyvxg0qpki9f0lydag9hyys20q5ywgxim0jcaa0jky0j92x";
- revision = "1";
- editedCabalFile = "1v0brbq9ri5fx19kb2ijhd3h3ibqadfprgcisja0mx6amzkbqnrz";
+ version = "0.2.1.0";
+ sha256 = "01i0npbwf6cnjkwwk0l4fnwlbjhsj7vn3d4zd202hcnxdm7bbdiz";
libraryHaskellDepends = [
aeson aeson-pretty base cborg scientific text unordered-containers
vector
@@ -43742,8 +44600,8 @@ self: {
}:
mkDerivation {
pname = "cdeps";
- version = "0.1.1.7";
- sha256 = "15acmkp512bzpq9d0yz4dclpvb71fr2wv292ygv371nhyzs8vilp";
+ version = "0.1.2.2";
+ sha256 = "1p2razfnqzg9ya421al80db3ag62gwx5l55l2hyw7ka617jpagyd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -44507,6 +45365,8 @@ self: {
pname = "charset";
version = "0.3.7.1";
sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x";
+ revision = "1";
+ editedCabalFile = "1z6nxw2g9vgsjq0g159sk8mwj68lwzxzi5iv5ynha0h85jcqxszy";
libraryHaskellDepends = [
array base bytestring containers semigroups unordered-containers
];
@@ -44839,26 +45699,26 @@ self: {
, directory, file-embed, filepath, github, hlint, hspec
, hspec-megaparsec, interpolatedstring-perl6, megaparsec
, monad-parallel, optparse-applicative, process, QuickCheck
- , quickcheck-text, range, temporary, text
+ , quickcheck-text, temporary, text
}:
mkDerivation {
pname = "checkmate";
- version = "0.3.2";
- sha256 = "1s79cpi5hzfb59705i6gdvicczvddsbikcwwqx22v3yfyakbbxww";
+ version = "0.4.0";
+ sha256 = "0l5d1wf9pbji0h8qsqhqliv3kvzc6xcryq5zvps375pk8r5l2lvb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base containers diff-parse directory filepath github megaparsec
- monad-parallel range text
+ monad-parallel text
];
executableHaskellDepends = [
base diff-parse directory filepath megaparsec optparse-applicative
- process range text
+ process text
];
testHaskellDepends = [
base bytestring diff-parse directory file-embed filepath hlint
hspec hspec-megaparsec interpolatedstring-perl6 megaparsec
- QuickCheck quickcheck-text range temporary text
+ QuickCheck quickcheck-text temporary text
];
description = "Generate checklists relevant to a given patch";
license = stdenv.lib.licenses.agpl3;
@@ -45620,8 +46480,8 @@ self: {
pname = "circle-packing";
version = "0.1.0.6";
sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4";
- revision = "1";
- editedCabalFile = "10dh8jgjah1h54f83s9289abfqzc4ifykb01p5jljfac63yn42zs";
+ revision = "2";
+ editedCabalFile = "1ag213lv6yfzxdc4ghbywy165qblnqx5b3j9d23kc6fcyf19nfyk";
libraryHaskellDepends = [ base ];
description = "Simple heuristic for packing discs of varying radii in a circle";
license = stdenv.lib.licenses.bsd3;
@@ -45810,8 +46670,8 @@ self: {
({ mkDerivation, base, criterion, QuickCheck, random }:
mkDerivation {
pname = "cl3";
- version = "1.0.0.3";
- sha256 = "16jllcyqdd6i0gq730c88ls47d2334ywr317pm7q6d6vgrjc4gjj";
+ version = "1.0.0.4";
+ sha256 = "18q5r2m4sr7h8z35nivq2fndmxamyw3217j11na4gq361rq1340v";
libraryHaskellDepends = [ base random ];
testHaskellDepends = [ base QuickCheck ];
benchmarkHaskellDepends = [ base criterion ];
@@ -46213,6 +47073,37 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "classify-frog" = callPackage
+ ({ mkDerivation, array, audacity, base, bifunctors, Cabal, carray
+ , concurrent-split, containers, deepseq, explicit-exception, fft
+ , filemanip, gnuplot, hmatrix, hmm-hmatrix, lazy-csv, llvm-extra
+ , llvm-tf, non-empty, numeric-prelude, optparse-applicative
+ , parallel, pathtype, pooled-io, semigroups, soxlib
+ , storable-record, storablevector, storablevector-carray
+ , synthesizer-core, synthesizer-llvm, tagchup, text, time
+ , transformers, utility-ht, xml-basic
+ }:
+ mkDerivation {
+ pname = "classify-frog";
+ version = "0.2.3";
+ sha256 = "1fhiia335snb14nkvn3sglv0z7mkc7y5vj6jsaa8v9l72fwacz9a";
+ isLibrary = false;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ executableHaskellDepends = [
+ array audacity base bifunctors Cabal carray concurrent-split
+ containers deepseq explicit-exception fft filemanip gnuplot hmatrix
+ hmm-hmatrix lazy-csv llvm-extra llvm-tf non-empty numeric-prelude
+ optparse-applicative parallel pathtype pooled-io semigroups soxlib
+ storable-record storablevector storablevector-carray
+ synthesizer-core synthesizer-llvm tagchup text time transformers
+ utility-ht xml-basic
+ ];
+ description = "Classify sounds produced by Xenopus laevis";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"classy-influxdb-simple" = callPackage
({ mkDerivation, aeson, async-io-either, base, bytestring, lens
, mtl, scientific, text, time, vector, wreq
@@ -46278,6 +47169,34 @@ self: {
pname = "classy-prelude";
version = "1.4.0";
sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb";
+ revision = "1";
+ editedCabalFile = "1gf615lz0bfsn09vrjgj63d8zcpsmz1cgvdv8px3h0b4jrwdij6v";
+ libraryHaskellDepends = [
+ async base basic-prelude bifunctors bytestring chunked-data
+ containers deepseq dlist ghc-prim hashable mono-traversable
+ mono-traversable-instances mtl mutable-containers primitive say
+ semigroups stm stm-chans text time transformers unliftio
+ unordered-containers vector vector-instances
+ ];
+ testHaskellDepends = [
+ base containers hspec QuickCheck transformers unordered-containers
+ ];
+ description = "A typeclass-based Prelude";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "classy-prelude_1_5_0" = callPackage
+ ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
+ , chunked-data, containers, deepseq, dlist, ghc-prim, hashable
+ , hspec, mono-traversable, mono-traversable-instances, mtl
+ , mutable-containers, primitive, QuickCheck, say, semigroups, stm
+ , stm-chans, text, time, transformers, unliftio
+ , unordered-containers, vector, vector-instances
+ }:
+ mkDerivation {
+ pname = "classy-prelude";
+ version = "1.5.0";
+ sha256 = "1nm4lygxqb1wq503maki6dsah2gpn5rd22jmbwjxfwyzgyqy9fnk";
libraryHaskellDepends = [
async base basic-prelude bifunctors bytestring chunked-data
containers deepseq dlist ghc-prim hashable mono-traversable
@@ -46290,6 +47209,7 @@ self: {
];
description = "A typeclass-based Prelude";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"classy-prelude-conduit" = callPackage
@@ -46311,6 +47231,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "classy-prelude-conduit_1_5_0" = callPackage
+ ({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
+ , monad-control, QuickCheck, resourcet, transformers, void
+ }:
+ mkDerivation {
+ pname = "classy-prelude-conduit";
+ version = "1.5.0";
+ sha256 = "007xz0yzp0bzbrx7arj7xmjlwrja120kwgxrbkm98sydjlsph9ys";
+ libraryHaskellDepends = [
+ base bytestring classy-prelude conduit monad-control resourcet
+ transformers void
+ ];
+ testHaskellDepends = [
+ base bytestring conduit hspec QuickCheck transformers
+ ];
+ description = "classy-prelude together with conduit functions";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"classy-prelude-yesod" = callPackage
({ mkDerivation, aeson, base, classy-prelude
, classy-prelude-conduit, data-default, http-conduit, http-types
@@ -46330,6 +47270,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "classy-prelude-yesod_1_5_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.5.0";
+ sha256 = "10wz09ksn537w5z9lmj4dsfi0ygk37d5khijr8qq3py2gr2c9ywz";
+ libraryHaskellDepends = [
+ aeson base classy-prelude classy-prelude-conduit data-default
+ http-conduit http-types persistent yesod yesod-newsfeed
+ yesod-static
+ ];
+ description = "Provide a classy prelude including common Yesod functionality";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"classyplate" = callPackage
({ mkDerivation, base, criterion, parallel, template-haskell
, uniplate
@@ -46371,8 +47330,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks";
- version = "0.24.0.7";
- sha256 = "1czalrr7y3526jb4cgi8bghxghqwsjwkfhm5vb4q19xzqg3kjqwy";
+ version = "0.24.0.8";
+ sha256 = "1csiak0i3aaz56f64509w49q4j21cb10zlxdx8lyhbm8aikva0n1";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
@@ -46543,8 +47502,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-plugin-page";
- version = "0.4.3.12";
- sha256 = "0xndx7843laiha1n8xscq13dv6x6fv098v1cdmmzx7qnvfvhhlxj";
+ version = "0.4.3.13";
+ sha256 = "0fkfsi9hv0hv4zbv2znb0v30z5qvifgmz9875868va0830nv3ibh";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
acid-state aeson attoparsec base clckwrks containers directory
@@ -47164,8 +48123,8 @@ self: {
}:
mkDerivation {
pname = "cloudi";
- version = "1.7.3";
- sha256 = "10in4z00in2js5w2zgg6ydm7i2n0f0y2ass421p5rqpfv9q7y179";
+ version = "1.7.4";
+ sha256 = "0vpsb7sngc8q7bkdg737bfzqfkl14mwjzaycfs0x0fwl6f8l5a8a";
libraryHaskellDepends = [
array base binary bytestring containers network time unix zlib
];
@@ -47216,8 +48175,8 @@ self: {
}:
mkDerivation {
pname = "clr-host";
- version = "0.2.0.1";
- sha256 = "15hfdwddqij5dhl8qbq89rsbjvxpymvph8wz2naxa8mrd09yl1jk";
+ version = "0.2.1.0";
+ sha256 = "192yzi7xx2hrk2q0i4qzq0plam2b0xgg9r5s3kjzcvf9hq1vyapy";
setupHaskellDepends = [
base Cabal directory filepath transformers
];
@@ -47455,25 +48414,8 @@ self: {
}:
mkDerivation {
pname = "cmark-gfm";
- version = "0.1.4";
- sha256 = "0jjcl7pfack8aksx34m1f80ll0y62ba1fyzdn77xbs2rvlvjzw0m";
- libraryHaskellDepends = [ base bytestring text ];
- testHaskellDepends = [ base HUnit text ];
- benchmarkHaskellDepends = [
- base blaze-html cheapskate criterion discount markdown sundown text
- ];
- description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cmark-gfm_0_1_5" = callPackage
- ({ mkDerivation, base, blaze-html, bytestring, cheapskate
- , criterion, discount, HUnit, markdown, sundown, text
- }:
- mkDerivation {
- pname = "cmark-gfm";
- version = "0.1.5";
- sha256 = "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7";
+ version = "0.1.6";
+ sha256 = "0s39djd1j0rq63g4sy0cnras14m263anr56nvijcbcy9zg41dyf8";
libraryHaskellDepends = [ base bytestring text ];
testHaskellDepends = [ base HUnit text ];
benchmarkHaskellDepends = [
@@ -47481,7 +48423,6 @@ self: {
];
description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cmark-highlight" = callPackage
@@ -47782,6 +48723,39 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "co-log" = callPackage
+ ({ mkDerivation, ansi-terminal, base, base-noprelude, bytestring
+ , co-log-core, containers, contravariant, markdown-unlit, mtl
+ , relude, text, time, transformers, typerep-map
+ }:
+ mkDerivation {
+ pname = "co-log";
+ version = "0.1.0";
+ sha256 = "101ajw1qckc7nin5ard3dcamhz447qv0wv1wvnid8xmw9zsjf7gg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base-noprelude bytestring co-log-core containers
+ contravariant mtl relude text time transformers typerep-map
+ ];
+ executableHaskellDepends = [ base relude text typerep-map ];
+ executableToolDepends = [ markdown-unlit ];
+ description = "Logging library";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "co-log-core" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "co-log-core";
+ version = "0.1.0";
+ sha256 = "1yxz7p5df70r0327gxfip2nwjh8gsc2fh1i6bjaf9yzfccar69xx";
+ libraryHaskellDepends = [ base ];
+ description = "Logging library";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"coalpit" = callPackage
({ mkDerivation, base, generic-random, megaparsec, network-uri
, scientific, tasty, tasty-quickcheck, tasty-travis, time
@@ -48271,6 +49245,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "collapse-duplication" = callPackage
+ ({ mkDerivation, base, bytestring, bytestring-show, cassava
+ , containers, hierarchical-clustering, lens, optparse-generic
+ , split
+ }:
+ mkDerivation {
+ pname = "collapse-duplication";
+ version = "0.4.0.1";
+ sha256 = "0azfyayvlw6vmgim98rsmgz5gx2dmwnbk9dwmm23781wdbm448a5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring bytestring-show cassava containers
+ hierarchical-clustering lens
+ ];
+ executableHaskellDepends = [
+ base bytestring cassava containers lens optparse-generic split
+ ];
+ description = "Collapse the duplication output into clones and return their frequencies";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"collapse-util" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -48533,6 +49529,8 @@ self: {
pname = "colour-accelerate";
version = "0.3.0.0";
sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz";
+ revision = "1";
+ editedCabalFile = "1mbz9wdx396q8gdy6yqsc5vsxrkky9zkxczjblvc9zy542v252cn";
libraryHaskellDepends = [ accelerate base ];
description = "Working with colours in Accelerate";
license = stdenv.lib.licenses.bsd3;
@@ -48687,19 +49685,21 @@ self: {
}) {};
"combinat" = callPackage
- ({ mkDerivation, array, base, containers, QuickCheck, random
- , test-framework, test-framework-quickcheck2, transformers
+ ({ mkDerivation, array, base, containers, QuickCheck, random, tasty
+ , tasty-hunit, tasty-quickcheck, test-framework
+ , test-framework-quickcheck2, transformers
}:
mkDerivation {
pname = "combinat";
- version = "0.2.8.2";
- sha256 = "0i7hk8518ixwxvxgy9xbf9hcyfpvmcfgz5m3wbxzcj5ry4rnnhnh";
+ version = "0.2.9.0";
+ sha256 = "1y617qyhqh2k6d51j94c0xnj54i7b86d87n0j12idxlkaiv4j5sw";
libraryHaskellDepends = [
array base containers random transformers
];
testHaskellDepends = [
- array base containers QuickCheck random test-framework
- test-framework-quickcheck2 transformers
+ array base containers QuickCheck random tasty tasty-hunit
+ tasty-quickcheck test-framework test-framework-quickcheck2
+ transformers
];
description = "Generate and manipulate various combinatorial objects";
license = stdenv.lib.licenses.bsd3;
@@ -48770,10 +49770,8 @@ self: {
}:
mkDerivation {
pname = "combinatorial";
- version = "0.1";
- sha256 = "1a5l4iixjhvqca8dvwkx3zvlaimp6ggr3fcm7vk7r77rv6n6svh9";
- revision = "1";
- editedCabalFile = "1bqcg04w48dqk4n1n36j9ykajrmwqdd4qpcjjjfhzvm83z5ypsh7";
+ version = "0.1.0.1";
+ sha256 = "0w6vjs2pg2dffbq1dbs1dygnxk8nppzhkq3bgrg3ydfdzra7imn4";
libraryHaskellDepends = [
array base containers transformers utility-ht
];
@@ -48828,12 +49826,18 @@ self: {
}) {};
"comfort-array" = callPackage
- ({ mkDerivation, base, utility-ht }:
+ ({ mkDerivation, base, guarded-allocation, primitive, QuickCheck
+ , storable-record, transformers, utility-ht
+ }:
mkDerivation {
pname = "comfort-array";
- version = "0.0.1.1";
- sha256 = "1p6ba5yjpldhy5j7cml2i0i6597pjw87l6xpym1hccn6q1mkqxq5";
- libraryHaskellDepends = [ base utility-ht ];
+ version = "0.1.2";
+ sha256 = "1rc8gfgjid10wajjk5pp1vmm8wc2apr5qcr2w41pwk25m554iyz1";
+ libraryHaskellDepends = [
+ base guarded-allocation primitive QuickCheck storable-record
+ transformers utility-ht
+ ];
+ testHaskellDepends = [ base QuickCheck ];
description = "Arrays where the index type is a function of the shape type";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -48844,8 +49848,8 @@ self: {
}:
mkDerivation {
pname = "comfort-graph";
- version = "0.0.3";
- sha256 = "11s3ag5skk07vs4h6xl20hbmlrbxqcwrj54wfpz2fk73347prmmr";
+ version = "0.0.3.1";
+ sha256 = "0qmmz3z9dgjb41rj6g81ppxaj4jswqnnb8bqn2s1dd6hf6cih9n9";
libraryHaskellDepends = [
base containers QuickCheck semigroups transformers utility-ht
];
@@ -49025,6 +50029,8 @@ self: {
pname = "comonad-extras";
version = "4.0";
sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62";
+ revision = "1";
+ editedCabalFile = "1bmhdmncfbv80qgmykn67f4jkwbgags4ypaqibnzz849hpmibfj1";
libraryHaskellDepends = [
array base comonad containers distributive semigroupoids
transformers
@@ -49085,6 +50091,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "compact-list" = callPackage
+ ({ mkDerivation, base, ghc-prim }:
+ mkDerivation {
+ pname = "compact-list";
+ version = "0.1.0";
+ sha256 = "0mg2s7mm908gy5j958abmiylfc05fs4y08dcjz4805ayi9cb1qqd";
+ libraryHaskellDepends = [ base ghc-prim ];
+ testHaskellDepends = [ base ];
+ description = "An append only list in a compact region";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"compact-map" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers }:
mkDerivation {
@@ -49200,26 +50218,26 @@ self: {
}) {};
"compdata" = callPackage
- ({ mkDerivation, base, containers, criterion, deepseq, derive
- , HUnit, mtl, QuickCheck, random, template-haskell, test-framework
+ ({ mkDerivation, base, containers, criterion, deepseq, HUnit, mtl
+ , QuickCheck, random, template-haskell, test-framework
, test-framework-hunit, test-framework-quickcheck2, th-expand-syns
, transformers, tree-view, uniplate
}:
mkDerivation {
pname = "compdata";
- version = "0.11";
- sha256 = "1h8ri808zaggfi4n4anq8sdz76f8pij9p5g9wpf4w6zvcghg5jn4";
+ version = "0.12";
+ sha256 = "0b08mmj04bbi735hvvdbg1nmg66qg1c11r0kvq7m569r91bmy54v";
libraryHaskellDepends = [
- base containers deepseq derive mtl QuickCheck template-haskell
+ base containers deepseq mtl QuickCheck template-haskell
th-expand-syns transformers tree-view
];
testHaskellDepends = [
- base containers deepseq derive HUnit mtl QuickCheck
- template-haskell test-framework test-framework-hunit
- test-framework-quickcheck2 th-expand-syns transformers
+ base containers deepseq HUnit mtl QuickCheck template-haskell
+ test-framework test-framework-hunit test-framework-quickcheck2
+ th-expand-syns transformers
];
benchmarkHaskellDepends = [
- base containers criterion deepseq derive mtl QuickCheck random
+ base containers criterion deepseq mtl QuickCheck random
template-haskell th-expand-syns transformers uniplate
];
description = "Compositional Data Types";
@@ -49232,8 +50250,8 @@ self: {
}:
mkDerivation {
pname = "compdata-automata";
- version = "0.9.1";
- sha256 = "1d4q6ssck7jknkxarkz3zcgc5mk60f16wp58kzf1dgv2ar42w4cy";
+ version = "0.9.2";
+ sha256 = "0yb0mlkvk25fmypad4pmg31vk6v5xqi2sqz1jpnjkgn9jhcn8p19";
libraryHaskellDepends = [ base compdata containers projection ];
benchmarkHaskellDepends = [
base compdata containers criterion projection
@@ -49250,8 +50268,8 @@ self: {
}:
mkDerivation {
pname = "compdata-dags";
- version = "0.2";
- sha256 = "0z5vjfm0c4bcixnh951mzc06977l3lcs0v8mz6pbn65qbvv0d27c";
+ version = "0.2.1";
+ sha256 = "0h2ijhwpxv4bzfz81zhvhi7f42slzqsxawgqd9swk4kmqqzlfr58";
libraryHaskellDepends = [
base compdata containers mtl unordered-containers vector
];
@@ -49265,6 +50283,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "compdata-fixplate" = callPackage
+ ({ mkDerivation, base, composition, containers, deriving-compat
+ , fixplate, tree-view
+ }:
+ mkDerivation {
+ pname = "compdata-fixplate";
+ version = "0.1.2";
+ sha256 = "1ljnmwgjllpcrgibfxxb4zghfl76g7951i2r9haycpwmikz7dggz";
+ libraryHaskellDepends = [
+ base composition containers deriving-compat fixplate tree-view
+ ];
+ description = "Compdata basics implemented on top of Fixplate";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"compdata-param" = callPackage
({ mkDerivation, base, compdata, containers, HUnit, mtl
, template-haskell, test-framework, test-framework-hunit
@@ -49272,8 +50305,8 @@ self: {
}:
mkDerivation {
pname = "compdata-param";
- version = "0.9.1";
- sha256 = "079pnr11y2ra1p236h7hlwgm7az7094h2s3g5x43r4q9kzdym5zc";
+ version = "0.9.2";
+ sha256 = "1cfs7q6pw642dg1xjibrsvpkw1bg15g9lmj70y25xka192d9c2w2";
libraryHaskellDepends = [
base compdata mtl template-haskell transformers
];
@@ -49354,8 +50387,8 @@ self: {
pname = "complex-generic";
version = "0.1.1.1";
sha256 = "03wb599difj0qm1dpzgxdymq3bql69qmkdk5fspcyc19nnd5qlqz";
- revision = "2";
- editedCabalFile = "160lw045p7j5vm4j2sqqfpnfgkxkil2kwjnmi7x6am03gfi9g9kw";
+ revision = "3";
+ editedCabalFile = "0vm0i25bib0bzlw7fw209pqn3963y5hx0vkri049q4v7y0qld8k9";
libraryHaskellDepends = [ base template-haskell ];
description = "complex numbers with non-mandatory RealFloat";
license = stdenv.lib.licenses.bsd3;
@@ -49628,19 +50661,19 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "composition-prelude";
- version = "1.5.0.8";
- sha256 = "1pgpjmb5pnnil98h6xrr9vmxxn8hgh20k9gjzm3jqzmx0l6dyspc";
+ version = "1.5.3.1";
+ sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d";
libraryHaskellDepends = [ base ];
description = "Higher-order function combinators";
license = stdenv.lib.licenses.bsd3;
}) {};
- "composition-prelude_1_5_3_1" = callPackage
+ "composition-prelude_2_0_1_0" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "composition-prelude";
- version = "1.5.3.1";
- sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d";
+ version = "2.0.1.0";
+ sha256 = "027fzappyma8hqqkqka21af937h57fdaq8ni73skxa03pcflwqmc";
libraryHaskellDepends = [ base ];
description = "Higher-order function combinators";
license = stdenv.lib.licenses.bsd3;
@@ -49871,21 +50904,22 @@ self: {
"concraft" = callPackage
({ mkDerivation, aeson, array, base, binary, bytestring, cmdargs
, comonad, containers, crf-chain1-constrained, crf-chain2-tiers
- , data-lens, lazy-io, monad-codec, monad-ox, sgd, tagset-positional
- , temporary, text, text-binary, transformers, vector, vector-binary
- , zlib
+ , data-lens, data-memocombinators, lazy-io, monad-codec, monad-ox
+ , parallel, pedestrian-dag, sgd, tagset-positional, temporary, text
+ , text-binary, transformers, vector, vector-binary, zlib
}:
mkDerivation {
pname = "concraft";
- version = "0.9.4";
- sha256 = "17q7mhf0n9pnxhvwk3yy61ljfifz8nhld1xhhnn13fldq34663q3";
+ version = "0.14.2";
+ sha256 = "151cp99iah0fd50fkizidcla7f1kvb0jwgl1cj3j6f25j21894dy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson array base binary bytestring cmdargs comonad containers
- crf-chain1-constrained crf-chain2-tiers data-lens lazy-io
- monad-codec monad-ox sgd tagset-positional temporary text
- text-binary transformers vector vector-binary zlib
+ crf-chain1-constrained crf-chain2-tiers data-lens
+ data-memocombinators lazy-io monad-codec monad-ox parallel
+ pedestrian-dag sgd tagset-positional temporary text text-binary
+ transformers vector vector-binary zlib
];
description = "Morphological disambiguation based on constrained CRFs";
license = stdenv.lib.licenses.bsd3;
@@ -49916,21 +50950,28 @@ self: {
"concraft-pl" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, cmdargs, concraft
- , containers, lazy-io, mtl, network, process, sgd, split
- , tagset-positional, text, transformers
+ , containers, crf-chain1-constrained, crf-chain2-tiers, dhall
+ , filepath, http-types, lazy-io, lens, mtl, network, pedestrian-dag
+ , process, scotty, sgd, split, tagset-positional, text
+ , transformers, vector, wreq
}:
mkDerivation {
pname = "concraft-pl";
- version = "0.7.4";
- sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3";
+ version = "2.4.0";
+ sha256 = "0gc50aadzryy1a8mj85i4afgip34w6pk4s2kqsn10910634lmy6h";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson base binary bytestring concraft containers lazy-io mtl
- network process sgd split tagset-positional text transformers
+ aeson base binary bytestring concraft containers
+ crf-chain1-constrained crf-chain2-tiers dhall http-types lazy-io
+ lens mtl network pedestrian-dag process scotty sgd split
+ tagset-positional text transformers vector wreq
+ ];
+ executableHaskellDepends = [
+ base bytestring cmdargs concraft containers crf-chain1-constrained
+ dhall filepath pedestrian-dag sgd tagset-positional text
];
- executableHaskellDepends = [ cmdargs ];
description = "Morphological tagger for Polish";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -50057,8 +51098,8 @@ self: {
}:
mkDerivation {
pname = "concurrency";
- version = "1.6.0.0";
- sha256 = "14zbwbp5mgnp3nv40qirnw1b8pv2kp1nqlhg36dnhw7l0mq5dwlk";
+ version = "1.6.1.0";
+ sha256 = "00cycrgs2zl2jsg1acc1glcw9ladmgqwxxdqq1ss6v36j8qhk920";
libraryHaskellDepends = [
array atomic-primops base exceptions monad-control mtl stm
transformers
@@ -50067,6 +51108,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "concurrency-benchmarks" = callPackage
+ ({ mkDerivation, async, base, bench-graph, bytestring, Chart
+ , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics
+ , mtl, random, split, streamly, text, transformers, typed-process
+ }:
+ mkDerivation {
+ pname = "concurrency-benchmarks";
+ version = "0.1.1";
+ sha256 = "1zbkyyryh24k67kh3amzscfh7mljj1l6yqd926bkl4ps4d1mdn5d";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bench-graph bytestring Chart Chart-diagrams csv directory
+ getopt-generics split text transformers typed-process
+ ];
+ benchmarkHaskellDepends = [
+ async base deepseq gauge mtl random streamly transformers
+ ];
+ description = "Benchmarks to compare concurrency APIs";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"concurrent-barrier" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -50116,8 +51180,8 @@ self: {
}:
mkDerivation {
pname = "concurrent-dns-cache";
- version = "0.1.1";
- sha256 = "0q6mffxkdag9impmd69nfqvjhpmnb3wy88aqfnlb7q476g84yjkx";
+ version = "0.1.2";
+ sha256 = "1hczxqvlnp5nxcx3mdpv9cm7mv66823jhyw9pibfklpy94syiz5a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -50178,8 +51242,8 @@ self: {
}:
mkDerivation {
pname = "concurrent-output";
- version = "1.10.6";
- sha256 = "1qlp1vij4qgcrkw8ym5xdc0pgfwklbhsfh56sgayy3cvpvcac093";
+ version = "1.10.7";
+ sha256 = "0w5x81n9ljs8l2b8ypy2naazvrv16qqlm1lfzvsksnii2nm1al30";
libraryHaskellDepends = [
ansi-terminal async base directory exceptions process stm
terminal-size text transformers unix
@@ -50214,8 +51278,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "concurrent-split";
- version = "0.0.1";
- sha256 = "1rxq0l513mldz7rlpmpac7n6mipk4lciv58h77h0zypixy73qyb0";
+ version = "0.0.1.1";
+ sha256 = "0i9gak7q3ay8g1kzq7dg0bs36bg88n7kwy3h1r6jrni7mz7jh05f";
libraryHaskellDepends = [ base ];
description = "MVars and Channels with distinguished input and output side";
license = stdenv.lib.licenses.bsd3;
@@ -50413,8 +51477,8 @@ self: {
}:
mkDerivation {
pname = "conduit";
- version = "1.3.0.3";
- sha256 = "1sangm0qqi9dzlq95746a3kl14k8b09592a423shxjf2a0b1yx5v";
+ version = "1.3.1";
+ sha256 = "1mi0ad2ha51lyx1sw15zkzbh2bvv1q7jcfrxd4xc91d7mmk9n4mf";
libraryHaskellDepends = [
base bytestring directory exceptions filepath mono-traversable mtl
primitive resourcet text transformers unix unliftio-core vector
@@ -50442,8 +51506,8 @@ self: {
}:
mkDerivation {
pname = "conduit-algorithms";
- version = "0.0.8.1";
- sha256 = "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd";
+ version = "0.0.8.2";
+ sha256 = "1s423n2hybxdsady7spi4iy9s5lm07dsl0rjxn400y09faizm5x8";
libraryHaskellDepends = [
async base bytestring bzlib-conduit conduit conduit-combinators
conduit-extra containers deepseq exceptions lzma-conduit
@@ -50550,6 +51614,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "conduit-concurrent-map" = callPackage
+ ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
+ , resourcet, say, unliftio, unliftio-core, vector
+ }:
+ mkDerivation {
+ pname = "conduit-concurrent-map";
+ version = "0.1.1";
+ sha256 = "0rn7sry51xiz00hrs2vvqff18lnmmzyadrd858g1ixga76f44z2j";
+ libraryHaskellDepends = [
+ base conduit containers mtl resourcet unliftio unliftio-core vector
+ ];
+ testHaskellDepends = [ base conduit hspec HUnit say ];
+ description = "Concurrent, order-preserving mapping Conduit";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"conduit-connection" = callPackage
({ mkDerivation, base, bytestring, conduit, connection, HUnit
, network, resourcet, test-framework, test-framework-hunit
@@ -50804,8 +51884,8 @@ self: {
}:
mkDerivation {
pname = "conduit-zstd";
- version = "0.0.1.0";
- sha256 = "0psy03s9w9gw5s4a2grvfk9xwjd3g63qch7w4i2kvl3cf9yddsa0";
+ version = "0.0.1.1";
+ sha256 = "04h7w2903hgw4gjcx2pg29yinnmfapawvc19hd3r57rr12fzb0c6";
libraryHaskellDepends = [ base bytestring conduit zstd ];
testHaskellDepends = [
base bytestring conduit conduit-combinators conduit-extra directory
@@ -50849,6 +51929,62 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "confcrypt" = callPackage
+ ({ mkDerivation, amazonka, amazonka-kms, base, base64-bytestring
+ , bytestring, conduit, containers, crypto-pubkey-openssh
+ , crypto-pubkey-types, cryptonite, deepseq, HUnit, lens, megaparsec
+ , memory, mtl, optparse-applicative, parser-combinators, QuickCheck
+ , tasty, tasty-hunit, tasty-quickcheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "confcrypt";
+ version = "0.1.0.3";
+ sha256 = "0fj40m3yncrwb3z2dznvls17v40xm1kh0i4ig16mpb9qj7ww8chl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ amazonka amazonka-kms base base64-bytestring bytestring conduit
+ containers crypto-pubkey-openssh crypto-pubkey-types cryptonite
+ deepseq lens megaparsec mtl optparse-applicative parser-combinators
+ text transformers
+ ];
+ executableHaskellDepends = [
+ amazonka amazonka-kms base base64-bytestring bytestring conduit
+ containers crypto-pubkey-openssh crypto-pubkey-types cryptonite
+ deepseq lens megaparsec mtl optparse-applicative parser-combinators
+ text transformers
+ ];
+ testHaskellDepends = [
+ amazonka amazonka-kms base base64-bytestring bytestring conduit
+ containers crypto-pubkey-openssh crypto-pubkey-types cryptonite
+ deepseq HUnit lens megaparsec memory mtl optparse-applicative
+ parser-combinators QuickCheck tasty tasty-hunit tasty-quickcheck
+ text transformers
+ ];
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "confetti" = callPackage
+ ({ mkDerivation, base, directory, filepath, MissingH, tasty
+ , tasty-hunit, tasty-smallcheck, text, time, unix, yaml
+ }:
+ mkDerivation {
+ pname = "confetti";
+ version = "0.3.2";
+ sha256 = "0ac1mrxwiyjwihywy7hclfymrixhb0mj8266sljzpmk1671qr4ym";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base directory filepath MissingH text time unix yaml
+ ];
+ executableHaskellDepends = [ base directory text ];
+ testHaskellDepends = [
+ base tasty tasty-hunit tasty-smallcheck text
+ ];
+ description = "A simple config file swapping tool";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"conffmt" = callPackage
({ mkDerivation, base, language-conf, megaparsec
, optparse-applicative, pretty, text
@@ -50900,6 +52036,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "config-ini_0_2_3_0" = callPackage
+ ({ mkDerivation, base, containers, directory, hedgehog, ini
+ , megaparsec, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "config-ini";
+ version = "0.2.3.0";
+ sha256 = "03sv2y9ax3jqcfydfzfvmsixl8qch2zym3sr065pjsh8qxrknkqc";
+ revision = "1";
+ editedCabalFile = "0q5lps38g92irp6hm8lvdjds6qi0nafxxlar5wjh0544v78z0d9q";
+ libraryHaskellDepends = [
+ base containers megaparsec text transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers directory hedgehog ini text unordered-containers
+ ];
+ 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
@@ -50942,8 +52099,8 @@ self: {
pname = "config-schema";
version = "0.5.0.1";
sha256 = "18zdq0w65cs2zy8p0pvb0jfqffcyxq9km1c2h5fvky8c689lp0gp";
- revision = "2";
- editedCabalFile = "0wibr3739xwkvdl48cahppaxn8v20gcmhrjxjj8hkhvgnbpfi2gn";
+ revision = "3";
+ editedCabalFile = "102mwr18aas924hlxsyyx5pi8skkb2misic1h95f6khpz7wcy3vy";
libraryHaskellDepends = [
base config-value containers free kan-extensions pretty
semigroupoids text transformers
@@ -50975,6 +52132,8 @@ self: {
pname = "config-value";
version = "0.6.3.1";
sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z";
+ revision = "1";
+ editedCabalFile = "16h47yc8z3fkxs6gdyzfkahi9ibm7narkc72xcx67bmk309xb46c";
libraryHaskellDepends = [ array base pretty text ];
libraryToolDepends = [ alex happy ];
description = "Simple, layout-based value language similar to YAML or JSON";
@@ -50987,6 +52146,8 @@ self: {
pname = "config-value-getopt";
version = "0.1.1.0";
sha256 = "0ypg8wl17vqdqsk1gpaba11v63xmqysfp4cd4ii8zha7pfmlhb4c";
+ revision = "1";
+ editedCabalFile = "1vdm5pgql8cggdkqxhc2z0cg2s7xayghdm51k0m3lx9396f5pxm8";
libraryHaskellDepends = [ base config-value text ];
description = "Interface between config-value and System.GetOpt";
license = stdenv.lib.licenses.mit;
@@ -51393,12 +52554,12 @@ self: {
}) {};
"constrained-categories" = callPackage
- ({ mkDerivation, base, tagged, void }:
+ ({ mkDerivation, base, semigroups, tagged, void }:
mkDerivation {
pname = "constrained-categories";
- version = "0.3.1.0";
- sha256 = "0xxmbvzxa2phwn25haxbr6gv0cnh92c1i2l5anhckqizx29gl668";
- libraryHaskellDepends = [ base tagged void ];
+ version = "0.3.1.1";
+ sha256 = "00h8pw0pqj7lmngwzmz27lmvglpidgxhhxrdf275s49cdnkf8cvk";
+ libraryHaskellDepends = [ base semigroups tagged void ];
description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -51541,8 +52702,8 @@ self: {
({ mkDerivation, base, constraints, template-haskell }:
mkDerivation {
pname = "constraints-extras";
- version = "0.1.0.1";
- sha256 = "12m6z1va1idbqnl7syljgk8hy82vm0lymf262331jmhjb744awpz";
+ version = "0.2.0.0";
+ sha256 = "0id5xaij014vabzkbnl54h8km667vk1mz8dk27kdzfa5vg6pj8j8";
libraryHaskellDepends = [ base constraints template-haskell ];
description = "Utility package for constraints";
license = stdenv.lib.licenses.bsd3;
@@ -51639,8 +52800,8 @@ self: {
({ mkDerivation, base, containers, convert, lens, text, vector }:
mkDerivation {
pname = "container";
- version = "1.1.2";
- sha256 = "1i2zf7hn5pg0dmgq93w0i2v3vjsdryn6895za6mzfpdk7vyxsxsj";
+ version = "1.1.5";
+ sha256 = "1hh3ahw1vfmws1hyyl6blqyxaz4qcip0h0d80ia8pb6b1gfbvxsm";
libraryHaskellDepends = [
base containers convert lens text vector
];
@@ -51823,12 +52984,12 @@ self: {
}) {};
"contiguous" = callPackage
- ({ mkDerivation, base, primitive }:
+ ({ mkDerivation, base, deepseq, primitive }:
mkDerivation {
pname = "contiguous";
- version = "0.2.0.0";
- sha256 = "1cm6syjrql90m54hsinyknfjhspj47ikskq3fv408bl4sx3gk2kl";
- libraryHaskellDepends = [ base primitive ];
+ version = "0.3.1.0";
+ sha256 = "1x1rv1r05v725xbax2qig36h03gah7mx8r8vd1dcdcy6lm6lsc4i";
+ libraryHaskellDepends = [ base deepseq primitive ];
description = "Unified interface for primitive arrays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -51838,13 +52999,27 @@ self: {
({ mkDerivation, base, contiguous, primitive }:
mkDerivation {
pname = "contiguous-checked";
- version = "0.2.0.0";
- sha256 = "0cb7cankkmn8nb7v6fy4ykcglfd4sd5nc916lg1nyj7fjr5v7y4l";
+ version = "0.3.0.0";
+ sha256 = "144v6c9w0x9a43z1wpfgrq8k5h3d9nnrdxx87wcrkfcprcghdy7b";
libraryHaskellDepends = [ base contiguous primitive ];
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "contiguous-fft" = callPackage
+ ({ mkDerivation, base, contiguous, prim-instances, primitive }:
+ mkDerivation {
+ pname = "contiguous-fft";
+ version = "0.1.0.1";
+ sha256 = "07nv27gj4shh22azf1nl1yr7xvzy4hzmp66yjsgxywj50850i6dq";
+ libraryHaskellDepends = [
+ base contiguous prim-instances primitive
+ ];
+ description = "dft of contiguous memory structures";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"continue" = callPackage
({ mkDerivation, base, bifunctors, monad-control, mtl
, semigroupoids, transformers, transformers-base
@@ -51954,6 +53129,8 @@ self: {
pname = "contravariant-extras";
version = "0.3.4";
sha256 = "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n";
+ revision = "1";
+ editedCabalFile = "1h2955ahga6i4fn7k8v66l03v77p6fhsac6ck8gpabkc08ij60wp";
libraryHaskellDepends = [
base base-prelude contravariant semigroups template-haskell
tuple-th
@@ -51998,6 +53175,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "control-dsl" = callPackage
+ ({ mkDerivation, base, containers, doctest, doctest-discover
+ , temporary
+ }:
+ mkDerivation {
+ pname = "control-dsl";
+ version = "0.2.1.3";
+ sha256 = "0rv9wpjnr3y957vd6l8vmn87f9gi97nhk07bkgpr8083avi9biz8";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base containers doctest doctest-discover temporary
+ ];
+ description = "An alternative to monads for control flow DSLs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"control-event" = callPackage
({ mkDerivation, base, containers, stm, time }:
mkDerivation {
@@ -52136,14 +53329,12 @@ self: {
}) {};
"control-monad-free" = callPackage
- ({ mkDerivation, base, prelude-extras, transformers }:
+ ({ mkDerivation, base, transformers }:
mkDerivation {
pname = "control-monad-free";
- version = "0.6.1";
- sha256 = "11i297ngwb5ck23vsr84fh5qx4hn7fzm9ml90y79lwi97hyigagy";
- revision = "1";
- editedCabalFile = "1901lm2md7flri4ms745lgla18x2k7v0xh51jbjbx6202ppcx3fh";
- libraryHaskellDepends = [ base prelude-extras transformers ];
+ version = "0.6.2";
+ sha256 = "1habgf7byffqf1rqjkzpihvdhclaafgqsqpfpwp3fgpj5ayk1j33";
+ libraryHaskellDepends = [ base transformers ];
description = "Free monads and monad transformers";
license = stdenv.lib.licenses.publicDomain;
}) {};
@@ -52685,6 +53876,8 @@ self: {
pname = "corecursive-main";
version = "0.1.0.0";
sha256 = "14ckdqmy3r06kqhlp7mpapmx01369vcfmaj78gjywlqznchpw6dk";
+ revision = "1";
+ editedCabalFile = "0ffdav9hqn3vn3a2fpxcjlflir0f2lay800rsdi1qg67jycdfk73";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base process ];
@@ -53145,8 +54338,8 @@ self: {
({ mkDerivation, base, containers, parallel }:
mkDerivation {
pname = "cpsa";
- version = "3.6.0";
- sha256 = "1c2hhdny9nn10rgaray827fqc3wq02pv8pf853cy865dl6zdihpb";
+ version = "3.6.1";
+ sha256 = "04hvb1z483gh7mb5q1mvsiym8jg29512wnrfdssl8y9c90qhk2sp";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -53242,34 +54435,6 @@ self: {
}) {};
"cql-io" = callPackage
- ({ mkDerivation, async, auto-update, base, bytestring, containers
- , cql, cryptohash, data-default-class, Decimal, exceptions
- , hashable, HsOpenSSL, iproute, lens, monad-control, mtl
- , mwc-random, network, raw-strings-qq, retry, semigroups, stm
- , tasty, tasty-hunit, text, time, tinylog, transformers
- , transformers-base, unordered-containers, uuid, vector
- }:
- mkDerivation {
- pname = "cql-io";
- version = "1.0.1";
- sha256 = "06imd6cjfh7jnr8s0d2pqlg82w9h0s81xpyjir6hci61al6yfx5q";
- libraryHaskellDepends = [
- async auto-update base bytestring containers cql cryptohash
- data-default-class exceptions hashable HsOpenSSL iproute lens
- monad-control mtl mwc-random network retry semigroups stm text time
- tinylog transformers transformers-base unordered-containers uuid
- vector
- ];
- testHaskellDepends = [
- base containers cql Decimal iproute mtl raw-strings-qq tasty
- tasty-hunit text time tinylog uuid
- ];
- description = "Cassandra CQL client";
- license = stdenv.lib.licenses.mpl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "cql-io_1_0_1_1" = callPackage
({ mkDerivation, async, auto-update, base, bytestring, containers
, cql, cryptohash, data-default-class, Decimal, exceptions
, hashable, HsOpenSSL, iproute, lens, monad-control, mtl
@@ -53490,18 +54655,18 @@ self: {
}) {crack = null;};
"crackNum" = callPackage
- ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
+ ({ mkDerivation, base, FloatingHex, ieee754, reinterpret-cast }:
mkDerivation {
pname = "crackNum";
- version = "2.1";
- sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a";
+ version = "2.2";
+ sha256 = "15327p12jql90j5z02nfzx5fivp7zsbznkg1i79iby59n3njfv40";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base data-binary-ieee754 FloatingHex ieee754
+ base FloatingHex ieee754 reinterpret-cast
];
executableHaskellDepends = [
- base data-binary-ieee754 FloatingHex ieee754
+ base FloatingHex ieee754 reinterpret-cast
];
description = "Crack various integer, floating-point data formats";
license = stdenv.lib.licenses.bsd3;
@@ -53808,16 +54973,18 @@ self: {
"crf-chain1-constrained" = callPackage
({ mkDerivation, array, base, binary, containers, data-lens
- , logfloat, monad-codec, parallel, random, sgd, vector
- , vector-binary, vector-th-unbox
+ , data-memocombinators, logfloat, monad-codec, parallel
+ , pedestrian-dag, random, sgd, vector, vector-binary
+ , vector-th-unbox
}:
mkDerivation {
pname = "crf-chain1-constrained";
- version = "0.3.2";
- sha256 = "02xf9q96rlmmfcdz45bpbsdi0ki7mdrdwzg2zph7b55jwsnb4fja";
+ version = "0.6.0";
+ sha256 = "0yzwvzknn0qd8d2b0fqk1lznz8fplv6gx8x5hlmhqmi2f625yav7";
libraryHaskellDepends = [
- array base binary containers data-lens logfloat monad-codec
- parallel random sgd vector vector-binary vector-th-unbox
+ array base binary containers data-lens data-memocombinators
+ logfloat monad-codec parallel pedestrian-dag random sgd vector
+ vector-binary vector-th-unbox
];
description = "First-order, constrained, linear-chain conditional random fields";
license = stdenv.lib.licenses.bsd3;
@@ -53844,16 +55011,17 @@ self: {
"crf-chain2-tiers" = callPackage
({ mkDerivation, array, base, binary, comonad, containers
- , data-lens, logfloat, monad-codec, parallel, sgd, vector
- , vector-binary, vector-th-unbox
+ , data-lens, data-memocombinators, logfloat, monad-codec, parallel
+ , pedestrian-dag, sgd, vector, vector-binary, vector-th-unbox
}:
mkDerivation {
pname = "crf-chain2-tiers";
- version = "0.2.4";
- sha256 = "0sxa5rsla676x47a1l8cvypccyl8vi7y68fnbnrk7r20ahw6vxi1";
+ version = "0.6.0";
+ sha256 = "14vn96vq7ck9xs1gnjmsxi6hr8mlpa6vbr53v2v4lmbav29jqrhr";
libraryHaskellDepends = [
- array base binary comonad containers data-lens logfloat monad-codec
- parallel sgd vector vector-binary vector-th-unbox
+ array base binary comonad containers data-lens data-memocombinators
+ logfloat monad-codec parallel pedestrian-dag sgd vector
+ vector-binary vector-th-unbox
];
description = "Second-order, tiered, constrained, linear conditional random fields";
license = stdenv.lib.licenses.bsd3;
@@ -53902,6 +55070,8 @@ self: {
pname = "criterion";
version = "1.4.1.0";
sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4";
+ revision = "1";
+ editedCabalFile = "0jg7mk9y9br5aqi29vrrrq28mnyknyg96zmr8rrlxw0rf68l892a";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -53924,32 +55094,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "criterion_1_5_1_0" = callPackage
+ "criterion_1_5_2_0" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
, base-compat-batteries, binary, bytestring, cassava, code-page
, containers, criterion-measurement, deepseq, directory, exceptions
- , fail, filepath, Glob, HUnit, js-flot, js-jquery, microstache, mtl
- , mwc-random, optparse-applicative, parsec, QuickCheck, semigroups
- , statistics, tasty, tasty-hunit, tasty-quickcheck, text, time
- , transformers, transformers-compat, vector, vector-algorithms
+ , filepath, Glob, HUnit, js-flot, js-jquery, microstache, 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.5.1.0";
- sha256 = "1ixmr1mjid3yds5lzhcrjmvvlpgsn579wns96x5n1rkba14srxcq";
+ version = "1.5.2.0";
+ sha256 = "03y4lqkrr08nbsjk6qkrhyai7zzv0rrknn6rgni184f18c091wsd";
+ revision = "1";
+ editedCabalFile = "0v42832227asv9qb1cyq8lg37ygi13956j11jcg4hzrc68ck39vv";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-wl-pprint base base-compat-batteries binary bytestring
cassava code-page containers criterion-measurement deepseq
- directory exceptions fail filepath Glob js-flot js-jquery
- microstache mtl mwc-random optparse-applicative parsec semigroups
- statistics text time transformers transformers-compat vector
- vector-algorithms
+ directory exceptions filepath Glob js-flot js-jquery microstache
+ mtl mwc-random optparse-applicative parsec statistics text time
+ transformers transformers-compat vector vector-algorithms
];
executableHaskellDepends = [
- base base-compat-batteries optparse-applicative semigroups
+ base base-compat-batteries optparse-applicative
];
testHaskellDepends = [
aeson base base-compat base-compat-batteries bytestring deepseq
@@ -54185,8 +55356,8 @@ self: {
pname = "crypt-sha512";
version = "0";
sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2";
- revision = "1";
- editedCabalFile = "0wi8d12i2v76irrv0f16y4sfcn2a9sg92l11499djidmdq50vji9";
+ revision = "2";
+ editedCabalFile = "071lxiwsf23ga1fkbjd47ykz7f5irhsh7q7zz2qczzjgnvzadadh";
libraryHaskellDepends = [
attoparsec base bytestring cryptohash-sha512
];
@@ -54332,8 +55503,8 @@ self: {
}:
mkDerivation {
pname = "crypto-enigma";
- version = "0.0.2.12";
- sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b";
+ version = "0.0.2.14";
+ sha256 = "12gvgpi7hichjq9ya77hm9q1x49qc1024zmr6pb1mv57nwwx599p";
libraryHaskellDepends = [ base containers MissingH mtl split ];
testHaskellDepends = [ base HUnit QuickCheck ];
description = "An Enigma machine simulator with display";
@@ -54650,8 +55821,8 @@ self: {
pname = "cryptohash-md5";
version = "0.11.100.1";
sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi";
- revision = "2";
- editedCabalFile = "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a";
+ revision = "3";
+ editedCabalFile = "0ld224mdmw9mgzcl20q82rqkyl7d5vmi1iknsyymq58gcvcwdi2m";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base base16-bytestring bytestring pureMD5 tasty tasty-hunit
@@ -54670,8 +55841,8 @@ self: {
pname = "cryptohash-sha1";
version = "0.11.100.1";
sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w";
- revision = "2";
- editedCabalFile = "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m";
+ revision = "3";
+ editedCabalFile = "0i30cc85732v27baibdjy2kjjkdfv335ib5sk5ggwvsysvvvr66l";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -54690,8 +55861,8 @@ self: {
pname = "cryptohash-sha256";
version = "0.11.101.0";
sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj";
- revision = "1";
- editedCabalFile = "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3";
+ revision = "2";
+ editedCabalFile = "0m5h68xm60wrjv88gg6cn1q5qki5674mxl4d6sn3vxpbcj9b5417";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring ];
@@ -54712,8 +55883,8 @@ self: {
pname = "cryptohash-sha512";
version = "0.11.100.1";
sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h";
- revision = "2";
- editedCabalFile = "1xy1j3bn2w8my0q04s7z460rddmnqfdh43l95m86rpk75xpiryil";
+ revision = "3";
+ editedCabalFile = "19m1fp0i7ba84aa72d5wf59c7j0p4yr1bc43in8pspgywhsr3lfl";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base base16-bytestring bytestring SHA tasty tasty-hunit
@@ -54868,6 +56039,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) openssl;};
+ "cryptostore" = callPackage
+ ({ mkDerivation, asn1-encoding, asn1-types, base, basement
+ , bytestring, cryptonite, hourglass, memory, pem, tasty
+ , tasty-hunit, tasty-quickcheck, x509
+ }:
+ mkDerivation {
+ pname = "cryptostore";
+ version = "0.1.0.0";
+ sha256 = "1pq53k0dx0akwp1rkgadyb256w0lds8iq7yn2xb217nyjyghyrqz";
+ libraryHaskellDepends = [
+ asn1-encoding asn1-types base basement bytestring cryptonite
+ hourglass memory pem x509
+ ];
+ testHaskellDepends = [
+ asn1-types base bytestring cryptonite hourglass memory pem tasty
+ tasty-hunit tasty-quickcheck x509
+ ];
+ description = "Serialization of cryptographic data types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"cryptsy-api" = callPackage
({ mkDerivation, aeson, base, bytestring, deepseq, either
, http-client, http-client-tls, old-locale, pipes-attoparsec
@@ -54929,38 +56121,6 @@ self: {
}) {};
"csg" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers
- , criterion, doctest, doctest-driver-gen, gloss, gloss-raster
- , QuickCheck, simple-vec3, strict, system-filepath, tasty
- , tasty-hunit, tasty-quickcheck, transformers, turtle, vector
- }:
- mkDerivation {
- pname = "csg";
- version = "0.1.0.4";
- sha256 = "1dril9ayqng04s6jnh28r8by604kkygbjiblp2c4px0bqvz3g5cx";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- attoparsec base bytestring containers QuickCheck simple-vec3 strict
- transformers
- ];
- executableHaskellDepends = [
- base gloss gloss-raster QuickCheck simple-vec3 strict
- system-filepath turtle
- ];
- testHaskellDepends = [
- base bytestring doctest doctest-driver-gen simple-vec3 tasty
- tasty-hunit tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base criterion simple-vec3 strict vector
- ];
- description = "Analytical CSG (Constructive Solid Geometry) library";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "csg_0_1_0_5" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, criterion, doctest, doctest-driver-gen, gloss, gloss-raster
, QuickCheck, simple-vec3, strict, system-filepath, tasty
@@ -55149,8 +56309,8 @@ self: {
}:
mkDerivation {
pname = "css-syntax";
- version = "0.0.7";
- sha256 = "0r30rnwpmzvwbhj9di5rvbsigfn1w325c700hvjyw826x53ivz13";
+ version = "0.0.8";
+ sha256 = "1h9h606q9m9sxgwjxx3km9b30l4rmaygd2zfigf38wz45vqfqwa2";
libraryHaskellDepends = [
attoparsec base bytestring scientific text
];
@@ -55161,21 +56321,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "css-syntax_0_0_8" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
- , scientific, text
+ "css-syntax_0_1_0_0" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, directory, hspec
+ , QuickCheck, scientific, text
}:
mkDerivation {
pname = "css-syntax";
- version = "0.0.8";
- sha256 = "1h9h606q9m9sxgwjxx3km9b30l4rmaygd2zfigf38wz45vqfqwa2";
- libraryHaskellDepends = [
- attoparsec base bytestring scientific text
- ];
+ version = "0.1.0.0";
+ sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh";
+ revision = "1";
+ editedCabalFile = "14241m9nm3wbbhajw95gdj9mvfzf4hmrzvk2wgjvkm71mg4yhwnr";
+ libraryHaskellDepends = [ base scientific text ];
testHaskellDepends = [
- attoparsec base bytestring directory hspec scientific text
+ base directory hspec QuickCheck scientific text
];
- description = "This package implments a parser for the CSS syntax";
+ benchmarkHaskellDepends = [
+ base criterion deepseq directory scientific text
+ ];
+ description = "High-performance CSS tokenizer and serializer";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -55431,8 +56594,8 @@ self: {
}:
mkDerivation {
pname = "cublas";
- version = "0.4.0.1";
- sha256 = "0fk0yrm6arb85xxy7vr2bnkxgwassahfcl8lf9k99s9f9wqc9glr";
+ version = "0.5.0.0";
+ sha256 = "0s47wrmlb35dpym4dz3688qx8m166i2a9d8pqnfdzxy67zv98g1f";
setupHaskellDepends = [ base Cabal cuda directory filepath ];
libraryHaskellDepends = [
base cuda half storable-complex template-haskell
@@ -55456,19 +56619,42 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "cuckoo-filter" = callPackage
+ ({ mkDerivation, aeson, base, cereal, containers, criterion
+ , hashable, QuickCheck, random, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "cuckoo-filter";
+ version = "0.1.0.2";
+ sha256 = "16ql9qvf1qsbnk1wxy3d5iqyk0kyx9w27vq284gr34yqd18dpvk5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ aeson base cereal containers hashable ];
+ executableHaskellDepends = [
+ aeson base cereal containers criterion hashable random
+ ];
+ testHaskellDepends = [
+ aeson base cereal containers hashable QuickCheck tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ description = "Pure and impure Cuckoo Filter";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"cuda" = callPackage
({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
- , pretty, template-haskell
+ , pretty, template-haskell, uuid-types
}:
mkDerivation {
pname = "cuda";
- version = "0.9.0.3";
- sha256 = "0ym5j3rllxyl9zqji47pngwbi032hzm0bv5j06756d5cb769k44q";
+ version = "0.10.0.0";
+ sha256 = "17l482fnackx4081mxax0dx0bsaqbbg4rxy4zmi5iv5q6f6v37x7";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
- base bytestring filepath template-haskell
+ base bytestring filepath template-haskell uuid-types
];
libraryToolDepends = [ c2hs ];
executableHaskellDepends = [ base pretty ];
@@ -55499,8 +56685,32 @@ self: {
pname = "cue-sheet";
version = "1.0.1";
sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1";
- revision = "2";
- editedCabalFile = "09h4phhj0j1m4ab5gbfrz6475jn772x46l21k7l2qlxav6hi9w7x";
+ revision = "3";
+ editedCabalFile = "14kgk1digf1vbsr7v5jvj8gajkx0rkn3zjl4m8csqhxalkaxa2zl";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base bytestring containers data-default-class exceptions megaparsec
+ mtl QuickCheck text
+ ];
+ testHaskellDepends = [
+ base bytestring exceptions hspec hspec-megaparsec megaparsec
+ QuickCheck text
+ ];
+ description = "Support for construction, rendering, and parsing of CUE sheets";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "cue-sheet_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default-class
+ , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec
+ , mtl, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "cue-sheet";
+ version = "2.0.0";
+ sha256 = "1w6gmxwrqz7jlm7f0rccrik86w0syhjk5w5cvg29gi2yzj3grnql";
+ revision = "1";
+ editedCabalFile = "0cnlyy7psk8qcwahiqfdpaybvrw899bv106p0i53lrdjxfdsmf4g";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers data-default-class exceptions megaparsec
@@ -55510,8 +56720,10 @@ self: {
base bytestring exceptions hspec hspec-megaparsec megaparsec
QuickCheck text
];
+ testToolDepends = [ hspec-discover ];
description = "Support for construction, rendering, and parsing of CUE sheets";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cufft" = callPackage
@@ -55520,8 +56732,8 @@ self: {
}:
mkDerivation {
pname = "cufft";
- version = "0.9.0.0";
- sha256 = "1is6vk0nhvchi0n7d1kpy4vydf82lsb52pq4hqffiawlp0vp5scv";
+ version = "0.9.0.1";
+ sha256 = "1cf11ia4i19bpbs0wzkz2hqzc22hh2dvbn8m5frnwild83zal4n3";
setupHaskellDepends = [
base Cabal cuda directory filepath template-haskell
];
@@ -55580,6 +56792,32 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "curl-runnings_0_9_2" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, case-insensitive, cmdargs
+ , directory, hspec, hspec-expectations, http-conduit, http-types
+ , megaparsec, pretty-simple, regex-posix, tar, text
+ , unordered-containers, vector, yaml, zlib
+ }:
+ mkDerivation {
+ pname = "curl-runnings";
+ version = "0.9.2";
+ sha256 = "1xslp7zg6l3adljac6iga9c421cf0hab9zi4dyjbkws76imh1d0b";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring case-insensitive directory hspec
+ hspec-expectations http-conduit http-types megaparsec pretty-simple
+ regex-posix text unordered-containers vector yaml
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring cmdargs directory http-conduit tar text zlib
+ ];
+ testHaskellDepends = [ base directory hspec hspec-expectations ];
+ description = "A framework for declaratively writing curl based API tests";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"curlhs" = callPackage
({ mkDerivation, base, bytestring, hspec, rtld, time }:
mkDerivation {
@@ -55768,6 +57006,46 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "cursor" = callPackage
+ ({ mkDerivation, base, containers, microlens, text, validity
+ , validity-containers, validity-text
+ }:
+ mkDerivation {
+ pname = "cursor";
+ version = "0.0.0.1";
+ sha256 = "0iq83v3yp7rj1fn82qkwakxi180nri50irzf8p8bzi558c6b3bmr";
+ libraryHaskellDepends = [
+ base containers microlens text validity validity-containers
+ validity-text
+ ];
+ description = "Purely Functional Cursors";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "cursor-gen" = callPackage
+ ({ mkDerivation, base, containers, cursor, genvalidity
+ , genvalidity-containers, genvalidity-hspec
+ , genvalidity-hspec-optics, genvalidity-text, hspec, microlens
+ , pretty-show, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "cursor-gen";
+ version = "0.0.0.0";
+ sha256 = "10jxxy3dx2gsddmq4l95ddim4cj85l7l76lamhgqlhx6zw4j7d52";
+ libraryHaskellDepends = [
+ base containers cursor genvalidity genvalidity-containers
+ genvalidity-text QuickCheck text
+ ];
+ testHaskellDepends = [
+ base containers cursor genvalidity-hspec genvalidity-hspec-optics
+ hspec microlens pretty-show QuickCheck text
+ ];
+ description = "Generators for Purely Functional Cursors";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"curve25519" = callPackage
({ mkDerivation, base, bytestring, crypto-api, DRBG, HUnit
, QuickCheck, tagged, test-framework, test-framework-hunit
@@ -55806,15 +57084,15 @@ self: {
"cusolver" = callPackage
({ mkDerivation, base, c2hs, Cabal, cublas, cuda, cusparse
- , directory, filepath, half, storable-complex
+ , directory, filepath, half, storable-complex, template-haskell
}:
mkDerivation {
pname = "cusolver";
- version = "0.1.0.1";
- sha256 = "1wjwdhy51pzvhvr50v7b1s9ljgk001wp9qlmwkkjih0csk79047k";
+ version = "0.2.0.0";
+ sha256 = "0v30wm32jcz7jy940y26zcqvjy1058bqf0v44xf73v53dlwkd07a";
setupHaskellDepends = [ base Cabal cuda directory filepath ];
libraryHaskellDepends = [
- base cublas cuda cusparse half storable-complex
+ base cublas cuda cusparse half storable-complex template-haskell
];
libraryToolDepends = [ c2hs ];
description = "FFI bindings to CUDA Solver, a LAPACK-like library";
@@ -55828,8 +57106,8 @@ self: {
}:
mkDerivation {
pname = "cusparse";
- version = "0.1.0.1";
- sha256 = "1fsldpi4bglh875fc9blki3mlz14dal2j37651br1l587ky1v55w";
+ version = "0.2.0.0";
+ sha256 = "1y6qnxfdcw3ik3mjp4410846pq1l628d02bdasll1xd4r4r87vh6";
setupHaskellDepends = [ base Cabal cuda directory filepath ];
libraryHaskellDepends = [ base cuda half storable-complex ];
libraryToolDepends = [ c2hs ];
@@ -55939,8 +57217,8 @@ self: {
({ mkDerivation, base, template-haskell, transformers }:
mkDerivation {
pname = "czipwith";
- version = "1.0.1.0";
- sha256 = "0s1gz76789w5grm121fikgrxz1hjca6v6dwmds5zg63j6iir3f0p";
+ version = "1.0.1.1";
+ sha256 = "0hs296mwx62alp9fkpkhw9jsjqlygagvb911nx22b0pgyiwqa52a";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base transformers ];
description = "CZipWith class and deriving via TH";
@@ -55978,6 +57256,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "d10" = callPackage
+ ({ mkDerivation, base, doctest, template-haskell }:
+ mkDerivation {
+ pname = "d10";
+ version = "0.2.1.0";
+ sha256 = "0dbz1lil7qm0qnn1y5kakh6nyyc3jkv00125vfp9nk2n25yckb9z";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [ base doctest ];
+ description = "Digits 0-9";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"d3d11binding" = callPackage
({ mkDerivation, base, c-storable-deriving, d3d11, D3DCompiler
, d3dx11, d3dxof, dxgi, dxguid, vect, Win32
@@ -56556,8 +57846,8 @@ self: {
({ mkDerivation, array, base, containers, transformers }:
mkDerivation {
pname = "data-accessor";
- version = "0.2.2.7";
- sha256 = "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l";
+ version = "0.2.2.8";
+ sha256 = "1fq4gygxbz0bd0mzgvc1sl3m4gjnsv8nbgpnmdpa29zj5lb9agxc";
libraryHaskellDepends = [ array base containers transformers ];
description = "Utilities for accessing and manipulating fields of records";
license = stdenv.lib.licenses.bsd3;
@@ -56619,8 +57909,8 @@ self: {
}:
mkDerivation {
pname = "data-accessor-template";
- version = "0.2.1.15";
- sha256 = "0vxs6d6xv2lsxz81msgh5l91pvxma9gif69csi23nxq2xxapyaw0";
+ version = "0.2.1.16";
+ sha256 = "15gd6xlrq5ica514m5rdcz2dl8bibdmbsmnc98ddhx491c9g5rwk";
libraryHaskellDepends = [
base data-accessor template-haskell utility-ht
];
@@ -57338,8 +58628,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "data-forest";
- version = "0.1.0.6";
- sha256 = "11iisc82cgma5pp6apnjg112dd4cvqxclwf09zh9rh50lzkml9dk";
+ version = "0.1.0.7";
+ sha256 = "1q41cwinvv0ys260f1f7005403pvz1gbwn0d6cnwh8b7rlgp8f4j";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "A simple multi-way tree data structure";
@@ -57826,8 +59116,8 @@ self: {
({ mkDerivation, base, stm, transformers }:
mkDerivation {
pname = "data-ref";
- version = "0.0.1.1";
- sha256 = "0s7jckxgfd61ngzfqqd36jl1qswj1y3zgsyhj6bij6bl7klbxnm4";
+ version = "0.0.1.2";
+ sha256 = "0896wjkpk52cndlzkdr51s1rasi0n9b100058f1sb4qzl1dgcp30";
libraryHaskellDepends = [ base stm transformers ];
description = "Unify STRef and IORef in plain Haskell 98";
license = stdenv.lib.licenses.bsd3;
@@ -58115,15 +59405,15 @@ self: {
}) {};
"data-timeout" = callPackage
- ({ mkDerivation, base, data-textual, parsers, tagged, text-printer
- , transformers-base
+ ({ mkDerivation, base, data-textual, parsers, stm, tagged
+ , text-printer, transformers-base
}:
mkDerivation {
pname = "data-timeout";
- version = "0.3";
- sha256 = "1b6af2x19hb1kynsv7ypc2q6b71cazcg86gf1yhq0rr0fjj478ah";
+ version = "0.3.1";
+ sha256 = "1pnynkk99d2bhg2l2qd9x4ksp8nc2l7zii3gk6sch1svnbg0liv6";
libraryHaskellDepends = [
- base data-textual parsers tagged text-printer transformers-base
+ base data-textual parsers stm tagged text-printer transformers-base
];
description = "64-bit timeouts of nanosecond precision";
license = stdenv.lib.licenses.bsd3;
@@ -58144,8 +59434,8 @@ self: {
({ mkDerivation, base, pretty, syb }:
mkDerivation {
pname = "data-tree-print";
- version = "0.1.0.1";
- sha256 = "1zh1akyf8vvsqq39vrbn95v5md5in9fvzmz2jz79adh3w5wc5j6f";
+ version = "0.1.0.2";
+ sha256 = "00jh37anim8qsn553467gmfhajcz1c61zrgh1ypkqsll0gc29vy3";
libraryHaskellDepends = [ base pretty syb ];
description = "Print Data instances as a nested tree";
license = stdenv.lib.licenses.bsd3;
@@ -59320,24 +60610,6 @@ self: {
}) {};
"debian-build" = callPackage
- ({ mkDerivation, base, directory, filepath, process, split
- , transformers
- }:
- mkDerivation {
- pname = "debian-build";
- version = "0.10.1.1";
- sha256 = "0dv5fs0kp8qmrldly6cj0fkvab7infplii0ay23p1pbx6qjakrnk";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base directory filepath process split transformers
- ];
- executableHaskellDepends = [ base filepath transformers ];
- description = "Debian package build sequence tools";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "debian-build_0_10_1_2" = callPackage
({ mkDerivation, base, directory, filepath, process, split
, transformers
}:
@@ -59353,7 +60625,6 @@ self: {
executableHaskellDepends = [ base filepath transformers ];
description = "Debian package build sequence tools";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"debug" = callPackage
@@ -59504,6 +60775,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "decidable" = callPackage
+ ({ mkDerivation, base, singletons }:
+ mkDerivation {
+ pname = "decidable";
+ version = "0.1.4.0";
+ sha256 = "07cw2jhvii3prsbczxpmq7g492wc89yxp77ivs01gp3bl7m25cky";
+ libraryHaskellDepends = [ base singletons ];
+ description = "Combinators for manipulating dependently-typed predicates";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"decimal-arithmetic" = callPackage
({ mkDerivation, base, binary, binary-bits, deepseq, doctest, hspec
, mtl, QuickCheck
@@ -59661,16 +60943,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "deepseq_1_4_3_0" = callPackage
+ "deepseq_1_4_4_0" = callPackage
({ mkDerivation, array, base, ghc-prim, HUnit, test-framework
, test-framework-hunit
}:
mkDerivation {
pname = "deepseq";
- version = "1.4.3.0";
- sha256 = "0fjdmsd8fqqv78m7111m10pdfswnxmn02zx1fsv2k26b5jckb0bd";
- revision = "1";
- editedCabalFile = "0djisxi7z2xyx3wps550avgz5x56rl4xzks17j996crdsrdrcqh9";
+ version = "1.4.4.0";
+ sha256 = "09kfpmgl679l74b6dadia11pvhya9ik4wrd8x76cgkxk7gwcbkrc";
libraryHaskellDepends = [ array base ];
testHaskellDepends = [
array base ghc-prim HUnit test-framework test-framework-hunit
@@ -59712,8 +60992,8 @@ self: {
pname = "deepseq-generics";
version = "0.2.0.0";
sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh";
- revision = "2";
- editedCabalFile = "1pnidf8w8x0w5fsqgv8hhrw07slmhxwy5x4fikgk0bd6k76aqicb";
+ revision = "3";
+ editedCabalFile = "0734x6dm7ny1422n5ik4agzmjybvd3yybj1mnrc8z0kb89xdprcs";
libraryHaskellDepends = [ base deepseq ghc-prim ];
testHaskellDepends = [
base deepseq ghc-prim HUnit test-framework test-framework-hunit
@@ -59771,15 +61051,22 @@ self: {
}) {};
"deferred-folds" = callPackage
- ({ mkDerivation, base, bytestring, containers, foldl, primitive
- , transformers
+ ({ mkDerivation, base, bytestring, containers, foldl, hashable
+ , primitive, QuickCheck, quickcheck-instances, rerebase, tasty
+ , tasty-hunit, tasty-quickcheck, transformers, unordered-containers
+ , vector
}:
mkDerivation {
pname = "deferred-folds";
- version = "0.6.12";
- sha256 = "1gvbm0dkmvjjz5wwg2a5p2ahyd2imz1g751sr8k536hnd377xzy8";
+ version = "0.9.9";
+ sha256 = "1hsfz93h6d4bzrllgmqr22ankl5pas3vlwg2yhbbcfpf35pdk9vd";
libraryHaskellDepends = [
- base bytestring containers foldl primitive transformers
+ base bytestring containers foldl hashable primitive transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
];
description = "Abstractions over deferred folds";
license = stdenv.lib.licenses.mit;
@@ -60155,6 +61442,46 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dense-int-set" = callPackage
+ ({ mkDerivation, base, cereal, cereal-vector, deferred-folds
+ , hashable, QuickCheck, quickcheck-instances, rerebase, tasty
+ , tasty-hunit, tasty-quickcheck, vector, vector-algorithms
+ }:
+ mkDerivation {
+ pname = "dense-int-set";
+ version = "0.3";
+ sha256 = "04aww0ffsw1mfj7v3qhvfrbllqiwihyipis3zah0m4y47197x8gh";
+ libraryHaskellDepends = [
+ base cereal cereal-vector deferred-folds hashable vector
+ vector-algorithms
+ ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ description = "Dense int-set";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "dense-linear-algebra" = callPackage
+ ({ mkDerivation, base, deepseq, hspec, math-functions, primitive
+ , QuickCheck, vector, vector-algorithms, vector-binary-instances
+ , vector-th-unbox
+ }:
+ mkDerivation {
+ pname = "dense-linear-algebra";
+ version = "0.1.0.0";
+ sha256 = "1m7jjxahqxj7ilic3r9806mwp5rnnsmn8vvipkmk40xl65wplxzp";
+ libraryHaskellDepends = [
+ base deepseq math-functions primitive vector vector-algorithms
+ vector-binary-instances vector-th-unbox
+ ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ description = "Simple and incomplete pure haskell implementation of linear algebra";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
"dependency" = callPackage
({ mkDerivation, ansi-wl-pprint, base, binary, containers
, criterion, deepseq, hspec, microlens
@@ -60295,6 +61622,47 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "deptrack-core" = callPackage
+ ({ mkDerivation, base, containers, dlist, mtl, parsec }:
+ mkDerivation {
+ pname = "deptrack-core";
+ version = "0.1.0.0";
+ sha256 = "11v9yvvsp3m3igpqqqqkx1cp648s87xpa4d06vbsxnz4k6yp4bjj";
+ libraryHaskellDepends = [ base containers dlist mtl parsec ];
+ description = "DepTrack Core types and model";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
+ "deptrack-devops" = callPackage
+ ({ mkDerivation, array, async, base, base64-bytestring, binary
+ , bytestring, containers, deptrack-core, distributed-closure
+ , dotgen, hashable, lens, mtl, safe, stm, text
+ }:
+ mkDerivation {
+ pname = "deptrack-devops";
+ version = "0.1.0.0";
+ sha256 = "13m6y88icsy6068h6n8klv480hnrjsmqy0szmssrcgsqjnjzpdzh";
+ libraryHaskellDepends = [
+ array async base base64-bytestring binary bytestring containers
+ deptrack-core distributed-closure dotgen hashable lens mtl safe stm
+ text
+ ];
+ description = "DepTrack applied to DevOps";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
+ "deptrack-dot" = callPackage
+ ({ mkDerivation, base, containers, deptrack-core, dotgen }:
+ mkDerivation {
+ pname = "deptrack-dot";
+ version = "0.1.0.0";
+ sha256 = "1lxkab4c3qwgsv0wldvii8qspzq57j82y4bdc28kpp023g38gvb6";
+ libraryHaskellDepends = [ base containers deptrack-core dotgen ];
+ testHaskellDepends = [ base containers deptrack-core dotgen ];
+ description = "Facilitate Graphviz representations of DepTrack dependencies";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"deque" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -60306,6 +61674,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "deque_0_2_4" = callPackage
+ ({ mkDerivation, base, semigroups }:
+ mkDerivation {
+ pname = "deque";
+ version = "0.2.4";
+ sha256 = "19bz1i8la16an158wwqqg6zjd93d1n6jx6kqb2zd7lm1sk1055l9";
+ libraryHaskellDepends = [ base semigroups ];
+ description = "Double-ended queue";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dequeue" = callPackage
({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck
, safe
@@ -60447,8 +61827,8 @@ self: {
}:
mkDerivation {
pname = "derive-storable-plugin";
- version = "0.2.1.0";
- sha256 = "1138pkkzkzj4vmh6cnc152fhf50mirys0c9nvyd4n5xi5227rihi";
+ version = "0.2.2.0";
+ sha256 = "0rpwiwwz24j9bq07d89ndp61f95hjy7am2q72jxb0by7pzpy9xw0";
libraryHaskellDepends = [ base derive-storable ghc ghci ];
testHaskellDepends = [
base derive-storable ghc ghc-paths ghci hspec QuickCheck
@@ -60518,8 +61898,8 @@ self: {
}:
mkDerivation {
pname = "deriving-compat";
- version = "0.5.1";
- sha256 = "18mkmwm147h601zbdn2lna357z2picpnsxrmkw2jc863chban5vy";
+ version = "0.5.2";
+ sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9";
libraryHaskellDepends = [
base containers ghc-boot-th ghc-prim template-haskell
th-abstraction transformers transformers-compat
@@ -60560,8 +61940,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "derulo";
- version = "1.0.3";
- sha256 = "1z2yv4476a42xndws1zqw0kmiy4wqw1ydqgp7hf7rk3s067wz33m";
+ version = "1.0.5";
+ sha256 = "1pyal6rhnyhqx8gwyh42vf66i18y9nplmqka546ikzps439rvmly";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -60623,8 +62003,8 @@ self: {
}:
mkDerivation {
pname = "descriptive";
- version = "0.9.4";
- sha256 = "0bxskc4q6jzpvifnhh6zl77xic0fbni8abf9lipfr1xzarbwcpkr";
+ version = "0.9.5";
+ sha256 = "0y5693zm2kvqjilybbmrcv1g6n6x2p6zjgi0k0axjw1sdhh1g237";
libraryHaskellDepends = [
aeson base bifunctors containers mtl scientific text transformers
vector
@@ -60808,14 +62188,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "df1_0_2" = callPackage
+ "df1_0_3" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, QuickCheck, tasty, tasty-quickcheck, text, time
}:
mkDerivation {
pname = "df1";
- version = "0.2";
- sha256 = "11sd9d6izb3jrxxr27h058lajjij1p5wfsgg0pshjziqc9l426zs";
+ version = "0.3";
+ sha256 = "1qiy2xxri3vdqhy78ccan7phrlfdkb2ndvrj8grlhbzycmai64i3";
libraryHaskellDepends = [
attoparsec base bytestring containers text time
];
@@ -60829,28 +62209,37 @@ self: {
}) {};
"dfinity-radix-tree" = callPackage
- ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter
- , BoundedChan, bytestring, cmdargs, concurrent-extra, conduit
- , containers, cryptohash-sha256, data-default-class, deepseq
- , ghc-prim, lens-simple, leveldb-haskell, lrucaching, mtl
- , resourcet, semigroups, serialise, text, unordered-containers
+ ({ mkDerivation, aeson, base, base16-bytestring, blake2
+ , bloomfilter, BoundedChan, bytestring, cmdargs, concurrent-extra
+ , conduit, containers, criterion, data-default-class, deepseq
+ , directory, dlist, filepath, ghc-prim, hashtables, lens-simple
+ , leveldb-haskell, lmdb-simple, lrucaching, mtl, QuickCheck
+ , reducers, resourcet, semigroups, serialise, stm, tasty
+ , tasty-hunit, tasty-quickcheck, temporary, text, transformers
+ , unordered-containers
}:
mkDerivation {
pname = "dfinity-radix-tree";
- version = "0.3.1";
- sha256 = "0fzkhibixdzf4wm7kia224r6bqz8mks9m2c25b5qw31sf7m70zx1";
+ version = "0.5.2";
+ sha256 = "16w7na8sh5fvwrps0wa3m80yzrdg7znx8jgw2i64glvjjs7d5c61";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base base16-bytestring bloomfilter BoundedChan bytestring
- concurrent-extra conduit containers cryptohash-sha256
- data-default-class deepseq ghc-prim lens-simple leveldb-haskell
- lrucaching mtl resourcet semigroups serialise
+ base base16-bytestring blake2 bloomfilter BoundedChan bytestring
+ concurrent-extra conduit containers data-default-class deepseq
+ directory dlist ghc-prim hashtables lens-simple leveldb-haskell
+ lmdb-simple lrucaching mtl reducers resourcet semigroups serialise
+ stm temporary transformers
];
executableHaskellDepends = [
- aeson base base16-bytestring bytestring cmdargs containers
- cryptohash-sha256 data-default-class leveldb-haskell mtl resourcet
- text unordered-containers
+ base blake2 bytestring cmdargs criterion data-default-class
+ leveldb-haskell lmdb-simple resourcet temporary
+ ];
+ testHaskellDepends = [
+ aeson base base16-bytestring blake2 BoundedChan bytestring
+ concurrent-extra conduit containers filepath leveldb-haskell mtl
+ QuickCheck resourcet tasty tasty-hunit tasty-quickcheck temporary
+ text transformers unordered-containers
];
description = "A generic data integrity layer";
license = stdenv.lib.licenses.gpl3;
@@ -60948,37 +62337,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall_1_16_1" = callPackage
+ "dhall_1_18_0" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
- , containers, contravariant, criterion, cryptonite, deepseq, Diff
- , directory, doctest, exceptions, filepath, haskeline, http-client
- , http-client-tls, insert-ordered-containers, lens-family-core
- , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
- , prettyprinter, prettyprinter-ansi-terminal, repline, scientific
- , tasty, tasty-hunit, template-haskell, text, transformers
- , unordered-containers, vector
+ , cborg, containers, contravariant, criterion, cryptonite, deepseq
+ , Diff, directory, doctest, exceptions, filepath, haskeline
+ , http-client, http-client-tls, lens-family-core, megaparsec
+ , memory, mockery, mtl, optparse-applicative, parsers
+ , prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+ , quickcheck-instances, repline, scientific, serialise, tasty
+ , tasty-hunit, tasty-quickcheck, template-haskell, text
+ , transformers, unordered-containers, vector
}:
mkDerivation {
pname = "dhall";
- version = "1.16.1";
- sha256 = "1mf0x42f1gq8y6518hm1p8j8ca9dgh3nwbw2lfilddk1difrm9h2";
+ version = "1.18.0";
+ sha256 = "155bmfk4ivjvffyj0zbd21hwg47blswgydhnys2s0zvm9zzyqa5m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- ansi-terminal base bytestring case-insensitive containers
+ ansi-terminal base bytestring case-insensitive cborg containers
contravariant cryptonite Diff directory exceptions filepath
- haskeline http-client http-client-tls insert-ordered-containers
- lens-family-core megaparsec memory mtl optparse-applicative parsers
- prettyprinter prettyprinter-ansi-terminal repline scientific
+ haskeline http-client http-client-tls lens-family-core megaparsec
+ memory mtl optparse-applicative parsers prettyprinter
+ prettyprinter-ansi-terminal repline scientific serialise
template-haskell text transformers unordered-containers vector
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
- base deepseq directory doctest filepath insert-ordered-containers
- mockery prettyprinter tasty tasty-hunit text vector
+ base containers deepseq directory doctest filepath mockery
+ prettyprinter QuickCheck quickcheck-instances serialise tasty
+ tasty-hunit tasty-quickcheck text transformers vector
];
benchmarkHaskellDepends = [
- base containers criterion directory text
+ base bytestring containers criterion directory serialise text
];
description = "A configuration language guaranteed to terminate";
license = stdenv.lib.licenses.bsd3;
@@ -60992,10 +62383,8 @@ self: {
}:
mkDerivation {
pname = "dhall-bash";
- version = "1.0.14";
- sha256 = "1zxqlmnhq8lrwxiqz7hlqln7wf14mlz78s018yqy3hpzmy3aa84d";
- revision = "1";
- editedCabalFile = "1ih8w5q0gnys02hv7hnjxxapfqw4gqmd9xfxn7a05cg2gb30mapr";
+ version = "1.0.15";
+ sha256 = "15xgfglxy5bac93i83pp4pc78yfcwq6ys9vpak9kmklsbr08ynq4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -61009,6 +62398,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dhall-bash_1_0_16" = callPackage
+ ({ mkDerivation, base, bytestring, containers, dhall
+ , neat-interpolation, optparse-generic, shell-escape, text
+ }:
+ mkDerivation {
+ pname = "dhall-bash";
+ version = "1.0.16";
+ sha256 = "0zaz38df08fyfil11906agmz7vfz9wapxszzizyvvp9zid5gx58g";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring containers dhall neat-interpolation shell-escape
+ text
+ ];
+ executableHaskellDepends = [
+ base bytestring dhall optparse-generic text
+ ];
+ description = "Compile Dhall to Bash";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dhall-check" = callPackage
({ mkDerivation, base, containers, dhall, directory, filepath
, fsnotify, text, trifecta
@@ -61029,15 +62440,13 @@ self: {
"dhall-json" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
- , insert-ordered-containers, optparse-applicative, text
- , unordered-containers, yaml
+ , insert-ordered-containers, optparse-applicative, tasty
+ , tasty-hunit, text, unordered-containers, yaml
}:
mkDerivation {
pname = "dhall-json";
- version = "1.2.2";
- sha256 = "13vap0x53c9i2cyggh3riq8fza46c2d9rqmbxmsjvsawxz2jfm9d";
- revision = "1";
- editedCabalFile = "0vkn5kivqjl640f4ifjgy3mgmlqhz8ir48n04lklr4mra7z95qw2";
+ version = "1.2.3";
+ sha256 = "1npw5x49jrijq6lby5ipnywqvbq67znmbsrfhnk0pi9pz4kixjw3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -61048,10 +62457,37 @@ self: {
aeson aeson-pretty base bytestring dhall optparse-applicative text
yaml
];
+ testHaskellDepends = [ aeson base dhall tasty tasty-hunit text ];
description = "Compile Dhall to JSON or YAML";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dhall-json_1_2_4" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
+ , optparse-applicative, tasty, tasty-hunit, text
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "dhall-json";
+ version = "1.2.4";
+ sha256 = "1rv3vf5g3cwiy0ps1yn9jnhk56rbw7fci54xj9fj4iwc2rxb9575";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base dhall optparse-applicative text unordered-containers
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty base bytestring dhall optparse-applicative text
+ vector yaml
+ ];
+ testHaskellDepends = [
+ aeson base bytestring dhall tasty tasty-hunit text
+ ];
+ description = "Compile Dhall to JSON or YAML";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dhall-lex" = callPackage
({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
, hspec, hspec-dirstream, scientific
@@ -61069,6 +62505,7 @@ self: {
benchmarkHaskellDepends = [ base bytestring criterion ];
description = "Lexer for the Dhall language";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dhall-nix" = callPackage
@@ -61078,10 +62515,8 @@ self: {
}:
mkDerivation {
pname = "dhall-nix";
- version = "1.1.5";
- sha256 = "1j0b7w8ydhz5fq7jmajz35j8bw2xmr1v0pbl4yfkc2gv8djmiw6y";
- revision = "1";
- editedCabalFile = "1k9mb8fm5vxm7asqawvv103y63i81n84py42w7hh72rk3wp3xcnk";
+ version = "1.1.6";
+ sha256 = "0pchanzgcag6z7fywqm09xj29n0pfxd2ya2ky64aapykq038jxbs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -61099,10 +62534,8 @@ self: {
({ mkDerivation, base, dhall, optparse-applicative, text }:
mkDerivation {
pname = "dhall-text";
- version = "1.0.11";
- sha256 = "0zbsr5mchcm3713y6dbdj1vlak5rb6f13p6a8ah7f3kcihdpx0b1";
- revision = "1";
- editedCabalFile = "0lrp1aknia3y4cz87vh14ns3f273lbca09ssz138wlf3266ka613";
+ version = "1.0.13";
+ sha256 = "09bwhc2wrwliwrvd565wr0rgdxmi0g4i9691b8nb32nybb20l1ah";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -61177,14 +62610,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "di_1_1" = callPackage
+ "di_1_2" = callPackage
({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle
, di-monad, exceptions
}:
mkDerivation {
pname = "di";
- version = "1.1";
- sha256 = "1akwhznnnwb9y4rbb4kys2vvwzdmpxdccrnrh65s5c1pw3w517n5";
+ version = "1.2";
+ sha256 = "0d4ywmnibg9h12bah4bdh03fs2l50f5s590kv45baz010bcqyx0b";
libraryHaskellDepends = [
base containers df1 di-core di-df1 di-handle di-monad exceptions
];
@@ -61261,14 +62694,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "di-monad_1_2" = callPackage
+ "di-monad_1_3" = callPackage
({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes
, stm, transformers
}:
mkDerivation {
pname = "di-monad";
- version = "1.2";
- sha256 = "1zqgsylx6z6p0cvlyhl7vnff5sb4jlv9qzqgbz8kg3zli183gwc3";
+ version = "1.3";
+ sha256 = "019k7jc3lvh6cgmrgdjq13hcvh6ar76n38li4nviikqbsvxmpqsl";
libraryHaskellDepends = [
base containers di-core exceptions mtl pipes stm transformers
];
@@ -61445,6 +62878,8 @@ self: {
pname = "diagrams-contrib";
version = "1.4.3";
sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5";
+ revision = "1";
+ editedCabalFile = "16ici9kx7cnva1ihhin5nyc1icif17yks3nwcxxzqxjjw556vpig";
libraryHaskellDepends = [
base circle-packing colour containers cubicbezier data-default
data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -61468,6 +62903,8 @@ self: {
pname = "diagrams-core";
version = "1.4.1.1";
sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1";
+ revision = "2";
+ editedCabalFile = "1lf7xcq42l4hjksgp1nhj7600shvw9q5a27bh729fyfphmvv3xkf";
libraryHaskellDepends = [
adjunctions base containers distributive dual-tree lens linear
monoid-extras mtl profunctors semigroups unordered-containers
@@ -61585,6 +63022,8 @@ self: {
pname = "diagrams-lib";
version = "1.4.2.3";
sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5";
+ revision = "1";
+ editedCabalFile = "0zsigisgn6sjpfy2hm31zddnsyqm2a046nxb5drjqm7r0aa3vjff";
libraryHaskellDepends = [
active adjunctions array base bytestring cereal colour containers
data-default-class diagrams-core diagrams-solve directory
@@ -61708,8 +63147,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-rasterific";
- version = "1.4.1";
- sha256 = "0zlpmmgn79jgckzzib758c82brci391r181hg43267s1lx463iih";
+ version = "1.4.1.1";
+ sha256 = "0raki8c20s40y5xy2ax8y38xl3y40fb9qv95ax3qgnmi46s8fapp";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers data-default-class diagrams-core
@@ -61762,8 +63201,8 @@ self: {
pname = "diagrams-solve";
version = "0.1.1";
sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4";
- revision = "2";
- editedCabalFile = "1zgpx0jmgfr3mg77w3nz08cmgzlwfav2c6bcn68f53z829a6y5lf";
+ revision = "3";
+ editedCabalFile = "13vfs5k09c16q3dvqzgfca1kd93pgc4ll8mfl3wracanm5mn5rx7";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base deepseq tasty tasty-hunit tasty-quickcheck
@@ -61782,8 +63221,8 @@ self: {
pname = "diagrams-svg";
version = "1.4.2";
sha256 = "1lnyxx45yawqas7hmvvannwaa3ycf1l9g40lsl2m8sl2ja6vcmal";
- revision = "1";
- editedCabalFile = "1mb2fdfvy0c1v7nahspq2cisfqrn37xjh4a6xhqr3b36pfz8rwnd";
+ revision = "2";
+ editedCabalFile = "15sn85xaachw4cj56w61bjcwrbf4qmnkfl8mbgdapxi5k0y4f2qv";
libraryHaskellDepends = [
base base64-bytestring bytestring colour containers diagrams-core
diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
@@ -62377,21 +63816,23 @@ self: {
}) {};
"digit" = callPackage
- ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, papa, parsec
+ ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, parsec
, parsers, pretty, scientific, semigroupoids, semigroups, tasty
, tasty-hedgehog, tasty-hspec, tasty-hunit, template-haskell, text
}:
mkDerivation {
pname = "digit";
- version = "0.6";
- sha256 = "13cm8xk3szfcyfdzp108rzwkvwwws34bpla2viyqcr0sivmzdck8";
+ version = "0.7";
+ sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql";
+ revision = "2";
+ editedCabalFile = "0335fzcbrf4hciz9gdkk41y9jkd5vm5vbz99v9ick76q48h2bs6p";
libraryHaskellDepends = [
- base lens papa parsers scientific semigroupoids semigroups
+ base lens parsers scientific semigroupoids semigroups
template-haskell
];
testHaskellDepends = [
- ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty
- tasty-hedgehog tasty-hspec tasty-hunit text
+ ansi-wl-pprint base hedgehog lens parsec parsers pretty semigroups
+ tasty tasty-hedgehog tasty-hspec tasty-hunit text
];
description = "A data-type representing digits 0-9 and other combinations";
license = stdenv.lib.licenses.bsd3;
@@ -62835,8 +64276,10 @@ self: {
}:
mkDerivation {
pname = "dirstream";
- version = "1.0.3";
- sha256 = "1yga8qzmarskjlnz7wnkrjiv438m2yswz640bcw8dawwqk8xf1x4";
+ version = "1.1.0";
+ sha256 = "1xnxsx1m06jm8yvim1xnvfkwylhyab51wvba1j3fbicy4ysblfz0";
+ revision = "1";
+ editedCabalFile = "01bl222ymniz3q7nbpbxhbckvwqgrawrk553widw5d0hnn0h0hnb";
libraryHaskellDepends = [
base directory pipes pipes-safe system-fileio system-filepath unix
];
@@ -62887,6 +64330,8 @@ self: {
pname = "discord-gateway";
version = "0.2.2";
sha256 = "1pc8j2pqrpmgvf31kx24gwj6n96npxdjj6mjf2w9wzh500rdrrzy";
+ revision = "1";
+ editedCabalFile = "0aw47024gk2hvj0zzy7h01rvv6wxhnjqqjg8prb4x1pajjalg9l5";
libraryHaskellDepends = [
aeson base discord-types hslogger transformers url websockets wuss
];
@@ -62896,22 +64341,24 @@ self: {
}) {};
"discord-haskell" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, containers
- , data-default, http-client, iso8601-time, MonadRandom, req
- , safe-exceptions, text, time, unordered-containers, vector
- , websockets, wuss
+ ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+ , containers, data-default, http-client, iso8601-time, JuicyPixels
+ , MonadRandom, req, safe-exceptions, text, time
+ , unordered-containers, vector, websockets, wuss
}:
mkDerivation {
pname = "discord-haskell";
- version = "0.5.1";
- sha256 = "0y4ha8zsds53bq330740a0m4wjxmsrdlnhf2fmhp5i3c7rjknka8";
+ version = "0.6.0";
+ sha256 = "1202zfh3lq0ci48ylp637hcih469awz6sfkp14lzq5psybiiynvw";
libraryHaskellDepends = [
- aeson async base bytestring containers data-default http-client
- iso8601-time MonadRandom req safe-exceptions text time
- unordered-containers vector websockets wuss
+ aeson async base base64-bytestring bytestring containers
+ data-default http-client iso8601-time JuicyPixels MonadRandom req
+ safe-exceptions text time unordered-containers vector websockets
+ wuss
];
description = "Write bots for Discord in Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"discord-hs" = callPackage
@@ -62940,6 +64387,8 @@ self: {
pname = "discord-rest";
version = "0.2.2";
sha256 = "02sg05zf2m83d6hq5z51cjvw7ycarrmwx9y00c71wiw3hvb84fb3";
+ revision = "1";
+ editedCabalFile = "0hwiwzgh359cha0j97mwhdjmg1y2zppppbn538pn4ggfn6i7ma11";
libraryHaskellDepends = [
aeson base bytestring comonad data-default discord-types hashable
hslogger http-client mtl req stm text time url
@@ -62957,6 +64406,8 @@ self: {
pname = "discord-types";
version = "0.2.2";
sha256 = "12smb4z6mrj9hhk7jc9r2cz6p4lcix2016ahwp9qapklrql539sc";
+ revision = "1";
+ editedCabalFile = "015i65pzkxrx6pring1q0fv772r54xrbrbrwa339yqjgzm7c7z7w";
libraryHaskellDepends = [
aeson base hashable text time transformers unordered-containers
vector
@@ -62990,6 +64441,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {markdown = null;};
+ "discrete" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "discrete";
+ version = "0.1.0.0";
+ sha256 = "1888rv1lqmzip0g2c6f12b01kpwcd5vwk2ixby0g2291xnl7zs2w";
+ revision = "1";
+ editedCabalFile = "1ary1xyh2gy099p1madapfqhw2r1ys1pd8xg396xxaas4vjmqqkh";
+ libraryHaskellDepends = [ base ];
+ description = "replacement for enum";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"discrete-intervals" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -63205,16 +64669,19 @@ self: {
}) {};
"distributed-closure" = callPackage
- ({ mkDerivation, base, binary, bytestring, constraints, hspec
- , QuickCheck, syb, template-haskell
+ ({ mkDerivation, async, base, binary, bytestring, constraints
+ , hspec, QuickCheck, syb, template-haskell
}:
mkDerivation {
pname = "distributed-closure";
- version = "0.4.0";
- sha256 = "1r2ymmnm0misz92x4iz58yqyb4maf3kq8blsvxmclc0d77hblsnm";
+ version = "0.4.1";
+ sha256 = "1rkw5r5r3jlrkckjkqv290qx890a8sipx1c7n2syk1f6bshgwkny";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base binary bytestring constraints syb template-haskell
];
+ executableHaskellDepends = [ async base binary bytestring ];
testHaskellDepends = [ base binary hspec QuickCheck ];
description = "Serializable closures for distributed programming";
license = stdenv.lib.licenses.bsd3;
@@ -64034,8 +65501,8 @@ self: {
({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
mkDerivation {
pname = "dlist";
- version = "0.8.0.4";
- sha256 = "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc";
+ version = "0.8.0.5";
+ sha256 = "0hqvjld86vna9m0za4g37nv2gml2s8q01208igp4l3dl76l8ma4q";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [ base Cabal QuickCheck ];
description = "Difference lists";
@@ -64062,8 +65529,8 @@ self: {
pname = "dlist-nonempty";
version = "0.1.1";
sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
- revision = "3";
- editedCabalFile = "0gy0xkfy3811xz7jjz451a3rldlzg8crmrl5gn0a8fgyjdgqxc46";
+ revision = "4";
+ editedCabalFile = "10kkj4sf1bn87z6744p9gn6mkciqri2d3l9vmg9ylpi8g7priil2";
libraryHaskellDepends = [
base base-compat deepseq dlist semigroupoids
];
@@ -64271,6 +65738,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "do-notation" = callPackage
+ ({ mkDerivation, base, indexed }:
+ mkDerivation {
+ pname = "do-notation";
+ version = "0.1.0.2";
+ sha256 = "1xbvphpwbzns4567zbk8baq0zd068dcprp59cjzhbplf9cypiwy9";
+ libraryHaskellDepends = [ base indexed ];
+ testHaskellDepends = [ base indexed ];
+ description = "Generalize do-notation to work on monads and indexed monads simultaneously";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "do-notation-dsl" = callPackage
+ ({ mkDerivation, base, containers, doctest, doctest-discover
+ , temporary
+ }:
+ mkDerivation {
+ pname = "do-notation-dsl";
+ version = "0.1.0.3";
+ sha256 = "1q81hl8z4p2mqzijg69znf5cycv27phrrdd9f934brsv8fyvsbzx";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base containers doctest doctest-discover temporary
+ ];
+ description = "An alternative to monads";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"doc-review" = callPackage
({ mkDerivation, base, base64-bytestring, binary, bytestring
, containers, directory, feed, filepath, haskell98, heist, hexpat
@@ -64369,20 +65864,26 @@ self: {
}) {};
"docker-build-cacher" = callPackage
- ({ mkDerivation, base, containers, foldl, language-docker
+ ({ mkDerivation, aeson, base, containers, foldl, language-docker
, system-filepath, text, turtle
}:
mkDerivation {
pname = "docker-build-cacher";
- version = "2.0.0";
- sha256 = "1y5w6l75fvszx33f254a6sncvb3wab0iq7dci3qbj7s2147vl63n";
- isLibrary = false;
+ version = "2.1.1";
+ sha256 = "0n8x0mcb0rznazbwf9yrnl4mha6zxvpn9kqwna7xd9rxqasqzv0n";
+ isLibrary = true;
isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base containers foldl language-docker system-filepath text
+ turtle
+ ];
executableHaskellDepends = [
- base containers foldl language-docker system-filepath text turtle
+ aeson base containers foldl language-docker system-filepath text
+ turtle
];
- description = "Builds a services with docker and caches all of its intermediate stages";
+ description = "Builds a docker image and caches all of its intermediate stages";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dockercook" = callPackage
@@ -64430,6 +65931,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "dockerfile_0_2_0" = callPackage
+ ({ mkDerivation, base, hspec }:
+ mkDerivation {
+ pname = "dockerfile";
+ version = "0.2.0";
+ sha256 = "1amm7xrfry3fnd53wj50b684lp1vkv98yrz52xxhlldzb4jrk8cp";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec ];
+ description = "A Haskell DSL for generating Dockerfiles";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"docopt" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
, HUnit, parsec, split, template-haskell, text, th-lift
@@ -64490,8 +66004,8 @@ self: {
}:
mkDerivation {
pname = "doctest";
- version = "0.16.0";
- sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv";
+ version = "0.16.0.1";
+ sha256 = "106pc4rs4cfym7754gzdgy36dm9aidwmnqpjm9k7yq1hfd4pallv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -64585,8 +66099,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "doctest-driver-gen";
- version = "0.2.0.3";
- sha256 = "1vm9rwym2fdl76kwgkh21z2ixfcvza1df4gba2hm7hkk0n4ndcq6";
+ version = "0.2.0.4";
+ sha256 = "0wbsql0pph74nghnnwwm2p8w4wnqs0iiwqfn3p3i26g6cg8yv1nr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base doctest ];
@@ -64609,6 +66123,58 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "docusign-base" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-default, http-media
+ , lens, servant, servant-client, text
+ }:
+ mkDerivation {
+ pname = "docusign-base";
+ version = "0.0.1";
+ sha256 = "1qh1g8nyj606x0vapv6m07dhm4s3g5z17g1i4wk5bj63vxvms528";
+ libraryHaskellDepends = [
+ aeson base bytestring data-default http-media lens servant
+ servant-client text
+ ];
+ description = "Low-level bindings to the DocuSign API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "docusign-client" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , data-default, docusign-base, exceptions, http-client
+ , http-client-tls, http-types, servant-client, text, uuid
+ }:
+ mkDerivation {
+ pname = "docusign-client";
+ version = "0.0.1";
+ sha256 = "1vyb7n08vqjmc18adbs6ck01q5440a0r99ahb566v427mr9hcydg";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring data-default docusign-base
+ exceptions http-client http-client-tls http-types servant-client
+ text uuid
+ ];
+ description = "Client bindings for the DocuSign API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "docusign-example" = callPackage
+ ({ mkDerivation, base, bytestring, docusign-base, docusign-client
+ , exceptions, filepath, optparse-generic, text, uuid
+ }:
+ mkDerivation {
+ pname = "docusign-example";
+ version = "0.1.0.0";
+ sha256 = "0fhyzmgdjq5rds0p0gifwg6pfsq17yyhj4nwvi6zpgzmww4vya21";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring docusign-base docusign-client exceptions filepath
+ optparse-generic text uuid
+ ];
+ description = "DocuSign examples";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"docvim" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, dlist, filepath, hlint, lens, mtl, optparse-applicative, parsec
@@ -64862,6 +66428,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "dotenv_0_6_0_3" = callPackage
+ ({ mkDerivation, base, base-compat, containers, directory
+ , exceptions, hspec, hspec-megaparsec, megaparsec
+ , optparse-applicative, process, text, transformers, yaml
+ }:
+ mkDerivation {
+ pname = "dotenv";
+ version = "0.6.0.3";
+ sha256 = "0dckfs69k3hqfjrpxkk30liq52pjd2424r8gp6i8xb0zk1xlsqgk";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base base-compat containers directory exceptions megaparsec process
+ text transformers yaml
+ ];
+ executableHaskellDepends = [
+ base base-compat megaparsec optparse-applicative process text
+ transformers yaml
+ ];
+ testHaskellDepends = [
+ base base-compat containers directory exceptions hspec
+ hspec-megaparsec megaparsec process text transformers yaml
+ ];
+ description = "Loads environment variables from dotenv files";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dotfs" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, haskell-src, HFuse, HUnit, parsec, process, QuickCheck
@@ -65274,6 +66869,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "dragen" = callPackage
+ ({ mkDerivation, base, containers, extra, ghc-prim, matrix
+ , QuickCheck, split, template-haskell, text, transformers
+ }:
+ mkDerivation {
+ pname = "dragen";
+ version = "0.1.0.0";
+ sha256 = "079r8d3j5qm15cqg0d12iz4n6z0lxlmhbcqpv37dhdafjf12dyy7";
+ libraryHaskellDepends = [
+ base containers extra ghc-prim matrix QuickCheck split
+ template-haskell transformers
+ ];
+ testHaskellDepends = [
+ base containers extra ghc-prim matrix QuickCheck split
+ template-haskell text transformers
+ ];
+ description = "Automatic derivation of optimized QuickCheck random generators";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"draw-poker" = callPackage
({ mkDerivation, base, random-shuffle, safe }:
mkDerivation {
@@ -65365,6 +66980,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "drifter-sqlite" = callPackage
+ ({ mkDerivation, base, containers, directory, drifter, mtl
+ , sqlite-simple, tasty, tasty-hunit, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "drifter-sqlite";
+ version = "0.1.0.0";
+ sha256 = "07267h287bpn2smr50m7cf179kfmv8vhv4cwa4qdi1wpifiz8pic";
+ libraryHaskellDepends = [
+ base containers drifter mtl sqlite-simple time transformers
+ ];
+ testHaskellDepends = [
+ base containers directory drifter mtl sqlite-simple tasty
+ tasty-hunit text time transformers
+ ];
+ description = "SQLite support for the drifter schema migraiton tool";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"drinkery" = callPackage
({ mkDerivation, base, exceptions, mtl, transformers }:
mkDerivation {
@@ -65558,8 +67192,8 @@ self: {
({ mkDerivation, array, base, containers, QuickCheck, random }:
mkDerivation {
pname = "dsp";
- version = "0.2.4";
- sha256 = "0bwvb2axzv19lmv61ifvpmp3kpyzn62vi87agkyyjaip3psxzr7y";
+ version = "0.2.4.1";
+ sha256 = "0b748v9v9i7kw2djnb9a89yjw0nhwhb5sfml3x6ajydjhx79a8ik";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base containers random ];
@@ -65718,8 +67352,8 @@ self: {
pname = "dual-tree";
version = "0.2.2";
sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl";
- revision = "1";
- editedCabalFile = "1hkjhij3s2a82b0sd898511lr6iphk3myk1l0hpl42ai32sf606q";
+ revision = "2";
+ editedCabalFile = "0r8idr1haqixa9nlp8db5iw9vr9sdk6rcargkr7w7s6i99lm6jmh";
libraryHaskellDepends = [
base monoid-extras newtype-generics semigroups
];
@@ -65857,6 +67491,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dunai-core" = callPackage
+ ({ mkDerivation, base, MonadRandom, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "dunai-core";
+ version = "0.5.1.0";
+ sha256 = "1p8161m671dgf13q0rnpp797nymdxpi5nf6xl9mh9zj495libbzz";
+ libraryHaskellDepends = [
+ base MonadRandom transformers transformers-base
+ ];
+ description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"duplo" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
, base64-bytestring, bytestring, containers, directory
@@ -66553,8 +68201,8 @@ self: {
}:
mkDerivation {
pname = "easytest";
- version = "0.2";
- sha256 = "1sd9w5p6z9mmvxid6svmnh7h43r32mrcqilb8k7kiy36ln3n8j0b";
+ version = "0.2.1";
+ sha256 = "0gdyawzlw6d15yz7ji599xjgfr0g7l1iq11ffr4aw3j6g3dc6m8i";
libraryHaskellDepends = [
async base call-stack containers mtl random stm text transformers
];
@@ -66620,8 +68268,8 @@ self: {
}:
mkDerivation {
pname = "ec2-unikernel";
- version = "0.9.2";
- sha256 = "02nydjp2l686wx42a5dndhj3dxi5q73lx9628lhdan1alhim4j31";
+ version = "0.9.8";
+ sha256 = "137rq45d0d7ap77wlgiqp5sd2r0jwxkaw4mvxmj1lyi8yc52mxbg";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -66880,8 +68528,8 @@ self: {
}:
mkDerivation {
pname = "edges";
- version = "0.11.0.1";
- sha256 = "12bs1wlfhhq5cqb0xan34jvdpx1asr3rb2d2yiafxqpngwvd7nh8";
+ version = "0.11.0.3";
+ sha256 = "02735ky371hvxxxkgal7lzg6v8cmq5s115j6qx459lwj8p42az77";
libraryHaskellDepends = [
base cereal cereal-data-dword cereal-vector contravariant
data-dword deepseq deferred-folds foldl hashable monad-par pointed
@@ -66915,8 +68563,8 @@ self: {
}:
mkDerivation {
pname = "edit";
- version = "1.0.0.0";
- sha256 = "0p93j90f40ckg5n9d8hnsbd5qsi00c28cpdrczgihk81hjgflnkd";
+ version = "1.0.1.0";
+ sha256 = "0114fcb1cpfrvn01vqq4wcharny0ri412a3gsy888g739k61a4gj";
libraryHaskellDepends = [
base comonad deepseq QuickCheck transformers
];
@@ -67223,8 +68871,8 @@ self: {
}:
mkDerivation {
pname = "egison-tutorial";
- version = "3.7.9";
- sha256 = "04xy76737zp1vpnn1b76xd5z4d6hfxd4l707v8s1cd8vb18y3dc0";
+ version = "3.7.12";
+ sha256 = "16dpqwp96ngc15igzxhkn7waxynnxy87lx5j1flp5dj2v71fx17m";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -67333,6 +68981,8 @@ self: {
pname = "either";
version = "5.0.1";
sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc";
+ revision = "1";
+ editedCabalFile = "1kf0dy6nki64kkmjw8214jz3n086g1pghfm26f012b6qv0iakzca";
libraryHaskellDepends = [
base bifunctors mtl profunctors semigroupoids semigroups
];
@@ -67358,8 +69008,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "either-list-functions";
- version = "0.0.0.2";
- sha256 = "0m7fkf8r1i0z3zrfmnqsdzk0fc9mhanqmx7x6rjiisjiaf91yr8d";
+ version = "0.0.0.3";
+ sha256 = "1b01aj05dbx51hgyhmggh1zgcbwfvyijkxj7knqpbgpj7hymv00y";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "Functions involving lists of Either";
@@ -67398,8 +69048,8 @@ self: {
pname = "ekg";
version = "0.4.0.15";
sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8";
- revision = "3";
- editedCabalFile = "05vyycpr627znm769ilyaah39npwa6p23sncgar2vyvxscchkzpi";
+ revision = "4";
+ editedCabalFile = "17b68p16hsh79jaya1jfncml5cjf8y1jbr8827r42acnf9jk4s23";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring ekg-core ekg-json filepath network snap-core
@@ -67467,8 +69117,8 @@ self: {
pname = "ekg-core";
version = "0.1.1.4";
sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36";
- revision = "2";
- editedCabalFile = "1jky0jf6ajan5zmb46d6p4lv7293kc5gw1bcq5av733g10cwrbdk";
+ revision = "3";
+ editedCabalFile = "1s3545x9w01rrwzchb4f91ck0n6dc7gf0zwkryqx1b2c95ni5qa8";
libraryHaskellDepends = [
base containers ghc-prim text unordered-containers
];
@@ -67627,6 +69277,8 @@ self: {
pname = "ekg-statsd";
version = "0.2.4.0";
sha256 = "1nvsiblha1fzykvfaq1s0fyvfmhm32wvxdsfkn9pqd6dl5ivyx2y";
+ revision = "1";
+ editedCabalFile = "1iayg5ac94rgdz7shvvz7ff4saffww8dc6fy82hi0cpyk7kr2xy9";
libraryHaskellDepends = [
base bytestring ekg-core network text time unordered-containers
];
@@ -67758,6 +69410,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "eliminators_0_5" = callPackage
+ ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
+ , singletons, template-haskell, th-abstraction, th-desugar
+ }:
+ mkDerivation {
+ pname = "eliminators";
+ version = "0.5";
+ sha256 = "0d1d2pp8r2gai25q898v30gb5r82pjzi9smqndn27p1bk9xlqzzr";
+ libraryHaskellDepends = [
+ base extra singleton-nats singletons template-haskell
+ th-abstraction th-desugar
+ ];
+ testHaskellDepends = [ base hspec singleton-nats singletons ];
+ testToolDepends = [ hspec-discover ];
+ description = "Dependently typed elimination functions using singletons";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"elision" = callPackage
({ mkDerivation, base, profunctors }:
mkDerivation {
@@ -67779,8 +69450,8 @@ self: {
}:
mkDerivation {
pname = "elm-bridge";
- version = "0.4.3";
- sha256 = "154i3vwqw5qyam14x8dvpgffcgh2ljdl1hc9zw6xhiwb82vazy3z";
+ version = "0.5.0";
+ sha256 = "1laa86kkw2w4bz2z69fnp1vwyjnhz2w2zy6va93fgvxmn0cf7mj3";
libraryHaskellDepends = [ aeson base template-haskell ];
testHaskellDepends = [
aeson base containers hspec QuickCheck text
@@ -68270,8 +69941,8 @@ self: {
}:
mkDerivation {
pname = "email-validate";
- version = "2.3.2.6";
- sha256 = "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5";
+ version = "2.3.2.8";
+ sha256 = "1lsf6x3hmic8anx9dw6dryvsdh128rprb6dxqkyjr17iqy5ww6yp";
libraryHaskellDepends = [
attoparsec base bytestring template-haskell
];
@@ -68333,6 +70004,7 @@ self: {
testHaskellDepends = [ base doctest Glob ];
description = "Wrapper around email-validate library adding instances for common type classes";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"emailparse" = callPackage
@@ -68611,10 +70283,10 @@ self: {
}:
mkDerivation {
pname = "engine-io";
- version = "1.2.21";
- sha256 = "0rqpxvw2d2m5hlgkc2a3794874dig84vph1wkqnlrv2vxixkqplw";
+ version = "1.2.22";
+ sha256 = "19hmd804r9k20270zlsfbsyvww5syi5h3nl74klvgmni39ahcxcl";
revision = "1";
- editedCabalFile = "1n5l2fs0wn7wps2nr8irymrfac2qris75z3p73mmlxrdxmbjb2vr";
+ editedCabalFile = "098nkv1zrc4b80137pxdz87by83bla9cbsv6920cpbspkic8x9xz";
libraryHaskellDepends = [
aeson async attoparsec base base64-bytestring bytestring errors
free monad-loops mwc-random stm stm-delay text transformers
@@ -68668,8 +70340,8 @@ self: {
}:
mkDerivation {
pname = "engine-io-wai";
- version = "1.0.8";
- sha256 = "0mph6pg3j81kwwl73dn5hdbw3mndfxi2wqdgwb727znh058xh7zb";
+ version = "1.0.9";
+ sha256 = "1zdin34gfi2059n1wjfxs4i2kfc0r53f3wpwhjd0fbp0as56h94s";
libraryHaskellDepends = [
attoparsec base bytestring either engine-io http-types mtl text
transformers transformers-compat unordered-containers wai
@@ -68731,14 +70403,43 @@ self: {
}:
mkDerivation {
pname = "entropy";
- version = "0.4.1.1";
- sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf";
+ version = "0.4.1.3";
+ sha256 = "07596n4ligi1a6jddkh5kf94mrcg03kybs5wa198672d2gdfn2ji";
setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [ base bytestring unix ];
description = "A platform independent entropy source";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "entwine" = callPackage
+ ({ mkDerivation, async, base, containers, criterion, directory
+ , exceptions, monad-loops, process, QuickCheck
+ , quickcheck-instances, quickcheck-properties, quickcheck-text
+ , random, SafeSemaphore, stm, text, time, transformers
+ , transformers-either
+ }:
+ mkDerivation {
+ pname = "entwine";
+ version = "0.0.2";
+ sha256 = "08y5vxg6q5f7dakclap86i68if18srzl6q3a9hg7qyrrq6jlyv63";
+ libraryHaskellDepends = [
+ async base containers exceptions monad-loops SafeSemaphore stm text
+ time transformers transformers-either
+ ];
+ testHaskellDepends = [
+ async base directory exceptions process QuickCheck
+ quickcheck-instances text time transformers transformers-either
+ ];
+ benchmarkHaskellDepends = [
+ base criterion directory process QuickCheck quickcheck-instances
+ quickcheck-properties quickcheck-text random text transformers
+ transformers-either
+ ];
+ description = "entwine - Concurrency tools";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"enum-subset-generate" = callPackage
({ mkDerivation, base, generic-random, hspec, microlens, QuickCheck
, template-haskell
@@ -68755,6 +70456,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "enum-types" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "enum-types";
+ version = "0.1.0.0";
+ sha256 = "18qiq6nnnd1c5lkvjafsqd4ypa4xpmx99diq82dz5wy2h95ci2ri";
+ libraryHaskellDepends = [ base ];
+ description = "small enum types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"enumerable" = callPackage
({ mkDerivation, base, control-monad-omega, tagged }:
mkDerivation {
@@ -68832,6 +70544,8 @@ self: {
pname = "enumerator";
version = "0.4.20";
sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
+ revision = "1";
+ editedCabalFile = "10mn8a6sj7fvcprfmngr5z1h434k6yhdij064lqxjpiqyr1srg9z";
libraryHaskellDepends = [
base bytestring containers text transformers
];
@@ -68996,6 +70710,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "envstatus" = callPackage
+ ({ mkDerivation, base, ConfigFile, mtl, parsec, process, PyF, tasty
+ , tasty-hspec, unix
+ }:
+ mkDerivation {
+ pname = "envstatus";
+ version = "1.0.2";
+ sha256 = "1wdvhlmqwzwxv0y3n8xhw5yjy158c7xgiyd0p2zhjghws2p1jvp5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base ConfigFile mtl parsec process unix
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base ConfigFile parsec PyF tasty tasty-hspec
+ ];
+ description = "Display efficiently the state of the local environment";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"envy" = callPackage
({ mkDerivation, base, bytestring, containers, hspec, mtl
, QuickCheck, quickcheck-instances, text, time, transformers
@@ -69214,10 +70949,8 @@ self: {
}:
mkDerivation {
pname = "equivalence";
- version = "0.3.2";
- sha256 = "0a85bdyyvjqs5z4kfhhf758210k9gi9dv42ik66a3jl0z7aix8kx";
- revision = "1";
- editedCabalFile = "010n0gpk2rpninggdnnx0j7fys6hzn80s789b16iw0a55h4z0gn8";
+ version = "0.3.3";
+ sha256 = "02jhn8z1aqyxp3krylhfnwr7zzjcd17q9qriyd9653i92b7di3gf";
libraryHaskellDepends = [
base containers mtl STMonadTrans transformers transformers-compat
];
@@ -69667,53 +71400,56 @@ self: {
"espial" = callPackage
({ mkDerivation, aeson, base, bcrypt, bytestring, case-insensitive
, classy-prelude, classy-prelude-conduit, classy-prelude-yesod
- , conduit, containers, data-default, directory, esqueleto
- , fast-logger, file-embed, foreign-store, hjsmin, hscolour, hspec
- , http-conduit, iso8601-time, microlens, monad-control
- , monad-logger, mtl, optparse-generic, persistent
- , persistent-sqlite, persistent-template, pretty-show, safe
- , shakespeare, template-haskell, text, time, transformers
- , unordered-containers, vector, wai, wai-extra, wai-logger, warp
- , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-static
- , yesod-test
+ , conduit, containers, data-default, directory, ekg, ekg-core
+ , esqueleto, fast-logger, file-embed, foreign-store, hjsmin
+ , hscolour, hspec, http-conduit, iso8601-time, microlens
+ , monad-control, monad-logger, monad-metrics, mtl, optparse-generic
+ , persistent, persistent-sqlite, persistent-template, pinboard
+ , pretty-show, safe, shakespeare, template-haskell, text, time
+ , transformers, unordered-containers, vector, wai, wai-extra
+ , wai-logger, wai-middleware-metrics, warp, yaml, yesod, yesod-auth
+ , yesod-core, yesod-form, yesod-static, yesod-test
}:
mkDerivation {
pname = "espial";
- version = "0.0.4";
- sha256 = "15v0apj7mfb61jmbl806ak92h5a8qbp8cl05g07qnrp8hmh1g9fp";
+ version = "0.0.5.1";
+ sha256 = "010a809fmi6sxh2fwiwvjqk3d293cg5acj57lb1qbm6qjzn7ir37";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bcrypt bytestring case-insensitive classy-prelude
classy-prelude-conduit classy-prelude-yesod conduit containers
- data-default directory esqueleto fast-logger file-embed
- foreign-store hjsmin hscolour http-conduit iso8601-time
- monad-control monad-logger mtl persistent persistent-sqlite
- persistent-template pretty-show safe shakespeare template-haskell
- text time transformers unordered-containers vector wai wai-extra
- wai-logger warp yaml yesod yesod-auth yesod-core yesod-form
- yesod-static
+ data-default directory ekg ekg-core esqueleto fast-logger
+ file-embed foreign-store hjsmin hscolour http-conduit iso8601-time
+ microlens monad-control monad-logger monad-metrics mtl persistent
+ persistent-sqlite persistent-template pinboard pretty-show safe
+ shakespeare template-haskell text time transformers
+ unordered-containers vector wai wai-extra wai-logger
+ wai-middleware-metrics warp yaml yesod yesod-auth yesod-core
+ yesod-form yesod-static
];
executableHaskellDepends = [
aeson base bcrypt bytestring case-insensitive classy-prelude
classy-prelude-conduit classy-prelude-yesod conduit containers
- data-default directory esqueleto fast-logger file-embed
- foreign-store hjsmin hscolour http-conduit iso8601-time
- monad-control monad-logger mtl optparse-generic persistent
- persistent-sqlite persistent-template pretty-show safe shakespeare
- template-haskell text time transformers unordered-containers vector
- wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core
+ data-default directory ekg ekg-core esqueleto fast-logger
+ file-embed foreign-store hjsmin hscolour http-conduit iso8601-time
+ microlens monad-control monad-logger monad-metrics mtl
+ optparse-generic persistent persistent-sqlite persistent-template
+ pinboard pretty-show safe shakespeare template-haskell text time
+ transformers unordered-containers vector wai wai-extra wai-logger
+ wai-middleware-metrics warp yaml yesod yesod-auth yesod-core
yesod-form yesod-static
];
testHaskellDepends = [
aeson base bcrypt bytestring case-insensitive classy-prelude
classy-prelude-conduit classy-prelude-yesod conduit containers
- data-default directory esqueleto fast-logger file-embed
- foreign-store hjsmin hscolour hspec http-conduit iso8601-time
- microlens monad-control monad-logger mtl persistent
- persistent-sqlite persistent-template pretty-show safe shakespeare
- template-haskell text time transformers unordered-containers vector
- wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core
+ data-default directory ekg ekg-core esqueleto fast-logger
+ file-embed foreign-store hjsmin hscolour hspec http-conduit
+ iso8601-time microlens monad-control monad-logger monad-metrics mtl
+ persistent persistent-sqlite persistent-template pinboard
+ pretty-show safe shakespeare template-haskell text time
+ transformers unordered-containers vector wai wai-extra wai-logger
+ wai-middleware-metrics warp yaml yesod yesod-auth yesod-core
yesod-form yesod-static yesod-test
];
description = "Espial is an open-source, web-based bookmarking server";
@@ -69731,6 +71467,8 @@ self: {
pname = "esqueleto";
version = "2.5.3";
sha256 = "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x";
+ revision = "1";
+ editedCabalFile = "1rmqqx2p4bad6psg8jbzf6jwan9z4a5yjskdkw51q0f47jhpfcdj";
libraryHaskellDepends = [
base blaze-html bytestring conduit monad-logger persistent
resourcet tagged text transformers unordered-containers
@@ -69805,16 +71543,16 @@ self: {
}) {};
"etc" = callPackage
- ({ mkDerivation, aeson, base, hashable, rio, tasty, tasty-hunit
- , text, typed-process, unliftio
+ ({ mkDerivation, aeson, base, rio, tasty, tasty-hunit
+ , template-haskell, text, typed-process, unliftio
}:
mkDerivation {
pname = "etc";
- version = "0.4.0.3";
- sha256 = "0xnm5mvrd0409kcrxp6ls92z5fvq959pghf67pqmj4a84k1dwkw3";
+ version = "0.4.1.0";
+ sha256 = "1j17g8jij4y782vwpx7b52fv9nwv4v4mygk2hbq6vihzkbrdbd31";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson base hashable rio text typed-process unliftio
+ aeson base rio template-haskell text typed-process unliftio
];
testHaskellDepends = [ aeson base rio tasty tasty-hunit ];
description = "Declarative configuration spec for Haskell projects";
@@ -70157,10 +71895,8 @@ self: {
}:
mkDerivation {
pname = "euler-tour-tree";
- version = "0.1.0.1";
- sha256 = "12fxs5992rlfg91xxh2sahm2vykcjcjc30iwzkfm894qrk4flbz4";
- revision = "1";
- editedCabalFile = "033v38mr81pr81gb5wksi7bgpm1wrvcgck893dk1ymq4w6ifa2m6";
+ version = "0.1.1.0";
+ sha256 = "166gbinlf0ay8y2clzjzf5b2x489hcr1gzj8w5qk341z01f8pckh";
libraryHaskellDepends = [
base containers fingertree mtl parser-combinators transformers
Unique
@@ -70608,8 +72344,10 @@ self: {
}:
mkDerivation {
pname = "eventstore";
- version = "1.1.5";
- sha256 = "1c8iiq943smldh5yvjpfycfjzy8hnsb2dmvcnbzk41cpcdq2zkx8";
+ version = "1.1.6";
+ sha256 = "00bdkklwrabxvbr725hkdsc1a2fdr50gdwryn7spmsqxmqgzv96w";
+ revision = "1";
+ editedCabalFile = "1y1a7brw220bg4mfc80qhkcyzlm38qvs6pkr7p8xyk104b8k5qgx";
libraryHaskellDepends = [
aeson array base bifunctors bytestring cereal clock connection
containers dns dotnet-timespan ekg-core exceptions fast-logger
@@ -70844,6 +72582,8 @@ self: {
pname = "exception-transformers";
version = "0.4.0.7";
sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj";
+ revision = "1";
+ editedCabalFile = "0sahi93f75acvmqagkjc1lcwx31crja6z9hyww9abj85x45pqa6f";
libraryHaskellDepends = [
base stm transformers transformers-compat
];
@@ -70875,8 +72615,8 @@ self: {
pname = "exceptions";
version = "0.10.0";
sha256 = "1ms9zansv0pwzwdjncvx4kf18lnkjy2p61hvjhvxmjx5bqp93p8y";
- revision = "1";
- editedCabalFile = "1ydvmhi9bj7b1md3wd4l2z2lccgyjgv3ha8milmy2l4lad9xh6xy";
+ revision = "2";
+ editedCabalFile = "0aiihbjfrlmxzw9q8idvr6mihhs7kbx9s3w1vj8x3pz27p0ncq7g";
libraryHaskellDepends = [
base mtl stm template-haskell transformers transformers-compat
];
@@ -71017,8 +72757,8 @@ self: {
}:
mkDerivation {
pname = "exhaustive";
- version = "1.1.6";
- sha256 = "00gdgr9xqzy14sqx31j4afljvfc4ar2jrzmwpp3z6ybfq1saw7vk";
+ version = "1.1.7";
+ sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z";
libraryHaskellDepends = [
base generics-sop template-haskell transformers
];
@@ -71086,30 +72826,84 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "exinst_0_7" = callPackage
+ ({ mkDerivation, base, binary, bytestring, constraints, deepseq
+ , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "exinst";
+ version = "0.7";
+ sha256 = "01m50pixmrw6mrd04nxw6qwx0z5k857pn3nqfiybpmp4zbc3bwac";
+ libraryHaskellDepends = [
+ base binary constraints deepseq hashable profunctors QuickCheck
+ singletons
+ ];
+ testHaskellDepends = [
+ base binary bytestring constraints deepseq hashable profunctors
+ QuickCheck singletons tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Dependent pairs and their instances";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"exinst-aeson" = callPackage
- ({ mkDerivation, aeson, base, constraints, exinst, singletons }:
+ ({ mkDerivation, aeson, base, bytestring, constraints, exinst
+ , QuickCheck, singletons, tasty, tasty-quickcheck
+ }:
mkDerivation {
pname = "exinst-aeson";
- version = "0.2";
- sha256 = "12qnc7kfr51gxnmyj71m82rh76phj207bd6fl8iwhwvzb5xhnnsr";
+ version = "0.7";
+ sha256 = "1dn08xqcfp3bsgvrhcv491kdfmky6925wa33zry8aijwxkchva67";
libraryHaskellDepends = [
aeson base constraints exinst singletons
];
- description = "Derive instances for the `aeson` library for your existential types";
+ testHaskellDepends = [
+ aeson base bytestring exinst QuickCheck tasty tasty-quickcheck
+ ];
+ description = "Dependent pairs and their instances";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"exinst-bytes" = callPackage
- ({ mkDerivation, base, bytes, constraints, exinst, singletons }:
+ ({ mkDerivation, base, binary, bytes, bytestring, cereal
+ , constraints, exinst, exinst-cereal, QuickCheck, singletons, tasty
+ , tasty-quickcheck
+ }:
mkDerivation {
pname = "exinst-bytes";
- version = "0.2";
- sha256 = "0rxjfy3ljkmjnvsvif0wvcwhcgvz1yr5amj10ii08lr3vn6papnj";
+ version = "0.7";
+ sha256 = "05k2jzlz6aj5wwy3bnysszr6kw85n0j73wkda5vwcrsha4prmf9r";
libraryHaskellDepends = [
base bytes constraints exinst singletons
];
- description = "Derive instances for the `bytes` library for your existential types";
+ testHaskellDepends = [
+ base binary bytes bytestring cereal exinst exinst-cereal QuickCheck
+ tasty tasty-quickcheck
+ ];
+ description = "Dependent pairs and their instances";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "exinst-cereal" = callPackage
+ ({ mkDerivation, base, binary, bytestring, cereal, constraints
+ , exinst, QuickCheck, singletons, tasty, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "exinst-cereal";
+ version = "0.7";
+ sha256 = "1qdz4a4qzi3fbkigvng36hz5j322zbbwya2vrs0shja8ry6rvi74";
+ libraryHaskellDepends = [
+ base cereal constraints exinst singletons
+ ];
+ testHaskellDepends = [
+ base binary bytestring cereal exinst QuickCheck tasty
+ tasty-quickcheck
+ ];
+ description = "Dependent pairs and their instances";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -71140,6 +72934,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "exinst-serialise" = callPackage
+ ({ mkDerivation, base, binary, constraints, exinst, QuickCheck
+ , serialise, singletons, tasty, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "exinst-serialise";
+ version = "0.7";
+ sha256 = "0a51534sifdhq764qa9hrhwnv48f1y08a7f11mhhx3r23pxh4588";
+ libraryHaskellDepends = [
+ base constraints exinst serialise singletons
+ ];
+ testHaskellDepends = [
+ base binary exinst QuickCheck serialise tasty tasty-quickcheck
+ ];
+ description = "Dependent pairs and their instances";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"existential" = callPackage
({ mkDerivation, base, cereal, constraints, control-invariants
, lens, portable-template-haskell-lens, QuickCheck
@@ -71178,8 +72991,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "exit-codes";
- version = "0.1.1.0";
- sha256 = "0v8z5wkhyavd7zzcfbjm229mbgp1xcjbz9mvcxnjikcljn5xi181";
+ version = "1.0.0";
+ sha256 = "00cyli96zkyqhjr3lqzrislqyk72xwm2dcqvjagklidh32d4k8ja";
libraryHaskellDepends = [ base ];
description = "Exit codes as defined by BSD";
license = stdenv.lib.licenses.bsd3;
@@ -71194,6 +73007,8 @@ self: {
pname = "exitcode";
version = "0.1.0.1";
sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5";
+ revision = "2";
+ editedCabalFile = "0g30lnsl947bsxcw53swl0vv3qg8c7vqf8axpdnhl28mdrxa0ax9";
libraryHaskellDepends = [
base lens mmorph mtl semigroupoids semigroups transformers
];
@@ -71226,8 +73041,8 @@ self: {
}:
mkDerivation {
pname = "exp-cache";
- version = "0.1.0.1";
- sha256 = "0yg5p3682fgkb0cn8gyb01zr9qy7y5maqzc6ssc04w9ll06l66jd";
+ version = "0.1.0.2";
+ sha256 = "1r3k4l44hii964c2xm4zb981hi0pklzik62fxr3zwyzwdjzdd36a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -71247,8 +73062,8 @@ self: {
pname = "exp-extended";
version = "0.1.1.2";
sha256 = "0ymfnwq103n1paj6wl2cj6szi5nx2h2j1azy3wy4kkw6sk07m00r";
- revision = "2";
- editedCabalFile = "050v0c9l9gi1bxpqbfcl2j9mdiv7xdh1mdfwymxcgpjydv60xwh0";
+ revision = "3";
+ editedCabalFile = "0gd1jwhhj5qjvfysvrm41zywx3cq6n131ym2x94z68cpswdmv0qn";
libraryHaskellDepends = [ base compensated log-domain ];
description = "floating point with extended exponent range";
license = stdenv.lib.licenses.bsd3;
@@ -71263,6 +73078,30 @@ self: {
pname = "exp-pairs";
version = "0.1.6.0";
sha256 = "1qsvly4klhk17r2pk60cf03dyz0cjc449fa2plqrlai9rl7xjfp6";
+ revision = "1";
+ editedCabalFile = "1zbsjlj6wavz9ysfzjqb4ng7688crlfvsbyj4li84khc1jp71xj3";
+ libraryHaskellDepends = [
+ base containers deepseq ghc-prim prettyprinter
+ ];
+ testHaskellDepends = [
+ base matrix QuickCheck random smallcheck tasty tasty-hunit
+ tasty-quickcheck tasty-smallcheck
+ ];
+ description = "Linear programming over exponent pairs";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
+ "exp-pairs_0_2_0_0" = callPackage
+ ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
+ , prettyprinter, QuickCheck, random, smallcheck, tasty, tasty-hunit
+ , tasty-quickcheck, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "exp-pairs";
+ version = "0.2.0.0";
+ sha256 = "0ry9k89xfy2493j7yypyiqcj0v7h5x9w8gl60dy28w4597yinisp";
+ revision = "1";
+ editedCabalFile = "1fkllbgsygzm1lw3g3a9l8fg8ap74bx0x7ja8yx3lbrjjsaqh8pa";
libraryHaskellDepends = [
base containers deepseq ghc-prim prettyprinter
];
@@ -71272,6 +73111,7 @@ self: {
];
description = "Linear programming over exponent pairs";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"expand" = callPackage
@@ -71511,8 +73351,8 @@ self: {
}:
mkDerivation {
pname = "expressions";
- version = "0.1.9";
- sha256 = "1620ljwnprqsrbp2dp0c2f7kpjg7j1xz12x794kpq3csbdp52afk";
+ version = "0.4.2";
+ sha256 = "0lps0grvknsp0sfsqnd6kxfh6xf518x9ii11s7fy03qcl0v51da5";
libraryHaskellDepends = [
attoparsec base containers free lattices singletons text
transformers
@@ -71520,6 +73360,7 @@ self: {
testHaskellDepends = [ base singletons text ];
description = "Expressions and Formulae a la carte";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"expressions-z3" = callPackage
@@ -71528,8 +73369,8 @@ self: {
}:
mkDerivation {
pname = "expressions-z3";
- version = "0.1.6";
- sha256 = "0la7acpr9vd67crgj87920wlckyhzvilz9jv86ms1hiwwmvl1c7a";
+ version = "0.4";
+ sha256 = "1m3s9rm4767z68wpl92vryhg1sb0pllrv18x5x53amfa7kf6vrvv";
libraryHaskellDepends = [
base containers expressions list-t singletons transformers z3
];
@@ -71538,6 +73379,7 @@ self: {
];
description = "Encode and Decode expressions from Z3 ASTs";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"extcore" = callPackage
@@ -71601,8 +73443,8 @@ self: {
pname = "extended-reals";
version = "0.2.3.0";
sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw";
- revision = "1";
- editedCabalFile = "114s55sx0wq0zq9mgxrhaz4kd87c80zf8s35ani3h4dh1bb33j9w";
+ revision = "2";
+ editedCabalFile = "020aliazf97zrhkcdpblmh9xakabdd8wdxg0667j4553rsijwqcy";
libraryHaskellDepends = [ base deepseq hashable ];
testHaskellDepends = [
base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -71682,8 +73524,8 @@ self: {
}:
mkDerivation {
pname = "extensible-effects";
- version = "3.1.0.0";
- sha256 = "0p4vk4k6922ar853zb85jm4si7y1qdr1wkx4pwfd613a5ar23440";
+ version = "3.1.0.1";
+ sha256 = "1znqhcx5y4mpkbib18nma2c6bw4wxyxlxg3s8kafdalrx61rdhy3";
libraryHaskellDepends = [ base monad-control transformers-base ];
testHaskellDepends = [
base doctest HUnit monad-control QuickCheck silently test-framework
@@ -71698,20 +73540,23 @@ self: {
}) {};
"extensible-effects-concurrent" = callPackage
- ({ mkDerivation, base, containers, deepseq, directory
+ ({ mkDerivation, base, containers, data-default, deepseq, directory
, extensible-effects, filepath, HUnit, lens, logging-effect
, monad-control, mtl, parallel, process, QuickCheck, random, stm
, tagged, tasty, tasty-discover, tasty-hunit, time, transformers
}:
mkDerivation {
pname = "extensible-effects-concurrent";
- version = "0.4.0.0";
- sha256 = "0asqibn8hf4i627k9ms8sak90wmyis919ggb41lra4rlv03r61rc";
+ version = "0.8";
+ sha256 = "17xag4qcdgv7fihyigmi48kf4mb9f3dbxqlh7a7s1xqdfh9l6mc2";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- base containers deepseq directory extensible-effects filepath lens
- logging-effect monad-control mtl parallel process QuickCheck random
- stm tagged time transformers
+ base containers data-default deepseq directory extensible-effects
+ filepath lens logging-effect monad-control mtl parallel process
+ QuickCheck random stm tagged time transformers
];
+ executableHaskellDepends = [ base extensible-effects ];
testHaskellDepends = [
base containers deepseq extensible-effects HUnit lens QuickCheck
stm tasty tasty-discover tasty-hunit
@@ -71762,8 +73607,8 @@ self: {
}:
mkDerivation {
pname = "extra";
- version = "1.6.9";
- sha256 = "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b";
+ version = "1.6.13";
+ sha256 = "0jc5g120ff97sayff10kqn66wz8aw2wymgwgh2livzkf7vqm5q50";
libraryHaskellDepends = [
base clock directory filepath process time unix
];
@@ -71842,29 +73687,14 @@ self: {
({ mkDerivation, base, leancheck, speculate, template-haskell }:
mkDerivation {
pname = "extrapolate";
- version = "0.3.1";
- sha256 = "1hz03mdascy4jvqhyrqqmb1py3pb03g4z3if05z2cbdxgbgsbbn4";
- libraryHaskellDepends = [
- base leancheck speculate template-haskell
- ];
- testHaskellDepends = [ base leancheck speculate ];
- description = "generalize counter-examples of test properties";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "extrapolate_0_3_2" = callPackage
- ({ mkDerivation, base, leancheck, speculate, template-haskell }:
- mkDerivation {
- pname = "extrapolate";
- version = "0.3.2";
- sha256 = "1scfcjqz1q9pv37rvygbpdwx8j22469f5p2vf5ay68hd62d592gj";
+ version = "0.3.3";
+ sha256 = "1mc14d9wcrvrd2fkzjxc5gvy7s33p875qj97bdaacdjv5hmg5zr2";
libraryHaskellDepends = [
base leancheck speculate template-haskell
];
testHaskellDepends = [ base leancheck speculate ];
description = "generalize counter-examples of test properties";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ez-couch" = callPackage
@@ -71904,6 +73734,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "f-ree-hack-cheats-free-v-bucks-generator" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "f-ree-hack-cheats-free-v-bucks-generator";
+ version = "0.2";
+ sha256 = "0dk9bfcwalwlq52hnl4g4ypz2bip0d8yy45k9dib7cv6v09xfwhi";
+ revision = "3";
+ editedCabalFile = "0dsj8dbdkljcrk0qkmym2pciwcni602yrc90f47v1nm37hs46c6m";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base ];
+ description = "Spam";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"faceted" = callPackage
({ mkDerivation, base, free }:
mkDerivation {
@@ -71948,6 +73794,8 @@ self: {
pname = "facts";
version = "0.0.1.0";
sha256 = "12ifja6vgm8hafs23fzb2jfk0jiz4nss1if5b86950y3mc995rfx";
+ revision = "1";
+ editedCabalFile = "03v6p3vlilz6vk5xlvw3r31cqicx3m1xjii9shcqpacxvlh2zzlp";
libraryHaskellDepends = [ base exceptions mtl template-haskell ];
description = "Refined types";
license = stdenv.lib.licenses.bsd3;
@@ -72228,8 +74076,8 @@ self: {
}:
mkDerivation {
pname = "fast-arithmetic";
- version = "0.6.0.9";
- sha256 = "1kpki7j8kz9xzzg8gl8l5g7wgq0v2s7r2lhr0mb4m67bkq61zmrs";
+ version = "0.6.3.0";
+ sha256 = "0f02fi63xq0x1r5qqagwzz6wbsxblz99jm2g994gs13ba11abix1";
libraryHaskellDepends = [ base composition-prelude gmpint ];
testHaskellDepends = [
arithmoi base combinat-compat hspec QuickCheck
@@ -72358,11 +74206,10 @@ self: {
}:
mkDerivation {
pname = "fast-tags";
- version = "1.4.2";
- sha256 = "19z36f76w2cp763ija5di0zn1p9c9i1albx6q429f0afrpxymzp5";
+ version = "1.5.0";
+ sha256 = "0cchakbbs7sfjrsg6p45kv9bv1dsxp5mj6q3900v0hf8n7is3qqb";
isLibrary = true;
isExecutable = true;
- enableSeparateDataOutput = true;
libraryHaskellDepends = [
array async base bytestring containers cpphs deepseq directory
filepath mtl text utf8-string
@@ -72917,8 +74764,8 @@ self: {
pname = "fclabels";
version = "2.0.3.3";
sha256 = "1q62p41bj991s7i15ciayw1v1xq8szn4bls50p65lfy2dnj7554s";
- revision = "2";
- editedCabalFile = "0mn82r0h9zhdsaf7qz45fcps6y1kdkqi8xf8dsz8419by2x5ygfx";
+ revision = "3";
+ editedCabalFile = "1wncfnvh4mv87gh0ddhiqf839d63rqs1qzi3y386y6r8hfnvra0l";
libraryHaskellDepends = [ base mtl template-haskell transformers ];
testHaskellDepends = [
base HUnit mtl template-haskell transformers
@@ -73525,20 +75372,20 @@ self: {
}) {};
"fficxx" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers, data-default
- , directory, either, errors, filepath, hashable, haskell-src-exts
- , lens, mtl, process, pureMD5, split, template, template-haskell
- , text, transformers, unordered-containers
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+ , containers, data-default, directory, either, errors, filepath
+ , hashable, haskell-src-exts, lens, mtl, process, pureMD5, split
+ , template, template-haskell, text, transformers
+ , unordered-containers
}:
mkDerivation {
pname = "fficxx";
- version = "0.4.1";
- sha256 = "1s1yzvs1j4as4875509hzny1399zimpzyh9zh5g0ddg8dqg5lfi4";
- enableSeparateDataOutput = true;
+ version = "0.5.0.1";
+ sha256 = "01rvg7y9c0jczypjgrq7b6cbl79n10flsllkbgm9z5hhymwga38s";
libraryHaskellDepends = [
- base bytestring Cabal containers data-default directory either
- errors filepath hashable haskell-src-exts lens mtl process pureMD5
- split template template-haskell text transformers
+ aeson aeson-pretty base bytestring Cabal containers data-default
+ directory either errors filepath hashable haskell-src-exts lens mtl
+ process pureMD5 split template template-haskell text transformers
unordered-containers
];
description = "automatic C++ binding generation";
@@ -73550,8 +75397,8 @@ self: {
({ mkDerivation, base, bytestring, template-haskell }:
mkDerivation {
pname = "fficxx-runtime";
- version = "0.3";
- sha256 = "18pzjhfqsr2f783xywmcfkz5isx31iqcyng4j5mbz92q2m166idb";
+ version = "0.5";
+ sha256 = "05ljkq3zv8nfx4xhvqql13qd81v46bnxnja8f8590yrf3zfqg87x";
libraryHaskellDepends = [ base bytestring template-haskell ];
description = "Runtime for fficxx-generated library";
license = stdenv.lib.licenses.bsd3;
@@ -73618,8 +75465,8 @@ self: {
({ mkDerivation, base, fftw }:
mkDerivation {
pname = "fftwRaw";
- version = "0.1.0.1";
- sha256 = "1ka58mkn30mrhma7l5cshilhaif4r2jqxqpm6rvmscrvnrjq3nyz";
+ version = "0.1.0.2";
+ sha256 = "1690x5vllqba39srbp7q3gl2rv30wq941sx4z89fh89axwgp9629";
libraryHaskellDepends = [ base ];
librarySystemDepends = [ fftw ];
description = "Low level bindings to FFTW";
@@ -73635,6 +75482,8 @@ self: {
pname = "fgl";
version = "5.6.0.0";
sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll";
+ revision = "1";
+ editedCabalFile = "17r5p1c6srgyzpdkqkjcl9k3ax9c82lvps1kqjhxpdzypsnzns70";
libraryHaskellDepends = [
array base containers deepseq transformers
];
@@ -73860,8 +75709,8 @@ self: {
pname = "file-embed-lzma";
version = "0";
sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78";
- revision = "1";
- editedCabalFile = "18q9dgfdsr7r5mlqzhhgbx0bp4bv2xkpcsrihl655pwaj1lz1v2s";
+ revision = "2";
+ editedCabalFile = "0dmg69gsj2k9lf112bvqw6z2w8hl0p1lx5zxdvlvk85bb3qz6304";
libraryHaskellDepends = [
base base-compat bytestring directory filepath lzma
template-haskell text th-lift-instances transformers
@@ -74049,8 +75898,8 @@ self: {
pname = "filepath-crypto";
version = "0.1.0.0";
sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0";
- revision = "5";
- editedCabalFile = "1xyrac6m3szzj7x68fnrf7nh43gq03g9rwyynfxdx290bgc38gch";
+ revision = "6";
+ editedCabalFile = "0lg22k1f9l51a8bdnhkwq07mg0m3w3rhgavp1lxi3vmsszsmpmvc";
libraryHaskellDepends = [
base binary bytestring case-insensitive cryptoids cryptoids-class
cryptoids-types exceptions filepath sandi template-haskell
@@ -74236,6 +76085,8 @@ self: {
pname = "fin";
version = "0.0.1";
sha256 = "0mqs6qayj2n54siz3bpab9z6sk9030wdaxgvgg9g36983yaqmlil";
+ revision = "1";
+ editedCabalFile = "056d22f1j1xv5ka2qr7a3z5ad5w1im76qdf77v6dqdi4vaz52vd1";
libraryHaskellDepends = [ base deepseq hashable ];
testHaskellDepends = [ base inspection-testing tagged ];
description = "Nat and Fin: peano naturals and finite numbers";
@@ -74494,8 +76345,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "first-class-families";
- version = "0.1.0.0";
- sha256 = "19lm7p45rn3rlz51pi08ka2sc6nd01ba56pdp6nxakynmc44mw25";
+ version = "0.3.0.1";
+ sha256 = "07291dj197230kq8vxqdgs52zl428w12sgy18y0n5lk18g5isxib";
libraryHaskellDepends = [ base ];
description = "First class type families";
license = stdenv.lib.licenses.mit;
@@ -74755,14 +76606,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fixed-vector_1_2_0_0" = callPackage
+ ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
+ mkDerivation {
+ pname = "fixed-vector";
+ version = "1.2.0.0";
+ sha256 = "19846sgjlsv7qy9nm9l4p2wdms5kvx6y9wm5ffz1hw7h77qy8ryw";
+ libraryHaskellDepends = [ base deepseq primitive ];
+ testHaskellDepends = [ base doctest filemanip primitive ];
+ description = "Generic vectors with statically known size";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fixed-vector-binary" = callPackage
({ mkDerivation, base, binary, fixed-vector, tasty
, tasty-quickcheck
}:
mkDerivation {
pname = "fixed-vector-binary";
- version = "1.0.0.0";
- sha256 = "1q3rjjgn16fa5d8cqrlaac2b29v3045am1aanyn77vi843xzah98";
+ version = "1.0.0.1";
+ sha256 = "10s0mc6xdx7n6dmdgpjysbqmk79ssfw9zmaz5j0spjy7dy55zq3m";
libraryHaskellDepends = [ base binary fixed-vector ];
testHaskellDepends = [
base binary fixed-vector tasty tasty-quickcheck
@@ -74777,8 +76641,8 @@ self: {
}:
mkDerivation {
pname = "fixed-vector-cborg";
- version = "1.0.0.0";
- sha256 = "0fmdl4vfg65709iw8s18hjayqhdx4zgn36l17z2x9xlh0prspkki";
+ version = "1.0.0.1";
+ sha256 = "0m5xcy99hydcs99yph6n63517h2asg611rgg0h28blqd1f7bfch8";
libraryHaskellDepends = [ base cborg fixed-vector serialise ];
testHaskellDepends = [
base fixed-vector serialise tasty tasty-quickcheck
@@ -74793,8 +76657,8 @@ self: {
}:
mkDerivation {
pname = "fixed-vector-cereal";
- version = "1.0.0.0";
- sha256 = "1vg44xjwf4ffq4jxiqzk5rphbkgys81lzm1nzjsrfr8s7hhn0clp";
+ version = "1.0.0.1";
+ sha256 = "15vg3kr7fkd6i0swm4lm76gkfdnh0ydl4nci5abj1zss8qcn9gam";
libraryHaskellDepends = [ base cereal fixed-vector ];
testHaskellDepends = [
base cereal fixed-vector tasty tasty-quickcheck
@@ -75020,8 +76884,8 @@ self: {
}:
mkDerivation {
pname = "fizzbuzz-as-a-service";
- version = "0.1.0.2";
- sha256 = "0bskyv1zyk469bikh4rh6ad1i8d5ym9s89a88aw34cpphy0vq1zk";
+ version = "0.1.0.3";
+ sha256 = "0kzhbavi26qbph6pgna77fbnpfgrxi81h9v92177ycl980k4qdwv";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -75041,8 +76905,8 @@ self: {
pname = "flac";
version = "0.1.2";
sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn";
- revision = "3";
- editedCabalFile = "09xml5mv63q0wzw09s0ssjdzgnq041gr6gjhk63dr252rydnn4zh";
+ revision = "4";
+ editedCabalFile = "0bmhd56fg4idz62maig3kykk7dyqy9dpm27fdljqg8jccl0vbwbm";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers data-default-class directory exceptions
@@ -75306,44 +77170,33 @@ self: {
}) {};
"flight-igc" = callPackage
- ({ mkDerivation, base, cmdargs, directory, filemanip, filepath
- , hlint, mtl, parsec, raw-strings-qq, system-filepath, transformers
- }:
+ ({ mkDerivation, base, bytestring, parsec, utf8-string }:
mkDerivation {
pname = "flight-igc";
- version = "0.1.0";
- sha256 = "1cr25xhwmpzi0rg8znj1q7siy5skjm8q08ncgwvmd4h3mmdbb7xl";
- revision = "1";
- editedCabalFile = "0yaqp249gjqgch7w9d8y963afvjl43mhaywgni3x8ld14h55m7ia";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base parsec ];
- executableHaskellDepends = [
- base cmdargs directory filemanip filepath mtl raw-strings-qq
- system-filepath transformers
- ];
- testHaskellDepends = [ base hlint ];
+ version = "1.0.0";
+ sha256 = "17w40nfmdb4crg23fnqn663i4a60dx5714rcyaiqllm4r25n5qv9";
+ libraryHaskellDepends = [ base bytestring parsec utf8-string ];
description = "A parser for IGC files";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mpl20;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"flight-kml" = callPackage
- ({ mkDerivation, aeson, base, detour-via-sci, doctest, hlint, hxt
+ ({ mkDerivation, aeson, base, detour-via-sci, doctest, hxt
, hxt-xpath, parsec, path, raw-strings-qq, siggy-chardust
, smallcheck, split, tasty, tasty-hunit, tasty-quickcheck
, tasty-smallcheck, template-haskell, time
}:
mkDerivation {
pname = "flight-kml";
- version = "1.0.0";
- sha256 = "0h04f0hkcri1qjk9kfc4r0sg8wyf6hx6s4cjgzaqnmfak6sa9j9c";
+ version = "1.0.1";
+ sha256 = "1g70vm7qbxsx2azgb759xcpizq5c1ic2173w78jib0f7mpb8qc28";
libraryHaskellDepends = [
aeson base detour-via-sci hxt hxt-xpath parsec path siggy-chardust
split time
];
testHaskellDepends = [
- aeson base detour-via-sci doctest hlint hxt hxt-xpath parsec path
+ aeson base detour-via-sci doctest hxt hxt-xpath parsec path
raw-strings-qq siggy-chardust smallcheck split tasty tasty-hunit
tasty-quickcheck tasty-smallcheck template-haskell time
];
@@ -75478,8 +77331,8 @@ self: {
({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
mkDerivation {
pname = "flow";
- version = "1.0.14";
- sha256 = "0k6j0mh3lr2fpvjs2jl1agybng32g9z8w3qf5b542ydjl02nvk08";
+ version = "1.0.17";
+ sha256 = "06adx3drx4b283v0aawhzyigvjizbhig8lqxw9cgqfn1pvc1kv46";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest QuickCheck template-haskell ];
description = "Write more understandable Haskell";
@@ -75654,21 +77507,21 @@ self: {
"fltkhs" = callPackage
({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
- , mtl, parsec, text
+ , mtl, parsec, pkg-config, text, vector
}:
mkDerivation {
pname = "fltkhs";
- version = "0.5.4.5";
- sha256 = "17iqpnn0zgwifb937kllkfyz8qf37da90z8iyay348gy3siwjxic";
+ version = "0.6.0.0";
+ sha256 = "1cbyp8rq9yzx6jrw68dbprkdyd8pkdqbxx08wajyg7bfks6j39cb";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
- libraryHaskellDepends = [ base bytestring text ];
- libraryToolDepends = [ c2hs ];
+ libraryHaskellDepends = [ base bytestring text vector ];
+ libraryToolDepends = [ c2hs pkg-config ];
executableHaskellDepends = [ base directory filepath mtl parsec ];
description = "FLTK bindings";
license = stdenv.lib.licenses.mit;
- }) {};
+ }) {pkg-config = null;};
"fltkhs-demos" = callPackage
({ mkDerivation, base, bytestring, directory, fltkhs, process, stm
@@ -75728,6 +77581,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "fltkhs-themes" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, fltkhs, fontconfig
+ , load-font, text, vector
+ }:
+ mkDerivation {
+ pname = "fltkhs-themes";
+ version = "0.1.0.1";
+ sha256 = "03awhraincinrqr1zzb9c64mkb391isw3gb87csa1dkqk846wij6";
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [
+ base bytestring fltkhs load-font text vector
+ ];
+ librarySystemDepends = [ fontconfig ];
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) fontconfig;};
+
"fluent-logger" = callPackage
({ mkDerivation, attoparsec, base, bytestring, cereal
, cereal-conduit, conduit, conduit-extra, containers, criterion
@@ -75919,8 +77790,8 @@ self: {
}:
mkDerivation {
pname = "fmt";
- version = "0.6";
- sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy";
+ version = "0.6.1";
+ sha256 = "1c6a0nrm90drs13s1hry9xs8j7dx37j21f7kllpx5s240nqy4c6c";
libraryHaskellDepends = [
base base64-bytestring bytestring containers formatting microlens
text time time-locale-compat
@@ -75938,6 +77809,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fmt-terminal-colors" = callPackage
+ ({ mkDerivation, ansi-terminal, base, fmt }:
+ mkDerivation {
+ pname = "fmt-terminal-colors";
+ version = "0.1.0.1";
+ sha256 = "0a8gs4m21c1b0xl7v6rm2j915yix3pks0vvy0n3c2298lpkj0z6b";
+ libraryHaskellDepends = [ ansi-terminal base fmt ];
+ testHaskellDepends = [ ansi-terminal base fmt ];
+ description = "ANSI terminal colors formatters for fmt library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fn" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, directory
, filepath, hspec, http-types, resourcet, text
@@ -76008,8 +77891,8 @@ self: {
}:
mkDerivation {
pname = "fold-debounce";
- version = "0.2.0.7";
- sha256 = "13y6l6ng5rrva0sx9sa4adp6p2yrpyfz91v3jbkamgh4g99w8zpz";
+ version = "0.2.0.8";
+ sha256 = "1j7v11nq2q7p50z27lbmprwqrhvcf9qa5zy2hql68zsi53q3wszw";
libraryHaskellDepends = [
base data-default-class stm stm-delay time
];
@@ -76024,8 +77907,8 @@ self: {
}:
mkDerivation {
pname = "fold-debounce-conduit";
- version = "0.2.0.1";
- sha256 = "02shx123yd9g9y8n9aj6ai6yrlcb7zjqyhvw530kw68ailnl762z";
+ version = "0.2.0.3";
+ sha256 = "0rzgaxqv3q0s848bk3hm0mq14sxa1szpxvi9k19n0hpqlx60rj4p";
libraryHaskellDepends = [
base conduit fold-debounce resourcet stm transformers
transformers-base
@@ -76056,8 +77939,8 @@ self: {
}:
mkDerivation {
pname = "foldl";
- version = "1.4.3";
- sha256 = "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk";
+ version = "1.4.5";
+ sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b";
libraryHaskellDepends = [
base bytestring comonad containers contravariant hashable
mwc-random primitive profunctors semigroupoids semigroups text
@@ -76097,8 +77980,8 @@ self: {
}:
mkDerivation {
pname = "foldl-statistics";
- version = "0.1.5.0";
- sha256 = "1z9qx7kiaidl3icz6g3rd6pyycwnvyv7xyw8g6p1n7rpvz60633b";
+ version = "0.1.5.1";
+ sha256 = "196vkbgj6c5dhwfw6l73z8dw505hsjsrx4w1f3zfczm0jfc4fsxl";
libraryHaskellDepends = [
base containers foldl hashable math-functions profunctors
unordered-containers
@@ -76221,6 +78104,35 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "follow" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, exceptions, feed
+ , HandsomeSoup, hspec, hxt, req, text, time, transformers
+ , unordered-containers, yaml
+ }:
+ mkDerivation {
+ pname = "follow";
+ version = "0.1.0.0";
+ sha256 = "18j7m8dsmnrq7cnmin48zl1g8yidsh8sgqnlr42qldi49ciam4j0";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring exceptions feed HandsomeSoup hxt req text
+ time transformers unordered-containers yaml
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring exceptions feed HandsomeSoup hxt req text
+ time transformers unordered-containers yaml
+ ];
+ testHaskellDepends = [
+ aeson base bytestring exceptions feed HandsomeSoup hspec hxt req
+ text time transformers unordered-containers yaml
+ ];
+ description = "Haskell library to follow content published on any subject";
+ license = stdenv.lib.licenses.lgpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"follow-file" = callPackage
({ mkDerivation, attoparsec, attoparsec-path, base, bytestring
, conduit, conduit-combinators, directory, exceptions, hinotify
@@ -76379,8 +78291,8 @@ self: {
pname = "force-layout";
version = "0.4.0.6";
sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp";
- revision = "3";
- editedCabalFile = "0rp5ggzdqy9i8bsjz7i36l8l2b04vjy6sqm6gxmb4pqmakj1x8q6";
+ revision = "4";
+ editedCabalFile = "0hpr1z68lflgcdl9gbmva0i52wbgfhh4qj3iwdvzipsp8mwav7s7";
libraryHaskellDepends = [
base containers data-default-class lens linear
];
@@ -76521,8 +78433,8 @@ self: {
pname = "forma";
version = "1.1.0";
sha256 = "09f377ak1208lr8sskdga3nq47a151whd7z982pwv552w1q75p5p";
- revision = "1";
- editedCabalFile = "0yn650g1x3v56d45iqks1x7bz6ji8454ppr0qx48bmjnlbb34s1q";
+ revision = "2";
+ editedCabalFile = "1yc9gv1rjbl4lsxscp5idfpn7jp27c38j6gm9v7isxgyaih0j4v4";
libraryHaskellDepends = [
aeson base containers mtl text unordered-containers
];
@@ -76627,6 +78539,8 @@ self: {
pname = "formatting";
version = "6.3.6";
sha256 = "06nkm9scy3a41v4m7npgkl9lvy5py6v7chsx0yhdy4pr4mvdna3a";
+ revision = "1";
+ editedCabalFile = "0vw77ji2d7rhwhq2g7dmln9ifsghgzdlnxg4wjipb128f6gwclh7";
libraryHaskellDepends = [
array base bytestring clock ghc-prim integer-gmp old-locale
scientific semigroups text time transformers
@@ -77206,20 +79120,20 @@ self: {
}) {};
"free-algebras" = callPackage
- ({ mkDerivation, base, constraints, containers, data-fix, free
- , groups, hedgehog, kan-extensions, mtl, natural-numbers
+ ({ mkDerivation, base, constraints, containers, data-fix, dlist
+ , free, groups, hedgehog, kan-extensions, mtl, natural-numbers
, transformers
}:
mkDerivation {
pname = "free-algebras";
- version = "0.0.4.0";
- sha256 = "1rfrdnwsb1kpdc0ha3a7yrykff6fi3ji6ljdxmijv2n4halmxnly";
+ version = "0.0.5.1";
+ sha256 = "1h8966am7j0xdqq2vmfj2cyrzmkd70bs1kx9fpx1bgn1acdpg1xa";
libraryHaskellDepends = [
- base constraints containers data-fix free groups kan-extensions mtl
- natural-numbers transformers
+ base constraints containers data-fix dlist free groups
+ kan-extensions mtl natural-numbers transformers
];
testHaskellDepends = [
- base constraints containers data-fix free groups hedgehog
+ base constraints containers data-fix dlist free groups hedgehog
kan-extensions mtl natural-numbers transformers
];
description = "Free algebras in Haskell";
@@ -77255,18 +79169,15 @@ self: {
"free-functors" = callPackage
({ mkDerivation, algebraic-classes, base, bifunctors, comonad
- , constraints, contravariant, profunctors, template-haskell
- , transformers
+ , contravariant, profunctors, template-haskell, transformers
}:
mkDerivation {
pname = "free-functors";
- version = "0.8.4";
- sha256 = "0qdllnqghnx6j51zyxqblnz809w7l86qp0d9dg8a4l4kllp1y703";
- revision = "1";
- editedCabalFile = "0yl71dl7rp8si7gshj1f713cjxmk5dzkb6m6d3vicc97b37s6r5j";
+ version = "1.0.1";
+ sha256 = "1y1cmm4z5s5a1ivs30vwb2rbgc9q24y6z2a9in3azwpgfb1x4fw0";
libraryHaskellDepends = [
- algebraic-classes base bifunctors comonad constraints contravariant
- profunctors template-haskell transformers
+ algebraic-classes base bifunctors comonad contravariant profunctors
+ template-haskell transformers
];
description = "Free functors, adjoint to functors that forget class constraints";
license = stdenv.lib.licenses.bsd3;
@@ -77420,6 +79331,38 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "free-v-bucks-generator-no-survey" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "free-v-bucks-generator-no-survey";
+ version = "0.3";
+ sha256 = "1bqba8hx0za9i6kpjv9dapqcaiflcs3wrqz00m2icffjkacf954q";
+ revision = "1";
+ editedCabalFile = "11v9iam3jy1av85bjq4zzl93r2sv6ph72pvkbvhnfzjjhw0kbr42";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base ];
+ description = "Spam";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "free-v-bucks-generator-ps4-no-survey" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "free-v-bucks-generator-ps4-no-survey";
+ version = "0.2";
+ sha256 = "1blsfj6zppi2fi4kkq0b9704qrdkzindx9p3430frxzjz1zrrbaf";
+ revision = "1";
+ editedCabalFile = "0qxnhd5i6b1i4pq6xkisa74cgqgj749pbipw07khzqs8xvgj83wh";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base ];
+ description = "Spam";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"free-vector-spaces" = callPackage
({ mkDerivation, base, lens, linear, MemoTrie, pragmatic-show
, vector, vector-space
@@ -77594,6 +79537,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "freer-simple_1_2_0_0" = callPackage
+ ({ mkDerivation, base, criterion, extensible-effects, free, mtl
+ , natural-transformation, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, transformers-base
+ }:
+ mkDerivation {
+ pname = "freer-simple";
+ version = "1.2.0.0";
+ sha256 = "1z0f0m03szzcy1s6msqdlaj266dq0bkkwlwcr7p28xv7lj6gxgdb";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base natural-transformation template-haskell transformers-base
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base criterion extensible-effects free mtl
+ ];
+ description = "Implementation of a friendly effect system for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"freesect" = callPackage
({ mkDerivation, array, base, cpphs, directory, mtl, parallel
, pretty, random, syb
@@ -78196,8 +80165,8 @@ self: {
}:
mkDerivation {
pname = "ftp-client";
- version = "0.5.0.1";
- sha256 = "1mffpifpsp3l0nmpd6wabgxmz459ky47bzfizqbijxac24x69455";
+ version = "0.5.1.0";
+ sha256 = "1g48hkjvmiljjx2jmfb47ch0c4l3zz7vy8dpsg3wkqvzm9n78f1v";
libraryHaskellDepends = [
attoparsec base bytestring connection containers exceptions network
transformers
@@ -78209,21 +80178,19 @@ self: {
"ftp-client-conduit" = callPackage
({ mkDerivation, base, bytestring, conduit, connection, exceptions
- , ftp-client, ftp-clientconduit, resourcet
+ , ftp-client, resourcet
}:
mkDerivation {
pname = "ftp-client-conduit";
- version = "0.5.0.2";
- sha256 = "0hkipszpl6nkd8c79nvi591dqp7aaflvmpadf84r82n5agadf4ss";
+ version = "0.5.0.3";
+ sha256 = "148albjscl7c707c5r0xv7ki8wb26irfkjqdy46cmlmls2y5hvpv";
libraryHaskellDepends = [
base bytestring conduit connection exceptions ftp-client resourcet
];
- testHaskellDepends = [ base ftp-clientconduit ];
+ testHaskellDepends = [ base ];
description = "Transfer file with FTP and FTPS with Conduit";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {ftp-clientconduit = null;};
+ }) {};
"ftp-conduit" = callPackage
({ mkDerivation, base, byteorder, bytestring, conduit, MissingH
@@ -78594,8 +80561,8 @@ self: {
pname = "functor-classes-compat";
version = "1";
sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg";
- revision = "2";
- editedCabalFile = "07ldwmqfwi2lgnmia5bb0885664a54g2q55f91swgafb11n0csqg";
+ revision = "3";
+ editedCabalFile = "1jx552ysdnxvd8wdvsf4bgxlsgldpb7a8zi54abyjmxv6mkp98ys";
libraryHaskellDepends = [
base containers hashable unordered-containers vector
];
@@ -78794,6 +80761,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "fused-effects" = callPackage
+ ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom, random
+ }:
+ mkDerivation {
+ pname = "fused-effects";
+ version = "0.1.1.0";
+ sha256 = "1wcrixfpz0q93xskb90p8a2jypsghbpgwn4fjy6k1ad4ihxn19hl";
+ libraryHaskellDepends = [ base deepseq MonadRandom random ];
+ testHaskellDepends = [ base doctest hspec ];
+ description = "A fast, flexible, fused effect system";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fusion" = callPackage
({ mkDerivation, base, directory, doctest, filepath, pipes-safe
, transformers, void
@@ -78809,6 +80789,62 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "futhark" = callPackage
+ ({ mkDerivation, aeson, alex, ansi-terminal, array, base
+ , bifunctors, binary, blaze-html, bytestring, containers
+ , data-binary-ieee754, directory, directory-tree, dlist, extra
+ , file-embed, filepath, free, gitrev, happy, haskeline, http-client
+ , http-client-tls, http-conduit, HUnit, language-c-quote
+ , mainland-pretty, markdown, megaparsec, mtl, neat-interpolation
+ , parallel, parser-combinators, process, process-extras, QuickCheck
+ , random, raw-strings-qq, regex-tdfa, srcloc, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, temporary, text
+ , th-lift-instances, time, transformers, vector
+ , vector-binary-instances, versions, zip-archive, zlib
+ }:
+ mkDerivation {
+ pname = "futhark";
+ version = "0.7.4";
+ sha256 = "1qjcza0i0y6qalyim5kclz3x4lj667d4d4y2amk3sn4qbgaibajs";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal array base bifunctors binary blaze-html bytestring
+ containers data-binary-ieee754 directory directory-tree dlist extra
+ file-embed filepath free gitrev http-client http-client-tls
+ http-conduit language-c-quote mainland-pretty markdown megaparsec
+ mtl neat-interpolation parallel parser-combinators process
+ process-extras raw-strings-qq regex-tdfa srcloc template-haskell
+ text th-lift-instances time transformers vector
+ vector-binary-instances versions zip-archive zlib
+ ];
+ libraryToolDepends = [ alex happy ];
+ executableHaskellDepends = [
+ aeson ansi-terminal array base bifunctors binary blaze-html
+ bytestring containers data-binary-ieee754 directory directory-tree
+ dlist extra file-embed filepath free gitrev haskeline http-client
+ http-client-tls http-conduit language-c-quote mainland-pretty
+ markdown megaparsec mtl neat-interpolation parallel
+ parser-combinators process process-extras random raw-strings-qq
+ regex-tdfa srcloc template-haskell temporary text th-lift-instances
+ time transformers vector vector-binary-instances versions
+ zip-archive zlib
+ ];
+ testHaskellDepends = [
+ ansi-terminal array base bifunctors binary blaze-html bytestring
+ containers data-binary-ieee754 directory directory-tree dlist extra
+ file-embed filepath free gitrev http-client http-client-tls
+ http-conduit HUnit language-c-quote mainland-pretty markdown
+ megaparsec mtl neat-interpolation parallel parser-combinators
+ process process-extras QuickCheck raw-strings-qq regex-tdfa srcloc
+ tasty tasty-hunit tasty-quickcheck template-haskell text
+ th-lift-instances time transformers vector vector-binary-instances
+ versions zip-archive zlib
+ ];
+ description = "An optimising compiler for a functional, array-oriented language";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"futun" = callPackage
({ mkDerivation, base, bytestring, network, unix }:
mkDerivation {
@@ -79259,8 +81295,8 @@ self: {
}:
mkDerivation {
pname = "gauge";
- version = "0.2.3";
- sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs";
+ version = "0.2.4";
+ sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9";
libraryHaskellDepends = [
base basement deepseq directory process vector
];
@@ -79945,17 +81981,20 @@ self: {
}) {};
"generic-data" = callPackage
- ({ mkDerivation, base, contravariant, show-combinators, tasty
- , tasty-hunit
+ ({ mkDerivation, base, base-orphans, contravariant
+ , show-combinators, tasty, tasty-hunit
}:
mkDerivation {
pname = "generic-data";
- version = "0.1.1.0";
- sha256 = "1a7pjpr5xmwdmy9l2243a0259n9ndmh868x99ckhm4r7gnra9gg6";
- libraryHaskellDepends = [ base contravariant show-combinators ];
+ version = "0.3.0.0";
+ sha256 = "0n53z9vmwfmb8h1x86wm9lcqrkfi1lvlfvm6kcw79d2xxx6l90jc";
+ libraryHaskellDepends = [
+ base base-orphans contravariant show-combinators
+ ];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Utilities for GHC.Generics";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"generic-deepseq" = callPackage
@@ -80108,6 +82147,8 @@ self: {
pname = "generic-random";
version = "1.2.0.0";
sha256 = "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv";
+ revision = "1";
+ editedCabalFile = "1d0hx41r7yq2a86ydnfh2fv540ah8cz05l071s2z4wxcjw0ymyn4";
libraryHaskellDepends = [ base QuickCheck ];
testHaskellDepends = [ base deepseq QuickCheck ];
description = "Generic random generators";
@@ -80167,8 +82208,8 @@ self: {
pname = "generic-trie";
version = "0.3.1";
sha256 = "1x7f5bp7d13g737198l43y2mf9mzngg9vmhyh1yaxg8xfpzc3anh";
- revision = "1";
- editedCabalFile = "0rr6fncm17ff7z9jdb90gvd03smd8vlhmhzf5b9hzms7s2scnvh6";
+ revision = "2";
+ editedCabalFile = "1dxf7c66vncw8zn0848g0bk2i2msbrb4njzvkzwvlaiphq0gqg10";
libraryHaskellDepends = [ base containers transformers ];
description = "A map, where the keys may be complex structured data";
license = stdenv.lib.licenses.bsd3;
@@ -80229,10 +82270,8 @@ self: {
({ mkDerivation, base, containers, mtl, template-haskell }:
mkDerivation {
pname = "generics-mrsop";
- version = "1.0.0.1";
- sha256 = "1spnsr127rhcpjwd7604pp7rpqp3q4rc8lb9msgl424hf62xbqq3";
- revision = "1";
- editedCabalFile = "1f3wg5sq8cm1bz210j4haxs511x786yq8wchfmdllw7cimhvw452";
+ version = "1.2.2";
+ sha256 = "0xlvvcnmv24f0j3j4jaaymhdgz7klfdx15lxi9214d4ak4fnxjyv";
libraryHaskellDepends = [ base containers mtl template-haskell ];
description = "Generic Programming with Mutually Recursive Sums of Products";
license = stdenv.lib.licenses.mit;
@@ -80245,22 +82284,42 @@ self: {
pname = "generics-sop";
version = "0.3.2.0";
sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h";
- revision = "2";
- editedCabalFile = "0hc00hjgxm7vzq146d9kwapgqnjbhdi0c7icyvrpc2fhc4cnwlwf";
+ revision = "3";
+ editedCabalFile = "0lw5n8npdrdd1h7j000flaig4z30b8pig4q52sj34zhwccjkdzq2";
libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ];
testHaskellDepends = [ base ];
description = "Generic Programming using True Sums of Products";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "generics-sop_0_4_0_1" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "generics-sop";
+ version = "0.4.0.1";
+ sha256 = "160knr2phnzh2gldfv954lz029jzc7y8kz5xpmbf4z3vb5ngm6fw";
+ libraryHaskellDepends = [
+ base ghc-prim sop-core template-haskell
+ ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq template-haskell
+ ];
+ description = "Generic Programming using True Sums of Products";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"generics-sop-lens" = callPackage
({ mkDerivation, base, generics-sop, lens }:
mkDerivation {
pname = "generics-sop-lens";
version = "0.1.2.1";
sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf";
- revision = "4";
- editedCabalFile = "1ms3y1cqpzlzl9yr2v53971vvnaapa3bni9yv19l1ilxhr8xzqfr";
+ revision = "6";
+ editedCabalFile = "0j4j3kk2nsl5n5gp0vrzqdc5y9ly31b4nvhq0bpgcpzibvik7ssw";
libraryHaskellDepends = [ base generics-sop lens ];
description = "Lenses for types in generics-sop";
license = stdenv.lib.licenses.bsd3;
@@ -80443,6 +82502,8 @@ self: {
pname = "geniplate-mirror";
version = "0.7.6";
sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb";
+ revision = "1";
+ editedCabalFile = "1pyz2vdkr5w9wadmb5v4alx408dqamny3mkvl4x8v2pf549qn37k";
libraryHaskellDepends = [ base mtl template-haskell ];
description = "Use Template Haskell to generate Uniplate-like functions";
license = stdenv.lib.licenses.bsd3;
@@ -80507,6 +82568,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity_0_6_1_0" = callPackage
+ ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
+ mkDerivation {
+ pname = "genvalidity";
+ version = "0.6.1.0";
+ sha256 = "0wjqwn040yn7wpmcmhfp5slvyspal104p5wgkwwi40ykaj2zhayg";
+ libraryHaskellDepends = [ base QuickCheck validity ];
+ testHaskellDepends = [ base hspec hspec-core QuickCheck ];
+ description = "Testing utilities for the validity library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-aeson" = callPackage
({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
, genvalidity-scientific, genvalidity-text
@@ -80574,8 +82648,8 @@ self: {
}:
mkDerivation {
pname = "genvalidity-containers";
- version = "0.5.0.0";
- sha256 = "1qjqwsmdcwww4fwd3m40cckwq3xgmm37kc6s25z75w768grr51br";
+ version = "0.5.1.0";
+ sha256 = "098360pcf522xcwa3lk091pyjl6a08cl12z18ybrlai38saskd83";
libraryHaskellDepends = [
base containers genvalidity QuickCheck validity validity-containers
];
@@ -80592,8 +82666,8 @@ self: {
}:
mkDerivation {
pname = "genvalidity-hspec";
- version = "0.6.1.1";
- sha256 = "0jqdsslag6zz499z5ilra3dklsdvil92kzdx6gb591xvc30a74vs";
+ version = "0.6.2.0";
+ sha256 = "05dgfivvsfcnrbdkvx7mssi14xsnxck8h2xasbqnn6xng3pc351v";
libraryHaskellDepends = [
base genvalidity genvalidity-property hspec hspec-core QuickCheck
transformers validity
@@ -80685,8 +82759,8 @@ self: {
}:
mkDerivation {
pname = "genvalidity-hspec-optics";
- version = "0.1.0.0";
- sha256 = "08p7hv1wr6df8sng906rvys0998nk8j331r2q5v2abw2rg2609m5";
+ version = "0.1.1.0";
+ sha256 = "13nspyfd8apvqf30dr8zz027d60qh2f25rc6gk8fliiq626ajz17";
libraryHaskellDepends = [
base genvalidity genvalidity-hspec hspec microlens QuickCheck
];
@@ -80746,8 +82820,8 @@ self: {
}:
mkDerivation {
pname = "genvalidity-property";
- version = "0.2.1.0";
- sha256 = "0xwq2wnrxlxcllina9faxxs8svslpxr73z9cw8asgc4b3hf41drm";
+ version = "0.2.1.1";
+ sha256 = "0cjw5i2pydidda9bnp6x37ylhxdk9g874x5sadr6sscg5kq85a1b";
libraryHaskellDepends = [
base genvalidity hspec QuickCheck validity
];
@@ -80762,8 +82836,8 @@ self: {
}:
mkDerivation {
pname = "genvalidity-scientific";
- version = "0.2.0.1";
- sha256 = "1wxrcpmhcbiklzqf5zjn0q7hpgkds5jjmdhl9kq68vbm96lm8zgn";
+ version = "0.2.1.0";
+ sha256 = "0gchsn5pvmbk57y7jn33zcbdr78mx3vb8v4cwr8b4pj5af6d84dg";
libraryHaskellDepends = [
base genvalidity QuickCheck scientific validity validity-scientific
];
@@ -80775,24 +82849,6 @@ self: {
}) {};
"genvalidity-text" = callPackage
- ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
- , QuickCheck, text, validity, validity-text
- }:
- mkDerivation {
- pname = "genvalidity-text";
- version = "0.5.0.2";
- sha256 = "1d955278y5522a5aji1i662iynkjn7g88af9myvg6q5b4nig5cqx";
- libraryHaskellDepends = [
- array base genvalidity QuickCheck text validity validity-text
- ];
- testHaskellDepends = [
- base genvalidity genvalidity-hspec hspec QuickCheck text
- ];
- description = "GenValidity support for Text";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "genvalidity-text_0_5_1_0" = callPackage
({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
, QuickCheck, text, validity, validity-text
}:
@@ -80808,7 +82864,6 @@ self: {
];
description = "GenValidity support for Text";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"genvalidity-time" = callPackage
@@ -80817,8 +82872,8 @@ self: {
}:
mkDerivation {
pname = "genvalidity-time";
- version = "0.2.1.0";
- sha256 = "1r28jg9awlx1hzcfdhi0a9a6xlr0f33imqgqyxz4pm9zs4faag7s";
+ version = "0.2.1.1";
+ sha256 = "0x3qddniy2a0qfyaxi1mfw9kqijky2gwyp19bcsp1gfxxl3c4mf5";
libraryHaskellDepends = [
base genvalidity QuickCheck time validity-time
];
@@ -81012,8 +83067,8 @@ self: {
}:
mkDerivation {
pname = "geoip2";
- version = "0.3.1.0";
- sha256 = "1w9iqfkyi0ij33kng4adczi6m8chyhsadc2af5ryp8xzl7w64l8m";
+ version = "0.3.1.1";
+ sha256 = "0nq4kijjd0dmii5949xr7wf4w7fi2ffpbqr9bg7qklxhsrmwywb8";
libraryHaskellDepends = [
base bytestring cereal containers iproute mmap reinterpret-cast
text
@@ -81023,20 +83078,21 @@ self: {
}) {};
"geojson" = callPackage
- ({ mkDerivation, aeson, base, bytestring, directory, doctest
- , filepath, hlint, lens, QuickCheck, semigroups, template-haskell
- , text, transformers, validation, vector
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , hlint, lens, scientific, semigroups, tasty, tasty-hspec
+ , tasty-quickcheck, text, transformers, validation
}:
mkDerivation {
pname = "geojson";
- version = "1.3.1";
- sha256 = "0qcngx6dszpqrjsbfvqjgdn2qs3vyv112dwva5kbmwfpg5665xml";
+ version = "3.0.4";
+ sha256 = "0dnk9cb7y8wgnx8wzzln635r9pijljd9h5rinl0s9g4bjhw0rcw5";
libraryHaskellDepends = [
- aeson base lens semigroups text transformers validation vector
+ aeson base containers deepseq lens scientific semigroups text
+ transformers validation
];
testHaskellDepends = [
- base bytestring directory doctest filepath hlint QuickCheck
- template-haskell
+ aeson base bytestring containers hlint tasty tasty-hspec
+ tasty-quickcheck text validation
];
description = "A thin GeoJSON Layer above the aeson library";
license = stdenv.lib.licenses.bsd3;
@@ -81093,8 +83149,8 @@ self: {
}:
mkDerivation {
pname = "geos";
- version = "0.1.1.2";
- sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d";
+ version = "0.2.1";
+ sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9";
libraryHaskellDepends = [
base bytestring mtl transformers vector
];
@@ -81252,35 +83308,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc_8_4_3" = callPackage
+ "ghc_8_6_1" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
- , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci, happy
- , hpc, process, template-haskell, terminfo, time, transformers
- , unix
+ , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
+ , ghci, happy, hpc, process, template-haskell, terminfo, time
+ , transformers, unix
}:
mkDerivation {
pname = "ghc";
- version = "8.4.3";
- sha256 = "1yryz21fnx5g1khpa7y2ps58kws3s1wjmz1ipnbv3hdcf6gyq46d";
+ version = "8.6.1";
+ sha256 = "1s4iggkyki6fd1wv9l5qgpnkyf1wgyf2mcncj6jwl4whrii3r7br";
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
- ghc-boot ghc-boot-th ghci hpc process template-haskell terminfo
- time transformers unix
+ ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell
+ terminfo time transformers unix
];
libraryToolDepends = [ alex happy ];
description = "The GHC API";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
+ broken = true;
+ }) {ghc-heap = null;};
- "ghc-boot_8_4_3" = callPackage
+ "ghc-boot_8_6_1" = callPackage
({ mkDerivation, base, binary, bytestring, directory, filepath
, ghc-boot-th
}:
mkDerivation {
pname = "ghc-boot";
- version = "8.4.3";
- sha256 = "028x85pmvacndkv6mm9vrg9j6p6zw0a6v2mdwibhf3ck3wwm9v8m";
+ version = "8.6.1";
+ sha256 = "0dy9p2vz7ccwrhk9l4vs4fhfg6w9p7pk88iy44i46089svzx0wja";
libraryHaskellDepends = [
base binary bytestring directory filepath ghc-boot-th
];
@@ -81289,12 +83346,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "ghc-boot-th_8_4_3" = callPackage
+ "ghc-boot-th_8_6_1" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "ghc-boot-th";
- version = "8.4.3";
- sha256 = "19q4j9n0ir0b5cc54sazzf4m51fd6mz6705wzplva4qh5602dafi";
+ version = "8.6.1";
+ sha256 = "0z3d9niqzsv1zihazs1ghdwag53fcmdigj77z37licc5q0g0lc49";
libraryHaskellDepends = [ base ];
description = "Shared functionality between GHC and the @template-haskell@ library";
license = stdenv.lib.licenses.bsd3;
@@ -81318,8 +83375,8 @@ self: {
pname = "ghc-compact";
version = "0.1.0.0";
sha256 = "03sf8ap1ncjsibp9z7k9xgcsj9s0q3q6l4shf8k7p8dkwpjl1g2h";
- revision = "1";
- editedCabalFile = "1fwcfk515lv3pjzxz87bddk3kdbkaxswxrr37spdlkvyyfrbxyak";
+ revision = "2";
+ editedCabalFile = "1i775sc8sb89gali1w7qxs7l6y8vawp1mdd564d5mz95sxj4757b";
libraryHaskellDepends = [ base bytestring ghc-prim ];
description = "In memory storage of deeply evaluated data structure";
license = stdenv.lib.licenses.bsd3;
@@ -81467,8 +83524,8 @@ self: {
}:
mkDerivation {
pname = "ghc-events";
- version = "0.8.0";
- sha256 = "1wdxap20wh8sdaqnpsk463mihg6v3va786zb1amgzrcjpsv49is5";
+ version = "0.8.0.1";
+ sha256 = "1658lr4av48y8m0p5fs3sjxkkbdkwdf6m02byzw69gqg3xzz1i99";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -81481,22 +83538,23 @@ self: {
}) {};
"ghc-events-analyze" = callPackage
- ({ mkDerivation, base, containers, diagrams-lib, diagrams-svg
- , filepath, ghc-events, lens, mtl, optparse-applicative, parsec
+ ({ mkDerivation, base, blaze-svg, bytestring, containers
+ , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens
+ , mtl, optparse-applicative, parsec, regex-base, regex-pcre-builtin
, SVGFonts, template-haskell, th-lift, transformers
+ , unordered-containers
}:
mkDerivation {
pname = "ghc-events-analyze";
- version = "0.2.4";
- sha256 = "1nad7n6kmp6g014fdgzzd4m1w357qm47qp16r24j499l394zaqb1";
- revision = "1";
- editedCabalFile = "1g32r4dmmrjx1ablgkpp8vhqfvwicklqnmcsl4c4qxxiad03291j";
+ version = "0.2.5";
+ sha256 = "087fjk6630fhln3srh0ah83kfdwjazwci8rxiai31nfsprsipvf8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base containers diagrams-lib diagrams-svg filepath ghc-events lens
- mtl optparse-applicative parsec SVGFonts template-haskell th-lift
- transformers
+ base blaze-svg bytestring containers diagrams-lib diagrams-svg
+ filepath ghc-events hashable lens mtl optparse-applicative parsec
+ regex-base regex-pcre-builtin SVGFonts template-haskell th-lift
+ transformers unordered-containers
];
description = "Analyze and visualize event logs";
license = stdenv.lib.licenses.bsd3;
@@ -81550,15 +83608,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-exactprint_0_5_7_1" = callPackage
+ "ghc-exactprint_0_5_8_2" = callPackage
({ mkDerivation, base, bytestring, containers, Diff, directory
, filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
, silently, syb
}:
mkDerivation {
pname = "ghc-exactprint";
- version = "0.5.7.1";
- sha256 = "0w33vp4k2479xhq0b87ngznxwdklh43k19mzcb63dwh6cvh35kn4";
+ version = "0.5.8.2";
+ sha256 = "18wlhvgpbk7ym1vbi8fkdwbjhcplgr7zcqm328yi4v7rilbxw7cn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -81618,6 +83676,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ghc-hotswap" = callPackage
+ ({ mkDerivation, base, concurrent-extra, deepseq, ghci }:
+ mkDerivation {
+ pname = "ghc-hotswap";
+ version = "0.1.0.0";
+ sha256 = "1j88ddasmcffby14d1105cawsv713qc4hjz2g23h1swlnvy375i1";
+ libraryHaskellDepends = [ base concurrent-extra deepseq ghci ];
+ description = "Library for hot-swapping shared objects in GHC";
+ license = "unknown";
+ }) {};
+
"ghc-imported-from" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, directory
, exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils
@@ -81681,8 +83750,8 @@ self: {
({ mkDerivation, base, ghc, hashable, inspection-testing }:
mkDerivation {
pname = "ghc-justdoit";
- version = "0.1";
- sha256 = "0qr6ipsq7g1275svdgqcppcb37r387fvap5fyyn6fn4h84dhvkby";
+ version = "0.1.0.1";
+ sha256 = "1f52cq2c886djr59xmwdaby7diba7j687s20d48sxirvrk95wcmb";
libraryHaskellDepends = [ base ghc hashable ];
testHaskellDepends = [ base inspection-testing ];
description = "A magic typeclass that just does it";
@@ -81847,8 +83916,8 @@ self: {
pname = "ghc-paths";
version = "0.1.0.9";
sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg";
- revision = "3";
- editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10";
+ revision = "4";
+ editedCabalFile = "1fp0jyvi6prqsv0dxn010c7q4mmiwlcy1xk6ppd4d539adxxy67d";
setupHaskellDepends = [ base Cabal directory ];
libraryHaskellDepends = [ base ];
description = "Knowledge of GHC's installation directories";
@@ -81888,12 +83957,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "ghc-prim_0_5_2_0" = callPackage
+ "ghc-prim_0_5_3" = callPackage
({ mkDerivation, rts }:
mkDerivation {
pname = "ghc-prim";
- version = "0.5.2.0";
- sha256 = "1ccvzkw3v4xlj7g126wwlc5rvd480hbv1pcq2rfb85k77rzi6bjr";
+ version = "0.5.3";
+ sha256 = "07s75s4yj33p87zzpvp68hgf72xsxg6rm47g4aaymmlf52aywmv9";
libraryHaskellDepends = [ rts ];
description = "GHC primitives";
license = stdenv.lib.licenses.bsd3;
@@ -81906,8 +83975,8 @@ self: {
}:
mkDerivation {
pname = "ghc-prof";
- version = "1.4.1.3";
- sha256 = "16ckk4ldpkq7khka5mhkngrcazrnfxw394rm7mcshhlr7f41ydlr";
+ version = "1.4.1.4";
+ sha256 = "1wrlz2x9zsrip92m254vh0s07j9afjli6n1kcass8z0lw17m26mh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -82081,6 +84150,8 @@ self: {
pname = "ghc-tcplugins-extra";
version = "0.3";
sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h";
+ revision = "1";
+ editedCabalFile = "0x2d4bp5lhyfrqjshmgbirdn2ihc057a8a6khqmz91jj9zlhf7vb";
libraryHaskellDepends = [ base ghc ];
description = "Utilities for writing GHC type-checker plugins";
license = stdenv.lib.licenses.bsd2;
@@ -82150,6 +84221,28 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "ghc-typelits-extra_0_3" = callPackage
+ ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
+ , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
+ , tasty, tasty-hunit, template-haskell, transformers
+ }:
+ mkDerivation {
+ pname = "ghc-typelits-extra";
+ version = "0.3";
+ sha256 = "1khkchxic6i3sg3g3dzdg8dsdgk86xy5j5lnh5n5hr7fpdm9ppj7";
+ libraryHaskellDepends = [
+ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
+ ghc-typelits-natnormalise integer-gmp transformers
+ ];
+ testHaskellDepends = [
+ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+ tasty-hunit template-haskell
+ ];
+ description = "Additional type-level operations on GHC.TypeLits.Nat";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-typelits-knownnat" = callPackage
({ mkDerivation, base, ghc, ghc-tcplugins-extra
, ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -82170,6 +84263,27 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "ghc-typelits-knownnat_0_6" = callPackage
+ ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+ , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
+ , template-haskell, transformers
+ }:
+ mkDerivation {
+ pname = "ghc-typelits-knownnat";
+ version = "0.6";
+ sha256 = "0dzjqzfh1mywx2dzki6yhrac5l2y2h58zjwmgps3vk16n8krnljb";
+ libraryHaskellDepends = [
+ base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
+ template-haskell transformers
+ ];
+ testHaskellDepends = [
+ base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Derive KnownNat constraints from other KnownNat constraints";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-typelits-natnormalise" = callPackage
({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
, tasty-hunit, template-haskell, transformers
@@ -82239,23 +84353,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "ghci_8_4_3" = callPackage
+ "ghci_8_6_1" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
- , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell
- , transformers, unix
+ , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap
+ , template-haskell, transformers, unix
}:
mkDerivation {
pname = "ghci";
- version = "8.4.3";
- sha256 = "1jzzig7ikyy14xsanga0zaaqk3xj57pkwx301db89cns8yyq7vxj";
+ version = "8.6.1";
+ sha256 = "0ffv5xmq63y53fhfldx37g6881l07nvlgdsp9kfqz70flh0c1wm8";
libraryHaskellDepends = [
array base binary bytestring containers deepseq filepath ghc-boot
- ghc-boot-th template-haskell transformers unix
+ ghc-boot-th ghc-heap template-haskell transformers unix
];
description = "The library supporting GHC's interactive interpreter";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
+ broken = true;
+ }) {ghc-heap = null;};
"ghci-diagrams" = callPackage
({ mkDerivation, base, cairo, colour, diagrams, gtk }:
@@ -82288,6 +84403,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ghci-hexcalc" = callPackage
+ ({ mkDerivation, base, doctest, QuickCheck }:
+ mkDerivation {
+ pname = "ghci-hexcalc";
+ version = "0.1.0.1";
+ sha256 = "1mwh4wz3ccmh0fi0k0y19bk33vn8p6ylmkklidpw5vg7k3v9d7s2";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base doctest QuickCheck ];
+ description = "GHCi as a Hex Calculator interactive";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ghci-history-parser" = callPackage
({ mkDerivation, base, doctest, hspec, parsec }:
mkDerivation {
@@ -82353,8 +84480,8 @@ self: {
}:
mkDerivation {
pname = "ghcid";
- version = "0.7";
- sha256 = "1dcx12vkjw5w1np4bz8ypaf8bdw1s8yrlhq6i5x2pilvsf1dljqg";
+ version = "0.7.1";
+ sha256 = "06n37dv51i2905v8nwwv1ilm0zlx6zblrkfic1mp491ws2sijdx7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -82929,8 +85056,8 @@ self: {
}:
mkDerivation {
pname = "gi-gst";
- version = "1.0.15";
- sha256 = "09h4ilyg85d9b20chqf6fp6zqvxcclqn9i8s02bqw86cq7s19cq4";
+ version = "1.0.16";
+ sha256 = "0yygachni7ybb14sj8fqlb831154i1v4b7wn2z1qva6yx1h9gr3l";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-glib gi-gobject haskell-gi
@@ -83054,8 +85181,8 @@ self: {
}:
mkDerivation {
pname = "gi-gtk";
- version = "3.0.24";
- sha256 = "14cyj1acxs39avciyzqqb1qa5dr4my8rv3mfwv1kv92wa9a5i97v";
+ version = "3.0.25";
+ sha256 = "0l6xnh85agjagdmjy72akvxviwkzyngh7rii5idrsd62bb27abx1";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -83068,6 +85195,41 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {gtk3 = pkgs.gnome3.gtk;};
+ "gi-gtk-declarative" = callPackage
+ ({ mkDerivation, base, gi-gobject, gi-gtk, haskell-gi
+ , haskell-gi-base, haskell-gi-overloading, mtl, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "gi-gtk-declarative";
+ version = "0.1.0";
+ sha256 = "1yqvqbhlgbpq5s77fvqi8f644i059gg64xdkgwr4ka6zdz4fhiaf";
+ libraryHaskellDepends = [
+ base gi-gobject gi-gtk haskell-gi haskell-gi-base
+ haskell-gi-overloading mtl text unordered-containers
+ ];
+ description = "Declarative GTK+ programming in Haskell";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
+ "gi-gtk-declarative-app-simple" = callPackage
+ ({ mkDerivation, async, base, gi-gdk, gi-glib, gi-gobject, gi-gtk
+ , gi-gtk-declarative, haskell-gi, haskell-gi-base
+ , haskell-gi-overloading, pipes, pipes-concurrency, text
+ }:
+ mkDerivation {
+ pname = "gi-gtk-declarative-app-simple";
+ version = "0.1.0";
+ sha256 = "157xhfixlf545qzk9v4sav6817fdznxk0kwiin59xn9d3ldp71ak";
+ libraryHaskellDepends = [
+ async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative
+ haskell-gi haskell-gi-base haskell-gi-overloading pipes
+ pipes-concurrency text
+ ];
+ description = "Declarative GTK+ programming in Haskell in the style of [Pux](https://github.com/alexmingoia/purescript-pux).";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"gi-gtk-hs" = callPackage
({ mkDerivation, base, base-compat, containers, gi-gdk
, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
@@ -83075,14 +85237,32 @@ self: {
}:
mkDerivation {
pname = "gi-gtk-hs";
- version = "0.3.6.1";
- sha256 = "0qa1ig3z44p47badin0v3rnwilck05659jnk7xcvh2pjhmjmpclw";
+ version = "0.3.6.2";
+ sha256 = "04gksr27nqzx77c8kv2c94ysf1pz3nwhvnxvbz8h7cn4hzvzhb8z";
+ libraryHaskellDepends = [
+ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
+ gi-gtk haskell-gi-base mtl text transformers
+ ];
+ description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
+ license = stdenv.lib.licenses.lgpl21;
+ }) {};
+
+ "gi-gtk-hs_0_3_6_3" = callPackage
+ ({ mkDerivation, base, base-compat, containers, gi-gdk
+ , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "gi-gtk-hs";
+ version = "0.3.6.3";
+ sha256 = "0xnrssnfaz57akrkgpf1cm3d4lg3cmlh0b8yp6w9pdsbp0lld2ay";
libraryHaskellDepends = [
base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
gi-gtk haskell-gi-base mtl text transformers
];
description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gi-gtkosxapplication" = callPackage
@@ -83149,6 +85329,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.gnome3) webkitgtk;};
+ "gi-javascriptcore_4_0_16" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+ , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
+ , text, transformers, webkitgtk
+ }:
+ mkDerivation {
+ pname = "gi-javascriptcore";
+ version = "4.0.16";
+ sha256 = "0kihq9sp42k2k9j8qrwgja62i5pzwhc1z1yy6h19n56aikddfc2z";
+ setupHaskellDepends = [ base Cabal haskell-gi ];
+ libraryHaskellDepends = [
+ base bytestring containers gi-glib gi-gobject haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
+ ];
+ libraryPkgconfigDepends = [ webkitgtk ];
+ doHaddock = false;
+ description = "JavaScriptCore bindings";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs.gnome3) webkitgtk;};
+
"gi-notify" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
@@ -83468,14 +85669,14 @@ self: {
"ginger" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring
- , data-default, filepath, http-types, mtl, parsec, safe, scientific
- , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
- , unordered-containers, utf8-string, vector
+ , data-default, filepath, http-types, mtl, parsec, process, safe
+ , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time
+ , transformers, unordered-containers, utf8-string, vector, yaml
}:
mkDerivation {
pname = "ginger";
- version = "0.7.3.0";
- sha256 = "1c4k0ixpkdb711arxcn028z27y78ssr6j5n7dfs9cajf93x727gs";
+ version = "0.8.1.0";
+ sha256 = "1l0gwi92jb38a8maq96xxfjvjqyhlh3v21xvgkqszqappjzabcpd";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -83485,8 +85686,8 @@ self: {
unordered-containers utf8-string vector
];
executableHaskellDepends = [
- aeson base bytestring data-default text transformers
- unordered-containers
+ aeson base bytestring data-default process text transformers
+ unordered-containers yaml
];
testHaskellDepends = [
aeson base bytestring data-default mtl tasty tasty-hunit
@@ -83498,6 +85699,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "gingersnap" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, deepseq, http-types
+ , postgresql-simple, resource-pool, snap-core, text, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "gingersnap";
+ version = "0.2.2.3";
+ sha256 = "1w1ip80w9bc5gj0ws6cvk37648267b4fqmh81h2khn7qhdah74k7";
+ libraryHaskellDepends = [
+ aeson base bytestring deepseq http-types postgresql-simple
+ resource-pool snap-core text transformers unordered-containers
+ ];
+ description = "Tools for consistent and safe JSON APIs with snap-core and postgresql-simple";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ginsu" = callPackage
({ mkDerivation, array, async, base, binary, bytestring, containers
, directory, hashable, hashtables, mtl, network, old-locale
@@ -83651,10 +85869,10 @@ self: {
}) {};
"git-annex" = callPackage
- ({ mkDerivation, aeson, async, base, bloomfilter, bup, byteable
- , bytestring, Cabal, case-insensitive, concurrent-output, conduit
- , connection, containers, crypto-api, cryptonite, curl
- , data-default, DAV, dbus, directory, disk-free-space, dlist, dns
+ ({ mkDerivation, aeson, async, attoparsec, base, bloomfilter, bup
+ , byteable, bytestring, Cabal, case-insensitive, concurrent-output
+ , conduit, connection, containers, crypto-api, cryptonite, curl
+ , data-default, DAV, dbus, directory, disk-free-space, dlist
, edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
, free, git, gnupg, hinotify, hslogger, http-client
, http-client-tls, http-conduit, http-types, IfElse, lsof, magic
@@ -83669,8 +85887,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "6.20180807";
- sha256 = "1wkqh1y58m0z1mf2j33qhndpxcjwv8mbv384kdk17vn0lp9zas1s";
+ version = "6.20181011";
+ sha256 = "0k18vrk5g9fdlhvklg14fyjk7x9css18i82xzl8wsycjbcq9ncgf";
configureFlags = [
"-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
"-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
@@ -83684,19 +85902,19 @@ self: {
hslogger IfElse process split transformers unix-compat utf8-string
];
executableHaskellDepends = [
- aeson async base bloomfilter byteable bytestring case-insensitive
- concurrent-output conduit connection containers crypto-api
- cryptonite data-default DAV dbus directory disk-free-space dlist
- dns edit-distance esqueleto exceptions fdo-notify feed filepath
- free hinotify hslogger http-client http-client-tls http-conduit
- http-types IfElse magic memory monad-control monad-logger
- mountpoints mtl network network-info network-multicast network-uri
- old-locale optparse-applicative persistent persistent-sqlite
- persistent-template process QuickCheck random regex-tdfa resourcet
- SafeSemaphore sandi securemem socks split stm stm-chans tagsoup
- tasty tasty-hunit tasty-quickcheck tasty-rerun text time torrent
- transformers unix unix-compat unordered-containers utf8-string uuid
- vector
+ aeson async attoparsec base bloomfilter byteable bytestring
+ case-insensitive concurrent-output conduit connection containers
+ crypto-api cryptonite data-default DAV dbus directory
+ disk-free-space dlist edit-distance esqueleto exceptions fdo-notify
+ feed filepath free hinotify hslogger http-client http-client-tls
+ http-conduit http-types IfElse magic memory monad-control
+ monad-logger mountpoints mtl network network-info network-multicast
+ network-uri old-locale optparse-applicative persistent
+ persistent-sqlite persistent-template process QuickCheck random
+ regex-tdfa resourcet SafeSemaphore sandi securemem socks split stm
+ stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun
+ text time torrent transformers unix unix-compat
+ unordered-containers utf8-string uuid vector
];
executableSystemDepends = [
bup curl git gnupg lsof openssh perl rsync wget which
@@ -84071,8 +86289,8 @@ self: {
}:
mkDerivation {
pname = "githash";
- version = "0.1.0.1";
- sha256 = "03zc7vjlnrr7ix7cnpgi70s0znsi07ms60dci8baxbcmjbibdcgy";
+ version = "0.1.2.0";
+ sha256 = "0pwh0s4gfddy0ixx92ww00v9qam2cx047ivqcm373fw5h2h1vrq8";
libraryHaskellDepends = [
base bytestring directory filepath process template-haskell
];
@@ -84118,6 +86336,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "github_0_20" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, base16-bytestring
+ , binary, binary-orphans, byteable, bytestring, containers
+ , cryptohash, deepseq, deepseq-generics, exceptions, file-embed
+ , hashable, hspec, hspec-discover, http-client, http-client-tls
+ , http-link-header, http-types, iso8601-time, mtl, network-uri
+ , semigroups, text, time, tls, transformers, transformers-compat
+ , unordered-containers, vector, vector-instances
+ }:
+ mkDerivation {
+ pname = "github";
+ version = "0.20";
+ sha256 = "0gyinmrdwbqd6h5bvlv5jkv2rfp48p11088w5ayms8h361ck3kdp";
+ libraryHaskellDepends = [
+ aeson base base-compat base16-bytestring binary binary-orphans
+ byteable bytestring containers cryptohash deepseq deepseq-generics
+ exceptions hashable http-client http-client-tls http-link-header
+ http-types iso8601-time mtl network-uri semigroups text time tls
+ transformers transformers-compat unordered-containers vector
+ vector-instances
+ ];
+ testHaskellDepends = [
+ aeson base base-compat bytestring file-embed hspec
+ unordered-containers vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Access to the GitHub API, v3";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"github-backup" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, directory
, exceptions, filepath, git, github, hslogger, IfElse, mtl, network
@@ -84355,32 +86604,34 @@ self: {
"gitit" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, blaze-html
, bytestring, ConfigFile, containers, directory, feed, filepath
- , filestore, ghc, ghc-paths, happstack-server, highlighting-kate
- , hoauth2, hslogger, HStringTemplate, HTTP, http-client-tls
- , http-conduit, json, mtl, network, network-uri, old-locale
- , old-time, pandoc, pandoc-types, parsec, pretty, process, random
- , recaptcha, safe, SHA, split, syb, tagsoup, text, time, uri, url
- , utf8-string, uuid, xhtml, xml, xss-sanitize, zlib
+ , filestore, ghc, ghc-paths, happstack-server, hoauth2, hslogger
+ , HStringTemplate, HTTP, http-client-tls, http-conduit, json, mtl
+ , network, network-uri, old-locale, old-time, pandoc, pandoc-types
+ , parsec, pretty, process, random, recaptcha, safe, SHA
+ , skylighting, split, syb, tagsoup, text, time, uri, uri-bytestring
+ , url, utf8-string, uuid, xhtml, xml, xml-conduit, xss-sanitize
+ , zlib
}:
mkDerivation {
pname = "gitit";
- version = "0.12.2.1";
- sha256 = "1x2kh1lsqiib7g4yp7g0yijsghl27k1axjx3zmhl7fwhkxc4w48m";
+ version = "0.12.3";
+ sha256 = "0jfi8rvvj2sh0dv19575fr781azsnahs7a828r1z2cql0dslkljl";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base base64-bytestring blaze-html bytestring ConfigFile
containers directory feed filepath filestore ghc ghc-paths
- happstack-server highlighting-kate hoauth2 hslogger HStringTemplate
- HTTP http-client-tls http-conduit json mtl network network-uri
+ happstack-server hoauth2 hslogger HStringTemplate HTTP
+ http-client-tls http-conduit json mtl network network-uri
old-locale old-time pandoc pandoc-types parsec pretty process
- random recaptcha safe SHA split syb tagsoup text time uri url
- utf8-string uuid xhtml xml xss-sanitize zlib
+ random recaptcha safe SHA skylighting split syb tagsoup text time
+ uri uri-bytestring url utf8-string uuid xhtml xml xml-conduit
+ xss-sanitize zlib
];
executableHaskellDepends = [
base bytestring directory filepath hslogger HTTP mtl network
- network-uri syb url utf8-string
+ network-uri syb text url utf8-string
];
description = "Wiki using happstack, git or darcs, and pandoc";
license = "GPL";
@@ -84472,23 +86723,20 @@ self: {
"gitlib-libgit2" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-combinators
, containers, directory, exceptions, fast-logger, filepath, gitlib
- , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit
- , lifted-async, lifted-base, mmorph, monad-control, monad-loops
- , mtl, resourcet, stm, stm-conduit, tagged, template-haskell, text
- , text-icu, time, transformers, transformers-base
+ , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit, mmorph
+ , monad-loops, mtl, resourcet, stm, stm-conduit, tagged
+ , template-haskell, text, text-icu, time, transformers
+ , transformers-base, unliftio, unliftio-core
}:
mkDerivation {
pname = "gitlib-libgit2";
- version = "3.1.1";
- sha256 = "1fv8r2w0fd9m7chrccmf5kw0pr2v0k2r2l0d782galdvq7mhca7w";
- revision = "1";
- editedCabalFile = "0v510c4sd6zwwf6mbc6gfv5sin91ckw4v6c844wrfksi9gdq3shm";
+ version = "3.1.2";
+ sha256 = "1nj9f2qmjxb5k9b23wfyz290pgb01hnzrswbamwb7am9bnkk250b";
libraryHaskellDepends = [
base bytestring conduit conduit-combinators containers directory
- exceptions fast-logger filepath gitlib hlibgit2 lifted-async
- lifted-base mmorph monad-control monad-loops mtl resourcet stm
- stm-conduit tagged template-haskell text text-icu time transformers
- transformers-base
+ exceptions fast-logger filepath gitlib hlibgit2 mmorph monad-loops
+ mtl resourcet stm stm-conduit tagged template-haskell text text-icu
+ time transformers transformers-base unliftio unliftio-core
];
testHaskellDepends = [
base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
@@ -84544,17 +86792,17 @@ self: {
"gitlib-test" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-combinators
- , exceptions, gitlib, hspec, hspec-expectations, HUnit
- , monad-control, tagged, text, time, transformers
+ , exceptions, gitlib, hspec, hspec-expectations, HUnit, tagged
+ , text, time, transformers, unliftio-core
}:
mkDerivation {
pname = "gitlib-test";
- version = "3.1.0.3";
- sha256 = "07r970d6m15gri6xim71kl2vvml85jlb0vc51zb67gfsd6iby2py";
+ version = "3.1.1";
+ sha256 = "1h8kqqj298bb0bj7w4rw18jf3bz0h1rqdg8fngmp4p35c1k1kjzi";
libraryHaskellDepends = [
base bytestring conduit conduit-combinators exceptions gitlib hspec
- hspec-expectations HUnit monad-control tagged text time
- transformers
+ hspec-expectations HUnit tagged text time transformers
+ unliftio-core
];
description = "Test library for confirming gitlib backend compliance";
license = stdenv.lib.licenses.mit;
@@ -84696,8 +86944,8 @@ self: {
pname = "gl";
version = "0.8.0";
sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda";
- revision = "1";
- editedCabalFile = "17m5vagiq1v7zg6409f56qqy28jd0xp13yk44s661rcwj0f4pd14";
+ revision = "2";
+ editedCabalFile = "0zbpf559ajlcwnylpbm6dbi4m3g3s08fciqfp5am3i2vrmw0wpi9";
setupHaskellDepends = [
base Cabal containers directory filepath hxt transformers
];
@@ -85045,14 +87293,16 @@ self: {
({ mkDerivation, async, attoparsec, base, base64-bytestring
, bytestring, Cabal, config-schema, config-value, containers
, directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL
- , HUnit, irc-core, kan-extensions, lens, network, process
+ , HUnit, irc-core, kan-extensions, lens, network, process, psqueues
, regex-tdfa, semigroupoids, split, stm, template-haskell, text
, time, transformers, unix, unordered-containers, vector, vty
}:
mkDerivation {
pname = "glirc";
- version = "2.28";
- sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk";
+ version = "2.29";
+ sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx";
+ revision = "1";
+ editedCabalFile = "0kjari98vcx5d1nfvxk8f6nx557hpy6njw7fj5p1lfdals81qifz";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -85060,8 +87310,8 @@ self: {
async attoparsec base base64-bytestring bytestring config-schema
config-value containers directory filepath free gitrev hashable
hookup HsOpenSSL irc-core kan-extensions lens network process
- regex-tdfa semigroupoids split stm template-haskell text time
- transformers unix unordered-containers vector vty
+ psqueues regex-tdfa semigroupoids split stm template-haskell text
+ time transformers unix unordered-containers vector vty
];
executableHaskellDepends = [ base lens text vty ];
testHaskellDepends = [ base HUnit ];
@@ -85076,8 +87326,8 @@ self: {
}:
mkDerivation {
pname = "gll";
- version = "0.4.0.11";
- sha256 = "0vxi750q11q1ggf0s2yyjpr47fmpfvmqm5mjdh6i4z6bf5vlhfd8";
+ version = "0.4.0.12";
+ sha256 = "1ls01s36ixik53c0fyr9sy3bhyh2kfn0yjkh3mp8izgw6l8aydwr";
libraryHaskellDepends = [
array base containers pretty random-strings regex-applicative text
time TypeCompose
@@ -85231,6 +87481,8 @@ self: {
pname = "gloss";
version = "1.13.0.1";
sha256 = "1f19vlx32nkgply25p83n7498lwdpshiibqg7nzkhb2kv7n0y71q";
+ revision = "1";
+ editedCabalFile = "1nyg324icnlky647zq4c21sqxv2bgnwnzgh2hz5d5ys6ba69j59h";
libraryHaskellDepends = [
base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
];
@@ -85256,9 +87508,12 @@ self: {
pname = "gloss-algorithms";
version = "1.13.0.1";
sha256 = "0vbqcsvyicb409a60fab0c0shixny4l5z2l15n8hrrr1dsvisf95";
+ revision = "1";
+ editedCabalFile = "140zmk3br0nn98mjc6ri36nk8yl93n4v69zybzv2vc41yxgvnac5";
libraryHaskellDepends = [ base containers ghc-prim gloss ];
description = "Data structures and algorithms for working with 2D graphics";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gloss-banana" = callPackage
@@ -85294,8 +87549,8 @@ self: {
}:
mkDerivation {
pname = "gloss-examples";
- version = "1.13.0.1";
- sha256 = "071b75qlppjff9q7b8312wb382gry4dnz1b8p84sb8lxmxr2848w";
+ version = "1.13.0.2";
+ sha256 = "1g2l3jjj2mmmw9w45bmasqn9nbbsxxny6zhdvda931r6ryanq8db";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -85304,6 +87559,26 @@ self: {
];
description = "Examples using the gloss library";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "gloss-export" = callPackage
+ ({ mkDerivation, base, GLFW-b, gloss, gloss-rendering, GLUT
+ , JuicyPixels, OpenGLRaw, vector
+ }:
+ mkDerivation {
+ pname = "gloss-export";
+ version = "0.1.0.0";
+ sha256 = "0m5k8zr90wqh6sjgn5c3mrpffwkq8g42qji8ss77l97a2hcv50dq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base GLFW-b gloss-rendering GLUT JuicyPixels OpenGLRaw vector
+ ];
+ executableHaskellDepends = [ base gloss ];
+ testHaskellDepends = [ base ];
+ description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
+ license = stdenv.lib.licenses.mit;
}) {};
"gloss-game" = callPackage
@@ -85315,6 +87590,7 @@ self: {
libraryHaskellDepends = [ base gloss gloss-juicy ];
description = "Gloss wrapper that simplifies writing games";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gloss-juicy" = callPackage
@@ -85322,8 +87598,10 @@ self: {
}:
mkDerivation {
pname = "gloss-juicy";
- version = "0.2.2";
- sha256 = "1w1y8aijdf4ba80rq5i2456xh1yyix4wcfagy102xsyvcldlggpv";
+ version = "0.2.3";
+ sha256 = "0px0i6fvicmsgvp7sl7g37y3163s1i2fm5xcq5b1ar9smwv25gq3";
+ revision = "1";
+ editedCabalFile = "09cbz0854v2dsmv24l40rmx4bq7ic436m4xingw93gvw4fawlfqc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -85334,6 +87612,7 @@ self: {
];
description = "Load any image supported by Juicy.Pixels in your gloss application";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gloss-raster" = callPackage
@@ -85351,14 +87630,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "gloss-raster_1_13_0_1" = callPackage
+ "gloss-raster_1_13_0_2" = callPackage
({ mkDerivation, base, containers, ghc-prim, gloss, gloss-rendering
, repa
}:
mkDerivation {
pname = "gloss-raster";
- version = "1.13.0.1";
- sha256 = "1dyj8r0b3gal54dgyq9jb4s5sqjhp152q63r8nkpzjh1c9d3cp9x";
+ version = "1.13.0.2";
+ sha256 = "1k4l19c1fn1s14phq2qml5ibsli3jmkk6748k9y96lbrgj5nfp49";
libraryHaskellDepends = [
base containers ghc-prim gloss gloss-rendering repa
];
@@ -85404,6 +87683,8 @@ self: {
pname = "gloss-rendering";
version = "1.13.0.2";
sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0";
+ revision = "1";
+ editedCabalFile = "0r57zc8ryxgjb4ydcdlmq19hl3nj6gjm3z85wrmdkn0wrx16mqih";
libraryHaskellDepends = [
base bmp bytestring containers GLUT OpenGL
];
@@ -85731,8 +88012,8 @@ self: {
}:
mkDerivation {
pname = "gnuplot";
- version = "0.5.5.2";
- sha256 = "1mlppnc13ygjzmf6ldydys4wvy35yb3xjwwfgf9rbi7nfcqjr6mn";
+ version = "0.5.5.3";
+ sha256 = "0105ajc5szgrh091x5fxdcydc96rdh75gg2snyfr2y2rhf120x2g";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -85876,8 +88157,8 @@ self: {
}:
mkDerivation {
pname = "goatee";
- version = "0.3.1.2";
- sha256 = "1lz14w17yn92icdiz8i4435m4qli158infxq02ry6pap94kk78d9";
+ version = "0.3.1.3";
+ sha256 = "16nsgb1gf7mn35pchigrankl8q7p6cvgsxzbb3ab93jqm8kjxmyn";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base containers mtl parsec template-haskell
@@ -85894,8 +88175,8 @@ self: {
}:
mkDerivation {
pname = "goatee-gtk";
- version = "0.3.1.2";
- sha256 = "19qgkrv22jffvy27ykqyhgqw2qak4888r1d3x1lfs48r3bisli2h";
+ version = "0.3.1.3";
+ sha256 = "0sp819fzgflsfj1glgdmw2qhb97rzdy6nargdmwvaxfay925p8aw";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -88117,6 +90398,8 @@ self: {
pname = "grapefruit-frp";
version = "0.1.0.7";
sha256 = "132jd2dxj964paz6dcyb6sx25dkv271rl2fgw05c7zawrrfnrkxs";
+ revision = "1";
+ editedCabalFile = "14qhyvsf7r04fwm1jwl41gdijx0vrqz7lsqy50hmzpcwixr92013";
libraryHaskellDepends = [
arrows base containers fingertree semigroups TypeCompose
];
@@ -88145,6 +90428,8 @@ self: {
pname = "grapefruit-ui";
version = "0.1.0.7";
sha256 = "1r2wpn982z33s0p6fgdgslgv9ixanb2pysy71j20cfp1xzh13hdj";
+ revision = "1";
+ editedCabalFile = "0s61spgkw2h12g1wks5zxhrzpqqnmmxcw5kbirblyfl4p59pxpns";
libraryHaskellDepends = [
arrows base colour containers fraction grapefruit-frp
grapefruit-records
@@ -88163,6 +90448,8 @@ self: {
pname = "grapefruit-ui-gtk";
version = "0.1.0.7";
sha256 = "0ix6dilj3xv2cvihwq8cfykr8i1yq9w1bn86248r5bg5vhfn4g28";
+ revision = "1";
+ editedCabalFile = "0ahjd2sxh12hr8slz6vkc5gn2wr1h9dgq8q3kc9jq5xjzr66cgbk";
libraryHaskellDepends = [
base colour containers fraction glib grapefruit-frp
grapefruit-records grapefruit-ui gtk3 transformers
@@ -88605,6 +90892,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "graphmod-plugin" = callPackage
+ ({ mkDerivation, base, containers, directory, dotgen, filepath, ghc
+ , syb, template-haskell
+ }:
+ mkDerivation {
+ pname = "graphmod-plugin";
+ version = "0.1.0.0";
+ sha256 = "0p95zr37mkvh7gsyj7wkzc3lqqbbkz7jh33jg123hz6qili2hziw";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory dotgen filepath ghc syb template-haskell
+ ];
+ executableHaskellDepends = [ base ];
+ description = "A reimplementation of graphmod as a source plugin";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"graphql" = callPackage
({ mkDerivation, attoparsec, base, tasty, tasty-hunit, text }:
mkDerivation {
@@ -88643,6 +90949,17 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "graphql-w-persistent" = callPackage
+ ({ mkDerivation, base, containers, json, text }:
+ mkDerivation {
+ pname = "graphql-w-persistent";
+ version = "0.1.0.7";
+ sha256 = "13fbx5vzg2fq9883hdf8djbc47lyia6n4sshwz3dhg5bjpni7l1x";
+ libraryHaskellDepends = [ base containers json text ];
+ description = "Haskell GraphQL query parser-interpreter-data processor";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"graphs" = callPackage
({ mkDerivation, array, base, containers, transformers
, transformers-compat, void
@@ -88862,8 +91179,8 @@ self: {
}:
mkDerivation {
pname = "greenclip";
- version = "3.1.1";
- sha256 = "1axh1q7kcvcnhn4rl704i4gcix5yn5v0sb3bdgjk4vgkd7fv8chw";
+ version = "3.2.0";
+ sha256 = "09ygvyrczxqsp2plwmwx021wmbq2vln9i4b5iaj0j26j7prykikq";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -88965,8 +91282,8 @@ self: {
}:
mkDerivation {
pname = "greskell";
- version = "0.2.1.0";
- sha256 = "03a3rgrzmhc3rh8hwz2pmq3w2q6yf8ypcfzbmqm8cwkix5xx1h8z";
+ version = "0.2.1.1";
+ sha256 = "0nplscs0gv9isb1z2i8qh50yssvd7kkd669j53491hjw53rwy1cs";
libraryHaskellDepends = [
aeson base greskell-core semigroups text transformers
unordered-containers vector
@@ -88986,8 +91303,8 @@ self: {
}:
mkDerivation {
pname = "greskell-core";
- version = "0.1.2.2";
- sha256 = "1h9sx4sdfh2flbvnrmhwy7g5lrzg018w9qrqrrkd4szi499dxc0d";
+ version = "0.1.2.4";
+ sha256 = "11agvhvpv94rnylc5ch5cg90w5z1i0ywdw47yca83503lmv3y790";
libraryHaskellDepends = [
aeson base containers hashable scientific semigroups text
unordered-containers uuid vector
@@ -89007,8 +91324,8 @@ self: {
}:
mkDerivation {
pname = "greskell-websocket";
- version = "0.1.1.0";
- sha256 = "1c3n222ihaqb2gls0c9f4zc8pgbwgan7j1n4h5p7xhp7csg34p13";
+ version = "0.1.1.2";
+ sha256 = "1rydw93dscnq41a1j4l7fchbpxgbqgf2kx8c58kb0m8qxi7v6qlh";
libraryHaskellDepends = [
aeson async base base64-bytestring bytestring greskell-core
hashtables safe-exceptions stm text unordered-containers uuid
@@ -89023,17 +91340,16 @@ self: {
}) {};
"grid" = callPackage
- ({ mkDerivation, base, cereal, containers, QuickCheck
- , test-framework, test-framework-quickcheck2
+ ({ mkDerivation, base, containers, QuickCheck, test-framework
+ , test-framework-quickcheck2
}:
mkDerivation {
pname = "grid";
- version = "7.8.9";
- sha256 = "1gzf8k4v16aavz63fcl0byqxzha796g77dng7rsxjm8zsgzlicy0";
- libraryHaskellDepends = [ base cereal containers ];
+ version = "7.8.10";
+ sha256 = "1470w214jk285jvb7hyzz539gi3jl52dpa97k5yyfcm2q7186pbj";
+ libraryHaskellDepends = [ base containers ];
testHaskellDepends = [
- base containers QuickCheck test-framework
- test-framework-quickcheck2
+ base QuickCheck test-framework test-framework-quickcheck2
];
description = "Tools for working with regular grids (graphs, lattices)";
license = stdenv.lib.licenses.bsd3;
@@ -89211,8 +91527,8 @@ self: {
}:
mkDerivation {
pname = "groundhog";
- version = "0.8.0.1";
- sha256 = "0qrv2rpw1nqn28j6mcmwn0sjmfsfg5gj68sq5dcydh247q1acp5r";
+ version = "0.9.0";
+ sha256 = "09d0n91cd0bvmrik4ail2svbh7l8vp5va0344jzvy1g2ancy0yj0";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring blaze-builder bytestring
containers monad-control mtl resourcet safe-exceptions scientific
@@ -89249,8 +91565,10 @@ self: {
}:
mkDerivation {
pname = "groundhog-inspector";
- version = "0.8.0.2";
- sha256 = "1wbsx0qjbhliglwk4yhh44ra54i34cypvki9zvw28khpc8mxdfmz";
+ version = "0.9.0";
+ sha256 = "1vb9zsg2r5d9ad6ppbzzm18hq4d4ygc7g2z1w5nb866774zwlywb";
+ revision = "1";
+ editedCabalFile = "1fzkm7rxg3la10j65drhvqnzcv6c5rscq3cqz7f0395rbw0pakmy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -89273,8 +91591,8 @@ self: {
}:
mkDerivation {
pname = "groundhog-mysql";
- version = "0.8.0.1";
- sha256 = "0h4sckj7hrhlnrfa9639kr9id8rf11ragadsj9rxils1vn4cn35r";
+ version = "0.9.0";
+ sha256 = "0n3zcvb1qh5jdfrzgiamaf51fvkhgabsl07asy7wcdp0hb8rxdkq";
libraryHaskellDepends = [
base bytestring containers groundhog monad-control monad-logger
mysql mysql-simple resource-pool resourcet text time transformers
@@ -89292,8 +91610,8 @@ self: {
}:
mkDerivation {
pname = "groundhog-postgresql";
- version = "0.8.0.3";
- sha256 = "0iz21awiblzir01r6p77qnlvqsb8j87x5y11g1q2spnafzj4wlpl";
+ version = "0.9.0.1";
+ sha256 = "0p88l85rsmbdpfnrh2411n68yy70g0iw7pqmp496b8n6gr0mmvl5";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder bytestring containers groundhog
monad-control postgresql-libpq postgresql-simple resource-pool
@@ -89311,8 +91629,8 @@ self: {
}:
mkDerivation {
pname = "groundhog-sqlite";
- version = "0.8.0.1";
- sha256 = "1y6cfnyrrq61vv793crfb7yd21yn0gqmx7j7c9sg8665l34wq2jp";
+ version = "0.9.0";
+ sha256 = "06985myr96dc7f6hkkm9nihvvl2c19wdl1bn3nfvyj78yvz8ryxb";
libraryHaskellDepends = [
base bytestring containers direct-sqlite groundhog monad-control
resource-pool resourcet text transformers unordered-containers
@@ -89328,8 +91646,8 @@ self: {
}:
mkDerivation {
pname = "groundhog-th";
- version = "0.8.0.2";
- sha256 = "13rxdmnbmsivp608xclkvjnab0dzhzyqc8zjrpm7ml9d5yc8v596";
+ version = "0.9.0.1";
+ sha256 = "0hrk86s5mfj33sx5im6pcym1br160vnp17yhi82b2x1imm26cmlk";
libraryHaskellDepends = [
aeson base bytestring containers groundhog template-haskell text
time unordered-containers yaml
@@ -89463,6 +91781,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "grpc-api-etcd" = callPackage
+ ({ mkDerivation, base, proto-lens, proto-lens-runtime }:
+ mkDerivation {
+ pname = "grpc-api-etcd";
+ version = "0.2.0.0";
+ sha256 = "1ymvgsrqhnym2wv5j8mbhh8i3r7y0jcz19k927qmffqk7sacfxg1";
+ libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
+ description = "Generated messages and instances for etcd gRPC";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "grpc-etcd-client" = callPackage
+ ({ mkDerivation, base, bytestring, grpc-api-etcd, http2-client
+ , http2-client-grpc, lens, network, proto-lens, proto-lens-runtime
+ }:
+ mkDerivation {
+ pname = "grpc-etcd-client";
+ version = "0.1.2.0";
+ sha256 = "0ly24551b54cpzh05rmn9j6xl3qb3wi456yv45c69sv7i8jq63zf";
+ libraryHaskellDepends = [
+ base bytestring grpc-api-etcd http2-client http2-client-grpc lens
+ network proto-lens proto-lens-runtime
+ ];
+ description = "gRPC client for etcd";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"gruff" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
, FTGL, gtk, gtkglext, mtl, old-locale, OpenGL, OpenGLRaw, parallel
@@ -89590,8 +91937,8 @@ self: {
}:
mkDerivation {
pname = "gssapi-wai";
- version = "0.1.2.2";
- sha256 = "1fkgsdc4nkxwkhnz3b8rz6zx8jq6325mgniy5h5s3cr7k0kwnv0s";
+ version = "0.1.2.3";
+ sha256 = "08c47zwy4wh1cga5l4brg7dm5nkl7xcsq2rvwdzvmzzxyfg3nnr7";
libraryHaskellDepends = [
base base64-bytestring bytestring case-insensitive gssapi
http-types vault wai wai-extra
@@ -89688,6 +92035,25 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {gtk2 = pkgs.gnome2.gtk;};
+ "gtk_0_15_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
+ , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text
+ }:
+ mkDerivation {
+ pname = "gtk";
+ version = "0.15.0";
+ sha256 = "110lawhnd00acllfjhimcq59wxsrl2xs68mam6wmqfc43wan5f5k";
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
+ libraryHaskellDepends = [
+ array base bytestring cairo containers gio glib mtl pango text
+ ];
+ libraryPkgconfigDepends = [ gtk2 ];
+ description = "Binding to the Gtk+ graphical user interface library";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {gtk2 = pkgs.gnome2.gtk;};
+
"gtk-helpers" = callPackage
({ mkDerivation, array, base, gio, glib, gtk, mtl, process
, template-haskell
@@ -89858,6 +92224,8 @@ self: {
pname = "gtk2hs-buildtools";
version = "0.13.4.0";
sha256 = "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg";
+ revision = "1";
+ editedCabalFile = "0nbghg11y4nvxjxrvdm4a7fzj8z12fr12hkj4b7p27imlryg3m10";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -90021,6 +92389,27 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) gtk3;};
+ "gtk3_0_15_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
+ , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text
+ }:
+ mkDerivation {
+ pname = "gtk3";
+ version = "0.15.0";
+ sha256 = "1q6ysw00gjaaali18iz111zqzkjiblzg7cfg6ckvzf93mg0w6g0c";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
+ libraryHaskellDepends = [
+ array base bytestring cairo containers gio glib mtl pango text
+ ];
+ libraryPkgconfigDepends = [ gtk3 ];
+ description = "Binding to the Gtk+ 3 graphical user interface library";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gtk3;};
+
"gtk3-mac-integration" = callPackage
({ mkDerivation, array, base, Cabal, containers, glib
, gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl
@@ -90274,8 +92663,8 @@ self: {
}:
mkDerivation {
pname = "h-gpgme";
- version = "0.5.0.0";
- sha256 = "0fvkj7cz7nfz52a2zccngb8gbs8p94whvgccvnxpwmkg90m45mfp";
+ version = "0.5.1.0";
+ sha256 = "0fdlfi068m23yizkfgsbzjvd1yxmrvmbndsbsvawljq98jc75sgl";
libraryHaskellDepends = [
base bindings-gpgme bytestring data-default email-validate time
transformers unix
@@ -90561,8 +92950,8 @@ self: {
}:
mkDerivation {
pname = "hOpenPGP";
- version = "2.7.2";
- sha256 = "1fcpzc1ph0nykjs4k5hm6b67698h1n9452wlpm55acdf53mrk1lg";
+ version = "2.7.4.1";
+ sha256 = "0fcm87rkf1c94w68ad2zkd3r2pbxzqa82kh3d2ky87rc1wqnia0s";
libraryHaskellDepends = [
aeson asn1-encoding attoparsec base base16-bytestring
base64-bytestring bifunctors binary binary-conduit bytestring bzlib
@@ -91441,8 +93830,8 @@ self: {
pname = "hackage-security";
version = "0.5.3.0";
sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v";
- revision = "2";
- editedCabalFile = "0hwv588hwzlhzck7lhlhmnz4vv05mmfxmx1vmk0b9gwvlv7wfjc3";
+ revision = "3";
+ editedCabalFile = "07h13j203wafvimfhswpjl2a43iaavy9579hm16z5m565m7f8hwy";
libraryHaskellDepends = [
base base16-bytestring base64-bytestring bytestring Cabal
containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -91537,8 +93926,8 @@ self: {
}:
mkDerivation {
pname = "hackage-whatsnew";
- version = "0.1.1";
- sha256 = "140qsl0aqw2zg246inijifvcddmirba613as0hrg11hkd52f6fhr";
+ version = "0.1.2";
+ sha256 = "19nk01jqfirvr8c3wy6pacq32v5lzxi735r8i6d23d0vwjfmqxnk";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -91756,15 +94145,15 @@ self: {
}) {};
"haddock" = callPackage
- ({ mkDerivation, base, filepath, haddock-api, hspec }:
+ ({ mkDerivation, base, filepath, haddock-api }:
mkDerivation {
pname = "haddock";
- version = "2.20.0";
- sha256 = "0jfgd9n0gcbg9i2ifra5cnj0xh2nc5j65ns3b280482r65vnph9w";
+ version = "2.21.0";
+ sha256 = "1dkqhclhnjx6786vsmkw6k75kkq06cv1xcxkivm34l5pgnkwwqq8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base haddock-api ];
- testHaskellDepends = [ base filepath hspec ];
+ testHaskellDepends = [ base filepath ];
doCheck = false;
preCheck = "unset GHC_PACKAGE_PATH";
description = "A documentation-generation tool for Haskell libraries";
@@ -91840,8 +94229,8 @@ self: {
}:
mkDerivation {
pname = "haddock-api";
- version = "2.20.0";
- sha256 = "02f6038djjbx2vshd5digk4rm16fl33m080s7v01nn5bzfak9g7j";
+ version = "2.21.0";
+ sha256 = "0j6ixhq64nhjmq2ymhzdgz49ixdbffrrh8a96awl89d2kwdv3bnw";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base bytestring Cabal containers deepseq directory filepath
@@ -91911,25 +94300,6 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "haddock-library_1_4_4" = callPackage
- ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
- , hspec-discover, QuickCheck, transformers
- }:
- mkDerivation {
- pname = "haddock-library";
- version = "1.4.4";
- sha256 = "0dx5hawfanglhkj5nqq1dwr2j1v35p0syz30xvdk8gld8rif06p9";
- libraryHaskellDepends = [ base bytestring deepseq transformers ];
- testHaskellDepends = [
- base base-compat bytestring deepseq hspec QuickCheck transformers
- ];
- testToolDepends = [ hspec-discover ];
- doHaddock = false;
- description = "Library exposing some functionality of Haddock";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"haddock-library" = callPackage
({ mkDerivation, base, base-compat, bytestring, containers, deepseq
, directory, filepath, hspec, hspec-discover, optparse-applicative
@@ -91952,24 +94322,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "haddock-library_1_6_0" = callPackage
+ "haddock-library_1_7_0" = callPackage
({ mkDerivation, base, base-compat, bytestring, containers, deepseq
- , directory, filepath, hspec, hspec-discover, optparse-applicative
- , QuickCheck, transformers, tree-diff
+ , hspec, hspec-discover, parsec, QuickCheck, text, transformers
}:
mkDerivation {
pname = "haddock-library";
- version = "1.6.0";
- sha256 = "0h7721zw6kbm1vcr0kp69avfy3qfd9zsgmh24gy909kxgdp0k7v0";
+ version = "1.7.0";
+ sha256 = "04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7";
libraryHaskellDepends = [
- base bytestring containers deepseq transformers
+ base bytestring containers parsec text transformers
];
testHaskellDepends = [
- base base-compat bytestring containers deepseq directory filepath
- hspec optparse-applicative QuickCheck transformers tree-diff
+ base base-compat bytestring containers deepseq hspec parsec
+ QuickCheck text transformers
];
testToolDepends = [ hspec-discover ];
- doHaddock = false;
description = "Library exposing some functionality of Haddock";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -92020,17 +94388,17 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "1.11.2";
- sha256 = "0xfhghpy0jmgmlyzc6plcg3nq26afbwp36bjjdc156rcwzsm9qyx";
+ version = "1.14.0";
+ sha256 = "0cypqvl04fd0gdakl2kf087fjy6qw968isx2hmli5z5gza18hl0b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring containers language-docker megaparsec mtl
- ShellCheck split text void
+ aeson base bytestring containers directory filepath language-docker
+ megaparsec mtl ShellCheck split text void yaml
];
executableHaskellDepends = [
- base containers directory filepath gitrev language-docker
- megaparsec optparse-applicative text yaml
+ base containers gitrev language-docker megaparsec
+ optparse-applicative text
];
testHaskellDepends = [
aeson base bytestring hspec HUnit language-docker megaparsec
@@ -92470,8 +94838,8 @@ self: {
}:
mkDerivation {
pname = "hakyll";
- version = "4.12.3.0";
- sha256 = "1cczcca2h5spvrq8z2nm5ygphcrjfm6k725ppbcc05c4w49dqwm4";
+ version = "4.12.4.0";
+ sha256 = "0kflvb86maqn15h0dh2r2p415q9k351gl9mpb3vnbmfn0nhvg1x1";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -92644,13 +95012,34 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hakyll-dhall" = callPackage
+ ({ mkDerivation, base, binary, cborg, containers
+ , data-default-class, dhall, filepath, hakyll, lens-family-core
+ , mtl, prettyprinter, text, transformers
+ }:
+ mkDerivation {
+ pname = "hakyll-dhall";
+ version = "0.2.2.1";
+ sha256 = "03s1fs95mhaxwq79gf2qjlbzjfkimd3kkiksjmp42j8zxn0y9sbf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary cborg containers data-default-class dhall filepath
+ hakyll lens-family-core mtl prettyprinter text transformers
+ ];
+ executableHaskellDepends = [ base dhall hakyll ];
+ description = "Dhall compiler for Hakyll";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hakyll-dir-list" = callPackage
({ mkDerivation, base, containers, data-default, filepath, hakyll
}:
mkDerivation {
pname = "hakyll-dir-list";
- version = "1.0.0.2";
- sha256 = "0irkfnwbzhchvjsfzndb6i3w76gnwik9fq3fhi3qg3jc7l0cgi76";
+ version = "1.0.0.4";
+ sha256 = "0n7cfamaan0yyrpdfqmjbbgv7cg172hp4zs16zf52l90xdq253h9";
libraryHaskellDepends = [
base containers data-default filepath hakyll
];
@@ -92982,13 +95371,11 @@ self: {
({ mkDerivation, base, hedgehog, lens }:
mkDerivation {
pname = "halves";
- version = "0.1.0.0";
- sha256 = "06axsxkfja0p7vki4cnrf3rf3k255f5mk573pzn0zvzi4f8mmadn";
- revision = "1";
- editedCabalFile = "0hwp6fgnfmms2ckg0bzriklnshn7m39dxvj2vjrzm19spnf55fdn";
+ version = "0.1.0.1";
+ sha256 = "0mjxi7aq58k5aydslsihp66kabh0mr5wp2nngbzkvzbs0z7rrwma";
libraryHaskellDepends = [ base lens ];
testHaskellDepends = [ base hedgehog lens ];
- description = "Splitting/combining data structures to/from halves, quarters, eighths";
+ description = "Split or combine data structures to and from halves, quarters, eighths";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -93048,6 +95435,7 @@ self: {
];
description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hamlet" = callPackage
@@ -93398,56 +95786,30 @@ self: {
"hapistrano" = callPackage
({ mkDerivation, aeson, async, base, directory, filepath
, formatting, gitrev, hspec, mtl, optparse-applicative, path
- , path-io, process, stm, temporary, time, transformers, yaml
- }:
- mkDerivation {
- pname = "hapistrano";
- version = "0.3.5.9";
- sha256 = "1jyzjj9m6vj9rlpvadaxnfxxl8ynrn8jp9xzyp3kwkzyv6cdi1ha";
- revision = "2";
- editedCabalFile = "1gfs133dm21jwv48v4wlr1dbr993fz49b9lviaahkymlv1d3j8gd";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- base filepath formatting gitrev mtl path process time transformers
- ];
- executableHaskellDepends = [
- aeson async base formatting gitrev optparse-applicative path
- path-io stm yaml
- ];
- testHaskellDepends = [
- base directory filepath hspec mtl path path-io process temporary
- ];
- description = "A deployment library for Haskell applications";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "hapistrano_0_3_5_10" = callPackage
- ({ mkDerivation, aeson, async, base, directory, filepath
- , formatting, gitrev, hspec, mtl, optparse-applicative, path
- , path-io, process, stm, temporary, time, transformers, yaml
+ , path-io, process, QuickCheck, stm, temporary, time, transformers
+ , yaml
}:
mkDerivation {
pname = "hapistrano";
- version = "0.3.5.10";
- sha256 = "1pkgbcpddk5ik0b1b684nnvwil68kla1w7660c1751dyhhh78ikw";
+ version = "0.3.7.0";
+ sha256 = "16d1y3dwbvj76b1yyghvwi4f7wak1dv6l07ymknrbi42ks0w9041";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base filepath formatting gitrev mtl path process time transformers
+ aeson base filepath formatting gitrev mtl path process time
+ transformers
];
executableHaskellDepends = [
aeson async base formatting gitrev optparse-applicative path
path-io stm yaml
];
testHaskellDepends = [
- base directory filepath hspec mtl path path-io process temporary
+ base directory filepath hspec mtl path path-io process QuickCheck
+ temporary
];
description = "A deployment library for Haskell applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"happindicator" = callPackage
@@ -94167,8 +96529,8 @@ self: {
pname = "happy";
version = "1.19.9";
sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
- revision = "2";
- editedCabalFile = "1zxi8zfwiwxidrhr0yj5srpzp32z66sld9xv0k4yz7046rkl3577";
+ revision = "3";
+ editedCabalFile = "0kwlh964nyqvfbm02np8vpc28gbhsby0r65jhz1918rm0wip9izq";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
@@ -94519,8 +96881,8 @@ self: {
pname = "hasbolt";
version = "0.1.3.0";
sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx";
- revision = "2";
- editedCabalFile = "1isygckkasffk06bd6023imr51c7l9cdvk4vf2vgv9x10v8kpp37";
+ revision = "3";
+ editedCabalFile = "0j9njdb6x5ibx113bprsq2i0jmrigdli23pjabxam9q07979c9ac";
libraryHaskellDepends = [
base binary bytestring connection containers data-binary-ieee754
data-default hex network text transformers
@@ -94535,8 +96897,8 @@ self: {
}:
mkDerivation {
pname = "hasbolt-extras";
- version = "0.0.0.11";
- sha256 = "1x0dm5x4jr1k619s7ad78bb717c8572s8pakailf8g2wsyc340gr";
+ version = "0.0.0.12";
+ sha256 = "0rh4nn7dy9jfn4vhmf18fgyqhldj5lg46l35ka2m60ig86za9fkn";
libraryHaskellDepends = [
base containers free hasbolt lens mtl neat-interpolation
template-haskell text th-lift-instances
@@ -94819,10 +97181,8 @@ self: {
({ mkDerivation, base, hashable, time }:
mkDerivation {
pname = "hashable-time";
- version = "0.2.0.1";
- sha256 = "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm";
- revision = "1";
- editedCabalFile = "0rv40xkg3gj8jnqsry1gq3f5s5la6d5arg8fzkirnwdpcgha1as6";
+ version = "0.2.0.2";
+ sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs";
libraryHaskellDepends = [ base hashable time ];
description = "Hashable instances for Data.Time";
license = stdenv.lib.licenses.bsd3;
@@ -95370,6 +97730,61 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "haskell-bitmex-client" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
+ , cryptonite, haskell-bitmex-rest, http-client, http-client-tls
+ , http-types, katip, memory, microlens, mtl, network
+ , safe-exceptions, text, time, vector, websockets, wuss
+ }:
+ mkDerivation {
+ pname = "haskell-bitmex-client";
+ version = "0.1.0.1";
+ sha256 = "13qqi0ribc20p9h3nmfsjzhizyyz0nzsxfwx21i2r4v9md9j9n3c";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring bytestring-conversion cryptonite
+ haskell-bitmex-rest http-client http-client-tls http-types katip
+ memory microlens mtl network safe-exceptions text time vector
+ websockets wuss
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring haskell-bitmex-rest http-client
+ http-client-tls katip mtl text time websockets
+ ];
+ description = "Complete BitMEX Client";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "haskell-bitmex-rest" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , case-insensitive, containers, deepseq, exceptions, hspec
+ , http-api-data, http-client, http-client-tls, http-media
+ , http-types, iso8601-time, katip, microlens, mtl, network
+ , QuickCheck, random, safe-exceptions, semigroups, text, time
+ , transformers, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "haskell-bitmex-rest";
+ version = "0.1.0.0";
+ sha256 = "09xj9bf50wwq1xgy800wadm8jbnbs4qnjcxqx0gy3jmx1z7mgmmc";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring case-insensitive containers
+ deepseq exceptions http-api-data http-client http-client-tls
+ http-media http-types iso8601-time katip microlens mtl network
+ random safe-exceptions text time transformers unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers hspec iso8601-time mtl QuickCheck
+ semigroups text time transformers unordered-containers vector
+ ];
+ description = "Auto-generated bitmex API Client";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskell-brainfuck" = callPackage
({ mkDerivation, base, bytestring, mtl, parsec, QuickCheck, tasty
, tasty-quickcheck, tasty-th
@@ -95502,8 +97917,8 @@ self: {
}:
mkDerivation {
pname = "haskell-dap";
- version = "0.0.7.0";
- sha256 = "1xrjrdrn8an1w5dig134jcy9whwjfm2vnb8s4vvd1aa8iq37p87p";
+ version = "0.0.9.0";
+ sha256 = "1flsz93wbhd61yfydbfbb3q8brhh0d0gzfsdd3xscwvcbdzgw9qr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -95696,19 +98111,14 @@ self: {
}:
mkDerivation {
pname = "haskell-gi";
- version = "0.21.4";
- sha256 = "0rjb7pg8v0kjx115n0bksw705g6yg9vn8krxrakhvds5hvmb9caw";
- isLibrary = true;
- isExecutable = true;
+ version = "0.21.5";
+ sha256 = "1rvi9bmgxq7q6js8yb5yb156yxmnm9px9amgjwzxmr7sxz31dl8j";
libraryHaskellDepends = [
attoparsec 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
- ];
testHaskellDepends = [ base doctest process ];
description = "Generate Haskell bindings for GObject Introspection capable libraries";
license = stdenv.lib.licenses.lgpl21;
@@ -95719,8 +98129,8 @@ self: {
({ mkDerivation, base, bytestring, containers, glib, text }:
mkDerivation {
pname = "haskell-gi-base";
- version = "0.21.1";
- sha256 = "0p992mpyy9z699zpvp8i8b5v8a3jhiq6c4n29zlf7qbcxc8z4z36";
+ version = "0.21.4";
+ sha256 = "0vrl0cqws1l0ba7avf16c9zyfsvq7gd8wv4sjzd7rjk6jmg38vds";
libraryHaskellDepends = [ base bytestring containers text ];
libraryPkgconfigDepends = [ glib ];
description = "Foundation for libraries generated by haskell-gi";
@@ -95816,7 +98226,7 @@ self: {
description = "Haskell interface of the igraph library";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {igraph = null;};
+ }) {inherit (pkgs) igraph;};
"haskell-import-graph" = callPackage
({ mkDerivation, base, classy-prelude, ghc, graphviz, process, text
@@ -95874,8 +98284,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "haskell-lexer";
- version = "1.0.1";
- sha256 = "0rj3r1pk88hh3sk3mj61whp8czz5kpxhbc78xlr04bxwqjrjmm6p";
+ version = "1.0.2";
+ sha256 = "1wyxd8x33x4v5vxyzkhm610pl86gbkc8y439092fr1735q9g7kfq";
libraryHaskellDepends = [ base ];
description = "A fully compliant Haskell 98 lexer";
license = stdenv.lib.licenses.bsd3;
@@ -95913,7 +98323,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp_0_7_0_0" = callPackage
+ "haskell-lsp_0_8_0_1" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, data-default
, directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
, lens, mtl, network-uri, parsec, sorted-list, stm, text, time
@@ -95921,10 +98331,8 @@ self: {
}:
mkDerivation {
pname = "haskell-lsp";
- version = "0.7.0.0";
- sha256 = "1v67yj0ndd5wra2rnmdqcamivml82yn4lwhnm04nz6spsq2mqgkv";
- revision = "1";
- editedCabalFile = "1j33y61hwarfm5p54b682sd3rfhxf82lchr1jnnvv1h8xs56ryln";
+ version = "0.8.0.1";
+ sha256 = "1lvrqxp6v5xvha88l8r6n86ydvlszzxmi7fazvjxz4bixy9zvw8q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -95983,15 +98391,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp-types_0_7_0_0" = callPackage
+ "haskell-lsp-types_0_8_0_1" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default, filepath
, hashable, lens, network-uri, scientific, text
, unordered-containers
}:
mkDerivation {
pname = "haskell-lsp-types";
- version = "0.7.0.0";
- sha256 = "1iisadmi3v3wshpwi5cbn2p8p4qr9rh5xnlbhjymzxhj9k09cmcb";
+ version = "0.8.0.1";
+ sha256 = "0czh6fqrzzp5xkawwiia5n437pmch41rnkp166lpvglfqg4gx8y8";
libraryHaskellDepends = [
aeson base bytestring data-default filepath hashable lens
network-uri scientific text unordered-containers
@@ -96083,8 +98491,8 @@ self: {
}:
mkDerivation {
pname = "haskell-names";
- version = "0.9.2";
- sha256 = "1gfqyh0lgi4n20dmh6pavxixy3flw385fp2iisks99l30nzn0kyv";
+ version = "0.9.3";
+ sha256 = "1gr5sxjjkf7faiyc4y1sbiv06c5fiz7w5s8sxz7hh5k54w8nhs4c";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers data-lens-light filepath
@@ -96165,6 +98573,7 @@ self: {
];
description = "Manage nix overrides for haskell packages";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-packages" = callPackage
@@ -96287,6 +98696,7 @@ self: {
testPkgconfigDepends = [ libpostal ];
description = "Haskell binding for the libpostal library";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {libpostal = null;};
"haskell-proxy-list" = callPackage
@@ -96434,17 +98844,15 @@ self: {
}) {};
"haskell-src-exts" = callPackage
- ({ mkDerivation, array, base, containers, cpphs, directory
- , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
- , tasty, tasty-golden, tasty-smallcheck
+ ({ mkDerivation, array, base, containers, directory, filepath
+ , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty
+ , tasty-golden, tasty-smallcheck
}:
mkDerivation {
pname = "haskell-src-exts";
- version = "1.20.2";
- sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz";
- revision = "1";
- editedCabalFile = "0gxpxs3p4qvky6m8g3fjj09hx7nkg28b9a4999ca7afz359si3r9";
- libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
+ version = "1.20.3";
+ sha256 = "1a74s4zarxdvhnflkxy13pawbfcdhyrb6gkdx0si8spv66knhgj3";
+ libraryHaskellDepends = [ array base ghc-prim pretty ];
libraryToolDepends = [ happy ];
testHaskellDepends = [
base containers directory filepath mtl pretty-show smallcheck tasty
@@ -96549,6 +98957,8 @@ self: {
pname = "haskell-src-meta";
version = "0.8.0.3";
sha256 = "08jq156zv4m0fjq6712n99c1jwxnpa6kj6sq8ch0r1l0a1ay6ww4";
+ revision = "2";
+ editedCabalFile = "0dp5v0yd0wgijzaggr22glgjswpa65hy84h8awdzd9d78g2fjz6c";
libraryHaskellDepends = [
base haskell-src-exts pretty syb template-haskell th-orphans
];
@@ -97748,34 +100158,32 @@ self: {
];
description = "An adapter for haskoin to network-bitcoin";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskoin-core" = callPackage
- ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable
- , bytestring, cereal, conduit, containers, cryptohash, deepseq
- , either, entropy, HUnit, largeword, mtl, murmur3, network, pbkdf
- , QuickCheck, safe, scientific, secp256k1, split
- , string-conversions, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, time, unordered-containers
- , vector
+ ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
+ , cereal, conduit, containers, cryptonite, entropy, hashable, hspec
+ , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck
+ , safe, scientific, secp256k1-haskell, split, string-conversions
+ , text, time, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "haskoin-core";
- version = "0.4.2";
- sha256 = "0nyla9kqgyjahnpf3idi7kzyx8h7q92vk3jql1gl9iq8q9acwnzk";
+ version = "0.8.1";
+ sha256 = "0wlsxxrb4a7dn19412gxkwlayrjzpawkpxxy7mww279i159zl7k8";
libraryHaskellDepends = [
- aeson base base16-bytestring byteable bytestring cereal conduit
- containers cryptohash deepseq either entropy largeword mtl murmur3
- network pbkdf QuickCheck secp256k1 split string-conversions text
- time vector
+ aeson array base base16-bytestring bytestring cereal conduit
+ containers cryptonite entropy hashable memory mtl murmur3 network
+ QuickCheck scientific secp256k1-haskell split string-conversions
+ text time transformers unordered-containers vector
];
testHaskellDepends = [
- aeson base binary bytestring cereal containers HUnit largeword mtl
- QuickCheck safe scientific secp256k1 split string-conversions
- test-framework test-framework-hunit test-framework-quickcheck2 text
- unordered-containers vector
+ aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
+ safe split string-conversions text vector
];
- description = "Implementation of the core Bitcoin protocol features";
+ testToolDepends = [ hspec-discover ];
+ description = "Bitcoin & Bitcoin Cash library for Haskell";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -97804,34 +100212,28 @@ self: {
}) {};
"haskoin-node" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, cereal
- , concurrent-extra, conduit, conduit-extra, containers
- , data-default, deepseq, either, esqueleto, exceptions
- , haskoin-core, HUnit, largeword, lifted-async, lifted-base
- , monad-control, monad-logger, mtl, network, persistent
- , persistent-sqlite, persistent-template, QuickCheck, random
- , resource-pool, resourcet, stm, stm-chans, stm-conduit
- , string-conversions, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, time
+ ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
+ , data-default, hashable, haskoin-core, hspec, hspec-discover
+ , HUnit, monad-logger, mtl, network, nqe, random, resourcet
+ , rocksdb-haskell, rocksdb-query, safe, string-conversions, text
+ , time, transformers, unliftio, unordered-containers
}:
mkDerivation {
pname = "haskoin-node";
- version = "0.4.2";
- sha256 = "0khgdr5qql716d1klajs4y0mkyz0d9h3drahhv8062k64n7a989s";
+ version = "0.9.3";
+ sha256 = "149k9b11c0dj3qqdbinwqnjxy8bxmc4bk65lfxpic2zy26n46k7q";
libraryHaskellDepends = [
- aeson async base bytestring cereal concurrent-extra conduit
- conduit-extra containers data-default deepseq either esqueleto
- exceptions haskoin-core largeword lifted-async lifted-base
- monad-control monad-logger mtl network persistent
- persistent-template random resource-pool stm stm-chans stm-conduit
- string-conversions text time
+ base bytestring cereal conduit conduit-extra data-default hashable
+ haskoin-core monad-logger mtl network nqe random resourcet
+ rocksdb-haskell rocksdb-query string-conversions text time
+ transformers unliftio unordered-containers
];
testHaskellDepends = [
- base haskoin-core HUnit monad-logger mtl persistent
- persistent-sqlite QuickCheck resourcet test-framework
- test-framework-hunit test-framework-quickcheck2
+ base bytestring cereal haskoin-core hspec HUnit monad-logger mtl
+ network nqe random rocksdb-haskell safe unliftio
];
- description = "Implementation of a Bitoin node";
+ testToolDepends = [ hspec-discover ];
+ description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -97880,6 +100282,41 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskoin-store" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, cereal, conduit
+ , containers, data-default, directory, filepath, hashable
+ , haskoin-core, haskoin-node, hspec, http-types, monad-logger, mtl
+ , network, nqe, optparse-applicative, random, rocksdb-haskell
+ , rocksdb-query, scotty, string-conversions, text, time
+ , transformers, unliftio, unordered-containers
+ }:
+ mkDerivation {
+ pname = "haskoin-store";
+ version = "0.4.2";
+ sha256 = "0fjp566icp76dqhivl9jn3s3k2fvxmjysj4rpmrvwfyzb7snlqvp";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring cereal conduit containers data-default
+ hashable haskoin-core haskoin-node monad-logger mtl network nqe
+ random rocksdb-haskell rocksdb-query string-conversions text time
+ transformers unliftio unordered-containers
+ ];
+ executableHaskellDepends = [
+ aeson base binary bytestring cereal conduit data-default directory
+ filepath haskoin-core haskoin-node http-types monad-logger nqe
+ optparse-applicative rocksdb-haskell scotty string-conversions text
+ transformers unliftio unordered-containers
+ ];
+ testHaskellDepends = [
+ base data-default haskoin-core haskoin-node hspec monad-logger mtl
+ nqe rocksdb-haskell transformers unliftio unordered-containers
+ ];
+ description = "Storage and index for Bitcoin and Bitcoin Cash";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskoin-util" = callPackage
({ mkDerivation, base, binary, bytestring, containers, either
, HUnit, mtl, QuickCheck, test-framework, test-framework-hunit
@@ -98093,20 +100530,23 @@ self: {
}) {};
"hasktags" = callPackage
- ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json
- , microlens-platform, utf8-string
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , HUnit, json, microlens-platform, optparse-applicative
+ , utf8-string
}:
mkDerivation {
pname = "hasktags";
- version = "0.70.1";
- sha256 = "01ngdfaiwlzwai34wmhi7wysk6raxb465v0imyn7j3ibk374af5v";
+ version = "0.71.2";
+ sha256 = "1s2k9qrgy1jily96img2pmn7g35mwnnfiw6si3aw32jfhg5zsh1c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring directory filepath json microlens-platform
utf8-string
];
- executableHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [
+ base containers directory filepath optparse-applicative
+ ];
testHaskellDepends = [
base bytestring directory filepath HUnit json microlens-platform
utf8-string
@@ -98116,6 +100556,33 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hasktorch-codegen" = callPackage
+ ({ mkDerivation, base, containers, directory, hashable, hspec
+ , hspec-discover, megaparsec, optparse-applicative, pretty-show
+ , QuickCheck, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "hasktorch-codegen";
+ version = "0.0.1.0";
+ sha256 = "0s48myr8k96kb0mwvfcc9h5razp8y5k8dk987hfg101h2nfz5k10";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory hashable megaparsec pretty-show text
+ unordered-containers
+ ];
+ executableHaskellDepends = [
+ base optparse-applicative pretty-show
+ ];
+ testHaskellDepends = [
+ base containers hspec hspec-discover megaparsec pretty-show
+ QuickCheck text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Code generation tools for Hasktorch";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"haskus-binary" = callPackage
({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils
, mtl, QuickCheck, tasty, tasty-quickcheck
@@ -98164,8 +100631,8 @@ self: {
}:
mkDerivation {
pname = "haskus-utils";
- version = "1.0";
- sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd";
+ version = "1.1";
+ sha256 = "1grbj23545b7wxxyc4rra681k9c8xg36swlql3rgcr15m61fm647";
libraryHaskellDepends = [
base containers extra file-embed haskus-utils-data
haskus-utils-types haskus-utils-variant list-t mtl
@@ -98184,8 +100651,8 @@ self: {
}:
mkDerivation {
pname = "haskus-utils-data";
- version = "1.0";
- sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4";
+ version = "1.1";
+ sha256 = "1001apph6i956rkb6dpfhg8cgk870s44jgaaiv8ccxivkv45y7di";
libraryHaskellDepends = [
base containers extra haskus-utils-types mtl recursion-schemes
transformers
@@ -98198,23 +100665,26 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "haskus-utils-types";
- version = "1.0";
- sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf";
+ version = "1.1";
+ sha256 = "1fihf61z5078l73a08fvm5qb67dr3yc32nhgakkldd0fbh7clyrz";
libraryHaskellDepends = [ base ];
description = "Haskus utility modules";
license = stdenv.lib.licenses.bsd3;
}) {};
"haskus-utils-variant" = callPackage
- ({ mkDerivation, base, haskus-utils-data, haskus-utils-types }:
+ ({ mkDerivation, base, haskus-utils-data, haskus-utils-types, tasty
+ , tasty-quickcheck, template-haskell
+ }:
mkDerivation {
pname = "haskus-utils-variant";
- version = "1.0";
- sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn";
+ version = "2.0.1";
+ sha256 = "1rg4m1iq2fnnjxd6vbxsqnv21h8rnqisvxxfhns7hc167aydfwwp";
libraryHaskellDepends = [
- base haskus-utils-data haskus-utils-types
+ base haskus-utils-data haskus-utils-types template-haskell
];
- description = "Haskus utility modules";
+ testHaskellDepends = [ base tasty tasty-quickcheck ];
+ description = "Variant and EADT";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -98292,8 +100762,8 @@ self: {
}:
mkDerivation {
pname = "hasmin";
- version = "1.0.2";
- sha256 = "13cblc4jcn88w00rsb72dqhiy18mfph388407vm3k6kbg5zxg1d9";
+ version = "1.0.2.1";
+ sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -98349,6 +100819,8 @@ self: {
pname = "hasql";
version = "1.3.0.3";
sha256 = "01vl4p67yhcm8cmbmajgyd7ggj3p5f6350f8sky8kv3dn31wg6ji";
+ revision = "2";
+ editedCabalFile = "14063k0dald0i2cqk70kdja1df587vn8vrzgw3rb62nxwycr0r9b";
libraryHaskellDepends = [
attoparsec base base-prelude bytestring bytestring-strict-builder
contravariant contravariant-extras data-default-class dlist
@@ -99055,8 +101527,8 @@ self: {
}:
mkDerivation {
pname = "haxl";
- version = "2.0.1.0";
- sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd";
+ version = "2.0.1.1";
+ sha256 = "1wfnwi3impv4cv359a65yh50c6kdfxhvbwycf5h76w3cvqdhvwsr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -99964,6 +102436,8 @@ self: {
pname = "hdirect";
version = "0.21.0";
sha256 = "1v7yx9k0kib6527k49hf3s4jvdda7a0wgv09qhyjk6lyriyi3ny2";
+ revision = "1";
+ editedCabalFile = "19h5zsxl8knbvkbyv7z0an5hdibi2xslbva5cmck9h5wgc9m874n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base haskell98 pretty ];
@@ -100049,10 +102523,8 @@ self: {
}:
mkDerivation {
pname = "hdocs";
- version = "0.5.3.0";
- sha256 = "0gkv4xy7jr2ic22gn5fpj3vd6avgd1xqblv96gg1m0fhfsj92y5h";
- revision = "1";
- editedCabalFile = "0dy2jamwd0jxai8hcfq506xqczi0hn9c8p7z4dbmq62d29fm79yb";
+ version = "0.5.3.1";
+ sha256 = "0nxvkmhxpxx3500sy7kzpqyp45rq83hjm6gkj10vglxgjk32vzp4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -100205,6 +102677,60 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "heatitup" = callPackage
+ ({ mkDerivation, base, bytestring, bytestring-show, cassava, colour
+ , containers, diagrams-core, diagrams-html5, diagrams-lib
+ , diagrams-pgf, diagrams-rasterific, diagrams-svg, edit-distance
+ , fasta, lens, optparse-applicative, pipes, pipes-bytestring
+ , pipes-csv, safe, string-similarity, stringsearch, suffixtree
+ , vector
+ }:
+ mkDerivation {
+ pname = "heatitup";
+ version = "0.5.3.3";
+ sha256 = "1bqindh91i4ra67516nl0c5i98fgm9bwsjy7vv0qjzmfqk3bqp84";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring bytestring-show cassava colour containers
+ diagrams-lib edit-distance fasta lens pipes pipes-bytestring
+ pipes-csv safe string-similarity stringsearch suffixtree vector
+ ];
+ executableHaskellDepends = [
+ base bytestring colour containers diagrams-core diagrams-html5
+ diagrams-lib diagrams-pgf diagrams-rasterific diagrams-svg fasta
+ lens optparse-applicative pipes pipes-bytestring pipes-csv safe
+ vector
+ ];
+ description = "Find and annotate ITDs";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "heatitup-complete" = callPackage
+ ({ mkDerivation, base, bytestring, cassava, containers, fasta
+ , foldl, lens, optparse-applicative, pipes, pipes-text, safe, text
+ , text-show, turtle, vector
+ }:
+ mkDerivation {
+ pname = "heatitup-complete";
+ version = "0.5.3.3";
+ sha256 = "1djs5hni6s4mzs4fniamfz6k7590l34mgvd1d2kglmdpb5m22pcz";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring cassava containers fasta foldl lens safe text
+ text-show turtle vector
+ ];
+ executableHaskellDepends = [
+ base bytestring cassava containers fasta foldl optparse-applicative
+ pipes pipes-text safe text turtle vector
+ ];
+ description = "Find and annotate ITDs with assembly or read pair joining";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"heatshrink" = callPackage
({ mkDerivation, base, bytestring, c2hs, cereal, pcre-heavy, tasty
, tasty-golden, tasty-hunit, text
@@ -100342,8 +102868,10 @@ self: {
}:
mkDerivation {
pname = "hedgehog";
- version = "0.6";
- sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq";
+ version = "0.6.1";
+ sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj";
+ revision = "1";
+ editedCabalFile = "1fj3m5p5nm3dip93a1z7yrrq3fmqk30qgljdspia13y3lyqlcrf1";
libraryHaskellDepends = [
ansi-terminal async base bytestring concurrent-output containers
directory exceptions lifted-async mmorph monad-control mtl
@@ -100443,8 +102971,8 @@ self: {
pname = "hedgehog-quickcheck";
version = "0.1";
sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1";
- revision = "2";
- editedCabalFile = "0fxd4ain7sfxw7q0h3hj2rlp9385zcf9n7lh98i0gqpjqs55dwnd";
+ revision = "3";
+ editedCabalFile = "08pglka9hc7q3fql7fsmqn17wm1xmixkpqfslv86l79hn4y3rfq3";
libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
description = "Use QuickCheck generators in Hedgehog and vice versa";
license = stdenv.lib.licenses.bsd3;
@@ -100452,31 +102980,6 @@ self: {
}) {};
"hedis" = callPackage
- ({ mkDerivation, async, base, bytestring, bytestring-lexing
- , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
- , resource-pool, scanner, slave-thread, stm, test-framework
- , test-framework-hunit, text, time, tls, unordered-containers
- , vector
- }:
- mkDerivation {
- pname = "hedis";
- version = "0.10.3";
- sha256 = "0wapsg0amlmzayphchng67ih3ivp0mk3vgi8x1mzrkd1xrlgav3v";
- libraryHaskellDepends = [
- async base bytestring bytestring-lexing deepseq errors HTTP mtl
- network network-uri resource-pool scanner stm text time tls
- unordered-containers vector
- ];
- testHaskellDepends = [
- async base bytestring doctest HUnit mtl slave-thread stm
- test-framework test-framework-hunit text time
- ];
- benchmarkHaskellDepends = [ base mtl time ];
- description = "Client library for the Redis datastore: supports full command set, pipelining";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hedis_0_10_4" = callPackage
({ mkDerivation, async, base, bytestring, bytestring-lexing
, deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
, resource-pool, scanner, slave-thread, stm, test-framework
@@ -100499,7 +103002,6 @@ self: {
benchmarkHaskellDepends = [ base mtl time ];
description = "Client library for the Redis datastore: supports full command set, pipelining";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hedis-config" = callPackage
@@ -100646,17 +103148,18 @@ self: {
"heist" = callPackage
({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder
- , blaze-html, bytestring, containers, criterion, directory
- , directory-tree, dlist, filepath, hashable, HUnit, lens
- , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck
- , random, statistics, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, time, transformers
- , transformers-base, unordered-containers, vector, xmlhtml
+ , blaze-html, bytestring, containers, criterion
+ , criterion-measurement, directory, directory-tree, dlist, filepath
+ , hashable, HUnit, lens, lifted-base, map-syntax, monad-control
+ , mtl, process, QuickCheck, random, statistics, test-framework
+ , test-framework-hunit, test-framework-quickcheck2, text, time
+ , transformers, transformers-base, unordered-containers, vector
+ , xmlhtml
}:
mkDerivation {
pname = "heist";
- version = "1.1";
- sha256 = "15hdq3i041ph0ry6f9dn6vx2w9hzgkvi9db4p6cy6czwbp53kjbq";
+ version = "1.1.0.1";
+ sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder blaze-html bytestring
containers directory directory-tree dlist filepath hashable
@@ -100673,10 +103176,11 @@ self: {
];
benchmarkHaskellDepends = [
aeson attoparsec base blaze-builder blaze-html bytestring
- containers criterion directory directory-tree dlist filepath
- hashable HUnit lifted-base map-syntax monad-control mtl process
- random statistics test-framework test-framework-hunit text time
- transformers transformers-base unordered-containers vector xmlhtml
+ containers criterion criterion-measurement directory directory-tree
+ dlist filepath hashable HUnit lifted-base map-syntax monad-control
+ mtl process random statistics test-framework test-framework-hunit
+ text time transformers transformers-base unordered-containers
+ vector xmlhtml
];
description = "An Haskell template system supporting both HTML5 and XML";
license = stdenv.lib.licenses.bsd3;
@@ -101504,6 +104008,54 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hevm" = callPackage
+ ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
+ , base16-bytestring, base64-bytestring, binary, brick, bytestring
+ , cereal, containers, cryptonite, data-dword, deepseq, directory
+ , fgl, filepath, ghci-pretty, haskeline, here, HUnit, lens
+ , lens-aeson, megaparsec, memory, monad-par, mtl, multiset
+ , operational, optparse-generic, process, QuickCheck
+ , quickcheck-text, readline, regex-tdfa, restless-git, rosezipper
+ , s-cargot, scientific, secp256k1, tasty, tasty-hunit
+ , tasty-quickcheck, temporary, text, text-format, time
+ , transformers, tree-view, unordered-containers, vector, vty, wreq
+ }:
+ mkDerivation {
+ pname = "hevm";
+ version = "0.21";
+ sha256 = "0h3d1b2xdd59d3rl1a9ng1hz2hr3g6n1dpak0a4namjlcfxvwwhd";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ abstract-par aeson ansi-wl-pprint base base16-bytestring
+ base64-bytestring binary brick bytestring cereal containers
+ cryptonite data-dword deepseq directory fgl filepath ghci-pretty
+ haskeline lens lens-aeson megaparsec memory monad-par mtl multiset
+ operational optparse-generic process QuickCheck quickcheck-text
+ readline restless-git rosezipper s-cargot scientific temporary text
+ text-format time transformers tree-view unordered-containers vector
+ vty wreq
+ ];
+ librarySystemDepends = [ secp256k1 ];
+ executableHaskellDepends = [
+ aeson ansi-wl-pprint async base base16-bytestring base64-bytestring
+ binary brick bytestring containers cryptonite data-dword deepseq
+ directory filepath ghci-pretty lens lens-aeson memory mtl
+ optparse-generic process QuickCheck quickcheck-text readline
+ regex-tdfa temporary text text-format unordered-containers vector
+ vty
+ ];
+ testHaskellDepends = [
+ base base16-bytestring binary bytestring ghci-pretty here HUnit
+ lens mtl QuickCheck tasty tasty-hunit tasty-quickcheck text vector
+ ];
+ testSystemDepends = [ secp256k1 ];
+ description = "Ethereum virtual machine evaluator";
+ license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) secp256k1;};
+
"hevolisa" = callPackage
({ mkDerivation, base, bytestring, cairo, filepath, haskell98 }:
mkDerivation {
@@ -101623,8 +104175,8 @@ self: {
({ mkDerivation, base, bytestring, extra }:
mkDerivation {
pname = "hexml";
- version = "0.3.3";
- sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4";
+ version = "0.3.4";
+ sha256 = "0amy5gjk1sqj5dq8a8gp7d3z9wfhcflhxkssijnklnfn5s002x4k";
libraryHaskellDepends = [ base bytestring extra ];
testHaskellDepends = [ base bytestring ];
description = "XML subset DOM parser";
@@ -101862,6 +104414,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "heyting-algebras" = callPackage
+ ({ mkDerivation, base, containers, free-algebras, hashable
+ , lattices, QuickCheck, tagged, tasty, tasty-quickcheck
+ , universe-base, unordered-containers
+ }:
+ mkDerivation {
+ pname = "heyting-algebras";
+ version = "0.0.1.2";
+ sha256 = "132r0k0m8b7f8rkyay57k42kjl7nyzqv7942njkz6nwnhjg8i6ag";
+ libraryHaskellDepends = [
+ base containers free-algebras hashable lattices QuickCheck tagged
+ universe-base unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers lattices QuickCheck tasty tasty-quickcheck
+ universe-base
+ ];
+ description = "Heyting and Boolean algebras";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"hfann" = callPackage
({ mkDerivation, base, doublefann, fann }:
mkDerivation {
@@ -101980,10 +104553,8 @@ self: {
}:
mkDerivation {
pname = "hformat";
- version = "0.3.3.0";
- sha256 = "0g9kjfssaksjj3cp0qiwk7v85yy3sb2ryhjnlrdznhm3mnkvp35j";
- revision = "1";
- editedCabalFile = "00924yrjyzy3v5l13f03v1qw45ra2600f98r9bgswjqrrn87m79i";
+ version = "0.3.3.1";
+ sha256 = "0wx7qlhdzd8rl2d351hvxzwlyz9yxza625fklp2p66x7khfxlbih";
libraryHaskellDepends = [
ansi-terminal base base-unicode-symbols text
];
@@ -102243,18 +104814,18 @@ self: {
({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart
, Chart-cairo, Chart-diagrams, colour, composition-prelude
, data-binary-ieee754, data-default, directory, filepath, hspec
- , lens, monad-loops
+ , lens, monad-loops, spherical
}:
mkDerivation {
pname = "hgis";
- version = "1.0.0.2";
- sha256 = "1z730c48pvi6ylb0pjzx2x9jnd03aadpmsx3psrlf2vp0bvm6ims";
+ version = "1.0.0.3";
+ sha256 = "00s87mna6lxr1q3275jg7ya17qhksr9bmfg2nw9mgadb05j6h2v8";
libraryHaskellDepends = [
ansi-wl-pprint base binary bytestring Chart Chart-cairo
Chart-diagrams colour composition-prelude data-binary-ieee754
- data-default directory filepath lens monad-loops
+ data-default directory filepath lens monad-loops spherical
];
- testHaskellDepends = [ base hspec ];
+ testHaskellDepends = [ base hspec spherical ];
doHaddock = false;
description = "Library and for GIS with Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -102305,8 +104876,8 @@ self: {
pname = "hgmp";
version = "0.1.1";
sha256 = "1hisbcpz47x2lbqf8vzwis7qw7xhvx22lv7dcyhm9vsmsh5741dr";
- revision = "2";
- editedCabalFile = "0v318nifmgqq5jg1d5q0jspfgyqp7cfnkz3ikqaz9xjg8inzl8mr";
+ revision = "3";
+ editedCabalFile = "0z2xbqzyrgm9apy3xl353wgwhbnc3hdb1giw2j6fyvv705fmpb62";
libraryHaskellDepends = [ base ghc-prim integer-gmp ];
testHaskellDepends = [ base QuickCheck ];
description = "Haskell interface to GMP";
@@ -102700,8 +105271,8 @@ self: {
}:
mkDerivation {
pname = "higher-leveldb";
- version = "0.5.0.1";
- sha256 = "0p7rsawd4d5cbsxlj8ddgx5blg2yw853zjfqcy78gdqn6kk8vz24";
+ version = "0.5.0.2";
+ sha256 = "1wmgz2aqz0vg0fnnigpg27gnzs9i6slyn6lb41myv6m20j0j5z1a";
libraryHaskellDepends = [
base bytestring cereal data-default exceptions leveldb-haskell mtl
resourcet transformers transformers-base unliftio-core
@@ -102899,8 +105470,8 @@ self: {
pname = "hills";
version = "0.1.2.6";
sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh";
- revision = "1";
- editedCabalFile = "1qdn733rdn4c15avgncgns10j2hw0bvnzdkd5f9yzm3s8vq8sqv9";
+ revision = "2";
+ editedCabalFile = "11f4mmhxivxkdcn4wdcz1hszfyi3hdggls22x2q0m3jxq3lw0izg";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -103241,6 +105812,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hint_0_9_0" = callPackage
+ ({ mkDerivation, base, directory, exceptions, extensible-exceptions
+ , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary
+ , unix
+ }:
+ mkDerivation {
+ pname = "hint";
+ version = "0.9.0";
+ sha256 = "1g7q4clzc2pdnbvmm265dindjpynabsykd088qjjzlk6590sy9bl";
+ libraryHaskellDepends = [
+ base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+ random temporary unix
+ ];
+ testHaskellDepends = [
+ base directory exceptions extensible-exceptions filepath HUnit unix
+ ];
+ description = "Runtime Haskell interpreter (GHC API wrapper)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hint-server" = callPackage
({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl
}:
@@ -103597,8 +106189,8 @@ self: {
}:
mkDerivation {
pname = "histogram-fill";
- version = "0.9.0.0";
- sha256 = "00j4ncqy0s5wil158wx1f8x0n2mj4ki2hgs4hmkrx0vbkc2pil56";
+ version = "0.9.1.0";
+ sha256 = "0qcil8lgkzklgbzb9a81kdzsyzrsgzwdgz424mlvp8sbrfmbnz3m";
libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
benchmarkHaskellDepends = [ base criterion mwc-random vector ];
description = "Library for histograms creation";
@@ -103784,12 +106376,12 @@ self: {
}:
mkDerivation {
pname = "hjsonpointer";
- version = "1.4.0";
- sha256 = "0hkcaqiich4ap323ir2dmr3v498rlavy34g69m386d4ml1gxm411";
- revision = "1";
- editedCabalFile = "0l84zr0p1ywwn81fdb2z365vrs9xaaz7c7bcmx8pjvb5wfx1g9g4";
+ version = "1.5.0";
+ sha256 = "1bdr5jpc2vcx6bk724jmfz7nh3jgqwrmj4hab64h9pjdrl4vz00y";
+ revision = "2";
+ editedCabalFile = "1s43vdkl71msm8kppksn910prs40nwq4cz5klajr8apak77z4dzi";
libraryHaskellDepends = [
- aeson base hashable QuickCheck text unordered-containers vector
+ aeson base hashable text unordered-containers vector
];
testHaskellDepends = [
aeson base hspec http-types QuickCheck text unordered-containers
@@ -103830,17 +106422,20 @@ self: {
}) {};
"hjugement" = callPackage
- ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit
- , tasty-quickcheck, text, transformers
+ ({ mkDerivation, base, containers, hashable, QuickCheck, random
+ , tasty, tasty-hunit, tasty-quickcheck, text, transformers
+ , unordered-containers
}:
mkDerivation {
pname = "hjugement";
- version = "1.0.0.20170808";
- sha256 = "1za90csf836zc4iv2gn5m4049zknzp5ydham0axga13987bs2j1w";
- libraryHaskellDepends = [ base containers ];
+ version = "2.0.0.20181030";
+ sha256 = "063d484ns520prgvb2b1szq33wx569fgbgrzvfrgpfcznra638fi";
+ libraryHaskellDepends = [
+ base containers hashable unordered-containers
+ ];
testHaskellDepends = [
- base containers QuickCheck tasty tasty-hunit tasty-quickcheck text
- transformers
+ base containers hashable QuickCheck random tasty tasty-hunit
+ tasty-quickcheck text transformers unordered-containers
];
description = "Majority Judgment";
license = stdenv.lib.licenses.gpl3;
@@ -103959,53 +106554,54 @@ self: {
"hledger" = callPackage
({ mkDerivation, ansi-terminal, base, base-compat-batteries
- , bytestring, cmdargs, containers, criterion, csv, data-default
- , Decimal, Diff, directory, file-embed, filepath, hashable
- , haskeline, here, hledger-lib, html, HUnit, lucid, megaparsec, mtl
+ , bytestring, cmdargs, containers, criterion, data-default, Decimal
+ , Diff, directory, easytest, file-embed, filepath, hashable
+ , haskeline, here, hledger-lib, html, lucid, megaparsec, mtl
, mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
- , safe, shakespeare, split, tabular, temporary, terminfo
- , test-framework, test-framework-hunit, text, time, timeit
- , transformers, unordered-containers, utf8-string, utility-ht
- , wizards
+ , safe, shakespeare, split, statistics, tabular, temporary
+ , terminfo, test-framework, test-framework-hunit, text, time
+ , timeit, transformers, unordered-containers, utf8-string
+ , utility-ht, wizards
}:
mkDerivation {
pname = "hledger";
- version = "1.10";
- sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n";
+ version = "1.11.1";
+ sha256 = "0cy60ysmydg0ahx6gjmjm97skvjp5a3vgqxsn2l1dp7hk34ac5p9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers csv data-default Decimal Diff directory file-embed
- filepath hashable haskeline here hledger-lib HUnit lucid megaparsec
- mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe
- shakespeare split tabular temporary terminfo text time transformers
- unordered-containers utf8-string utility-ht wizards
+ containers data-default Decimal Diff directory easytest file-embed
+ filepath hashable haskeline here hledger-lib lucid megaparsec mtl
+ mtl-compat old-time parsec pretty-show process regex-tdfa safe
+ shakespeare split statistics tabular temporary terminfo text time
+ transformers unordered-containers utf8-string utility-ht wizards
];
executableHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers csv data-default Decimal directory file-embed filepath
- haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time
- parsec pretty-show process regex-tdfa safe shakespeare split
- tabular temporary terminfo text time transformers
+ containers data-default Decimal directory easytest file-embed
+ filepath haskeline here hledger-lib megaparsec mtl mtl-compat
+ old-time parsec pretty-show process regex-tdfa safe shakespeare
+ split statistics tabular temporary terminfo text time transformers
unordered-containers utf8-string utility-ht wizards
];
testHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers csv data-default Decimal directory file-embed filepath
- haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time
- parsec pretty-show process regex-tdfa safe shakespeare split
- tabular temporary terminfo test-framework test-framework-hunit text
- time transformers unordered-containers utf8-string utility-ht
- wizards
+ containers data-default Decimal directory easytest file-embed
+ filepath haskeline here hledger-lib megaparsec mtl mtl-compat
+ old-time parsec pretty-show process regex-tdfa safe shakespeare
+ split statistics tabular temporary terminfo test-framework
+ test-framework-hunit text time transformers unordered-containers
+ utf8-string utility-ht wizards
];
benchmarkHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers criterion csv data-default Decimal directory file-embed
- filepath haskeline here hledger-lib html HUnit megaparsec mtl
+ containers criterion data-default Decimal directory easytest
+ file-embed filepath haskeline here hledger-lib html megaparsec mtl
mtl-compat old-time parsec pretty-show process regex-tdfa safe
- shakespeare split tabular temporary terminfo text time timeit
- transformers unordered-containers utf8-string utility-ht wizards
+ shakespeare split statistics tabular temporary terminfo text time
+ timeit transformers unordered-containers utf8-string utility-ht
+ wizards
];
description = "Command-line interface for the hledger accounting tool";
license = stdenv.lib.licenses.gpl3;
@@ -104020,8 +106616,8 @@ self: {
}:
mkDerivation {
pname = "hledger-api";
- version = "1.10";
- sha256 = "1axcpipq6m4r9bh2633j7l88pc4ax8ycb2q0wivhfq2dp1pbylbf";
+ version = "1.11.1";
+ sha256 = "1wsbjsdibdwf4bmhbwcql7yiprhz83zj8g7a1labykmdw8lldlqc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -104077,6 +106673,8 @@ self: {
pname = "hledger-iadd";
version = "1.3.6";
sha256 = "04gy5pvbcgkr3jg1a2dav3kcd7ih46knn0d39l8670bmwhx3y5br";
+ revision = "1";
+ editedCabalFile = "067mrhg3m77ygv6cph5cxxcyd23acg9mq2fhpkl7714blc58z97v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -104096,6 +106694,7 @@ self: {
];
description = "A terminal UI as drop-in replacement for hledger add";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hledger-interest" = callPackage
@@ -104103,8 +106702,8 @@ self: {
}:
mkDerivation {
pname = "hledger-interest";
- version = "1.5.2";
- sha256 = "10ck23d69wxylxbp8cj7ic8slklm9l88xbb4p29nvm5lgjiqidbq";
+ version = "1.5.3";
+ sha256 = "1ff113z2ir07ihdvfa5fca4x326zwm2jd7sjy6hjpr4qgi1mszvs";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -104130,35 +106729,37 @@ self: {
];
description = "computes the internal rate of return of an investment";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hledger-lib" = callPackage
({ mkDerivation, ansi-terminal, array, base, base-compat-batteries
- , blaze-markup, bytestring, cmdargs, containers, csv, data-default
- , Decimal, deepseq, directory, doctest, easytest, extra, filepath
- , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time
- , parsec, parser-combinators, pretty-show, regex-tdfa, safe, split
- , tabular, test-framework, test-framework-hunit, text, time
+ , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec
+ , cmdargs, containers, data-default, Decimal, deepseq, directory
+ , doctest, easytest, extra, filepath, Glob, hashtables, megaparsec
+ , mtl, mtl-compat, old-time, parsec, parser-combinators
+ , pretty-show, regex-tdfa, safe, split, tabular, text, time
, transformers, uglymemo, utf8-string
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.10";
- sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1";
+ version = "1.11.1";
+ sha256 = "0diz7ygl8zl4bjxq2c627fjvvjcdpkiqp42f5wjmz9pd1nd2da4f";
libraryHaskellDepends = [
ansi-terminal array base base-compat-batteries blaze-markup
- bytestring cmdargs containers csv data-default Decimal deepseq
- directory extra filepath hashtables HUnit megaparsec mtl mtl-compat
- old-time parsec parser-combinators pretty-show regex-tdfa safe
- split tabular text time transformers uglymemo utf8-string
+ bytestring call-stack cassava cassava-megaparsec cmdargs containers
+ data-default Decimal deepseq directory easytest extra filepath Glob
+ hashtables megaparsec mtl mtl-compat old-time parsec
+ parser-combinators pretty-show regex-tdfa safe split tabular text
+ time transformers uglymemo utf8-string
];
testHaskellDepends = [
ansi-terminal array base base-compat-batteries blaze-markup
- bytestring cmdargs containers csv data-default Decimal deepseq
- directory doctest easytest extra filepath Glob hashtables HUnit
- megaparsec mtl mtl-compat old-time parsec parser-combinators
- pretty-show regex-tdfa safe split tabular test-framework
- test-framework-hunit text time transformers uglymemo utf8-string
+ bytestring call-stack cassava cassava-megaparsec cmdargs containers
+ data-default Decimal deepseq directory doctest easytest extra
+ filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec
+ parser-combinators pretty-show regex-tdfa safe split tabular text
+ time transformers uglymemo utf8-string
];
description = "Core data types, parsers and functionality for the hledger accounting tools";
license = stdenv.lib.licenses.gpl3;
@@ -104167,22 +106768,21 @@ self: {
"hledger-ui" = callPackage
({ mkDerivation, ansi-terminal, async, base, base-compat-batteries
, brick, cmdargs, containers, data-default, directory, filepath
- , fsnotify, hledger, hledger-lib, HUnit, megaparsec, microlens
+ , fsnotify, hledger, hledger-lib, megaparsec, microlens
, microlens-platform, pretty-show, process, safe, split, text
, text-zipper, time, transformers, vector, vty
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.10.1";
- sha256 = "1h4hhsyajpiydvs1p6f4z1s3kblyfn4lvnwwbar6lj4z5jfizm67";
+ version = "1.11.1";
+ sha256 = "03k62vsjyk2d7nq3lzas4qac2ck09xhk2x752xncls5rfzj8hjcj";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
ansi-terminal async base base-compat-batteries brick cmdargs
containers data-default directory filepath fsnotify hledger
- hledger-lib HUnit megaparsec microlens microlens-platform
- pretty-show process safe split text text-zipper time transformers
- vector vty
+ hledger-lib megaparsec microlens microlens-platform pretty-show
+ process safe split text text-zipper time transformers vector vty
];
description = "Curses-style user interface for the hledger accounting tool";
license = stdenv.lib.licenses.gpl3;
@@ -104211,23 +106811,23 @@ self: {
({ mkDerivation, base, blaze-html, blaze-markup, bytestring
, case-insensitive, clientsession, cmdargs, conduit, conduit-extra
, data-default, directory, filepath, hjsmin, hledger, hledger-lib
- , http-client, http-conduit, HUnit, json, megaparsec, mtl
- , semigroups, shakespeare, template-haskell, text, time
- , transformers, wai, wai-extra, wai-handler-launch, warp, yaml
- , yesod, yesod-core, yesod-form, yesod-static
+ , http-client, http-conduit, json, megaparsec, mtl, semigroups
+ , shakespeare, template-haskell, text, time, transformers, wai
+ , wai-extra, wai-handler-launch, warp, yaml, yesod, yesod-core
+ , yesod-form, yesod-static
}:
mkDerivation {
pname = "hledger-web";
- version = "1.10";
- sha256 = "1hfl9kr3h9lcmy512s3yiv3rp31md7kw5n1145khj2j3l8qd3py9";
+ version = "1.11.1";
+ sha256 = "1bvhiikz8hlgjvc7s2hk363gjva9izga167bpx074m560q7y77fs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base blaze-html blaze-markup bytestring case-insensitive
clientsession cmdargs conduit conduit-extra data-default directory
- filepath hjsmin hledger hledger-lib http-client http-conduit HUnit
- json megaparsec mtl semigroups shakespeare template-haskell text
- time transformers wai wai-extra wai-handler-launch warp yaml yesod
+ filepath hjsmin hledger hledger-lib http-client http-conduit json
+ megaparsec mtl semigroups shakespeare template-haskell text time
+ transformers wai wai-extra wai-handler-launch warp yaml yesod
yesod-core yesod-form yesod-static
];
executableHaskellDepends = [ base ];
@@ -104505,6 +107105,8 @@ self: {
pname = "hmatrix";
version = "0.19.0.0";
sha256 = "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj";
+ revision = "1";
+ editedCabalFile = "0krx0ds5mcj28y6zpg0r50lljn8681wi4c5lqcdz2c71nhixfq8h";
configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
libraryHaskellDepends = [
array base binary bytestring deepseq random semigroups split
@@ -104681,8 +107283,8 @@ self: {
({ mkDerivation, base, doctest, hmatrix, nlopt-haskell, vector }:
mkDerivation {
pname = "hmatrix-nlopt";
- version = "0.1.2.0";
- sha256 = "1w04gi7shpck8z80a3lx77054i39ig7n3rig66hbpq1wp11snivs";
+ version = "0.1.3.0";
+ sha256 = "17c6s4q5sldr3mqqbyg4yknqxfgd45a0aw6sac33xcv9dvgyjyfc";
libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ];
testHaskellDepends = [ base doctest ];
description = "Interface HMatrix with the NLOPT minimizer";
@@ -104786,8 +107388,8 @@ self: {
}:
mkDerivation {
pname = "hmatrix-svdlibc";
- version = "0.5.0";
- sha256 = "1spzpns2r7i82rqkq7s1ikz74m6d0z7fi3nbii7hjz6amskyzpz8";
+ version = "0.5.0.1";
+ sha256 = "0n89899f4n84d284aq2lx88zz1327a030dlzh17bh0ns2yjbm63g";
libraryHaskellDepends = [ base hmatrix vector ];
testHaskellDepends = [ base hmatrix hspec QuickCheck vector ];
benchmarkHaskellDepends = [ base criterion hmatrix vector ];
@@ -104826,6 +107428,7 @@ self: {
benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
description = "Tests for hmatrix";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hmatrix-vector-sized" = callPackage
@@ -104842,6 +107445,7 @@ self: {
];
description = "Conversions between hmatrix and vector-sized types";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hmeap" = callPackage
@@ -105289,8 +107893,8 @@ self: {
}:
mkDerivation {
pname = "hoauth2";
- version = "1.7.2";
- sha256 = "0klkgr11p8m03ksrad59pqs0czp6hrgmzxynng4zirbmz643plvf";
+ version = "1.8.0";
+ sha256 = "02pirdgq1l638n126qj6sccfkjc6scxl53m584fxq79gfdwarx2q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -105595,6 +108199,8 @@ self: {
pname = "hoist-error";
version = "0.2.1.0";
sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss";
+ revision = "1";
+ editedCabalFile = "0abzpyxr46kk9vh5yxy8wawmyn1x1zrhl9mdxwfz0s938z4s7nr5";
libraryHaskellDepends = [ base either mtl ];
description = "Some convenience facilities for hoisting errors into a monad";
license = stdenv.lib.licenses.mit;
@@ -106162,8 +108768,8 @@ self: {
pname = "hookup";
version = "0.2.2";
sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf";
- revision = "1";
- editedCabalFile = "1ag338856kxlywgcizqij566iaqicv4jb3kmd017k7qflq8vmwb3";
+ revision = "2";
+ editedCabalFile = "12x7h7yg0x9gqv9yj2snp3k221yzyphm1l7aixkz1szxp1pndfgy";
libraryHaskellDepends = [
attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
];
@@ -106392,8 +108998,8 @@ self: {
}:
mkDerivation {
pname = "hoppy-generator";
- version = "0.5.1";
- sha256 = "1hnaxv3vg46a9iqszi3dfjj5kd3gqiagrxz28hi2wvvcpc8zpadn";
+ version = "0.5.2";
+ sha256 = "0ifk7ja1nynbgcf7q8v2dl4sn5ivif9rbd2d7pjp9lx43di9axfc";
libraryHaskellDepends = [
base containers directory filepath haskell-src mtl
];
@@ -106665,25 +109271,6 @@ self: {
}) {};
"hourglass" = callPackage
- ({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
- , tasty, tasty-hunit, tasty-quickcheck, time
- }:
- mkDerivation {
- pname = "hourglass";
- version = "0.2.11";
- sha256 = "0lag9sgj7ndrbfmab6jhszlv413agg0zzaj5r9f2fmf07wqbp9hq";
- libraryHaskellDepends = [ base deepseq ];
- testHaskellDepends = [
- base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
- ];
- benchmarkHaskellDepends = [
- base bytestring deepseq gauge mtl old-locale time
- ];
- description = "simple performant time related library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hourglass_0_2_12" = callPackage
({ mkDerivation, base, bytestring, deepseq, gauge, mtl, old-locale
, tasty, tasty-hunit, tasty-quickcheck, time
}:
@@ -106700,7 +109287,6 @@ self: {
];
description = "simple performant time related library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hourglass-fuzzy-parsing" = callPackage
@@ -106909,18 +109495,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hpack_0_29_7" = callPackage
+ "hpack_0_31_0" = callPackage
({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
, containers, cryptonite, deepseq, directory, filepath, Glob, hspec
- , http-client, http-client-tls, http-types, HUnit, infer-license
- , interpolate, mockery, pretty, QuickCheck, scientific
- , template-haskell, temporary, text, transformers
+ , hspec-discover, http-client, http-client-tls, http-types, HUnit
+ , infer-license, interpolate, mockery, pretty, QuickCheck
+ , scientific, template-haskell, temporary, text, transformers
, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "hpack";
- version = "0.29.7";
- sha256 = "07a9dar92qmgxfkf783rlwpkl49f242ygd50wrc22g4xllgrm2y9";
+ version = "0.31.0";
+ sha256 = "0lh60zqjzbjq0hkdia97swz0g1r3ihj84fph9jq9936fpb7hm1n9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -106942,6 +109528,7 @@ self: {
QuickCheck scientific template-haskell temporary text transformers
unordered-containers vector yaml
];
+ testToolDepends = [ hspec-discover ];
description = "A modern format for Haskell packages";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -106980,24 +109567,33 @@ self: {
}) {};
"hpack-dhall" = callPackage
- ({ mkDerivation, aeson, base, dhall, dhall-json, hpack, hspec
- , interpolate, megaparsec, mockery, text, transformers
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
+ , dhall, dhall-json, Diff, filepath, hpack, megaparsec, microlens
+ , optparse-applicative, prettyprinter, tasty, tasty-golden, text
+ , transformers, utf8-string, yaml
}:
mkDerivation {
pname = "hpack-dhall";
- version = "0.3.0";
- sha256 = "0dplb37npz47cxya1c3dnj6bjcnprjph83yifb08a5qf6vnhcjyh";
- isLibrary = false;
+ version = "0.4.0";
+ sha256 = "04bjhfc5xqkvp58y28cifsq58l2rbc8xa7ywvzmk9hvw7acbixca";
+ isLibrary = true;
isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+ megaparsec microlens prettyprinter text transformers yaml
+ ];
executableHaskellDepends = [
- aeson base dhall dhall-json hpack megaparsec text transformers
+ aeson aeson-pretty base bytestring dhall dhall-json filepath hpack
+ megaparsec microlens optparse-applicative prettyprinter text
+ transformers yaml
];
testHaskellDepends = [
- aeson base dhall dhall-json hpack hspec interpolate megaparsec
- mockery text transformers
+ aeson aeson-pretty base bytestring Cabal dhall dhall-json Diff
+ filepath hpack megaparsec microlens prettyprinter tasty
+ tasty-golden text transformers utf8-string yaml
];
- description = "Dhall support for Hpack";
- license = stdenv.lib.licenses.publicDomain;
+ description = "hpack's dhalling";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -107070,7 +109666,7 @@ self: {
description = "Binding for the PAPI library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {papi = null;};
+ }) {inherit (pkgs) papi;};
"hpaste" = callPackage
({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
@@ -107147,8 +109743,8 @@ self: {
pname = "hpc";
version = "0.6.0.3";
sha256 = "1am2fcxg7d3j3kpyhz48wzbpg83dk2jmzhqm4yiib649alzcgnhn";
- revision = "1";
- editedCabalFile = "1bddfsgn48kh8qa72asgmx7z4ym00zkh09g3hqp6l6yl919drn2i";
+ revision = "2";
+ editedCabalFile = "0ywki1w4kld0m3z8v1i287g6hcsjgmyq4nxx8b9jij721ad9b9w3";
libraryHaskellDepends = [
base containers directory filepath time
];
@@ -107343,18 +109939,18 @@ self: {
}) {};
"hpp" = callPackage
- ({ mkDerivation, base, bytestring, bytestring-trie, directory
- , filepath, ghc-prim, time, transformers
+ ({ mkDerivation, base, bytestring, directory, filepath, ghc-prim
+ , time, transformers, unordered-containers
}:
mkDerivation {
pname = "hpp";
- version = "0.5.2";
- sha256 = "1r1sas1rcxcra4q3vjw3qmiv0xc4j263m7p93y6bwm1fvpxlkvcc";
+ version = "0.6.1";
+ sha256 = "1gv2gndbyrppl8qan680kl9kmwv6b5a5j5yrwifzh8rj73s47a6i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring bytestring-trie directory filepath ghc-prim time
- transformers
+ base bytestring directory filepath ghc-prim time transformers
+ unordered-containers
];
executableHaskellDepends = [ base directory filepath time ];
testHaskellDepends = [ base bytestring transformers ];
@@ -107680,6 +110276,8 @@ self: {
pname = "hreader";
version = "1.1.0";
sha256 = "0fkxk9sz9hnnacnsv8dq7xb0sfq0b9abch6ky1zsnhxkb7004ara";
+ revision = "1";
+ editedCabalFile = "0kz3yzah7m4c2r9yaawhljcgb579masx3lx4mrr4lmqy39kmsvcb";
libraryHaskellDepends = [
base exceptions hset mmorph monad-control mtl tagged transformers
transformers-base
@@ -107722,18 +110320,18 @@ self: {
({ mkDerivation, aeson, base, binary, bytestring, containers
, criterion, hostname, hspec, hspec-core, HUnit, kazura-queue, mtl
, network, protocol-buffers, protocol-buffers-descriptor
- , QuickCheck, scientific, text, time, unagi-chan
+ , QuickCheck, scientific, stm, text, time, unagi-chan
}:
mkDerivation {
pname = "hriemann";
- version = "0.3.3.0";
- sha256 = "0apji56rwh1did67z9z0bcy5r9k2m6rrfkiv18rp4mbd863skg25";
+ version = "0.3.3.3";
+ sha256 = "0xxdzbx5wqmz62k8jka2k896sdz49j2aqivmcic9fsrar5inalyp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base binary bytestring containers criterion hostname
kazura-queue mtl network protocol-buffers
- protocol-buffers-descriptor scientific text time unagi-chan
+ protocol-buffers-descriptor scientific stm text time unagi-chan
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -107741,6 +110339,7 @@ self: {
];
description = "A Riemann Client for Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hruby" = callPackage
@@ -107750,8 +110349,8 @@ self: {
}:
mkDerivation {
pname = "hruby";
- version = "0.3.5.4";
- sha256 = "17nm55xg6v71dp8cvaz9rp2siyywpynlxqxr1j44ciyw114h36vk";
+ version = "0.3.6";
+ sha256 = "068mvb6bf583bldx07whc3cc0s3xbjlibi55r0ajjq9v4kxv98yx";
setupHaskellDepends = [ base Cabal process ];
libraryHaskellDepends = [
aeson attoparsec base bytestring scientific stm text
@@ -108016,17 +110615,6 @@ self: {
}) {inherit (pkgs) fltk; fltk_images = null;};
"hs-functors" = callPackage
- ({ mkDerivation, base, transformers }:
- mkDerivation {
- pname = "hs-functors";
- version = "0.1.2.0";
- sha256 = "0jhhli0hhhmrh313nnydblyz68rhhmf4g6yrn35m8davj5cg1wd7";
- libraryHaskellDepends = [ base transformers ];
- description = "Functors from products of Haskell and its dual to Haskell";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hs-functors_0_1_3_0" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "hs-functors";
@@ -108035,7 +110623,6 @@ self: {
libraryHaskellDepends = [ base transformers ];
description = "Functors from products of Haskell and its dual to Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hs-gchart" = callPackage
@@ -108473,20 +111060,17 @@ self: {
"hs2ats" = callPackage
({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
- , cpphs, criterion, deepseq, haskell-src-exts, hspec
- , hspec-dirstream, language-ats, microlens, optparse-generic
- , system-filepath
+ , criterion, deepseq, haskell-src-exts, hspec, hspec-dirstream
+ , language-ats, microlens, optparse-generic, system-filepath
}:
mkDerivation {
pname = "hs2ats";
- version = "0.3.0.3";
- sha256 = "0j8kka9n3in9ya1hndn0dpj8d1ha5ihxfrl995dwsa900z00i5yk";
- revision = "1";
- editedCabalFile = "0lx2z4zfphypmjx9m5v23lywfj2d16l6hs6ipd796g46jczc4piq";
+ version = "0.4.0.0";
+ sha256 = "1564xybdqli5i3096xmccy6z0xgm5yvfmjmz60r9ny3h54ahlj7r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- ansi-wl-pprint base casing composition-prelude cpphs deepseq
+ ansi-wl-pprint base casing composition-prelude deepseq
haskell-src-exts language-ats microlens
];
executableHaskellDepends = [ base optparse-generic ];
@@ -108561,6 +111145,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hsPID" = callPackage
+ ({ mkDerivation, base, HUnit, lens }:
+ mkDerivation {
+ pname = "hsPID";
+ version = "0.1";
+ sha256 = "16ks8pvpd0rcw11zinzlldv21i6mbcbrnnq3j9z3vmcjpd25wzim";
+ libraryHaskellDepends = [ base lens ];
+ testHaskellDepends = [ base HUnit lens ];
+ description = "PID control loop";
+ license = stdenv.lib.licenses.lgpl3;
+ }) {};
+
"hsSqlite3" = callPackage
({ mkDerivation, base, bindings-sqlite3, bytestring, mtl
, utf8-string
@@ -108771,17 +111367,22 @@ self: {
}) {};
"hsc2hs" = callPackage
- ({ mkDerivation, base, containers, directory, filepath, process }:
+ ({ mkDerivation, base, containers, directory, filepath, process
+ , tasty, tasty-hspec
+ }:
mkDerivation {
pname = "hsc2hs";
- version = "0.68.3";
- sha256 = "0q46l4mvclw7lys53zljgrcj142rbwzk5zc2djk2qj956ah1i25h";
+ version = "0.68.4";
+ sha256 = "07qzyr1j76gxrrsds65vivm5cx33paxpifvxdlmkxprrm3s4z7z6";
+ revision = "1";
+ editedCabalFile = "1wab9n4wy3bffxly0b0v1ppzf6sfn6aqc8pi1r8jnwb4rzy94c3i";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
base containers directory filepath process
];
+ testHaskellDepends = [ base tasty tasty-hspec ];
description = "A preprocessor that helps with writing Haskell bindings to C code";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -109264,14 +111865,16 @@ self: {
}) {};
"hscrtmpl" = callPackage
- ({ mkDerivation, base, directory, process, time }:
+ ({ mkDerivation, base, directory, filepath, process, time }:
mkDerivation {
pname = "hscrtmpl";
- version = "1.5";
- sha256 = "12b5409gaiasgap0lvykvapjbls1p2p9jz62sqpl70181y4812l0";
+ version = "1.6";
+ sha256 = "166xp46bxi079h9bpr8xfnlzzivwkhnykv7g7kg7rnp35cmwxshm";
isLibrary = false;
isExecutable = true;
- executableHaskellDepends = [ base directory process time ];
+ executableHaskellDepends = [
+ base directory filepath process time
+ ];
description = "Haskell shell script template";
license = stdenv.lib.licenses.isc;
}) {};
@@ -109326,35 +111929,33 @@ self: {
}) {};
"hsdev" = callPackage
- ({ mkDerivation, aeson, aeson-lens, aeson-pretty, array, async
- , attoparsec, base, bytestring, Cabal, containers, cpphs
- , data-default, deepseq, direct-sqlite, directory, exceptions
- , filepath, fsnotify, ghc, ghc-boot, ghc-paths, ghc-syb-utils
- , haddock-api, haddock-library, haskell-names, haskell-src-exts
- , hdocs, hformat, hlint, hspec, HTTP, lens, lifted-base, mmorph
- , monad-control, monad-loops, mtl, network, optparse-applicative
- , process, regex-pcre-builtin, scientific, simple-log
- , sqlite-simple, stm, syb, template-haskell, text, text-region
- , time, transformers, transformers-base, traverse-with-class
- , uniplate, unix, unordered-containers, vector
+ ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec
+ , base, bytestring, Cabal, containers, cpphs, data-default, deepseq
+ , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc
+ , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names
+ , haskell-src-exts, hdocs, hformat, hlint, hspec, HTTP, lens
+ , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl
+ , network, optparse-applicative, process, regex-pcre-builtin
+ , scientific, simple-log, sqlite-simple, stm, syb, template-haskell
+ , text, text-region, time, transformers, transformers-base
+ , traverse-with-class, uniplate, unix, unordered-containers, vector
}:
mkDerivation {
pname = "hsdev";
- version = "0.3.1.4";
- sha256 = "12mz6ahfs693yxi02765v4215dbs2pzqp17w49z38zz3y6kcwmb9";
+ version = "0.3.2.1";
+ sha256 = "01sfpd2dsqbbkxq5arb0gzllfyfcmjwcln91v02f5x1f6ksjlpzp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty array async attoparsec base bytestring Cabal
containers cpphs data-default deepseq direct-sqlite directory
- exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils
- haddock-api haddock-library haskell-names haskell-src-exts hdocs
- hformat hlint HTTP lens lifted-base mmorph monad-control
- monad-loops mtl network optparse-applicative process
- regex-pcre-builtin scientific simple-log sqlite-simple stm syb
- template-haskell text text-region time transformers
- transformers-base traverse-with-class uniplate unix
- unordered-containers vector
+ exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api
+ haddock-library haskell-names haskell-src-exts hdocs hformat hlint
+ HTTP lens lifted-base mmorph monad-control monad-loops mtl network
+ optparse-applicative process regex-pcre-builtin scientific
+ simple-log sqlite-simple stm syb template-haskell text text-region
+ time transformers transformers-base traverse-with-class uniplate
+ unix unordered-containers vector
];
executableHaskellDepends = [
aeson aeson-pretty base bytestring containers deepseq directory
@@ -109362,8 +111963,8 @@ self: {
process text transformers unordered-containers
];
testHaskellDepends = [
- aeson aeson-lens async base containers data-default deepseq
- directory filepath hformat hspec lens mtl text
+ aeson async base containers data-default deepseq directory filepath
+ hformat hspec lens lens-aeson mtl text
];
description = "Haskell development library";
license = stdenv.lib.licenses.bsd3;
@@ -109533,8 +112134,10 @@ self: {
}:
mkDerivation {
pname = "hsexif";
- version = "0.6.1.5";
- sha256 = "0vmhd6l9vkzm4pqizqh3hjb86f4vk212plvlzfd6rd5dc08fl4ig";
+ version = "0.6.1.6";
+ sha256 = "0pdm0v3xz308yzdhc646bbkwj156llf9g17c2y74x339xk6i8zhg";
+ revision = "1";
+ editedCabalFile = "1dgcgsmx0k5p3ibfv3n5k0c5p1is2m5zfsd2s6nc6d0pz34d4wl9";
libraryHaskellDepends = [
base binary bytestring containers iconv text time
];
@@ -109746,6 +112349,24 @@ self: {
license = stdenv.lib.licenses.isc;
}) {};
+ "hsinstall_2_1" = callPackage
+ ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process
+ }:
+ mkDerivation {
+ pname = "hsinstall";
+ version = "2.1";
+ sha256 = "1azbzkslszq9pw4h91mp1zr6g6ad2haaf3g5146naf1f456z9zjg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [
+ base Cabal directory filepath heredoc process
+ ];
+ description = "Install Haskell software";
+ license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hskeleton" = callPackage
({ mkDerivation, base, Cabal }:
mkDerivation {
@@ -109811,10 +112432,8 @@ self: {
}:
mkDerivation {
pname = "hslogger";
- version = "1.2.10";
- sha256 = "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp";
- revision = "1";
- editedCabalFile = "04vhwv9qidwan7fbkgvx8z5hnybjaf6wq2951fx4qw3nqsys9250";
+ version = "1.2.12";
+ sha256 = "0ykcsk7wqygvrg60r5kpl6xfinr706al8pfyk5wj67wjs24lqypr";
libraryHaskellDepends = [
base containers directory mtl network old-locale process time unix
];
@@ -109913,6 +112532,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {inherit (pkgs) lua5_3;};
+ "hslua_1_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+ , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances
+ , tasty, tasty-hunit, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "hslua";
+ version = "1.0.1";
+ sha256 = "185izqlvxn406y6frhjr4sk3lq2hcmfm11hyyrxqf5v9pnxp8kna";
+ configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
+ libraryHaskellDepends = [
+ base bytestring containers exceptions fail mtl text
+ ];
+ librarySystemDepends = [ lua5_3 ];
+ testHaskellDepends = [
+ base bytestring containers exceptions fail mtl QuickCheck
+ quickcheck-instances tasty tasty-hunit tasty-quickcheck text
+ ];
+ benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
+ description = "Bindings to Lua, an embeddable scripting language";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) lua5_3;};
+
"hslua-aeson" = callPackage
({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit
, ieee754, QuickCheck, quickcheck-instances, scientific, text
@@ -109934,6 +112577,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hslua-aeson_1_0_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec
+ , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific
+ , text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "hslua-aeson";
+ version = "1.0.0";
+ sha256 = "0wvcf0adv2b5fn7mvi8p6ydzsyzbn43qyk1kjvvi9achrgvc59zz";
+ libraryHaskellDepends = [
+ aeson base hashable hslua scientific text unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring hashable hslua hspec HUnit ieee754 QuickCheck
+ quickcheck-instances scientific text unordered-containers vector
+ ];
+ description = "Allow aeson data types to be used with lua";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hslua-module-text" = callPackage
({ mkDerivation, base, hslua, tasty, tasty-hunit, text }:
mkDerivation {
@@ -109948,6 +112613,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hslua-module-text_0_2_0" = callPackage
+ ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "hslua-module-text";
+ version = "0.2.0";
+ sha256 = "0zlgin87cck5ccw82jf0bfjcrpdnqlylh4sfqifbdjgspswha5vi";
+ libraryHaskellDepends = [ base bytestring hslua text ];
+ testHaskellDepends = [ base hslua tasty tasty-hunit text ];
+ description = "Lua module for text";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hsluv-haskell" = callPackage
({ mkDerivation, aeson, base, bytestring, colour, containers }:
mkDerivation {
@@ -110258,8 +112937,8 @@ self: {
}:
mkDerivation {
pname = "hsparql";
- version = "0.3.5";
- sha256 = "0557c81wgk930x2bq72f2f3kycanxxvk1s5nrfxn56lmgijzkkqz";
+ version = "0.3.6";
+ sha256 = "0hx1mwdww6i88g497i26qdg0dhw2a41qclvpgwq7rl2m5wshm9qp";
libraryHaskellDepends = [
base bytestring HTTP MissingH mtl network network-uri rdf4h text
xml
@@ -110336,6 +113015,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec_2_5_8" = callPackage
+ ({ mkDerivation, base, hspec-core, hspec-discover
+ , hspec-expectations, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec";
+ version = "2.5.8";
+ sha256 = "061k4r1jlzcnl0mzvk5nvamw1bx36rs2a38958m2hlh2mmfnfnsr";
+ libraryHaskellDepends = [
+ base hspec-core hspec-discover hspec-expectations QuickCheck
+ ];
+ description = "A Testing Framework for Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-attoparsec" = callPackage
({ mkDerivation, attoparsec, base, bytestring, hspec
, hspec-expectations, text
@@ -110388,6 +113083,8 @@ self: {
pname = "hspec-core";
version = "2.4.8";
sha256 = "02zr6n7mqdncvf1braf38zjdplaxrkg11x9k8717k4yg57585ji4";
+ revision = "1";
+ editedCabalFile = "05rfar3kl9nkh421jxx71p6dn3zykj61lj1hjhrj0z3s6m1ihn5q";
libraryHaskellDepends = [
ansi-terminal array base call-stack deepseq directory filepath
hspec-expectations HUnit QuickCheck quickcheck-io random setenv stm
@@ -110415,6 +113112,34 @@ self: {
pname = "hspec-core";
version = "2.5.5";
sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x";
+ revision = "1";
+ editedCabalFile = "1fifkdjhzrvwsx27qcsj0jam66sswjas5vfrzmb75z0xqyg5lpr7";
+ libraryHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+ setenv stm tf-random transformers
+ ];
+ testHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations hspec-meta HUnit process QuickCheck
+ quickcheck-io random setenv silently stm temporary tf-random
+ transformers
+ ];
+ testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+ description = "A Testing Framework for Haskell";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "hspec-core_2_5_8" = callPackage
+ ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+ , deepseq, directory, filepath, hspec-expectations, hspec-meta
+ , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+ , silently, stm, temporary, tf-random, transformers
+ }:
+ mkDerivation {
+ pname = "hspec-core";
+ version = "2.5.8";
+ sha256 = "08y6rhzc2vwmrxzl3bc8iwklkhgzv7x90mf9fnjnddlyaj7wcjg5";
libraryHaskellDepends = [
ansi-terminal array base call-stack clock deepseq directory
filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -110426,9 +113151,11 @@ self: {
quickcheck-io random setenv silently stm temporary tf-random
transformers
];
+ testToolDepends = [ hspec-meta ];
testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
description = "A Testing Framework for Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hspec-dirstream" = callPackage
@@ -110437,8 +113164,8 @@ self: {
}:
mkDerivation {
pname = "hspec-dirstream";
- version = "1.0.0.0";
- sha256 = "0xj7qj6j3mp1j3q4pdm0javjc4rw586brcd399ygh74vpa669pgf";
+ version = "1.0.0.2";
+ sha256 = "1df6rjgwj6rw78dh1ihswk7sgh72c8aqnaaj4r9k0gjq30hkdlfr";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base dirstream filepath hspec hspec-core pipes pipes-safe
@@ -110447,6 +113174,7 @@ self: {
testHaskellDepends = [ base hspec ];
description = "Helper functions to simplify adding integration tests";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hspec-discover_2_4_8" = callPackage
@@ -110486,6 +113214,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-discover_2_5_8" = callPackage
+ ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec-discover";
+ version = "2.5.8";
+ sha256 = "001i0ldxi88qcww2hh3mkdr6svw4kj23lf65camk9bgn5zwvq5aj";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [ base directory filepath ];
+ testHaskellDepends = [
+ base directory filepath hspec-meta QuickCheck
+ ];
+ testToolDepends = [ hspec-meta ];
+ description = "Automatically discover and run Hspec tests";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-expectations" = callPackage
({ mkDerivation, base, call-stack, HUnit, nanospec }:
mkDerivation {
@@ -110662,6 +113410,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-leancheck" = callPackage
+ ({ mkDerivation, base, hspec, hspec-core, HUnit, leancheck }:
+ mkDerivation {
+ pname = "hspec-leancheck";
+ version = "0.0.2";
+ sha256 = "1780xhwmbvkhca3l6rckbnr92f7i3icarwprdcfnrrdpk4yq9ml8";
+ libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ];
+ testHaskellDepends = [ base hspec leancheck ];
+ description = "LeanCheck support for the Hspec test framework";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hspec-megaparsec" = callPackage
({ mkDerivation, base, containers, hspec, hspec-expectations
, megaparsec
@@ -110678,14 +113438,16 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hspec-megaparsec_1_1_0" = callPackage
+ "hspec-megaparsec_2_0_0" = callPackage
({ mkDerivation, base, containers, hspec, hspec-expectations
, megaparsec
}:
mkDerivation {
pname = "hspec-megaparsec";
- version = "1.1.0";
- sha256 = "1929fnpys1j7nja1c3limyl6f259gky9dpf98xyyx0pi663qdmf1";
+ version = "2.0.0";
+ sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8";
+ revision = "1";
+ editedCabalFile = "15hpf1v1d4dwzdvk7xhgj37yd37pcyj6yzw750k1fcj6j0hk4rb7";
libraryHaskellDepends = [
base containers hspec-expectations megaparsec
];
@@ -110720,6 +113482,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-meta_2_5_6" = callPackage
+ ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+ , deepseq, directory, filepath, hspec-expectations, HUnit
+ , QuickCheck, quickcheck-io, random, setenv, stm, time
+ , transformers
+ }:
+ mkDerivation {
+ pname = "hspec-meta";
+ version = "2.5.6";
+ sha256 = "196dyacvh7liq49ccwd5q0dw6n74igrvhk35zm95i3y8m44ky3a4";
+ revision = "1";
+ editedCabalFile = "0c7dq1vvk09fj6nljwwshgpkszg725hrpgnq9l2aka230sig9vz4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+ setenv stm time transformers
+ ];
+ executableHaskellDepends = [
+ ansi-terminal array base call-stack clock deepseq directory
+ filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+ setenv stm time transformers
+ ];
+ description = "A version of Hspec which is used to test Hspec itself";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-monad-control" = callPackage
({ mkDerivation, base, hspec-core, monad-control, transformers
, transformers-base
@@ -110758,8 +113549,8 @@ self: {
}:
mkDerivation {
pname = "hspec-need-env";
- version = "0.1.0.0";
- sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d";
+ version = "0.1.0.1";
+ sha256 = "1n364lzmiyb27wl88z8g0kpgsgcxa2hp45w1qxzasl2im4q8adv5";
libraryHaskellDepends = [ base hspec-core hspec-expectations ];
testHaskellDepends = [ base hspec hspec-core setenv transformers ];
description = "Read environment variables for hspec tests";
@@ -111467,6 +114258,8 @@ self: {
pname = "hstatistics";
version = "0.3";
sha256 = "1v7f2844p6bjzcwc2pnjyb8zl42kw1x021gcn688dvdxs6cgdwvs";
+ revision = "1";
+ editedCabalFile = "0qcp1kgpwnqphqq1fd92lfp8d0vcf3l6ighsdiqin51qg499xz9w";
libraryHaskellDepends = [
array base hmatrix hmatrix-gsl-stats random vector
];
@@ -111561,25 +114354,29 @@ self: {
"hstox" = callPackage
({ mkDerivation, async, base, base16-bytestring, binary
- , binary-bits, bytestring, containers, data-msgpack, hspec
- , integer-gmp, iproute, network, network-msgpack-rpc, process
- , QuickCheck, saltine, tagged, text, transformers
+ , binary-bits, bytestring, clock, containers, data-msgpack
+ , data-msgpack-types, entropy, hspec, integer-gmp, iproute
+ , lens-family, MonadRandom, mtl, network, network-msgpack-rpc
+ , process, QuickCheck, random, saltine, semigroups, tagged, text
+ , transformers
}:
mkDerivation {
pname = "hstox";
- version = "0.0.1";
- sha256 = "02ifk98jqnfc4dinf8g7zsls6vmb4kys2mw42qgp6grrkw5clqkd";
+ version = "0.0.2";
+ sha256 = "0dnz2kza50741gkhkclipd73wiqlfh0f40bsx9askl2sbj5zschg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base base16-bytestring binary binary-bits bytestring containers
- data-msgpack hspec integer-gmp iproute network network-msgpack-rpc
- QuickCheck saltine tagged text transformers
+ base base16-bytestring binary binary-bits bytestring clock
+ containers data-msgpack data-msgpack-types entropy hspec
+ integer-gmp iproute lens-family MonadRandom mtl network
+ network-msgpack-rpc QuickCheck random saltine semigroups tagged
+ text transformers
];
executableHaskellDepends = [ base process ];
testHaskellDepends = [ async base ];
description = "A Tox protocol implementation in Haskell";
- license = stdenv.lib.licenses.agpl3;
+ license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -111975,8 +114772,8 @@ self: {
}:
mkDerivation {
pname = "htirage";
- version = "1.20170804";
- sha256 = "04rjp4gzi2dfzp9vpmwrvlwdj0mwx7s1myvl85jzlf5ikic1898p";
+ version = "2.1.0.20180829";
+ sha256 = "1r0p1xsc7gg9d089z7d60qdfcaxahrzd9z951mr7jrqdi7b2fi3f";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base containers QuickCheck tasty tasty-quickcheck text transformers
@@ -112061,8 +114858,8 @@ self: {
}:
mkDerivation {
pname = "html-conduit";
- version = "1.3.1";
- sha256 = "0dg3sblihi93qn6ax1cwha0cng4zlpmic83ckdylq7s7kwa3rhbi";
+ version = "1.3.2";
+ sha256 = "0l5hc7bf57p5jiqh3wvnqapc27ibnlv00zm6szc0nqbvknzvvz85";
libraryHaskellDepends = [
attoparsec base bytestring conduit conduit-extra containers
resourcet text transformers xml-conduit xml-types
@@ -112237,6 +115034,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "html-validator-cli" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
+ , doctest, filepath, hspec, http-conduit, text, utf8-string
+ }:
+ mkDerivation {
+ pname = "html-validator-cli";
+ version = "0.1.0.5";
+ sha256 = "0f1af2zsg7vmirmdnh3fwvyk3m7gdd34nfgfkdygs4ridhv6hqxs";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal base bytestring directory doctest filepath
+ hspec http-conduit text utf8-string
+ ];
+ executableHaskellDepends = [
+ aeson ansi-terminal base bytestring directory doctest filepath
+ hspec http-conduit text utf8-string
+ ];
+ testHaskellDepends = [
+ aeson ansi-terminal base bytestring directory doctest filepath
+ hspec http-conduit text utf8-string
+ ];
+ description = "A command-line interface for https://validator.w3.org/";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"html2hamlet" = callPackage
({ mkDerivation, base, bytestring, containers, hamlet, html-conduit
, http-conduit, mtl, optparse-declarative, regex-tdfa, text
@@ -112322,26 +115146,27 @@ self: {
"htoml-megaparsec" = callPackage
({ mkDerivation, aeson, base, bytestring, composition-prelude
- , containers, criterion, deepseq, file-embed, hspec, megaparsec
- , mtl, tasty, tasty-hspec, tasty-hunit, text, time
- , unordered-containers, vector
+ , containers, criterion, deepseq, file-embed, megaparsec, mtl
+ , tasty, tasty-hspec, tasty-hunit, text, time, unordered-containers
+ , vector
}:
mkDerivation {
pname = "htoml-megaparsec";
- version = "2.0.0.2";
- sha256 = "1z0p35l2rjclxkmbvwg6fcfx50ibfd6v7gia5wbnkbgh3cwyp19d";
+ version = "2.1.0.3";
+ sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x";
libraryHaskellDepends = [
base composition-prelude containers deepseq megaparsec mtl text
time unordered-containers vector
];
testHaskellDepends = [
- aeson base bytestring containers file-embed hspec megaparsec tasty
+ aeson base bytestring containers file-embed megaparsec tasty
tasty-hspec tasty-hunit text time unordered-containers vector
];
benchmarkHaskellDepends = [ base criterion text ];
doHaddock = false;
description = "Parser for TOML files";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"htrace" = callPackage
@@ -112457,6 +115282,8 @@ self: {
pname = "http-api-data";
version = "0.3.8.1";
sha256 = "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf";
+ revision = "1";
+ editedCabalFile = "1843bapm2rdkl4941rycryircpqpp7mbal7vgmlikf11f8ws7y7x";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
attoparsec attoparsec-iso8601 base bytestring containers hashable
@@ -112472,6 +115299,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http-api-data_0_3_10" = callPackage
+ ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring
+ , Cabal, cabal-doctest, containers, cookie, directory, doctest
+ , filepath, hashable, hspec, hspec-discover, http-types, HUnit
+ , QuickCheck, quickcheck-instances, text, time, time-locale-compat
+ , unordered-containers, uuid-types
+ }:
+ mkDerivation {
+ pname = "http-api-data";
+ version = "0.3.10";
+ sha256 = "061v98l5j8791jzp6fzhdc0gpmzzf4qxavrjzm7ir8x5h7il3qm8";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ attoparsec attoparsec-iso8601 base bytestring containers cookie
+ hashable http-types text time time-locale-compat
+ unordered-containers uuid-types
+ ];
+ testHaskellDepends = [
+ base bytestring cookie directory doctest filepath hspec HUnit
+ QuickCheck quickcheck-instances text time unordered-containers
+ uuid-types
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-attoparsec" = callPackage
({ mkDerivation, attoparsec, base, bytestring, http-types }:
mkDerivation {
@@ -112606,6 +115461,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "http-client-openssl_0_3_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client
+ , http-types, network
+ }:
+ mkDerivation {
+ pname = "http-client-openssl";
+ version = "0.3.0.0";
+ sha256 = "0y7d1bp045mj1lnbd74a1v4viv5g5awivdhbycq75hnvqf2n50vl";
+ libraryHaskellDepends = [
+ base bytestring HsOpenSSL http-client network
+ ];
+ testHaskellDepends = [
+ base HsOpenSSL hspec http-client http-types
+ ];
+ doCheck = false;
+ description = "http-client backend using the OpenSSL library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-client-request-modifiers" = callPackage
({ mkDerivation, base, bytestring, exceptions, http-client
, http-media, http-types, network, network-uri
@@ -113015,10 +115890,8 @@ self: {
}:
mkDerivation {
pname = "http-media";
- version = "0.7.1.2";
- sha256 = "01vvrd6yb2aykha7y1c13ylnkyws2wy68vqbdb7kmbzwbdxdb4zy";
- revision = "1";
- editedCabalFile = "0lxlig3mhw52ixqq65c9fzawviia2fl00d7hn1diny964h8klwgc";
+ version = "0.7.1.3";
+ sha256 = "0kqjzvh5y8r6x5rw2kgd816w2963c6cbyw2qjvaj2mv59zxzqkrr";
libraryHaskellDepends = [
base bytestring case-insensitive containers utf8-string
];
@@ -113037,8 +115910,8 @@ self: {
}:
mkDerivation {
pname = "http-monad";
- version = "0.1.1.2";
- sha256 = "0s2ajy2iwi7k5zrs6asp5ncyy06jnphp4ncc130cg2kpnf32yyfz";
+ version = "0.1.1.3";
+ sha256 = "0hch3qjs5axf4grrvgfmd208ar0pviywkrgdmh26564aqrfpr2y1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -113318,8 +116191,8 @@ self: {
}:
mkDerivation {
pname = "http-types";
- version = "0.12.1";
- sha256 = "1wv9k6nlvkdsxwlr7gaynphvzmvi5211gvwq96mbcxgk51a739rz";
+ version = "0.12.2";
+ sha256 = "01ck5wmzvl5cqd3w2kwkrmp18n78474a3lngk6ry28w9pbbh4caj";
libraryHaskellDepends = [
array base bytestring case-insensitive text
];
@@ -113372,14 +116245,45 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http2_1_6_4" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+ , case-insensitive, containers, criterion, directory, doctest
+ , filepath, Glob, heaps, hex, hspec, mwc-random, network-byte-order
+ , psqueues, stm, text, unordered-containers, vector, word8
+ }:
+ mkDerivation {
+ pname = "http2";
+ version = "1.6.4";
+ sha256 = "0rhy7z67bmbb15kxq9fmpgvqmc3npsbf1ym04cg07ymq9ihxvjig";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base bytestring case-insensitive containers
+ network-byte-order psqueues stm
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty array base bytestring case-insensitive
+ containers directory doctest filepath Glob hex hspec
+ network-byte-order psqueues stm text unordered-containers vector
+ word8
+ ];
+ benchmarkHaskellDepends = [
+ array base bytestring case-insensitive containers criterion heaps
+ mwc-random network-byte-order psqueues stm
+ ];
+ description = "HTTP/2 library including frames, priority queues and HPACK";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http2-client" = callPackage
({ mkDerivation, async, base, bytestring, containers, deepseq
, http2, network, stm, time, tls
}:
mkDerivation {
pname = "http2-client";
- version = "0.8.0.1";
- sha256 = "055x0cscrd0idfda4ak48dagkmqkgj1zg29mz4yxrdj9vp2n0xd3";
+ version = "0.8.0.2";
+ sha256 = "16m4amw7xq7psvxix76z7g1dvllkfs9pzpnig5rfhbgfvbf5pydw";
libraryHaskellDepends = [
async base bytestring containers deepseq http2 network stm time tls
];
@@ -113394,8 +116298,8 @@ self: {
}:
mkDerivation {
pname = "http2-client-exe";
- version = "0.1.0.0";
- sha256 = "0i8rnq01dlnj7yzf64b7g7cshzsbxc668m9fhc97x3hbdr7b0iad";
+ version = "0.1.0.1";
+ sha256 = "1z1y52253dybliwplybwd71a1ssmma34zcylv54aj6x7grrj37hm";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -113407,17 +116311,17 @@ self: {
}) {};
"http2-client-grpc" = callPackage
- ({ mkDerivation, base, binary, bytestring, data-default-class
- , http2, http2-client, http2-grpc-types, proto-lens
- , proto-lens-protoc, text, zlib
+ ({ mkDerivation, async, base, binary, bytestring, case-insensitive
+ , data-default-class, http2, http2-client, http2-grpc-types, lens
+ , proto-lens, text, tls
}:
mkDerivation {
pname = "http2-client-grpc";
- version = "0.2.0.0";
- sha256 = "1bg4p6fy09mbi5r355vvrbmc0al7mcwbr3mx2lpkjkzm9cg53x2z";
+ version = "0.5.0.4";
+ sha256 = "1277qp7gvwvqb12pz6j2nm08zdgx9nia4zak9d4pyw147dcf9qwv";
libraryHaskellDepends = [
- base binary bytestring data-default-class http2 http2-client
- http2-grpc-types proto-lens proto-lens-protoc text zlib
+ async base binary bytestring case-insensitive data-default-class
+ http2 http2-client http2-grpc-types lens proto-lens text tls
];
testHaskellDepends = [ base ];
description = "Implement gRPC-over-HTTP2 clients";
@@ -113426,12 +116330,18 @@ self: {
}) {};
"http2-grpc-types" = callPackage
- ({ mkDerivation, base, binary, bytestring, proto-lens, zlib }:
+ ({ mkDerivation, base, binary, bytestring, case-insensitive
+ , proto-lens, zlib
+ }:
mkDerivation {
pname = "http2-grpc-types";
- version = "0.1.0.0";
- sha256 = "0qj9bffznw8fawalj6hlvx8r0sj9smgks88wdqjq5ran02b6i2dl";
- libraryHaskellDepends = [ base binary bytestring proto-lens zlib ];
+ version = "0.3.0.0";
+ sha256 = "0r3gfc8alm535hqmyy39hd7nhpp3dmba52l4wf38bj7j3ckggpy5";
+ revision = "2";
+ editedCabalFile = "0b3dpd1krsaxxbg08vp9m2r2f2w4ab1dylb6bp945dfyr7fl6c1c";
+ libraryHaskellDepends = [
+ base binary bytestring case-insensitive proto-lens zlib
+ ];
description = "Types for gRPC over HTTP2 common for client and servers";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -113442,8 +116352,8 @@ self: {
pname = "httpd-shed";
version = "0.4.0.3";
sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh";
- revision = "1";
- editedCabalFile = "159cjn9j8lq00gj2yvrzp81r37av25f83chsimp88h55zm9z8akw";
+ revision = "2";
+ editedCabalFile = "12y9qf8s0aq4dc80wrvh14cjvvm4mcygrqq72w4z8w9n8mp8jg9p";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base network network-uri ];
@@ -114188,16 +117098,16 @@ self: {
"hw-conduit" = callPackage
({ mkDerivation, array, base, bytestring, conduit
- , conduit-combinators, criterion, hspec, mmap, time, vector, word8
+ , conduit-combinators, criterion, hspec, mmap, time, transformers
+ , unliftio-core, vector, word8
}:
mkDerivation {
pname = "hw-conduit";
- version = "0.2.0.3";
- sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a";
- revision = "1";
- editedCabalFile = "0zr1r7px2qgpf5fgq18l6ziy2xaz773qbxc87cp84x0vpwas0yg7";
+ version = "0.2.0.5";
+ sha256 = "00fpinpafvrdkmk6gksqd9v6f3lzrqcg79yja0h55gw7qjz5lz84";
libraryHaskellDepends = [
- array base bytestring conduit conduit-combinators time word8
+ array base bytestring conduit conduit-combinators time transformers
+ unliftio-core word8
];
testHaskellDepends = [ base bytestring conduit hspec ];
benchmarkHaskellDepends = [
@@ -114207,6 +117117,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hw-conduit-merges" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
+ , mtl, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hw-conduit-merges";
+ version = "0.2.0.0";
+ sha256 = "1302b2dsvv8yazvq5vz9cs2fbqvdsh6zyprijb41g881riqa5klv";
+ revision = "1";
+ editedCabalFile = "1azji7zc0ygqjgd2shbqw7p8a2ll2qp3b1yq5i3665448brlwpvc";
+ libraryHaskellDepends = [ base conduit conduit-extra mtl ];
+ testHaskellDepends = [
+ base bytestring conduit conduit-extra hspec mtl QuickCheck
+ ];
+ description = "Additional merges and joins for Conduit";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-diagnostics" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -114219,37 +117147,37 @@ self: {
}) {};
"hw-dsv" = callPackage
- ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion
- , deepseq, directory, hedgehog, hspec, hspec-discover, hw-bits
+ ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava
+ , criterion, deepseq, directory, ghc-prim, hedgehog, hspec, hw-bits
, hw-hspec-hedgehog, hw-prim, hw-rankselect, hw-rankselect-base
- , lens, mmap, optparse-applicative, resourcet, text, vector, weigh
+ , hw-simd, lens, mmap, optparse-applicative, resourcet, text
+ , vector, weigh
}:
mkDerivation {
pname = "hw-dsv";
- version = "0.2.1";
- sha256 = "1kb8dc05dfslpqnjw42qnnxg16xfd2jz17ag9vgmci88rnsanaxv";
- revision = "1";
- editedCabalFile = "1di1vdj6c0s0n2zjhjhy8iszlgk29gbh7a46pc4q0hp587avff04";
+ version = "0.3.0";
+ sha256 = "0cpnzf8f4mk28jpxx66q8mv0gm3rassjp48r17hwzkalvw3ng3ni";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
- hw-rankselect-base vector
+ base bits-extra bytestring deepseq ghc-prim hw-bits hw-prim
+ hw-rankselect hw-rankselect-base hw-simd vector
];
+ libraryToolDepends = [ c2hs ];
executableHaskellDepends = [
- base bits-extra bytestring deepseq hedgehog hw-bits hw-prim
- hw-rankselect hw-rankselect-base lens optparse-applicative
- resourcet vector
+ base bits-extra bytestring deepseq ghc-prim hedgehog hw-bits
+ hw-prim hw-rankselect hw-rankselect-base hw-simd lens
+ optparse-applicative resourcet vector
];
testHaskellDepends = [
- base bits-extra bytestring cassava deepseq directory hedgehog hspec
- hw-bits hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base
- text vector weigh
+ base bits-extra bytestring cassava deepseq directory ghc-prim
+ hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim hw-rankselect
+ hw-rankselect-base hw-simd text vector weigh
];
- testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
base bits-extra bytestring cassava criterion deepseq directory
- hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector
+ ghc-prim hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd
+ mmap vector
];
description = "Unbelievably fast streaming DSV file parser";
license = stdenv.lib.licenses.bsd3;
@@ -114381,14 +117309,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hw-ip_0_2_0_2" = callPackage
+ "hw-ip_0_4_2" = callPackage
({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec
, hw-bits, hw-hspec-hedgehog, text
}:
mkDerivation {
pname = "hw-ip";
- version = "0.2.0.2";
- sha256 = "0c2nz9iq5x7mys90zy29ka4zkdggqngz77wjm51kv1jp7rsnpqn7";
+ version = "0.4.2";
+ sha256 = "1jcfj75hlg7szvknw6v13barvcilldzh76jv1rnfyscrfhpdkd2s";
libraryHaskellDepends = [
attoparsec base generic-lens hw-bits text
];
@@ -114413,8 +117341,8 @@ self: {
pname = "hw-json";
version = "0.6.0.0";
sha256 = "1na1xcgnnig27cv1v773jr7mv5izv8n1dnf6k3irw9rml3l213mv";
- revision = "1";
- editedCabalFile = "18w22jnsjv8f4k2q3548vdzl80p4r80pn96rnp69f6l36ibmx771";
+ revision = "2";
+ editedCabalFile = "0ygq95nx4sb70l5kfxlsj6rf2b3ry84ixby567n0jk1g0zks3z7s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -114444,16 +117372,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hw-json_0_8_1_0" = callPackage
+ "hw-json_0_9_0_1" = callPackage
({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
, bytestring, containers, criterion, directory, dlist, hspec
, hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim
- , hw-rankselect, hw-rankselect-base, mmap, text, vector, word8
+ , hw-rankselect, hw-rankselect-base, lens, mmap
+ , optparse-applicative, text, vector, word8
}:
mkDerivation {
pname = "hw-json";
- version = "0.8.1.0";
- sha256 = "1dllysbajkjsyb0rr9rhp2pmyrl99l7n086w8ifkm3491vgph179";
+ version = "0.9.0.1";
+ sha256 = "00prvi3jrb02g92vq1ghyxpdpqangj482x1k3l13s385804grgqw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -114463,7 +117392,8 @@ self: {
];
executableHaskellDepends = [
base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery
- hw-prim hw-rankselect hw-rankselect-base mmap vector
+ hw-prim hw-rankselect hw-rankselect-base lens mmap
+ optparse-applicative vector
];
testHaskellDepends = [
attoparsec base bytestring containers hspec hw-balancedparens
@@ -114637,8 +117567,8 @@ self: {
}:
mkDerivation {
pname = "hw-prim";
- version = "0.6.2.9";
- sha256 = "1c2ykdxvrg0i1wbjgfc0mank5z7466crqcs5hdyddjc833xhmv2d";
+ version = "0.6.2.17";
+ sha256 = "184ymryvfj3s6bc3igahfyd8k9cqf59vmpb9g3afh8xpicpmmiv6";
libraryHaskellDepends = [
base bytestring mmap semigroups transformers vector
];
@@ -114653,30 +117583,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hw-prim_0_6_2_13" = callPackage
- ({ mkDerivation, base, bytestring, criterion, directory, exceptions
- , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
- , transformers, vector
- }:
- mkDerivation {
- pname = "hw-prim";
- version = "0.6.2.13";
- sha256 = "0cvg99v9c86fzf76i4z3lilss0qgs1i91v1hsk2n22a79rmhpvnb";
- libraryHaskellDepends = [
- base bytestring mmap semigroups transformers vector
- ];
- testHaskellDepends = [
- base bytestring directory exceptions hedgehog hspec
- hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
- ];
- benchmarkHaskellDepends = [
- base bytestring criterion mmap semigroups transformers vector
- ];
- description = "Primitive functions and data types";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"hw-prim-bits" = callPackage
({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
, hw-hspec-hedgehog, QuickCheck, vector
@@ -114695,6 +117601,7 @@ self: {
benchmarkHaskellDepends = [ base criterion vector ];
description = "Primitive support for bit manipulation";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hw-rankselect" = callPackage
@@ -114795,8 +117702,8 @@ self: {
}:
mkDerivation {
pname = "hw-simd";
- version = "0.1.1.1";
- sha256 = "1mcingwc7z6ybsn32c3g66r4j9sfwpm4jkqvwh8cbbbd97lhalmq";
+ version = "0.1.1.2";
+ sha256 = "0jcd6clhcqdmkcvhvf68xldgmx4n1wp333438ypbwk2mwp1q559l";
libraryHaskellDepends = [
base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
hw-rankselect-base vector
@@ -114817,6 +117724,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hw-streams" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+ , ghc-prim, hedgehog, hspec, hw-bits, hw-hspec-hedgehog, hw-prim
+ , mmap, primitive, QuickCheck, semigroups, transformers, vector
+ }:
+ mkDerivation {
+ pname = "hw-streams";
+ version = "0.0.0.4";
+ sha256 = "08dmcbvw3z53plzgq5z3pa9ns9rjj0xs9rx70pyfrqrrc2f98hwi";
+ libraryHaskellDepends = [
+ base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups
+ transformers vector
+ ];
+ testHaskellDepends = [
+ base bytestring directory exceptions ghc-prim hedgehog hspec
+ hw-bits hw-hspec-hedgehog hw-prim mmap primitive QuickCheck
+ semigroups transformers vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive
+ semigroups transformers vector
+ ];
+ description = "Primitive functions and data types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-string-parse" = callPackage
({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
mkDerivation {
@@ -116005,6 +118938,8 @@ self: {
pname = "hyraxAbif";
version = "0.2.3.10";
sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b";
+ revision = "1";
+ editedCabalFile = "1iq9bw70rwp0lghxi188iidvp29cinyam78n5d30rqb4p807fb55";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -116136,8 +119071,8 @@ self: {
}:
mkDerivation {
pname = "iCalendar";
- version = "0.4.0.4";
- sha256 = "1hgji4riaqjpsqi2c7i1md9p8ig4sfigmldllnpkwbbhwhzmnsq5";
+ version = "0.4.0.5";
+ sha256 = "1s1pnwbp6bnsyswrw4vz8hr33jrfd4xs8vnpvrh57a75jdskgsn0";
libraryHaskellDepends = [
base base64-bytestring bytestring case-insensitive containers
data-default mime mtl network network-uri old-locale parsec text
@@ -116591,8 +119526,8 @@ self: {
}:
mkDerivation {
pname = "idris";
- version = "1.3.0";
- sha256 = "1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48";
+ version = "1.3.1";
+ sha256 = "0fn9h58l592j72njwma1ia48h8h87wi2rjqfxs7j2lfmvgfv18fi";
configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ];
isLibrary = true;
isExecutable = true;
@@ -116829,7 +119764,7 @@ self: {
description = "Bindings to the igraph C library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {igraph = null;};
+ }) {inherit (pkgs) igraph;};
"igrf" = callPackage
({ mkDerivation, ad, base, polynomial }:
@@ -117816,8 +120751,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "inchworm";
- version = "1.0.2.2";
- sha256 = "0r8a8hg3fzfc619zsjdnid1la0njnfrijhqfgqjmis4ncivah52h";
+ version = "1.0.2.4";
+ sha256 = "0r4d3pqpkmfa6ksjzvm8kjzrrkvb0lv76cf6fcrciwm7dj5biz74";
libraryHaskellDepends = [ base ];
description = "Inchworm Lexer Framework";
license = stdenv.lib.licenses.mit;
@@ -117904,8 +120839,8 @@ self: {
}:
mkDerivation {
pname = "incremental-parser";
- version = "0.3.1.1";
- sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz";
+ version = "0.3.2";
+ sha256 = "0rzm83mjbvaxa48yjs16c1v41l0yy1nfilc549z4vjgzqixy1pw6";
libraryHaskellDepends = [ base monoid-subclasses ];
testHaskellDepends = [
base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
@@ -117955,8 +120890,8 @@ self: {
}:
mkDerivation {
pname = "indentation";
- version = "0.3.2";
- sha256 = "1knazqvr6bk07j7q7835z2d2vs3zyd7i4hzir6aqcdxwhrqm5q7k";
+ version = "0.3.3";
+ sha256 = "0iwnz4j4zkr9xpw5f8p42blgifdj6mqbxpqsci76pic6safp3avq";
libraryHaskellDepends = [
base indentation-core indentation-parsec indentation-trifecta mtl
parsec parsers trifecta
@@ -117970,8 +120905,8 @@ self: {
({ mkDerivation, base, mtl }:
mkDerivation {
pname = "indentation-core";
- version = "0.0.0.1";
- sha256 = "136skn3parvsyfii0ywm8cqfmsysi562944fbb0xsgckx0sq1dr1";
+ version = "0.0.0.2";
+ sha256 = "1l1zk5wz9x0m4ird1qk8shi1fkcm3sq2nwkjj6wz2sicp0xkx6h9";
libraryHaskellDepends = [ base mtl ];
description = "Indentation sensitive parsing combinators core library";
license = stdenv.lib.licenses.bsd3;
@@ -117983,8 +120918,8 @@ self: {
}:
mkDerivation {
pname = "indentation-parsec";
- version = "0.0.0.1";
- sha256 = "12s7ic8i7l2g7knzzab0c6k1s59cjlcdsrwygzh8l6l9azvya5lp";
+ version = "0.0.0.2";
+ sha256 = "1m7jr1s7h4vrx0lbl88gjrpd6zgzalmqzqsv6rn5s17ay5p88dqf";
libraryHaskellDepends = [ base indentation-core mtl parsec ];
testHaskellDepends = [ base parsec tasty tasty-hunit ];
description = "Indentation sensitive parsing combinators for Parsec";
@@ -117997,8 +120932,8 @@ self: {
}:
mkDerivation {
pname = "indentation-trifecta";
- version = "0.0.2";
- sha256 = "0d2mxd1cdcr0zfz618dh4grin4z2bjfv4659i2zsddxm9li0dqis";
+ version = "0.1.0";
+ sha256 = "1za8x4w26ifxvfv5xra5xpykr67ari91c4p0vca89y28q54l9qpj";
libraryHaskellDepends = [
base indentation-core mtl parsers trifecta
];
@@ -118046,18 +120981,21 @@ self: {
}) {};
"indexation" = callPackage
- ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
- , hashable, hashtables, mmorph, potoki, potoki-cereal, profunctors
- , text, transformers, unordered-containers, vector
+ ({ mkDerivation, base, bitvec, bytestring, cereal, cereal-vector
+ , contravariant, deepseq, deferred-folds, dense-int-set, focus
+ , foldl, hashable, list-t, mmorph, potoki, potoki-cereal
+ , profunctors, stm-containers, text, transformers
+ , unordered-containers, vector, vector-th-unbox
}:
mkDerivation {
pname = "indexation";
- version = "0.5.0.1";
- sha256 = "036azy4bnz5xaf0m6dg18yfhi6sljiz9pmap2i8xs8gfbrrl3xsr";
+ version = "0.8";
+ sha256 = "111ikvrmxhqb1idpc1n70hds6slp3c9i15pigmpldj73jxinqihf";
libraryHaskellDepends = [
- base bytestring cereal deferred-folds focus hashable hashtables
- mmorph potoki potoki-cereal profunctors text transformers
- unordered-containers vector
+ base bitvec bytestring cereal cereal-vector contravariant deepseq
+ deferred-folds dense-int-set focus foldl hashable list-t mmorph
+ potoki potoki-cereal profunctors stm-containers text transformers
+ unordered-containers vector vector-th-unbox
];
description = "Tools for entity indexation";
license = stdenv.lib.licenses.mit;
@@ -118116,8 +121054,8 @@ self: {
({ mkDerivation, base, hspec, Only }:
mkDerivation {
pname = "indexed-list-literals";
- version = "0.2.1.1";
- sha256 = "1b4g2196pi7v347gzl1x68qriwwfgr2iddjqfs49h5swh7qqqpfg";
+ version = "0.2.1.2";
+ sha256 = "043xl356q9n1nw2bw8a8msymy18d6f7nwcyrrpzak9qr75dsx5nq";
libraryHaskellDepends = [ base Only ];
testHaskellDepends = [ base hspec ];
description = "Type safe indexed list literals";
@@ -118318,6 +121256,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "inflections_0_4_0_4" = callPackage
+ ({ mkDerivation, base, containers, exceptions, hspec
+ , hspec-megaparsec, megaparsec, QuickCheck, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "inflections";
+ version = "0.4.0.4";
+ sha256 = "0lspb0xpfj4q6wrzgss7pfjmr6xb5clj7y686vsairbkpcj3cfcl";
+ libraryHaskellDepends = [
+ base exceptions megaparsec text unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers hspec hspec-megaparsec megaparsec QuickCheck text
+ ];
+ description = "Inflections library for Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"inflist" = callPackage
({ mkDerivation, base, QuickCheck }:
mkDerivation {
@@ -118340,8 +121298,8 @@ self: {
}:
mkDerivation {
pname = "influxdb";
- version = "1.6.0.7";
- sha256 = "1fafcsrwfwxjzlz69qz9bq0pxc5iym12xnr6zv7j34yj6j96xzb2";
+ version = "1.6.0.9";
+ sha256 = "0xs2bbqgaj6zmk6wrfm21q516qa2x7qfcvfazkkvyv49vvk9i7is";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -118431,6 +121389,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "initialize" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "initialize";
+ version = "0.1.1.0";
+ sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504";
+ libraryHaskellDepends = [ base ];
+ description = "Initialization and Deinitialization of 'Storable' values";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"inj" = callPackage
({ mkDerivation }:
mkDerivation {
@@ -118493,6 +121462,8 @@ self: {
pname = "inline-c";
version = "0.5.6.1";
sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd";
+ revision = "1";
+ editedCabalFile = "0q8wxvsi2gycyv98hw910p87633l9azchnn9783vsknbycsi1c64";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -118554,8 +121525,8 @@ self: {
}:
mkDerivation {
pname = "inline-c-cpp";
- version = "0.2.2.1";
- sha256 = "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci";
+ version = "0.3.0.1";
+ sha256 = "00q4f2rv6ny5cnfyfdwqvmngw2w40jfs5zb1x7zs574w4l31g701";
libraryHaskellDepends = [
base inline-c safe-exceptions template-haskell
];
@@ -118676,8 +121647,8 @@ self: {
pname = "insert-ordered-containers";
version = "0.2.1.0";
sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp";
- revision = "8";
- editedCabalFile = "0ry5jsyimf1dx6013k1bhvsy3vjpg94q7z0sy9yxhmfdf16zb1fa";
+ revision = "9";
+ editedCabalFile = "02d4zqyb9dbahkpcbpgxylrc5xxc0zbw1awj5w0jyrql2g2b6a5f";
libraryHaskellDepends = [
aeson base base-compat hashable lens semigroupoids semigroups text
transformers unordered-containers
@@ -118736,14 +121707,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "inspection-testing_0_3" = callPackage
+ "inspection-testing_0_4" = callPackage
({ mkDerivation, base, containers, ghc, mtl, template-haskell
, transformers
}:
mkDerivation {
pname = "inspection-testing";
- version = "0.3";
- sha256 = "0drrfl1k9y7vm270iwr1l451vifffn3qmxjm92rmdq9sk3kij3al";
+ version = "0.4";
+ sha256 = "04km186267ssaqs18kxjzsbya4jhsbyfj51959clfzbi1bfj0yfb";
libraryHaskellDepends = [
base containers ghc mtl template-haskell transformers
];
@@ -118940,6 +121911,8 @@ self: {
pname = "int-cast";
version = "0.2.0.0";
sha256 = "0s8rqm5d9f4y2sskajsw8ff7q8xp52vwqa18m6bajldp11m9a1p0";
+ revision = "1";
+ editedCabalFile = "111pac97pcrp01zphf96crdx22fnq7ha2s27av0mqki5421rghpm";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base QuickCheck test-framework test-framework-quickcheck2
@@ -118987,8 +121960,10 @@ self: {
}:
mkDerivation {
pname = "integer-logarithms";
- version = "1.0.2.1";
- sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j";
+ version = "1.0.2.2";
+ sha256 = "1hvzbrh8fm1g9fbavdym52pr5n9f2bnfx1parkfizwqlbj6n51ms";
+ revision = "1";
+ editedCabalFile = "1684dkh8j2xqsd85bfsmhv3iam37hasjg4x79mvl6xh7scmpfdbw";
libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
testHaskellDepends = [
base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
@@ -119258,14 +122233,15 @@ self: {
}) {};
"interpolatedstring-perl6" = callPackage
- ({ mkDerivation, base, bytestring, haskell-src-meta
+ ({ mkDerivation, base, bytestring, Cabal, haskell-src-meta, process
, template-haskell, text
}:
mkDerivation {
pname = "interpolatedstring-perl6";
- version = "1.0.0";
- sha256 = "1lx125wzadvbicsaml9wrhxxplc4gd0i4wk3f1apb0kl5nnv5q35";
+ version = "1.0.1";
+ sha256 = "0n3j6qvzp6as5ji93rn0sy873w5hdsplik51lkrah42cl95vmbay";
enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal process ];
libraryHaskellDepends = [
base bytestring haskell-src-meta template-haskell text
];
@@ -119309,8 +122285,8 @@ self: {
({ mkDerivation, array, base, containers, QuickCheck, utility-ht }:
mkDerivation {
pname = "interpolation";
- version = "0.1.0.2";
- sha256 = "1qjh0jx6xx1x80diay8q18basfwkrsm9x0yrqd27ig2mi9drp0qq";
+ version = "0.1.0.3";
+ sha256 = "0j9hdzi59lqq92773f8h17awrm9ghr45k876qc7krq87pgbr95z2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base utility-ht ];
@@ -119461,6 +122437,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "intro_0_5_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, dlist
+ , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers
+ , unordered-containers, writer-cps-mtl
+ }:
+ mkDerivation {
+ pname = "intro";
+ version = "0.5.1.0";
+ sha256 = "0gsj5l0vgvpbdw2vwlr9r869jwc08lqbypp24g33dlnd338pjxzs";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq dlist extra hashable mtl safe
+ text transformers unordered-containers writer-cps-mtl
+ ];
+ testHaskellDepends = [
+ base bytestring containers deepseq dlist extra hashable lens mtl
+ QuickCheck safe text transformers unordered-containers
+ writer-cps-mtl
+ ];
+ description = "Safe and minimal prelude";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"intro-prelude" = callPackage
({ mkDerivation, intro }:
mkDerivation {
@@ -119588,6 +122587,7 @@ self: {
testHaskellDepends = [ base QuickCheck transformers ];
description = "bidirectional arrows, bijective functions, and invariant functors";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"invertible-grammar" = callPackage
@@ -119630,6 +122630,7 @@ self: {
];
description = "invertible transformer instances for HXT Picklers";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"invertible-syntax" = callPackage
@@ -119767,8 +122768,8 @@ self: {
pname = "io-streams";
version = "1.5.0.1";
sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx";
- revision = "1";
- editedCabalFile = "1d7rpwi10rqcry58d4hc651xvk9xzni6n6k22wm9532l14i3x21c";
+ revision = "2";
+ editedCabalFile = "1mcab95d6hm098myh9gp7sh10srigjphgvm8s9pfs7jg5hzghy14";
configureFlags = [ "-fNoInteractiveTests" ];
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder network primitive
@@ -119792,8 +122793,8 @@ self: {
pname = "io-streams-haproxy";
version = "1.0.0.2";
sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp";
- revision = "2";
- editedCabalFile = "0jrasbn4s6ac0691bf88fbflpha2vn24bd45gk0s3znvl395dxgr";
+ revision = "4";
+ editedCabalFile = "06c51a057n5bc9xfbp2m4jz5ds4z1xvmsx5mppch6qfwbz7x5i9l";
libraryHaskellDepends = [
attoparsec base bytestring io-streams network transformers
];
@@ -119827,8 +122828,8 @@ self: {
pname = "io-string-like";
version = "0.1.0.1";
sha256 = "0p8p4xp9qj7h1xa9dyizqpr85j8qjiccj3y9kplbskaqazl9pyqp";
- revision = "1";
- editedCabalFile = "1q10d2pjhy3k549pw3lid2lda5z4790x0vmg1qajwyapm7q5cma6";
+ revision = "2";
+ editedCabalFile = "0fn9zq62js0xybfbhd673hbh5zp0l2v1p2ddknwkclh4i01i03i6";
libraryHaskellDepends = [ base binary bytestring text ];
description = "Classes to handle Prelude style IO functions for different datatypes";
license = stdenv.lib.licenses.bsd3;
@@ -119949,6 +122950,7 @@ self: {
];
description = "Library for IP and MAC addresses";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ip_1_4_1" = callPackage
@@ -120107,8 +123109,8 @@ self: {
}:
mkDerivation {
pname = "iproute";
- version = "1.7.5";
- sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
+ version = "1.7.6";
+ sha256 = "1svczhzy126w7pa5vyfg90xrvi2ym34f47nj4hhcpx13dv06g5wi";
libraryHaskellDepends = [
appar base byteorder containers network
];
@@ -120222,8 +123224,8 @@ self: {
}:
mkDerivation {
pname = "irc-client";
- version = "1.1.0.4";
- sha256 = "1ag1rmsk53v3j5r0raipfc6w9mfc21w92gbanjfdl5nzsr4fzh87";
+ version = "1.1.0.5";
+ sha256 = "13qc5acpkgd80nazlpac3q2viqp76fhq6qjk7fp5dp1w6bhj9qi7";
libraryHaskellDepends = [
base bytestring conduit connection containers contravariant
exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
@@ -120470,24 +123472,24 @@ self: {
}) {};
"iridium" = callPackage
- ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
- , extra, foldl, http-conduit, lifted-base, monad-control
- , multistate, process, split, system-filepath, tagged, text
- , transformers, transformers-base, turtle, unordered-containers
- , vector, xmlhtml, yaml
+ ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
+ , containers, extra, foldl, HTTP, lifted-base, monad-control
+ , multistate, network-uri, process, split, system-filepath, tagged
+ , text, transformers, transformers-base, turtle
+ , unordered-containers, vector, yaml
}:
mkDerivation {
pname = "iridium";
- version = "0.1.5.7";
- sha256 = "0jfsz8j9dq0nfr536wp78k02ffg8xgjm3zqgjgfdm1i0zwi5dcbp";
+ version = "0.1.5.8";
+ sha256 = "02l18z38n3cbrav7lyi3d27393invc216j78xgg7qfpbvhm3pfgw";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- ansi-terminal base bytestring Cabal containers extra foldl
- http-conduit lifted-base monad-control multistate process split
+ aeson ansi-terminal base bytestring Cabal containers extra foldl
+ HTTP lifted-base monad-control multistate network-uri process split
system-filepath tagged text transformers transformers-base turtle
- unordered-containers vector xmlhtml yaml
+ unordered-containers vector yaml
];
executableHaskellDepends = [
base extra multistate text transformers unordered-containers yaml
@@ -120790,6 +123792,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "itcli" = callPackage
+ ({ mkDerivation, base, bytestring, directory, filepath, mtl
+ , optparse-applicative, text, time, uuid, yaml
+ }:
+ mkDerivation {
+ pname = "itcli";
+ version = "0.1.8.3";
+ sha256 = "1ml6k0imkb6wy3fky2fd5q1gkbywm360jmlb6gw8mp8z7ci6ijbg";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring directory filepath mtl optparse-applicative text
+ time uuid yaml
+ ];
+ description = "Issue Tracker for the CLI";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"itemfield" = callPackage
({ mkDerivation, base, brick, data-default, HUnit, microlens
, microlens-th, QuickCheck, random, test-framework
@@ -120978,14 +123999,56 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "iterm-show" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring }:
+ mkDerivation {
+ pname = "iterm-show";
+ version = "0.1.0.1";
+ sha256 = "1wlrn6q3v5a4pqmk3a3syir7szq97g658s1bzrq5p65frs7i7daw";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base base64-bytestring bytestring ];
+ executableHaskellDepends = [ base bytestring ];
+ description = "Enable graphical display of images inline on some terminals";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "iterm-show-JuicyPixels" = callPackage
+ ({ mkDerivation, base, iterm-show, JuicyPixels }:
+ mkDerivation {
+ pname = "iterm-show-JuicyPixels";
+ version = "0.1.0.0";
+ sha256 = "1r4if1izanpz7kc2hl8vcn6iz7p0sk5dqq8rxvrpclcx3dklhh6z";
+ libraryHaskellDepends = [ base iterm-show JuicyPixels ];
+ description = "Orphan Show instances for JuciyPixels image types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "iterm-show-diagrams" = callPackage
+ ({ mkDerivation, base, diagrams-lib, diagrams-rasterific
+ , iterm-show, JuicyPixels
+ }:
+ mkDerivation {
+ pname = "iterm-show-diagrams";
+ version = "0.1.0.0";
+ sha256 = "1szan9v24d8fksxcw3fqvzppf49664xm5y1zdk9yv007r5pfxr4c";
+ libraryHaskellDepends = [
+ base diagrams-lib diagrams-rasterific iterm-show JuicyPixels
+ ];
+ description = "Orphan Show instances for diagrams package that render inline in some terminals";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ival" = callPackage
({ mkDerivation, alg, base, smallcheck, tasty, tasty-smallcheck }:
mkDerivation {
pname = "ival";
- version = "0.1.0.0";
- sha256 = "16iffzyhqm160sy6qskfxr0wrbjic9bxrm8y9f1ych7gmzp3cdwk";
+ version = "0.2.0.0";
+ sha256 = "1djgkxz6npymkzf5802hdcvr40jlc16pmyxd3qpi98f1c1h4rg5x";
libraryHaskellDepends = [ alg base ];
- testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ testHaskellDepends = [
+ alg base smallcheck tasty tasty-smallcheck
+ ];
description = "Intervals";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -121282,8 +124345,8 @@ self: {
}:
mkDerivation {
pname = "ixset";
- version = "1.1";
- sha256 = "147fr6hqvbnlrhy7zpxzg1iiciz4gzk2g281fkp4ylklq1lz9c4v";
+ version = "1.1.1";
+ sha256 = "1wjv6jfkv5z5j3af6dg7zlbir780mshq01x2wzlyav5dwr40di3m";
libraryHaskellDepends = [
base containers safecopy syb syb-with-class template-haskell
];
@@ -121301,8 +124364,8 @@ self: {
}:
mkDerivation {
pname = "ixset-typed";
- version = "0.4";
- sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa";
+ version = "0.4.0.1";
+ sha256 = "135cfc8d39qv02sga03gsym1yfajf0l5ci1s6q9n1xpb9ignblx8";
libraryHaskellDepends = [
base containers deepseq safecopy syb template-haskell
];
@@ -121389,8 +124452,8 @@ self: {
}:
mkDerivation {
pname = "jack";
- version = "0.7.1.3";
- sha256 = "1n0znnk3q8vic47k1vlv6mdqghrklagcwalvz1arsdfvpy74ig4c";
+ version = "0.7.1.4";
+ sha256 = "018lsa5mgl7vb0hrd4jswa40d6w7alfq082brax8p832zf0v5bj2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121534,6 +124597,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "japanese-calendar" = callPackage
+ ({ mkDerivation, base, hspec, QuickCheck, time }:
+ mkDerivation {
+ pname = "japanese-calendar";
+ version = "0.1.0.2";
+ sha256 = "1dkfp2qj588nnd5r3ad37145n3mjm76h9pc2y7ga9s76cvi52xqy";
+ libraryHaskellDepends = [ base time ];
+ testHaskellDepends = [ base hspec QuickCheck time ];
+ description = "Data type of Japanese Calendar (Wareki)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"japanese-holidays" = callPackage
({ mkDerivation, base, doctest, hspec, QuickCheck
, quickcheck-instances, time
@@ -121915,6 +124990,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "jinquantities" = callPackage
+ ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl
+ , parsec, process, quantities, regex-compat
+ }:
+ mkDerivation {
+ pname = "jinquantities";
+ version = "0.1.1";
+ sha256 = "1zrdbd2dkc4n1jycv20a1j8px6lkxdjvnv9l3w7b3z2rajj7rfh2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers mtl parsec ];
+ executableHaskellDepends = [
+ base containers mtl parsec quantities
+ ];
+ testHaskellDepends = [
+ base containers doctest Glob hlint hspec mtl parsec process
+ quantities regex-compat
+ ];
+ description = "Unit conversion and manipulation library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"jmacro" = callPackage
({ mkDerivation, aeson, base, bytestring, containers
, haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec
@@ -121925,6 +125023,8 @@ self: {
pname = "jmacro";
version = "0.6.15";
sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s";
+ revision = "1";
+ editedCabalFile = "07jghfxn4m26q8rksxn4v6pcc8mwcjdlz1ypy7dqsvhzc3hs2s4i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -122011,6 +125111,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "jmonkey" = callPackage
+ ({ mkDerivation, base, casing, free, jmacro }:
+ mkDerivation {
+ pname = "jmonkey";
+ version = "0.1.0.1";
+ sha256 = "1yhmhaa8ykjv3xivd7v10q3zw3pvgf45jk5wsbrr95s2p806n5nf";
+ libraryHaskellDepends = [ base casing free jmacro ];
+ testHaskellDepends = [ base casing free jmacro ];
+ description = "Jmonkey is very restricted but handy EDSL for JavaScript";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"jni" = callPackage
({ mkDerivation, base, bytestring, choice, constraints, containers
, cpphs, deepseq, inline-c, jdk, singletons
@@ -122114,8 +125226,8 @@ self: {
({ mkDerivation, base, haskeline, hspec, HUnit }:
mkDerivation {
pname = "jord";
- version = "0.4.0.0";
- sha256 = "0sa19hr49l71dlvm1wpkw6901zzws12higd4xksk8b81cwrgp8l2";
+ version = "0.4.2.0";
+ sha256 = "0nhkxd8vbygybihm1c20bhn8cfylj94l5jr9f7phkp1667lqxdgc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -122309,6 +125421,8 @@ self: {
pname = "jsaddle";
version = "0.9.5.0";
sha256 = "1b1d8dvj5lqpn0k6ay90jdgm0a05vbchxy4l3r9s4fn4mx56jp9z";
+ revision = "1";
+ editedCabalFile = "1f77rxrmd0rqdz81dqaw5rxxcrsjw7ibw5qp93lkgw6yj531ki99";
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring bytestring containers
deepseq exceptions filepath ghc-prim http-types lens primitive
@@ -122585,6 +125699,8 @@ self: {
pname = "json-autotype";
version = "2.0.0";
sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68";
+ revision = "1";
+ editedCabalFile = "00wbcq9bx6sq6i5756ja6pf016xbpk2kflq20ncdv76zycxdkqnm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -122918,8 +126034,8 @@ self: {
pname = "json-rpc-client";
version = "0.2.5.0";
sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak";
- revision = "6";
- editedCabalFile = "1x5vivxcnmf8igc5m3sh301nlag2kj6n7dgpiw58k0f0cdbh86i3";
+ revision = "9";
+ editedCabalFile = "04b65m8lhk2g2d5x5i637ff3wkgvf4z6dhn5x1pizsj9y3aq35zm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -122936,26 +126052,6 @@ self: {
}) {};
"json-rpc-generic" = callPackage
- ({ mkDerivation, aeson, aeson-generic-compat, base, containers
- , dlist, QuickCheck, quickcheck-simple, scientific, text
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "json-rpc-generic";
- version = "0.2.1.4";
- sha256 = "0zibbxc5fqm9mazfdjbi6angyh5rlcccfd260k667w8lcxc6h7kl";
- libraryHaskellDepends = [
- aeson aeson-generic-compat base containers dlist scientific text
- transformers unordered-containers vector
- ];
- testHaskellDepends = [
- aeson base QuickCheck quickcheck-simple text
- ];
- description = "Generic encoder and decode for JSON-RPC";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "json-rpc-generic_0_2_1_5" = callPackage
({ mkDerivation, aeson, aeson-generic-compat, base, containers
, dlist, QuickCheck, quickcheck-simple, scientific, text
, transformers, unordered-containers, vector
@@ -122973,7 +126069,6 @@ self: {
];
description = "Generic encoder and decode for JSON-RPC";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"json-rpc-server" = callPackage
@@ -122985,8 +126080,8 @@ self: {
pname = "json-rpc-server";
version = "0.2.6.0";
sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn";
- revision = "5";
- editedCabalFile = "0hvkfbgg3jbgs0d2jp5djhpd2qp3q9hs5cr4ds93bc9nyncymyq9";
+ revision = "6";
+ editedCabalFile = "1rfabr679pk605v141gm0ynbp3l6x87s3ip3wa49lwnpab495mxs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -123010,6 +126105,8 @@ self: {
pname = "json-schema";
version = "0.7.4.2";
sha256 = "09bgcc00q1v24rdglw9b24dgi690mlax6abarhcgvgmn22406wp8";
+ revision = "1";
+ editedCabalFile = "0pwmh48z54n0mrwzmgff95mwy1jbmy1rwsk5kmddby86f0j5873g";
libraryHaskellDepends = [
aeson base base-compat-batteries containers generic-aeson
generic-deriving mtl scientific text time unordered-containers
@@ -123031,8 +126128,8 @@ self: {
pname = "json-sop";
version = "0.2.0.3";
sha256 = "0ay2cymy4aar23cixcyqam91bs9x4z0vqiw2k0nvgy9nyqfz2r9h";
- revision = "1";
- editedCabalFile = "1bvmfl6fqdr8fklv8zai5jgzlnv1jf9xy8i656lfz1ys95q9yr48";
+ revision = "2";
+ editedCabalFile = "1lclvvcfvicr05v2nf1xkf21qry2g2bqjhd7gfhza89d571aq3gp";
libraryHaskellDepends = [
aeson base generics-sop lens-sop tagged text time transformers
unordered-containers vector
@@ -123064,8 +126161,8 @@ self: {
}:
mkDerivation {
pname = "json-stream";
- version = "0.4.2.3";
- sha256 = "0ijic6vfrpykzy7j3li94fjmaj1vclvp0in1ymb5z5whvljlynw7";
+ version = "0.4.2.4";
+ sha256 = "1ryv2738ajagb0wdkac5lka1kzprrf85gqxabafmm3g5szllxjl1";
libraryHaskellDepends = [
aeson base bytestring scientific text unordered-containers vector
];
@@ -123487,8 +126584,8 @@ self: {
}:
mkDerivation {
pname = "jukebox";
- version = "0.4.1";
- sha256 = "1vpd5j71x85ni6wmvmifb5fw8h3y77l67a3dsngsdcs22jilbbgw";
+ version = "0.4.2";
+ sha256 = "0vxy06dan6iq03p8p2frzvyab5zaahh4pd37rzqg2vh71m6rqka7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -123627,8 +126724,8 @@ self: {
}:
mkDerivation {
pname = "jvm-binary";
- version = "0.1.0";
- sha256 = "0s64cwr86ipl7gpcgdgx50l7mm5h91njgir4mn2d82fzzq08x881";
+ version = "0.2.0";
+ sha256 = "1pq4v3xzbb9673rvr8qbvyln155v5ric712pf08vvkw1aihwgpa4";
libraryHaskellDepends = [
attoparsec base binary bytestring containers data-binary-ieee754
deepseq deriving-compat mtl template-haskell text vector
@@ -123768,6 +126865,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "kafka" = callPackage
+ ({ mkDerivation }:
+ mkDerivation {
+ pname = "kafka";
+ version = "0.0.0.0";
+ sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j";
+ doHaddock = false;
+ description = "TBA";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"kafka-client" = callPackage
({ mkDerivation, base, bytestring, cereal, digest, dlist, hspec
, hspec-discover, network, QuickCheck, snappy, time, zlib
@@ -124083,13 +127191,17 @@ self: {
}) {};
"kansas-lava-shake" = callPackage
- ({ mkDerivation, base, hastache, kansas-lava, shake, text }:
+ ({ mkDerivation, base, containers, kansas-lava, mustache, shake
+ , text, vector
+ }:
mkDerivation {
pname = "kansas-lava-shake";
- version = "0.2.0";
- sha256 = "197nyj21r2z9a648ljmqkhzdbhy3syzw1rw4xfggn1rhk94px0rl";
+ version = "0.3.0";
+ sha256 = "00mmk0fsv1vdm3xidmv9wa5dwbnka564bhjp2j3jx5i4l7kw4xrb";
enableSeparateDataOutput = true;
- libraryHaskellDepends = [ base hastache kansas-lava shake text ];
+ libraryHaskellDepends = [
+ base containers kansas-lava mustache shake text vector
+ ];
description = "Shake rules for building Kansas Lava projects";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -124169,8 +127281,8 @@ self: {
}:
mkDerivation {
pname = "katip";
- version = "0.6.0.0";
- sha256 = "1ll33qvxlqdja7yljyv1mlc5sy4q8izgdscz6zvbyqnjl9iczrn3";
+ version = "0.6.3.0";
+ sha256 = "0pjd81rp5rhf0nxgqi274zlffhcvd3v8nl60y5pj06wpyn55wx0g";
libraryHaskellDepends = [
aeson async auto-update base bytestring containers either hostname
microlens microlens-th monad-control mtl old-locale resourcet
@@ -124202,8 +127314,8 @@ self: {
}:
mkDerivation {
pname = "katip-elasticsearch";
- version = "0.4.2.0";
- sha256 = "0h6v9jsdc6r1zqz4wgvqr3y0ghqprjbfhlgmwh6q2cjixm3mxw1x";
+ version = "0.5.1.0";
+ sha256 = "0nl88srx0w7i7h14g97qxki91vbwg2ibkcqd4v39a7l7j0rzw0vh";
libraryHaskellDepends = [
aeson async base bloodhound bytestring enclosed-exceptions
exceptions http-client http-types katip retry scientific semigroups
@@ -124320,21 +127432,26 @@ self: {
}:
mkDerivation {
pname = "katydid";
- version = "0.3.1.0";
- sha256 = "0h7w54z9318m85qdd9whlmg3vnkv69gbl8nxc8iz35pw2cbw51r2";
+ version = "0.4.0.2";
+ sha256 = "0gg94j983q6bga015h2wiia2a0miy0s70rsxa46g3k0czpkzgyyg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring containers deepseq either extra hxt ilist json mtl
parsec regex-tdfa text transformers
];
- executableHaskellDepends = [ base mtl ];
+ executableHaskellDepends = [
+ base bytestring containers deepseq either extra hxt ilist json mtl
+ parsec regex-tdfa text transformers
+ ];
testHaskellDepends = [
- base containers directory filepath HUnit hxt ilist json mtl parsec
- primes tasty tasty-hunit text
+ base bytestring containers deepseq directory either extra filepath
+ HUnit hxt ilist json mtl parsec primes regex-tdfa tasty tasty-hunit
+ text transformers
];
benchmarkHaskellDepends = [
- base criterion deepseq directory filepath hxt mtl text
+ base bytestring containers criterion deepseq directory either extra
+ filepath hxt ilist json mtl parsec regex-tdfa text transformers
];
description = "A haskell implementation of Katydid";
license = stdenv.lib.licenses.bsd3;
@@ -124416,18 +127533,20 @@ self: {
}:
mkDerivation {
pname = "kazura-queue";
- version = "0.1.0.2";
- sha256 = "0yywvl9pdy78851cmby6z7f9ivinp83qxfxfmfn68qzavx5m9l0f";
- libraryHaskellDepends = [
- async atomic-primops base containers primitive
- ];
+ version = "0.1.0.4";
+ sha256 = "0zi3b6d97ql3ixml238r50lpmp8aghz2mbc5yi94fyp9xvq42m2y";
+ libraryHaskellDepends = [ atomic-primops base primitive ];
testHaskellDepends = [
- async base containers deepseq doctest exceptions free hspec
- hspec-expectations HUnit mtl QuickCheck transformers
+ async atomic-primops base containers deepseq doctest exceptions
+ free hspec hspec-expectations HUnit mtl primitive QuickCheck
+ transformers
+ ];
+ benchmarkHaskellDepends = [
+ atomic-primops base criterion primitive stm
];
- benchmarkHaskellDepends = [ async base containers criterion stm ];
description = "Fast concurrent queues much inspired by unagi-chan";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"kbq-gu" = callPackage
@@ -124968,8 +128087,8 @@ self: {
pname = "keycode";
version = "0.2.2";
sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan";
- revision = "2";
- editedCabalFile = "0g19sjk2sh1w9ahn93dnvjkim4mqapq0plmdd37179qfgi49qnp8";
+ revision = "3";
+ editedCabalFile = "18dgbpf3xwdm3x9j63vsr5q7l028qvifgc6jmjf1ar4p2wv1fzz0";
libraryHaskellDepends = [
base containers ghc-prim template-haskell
];
@@ -125229,6 +128348,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "kind-apply" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "kind-apply";
+ version = "0.1.0.0";
+ sha256 = "0n2picf38cxfgsi76372h6d25s5kvc32qw7514b2i4ald6qh8aip";
+ libraryHaskellDepends = [ base ];
+ description = "Utilities to work with lists of types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "kind-generics" = callPackage
+ ({ mkDerivation, base, kind-apply }:
+ mkDerivation {
+ pname = "kind-generics";
+ version = "0.1.0.0";
+ sha256 = "1h6pb14b75lphlxzz7q08ihvg2phh082sx6a2zpdk5gwh8qzihpg";
+ libraryHaskellDepends = [ base kind-apply ];
+ description = "Generic programming in GHC style for arbitrary kinds and GADTs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"kinds" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -125270,6 +128411,8 @@ self: {
pname = "kleene";
version = "0";
sha256 = "00hbrmsm19azxxql14y6k7h7z8k4azlmy4y0gimyqbx4nb7swln6";
+ revision = "1";
+ editedCabalFile = "1izdmr7a2d7qssnj732m2qc02inm3hrc882x9nyvz68648pvwwsx";
libraryHaskellDepends = [
base base-compat-batteries containers lattices MemoTrie QuickCheck
range-set-list regex-applicative step-function text transformers
@@ -125342,18 +128485,18 @@ self: {
}) {};
"knead" = callPackage
- ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record
+ ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, storable-record
, storable-tuple, tfp, transformers, utility-ht
}:
mkDerivation {
pname = "knead";
- version = "0.2.3";
- sha256 = "14wi37i3y8hvfiwfs82mg7nanin84if4wlxi3rdg4w3fkdqm9ycl";
+ version = "0.3";
+ sha256 = "0pghy04z5ps1m3v6qmq7pilnflrcswm83c68k2f8d4g56v9lcp40";
libraryHaskellDepends = [
- base llvm-extra llvm-tf storable-record storable-tuple tfp
+ base bool8 llvm-extra llvm-tf storable-record storable-tuple tfp
transformers utility-ht
];
- description = "Repa array processing using LLVM JIT";
+ description = "Repa-like array processing using LLVM JIT";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -125515,8 +128658,8 @@ self: {
pname = "kraken";
version = "0.1.0";
sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k";
- revision = "1";
- editedCabalFile = "0ycdikk0mwy1ys9v29ybiws4fr59arwkpibdx62p9vpdv9f0p9k6";
+ revision = "2";
+ editedCabalFile = "141qx2fb3dimv20qsl2q1bagwcn9i0r72z2ha1w7191m557in319";
libraryHaskellDepends = [
aeson base bytestring http-client http-client-tls mtl
];
@@ -125921,6 +129064,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "lambda-calculus-interpreter" = callPackage
+ ({ mkDerivation, base, tasty, tasty-hunit }:
+ mkDerivation {
+ pname = "lambda-calculus-interpreter";
+ version = "0.1.0.3";
+ sha256 = "0ccvqblggpng130l7i857nh7vdr7yfxv8s8r17bd05ckclp21k0f";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base tasty tasty-hunit ];
+ description = "Lambda Calculus interpreter";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lambda-canvas" = callPackage
({ mkDerivation, base, GLUT, mtl, OpenGL, time }:
mkDerivation {
@@ -126078,8 +129236,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot";
- version = "5.1.0.2";
- sha256 = "1nzjlxyzrri8zw67flqn1arz10mgbmyglhvf6pg4r8w78iwg5nk3";
+ version = "5.1.0.4";
+ sha256 = "1pywangzqf85pqhh5sn10vpk0wrd7ff5p29jrsi6sxdz5lyb7svk";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -126103,8 +129261,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-core";
- version = "5.1.0.2";
- sha256 = "1n0cqkbiadc169vq7pj5zwvi3yay6db60q8pdk4kci0s9clz4161";
+ version = "5.1.0.4";
+ sha256 = "1cnp0w47fp0s1zlyb0d90xj5ynwfmlnzm5inc5lhbichwgqcwfzk";
libraryHaskellDepends = [
base binary bytestring containers dependent-map dependent-sum
dependent-sum-template directory edit-distance filepath haskeline
@@ -126129,8 +129287,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-haskell-plugins";
- version = "5.1.0.3";
- sha256 = "1hka7kb2j5nqzv9jljjyylfyrf5z3hsfp2sfgv95y5qsr2b6g96a";
+ version = "5.1.0.4";
+ sha256 = "19fl14c1j7p9qaf26g1qkmxvmw9r7hvxqmp9jxmmwbp7xlc3664v";
libraryHaskellDepends = [
array arrows base bytestring containers data-memocombinators
directory filepath haskell-src-exts-simple hoogle HTTP IOSpec
@@ -126150,8 +129308,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-irc-plugins";
- version = "5.1.0.1";
- sha256 = "1axixb6q5j7vs93q9d3n5v7l57nvnbjpry1ww8vaqlm71m1z4l2f";
+ version = "5.1.0.4";
+ sha256 = "0kscksdqjysk9amxwb1xjh475pbwq22mf9as5kqwn72c8s75ngaf";
libraryHaskellDepends = [
base bytestring containers directory filepath lambdabot-core
lifted-base mtl network SafeSemaphore split time
@@ -126170,8 +129328,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-misc-plugins";
- version = "5.1.0.1";
- sha256 = "1bg15z7k21l0dwnkvprxvx5jcvs5igl8fqffg11y7h0r74f4yhks";
+ version = "5.1.0.4";
+ sha256 = "169grwgg5x63qhls16c7xd0p78da38r275mar27il78az7qfgn8d";
libraryHaskellDepends = [
base bytestring containers filepath hstatsd lambdabot-core
lifted-base mtl network network-uri parsec process random random-fu
@@ -126190,8 +129348,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-novelty-plugins";
- version = "5.1.0.1";
- sha256 = "1ispnp12i2f8fcs11nay3mww8sa6dwx7lkl6d6gc9cfhzgwih6gi";
+ version = "5.1.0.4";
+ sha256 = "1m6n0asp8pn12wif5jv0nvjipzgh7mzzxa17j4mzd7mdqi4dma7z";
libraryHaskellDepends = [
base binary brainfuck bytestring containers dice directory
lambdabot-core misfortune process random-fu regex-tdfa unlambda
@@ -126207,8 +129365,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-reference-plugins";
- version = "5.1.0.1";
- sha256 = "0s5923hsl1pzyayi4954livp4rsgx84slwpnr7mq8nhfsdxm84wp";
+ version = "5.1.0.4";
+ sha256 = "0qavp784p5qdb2plhhgk1idrjxcazzn4a94pg8syymb24fzjvm1w";
libraryHaskellDepends = [
base bytestring containers HTTP lambdabot-core mtl network
network-uri oeis process regex-tdfa split tagsoup utf8-string
@@ -126223,8 +129381,8 @@ self: {
}:
mkDerivation {
pname = "lambdabot-social-plugins";
- version = "5.1.0.1";
- sha256 = "1p46qyb2x7h37xs9y69k1mc5v84rwvkrgkdwkl4cw6pmnkmjnl42";
+ version = "5.1.0.4";
+ sha256 = "0kjjsnrrsrcdvkn75dsbw7afx8y87i36i6lk54hs6cg88zndailz";
libraryHaskellDepends = [
base binary bytestring containers lambdabot-core mtl split time
];
@@ -126236,8 +129394,8 @@ self: {
({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }:
mkDerivation {
pname = "lambdabot-trusted";
- version = "5.1.0.1";
- sha256 = "11qvpxgv4xbs8iw0lix8mdj174dzj0gwgny7vgvs4vd9pi37sb7r";
+ version = "5.1.0.4";
+ sha256 = "1mlyhxc93d3466xhxqlyzg1c8988spzbyk4d5l0c05l1m0xlq77j";
libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
description = "Lambdabot trusted code";
license = "GPL";
@@ -126650,20 +129808,20 @@ self: {
"language-ats" = callPackage
({ mkDerivation, alex, ansi-wl-pprint, array, base
- , composition-prelude, containers, cpphs, criterion, deepseq, happy
- , hspec, hspec-dirstream, microlens, recursion, system-filepath
+ , composition-prelude, containers, criterion, deepseq, happy, hspec
+ , hspec-dirstream, microlens, recursion, system-filepath
, transformers
}:
mkDerivation {
pname = "language-ats";
- version = "1.7.0.3";
- sha256 = "0lmqic0pwn1f5l5zm3830ipyfjv6cj799kzgx0ia0mdy9wh8pfg9";
+ version = "1.7.0.4";
+ sha256 = "1dqmb2wp47smjg55klwb2si8v14yahkrqzgzw9sssla9kyqna46n";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-wl-pprint array base composition-prelude containers deepseq
microlens recursion transformers
];
- libraryToolDepends = [ alex cpphs happy ];
+ libraryToolDepends = [ alex happy ];
testHaskellDepends = [
base hspec hspec-dirstream system-filepath
];
@@ -126680,8 +129838,8 @@ self: {
}:
mkDerivation {
pname = "language-bash";
- version = "0.7.1";
- sha256 = "1p8ikx9iq9ssvm8b99hly7pqqw09588xjkgf5397kg5xpv8ga4gp";
+ version = "0.8.0";
+ sha256 = "16lkqy1skc82cyxsh313184dbm31hrsi3w1729ci8lw8dybmz6ax";
libraryHaskellDepends = [ base parsec pretty transformers ];
testHaskellDepends = [
base parsec process QuickCheck tasty tasty-expected-failure
@@ -126721,8 +129879,10 @@ self: {
}:
mkDerivation {
pname = "language-c";
- version = "0.8.1";
- sha256 = "0sdkjj0hq8p69fcdm6ljbjkjvrsrb8a6rl5dq6dj6byj32ajrm3d";
+ version = "0.8.2";
+ sha256 = "05ff3ywh2lpxgd00nv6y3jnqpdl6bg0f2yn3csd043rv4srd6adp";
+ revision = "1";
+ editedCabalFile = "1xg49j4bykgdm6l14m65wyz8r3s4v4dqc7a9zjcsr12ffkiv8nam";
libraryHaskellDepends = [
array base bytestring containers deepseq directory filepath pretty
process syb
@@ -126774,6 +129934,8 @@ self: {
pname = "language-c-quote";
version = "0.12.2";
sha256 = "15c6rdj91768jf8lqzf4fkbi8k6kz9gch5w81x6qzy2l256rncgb";
+ revision = "1";
+ editedCabalFile = "099w1lln1vm000sf06wrmq6gya5sx2w4flrlwqz2c8wwvv8c9j9h";
libraryHaskellDepends = [
array base bytestring containers exception-mtl
exception-transformers filepath haskell-src-meta mainland-pretty
@@ -126872,6 +130034,29 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "language-docker_8_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
+ , QuickCheck, split, template-haskell, text, th-lift, time
+ }:
+ mkDerivation {
+ pname = "language-docker";
+ version = "8.0.0";
+ sha256 = "00zryknsc0717ysq8g1ip5dm70v8b33lfrscbzpdcw5dd2j32k7n";
+ libraryHaskellDepends = [
+ base bytestring containers free megaparsec mtl prettyprinter split
+ template-haskell text th-lift time
+ ];
+ testHaskellDepends = [
+ base bytestring containers directory filepath free Glob hspec HUnit
+ megaparsec mtl prettyprinter process QuickCheck split
+ template-haskell text th-lift time
+ ];
+ description = "Dockerfile parser, pretty-printer and embedded DSL";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"language-dockerfile" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath, free
, Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck
@@ -127022,10 +130207,10 @@ self: {
}:
mkDerivation {
pname = "language-glsl";
- version = "0.2.1";
- sha256 = "08hrl9s8640a61npdshjrw5q3j3b2gvms846cf832j0n19mi24h0";
+ version = "0.3.0";
+ sha256 = "0hdg67ainlqpjjghg3qin6fg4p783m0zmjqh4rd5gyizwiplxkp1";
revision = "1";
- editedCabalFile = "1dlax6dfjc8ca0p5an3k1f29b078hgb44aj48njf97shvl9hqf5v";
+ editedCabalFile = "10ac9pk4jy75k03j1ns4b5136l4kw8krr2d2nw2fdmpm5jzyghc5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base parsec prettyclass ];
@@ -127107,6 +130292,8 @@ self: {
pname = "language-java";
version = "0.2.9";
sha256 = "03hrj8hgyjmw2fvvk4ik30fdmbi3hndpkvf1bqcnpzqy5anwh58x";
+ revision = "1";
+ editedCabalFile = "0fnbg9b8isyk8dpmggh736mms7a2m65956y1z15wds63imzhs2ik";
libraryHaskellDepends = [ array base parsec pretty ];
libraryToolDepends = [ alex ];
testHaskellDepends = [
@@ -127378,6 +130565,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "language-ocaml" = callPackage
+ ({ mkDerivation, alex, array, base, containers, data-default
+ , extensible-effects, happy, interpolate, lens, megaparsec, mtl
+ , prettyprinter, string-qq, tasty, tasty-hunit, zlib
+ }:
+ mkDerivation {
+ pname = "language-ocaml";
+ version = "0.1.31";
+ sha256 = "1vkqy5hdyqq5c22cccyvj1ci5srimpd5w8qwrwrrq9d5yai061w6";
+ libraryHaskellDepends = [
+ array base containers data-default extensible-effects interpolate
+ lens megaparsec mtl prettyprinter string-qq tasty tasty-hunit
+ ];
+ libraryPkgconfigDepends = [ zlib ];
+ libraryToolDepends = [ alex happy ];
+ testHaskellDepends = [
+ base interpolate megaparsec prettyprinter string-qq tasty
+ tasty-hunit
+ ];
+ description = "Language tools for manipulating OCaml programs in Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) zlib;};
+
"language-openscad" = callPackage
({ mkDerivation, attoparsec, base, bytestring }:
mkDerivation {
@@ -127430,8 +130641,8 @@ self: {
}:
mkDerivation {
pname = "language-puppet";
- version = "1.3.20";
- sha256 = "074k9lk7wqspbn193qa78f1nabv0s27dza9qh7qzni4v95zz5k4r";
+ version = "1.3.20.1";
+ sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -127461,22 +130672,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "language-puppet_1_3_20_1" = callPackage
+ "language-puppet_1_4_0" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
, base16-bytestring, bytestring, case-insensitive, containers
, cryptonite, directory, exceptions, filecache, filepath
, formatting, Glob, hashable, hruby, hslogger, hspec
, hspec-megaparsec, http-api-data, http-client, lens, lens-aeson
, megaparsec, memory, mtl, operational, optparse-applicative
- , parallel-io, parsec, pcre-utils, process, protolude, random
- , regex-pcre-builtin, scientific, servant, servant-client, split
- , stm, strict-base-types, temporary, text, time, transformers, unix
- , unordered-containers, vector, yaml
+ , parallel-io, parsec, parser-combinators, pcre-utils, process
+ , protolude, random, regex-pcre-builtin, scientific, servant
+ , servant-client, split, stm, strict-base-types, temporary, text
+ , time, transformers, unix, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "language-puppet";
- version = "1.3.20.1";
- sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs";
+ version = "1.4.0";
+ sha256 = "169kzd6csar170j0zqzisa82jxs5xfang17ys6aa4m1jx0nbh4mz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -127485,10 +130696,10 @@ self: {
case-insensitive containers cryptonite directory exceptions
filecache filepath formatting hashable hruby hslogger hspec
http-api-data http-client lens lens-aeson megaparsec memory mtl
- operational parsec pcre-utils process protolude random
- regex-pcre-builtin scientific servant servant-client split stm
- strict-base-types text time transformers unix unordered-containers
- vector yaml
+ operational parsec parser-combinators pcre-utils process protolude
+ random regex-pcre-builtin scientific servant servant-client split
+ stm strict-base-types text time transformers unix
+ unordered-containers vector yaml
];
executableHaskellDepends = [
aeson ansi-wl-pprint base bytestring containers Glob hslogger
@@ -127798,8 +131009,8 @@ self: {
}:
mkDerivation {
pname = "lapack-ffi-tools";
- version = "0.1.0.1";
- sha256 = "0cddhc6hm72sjkj3i5f38z3bf4m0cy44jnbgv2v5ck5x0h55173w";
+ version = "0.1.1";
+ sha256 = "1y3h69mkbjidl146y1w0symk8rgpir5gb5914ymmg83nsyyl16vk";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -127912,8 +131123,8 @@ self: {
({ mkDerivation, base, containers, utility-ht }:
mkDerivation {
pname = "latex";
- version = "0.1.0.3";
- sha256 = "1linwqab6z2s91vdxr874vk7rg7gv1ckabsxwmlr80gnhdfgyhmp";
+ version = "0.1.0.4";
+ sha256 = "10m0l0wlrkkl474sdmi7cl6w6kqyqzcp05h7jdacxhzbxyf8nahw";
libraryHaskellDepends = [ base containers utility-ht ];
description = "Parse, format and process LaTeX files";
license = stdenv.lib.licenses.bsd3;
@@ -128020,6 +131231,8 @@ self: {
pname = "lattices";
version = "1.7.1.1";
sha256 = "1byx2hmmh2213afdcsjxf3mvq3h9bwkl5wrvzxv1yqvd9jiqjz3r";
+ revision = "1";
+ editedCabalFile = "18182vlzaz5kzcn2j0k1jmdl8kgqmnpjc3ynsi7v6jdl3vig89dr";
libraryHaskellDepends = [
base base-compat containers deepseq hashable semigroupoids tagged
universe-base universe-reverse-instances unordered-containers
@@ -128358,6 +131571,8 @@ self: {
pname = "lazysplines";
version = "0.2";
sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y";
+ revision = "1";
+ editedCabalFile = "0781158jza2q6zdd7z0szsnsw1kvsbhiijivbi61rridjgv1yq23";
libraryHaskellDepends = [ base ];
description = "Differential solving with lazy splines";
license = stdenv.lib.licenses.bsd3;
@@ -128529,25 +131744,23 @@ self: {
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "leancheck";
- version = "0.7.1";
- sha256 = "184z6n86jg5vmd5f02qzg62hm14snrk5d9knsf72gayyj4fla1kh";
+ version = "0.7.7";
+ sha256 = "0ymzs3w7nfagpcyh4f57f1wi1gr72k7pbkh729jrxxqgqhd84bvd";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base ];
- description = "Cholesterol-free property-based testing";
+ description = "Enumerative property-based testing";
license = stdenv.lib.licenses.bsd3;
}) {};
- "leancheck_0_7_3" = callPackage
- ({ mkDerivation, base, template-haskell }:
+ "leancheck-enum-instances" = callPackage
+ ({ mkDerivation, base, enum-types, leancheck }:
mkDerivation {
- pname = "leancheck";
- version = "0.7.3";
- sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9";
- libraryHaskellDepends = [ base template-haskell ];
- testHaskellDepends = [ base ];
- description = "Enumerative property-based testing";
+ pname = "leancheck-enum-instances";
+ version = "0.1.0.0";
+ sha256 = "0l14npnkwdr3vcdjv2b20a0g3cka0nd93cm6hrq16dcphm1ckaj1";
+ libraryHaskellDepends = [ base enum-types leancheck ];
+ description = "listable instances for small enum types";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"leankit-api" = callPackage
@@ -128601,17 +131814,21 @@ self: {
}) {};
"learn-physics" = callPackage
- ({ mkDerivation, base, gloss, gnuplot, hmatrix, vector-space }:
+ ({ mkDerivation, base, gloss, gnuplot, hmatrix, not-gloss
+ , spatial-math, vector-space
+ }:
mkDerivation {
pname = "learn-physics";
- version = "0.6.2";
- sha256 = "0j69q7jyznjjizkyyn032dfc1g9r6fssxp4b183bapj1xp9n116j";
+ version = "0.6.3";
+ sha256 = "0nhc53l963fsviw3yqz7yxwbjwxsrp8s4jckffbg6hl8npakhirh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base gloss gnuplot hmatrix vector-space
+ base gloss gnuplot hmatrix not-gloss spatial-math vector-space
+ ];
+ executableHaskellDepends = [
+ base gloss gnuplot not-gloss spatial-math
];
- executableHaskellDepends = [ base gloss gnuplot ];
description = "Haskell code for learning physics";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -128949,6 +132166,8 @@ self: {
pname = "lens-accelerate";
version = "0.2.0.0";
sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk";
+ revision = "1";
+ editedCabalFile = "0ggm157i4bmgh7k0dv9zncgn4agwk7zn5wvsknxsnfqzy45qabi9";
libraryHaskellDepends = [ accelerate base lens ];
description = "Instances to mix lens with accelerate";
license = stdenv.lib.licenses.bsd3;
@@ -129013,8 +132232,8 @@ self: {
}:
mkDerivation {
pname = "lens-family";
- version = "1.2.2";
- sha256 = "0fs34wdhmfln06dnmgnbzgjiib6yb6z4ybcxqibal3amg7jlv8nx";
+ version = "1.2.3";
+ sha256 = "0a8fvvc3fsi5fzk5bnqvbgdz22xvvw55nyfac6411q0pm6vy4nc0";
libraryHaskellDepends = [
base containers lens-family-core mtl transformers
];
@@ -129026,8 +132245,8 @@ self: {
({ mkDerivation, base, containers, transformers }:
mkDerivation {
pname = "lens-family-core";
- version = "1.2.2";
- sha256 = "0a26rbgwq9z7lp52zkvwz13sjd35hr06xxc6zz4sglpjc4dqkzlm";
+ version = "1.2.3";
+ sha256 = "009rf10pj1cb50v44cc1pq7qvfrmkkk9dikahs9qmvbvgl3mykwi";
libraryHaskellDepends = [ base containers transformers ];
description = "Haskell 98 Lens Families";
license = stdenv.lib.licenses.bsd3;
@@ -129061,13 +132280,25 @@ self: {
({ mkDerivation, base, ghc-prim, profunctors, tagged }:
mkDerivation {
pname = "lens-labels";
- version = "0.2.0.1";
- sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj";
+ version = "0.2.0.2";
+ sha256 = "1s23klkxckly91yfn194bbd3g8lq2x5ykp2mx6730wh2izzwiblw";
libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
description = "Integration of lenses with OverloadedLabels";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lens-labels_0_3_0_1" = callPackage
+ ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
+ mkDerivation {
+ pname = "lens-labels";
+ version = "0.3.0.1";
+ sha256 = "0zz2w01knsj1zn9vj8g3dbhvh0sgnibr5wm9dn91qv0bmps745z7";
+ libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
+ description = "Integration of lenses with OverloadedLabels";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lens-misc" = callPackage
({ mkDerivation, base, lens, tagged, template-haskell }:
mkDerivation {
@@ -129114,8 +132345,8 @@ self: {
pname = "lens-properties";
version = "4.11.1";
sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g";
- revision = "1";
- editedCabalFile = "1b9db7dbfq46q63y6w1471nffj77rb363rk4b1l3l23g15cq6a5i";
+ revision = "2";
+ editedCabalFile = "1b14fcncz2yby0d4jhx2h0ma6nx0fd1z7hrg1va4h7zn06m99482";
libraryHaskellDepends = [ base lens QuickCheck transformers ];
description = "QuickCheck properties for lens";
license = stdenv.lib.licenses.bsd3;
@@ -129162,6 +132393,8 @@ self: {
pname = "lens-sop";
version = "0.2.0.2";
sha256 = "16bd95cwqiprz55s5272mv6wiw5pmv6mvihviiwbdbilhq400s3z";
+ revision = "1";
+ editedCabalFile = "0k7xdwj64kd56kjh7ghjwm79rjwjqxlw5nwzwj0cq5q56vb340jm";
libraryHaskellDepends = [
base fclabels generics-sop transformers
];
@@ -129223,6 +132456,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "lens-typelevel" = callPackage
+ ({ mkDerivation, base, singletons }:
+ mkDerivation {
+ pname = "lens-typelevel";
+ version = "0.1.1.0";
+ sha256 = "0lsdp6rgacsa13fppa2dfn2nz8cdrvj5clmlshzrv1h0423hfgbp";
+ libraryHaskellDepends = [ base singletons ];
+ description = "Type-level lenses using singletons";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lens-utils" = callPackage
({ mkDerivation, aeson, base, containers, data-default, lens
, monoid, split, template-haskell
@@ -129285,8 +132529,8 @@ self: {
}:
mkDerivation {
pname = "lentil";
- version = "1.0.11.3";
- sha256 = "0kb9fydcv0skp94bhvhbqggam8vrq2wv5iradxmggaf41h0ly123";
+ version = "1.1.0.0";
+ sha256 = "0qw6nvhlczqywwzinsj0x5p2xw8490bbizl2lmj48dr71mndxdz0";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -129574,8 +132818,8 @@ self: {
}:
mkDerivation {
pname = "lhs2tex";
- version = "1.20";
- sha256 = "0fmhvxi1a839h3i6s2aqckh64bc0qyp4hbzc3wp85zr5gmzix1df";
+ version = "1.22";
+ sha256 = "1g9966m4pw5rp7a83839k46jmih64rn6w0xnmjlrl0df9ddkpsky";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [
@@ -129934,8 +133178,8 @@ self: {
}:
mkDerivation {
pname = "libmpd";
- version = "0.9.0.8";
- sha256 = "0kpdj4ciwrfd6vmr60y7c276h5z2r40avs26a0x8s51rbr00lasq";
+ version = "0.9.0.9";
+ sha256 = "1931m23iqb4wddpdidm4ph746zpaw41kkjzmb074j7yyfpk7x1jv";
libraryHaskellDepends = [
attoparsec base bytestring containers data-default-class filepath
mtl network old-locale text time utf8-string
@@ -129964,6 +133208,7 @@ self: {
];
description = "Bindings to the nix package manager";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"libnotify" = callPackage
@@ -130325,6 +133570,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {xslt = null;};
+ "libyaml" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, resourcet }:
+ mkDerivation {
+ pname = "libyaml";
+ version = "0.1.0.0";
+ sha256 = "01vgzf05ad1v8h65n12fwd2whldnqhlv7cbcaf08m3ck2viqimlw";
+ libraryHaskellDepends = [ base bytestring conduit resourcet ];
+ description = "Low-level, streaming YAML interface";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"libzfs" = callPackage
({ mkDerivation, base, mtl, nvpair, transformers, zfs }:
mkDerivation {
@@ -130401,6 +133657,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lift-generics" = callPackage
@@ -130441,8 +133698,8 @@ self: {
}:
mkDerivation {
pname = "lifted-async";
- version = "0.10.0.2";
- sha256 = "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf";
+ version = "0.10.0.3";
+ sha256 = "131bh83yc3jhy0hwgslvs9p9clgl4i2hhvwz2xgx7igpbhsrrl43";
libraryHaskellDepends = [
async base constraints lifted-base monad-control transformers-base
];
@@ -130495,6 +133752,7 @@ self: {
];
description = "lifted IO operations from the base library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lifted-protolude" = callPackage
@@ -130521,8 +133779,8 @@ self: {
}:
mkDerivation {
pname = "lifted-stm";
- version = "0.1";
- sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0";
+ version = "0.2";
+ sha256 = "115yh4rpm7z97jrc088g5jb49amr31kz5sdllpydq3h1yi1wlmbq";
libraryHaskellDepends = [
array base monad-finally stm transformers transformers-abort
transformers-base transformers-compat
@@ -130928,22 +134186,22 @@ self: {
"linear-code" = callPackage
({ mkDerivation, base, containers, data-default
, ghc-typelits-knownnat, ghc-typelits-natnormalise, HaskellForMaths
- , matrix, QuickCheck, random, random-shuffle, smallcheck, tasty
- , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+ , matrix-static, QuickCheck, random, random-shuffle, smallcheck
+ , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck
}:
mkDerivation {
pname = "linear-code";
- version = "0.1.1";
- sha256 = "0dyz7j6y6ayxd2367pkrln78zr2hx1bygswsy840hjf4xhm30a1b";
+ version = "0.2.0";
+ sha256 = "14d4gmpqx9x9acaldml7hf64fbpdrncn5akgid1scnqv1jzc9197";
libraryHaskellDepends = [
base containers data-default ghc-typelits-knownnat
- ghc-typelits-natnormalise HaskellForMaths matrix random
+ ghc-typelits-natnormalise HaskellForMaths matrix-static random
random-shuffle
];
testHaskellDepends = [
base containers data-default ghc-typelits-knownnat
- ghc-typelits-natnormalise HaskellForMaths matrix QuickCheck random
- random-shuffle smallcheck tasty tasty-hunit tasty-quickcheck
+ ghc-typelits-natnormalise HaskellForMaths matrix-static QuickCheck
+ random random-shuffle smallcheck tasty tasty-hunit tasty-quickcheck
tasty-smallcheck
];
description = "A simple library for linear codes (coding theory, error correction)";
@@ -130995,17 +134253,12 @@ self: {
}) {};
"linear-socket" = callPackage
- ({ mkDerivation, base, bytestring, hlint, hspec, network
- , tasty-hspec
- }:
+ ({ mkDerivation, base, bytestring, hspec, network, tasty-hspec }:
mkDerivation {
pname = "linear-socket";
- version = "0.3.3.2";
- sha256 = "1a3ddpay2wyl5bwlnysx037ca0x0bh93ingxl6c2wlxab351zm4h";
- isLibrary = true;
- isExecutable = true;
+ version = "0.3.3.3";
+ sha256 = "0bi2idqny1y5d63xhryxl085plc7w3ybk6fgj9xsp6scyxdx8p82";
libraryHaskellDepends = [ base bytestring network ];
- executableHaskellDepends = [ base hlint ];
testHaskellDepends = [ base hspec network tasty-hspec ];
description = "Typed sockets";
license = stdenv.lib.licenses.gpl3;
@@ -131910,10 +135163,10 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "list-zip-def";
- version = "0.1.0.1";
- sha256 = "07fasgp9vagsqaaikrn38hxf7dbpfrjcrp97dn72pss7adz7yi6h";
+ version = "0.1.0.2";
+ sha256 = "15123r7a52qb6dcxy1bxid8llykx439srqripmvji3rizwlqaa89";
libraryHaskellDepends = [ base ];
- description = "Provides zips where the combining doesn't stop premature, but instead uses default values";
+ description = "Provides zips with default values";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -131971,26 +135224,35 @@ self: {
}) {};
"liszt" = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, deepseq
- , directory, exceptions, filepath, fsnotify, network, reflection
- , scientific, sendfile, stm, stm-delay, text, transformers
- , unordered-containers, winery
+ ({ mkDerivation, base, binary, bytestring, cereal, containers, cpu
+ , deepseq, directory, exceptions, filepath, fsnotify, gauge
+ , network, reflection, scientific, sendfile, stm, stm-delay, text
+ , transformers, unordered-containers, vector, vector-th-unbox
+ , winery
}:
mkDerivation {
pname = "liszt";
- version = "0.1";
- sha256 = "0ffqpplasb6d0kbj6n50811a5qawaghv9s9vfszm6z2dw27zkjwd";
+ version = "0.2";
+ sha256 = "1dy7c1l64ylgyxsi5ivxdc4kikaja4yhakx2z5i1sdk7kc7gkr51";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base binary bytestring containers deepseq directory exceptions
- filepath fsnotify network reflection scientific sendfile stm
- stm-delay text transformers unordered-containers winery
+ base binary bytestring cereal containers cpu deepseq directory
+ exceptions filepath fsnotify network reflection scientific sendfile
+ stm stm-delay text transformers unordered-containers vector
+ vector-th-unbox winery
];
executableHaskellDepends = [
- base binary bytestring containers deepseq directory exceptions
- filepath fsnotify network reflection scientific sendfile stm
- stm-delay text transformers unordered-containers winery
+ base binary bytestring cereal containers cpu deepseq directory
+ exceptions filepath fsnotify network reflection scientific sendfile
+ stm stm-delay text transformers unordered-containers vector
+ vector-th-unbox winery
+ ];
+ benchmarkHaskellDepends = [
+ base binary bytestring cereal containers cpu deepseq directory
+ exceptions filepath fsnotify gauge network reflection scientific
+ sendfile stm stm-delay text transformers unordered-containers
+ vector vector-th-unbox winery
];
description = "Append only key-list database";
license = stdenv.lib.licenses.bsd3;
@@ -132236,18 +135498,18 @@ self: {
}) {};
"llvm-extra" = callPackage
- ({ mkDerivation, base, bifunctors, containers, cpuid, llvm-tf
- , non-empty, tfp, transformers, unsafe, utility-ht
+ ({ mkDerivation, base, bifunctors, bool8, containers, cpuid
+ , llvm-tf, non-empty, tfp, transformers, unsafe, utility-ht
}:
mkDerivation {
pname = "llvm-extra";
- version = "0.7.3";
- sha256 = "12h3c86i8hps26rgy1s8m7rpmp7v6sms7m3bnq7l22qca7dny58a";
+ version = "0.8.0.1";
+ sha256 = "0hnad3cqrvaijnczjy0krbf0szxf0573c5g37746xspwsjy42srd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bifunctors containers cpuid llvm-tf non-empty tfp transformers
- unsafe utility-ht
+ base bifunctors bool8 containers cpuid llvm-tf non-empty tfp
+ transformers unsafe utility-ht
];
description = "Utility functions for the llvm interface";
license = stdenv.lib.licenses.bsd3;
@@ -132275,8 +135537,8 @@ self: {
}:
mkDerivation {
pname = "llvm-ffi-tools";
- version = "0.0";
- sha256 = "18lfa6fzpcxp6j95wbi5axm58ipzwn98rx3d1c54zdkjhzrl507x";
+ version = "0.0.0.1";
+ sha256 = "0nicgcdlywb8w5fr7hi5hgayv9phwslp5s47p2c30kavj7c3f3zk";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -132369,8 +135631,37 @@ self: {
pname = "llvm-hs";
version = "6.3.0";
sha256 = "10v13f0pcsjaz7lhpg5wr520qp9rgajbv5c3pqx4v79nmfv797jd";
+ revision = "2";
+ editedCabalFile = "08rm1y7icxp2bdmv65n5nxg5mkppqpqd3m62n50gk6991kki9qdf";
+ setupHaskellDepends = [ base Cabal containers ];
+ libraryHaskellDepends = [
+ array attoparsec base bytestring containers exceptions llvm-hs-pure
+ mtl template-haskell transformers utf8-string
+ ];
+ libraryToolDepends = [ llvm-config ];
+ testHaskellDepends = [
+ base bytestring containers llvm-hs-pure mtl pretty-show process
+ QuickCheck tasty tasty-hunit tasty-quickcheck temporary
+ transformers
+ ];
+ description = "General purpose LLVM bindings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {llvm-config = null;};
+
+ "llvm-hs_7_0_1" = callPackage
+ ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+ , containers, exceptions, llvm-config, llvm-hs-pure, mtl
+ , pretty-show, process, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, temporary, transformers
+ , utf8-string
+ }:
+ mkDerivation {
+ pname = "llvm-hs";
+ version = "7.0.1";
+ sha256 = "1ghgmmks22ra6ivhwhy65yj9ihr51lbhwdghm52pna5f14brhlyy";
revision = "1";
- editedCabalFile = "01kmqdma80qzfpzikny0xm69q0ikv5fy3kw4p6mpg15kkypwmcpg";
+ editedCabalFile = "0nxyjcnsph4mlyxqy47m67ayd4mnpxx3agy5vx7f4v74bg4xx44a";
setupHaskellDepends = [ base Cabal containers ];
libraryHaskellDepends = [
array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -132428,6 +135719,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "llvm-hs-pure_7_0_0" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, fail
+ , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "llvm-hs-pure";
+ version = "7.0.0";
+ sha256 = "1b82cin889qkyp9qv5p3yk7wq7ibnx2v9pk0mpvk6k9ca7fpr7dg";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers fail mtl template-haskell
+ transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base containers mtl tasty tasty-hunit tasty-quickcheck transformers
+ ];
+ description = "Pure Haskell LLVM functionality (no FFI)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"llvm-ht" = callPackage
({ mkDerivation, base, bytestring, directory, mtl, process
, type-level
@@ -132509,8 +135821,8 @@ self: {
}:
mkDerivation {
pname = "llvm-tf";
- version = "3.1.1";
- sha256 = "0mhlz1jv81rl353qp0vbm39qz15yms9n0xlb0s27jj88yf66zks1";
+ version = "3.1.1.1";
+ sha256 = "1rqszg06r8md7cgw2zgf30yvri4isndj608r9l8grqfnyi4lfjay";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -132659,8 +135971,8 @@ self: {
}:
mkDerivation {
pname = "load-env";
- version = "0.2.0.1";
- sha256 = "1xkk72lfpb4fbnmm7wqxxl1v7jwk9b6da53i90k3dvypakl4gryb";
+ version = "0.2.0.2";
+ sha256 = "063zd2nbwbyndfy1hrir9x270f99wzbyarfj561r9dddak2754w1";
libraryHaskellDepends = [ base directory filepath parsec ];
testHaskellDepends = [
base directory doctest hspec parsec temporary
@@ -133007,8 +136319,8 @@ self: {
}:
mkDerivation {
pname = "log-effect";
- version = "1.1.0";
- sha256 = "1x3mj0gcpclv9by51rd1bi1ccaas0cy8yv1g6i08r64hj8jyhlk3";
+ version = "1.1.1";
+ sha256 = "10fd3xnkybca8pi7nw2hq1ggk5g89z8b2ml3avqi1x91chqdqi85";
libraryHaskellDepends = [
base bytestring extensible-effects monad-control text
transformers-base
@@ -133244,8 +136556,8 @@ self: {
}:
mkDerivation {
pname = "logging-effect";
- version = "1.3.2";
- sha256 = "1q8mhshz95xckqn4d8wxj0nsg4qrxmc6a826fjzxm1ii0krwpgbd";
+ version = "1.3.3";
+ sha256 = "10pighhav1zmg54gvfnvxcvz83698ziaq9ccs3zqc7jxahmyaslr";
libraryHaskellDepends = [
async base exceptions free monad-control mtl prettyprinter
semigroups stm stm-delay text time transformers transformers-base
@@ -133433,6 +136745,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "loglevel" = callPackage
+ ({ mkDerivation, base, deepseq, text }:
+ mkDerivation {
+ pname = "loglevel";
+ version = "0.1.0.0";
+ sha256 = "12hck2fb7xdk905428yd1a8dnm1hw1apkhw6fr7zqyxzhfqqm1yz";
+ libraryHaskellDepends = [ base deepseq text ];
+ testHaskellDepends = [ base text ];
+ description = "Log Level Datatype";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"logplex-parse" = callPackage
({ mkDerivation, base, hspec, iso8601-time, parsec, text, time }:
mkDerivation {
@@ -133731,6 +137055,8 @@ self: {
pname = "long-double";
version = "0.1";
sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j";
+ revision = "1";
+ editedCabalFile = "12vmzzrxgb4yqf9axf1fildl4m0dfm3zqxk4vg6k6m5qi6haz1yn";
libraryHaskellDepends = [ base integer-gmp ];
description = "FFI bindings for C long double";
license = stdenv.lib.licenses.bsd3;
@@ -134037,8 +137363,8 @@ self: {
pname = "lrucaching";
version = "0.3.3";
sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
- revision = "3";
- editedCabalFile = "0y7j6m0n1xi40c7dmabi9lk6mjic9h49xx60rq9xc4xap90hjfqb";
+ revision = "4";
+ editedCabalFile = "11zfnngp3blx8c3sgy5cva1g9bp69wqz7ys23gdm905i7sjjs6a9";
libraryHaskellDepends = [
base base-compat deepseq hashable psqueues vector
];
@@ -134095,8 +137421,8 @@ self: {
}:
mkDerivation {
pname = "lsp-test";
- version = "0.2.1.0";
- sha256 = "1nd3nn5lyn9cwviijzfhqybj38zg10nf7ypb76ifaax91vj2hrkw";
+ version = "0.4.0.0";
+ sha256 = "0kiddzb7lwwdf96jz4ghvjnwr2hf9jiv8vjjlxwm76k3ab4wx09c";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal base bytestring conduit
conduit-parse containers data-default Diff directory filepath
@@ -134109,6 +137435,7 @@ self: {
];
description = "Functional test framework for LSP servers";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lss" = callPackage
@@ -134323,10 +137650,8 @@ self: {
}:
mkDerivation {
pname = "lucid";
- version = "2.9.10";
- sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0";
- revision = "1";
- editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah";
+ version = "2.9.11";
+ sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc";
libraryHaskellDepends = [
base blaze-builder bytestring containers hashable mmorph mtl text
transformers unordered-containers
@@ -134733,8 +138058,8 @@ self: {
pname = "lzma";
version = "0.0.0.3";
sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg";
- revision = "2";
- editedCabalFile = "0c6jkr22w797jvmad9vki2mm7cdzxpqqxkpv836fh5m248nnc618";
+ revision = "3";
+ editedCabalFile = "1sify6gnsalyp6dakfzi0mdy5jcz2kcp9jsdsgkmxd40nfzgd44m";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ lzma ];
testHaskellDepends = [
@@ -134807,8 +138132,8 @@ self: {
pname = "lzma-streams";
version = "0.1.0.0";
sha256 = "1w8s0xvcz8c3s171gizjkc9iadccjznw7rnfq5wpydkc7x4hxjdn";
- revision = "2";
- editedCabalFile = "068k1y57r8vsvm36c682jylv27nsdw646fsx1bkjxccgq7h6mbbb";
+ revision = "3";
+ editedCabalFile = "1zx9y1pls8mnad78ancf52kffyw6ixp9x9bbvp7qfmmi8dc8s90r";
libraryHaskellDepends = [ base bytestring io-streams lzma ];
testHaskellDepends = [
base bytestring HUnit io-streams QuickCheck test-framework
@@ -135136,8 +138461,8 @@ self: {
}:
mkDerivation {
pname = "madlang";
- version = "4.0.2.12";
- sha256 = "0g3nciqjfqkhi6j5kcyp4zwrzbik3v9qrj0jpl374g4r1sw3piq9";
+ version = "4.0.2.13";
+ sha256 = "10a7q64dm9vw2a3qzvixlg0632l5h8j6xj9ga3w430fxch618f26";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cli-setup ];
@@ -135194,8 +138519,8 @@ self: {
}:
mkDerivation {
pname = "magic-wormhole";
- version = "0.1.0";
- sha256 = "0lkwnbr76chiakc7j51pm23q15q26l3xqglg1rj5blwybkymg29x";
+ version = "0.2.1";
+ sha256 = "1wdn5nykn4wqb65xdhkpy8gpz216a5wi3nngadf58c7acym60gyx";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -135247,6 +138572,37 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "magicbane_0_4_0" = callPackage
+ ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring
+ , conduit, conduit-combinators, data-has, ekg-core, ekg-wai, envy
+ , errors, exceptions, fast-logger, http-api-data, http-client
+ , http-client-tls, http-conduit, http-link-header, http-types
+ , lifted-base, monad-control, monad-logger, monad-metrics
+ , mono-traversable, mtl, network-uri, raw-strings-qq, refined, rio
+ , rio-orphans, servant-server, split, string-conversions, text
+ , transformers, transformers-base, unliftio, unliftio-core
+ , unordered-containers, wai, wai-cli, wai-middleware-metrics
+ }:
+ mkDerivation {
+ pname = "magicbane";
+ version = "0.4.0";
+ sha256 = "0n2yn3jbklibb21pm2ifiy9035d3xmrh8cgywnpawm51p5q3klwl";
+ libraryHaskellDepends = [
+ aeson aeson-qq attoparsec base bytestring conduit
+ conduit-combinators data-has ekg-core ekg-wai envy errors
+ exceptions fast-logger http-api-data http-client http-client-tls
+ http-conduit http-link-header http-types lifted-base monad-control
+ monad-logger monad-metrics mono-traversable mtl network-uri
+ raw-strings-qq refined rio rio-orphans servant-server split
+ string-conversions text transformers transformers-base unliftio
+ unliftio-core unordered-containers wai wai-cli
+ wai-middleware-metrics
+ ];
+ description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"magico" = callPackage
({ mkDerivation, base, hmatrix, transformers, utility-ht }:
mkDerivation {
@@ -135420,6 +138776,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "main-tester_0_2_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, directory, hspec, hspec-core
+ , QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "main-tester";
+ version = "0.2.0.0";
+ sha256 = "0iqb7p90hsygpscyddpvrxdaxka8hdc5xk3acacfns0didc7icnc";
+ libraryHaskellDepends = [ base bytestring directory ];
+ testHaskellDepends = [
+ base bytestring hspec hspec-core QuickCheck text
+ ];
+ description = "Capture stdout/stderr/exit code, and replace stdin of your main function";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mainland-pretty_0_6_2" = callPackage
({ mkDerivation, base, containers, srcloc, text, transformers }:
mkDerivation {
@@ -135440,6 +138813,8 @@ self: {
pname = "mainland-pretty";
version = "0.7";
sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi";
+ revision = "1";
+ editedCabalFile = "1apyqnbcsbjfkqc1d6mk74pxl12130r6ijwhj555gddls9g0qdf3";
libraryHaskellDepends = [
base containers srcloc text transformers
];
@@ -135593,14 +138968,14 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "mameya";
- version = "0.1.0";
- sha256 = "15yxnr2b678gb358xy78zws4wgjcr3rqd8ia1d04924yfcm670pb";
+ version = "0.2.1";
+ sha256 = "05di6x3ahjfzs7lz69l4z54ikwz5vw94qdi4bc8mmr6jh67b1z3s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
executableHaskellDepends = [ base ];
testHaskellDepends = [ base ];
- description = "static site generator made to learn Haskell";
+ description = "Static Website Generator in Haskell";
license = stdenv.lib.licenses.mit;
}) {};
@@ -135998,18 +139373,18 @@ self: {
"mandrill" = 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
+ , http-client-tls, http-types, microlens-th, mtl, old-locale
+ , QuickCheck, raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck
+ , text, time, unordered-containers
}:
mkDerivation {
pname = "mandrill";
- version = "0.5.3.4";
- sha256 = "0gaz5drb8wvlr12ynwag4rcgmsyzd713j0qgpv9ydy3jlk65nrf7";
+ version = "0.5.3.5";
+ sha256 = "0yh7r3wrzpzm3iv0zvs6nzf36hwv0y7xlsz6cy3dlnyrr5jbsb1i";
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
+ email-validate http-client http-client-tls http-types microlens-th
+ mtl old-locale QuickCheck text time unordered-containers
];
testHaskellDepends = [
aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
@@ -136105,8 +139480,8 @@ self: {
}:
mkDerivation {
pname = "manifolds";
- version = "0.5.0.0";
- sha256 = "1261vap8raffngdxmzv042carjdlcssqbpa9vs3qi0x3jbbwiywc";
+ version = "0.5.0.1";
+ sha256 = "1l2rbf0axlbyvxdd62dhik4pk8n9jf2c6pxl86yi48hhvc3wyx07";
libraryHaskellDepends = [
array base call-stack comonad constrained-categories containers
deepseq free free-vector-spaces ieee754 lens linear
@@ -136128,8 +139503,8 @@ self: {
({ mkDerivation, base, call-stack, tagged, vector-space }:
mkDerivation {
pname = "manifolds-core";
- version = "0.5.0.0";
- sha256 = "0b8ac9l2asqlhazl0wlgb0qiyj1adk89m5fvhqqx1nw829dly6gw";
+ version = "0.5.0.1";
+ sha256 = "0bq102vfxq47if5nf0az92inzxgbla9by09nggi2nww4gqrd37v3";
libraryHaskellDepends = [ base call-stack tagged vector-space ];
description = "The basic classes for the manifolds hierarchy";
license = stdenv.lib.licenses.gpl3;
@@ -136174,6 +139549,8 @@ self: {
pname = "map-syntax";
version = "0.3";
sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k";
+ revision = "1";
+ editedCabalFile = "1qfjficc7b6hbg44r3czk8iqgkjmgnp14wmzcdcz4ai93kx8dp44";
libraryHaskellDepends = [ base containers mtl ];
testHaskellDepends = [
base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -136282,22 +139659,22 @@ self: {
"markdown" = callPackage
({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
- , call-stack, conduit, conduit-extra, containers, data-default
- , directory, filepath, hspec, text, transformers, xml-conduit
- , xml-types, xss-sanitize
+ , bytestring, call-stack, conduit, conduit-extra, containers
+ , data-default, directory, filepath, hspec, text, transformers
+ , xml-conduit, xml-types, xss-sanitize
}:
mkDerivation {
pname = "markdown";
- version = "0.1.17.1";
- sha256 = "0n1vcw0vmhpgsmyxxafc82r2kp27g081zwx9md96zj5x5642vxz1";
+ version = "0.1.17.4";
+ sha256 = "1m7xf3r7wvpzdj2zic90w5b6adnjb6mjq9mycbnzcjibpr1fgqy2";
libraryHaskellDepends = [
attoparsec base blaze-html blaze-markup conduit conduit-extra
containers data-default text transformers xml-conduit xml-types
xss-sanitize
];
testHaskellDepends = [
- base blaze-html call-stack conduit conduit-extra containers
- directory filepath hspec text transformers
+ base blaze-html bytestring call-stack conduit conduit-extra
+ containers directory filepath hspec text transformers
];
description = "Convert Markdown to HTML, with XSS protection";
license = stdenv.lib.licenses.bsd3;
@@ -136444,6 +139821,7 @@ self: {
];
description = "Abstraction for HTML-embedded content";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"markup-preview" = callPackage
@@ -136645,18 +140023,21 @@ self: {
}) {};
"massiv" = callPackage
- ({ mkDerivation, base, data-default, data-default-class, deepseq
- , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
+ ({ mkDerivation, base, bytestring, data-default, data-default-class
+ , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions
+ , vector
}:
mkDerivation {
pname = "massiv";
- version = "0.2.0.0";
- sha256 = "0jyripzh4da29bvbhrfmwvjicr22ll9vbd0f3wiv4gcmlpnhls9j";
+ version = "0.2.2.0";
+ sha256 = "1mw636d070icl2wanvgrr8k0a44fhzdmzkw3047442nvl3nyghbc";
libraryHaskellDepends = [
- base data-default-class deepseq ghc-prim primitive vector
+ base bytestring data-default-class deepseq ghc-prim primitive
+ vector
];
testHaskellDepends = [
- base data-default deepseq hspec QuickCheck safe-exceptions vector
+ base bytestring data-default deepseq hspec QuickCheck
+ safe-exceptions vector
];
description = "Massiv (Массив) is an Array Library";
license = stdenv.lib.licenses.bsd3;
@@ -136765,15 +140146,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "math-functions_0_3_0_1" = callPackage
+ "math-functions_0_3_0_2" = callPackage
({ mkDerivation, base, data-default-class, deepseq, erf, HUnit
, primitive, QuickCheck, test-framework, test-framework-hunit
, test-framework-quickcheck2, vector, vector-th-unbox
}:
mkDerivation {
pname = "math-functions";
- version = "0.3.0.1";
- sha256 = "1nrslskbgsy9yx0kzc5a0jdahch218qd16343j001pdxkygq21b2";
+ version = "0.3.0.2";
+ sha256 = "094kf3261b3m07r6gyf63s0pnhw5v0z1q5pzfskl4y8fdjvsp4kb";
libraryHaskellDepends = [
base data-default-class deepseq primitive vector vector-th-unbox
];
@@ -136783,7 +140164,7 @@ self: {
vector vector-th-unbox
];
description = "Collection of tools for numeric computations";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.bsd2;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -137032,6 +140413,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "matrix-static" = callPackage
+ ({ mkDerivation, base, deepseq, ghc-typelits-knownnat
+ , ghc-typelits-natnormalise, matrix, tasty, tasty-hunit, vector
+ }:
+ mkDerivation {
+ pname = "matrix-static";
+ version = "0.2";
+ sha256 = "0g4vkzc6jw4sx2an86d20fv9b23jzly8dxsan7ygih1mp8rn5r07";
+ libraryHaskellDepends = [
+ base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
+ vector
+ ];
+ testHaskellDepends = [
+ base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
+ tasty tasty-hunit vector
+ ];
+ description = "Type-safe matrix operations";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"matsuri" = callPackage
({ mkDerivation, base, ConfigFile, containers, directory, MissingH
, mtl, network, old-locale, split, time, vty, vty-ui, XMPP
@@ -137415,8 +140816,8 @@ self: {
pname = "mcm";
version = "0.6.5.0";
sha256 = "1vf54aziyybxyc9bwnn57pfcjmgli2hjjd2kzij8vy2g64ipip9m";
- revision = "1";
- editedCabalFile = "1anhhrl8a627y7vfvcmiwbfjiyvglwrqcim1gc6zycqidyqq22pq";
+ revision = "2";
+ editedCabalFile = "0xgnh356qwc1zdailqr3m6hbv7q5gc36ycqfz31z6l5kphmbblsc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -137885,8 +141286,8 @@ self: {
pname = "megaparsec";
version = "6.5.0";
sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
- revision = "3";
- editedCabalFile = "137ap53bgvnc0bdhkyv84290i3fzngryijsv33h7fb0q9k6dmb6h";
+ revision = "4";
+ editedCabalFile = "0ij3asi5vwlhbgwsy6nhli9a0qb7926mg809fsgyl1rnhs9fvpx1";
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq mtl
parser-combinators scientific text transformers
@@ -137901,6 +141302,33 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "megaparsec_7_0_2" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , criterion, deepseq, hspec, hspec-expectations, mtl
+ , parser-combinators, QuickCheck, scientific, text, transformers
+ , weigh
+ }:
+ mkDerivation {
+ pname = "megaparsec";
+ version = "7.0.2";
+ sha256 = "1ny54saxiz0md50mp24gz267gmqjbl8d8b1zi74hi6bcxyhzd278";
+ libraryHaskellDepends = [
+ base bytestring case-insensitive containers deepseq mtl
+ parser-combinators scientific text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive containers hspec
+ hspec-expectations mtl parser-combinators QuickCheck scientific
+ text transformers
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion deepseq text weigh
+ ];
+ description = "Monadic parser combinators";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"meldable-heap" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -138245,12 +141673,12 @@ self: {
}:
mkDerivation {
pname = "memory";
- version = "0.14.16";
- sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v";
+ version = "0.14.18";
+ sha256 = "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm";
revision = "1";
- editedCabalFile = "10j8737fm287ii0nm4hqnhf87apls3xjczkzdw9qqkb4a2dybsbx";
+ editedCabalFile = "0h4d0avv8kv3my4rim79lcamv2dyibld7w6ianq46nhwgr0h2lzm";
libraryHaskellDepends = [
- base basement bytestring deepseq foundation ghc-prim
+ base basement bytestring deepseq ghc-prim
];
testHaskellDepends = [ base basement bytestring foundation ];
description = "memory and related abstraction stuff";
@@ -138347,8 +141775,8 @@ self: {
}:
mkDerivation {
pname = "merge-bash-history";
- version = "0.1.0.0";
- sha256 = "0v682qss97ffwm0v1kscqy02a8j7jfn66xr1p277jnfg3m6ng4rf";
+ version = "0.1.0.1";
+ sha256 = "1fi8qg5slkgksx24vz91bhi1ddnmavyjcm1i50la60l3c2y0m8rk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -138356,7 +141784,7 @@ self: {
];
executableHaskellDepends = [ base optparse-applicative text ];
testHaskellDepends = [ base ];
- description = "Initial project template from stack";
+ description = "command line utility to merge bash_history";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -138582,6 +142010,54 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "metar" = callPackage
+ ({ mkDerivation, base, checkers, deriving-compat, HTTP, lens
+ , network-uri, QuickCheck, semigroupoids, semigroups, tagsoup
+ , tagsoup-selection, tasty, tasty-hunit, tasty-quickcheck
+ , transformers
+ }:
+ mkDerivation {
+ pname = "metar";
+ version = "0.0.2";
+ sha256 = "1iaqjzy1a7hkvcni6ijkwwcsb433j3gkx9f7z8ng1yhlbcr9a556";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base deriving-compat HTTP lens network-uri semigroupoids semigroups
+ tagsoup tagsoup-selection transformers
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Australian METAR";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "metar-http" = callPackage
+ ({ mkDerivation, base, checkers, http-types, lens, metar
+ , network-uri, QuickCheck, semigroupoids, semigroups, tasty
+ , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string
+ , wai, warp
+ }:
+ mkDerivation {
+ pname = "metar-http";
+ version = "0.0.1";
+ sha256 = "0xpi9x1c05py659a94ldksn3z5xz9ws069gp1swam1fllg8xbxj6";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base http-types lens metar network-uri semigroupoids semigroups
+ text transformers utf8-string wai warp
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "HTTP for METAR";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"metric" = callPackage
({ mkDerivation, base, data-default, edit-distance, hmatrix
, QuickCheck, test-framework, test-framework-quickcheck2, vector
@@ -138728,6 +142204,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "miconix-test" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "miconix-test";
+ version = "0.2";
+ sha256 = "02p2m11chfva4i6293if0yf8rvdbxjf8wz38ckmksiicmzhss10y";
+ revision = "3";
+ editedCabalFile = "1rkx448wrvq08qi84g5vqxk3fc27xb4jgwf9vi6hqj5a9gwnjfcg";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base ];
+ description = "spam";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"micro-recursion-schemes" = callPackage
({ mkDerivation, base, cpphs, HUnit, template-haskell
, th-abstraction
@@ -138752,6 +142244,8 @@ self: {
pname = "microaeson";
version = "0.1.0.0";
sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz";
+ revision = "1";
+ editedCabalFile = "0pxgpmr0xv355rnpr8m7l07swbzsjbfiba3dxyz53bdjcc8ya9dq";
libraryHaskellDepends = [
array base bytestring containers deepseq text
];
@@ -138897,8 +142391,8 @@ self: {
({ mkDerivation, base, contravariant, microlens }:
mkDerivation {
pname = "microlens-contra";
- version = "0.1.0.1";
- sha256 = "15gmqxi24jy8w83852y5qf4xymiilkl24sppcaw7r2hn6yfz30s9";
+ version = "0.1.0.2";
+ sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m";
libraryHaskellDepends = [ base contravariant microlens ];
description = "True folds and getters for microlens";
license = stdenv.lib.licenses.bsd3;
@@ -138917,21 +142411,6 @@ self: {
}) {};
"microlens-ghc" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, microlens
- , transformers
- }:
- mkDerivation {
- pname = "microlens-ghc";
- version = "0.4.9";
- sha256 = "0wdwra9s7gllw0i7sf7d371h6d5qwlk6jrvhdm8hafj4fxagafma";
- libraryHaskellDepends = [
- array base bytestring containers microlens transformers
- ];
- description = "microlens + array, bytestring, containers, transformers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "microlens-ghc_0_4_9_1" = callPackage
({ mkDerivation, array, base, bytestring, containers, microlens
, transformers
}:
@@ -138944,7 +142423,6 @@ self: {
];
description = "microlens + array, bytestring, containers, transformers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"microlens-mtl" = callPackage
@@ -138984,25 +142462,8 @@ self: {
}:
mkDerivation {
pname = "microlens-th";
- version = "0.4.2.1";
- sha256 = "0hpwwk50a826s87ad0k6liw40qp6av0hmdhnsdfhhk5mka710mzc";
- libraryHaskellDepends = [
- base containers microlens template-haskell th-abstraction
- transformers
- ];
- testHaskellDepends = [ base microlens ];
- description = "Automatic generation of record lenses for microlens";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "microlens-th_0_4_2_2" = callPackage
- ({ mkDerivation, base, containers, microlens, template-haskell
- , th-abstraction, transformers
- }:
- mkDerivation {
- pname = "microlens-th";
- version = "0.4.2.2";
- sha256 = "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05";
+ version = "0.4.2.3";
+ sha256 = "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j";
libraryHaskellDepends = [
base containers microlens template-haskell th-abstraction
transformers
@@ -139010,7 +142471,6 @@ self: {
testHaskellDepends = [ base microlens ];
description = "Automatic generation of record lenses for microlens";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"micrologger" = callPackage
@@ -139055,18 +142515,20 @@ self: {
pname = "microspec";
version = "0.1.0.0";
sha256 = "0hykarba8ccwkslh8cfsxbriw043f8pa4jyhr3hqc5yqfijibr71";
+ revision = "1";
+ editedCabalFile = "0cnfj3v6fzck57bgrsnmgz8a9azvz04pm3hv17fg12xzchmp07cq";
libraryHaskellDepends = [ base QuickCheck ];
description = "Tiny QuickCheck test library with minimal dependencies";
license = stdenv.lib.licenses.bsd3;
}) {};
- "microspec_0_2_0_0" = callPackage
- ({ mkDerivation, base, QuickCheck }:
+ "microspec_0_2_0_1" = callPackage
+ ({ mkDerivation, base, QuickCheck, time }:
mkDerivation {
pname = "microspec";
- version = "0.2.0.0";
- sha256 = "0nz9achmckza9n6hx7ix7yyh9fhhfjnbszzjssz4mnghcmm8l0wv";
- libraryHaskellDepends = [ base QuickCheck ];
+ version = "0.2.0.1";
+ sha256 = "1ygkxsj7rm42f245qip8893lm189immmd5ajimp5d1pkzfkw4dnp";
+ libraryHaskellDepends = [ base QuickCheck time ];
description = "Tiny QuickCheck test library with minimal dependencies";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -139081,8 +142543,8 @@ self: {
pname = "microstache";
version = "1.0.1.1";
sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
- revision = "2";
- editedCabalFile = "0rl6vgmjnf1a14kiynh4gnmy6n6kkik9hqj9k5vqw68h4f110i4b";
+ revision = "3";
+ editedCabalFile = "1pq0h64vxc7zlncn2ld6k02wi6rfa5ccqc4z0hfkvaldj41y2sb1";
libraryHaskellDepends = [
aeson base bytestring containers deepseq directory filepath parsec
text transformers unordered-containers vector
@@ -139192,8 +142654,8 @@ self: {
}:
mkDerivation {
pname = "midi-music-box";
- version = "0.0.0.4";
- sha256 = "0l8nv3bfbncjbh80dav7qps5aqd20g88sx00xhqr6j9m66znfg1p";
+ version = "0.0.0.5";
+ sha256 = "1zgskam31akqi58wvjxqfgag937fczskyvzanivvxd7p6gvj5l0g";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -139429,8 +142891,8 @@ self: {
}:
mkDerivation {
pname = "milena";
- version = "0.5.2.2";
- sha256 = "0dag2r79wpq67ydd7blwha2jf8nd5311bxv3li3fm88m0kbqrni1";
+ version = "0.5.2.3";
+ sha256 = "0s3bxj6d3p0fng08da9y2qb8cl967lqhsqplhcwmaj3aai72rj5w";
libraryHaskellDepends = [
base bytestring cereal containers digest lens lifted-base
monad-control mtl murmur-hash network random resource-pool
@@ -139881,21 +143343,27 @@ self: {
}) {};
"mios" = callPackage
- ({ mkDerivation, base, bytestring, ghc-prim, primitive, vector }:
+ ({ mkDerivation, base, bytestring, ghc-prim, gitrev, hspec
+ , primitive, vector
+ }:
mkDerivation {
pname = "mios";
- version = "1.6.0";
- sha256 = "1pwcv24csffb734q4z4amjlgv8kkzncz8bjhn4s3wji021ndj1b7";
+ version = "1.6.2";
+ sha256 = "1q2lz5sir6pcxiqxb3vr1xp6zsld0nfwjymg0zbhszd5w0iprxdh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring ghc-prim primitive vector
];
executableHaskellDepends = [
- base bytestring ghc-prim primitive vector
+ base bytestring ghc-prim gitrev primitive vector
+ ];
+ testHaskellDepends = [
+ base bytestring ghc-prim hspec primitive vector
];
description = "A Minisat-based CDCL SAT solver in Haskell";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mirror-tweet" = callPackage
@@ -139945,8 +143413,8 @@ self: {
}:
mkDerivation {
pname = "miso";
- version = "0.21.1.0";
- sha256 = "1yz909nmm0qjvm4kbq5r8a5r4881pcq0n2jzf29y9svcz8apw08l";
+ version = "0.21.2.0";
+ sha256 = "061bjvxcs6psh8hj947p4jm9ki9ngrwvn23szvk8i3x4xd87jbfm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -140048,6 +143516,7 @@ self: {
testToolDepends = [ hspec-discover markdown-unlit ];
description = "Mixpanel client";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mkbndl" = callPackage
@@ -140176,6 +143645,39 @@ self: {
benchmarkHaskellDepends = [ base criterion text weigh ];
description = "Strict markdown processor for writers";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "mmark_0_0_6_0" = callPackage
+ ({ mkDerivation, aeson, base, case-insensitive, containers
+ , criterion, data-default-class, deepseq, dlist, email-validate
+ , foldl, hashable, hspec, hspec-discover, hspec-megaparsec
+ , html-entity-map, lucid, megaparsec, microlens, microlens-th
+ , modern-uri, mtl, parser-combinators, QuickCheck, text
+ , text-metrics, unordered-containers, weigh, yaml
+ }:
+ mkDerivation {
+ pname = "mmark";
+ version = "0.0.6.0";
+ sha256 = "0ifz40fv5fdlj17cb4646amc4spy9dq7xn0bbscljskm7n7n1pxv";
+ revision = "1";
+ editedCabalFile = "0z9r6xjg6qpp2ai1wzkn0cvjw8dv6s94awsys6968ixmdzz9vrbz";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base case-insensitive containers data-default-class deepseq
+ dlist email-validate foldl hashable html-entity-map lucid
+ megaparsec microlens microlens-th modern-uri mtl parser-combinators
+ text text-metrics unordered-containers yaml
+ ];
+ testHaskellDepends = [
+ aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
+ QuickCheck text
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion text weigh ];
+ description = "Strict markdown processor for writers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mmark-cli" = callPackage
@@ -140197,6 +143699,27 @@ self: {
];
description = "Command line interface to MMark markdown processor";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "mmark-cli_0_0_4_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid
+ , megaparsec, mmark, mmark-ext, optparse-applicative, stache, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "mmark-cli";
+ version = "0.0.4.0";
+ sha256 = "0vw1pq3iz4bbz5fgbzi8lvpscc58izh6y210jfi12h2jyzajyf5k";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base bytestring directory gitrev lucid megaparsec mmark
+ mmark-ext optparse-applicative stache text unordered-containers
+ ];
+ description = "Command line interface to the MMark markdown processor";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mmark-ext" = callPackage
@@ -140208,6 +143731,8 @@ self: {
pname = "mmark-ext";
version = "0.2.1.0";
sha256 = "1k9zw9fbfhlp5irbykycpw5qkjyhlcb8qrnbmsrn133hh1m3j0hs";
+ revision = "2";
+ editedCabalFile = "0xcjkzaah0npyw87mdsymq4bjwdf988fqmylzgr4kihks1a8d4xs";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri
@@ -140217,6 +143742,7 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Commonly useful extensions for the MMark markdown processor";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mmorph" = callPackage
@@ -140400,6 +143926,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "modern-uri_0_3_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, contravariant
+ , criterion, deepseq, exceptions, hspec, hspec-discover
+ , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
+ , reflection, tagged, template-haskell, text, weigh
+ }:
+ mkDerivation {
+ pname = "modern-uri";
+ version = "0.3.0.1";
+ sha256 = "01a5jnv8kbl2c9ka9dgqm4a8b7n6frmg7yi8f417qcnwgn1lbs78";
+ libraryHaskellDepends = [
+ base bytestring containers contravariant deepseq exceptions
+ megaparsec mtl profunctors QuickCheck reflection tagged
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion deepseq megaparsec text weigh
+ ];
+ description = "Modern library for working with URIs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"modify-fasta" = callPackage
({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
, pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@@ -140602,8 +144155,8 @@ self: {
}:
mkDerivation {
pname = "mohws";
- version = "0.2.1.5";
- sha256 = "1xkkkb1ili45icvlmz2r5i42qf1fib01ywqywgq4n53cyx1ncqa9";
+ version = "0.2.1.6";
+ sha256 = "0rnb6nq99bav0z5dxzc4xkb2ai6ifm5v2ijd76sgzbs2032v6wqs";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -140629,6 +144182,8 @@ self: {
pname = "mole";
version = "0.0.6";
sha256 = "0shsx1sc6rc5jxijvrc4bzqpjw4xdjq5ghlj8jnmm7gp8b6h6y5b";
+ revision = "2";
+ editedCabalFile = "1qykba99djdhwm0mmkrfbjdyjcx47gi5clxm8kz87ccx9qs72kfy";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -141080,8 +144635,8 @@ self: {
}:
mkDerivation {
pname = "monad-logger";
- version = "0.3.29";
- sha256 = "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv";
+ version = "0.3.30";
+ sha256 = "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7";
libraryHaskellDepends = [
base bytestring conduit conduit-extra exceptions fast-logger
lifted-base monad-control monad-loops mtl resourcet stm stm-chans
@@ -141221,15 +144776,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "monad-memo_0_5_0" = callPackage
+ "monad-memo_0_5_1" = callPackage
({ mkDerivation, array, base, containers, criterion, primitive
, QuickCheck, random, test-framework, test-framework-quickcheck2
, transformers, vector
}:
mkDerivation {
pname = "monad-memo";
- version = "0.5.0";
- sha256 = "1ax1myhgnpy7gyb7pxn98424mda317zvji47bdwj2h58rpldqhjm";
+ version = "0.5.1";
+ sha256 = "1zsvp0g2kzjf5zkv1js65jfc1p3yrkr95csp2ljpqx857qy4lnn6";
libraryHaskellDepends = [
array base containers primitive transformers vector
];
@@ -141422,17 +144977,15 @@ self: {
}:
mkDerivation {
pname = "monad-persist";
- version = "0.0.2.0";
- sha256 = "17jq41r7bmycnzz028pii14cm0qjvclj01z78aj6aj1h4mlwlbc1";
- revision = "1";
- editedCabalFile = "0sghbyfd7jpwi80hivzbh2z77zl9kpzlvablkfx2w0q70hnbbrvd";
+ version = "0.0.3.0";
+ sha256 = "1d97lx9frzwydc82b7srw4r6dr3865wrnvyz27xmcvzxfzbyymi8";
libraryHaskellDepends = [
base exceptions monad-control monad-logger mtl persistent text
transformers transformers-base
];
testHaskellDepends = [
base hspec monad-control monad-logger persistent persistent-sqlite
- persistent-template text
+ persistent-template text transformers
];
description = "An mtl-style typeclass and transformer for persistent";
license = stdenv.lib.licenses.isc;
@@ -141743,11 +145296,12 @@ self: {
({ mkDerivation, base, mtl, stm }:
mkDerivation {
pname = "monadIO";
- version = "0.11.0.0";
- sha256 = "11pbg83fw5vdlny5w9afmzdhn3ryg1av429gbsk8w6wl8zqhd4n9";
+ version = "0.11.1.0";
+ sha256 = "1a3gb70fkh28ck13zdkphdip2kzdcivzdrsg9fdn3nci9scbdp2w";
libraryHaskellDepends = [ base mtl stm ];
description = "Overloading of concurrency variables";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"monadLib" = callPackage
@@ -141966,6 +145520,8 @@ self: {
pname = "monadplus";
version = "1.4.2";
sha256 = "15b5320wdpmdp5slpphnc1x4rhjch3igw245dp2jxbqyvchdavin";
+ revision = "1";
+ editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp";
libraryHaskellDepends = [ base ];
description = "Haskell98 partial maps and filters over MonadPlus";
license = stdenv.lib.licenses.bsd3;
@@ -142053,8 +145609,8 @@ self: {
({ mkDerivation, base, bindings-monetdb-mapi }:
mkDerivation {
pname = "monetdb-mapi";
- version = "0.1.0.0";
- sha256 = "0v7709zvx2q07zymdk2hi4nwaby4a5i02qgs97l5f9s4nwwb5qmr";
+ version = "0.1.0.1";
+ sha256 = "1r035w349js424x0864xghvs79v4wsf9br4rwqpfqkyz2hxsqhx0";
libraryHaskellDepends = [ base bindings-monetdb-mapi ];
description = "Mid-level bindings for the MonetDB API (mapi)";
license = stdenv.lib.licenses.bsd3;
@@ -142275,8 +145831,8 @@ self: {
pname = "monoid-extras";
version = "0.5";
sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6";
- revision = "1";
- editedCabalFile = "12dq0flvkw8lqbga3wsygcmkzwc9f16kmq31wh79alybzynz36qw";
+ revision = "2";
+ editedCabalFile = "1q73ghd12fd451zm4m045h8v3y61jmfhj6k890gnv6z7lyb7xwg2";
libraryHaskellDepends = [ base groups semigroupoids semigroups ];
benchmarkHaskellDepends = [ base criterion semigroups ];
description = "Various extra monoid-related definitions and utilities";
@@ -142332,8 +145888,8 @@ self: {
}:
mkDerivation {
pname = "monoid-subclasses";
- version = "0.4.6";
- sha256 = "1rsipvaab5wpzi4qxzzb3gihg1gnsdiv0iz00gdskgjifggamh8m";
+ version = "0.4.6.1";
+ sha256 = "19mfklkdhyv94pfg5i92h0z90sc99rbgpi8z0w55bz3qhxnqg5yh";
libraryHaskellDepends = [
base bytestring containers primes text vector
];
@@ -142373,6 +145929,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "monoidal-containers_0_4_0_0" = callPackage
+ ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens
+ , newtype, semigroups, unordered-containers
+ }:
+ mkDerivation {
+ pname = "monoidal-containers";
+ version = "0.4.0.0";
+ sha256 = "15mh2hx7a31gr5zb2g30h2fcnb3a2wvv2y8hvzzk5l9cr2nvhcm1";
+ libraryHaskellDepends = [
+ aeson base containers deepseq hashable lens newtype semigroups
+ unordered-containers
+ ];
+ description = "Containers with monoidal accumulation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"monoidplus" = callPackage
({ mkDerivation, base, contravariant, semigroups, transformers }:
mkDerivation {
@@ -142414,6 +145987,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "monopati" = callPackage
+ ({ mkDerivation, base, directory, free, split }:
+ mkDerivation {
+ pname = "monopati";
+ version = "0.1.2";
+ sha256 = "1bimppfh14754a8dra6cjd2ricdyry5fmm0shryf974h9l6wbrp8";
+ libraryHaskellDepends = [ base directory free split ];
+ description = "Well-typed paths";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"montage" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, ListLike
, old-locale, pool-conduit, protocol-buffers
@@ -142480,6 +146064,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "monus" = callPackage
+ ({ mkDerivation, base, containers, smallcheck, tasty
+ , tasty-quickcheck, tasty-smallcheck
+ }:
+ mkDerivation {
+ pname = "monus";
+ version = "0.2.0.0";
+ sha256 = "1iyzq3ivw6brjf45d3023n8x7hq0ihy8gvjh8hjdsmc6pnm26gw9";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [
+ base containers smallcheck tasty tasty-quickcheck tasty-smallcheck
+ ];
+ description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"monzo" = callPackage
({ mkDerivation, aeson, authenticate-oauth, base, bytestring
, containers, hspec, http-client, http-client-tls, mtl, network
@@ -142574,8 +146174,8 @@ self: {
}:
mkDerivation {
pname = "morfette";
- version = "0.4.4";
- sha256 = "064wgdk0yrrjh8b7xnpmhk541fwqh24pg7hq1rh28vf2fbv6blcy";
+ version = "0.4.7";
+ sha256 = "1vxqg55zsj36pi1bsydm0v4fls4blya9jjfdv56jgdfjsjzzljyh";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -142659,7 +146259,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "morte_1_7_0" = callPackage
+ "morte_1_7_1" = callPackage
({ mkDerivation, alex, array, base, binary, code-page, containers
, criterion, deepseq, Earley, formatting, http-client
, http-client-tls, microlens, microlens-mtl, mtl
@@ -142669,8 +146269,8 @@ self: {
}:
mkDerivation {
pname = "morte";
- version = "1.7.0";
- sha256 = "1q2na2xw70jr71v1ysscqf3v3f2hvn4f0lxkh4dgsdy8986b41cl";
+ version = "1.7.1";
+ sha256 = "1ff9h3zzcz59q07v0yx93v537z6swy65j88z9cn6mgfjrxjmqx2b";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -142723,6 +146323,48 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "moto" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+ , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath
+ , mtl, optparse-applicative, pipes, pipes-attoparsec
+ , pipes-bytestring, random, safe-exceptions, tasty, tasty-hunit
+ , tasty-quickcheck, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "moto";
+ version = "0.0.3";
+ sha256 = "1grvw5dlg6gjf83rhz45hnh73p74v85kmyn9yfi2gwbxcs7fsmvx";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring containers cryptohash-sha1 df1
+ di-core di-df1 directory filepath mtl optparse-applicative pipes
+ pipes-attoparsec pipes-bytestring safe-exceptions text time
+ transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers di di-core directory filepath random
+ safe-exceptions tasty tasty-hunit tasty-quickcheck text time
+ ];
+ description = "General purpose migrations library";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "moto-postgresql" = callPackage
+ ({ mkDerivation, base, bytestring, moto, postgresql-simple
+ , safe-exceptions
+ }:
+ mkDerivation {
+ pname = "moto-postgresql";
+ version = "0.0.1";
+ sha256 = "0z5kxphsgywmnv33lf95by9gxlgr6i8y8lq7sqy495f87b1jv62d";
+ libraryHaskellDepends = [
+ base bytestring moto postgresql-simple safe-exceptions
+ ];
+ description = "PostgreSQL-based migrations registry for moto";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"motor" = callPackage
({ mkDerivation, base, indexed, indexed-extras, reflection
, row-types, template-haskell
@@ -142911,6 +146553,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) mpg123;};
+ "mpi-hs" = callPackage
+ ({ mkDerivation, base, bytestring, c2hs, criterion, monad-loops
+ , openmpi, store
+ }:
+ mkDerivation {
+ pname = "mpi-hs";
+ version = "0.3.1.0";
+ sha256 = "1ka212z51ga82fwjj6jz6aiidn4fyvf0b5p9xma67fnv9a7cs4v2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bytestring monad-loops store ];
+ librarySystemDepends = [ openmpi ];
+ libraryToolDepends = [ c2hs ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base monad-loops ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "MPI bindings for Haskell";
+ license = stdenv.lib.licenses.asl20;
+ }) {inherit (pkgs) openmpi;};
+
"mpppc" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, split, text }:
mkDerivation {
@@ -143613,8 +147275,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "multi-instance";
- version = "0.0.0.2";
- sha256 = "11r7wy143zy9drjrz7l57bdsbaj2fd3sjwbiz7pcmcdr1bxxga63";
+ version = "0.0.0.3";
+ sha256 = "197jrq0r7va89z2hzhna0v4xmrranq1lgv4ncmbzlzliis6j7m22";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "Typeclasses augmented with a phantom type parameter";
@@ -143969,8 +147631,8 @@ self: {
({ mkDerivation, base, containers, deepseq, doctest, Glob }:
mkDerivation {
pname = "multiset";
- version = "0.3.4";
- sha256 = "0kdmf0ba946pxq1m8q0x5bk2my2fd5frhaw3cj2i3x88nc9f0ycp";
+ version = "0.3.4.1";
+ sha256 = "05iynv54mgfwil7l81ni8mrhhb5vz3fdls13vm2m3dnwqgp7vzxh";
libraryHaskellDepends = [ base containers deepseq ];
testHaskellDepends = [ base doctest Glob ];
description = "The Data.MultiSet container type";
@@ -144007,10 +147669,8 @@ self: {
}:
mkDerivation {
pname = "multistate";
- version = "0.8.0.0";
- sha256 = "0sax983yjzcbailza3fpjjszg4vn0wb11wjr11jskk22lccbagq1";
- revision = "2";
- editedCabalFile = "1dp52gacm8ql3g7xvb1dzp3migwpz2kcnz8pafbf7rs1lmccj1zf";
+ version = "0.8.0.1";
+ sha256 = "1s9fs29ki3l1df0ddi04ckbich1xid413sm2zx59aqp92dfpimvm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -144627,8 +148287,8 @@ self: {
({ mkDerivation, base, safe-exceptions }:
mkDerivation {
pname = "mvar-lock";
- version = "0.1.0.1";
- sha256 = "0kdf7811kxwfj032d8g18za0nn9jlssh7dpvvr8kzjk01b77804r";
+ version = "0.1.0.2";
+ sha256 = "09diqzb4vp7bcg6v16fgjb70mi68i8srnyxf6qga58va6avbc4wg";
libraryHaskellDepends = [ base safe-exceptions ];
description = "A trivial lock based on MVar";
license = stdenv.lib.licenses.asl20;
@@ -144750,8 +148410,8 @@ self: {
pname = "mwc-random-accelerate";
version = "0.1.0.0";
sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih";
- revision = "2";
- editedCabalFile = "16llz1jvpq841a20wvv2j8kkb357y970i54w340hwk4c187hypic";
+ revision = "3";
+ editedCabalFile = "1a7xx3mcli9fx5lqg1zxwqbrgzvgbssn3vprh4wp8zg58pqic6ic";
libraryHaskellDepends = [ accelerate base mwc-random ];
description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
license = stdenv.lib.licenses.bsd3;
@@ -145097,6 +148757,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "mysql-haskell_0_8_4_1" = callPackage
+ ({ mkDerivation, base, binary, binary-ieee754, binary-parsers
+ , blaze-textual, bytestring, bytestring-lexing, cryptonite
+ , 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.8.4.1";
+ sha256 = "0m3kqm5ldy47gv0gbh3sxv2zm4kmszw96r5sar5bzb3v9jvmz94x";
+ libraryHaskellDepends = [
+ base binary binary-ieee754 binary-parsers blaze-textual bytestring
+ bytestring-lexing cryptonite io-streams memory monad-loops network
+ scientific tcp-streams text time tls vector wire-streams word24
+ ];
+ testHaskellDepends = [
+ base bytestring io-streams tasty tasty-hunit text time vector
+ ];
+ description = "pure haskell MySQL driver";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mysql-haskell-nem" = callPackage
({ mkDerivation, base, bytestring, io-streams, mysql-haskell
, scientific, text, time
@@ -145343,8 +149027,8 @@ self: {
}:
mkDerivation {
pname = "nakadi-client";
- version = "0.6.0.0";
- sha256 = "15hcaccm25frzar2fwyrrhai9kpja7xdcpi2ibl6gf3drp6z65jy";
+ version = "0.6.1.0";
+ sha256 = "0y6mvw10cbiqib309v38ldjq14xryccs8mhi41zkwpnqldmkyd1x";
libraryHaskellDepends = [
aeson aeson-casing async async-timer base bytestring conduit
conduit-extra containers exceptions hashable http-client
@@ -145501,12 +149185,18 @@ self: {
}) {};
"nano-cryptr" = callPackage
- ({ mkDerivation, base, bytestring }:
+ ({ mkDerivation, base, bytestring, HUnit, test-framework
+ , test-framework-hunit, test-framework-quickcheck2
+ }:
mkDerivation {
pname = "nano-cryptr";
- version = "0.1.1.3";
- sha256 = "1pqwzl8l48c4q83jhjj11jd3kwwa0ail2c6kv3k38kig9yvj7ff8";
+ version = "0.2.1";
+ sha256 = "00c0niyjhkcv942vhm775jml3frhj0i3svgj9xxy0hnfb3nawvjb";
libraryHaskellDepends = [ base bytestring ];
+ testHaskellDepends = [
+ base bytestring HUnit test-framework test-framework-hunit
+ test-framework-quickcheck2
+ ];
description = "A threadsafe binding to glibc's crypt_r function";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -145857,6 +149547,8 @@ self: {
pname = "natural";
version = "0.3.0.2";
sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd";
+ revision = "1";
+ editedCabalFile = "0y8dg3iplxgk36zbgyf8glzm16gi9x837micw9rbwg4vpzg2a171";
libraryHaskellDepends = [ base lens semigroupoids ];
testHaskellDepends = [
base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
@@ -146070,6 +149762,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "neat-interpolation_0_3_2_4" = callPackage
+ ({ mkDerivation, base, base-prelude, HTF, megaparsec
+ , template-haskell, text
+ }:
+ mkDerivation {
+ pname = "neat-interpolation";
+ version = "0.3.2.4";
+ sha256 = "0lhpjckwhzlvx4cdhrwprwb85vc7hc44ybvk5nswgn7z73cp0wyy";
+ libraryHaskellDepends = [
+ base base-prelude megaparsec template-haskell text
+ ];
+ testHaskellDepends = [ base-prelude HTF ];
+ description = "A quasiquoter for neat and simple multiline text interpolation";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"needle" = callPackage
({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec
, parsec-extra, template-haskell, text, vector
@@ -146409,6 +150118,24 @@ self: {
broken = true;
}) {ghc-binary = null;};
+ "net-spider" = callPackage
+ ({ mkDerivation, aeson, base, containers, greskell
+ , greskell-websocket, hashable, hspec, safe-exceptions, text, time
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "net-spider";
+ version = "0.1.0.0";
+ sha256 = "0vhvq29dr8s3w5acjpaha3k4g14li970rpx405dpj66l96pk2a7x";
+ libraryHaskellDepends = [
+ aeson base containers greskell greskell-websocket hashable
+ safe-exceptions text time unordered-containers vector
+ ];
+ testHaskellDepends = [ base hspec vector ];
+ description = "A graph database middleware to maintain a time-varying graph";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"netclock" = callPackage
({ mkDerivation, base, bytestring, hosc, network }:
mkDerivation {
@@ -146594,8 +150321,8 @@ self: {
pname = "netrc";
version = "0.2.0.0";
sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
- revision = "4";
- editedCabalFile = "0g1c3nbalpb7qh6kddir5b84wwg57j2852al2fg5xza3akdd8jsr";
+ revision = "5";
+ editedCabalFile = "0v383hy7iw44xxnpdp2fla2dc8ivrhwgh2m303ps4z9fsw25cyka";
libraryHaskellDepends = [ base bytestring deepseq parsec ];
testHaskellDepends = [
base bytestring tasty tasty-golden tasty-quickcheck
@@ -146841,16 +150568,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "network_2_7_0_2" = callPackage
+ "network_2_8_0_0" = callPackage
({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit
, unix
}:
mkDerivation {
pname = "network";
- version = "2.7.0.2";
- sha256 = "1fsdcwz7w1g1gznr62a6za8jc2g8cq5asrcq2vc14x9plf31s2vf";
- revision = "2";
- editedCabalFile = "04h5wq6116brd2r3182g65crrbidn43wi43qz1n99gl042ydgf3w";
+ version = "2.8.0.0";
+ sha256 = "00skcish0xmm67ax999nv1nll9rm3gqmn92099iczd73nxl55468";
libraryHaskellDepends = [ base bytestring unix ];
testHaskellDepends = [
base bytestring directory doctest hspec HUnit
@@ -146938,8 +150663,8 @@ self: {
}:
mkDerivation {
pname = "network-api-support";
- version = "0.3.3";
- sha256 = "1dp9fp907sc1r0mshby18vlbkji9bggikbycjbdlb6mzg7mjmiav";
+ version = "0.3.4";
+ sha256 = "0zzb5jxb6zxwq88qwldzy7qy5b4arz4vnn82ilcz2214w21bhzlp";
libraryHaskellDepends = [
aeson attoparsec base bytestring case-insensitive http-client
http-client-tls http-types text time tls
@@ -147038,6 +150763,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "network-byte-order" = callPackage
+ ({ mkDerivation, base, bytestring, doctest }:
+ mkDerivation {
+ pname = "network-byte-order";
+ version = "0.0.0.0";
+ sha256 = "0wfy57ip87ksppggpz26grk4w144yld95mf2y0c6mhcs1l8z3div";
+ libraryHaskellDepends = [ base bytestring ];
+ testHaskellDepends = [ base bytestring doctest ];
+ description = "Network byte order utilities";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"network-bytestring" = callPackage
({ mkDerivation, base, bytestring, network, unix }:
mkDerivation {
@@ -147054,8 +150791,8 @@ self: {
({ mkDerivation, base, bytestring, network, text, time, vector }:
mkDerivation {
pname = "network-carbon";
- version = "1.0.12";
- sha256 = "0fb1ymk1rnsppvil46pyaxlzc09l6716jbrr0h7rb5nxv0bvk5pd";
+ version = "1.0.14";
+ sha256 = "1jrmda71gkcpppzv8s44kms4vz4zj7yb67wyr882s2b4hcf4il5b";
libraryHaskellDepends = [
base bytestring network text time vector
];
@@ -147261,8 +150998,8 @@ self: {
}:
mkDerivation {
pname = "network-messagepack-rpc";
- version = "0.1.0.0";
- sha256 = "0yqisywmhl0y6f88ifpkv8dlldg5s2c2h8z8cv6mhhqj4qdzp1h3";
+ version = "0.1.1.0";
+ sha256 = "13q3dr0l5a5yd693hb2h5nw86kxcw7vbm41dw3lbky7jr8hh2r0h";
libraryHaskellDepends = [
base bytestring data-msgpack safe-exceptions text
unordered-containers
@@ -147278,8 +151015,8 @@ self: {
}:
mkDerivation {
pname = "network-messagepack-rpc-websocket";
- version = "0.1.0.0";
- sha256 = "1q7ckch5z08wxrdsv62z07ivdihqvmcwfg2pgcbf66dhgc9bq4f6";
+ version = "0.1.1.0";
+ sha256 = "05cd6cqyydjwymnk8rscqngvz3knyibl674rcbjpz28him6gbc7d";
libraryHaskellDepends = [
base network-messagepack-rpc text websockets wss-client
];
@@ -147289,6 +151026,7 @@ self: {
];
description = "WebSocket backend for MessagePack RPC";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"network-metrics" = callPackage
@@ -147471,15 +151209,15 @@ self: {
}) {};
"network-simple" = callPackage
- ({ mkDerivation, base, bytestring, exceptions, network
- , safe-exceptions, transformers
+ ({ mkDerivation, base, bytestring, network, safe-exceptions, socks
+ , transformers
}:
mkDerivation {
pname = "network-simple";
- version = "0.4.2";
- sha256 = "0h3xq0lv9wqczm93m81irqsirwsrw9jip11rxyghxrk4rf6pg4ip";
+ version = "0.4.3";
+ sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d";
libraryHaskellDepends = [
- base bytestring exceptions network safe-exceptions transformers
+ base bytestring network safe-exceptions socks transformers
];
description = "Simple network sockets usage patterns";
license = stdenv.lib.licenses.bsd3;
@@ -147502,17 +151240,17 @@ self: {
}) {};
"network-simple-tls" = callPackage
- ({ mkDerivation, base, bytestring, data-default, exceptions
- , network, network-simple, tls, transformers, x509, x509-store
- , x509-system, x509-validation
+ ({ mkDerivation, base, bytestring, data-default, network
+ , network-simple, safe-exceptions, tls, transformers, x509
+ , x509-store, x509-system, x509-validation
}:
mkDerivation {
pname = "network-simple-tls";
- version = "0.3";
- sha256 = "11s5r7vibba7pmmbnglx1w2v5wxykxrzwkrwy4hifxzpbb2gybdw";
+ version = "0.3.1";
+ sha256 = "12kwi2jc8g310wrw7ynq2hfhkxhh95qn0fy205g7a48xrw75npyj";
libraryHaskellDepends = [
- base bytestring data-default exceptions network network-simple tls
- transformers x509 x509-store x509-system x509-validation
+ base bytestring data-default network network-simple safe-exceptions
+ tls transformers x509 x509-store x509-system x509-validation
];
description = "Simple interface to TLS secured network sockets";
license = stdenv.lib.licenses.bsd3;
@@ -147759,8 +151497,8 @@ self: {
({ mkDerivation, base, doctest, network-uri, template-haskell }:
mkDerivation {
pname = "network-uri-static";
- version = "0.1.0.0";
- sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9";
+ version = "0.1.1.0";
+ sha256 = "1fjw3a9ypmqf7kl8s9mgwa9jlswz98igp830f1hsyc1hdh9xlrqw";
libraryHaskellDepends = [ base network-uri template-haskell ];
testHaskellDepends = [ base doctest ];
description = "A small utility to declare type-safe static URIs";
@@ -148091,6 +151829,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {nfc = null;};
+ "ngram" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, cereal-text, containers
+ , optparse-generic, text, zlib
+ }:
+ mkDerivation {
+ pname = "ngram";
+ version = "0.1.0.0";
+ sha256 = "0qk5wgkr69jd9gdy524nsx6r9ss328ynq65k6wn5k7pjkmnfym26";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base cereal cereal-text containers text
+ ];
+ executableHaskellDepends = [
+ base bytestring cereal cereal-text containers optparse-generic text
+ zlib
+ ];
+ description = "Ngram models for compressing and classifying text";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ngrams-loader" = callPackage
({ mkDerivation, attoparsec, base, machines, mtl, parseargs
, resourcet, sqlite-simple, text
@@ -148116,8 +151875,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export";
- version = "1.4.1";
- sha256 = "1a9swysq72igyfbqw078fj3j8vw6hw1v5h4f64kh9wvvdcrdl2rh";
+ version = "1.5.0";
+ sha256 = "1lw1hf2xy86n6c8426zdvk1qbm43gsk5zxjrbfqcy28qlnvwcdpa";
libraryHaskellDepends = [
async base binary bytestring deepseq monad-loops template-haskell
unix
@@ -148126,6 +151885,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ngx-export-tools" = callPackage
+ ({ mkDerivation, aeson, base, binary, bytestring, ngx-export, safe
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "ngx-export-tools";
+ version = "0.2.1.0";
+ sha256 = "1xavggdab7khi8isvrcf85xlrxhy852fb2ccj7jhmdnfmqzbzyyq";
+ libraryHaskellDepends = [
+ aeson base binary bytestring ngx-export safe template-haskell
+ ];
+ description = "Extra tools for Nginx haskell module";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"niagra" = callPackage
({ mkDerivation, base, ghc-prim, HUnit, mtl, primitive, QuickCheck
, text, transformers
@@ -148353,18 +152127,18 @@ self: {
}) {};
"nix-deploy" = callPackage
- ({ mkDerivation, base, neat-interpolation, optparse-applicative
- , optparse-generic, text, turtle
+ ({ mkDerivation, base, bytestring, neat-interpolation
+ , optparse-applicative, optparse-generic, text, turtle
}:
mkDerivation {
pname = "nix-deploy";
- version = "1.0.2";
- sha256 = "07cirn4gaaarw5va128f63jp2q7jlghmg4kclya4fvapx963qbya";
+ version = "1.0.3";
+ sha256 = "0anhmc9g9k40nwj87f24hq4wnj6mkli36dzhzdpa0p3cpg7sh2kh";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base neat-interpolation optparse-applicative optparse-generic text
- turtle
+ base bytestring neat-interpolation optparse-applicative
+ optparse-generic text turtle
];
description = "Deploy Nix-built software to a NixOS machine";
license = stdenv.lib.licenses.asl20;
@@ -148479,6 +152253,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "nixpkgs-update" = callPackage
+ ({ mkDerivation, base, directory, doctest, errors, filepath, github
+ , mtl, neat-interpolation, optparse-applicative, regex-applicative
+ , shelly, text, time, unix, vector
+ }:
+ mkDerivation {
+ pname = "nixpkgs-update";
+ version = "0.2.0";
+ sha256 = "1vlvkyvvykzcss5w4snmwa9lrd50rss8d2gsv36a69w4y0k2ms5z";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base directory errors filepath github mtl neat-interpolation
+ optparse-applicative regex-applicative shelly text time unix vector
+ ];
+ testHaskellDepends = [
+ base directory doctest errors filepath github mtl
+ neat-interpolation optparse-applicative regex-applicative shelly
+ text time unix vector
+ ];
+ description = "Tool for semi-automatic updating of nixpkgs repository";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"nkjp" = callPackage
({ mkDerivation, base, bytestring, containers, data-named, filepath
, polysoup, tar, text, zlib
@@ -148502,8 +152300,8 @@ self: {
({ mkDerivation, base, nlopt, vector }:
mkDerivation {
pname = "nlopt-haskell";
- version = "0.1.2.0";
- sha256 = "0hzg2y11lacgn9793zsk0vib3wb9kyqkcp65vfcfwvd90lny3mmn";
+ version = "0.1.3.0";
+ sha256 = "1lsh2wbl1l291xqwjxdqjpvxss9zzl2ivvwigza7zkbmaz9a0zvx";
libraryHaskellDepends = [ base vector ];
librarySystemDepends = [ nlopt ];
testHaskellDepends = [ base vector ];
@@ -148864,12 +152662,12 @@ self: {
}) {};
"non-empty-containers" = callPackage
- ({ mkDerivation, base, containers }:
+ ({ mkDerivation, base, containers, semigroupoids }:
mkDerivation {
pname = "non-empty-containers";
- version = "0.1.1.0";
- sha256 = "1m4js4z27x43bkccbaqnlrmknfdiwqgdvvkfad7r4kgwdmil3mnc";
- libraryHaskellDepends = [ base containers ];
+ version = "0.1.2.0";
+ sha256 = "0lqyz0xn34byx8f71klj21ficjpy6c049x3fngs7x765vam2dmii";
+ libraryHaskellDepends = [ base containers semigroupoids ];
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -149231,6 +153029,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "nowdoc" = callPackage
+ ({ mkDerivation, base, bytestring, template-haskell }:
+ mkDerivation {
+ pname = "nowdoc";
+ version = "0.1.1.0";
+ sha256 = "0s2j7z9zyb3y3k5hviqjnb3l2z9mvxll5m9nsvq566hn5h5lkzjg";
+ revision = "1";
+ editedCabalFile = "074xgrxs8ynq29bsx66an03q0457f80ga9jf4sqi0q34jgfpmbcv";
+ libraryHaskellDepends = [ base bytestring template-haskell ];
+ testHaskellDepends = [ base bytestring template-haskell ];
+ description = "Here document without variable expansion like PHP Nowdoc";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"np-extras" = callPackage
({ mkDerivation, base, containers, numeric-prelude, primes }:
mkDerivation {
@@ -149280,18 +153092,19 @@ self: {
}) {};
"nqe" = callPackage
- ({ mkDerivation, base, bytestring, conduit, conduit-extra
- , containers, exceptions, hspec, stm, stm-conduit, text, unliftio
+ ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
+ , containers, exceptions, hashable, hspec, mtl, stm, stm-conduit
+ , text, unique, unliftio
}:
mkDerivation {
pname = "nqe";
- version = "0.3.0.0";
- sha256 = "1ggss61zym8ramf3yavmsgn013nlcv40kp6r2v1ax7ccdqyzjh98";
+ version = "0.6.1";
+ sha256 = "1l0dydhcqmgf6bamy29sgry8sjirvw3khzjkhpjlb12zl2y75xxd";
libraryHaskellDepends = [
- base bytestring conduit conduit-extra containers stm unliftio
+ base conduit containers hashable mtl stm unique unliftio
];
testHaskellDepends = [
- base bytestring conduit conduit-extra exceptions hspec stm
+ async base bytestring conduit conduit-extra exceptions hspec stm
stm-conduit text unliftio
];
description = "Concurrency library in the style of Erlang/OTP";
@@ -149406,6 +153219,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ntype" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "ntype";
+ version = "0.1.0.0";
+ sha256 = "0raz6azyj7a3fygpmylhz38b75zy57xdrginbhj2d6vwzxhkmscd";
+ libraryHaskellDepends = [ base ];
+ description = "N-ary sum/product types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"null-canvas" = callPackage
({ mkDerivation, aeson, base, containers, filepath, scotty, split
, stm, text, transformers, wai-extra, warp
@@ -149632,8 +153456,8 @@ self: {
}:
mkDerivation {
pname = "numeric-prelude";
- version = "0.4.3";
- sha256 = "0bc937gblm8rz68fr3q2ms19hqjwi20wkmn1k1c0b675c2kgky5q";
+ version = "0.4.3.1";
+ sha256 = "0531yjw1rzbv3snv1lc955350frgf8526slsxbx3ias71krbdr69";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -149840,6 +153664,8 @@ self: {
pname = "numtype-dk";
version = "0.5.0.2";
sha256 = "0avkdbhxijcja9i9g3cqh699mys8nhsxgrrpkknycmqpvp07sy4q";
+ revision = "1";
+ editedCabalFile = "0892xm8vyyvl1glg4vniz8r5ydg1nz3zmbpgk5mxdih6wi6nmpy4";
libraryHaskellDepends = [ base ];
description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
license = stdenv.lib.licenses.bsd3;
@@ -149878,16 +153704,18 @@ self: {
"nuxeo" = callPackage
({ mkDerivation, attoparsec, base, bytestring, conduit
- , conduit-extra, text, time
+ , conduit-extra, optparse-applicative, text, time
}:
mkDerivation {
pname = "nuxeo";
- version = "0.2.0.3";
- sha256 = "1assz03rv0vdbgl2ihcr7sbx7ifsv7m2mp6lg2jgy5h0ghnlwzcd";
+ version = "0.3.0.2";
+ sha256 = "1h0asiqlffy0wy76q2dz7id6nzsid5nqkmsy1mxdl77zm3d9id4f";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
attoparsec base bytestring conduit conduit-extra text time
];
- description = "Nuxeo";
+ executableHaskellDepends = [ base optparse-applicative text ];
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -149903,8 +153731,8 @@ self: {
}:
mkDerivation {
pname = "nvim-hs";
- version = "1.0.0.2";
- sha256 = "00s8anzazzax8kjsa0ciyvx9c5smwb8a81qh625nf2v9pkp7lr20";
+ version = "1.0.0.3";
+ sha256 = "07pnabrb9hs2l8ajrzcs3wz1m9vfq88wqjirf84ygmmnnd8dva71";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -149977,8 +153805,8 @@ self: {
}:
mkDerivation {
pname = "nvvm";
- version = "0.8.0.3";
- sha256 = "1kwmgl1bp0mlv4bdnjl6m1v34k68pgg6z00z3i7x3wfjff8gd5sr";
+ version = "0.9.0.0";
+ sha256 = "00ggaycs5z2b617kgjv851ahrakd4v8w374qbym19r1ccrxkdhhb";
setupHaskellDepends = [
base Cabal cuda directory filepath template-haskell
];
@@ -150046,8 +153874,8 @@ self: {
}:
mkDerivation {
pname = "o-clock";
- version = "1.0.0";
- sha256 = "18wmy90fn514dmjsyk8n6q4p1nvks6lbi0077s00p6hv247p353j";
+ version = "1.0.0.1";
+ sha256 = "0nmv0zvhd2wd327q268xd8x9swb5v6pm5fn9p5zyn0khja38s6fr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ghc-prim ];
@@ -150334,8 +154162,8 @@ self: {
}:
mkDerivation {
pname = "ochintin-daicho";
- version = "0.3.1.1";
- sha256 = "06xdr5763xipzpl83190p8ha1rm9akqa49dh0588ibbhk2zbk0ln";
+ version = "0.3.4.2";
+ sha256 = "0k7k4rj3356n9d8waw5sjiq97w9wbrhq3bwqr0hr3zh2h5imy5sy";
libraryHaskellDepends = [
base bookkeeping mono-traversable text transaction
];
@@ -150448,8 +154276,8 @@ self: {
}:
mkDerivation {
pname = "odbc";
- version = "0.2.0";
- sha256 = "1dv7h2c6y59dsyhz99k1lzydms618i65jra7gzacf88zb4idnvi7";
+ version = "0.2.2";
+ sha256 = "0dkkkrv43kl3643i0j4hgj1mcsk1jhrl086dygd6hqb9hd4156k5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -151054,8 +154882,10 @@ self: {
}:
mkDerivation {
pname = "opaleye";
- version = "0.6.7001.0";
- sha256 = "0r1hy1p8lcvhqh7p0199dipl7791sbppihl8v1k1vazbr2nkj0l9";
+ version = "0.6.7003.1";
+ sha256 = "1lj4vz1526l11b0mc5y7j9sxf7v6kkzl8c1jymvb1vrqj2qkgxsx";
+ revision = "1";
+ editedCabalFile = "0nwyz9s81hfziwy7a18gpi0663xy6cfc6fl4vx8a1vkwdyfcjjli";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring case-insensitive
contravariant postgresql-simple pretty product-profunctors
@@ -151070,6 +154900,7 @@ self: {
testToolDepends = [ hspec-discover ];
description = "An SQL-generating DSL targeting PostgreSQL";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"opaleye-classy" = callPackage
@@ -151390,23 +155221,6 @@ self: {
}) {};
"openexr-write" = callPackage
- ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
- , deepseq, directory, hspec, split, vector, vector-split, zlib
- }:
- mkDerivation {
- pname = "openexr-write";
- version = "0.1.0.1";
- sha256 = "0f45jgj08fmrj30f167xldapm5lqma4yy95y9mjx6appb7cg5qvd";
- libraryHaskellDepends = [
- base binary bytestring data-binary-ieee754 deepseq split vector
- vector-split zlib
- ];
- testHaskellDepends = [ base bytestring directory hspec vector ];
- description = "Library for writing images in OpenEXR HDR file format";
- license = stdenv.lib.licenses.gpl3;
- }) {};
-
- "openexr-write_0_1_0_2" = callPackage
({ mkDerivation, base, binary, bytestring, data-binary-ieee754
, deepseq, directory, hspec, split, vector, vector-split, zlib
}:
@@ -151421,7 +155235,6 @@ self: {
testHaskellDepends = [ base bytestring directory hspec vector ];
description = "Library for writing images in OpenEXR HDR file format";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"openflow" = callPackage
@@ -151628,10 +155441,8 @@ self: {
}:
mkDerivation {
pname = "opensource";
- version = "0.1.0.0";
- sha256 = "09q1c9v27b7d482ccgv73fhvhk3jfq2fvxnrz6ywi3zvf37bcn9l";
- revision = "1";
- editedCabalFile = "02zb9m7d6fsjbqgwbjnkrpgqc93zm34bvzgasw903hhdkskshrp6";
+ version = "0.1.1.0";
+ sha256 = "10jlgk1rbpz5h1mbknq0i71k0n4ppp3yd498i7p2l79a9gi6pwqy";
libraryHaskellDepends = [
aeson base http-client http-client-tls text transformers
];
@@ -151685,8 +155496,8 @@ self: {
pname = "openssl-streams";
version = "1.2.1.3";
sha256 = "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw";
- revision = "1";
- editedCabalFile = "0kvbb0sgli3h1yw229cllfrs2w1maapmvj1i472ywhpsgpz83362";
+ revision = "2";
+ editedCabalFile = "1004kgdryflpkp19dv4ikilhcn0xbfc5dsp6v3ib34580pcfj7wy";
libraryHaskellDepends = [
base bytestring HsOpenSSL io-streams network
];
@@ -151901,14 +155712,16 @@ self: {
"opentok" = callPackage
({ mkDerivation, aeson, aeson-casing, aeson-compat, base
, base-compat, base64-string, bytestring, containers, convertible
- , either, hscolour, http-client, http-client-tls, http-conduit
- , http-types, iproute, jose, lens, monad-time, SHA, strings, text
- , time, transformers, unordered-containers, utf8-string, uuid
+ , either, hscolour, hspec, http-client, http-client-tls
+ , http-conduit, http-types, iproute, jose, lens, monad-time
+ , QuickCheck, quickcheck-instances, SHA, split, strings, tasty
+ , tasty-hspec, tasty-quickcheck, text, time, transformers
+ , unordered-containers, utf8-string, uuid
}:
mkDerivation {
pname = "opentok";
- version = "0.0.4";
- sha256 = "1wzl7ra1y3998kp54j9hpnv58kzk1ysx9qivi4fsg0psyvhqf17j";
+ version = "0.0.5";
+ sha256 = "1jcqsa9p1794hgf5ywq605i4rb85dm5qpvznn4n3s4y8d409k6wq";
libraryHaskellDepends = [
aeson aeson-casing aeson-compat base base-compat base64-string
bytestring containers convertible either hscolour http-client
@@ -151916,8 +155729,17 @@ self: {
monad-time SHA strings text time transformers unordered-containers
utf8-string uuid
];
+ testHaskellDepends = [
+ aeson aeson-casing aeson-compat base base-compat base64-string
+ bytestring containers convertible either hspec http-client
+ http-client-tls http-conduit http-types iproute jose lens
+ monad-time QuickCheck quickcheck-instances SHA split strings tasty
+ tasty-hspec tasty-quickcheck text time transformers
+ unordered-containers utf8-string uuid
+ ];
description = "An OpenTok SDK for Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"opentype" = callPackage
@@ -152094,8 +155916,8 @@ self: {
}:
mkDerivation {
pname = "optima";
- version = "0.3.0.1";
- sha256 = "10xacn6myg486hk3i4a586xnwsjqjd1r29pyw1plgmb7yjp75z85";
+ version = "0.3.0.2";
+ sha256 = "116h7rdv7g2h5bjxr883s15hg9l194q3nkyn045w2ygapk4xsimg";
libraryHaskellDepends = [
attoparsec attoparsec-data base optparse-applicative text
text-builder
@@ -152103,6 +155925,7 @@ self: {
testHaskellDepends = [ attoparsec-data rerebase ];
description = "Simple command line interface arguments parser";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"optimal-blocks" = callPackage
@@ -152235,8 +156058,8 @@ self: {
}:
mkDerivation {
pname = "optparse-applicative";
- version = "0.14.2.0";
- sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71";
+ version = "0.14.3.0";
+ sha256 = "0qvn1s7jwrabbpmqmh6d6iafln3v3h9ddmxj2y4m0njmzq166ivj";
libraryHaskellDepends = [
ansi-wl-pprint base process transformers transformers-compat
];
@@ -152354,6 +156177,7 @@ self: {
];
description = "Orchestration-style co-ordination EDSL";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"orchestrate" = callPackage
@@ -152582,21 +156406,21 @@ self: {
"orgmode-parse" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, containers
- , free, hashable, HUnit, neat-interpolation, old-locale, tasty
- , tasty-hunit, text, thyme, unordered-containers
+ , free, hashable, HUnit, neat-interpolation, old-locale, semigroups
+ , tasty, tasty-hunit, text, thyme, unordered-containers
}:
mkDerivation {
pname = "orgmode-parse";
- version = "0.2.1";
- sha256 = "1zpkj3f0gdi5ri39s7g532j2pgk5mgs97y2g1gj42q9aa5lm5hw5";
+ version = "0.2.2";
+ sha256 = "1f6wcxkln5ddaa2z7wbkp6wndgq38qv9h1wnn27gqcms02758v2r";
libraryHaskellDepends = [
aeson attoparsec base bytestring containers free hashable
- old-locale text thyme unordered-containers
+ old-locale semigroups text thyme unordered-containers
];
testHaskellDepends = [
aeson attoparsec base bytestring containers free hashable HUnit
- neat-interpolation old-locale tasty tasty-hunit text thyme
- unordered-containers
+ neat-interpolation old-locale semigroups tasty tasty-hunit text
+ thyme unordered-containers
];
description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
license = stdenv.lib.licenses.bsd3;
@@ -152604,27 +156428,27 @@ self: {
}) {};
"orgstat" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, boxes, bytestring, colour
- , containers, data-default, diagrams-lib, diagrams-svg, directory
- , exceptions, filepath, formatting, hashable, hspec, HUnit, lens
- , linear, log-warper, mtl, optparse-simple, orgmode-parse
- , QuickCheck, quickcheck-text, text, time, transformers, turtle
- , universum, yaml
+ ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, boxes
+ , bytestring, colour, containers, data-default, diagrams-lib
+ , diagrams-svg, directory, exceptions, filepath, fmt, formatting
+ , hashable, hspec, HUnit, lens, linear, mtl, optparse-simple
+ , orgmode-parse, QuickCheck, quickcheck-text, text, time
+ , transformers, turtle, universum, yaml
}:
mkDerivation {
pname = "orgstat";
- version = "0.1.4";
- sha256 = "063iqrxcqj4mxlic934ksrl23alvpwr3q5k2w666sqc02nkmcv88";
+ version = "0.1.5";
+ sha256 = "00zkn7d45q9wbbpkygkz8fslals6z5d90hvg1jgna4vw87zqwkdz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson attoparsec base boxes bytestring colour containers
- data-default diagrams-lib diagrams-svg directory exceptions
- filepath formatting hashable lens linear log-warper mtl
+ aeson ansi-terminal attoparsec base boxes bytestring colour
+ containers data-default diagrams-lib diagrams-svg directory
+ exceptions filepath fmt formatting hashable lens linear mtl
optparse-simple orgmode-parse text time turtle universum yaml
];
executableHaskellDepends = [
- base bytestring directory exceptions filepath formatting log-warper
+ base bytestring directory exceptions filepath formatting
optparse-simple universum
];
testHaskellDepends = [
@@ -153022,6 +156846,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "packcheck_0_4_1" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "packcheck";
+ version = "0.4.1";
+ sha256 = "056sjs771gdfvbyynb3vaxgabqj747hyhnbfjq83d0nnqyks8rdy";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ benchmarkHaskellDepends = [ base ];
+ description = "Universal build and CI testing for Haskell packages";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"packdeps" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, directory
, filepath, optparse-applicative, process, semigroups, split, tar
@@ -153471,7 +157309,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_2_2_3_2" = callPackage
+ "pandoc_2_3_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
, binary, blaze-html, blaze-markup, bytestring, Cabal
, case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -153486,8 +157324,8 @@ self: {
}:
mkDerivation {
pname = "pandoc";
- version = "2.2.3.2";
- sha256 = "0dmk2vy0kfsi8xzpa8h0kypidf264d5rjvcqyd7jf34rjj47ikk2";
+ version = "2.3.1";
+ sha256 = "1wf38mqny53ygpaii0vfjrk0889ya7mlsi7hvvqjakjndcyqflbl";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -153529,8 +157367,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-citeproc";
- version = "0.14.3.1";
- sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22";
+ version = "0.14.8";
+ sha256 = "1zxd6n6lsfqdm5w64v2w6wnm70jj9d4n9nqw5pxnmclad1hc38zl";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -153573,14 +157411,14 @@ self: {
"pandoc-crossref" = callPackage
({ mkDerivation, base, containers, data-accessor
, data-accessor-template, data-accessor-transformers, data-default
- , deepseq, directory, filepath, hspec, mtl, open-browser
+ , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser
, optparse-applicative, pandoc, pandoc-types, roman-numerals, syb
, template-haskell, temporary, text, utility-ht
}:
mkDerivation {
pname = "pandoc-crossref";
- version = "0.3.2.1";
- sha256 = "0rxinqgfri1zlq1di4dx949migm3j76lvb10hvmpa4rxz0fkq0l6";
+ version = "0.3.3.0";
+ sha256 = "0gnchg8z07g95wrsj9ywd308gy3h6ihrg7p50rw1dsszrdbfldiw";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -153593,7 +157431,7 @@ self: {
executableHaskellDepends = [
base containers data-accessor data-accessor-template
data-accessor-transformers data-default deepseq directory filepath
- mtl open-browser optparse-applicative pandoc pandoc-types
+ gitrev mtl open-browser optparse-applicative pandoc pandoc-types
roman-numerals syb template-haskell temporary text utility-ht
];
testHaskellDepends = [
@@ -153749,8 +157587,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-placetable";
- version = "0.5";
- sha256 = "0kjlx2krgwf32y30cca09xnf1h3c91s0pzsv5xf7l8zw85jikxah";
+ version = "0.5.1";
+ sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -153785,6 +157623,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pandoc-pyplot" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath
+ , pandoc-types, temporary, typed-process
+ }:
+ mkDerivation {
+ pname = "pandoc-pyplot";
+ version = "1.0.2.0";
+ sha256 = "0q6qj45g8d95z86lqkwpxw7c929x7q68611602mp2ip31dib11xc";
+ revision = "1";
+ editedCabalFile = "0zmvgzqhb4cggsr3m5xw1lhcns586jq5b0s9fhpwq1c3c6k5nq96";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory filepath pandoc-types temporary
+ typed-process
+ ];
+ executableHaskellDepends = [ base pandoc-types ];
+ description = "A Pandoc filter for including figures generated from Matplotlib";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"pandoc-sidenote" = callPackage
({ mkDerivation, base, monad-gen, pandoc, pandoc-types }:
mkDerivation {
@@ -153824,8 +157683,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-types";
- version = "1.17.5.1";
- sha256 = "1q6v2bynij724fv347mhqxdscwifzrx5jb9mq80608qf638fn717";
+ version = "1.17.5.4";
+ sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j";
libraryHaskellDepends = [
aeson base bytestring containers deepseq ghc-prim QuickCheck syb
transformers
@@ -153911,15 +157770,16 @@ self: {
}) {inherit (pkgs.gnome2) pango;};
"pangraph" = callPackage
- ({ mkDerivation, algebraic-graphs, base, bytestring, containers
- , hexml, HUnit
+ ({ mkDerivation, algebraic-graphs, attoparsec, base, bytestring
+ , containers, fgl, hexml, html-entities, HUnit, text
}:
mkDerivation {
pname = "pangraph";
- version = "0.1.2";
- sha256 = "03iqf77j7a382m7zwkgh872frbii98l04agh6sr4ic96554b0gzl";
+ version = "0.2.1";
+ sha256 = "09jyhaxl89y8arkm4xmbx3bp859viq00bdnqk3bnvdiwv3klry8l";
libraryHaskellDepends = [
- algebraic-graphs base bytestring containers hexml
+ algebraic-graphs attoparsec base bytestring containers fgl hexml
+ html-entities text
];
testHaskellDepends = [ base bytestring containers HUnit ];
description = "A set of parsers for graph languages and conversions to graph libaries";
@@ -154090,6 +157950,8 @@ self: {
pname = "papa-bifunctors-export";
version = "0.3.1";
sha256 = "070br6i23pdhha9kakfw4sq8rslyrjsf1n0iikm60ca5ldbl8vn0";
+ revision = "1";
+ editedCabalFile = "1d5jvb35as6kb9nmv99gv38v7rzl7c9mdg3ypwzmdqg0646m9k7m";
libraryHaskellDepends = [ base bifunctors ];
description = "export useful functions from `bifunctors`";
license = stdenv.lib.licenses.bsd3;
@@ -154495,8 +158357,8 @@ self: {
pname = "parallel-io";
version = "0.3.3";
sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s";
- revision = "1";
- editedCabalFile = "1vlb2x1ghih4l64031rmh7h643c3knh5r5mwilf7g8izb58ypvkm";
+ revision = "2";
+ editedCabalFile = "0mggzni708nzxlsjbibdzf03s3b5lnqj2zi1hnbh1rd4j4jr07ym";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -154586,8 +158448,8 @@ self: {
}:
mkDerivation {
pname = "paramtree";
- version = "0.1.1";
- sha256 = "1k6bcx0h4prg7a85knhaw4z7vh9gilc9m1y66r9qrhj2fqi0ilj3";
+ version = "0.1.1.1";
+ sha256 = "0ls9wzmz5lk7gyl8lx9cjs49zpwhrv955fs5q6ypv7bpbvjbchs1";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [
base bytestring tasty tasty-golden tasty-hunit temporary
@@ -154675,17 +158537,18 @@ self: {
}) {};
"parconc-examples" = callPackage
- ({ mkDerivation, abstract-par, accelerate, array, async, base
+ ({ mkDerivation, abstract-par, accelerate, alex, array, async, base
, binary, bytestring, containers, deepseq, directory
, distributed-process, distributed-process-simplelocalnet
- , distributed-static, filepath, http-conduit, monad-par, network
- , network-uri, normaldistribution, parallel, random, repa, stm
- , template-haskell, time, transformers, utf8-string, vector, xml
+ , distributed-static, filepath, happy, http-conduit, monad-par
+ , network, network-uri, normaldistribution, parallel, random, repa
+ , stm, template-haskell, time, transformers, utf8-string, vector
+ , xml
}:
mkDerivation {
pname = "parconc-examples";
- version = "0.4.5";
- sha256 = "172y33s74jx4cs0fykn5qg2c5s95kg5lngrins9ql9n97rb63pwh";
+ version = "0.4.7";
+ sha256 = "1r05ai6n6dgkqlcv4qlb10yzrjj86408ybz5zlh63qi2y34h9ga7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -154696,6 +158559,7 @@ self: {
parallel random repa stm template-haskell time transformers
utf8-string vector xml
];
+ executableToolDepends = [ alex happy ];
description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -154713,6 +158577,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "paripari" = callPackage
+ ({ mkDerivation, base, bytestring, parser-combinators, random
+ , tasty, tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "paripari";
+ version = "0.6.0.0";
+ sha256 = "1604py5ms14xhmvsxdqx56xfbs3g4wkhjd8f5gsmhpqwz7acy511";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring parser-combinators text
+ ];
+ executableHaskellDepends = [
+ base bytestring parser-combinators text
+ ];
+ testHaskellDepends = [
+ base bytestring parser-combinators random tasty tasty-hunit text
+ ];
+ description = "Parser combinators with fast-path and slower fallback for error reporting";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"parport" = callPackage
({ mkDerivation, array, base }:
mkDerivation {
@@ -155262,8 +159149,8 @@ self: {
({ mkDerivation, base, doctest, hedgehog }:
mkDerivation {
pname = "partial-semigroup";
- version = "0.3.0.3";
- sha256 = "1vsn82kpv2ny4yjj8gq8xaq8kvi55wzy8ix0k4lsppsda8j3s9rx";
+ version = "0.4.0.1";
+ sha256 = "0jfdybqxqrkxwbvscgy6q6vp32jp5h9xbyfykxbvsc64h02kn6gs";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest hedgehog ];
description = "A partial binary associative operator";
@@ -155275,8 +159162,8 @@ self: {
({ mkDerivation, base, hedgehog, partial-semigroup }:
mkDerivation {
pname = "partial-semigroup-hedgehog";
- version = "0.3.0.1";
- sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr";
+ version = "0.4.0.1";
+ sha256 = "1nvfy1cwp7qv77bm0ax3ll7jmqciasq9gsyyrghsx18y1q2d8qzp";
libraryHaskellDepends = [ base hedgehog partial-semigroup ];
description = "Property testing for partial semigroups using Hedgehog";
license = stdenv.lib.licenses.asl20;
@@ -155287,8 +159174,8 @@ self: {
({ mkDerivation, partial-semigroup-hedgehog }:
mkDerivation {
pname = "partial-semigroup-test";
- version = "0.3.0.1";
- sha256 = "006dlck7dr1xs2wwd233bm87mf619dlwnb66xlcfp82ksdmnfl6n";
+ version = "0.4.0.1";
+ sha256 = "0p990b35wqy339mhlbcd0xh82rc4qyahzn4ndjyy1cv33cab7is7";
libraryHaskellDepends = [ partial-semigroup-hedgehog ];
doHaddock = false;
description = "Testing utilities for the partial-semigroup package";
@@ -155357,6 +159244,8 @@ self: {
pname = "passman-cli";
version = "0.2.0.0";
sha256 = "0l0cbhngg2dxsy95a24x1g19cpnmngcgdkxklzjymmcnqmxp7jd8";
+ revision = "1";
+ editedCabalFile = "197mlc2v7azdgdnvr2pxm2whhpqj4v2czwn5vi6ksrax82xswcnc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -155370,25 +159259,23 @@ self: {
"passman-core" = callPackage
({ mkDerivation, aeson, async, base, bcrypt, bytestring, conduit
- , conduit-extra, containers, cryptohash-md5, csv-conduit
- , data-ordlist, directory, filepath, int-cast, memory, QuickCheck
- , quickcheck-unicode, resourcet, template-haskell, temporary, text
+ , containers, cryptohash-md5, csv-conduit, data-ordlist, directory
+ , filepath, int-cast, memory, QuickCheck, quickcheck-instances
+ , quickcheck-unicode, template-haskell, temporary, text
, unix-compat, yaml
}:
mkDerivation {
pname = "passman-core";
- version = "0.2.0.0";
- sha256 = "03l43n8r0jdxbc07qjdazkanzd7lj1kp814ylhvn0ri9zzyfcgm7";
- revision = "1";
- editedCabalFile = "1840hm9wiym9jlgij1b2d8fa90pdscg2rqhzhvrl7qawd3jjxq5x";
+ version = "0.2.0.1";
+ sha256 = "1j258waghli2ahg25ihc13qjwz8zmy6ppld0y6sz3jphpg2azybs";
libraryHaskellDepends = [
- aeson base bcrypt bytestring conduit conduit-extra containers
- cryptohash-md5 csv-conduit data-ordlist directory filepath int-cast
- memory resourcet text unix-compat yaml
+ aeson base bcrypt bytestring conduit containers cryptohash-md5
+ csv-conduit data-ordlist directory filepath int-cast memory text
+ unix-compat yaml
];
testHaskellDepends = [
- async base conduit filepath QuickCheck quickcheck-unicode
- template-haskell temporary text yaml
+ async base conduit filepath QuickCheck quickcheck-instances
+ quickcheck-unicode template-haskell temporary text yaml
];
doHaddock = false;
description = "Deterministic password generator core";
@@ -155452,21 +159339,22 @@ self: {
"patat" = callPackage
({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
- , bytestring, containers, directory, filepath, mtl, network
- , network-uri, optparse-applicative, pandoc, skylighting
- , terminal-size, text, time, unordered-containers, yaml
+ , base64-bytestring, bytestring, colour, containers, directory
+ , filepath, mtl, network, network-uri, optparse-applicative, pandoc
+ , process, skylighting, terminal-size, text, time
+ , unordered-containers, yaml
}:
mkDerivation {
pname = "patat";
- version = "0.7.2.0";
- sha256 = "1kn739dywchvvvcp972yyxg7r4n81s3qbrni684ag7493nck12iw";
+ version = "0.8.1.1";
+ sha256 = "19nnf08szakwivm7zqv85hr0vwpflpk455373a3hwhcjgkzdfy19";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- aeson ansi-terminal ansi-wl-pprint base bytestring containers
- directory filepath mtl network network-uri optparse-applicative
- pandoc skylighting terminal-size text time unordered-containers
- yaml
+ aeson ansi-terminal ansi-wl-pprint base base64-bytestring
+ bytestring colour containers directory filepath mtl network
+ network-uri optparse-applicative pandoc process skylighting
+ terminal-size text time unordered-containers yaml
];
description = "Terminal-based presentations using Pandoc";
license = stdenv.lib.licenses.gpl2;
@@ -155485,26 +159373,28 @@ self: {
}) {};
"patch-image" = callPackage
- ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
+ ({ mkDerivation, accelerate, accelerate-arithmetic
, accelerate-cufft, accelerate-fourier, accelerate-io
- , accelerate-utility, array, base, bytestring, Cabal, carray
- , cassava, containers, enumset, explicit-exception, fft, filepath
- , gnuplot, hmatrix, JuicyPixels, knead, llvm-extra, llvm-tf
- , non-empty, pqueue, storable-tuple, tfp, unordered-containers
- , utility-ht, vector
+ , accelerate-llvm-ptx, accelerate-utility, array, base, bool8
+ , bytestring, Cabal, carray, cassava, containers, dsp, enumset
+ , explicit-exception, fft, filepath, gnuplot, JuicyPixels, knead
+ , llvm-extra, llvm-tf, non-empty, pqueue, prelude-compat
+ , semigroups, storable-complex, storable-tuple, tfp
+ , unordered-containers, utility-ht, vector
}:
mkDerivation {
pname = "patch-image";
- version = "0.3.1";
- sha256 = "1l7iv83r145wmfhr8mygc7ln78jv669n2klhm1n9p50dinv1gj17";
+ version = "0.3.2.1";
+ sha256 = "1z8m3lfdd2izb6riqzscc40kk8wc7588l24214sg0bkampss1ysg";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft
- accelerate-fourier accelerate-io accelerate-utility array base
- bytestring Cabal carray cassava containers enumset
- explicit-exception fft filepath gnuplot hmatrix JuicyPixels knead
- llvm-extra llvm-tf non-empty pqueue storable-tuple tfp
+ accelerate accelerate-arithmetic accelerate-cufft
+ accelerate-fourier accelerate-io accelerate-llvm-ptx
+ accelerate-utility array base bool8 bytestring Cabal carray cassava
+ containers dsp enumset explicit-exception fft filepath gnuplot
+ JuicyPixels knead llvm-extra llvm-tf non-empty pqueue
+ prelude-compat semigroups storable-complex storable-tuple tfp
unordered-containers utility-ht vector
];
description = "Compose a big image from overlapping parts";
@@ -155678,6 +159568,8 @@ self: {
pname = "paths";
version = "0.2.0.0";
sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v";
+ revision = "1";
+ editedCabalFile = "1k477vwhahdgkf3sm2yjl1638qwq6ddm2x10vdf3cq48js2pkrw5";
libraryHaskellDepends = [
base bytestring deepseq directory filepath template-haskell text
time
@@ -155723,6 +159615,8 @@ self: {
pname = "patience";
version = "0.1.1";
sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm";
+ revision = "1";
+ editedCabalFile = "0xj4hypjnhsn5jhs66l9wwhpkn5pbd8xmx7pgcy2ib08cz1087y7";
libraryHaskellDepends = [ base containers ];
description = "Patience diff and longest increasing subsequence";
license = stdenv.lib.licenses.bsd3;
@@ -156471,6 +160365,17 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "pedestrian-dag" = callPackage
+ ({ mkDerivation, array, base, binary, containers }:
+ mkDerivation {
+ pname = "pedestrian-dag";
+ version = "0.2.0";
+ sha256 = "075m58nmls893vis3l55dix8mrciwl2r8kz1s18mgwhxvadm4gdp";
+ libraryHaskellDepends = [ array base binary containers ];
+ description = "A pedestrian implementation of directed acyclic graphs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"peg" = callPackage
({ mkDerivation, base, containers, filepath, haskeline, logict, mtl
, parsec
@@ -156949,6 +160854,7 @@ self: {
];
description = "Permutations of finite sets";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"permute" = callPackage
@@ -156963,6 +160869,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "persist" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, ghc-prim
+ , QuickCheck, test-framework, test-framework-quickcheck2, text
+ }:
+ mkDerivation {
+ pname = "persist";
+ version = "0.1";
+ sha256 = "0akiy8qrx71nj8l80hc7llxy7vnpcvjg01dhk499pl5mjaiqz2sq";
+ libraryHaskellDepends = [
+ array base bytestring containers ghc-prim text
+ ];
+ testHaskellDepends = [
+ base bytestring QuickCheck test-framework
+ test-framework-quickcheck2 text
+ ];
+ description = "Minimal serialization library with focus on performance";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"persist2er" = callPackage
({ mkDerivation, base, optparse-applicative, persistent, text }:
mkDerivation {
@@ -157087,6 +161012,38 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
+ "persistent_2_9_0" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+ , blaze-html, blaze-markup, bytestring, conduit, containers
+ , fast-logger, hspec, http-api-data, monad-control, monad-logger
+ , mtl, old-locale, path-pieces, resource-pool, resourcet
+ , scientific, silently, tagged, template-haskell, text, time
+ , transformers, unliftio-core, unordered-containers, vector, void
+ }:
+ mkDerivation {
+ pname = "persistent";
+ version = "2.9.0";
+ sha256 = "0qgjfydyhcyfr8mni0qjykn3jsh4r299yy2wqsl3rsd19bmmr1p7";
+ libraryHaskellDepends = [
+ aeson attoparsec base base64-bytestring blaze-html blaze-markup
+ bytestring conduit containers fast-logger http-api-data
+ monad-logger mtl old-locale path-pieces resource-pool resourcet
+ scientific silently tagged template-haskell text time transformers
+ unliftio-core unordered-containers vector void
+ ];
+ testHaskellDepends = [
+ aeson attoparsec base base64-bytestring blaze-html bytestring
+ conduit containers fast-logger hspec http-api-data monad-control
+ monad-logger mtl old-locale path-pieces resource-pool resourcet
+ scientific tagged template-haskell text time transformers
+ unordered-containers vector
+ ];
+ description = "Type-safe, multi-backend data serialization";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ psibi ];
+ }) {};
+
"persistent-audit" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring
, getopt-generics, hashable, hspec, mongoDB, persistent
@@ -157283,6 +161240,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "persistent-mysql_2_9_0" = callPackage
+ ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+ , containers, monad-logger, mysql, mysql-simple, persistent
+ , resource-pool, resourcet, text, transformers, unliftio-core
+ }:
+ mkDerivation {
+ pname = "persistent-mysql";
+ version = "2.9.0";
+ sha256 = "0aa1ia4r49vy5hfg59rbrfmfwdyaix0l32drdjnj9xxqbayifjzf";
+ libraryHaskellDepends = [
+ aeson base blaze-builder bytestring conduit containers monad-logger
+ mysql mysql-simple persistent resource-pool resourcet text
+ transformers unliftio-core
+ ];
+ description = "Backend for the persistent library using MySQL database server";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"persistent-mysql-haskell" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, containers
, io-streams, monad-logger, mysql-haskell, network, persistent
@@ -157291,8 +161267,8 @@ self: {
}:
mkDerivation {
pname = "persistent-mysql-haskell";
- version = "0.4.1";
- sha256 = "1wp8va21l03i0wlchlmzik7npvrm4gma4wly0p9rljdwizhgh291";
+ version = "0.4.2";
+ sha256 = "012vnfxjqlp352jm5s8glvypgyjligsqfrhb3y0kpzvxlsw4a653";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -157308,7 +161284,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "persistent-mysql-haskell_0_4_2" = callPackage
+ "persistent-mysql-haskell_0_5_0" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, containers
, io-streams, monad-logger, mysql-haskell, network, persistent
, persistent-template, resource-pool, resourcet, text, time, tls
@@ -157316,8 +161292,8 @@ self: {
}:
mkDerivation {
pname = "persistent-mysql-haskell";
- version = "0.4.2";
- sha256 = "012vnfxjqlp352jm5s8glvypgyjligsqfrhb3y0kpzvxlsw4a653";
+ version = "0.5.0";
+ sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -157387,6 +161363,29 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
+ "persistent-postgresql_2_9_0" = callPackage
+ ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+ , containers, monad-logger, persistent, postgresql-libpq
+ , postgresql-simple, resource-pool, resourcet, text, time
+ , transformers, unliftio-core
+ }:
+ mkDerivation {
+ pname = "persistent-postgresql";
+ version = "2.9.0";
+ sha256 = "1rqlbdz7wwjl1d3xqp01sz5xnn8hff35hgkhx6c66lzrfyl9q0mx";
+ revision = "1";
+ editedCabalFile = "0xrnww7n6kwr2371fj5xklslbx0114yj3pxcpdzwalmin5wm8vah";
+ libraryHaskellDepends = [
+ aeson base blaze-builder bytestring conduit containers monad-logger
+ persistent postgresql-libpq postgresql-simple resource-pool
+ resourcet text time transformers unliftio-core
+ ];
+ description = "Backend for the persistent library using postgresql";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ psibi ];
+ }) {};
+
"persistent-protobuf" = callPackage
({ mkDerivation, base, bytestring, persistent, protocol-buffers
, protocol-buffers-descriptor, template-haskell, text
@@ -157404,6 +161403,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "persistent-qq" = callPackage
+ ({ mkDerivation, base, haskell-src-meta, mtl, persistent
+ , template-haskell, text
+ }:
+ mkDerivation {
+ pname = "persistent-qq";
+ version = "2.9.0";
+ sha256 = "02dvsmlamfy93490qhb9qq25vq8wrqhzzza5q5shvak1n7wgjvh0";
+ revision = "1";
+ editedCabalFile = "15zkam90rfq33549kqpwyllrjpdvgkcpwnv16y6n439xd96vyyci";
+ libraryHaskellDepends = [
+ base haskell-src-meta mtl persistent template-haskell text
+ ];
+ description = "Provides a quasi-quoter for raw SQL for persistent";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"persistent-ratelimit" = callPackage
({ mkDerivation, base, time, yesod }:
mkDerivation {
@@ -157513,8 +161530,8 @@ self: {
}:
mkDerivation {
pname = "persistent-sqlite";
- version = "2.8.1.2";
- sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g";
+ version = "2.8.2";
+ sha256 = "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6";
configureFlags = [ "-fsystemlib" ];
isLibrary = true;
isExecutable = true;
@@ -157533,7 +161550,7 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {inherit (pkgs) sqlite;};
- "persistent-sqlite_2_8_2" = callPackage
+ "persistent-sqlite_2_9_0" = callPackage
({ mkDerivation, aeson, base, bytestring, conduit, containers
, hspec, microlens-th, monad-logger, old-locale, persistent
, persistent-template, resource-pool, resourcet, sqlite, temporary
@@ -157541,8 +161558,8 @@ self: {
}:
mkDerivation {
pname = "persistent-sqlite";
- version = "2.8.2";
- sha256 = "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6";
+ version = "2.9.0";
+ sha256 = "0yn99m64p49x0bghpbnm77bk3ghk99w2w5d1772cmx15aq2d7w0y";
configureFlags = [ "-fsystemlib" ];
isLibrary = true;
isExecutable = true;
@@ -158117,8 +162134,8 @@ self: {
}:
mkDerivation {
pname = "phoityne-vscode";
- version = "0.0.26.0";
- sha256 = "168qshbiawj1i7d676y2x5l2bmkhfvnf0fs2abr75v8g7hsa8imq";
+ version = "0.0.27.0";
+ sha256 = "1kx06kf700a849ivfnr36zs1sk7a5al71hx1h7w8b1agklf1kvzn";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -158274,6 +162291,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "physics" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "physics";
+ version = "0.1.2.1";
+ sha256 = "07ysi2xq73g29pv4c3zvwq9zf1yjl2aszb1zkim49n00f5bxfnqc";
+ libraryHaskellDepends = [ base ];
+ description = "dimensions, quantities and constants";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pi-calculus" = callPackage
({ mkDerivation, AES, base, binary, byteable, bytestring
, containers, cryptohash, HTTP, io-streams, mtl, network, parsec
@@ -158532,33 +162560,45 @@ self: {
}) {};
"pier" = callPackage
- ({ mkDerivation, aeson, base, base64-bytestring, binary
- , binary-orphans, bytestring, Cabal, containers, cryptohash-sha256
- , directory, hashable, http-client, http-client-tls, http-types
- , optparse-applicative, process, shake, split, temporary, text
- , transformers, unix, unordered-containers, yaml
+ ({ mkDerivation, aeson, base, binary, binary-orphans, Cabal
+ , containers, directory, hashable, optparse-applicative, pier-core
+ , shake, split, text, transformers, unordered-containers, yaml
}:
mkDerivation {
pname = "pier";
- version = "0.1.0.0";
- sha256 = "19l8ghpik8j8igh0xa8kcmn6zs6r4xa8yks60n8v37d6ksr5k9m6";
- isLibrary = true;
+ version = "0.3.0.0";
+ sha256 = "1rv5k8apxshh8kbbbjzcw23bfx819634ryz83jp2iqhixlgcqz69";
+ isLibrary = false;
isExecutable = true;
- libraryHaskellDepends = [
- aeson base base64-bytestring binary binary-orphans bytestring Cabal
- containers cryptohash-sha256 directory hashable http-client
- http-client-tls http-types process shake temporary text
- transformers unix unordered-containers yaml
- ];
executableHaskellDepends = [
- base Cabal directory optparse-applicative shake split
- unordered-containers
+ aeson base binary binary-orphans Cabal containers directory
+ hashable optparse-applicative pier-core shake split text
+ transformers unordered-containers yaml
];
description = "Yet another Haskell build system";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pier-core" = callPackage
+ ({ mkDerivation, base, base64-bytestring, binary, bytestring, Cabal
+ , containers, cryptohash-sha256, directory, hashable, http-client
+ , http-client-tls, http-types, process, shake, temporary, text
+ , unix
+ }:
+ mkDerivation {
+ pname = "pier-core";
+ version = "0.3.0.0";
+ sha256 = "0sxdswnkxhdcfcg4xq11lvgsip05nr4qd361qdrw2nxafq9q3dnj";
+ libraryHaskellDepends = [
+ base base64-bytestring binary bytestring Cabal containers
+ cryptohash-sha256 directory hashable http-client http-client-tls
+ http-types process shake temporary text unix
+ ];
+ description = "A library for writing forwards-declared build systems in haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"piet" = callPackage
({ mkDerivation, array, base, containers, Imlib, mtl }:
mkDerivation {
@@ -158785,6 +162825,8 @@ self: {
pname = "pipes";
version = "4.3.9";
sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w";
+ revision = "1";
+ editedCabalFile = "0mkwbbn8vlrsvm3pl2cyaw1qr9hbjqfm831naj7cbrmiksf2l5aa";
libraryHaskellDepends = [
base exceptions mmorph mtl semigroups transformers void
];
@@ -159078,8 +163120,10 @@ self: {
}:
mkDerivation {
pname = "pipes-concurrency";
- version = "2.0.11";
- sha256 = "03h87b11c64yvj28lxgbvjvqrsx0zfqb92v0apd8ypb9xxabqd4m";
+ version = "2.0.12";
+ sha256 = "17aqh6p1az09n6b6vs06pxcha5aq6dvqjwskgjcdiz7221vwchs3";
+ revision = "1";
+ editedCabalFile = "1c1rys2pp7a2z6si925ps610q8a38a6m26s182phwa5nfhyggpaw";
libraryHaskellDepends = [
async base contravariant pipes semigroups stm void
];
@@ -159408,6 +163452,8 @@ self: {
pname = "pipes-lzma";
version = "0.1.1.2";
sha256 = "0wx23wf1vr8d2nyapxgmpn1jk53hjbla1xss714vkmar7am37vrc";
+ revision = "1";
+ editedCabalFile = "13nyh3qqv3baifya0vwnnqh1yvr3k2yjrhjq7apigq0s584iyrka";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring lzma pipes ];
@@ -159635,8 +163681,8 @@ self: {
pname = "pipes-safe";
version = "2.2.9";
sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p";
- revision = "1";
- editedCabalFile = "08jxmxfhxfi3v19bvvmfs50c74ci6v36503knsb4qdscx9lr864d";
+ revision = "2";
+ editedCabalFile = "1crpzg72nahmffw468d31l23bw3wgi0p3w7ad2pv3jxhy1432c71";
libraryHaskellDepends = [
base containers exceptions monad-control mtl pipes primitive
transformers transformers-base
@@ -159645,6 +163691,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pipes-safe_2_3_1" = callPackage
+ ({ mkDerivation, base, containers, exceptions, monad-control, mtl
+ , pipes, primitive, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "pipes-safe";
+ version = "2.3.1";
+ sha256 = "0dfdd3fccfd7wfn5228hbfj3h10xq01sddpy1v2ds63wlg84kwly";
+ libraryHaskellDepends = [
+ base containers exceptions monad-control mtl pipes primitive
+ 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
@@ -159940,6 +164003,7 @@ self: {
];
description = "Haskell game engine like fantasy console";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pkcs1" = callPackage
@@ -160117,6 +164181,77 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "planet-mitchell" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, aeson-qq, ansi-terminal
+ , approximate, array, async, atomic-primops, base, base-orphans
+ , base16-bytestring, bits, bytestring, bytestring-lexing
+ , case-insensitive, cborg, comonad, compact, compactable
+ , constraints, containers, contravariant, contravariant-extras
+ , deepseq, Diff, distributive, dlist, double-conversion, Earley
+ , email-validate, erf, exact-pi, exceptions, extra, fast-digits
+ , fgl, filepath, foldl, free, generic-aeson, generic-lens, half
+ , hashable, heaps, ilist, insert-ordered-containers
+ , integer-logarithms, lens, lens-aeson, list-transformer, logict
+ , managed, megaparsec, mmorph, monad-ste, mtl, multiset, mwc-random
+ , neat-interpolation, network, network-info, network-uri, nf
+ , optparse-applicative, parallel, parser-combinators, pointed
+ , prettyprinter, prettyprinter-ansi-terminal, primitive
+ , profunctors, psqueues, random-bytestring, reactive-banana
+ , reflection, regex-applicative, safe, say, scientific
+ , semigroupoids, semigroups, semilattices, serialise, split, stm
+ , stm-chans, stm-containers, stringsearch, tagged, text
+ , text-metrics, text-short, time, transformers, transformers-base
+ , transformers-compat, typed-process, unagi-chan, unique, unix
+ , unliftio, unordered-containers, utf8-string, uuid, uuid-types
+ , vault, vector, vector-builder, writer-cps-mtl
+ }:
+ mkDerivation {
+ pname = "planet-mitchell";
+ version = "0.1.0";
+ sha256 = "0i9fhv17q6i7gim7k3kklivyg5c4kmxfhlfsdljpdv5sy8hl3jh1";
+ libraryHaskellDepends = [
+ aeson aeson-pretty aeson-qq ansi-terminal approximate array async
+ atomic-primops base base-orphans base16-bytestring bits bytestring
+ bytestring-lexing case-insensitive cborg comonad compact
+ compactable constraints containers contravariant
+ contravariant-extras deepseq Diff distributive dlist
+ double-conversion Earley email-validate erf exact-pi exceptions
+ extra fast-digits fgl filepath foldl free generic-aeson
+ generic-lens half hashable heaps ilist insert-ordered-containers
+ integer-logarithms lens lens-aeson list-transformer logict managed
+ megaparsec mmorph monad-ste mtl multiset mwc-random
+ neat-interpolation network network-info network-uri nf
+ optparse-applicative parallel parser-combinators pointed
+ prettyprinter prettyprinter-ansi-terminal primitive profunctors
+ psqueues random-bytestring reactive-banana reflection
+ regex-applicative safe say scientific semigroupoids semigroups
+ semilattices serialise split stm stm-chans stm-containers
+ stringsearch tagged text text-metrics text-short time transformers
+ transformers-base transformers-compat typed-process unagi-chan
+ unique unix unliftio unordered-containers utf8-string uuid
+ uuid-types vault vector vector-builder writer-cps-mtl
+ ];
+ description = "Planet Mitchell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "planet-mitchell-test" = callPackage
+ ({ mkDerivation, gauge, hedgehog, hspec-expectations, tasty
+ , tasty-hedgehog, tasty-hunit, tasty-rerun, weigh
+ }:
+ mkDerivation {
+ pname = "planet-mitchell-test";
+ version = "0.0.0";
+ sha256 = "09nmdz34nz7gdq7x48pmimn966vrnlicg3q74a6m3r29vn9wh47d";
+ libraryHaskellDepends = [
+ gauge hedgehog hspec-expectations tasty tasty-hedgehog tasty-hunit
+ tasty-rerun weigh
+ ];
+ description = "Planet Mitchell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"plankton" = callPackage
({ mkDerivation, adjunctions, base, protolude }:
mkDerivation {
@@ -160224,6 +164359,7 @@ self: {
];
description = "run a subprocess, combining stdout and stderr";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"plist" = callPackage
@@ -161166,6 +165302,18 @@ self: {
license = "LGPL";
}) {};
+ "polyparse_1_12_1" = callPackage
+ ({ mkDerivation, base, bytestring, text }:
+ mkDerivation {
+ pname = "polyparse";
+ version = "1.12.1";
+ sha256 = "19fs18g7fvfdkm9zy28cgighjcxfa6mcpqgyp6whmsjkb3h393fx";
+ libraryHaskellDepends = [ base bytestring text ];
+ description = "A variety of alternative parser combinator libraries";
+ license = "LGPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"polyseq" = callPackage
({ mkDerivation, array, base, bytestring, cgi, containers
, free-theorems, haskell-src, mtl, network, old-locale, old-time
@@ -161230,8 +165378,8 @@ self: {
pname = "polyvariadic";
version = "0.3.0.3";
sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1";
- revision = "2";
- editedCabalFile = "0bcckgz6v7707rdgipaahqws6gkcmmrq5wyl407awb3fssnqxfkn";
+ revision = "3";
+ editedCabalFile = "10lqcrp16v1h0lzr931haramkxkxz2bkfsyadxnc7ki73k39g11p";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base ];
description = "Creation and application of polyvariadic functions";
@@ -161245,8 +165393,8 @@ self: {
}:
mkDerivation {
pname = "pomaps";
- version = "0.0.1.0";
- sha256 = "1vvvpqr3gnps425mv00scmab0hc8h93ylsiw07vm8cpafwkfxii8";
+ version = "0.0.2.0";
+ sha256 = "08mlj61archpiqq8375gi5ha9mpxgpnsfpsx3kqja92dgj0aq5q6";
libraryHaskellDepends = [
base containers deepseq ghc-prim lattices
];
@@ -161460,8 +165608,8 @@ self: {
}:
mkDerivation {
pname = "pooled-io";
- version = "0.0.2.1";
- sha256 = "1l7rgwlkhgxxh9y3ag341zifdjabhmwd6k9hg83rqnnmfs45lh3x";
+ version = "0.0.2.2";
+ sha256 = "1g8zppj2s1wfzg5rpdgz15m44ihxhmrx16jx12n4821cdhsm2nrs";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -161988,8 +166136,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-connector";
- version = "0.2.6";
- sha256 = "1nhsplb7s4k3y2450pr57fl39n1gjs2110vvr9v4pn0h6hwz1yl3";
+ version = "0.2.7";
+ sha256 = "1p5nqav8yxgj8knbrmfv1lgpflid338ka2a9xp3pixq0dwz7argk";
libraryHaskellDepends = [
base bytestring exceptions lens mtl postgresql-simple resource-pool
resourcet time transformers-base
@@ -162036,11 +166184,12 @@ self: {
({ mkDerivation, base, bytestring, Cabal, postgresql, unix }:
mkDerivation {
pname = "postgresql-libpq";
- version = "0.9.4.1";
- sha256 = "0ssn12cs643nd1bliaks0l0ssainydsrzjr3l5p7hm3wnqwa77qd";
+ version = "0.9.4.2";
+ sha256 = "1y86kysakfcf3zq252yl2llrx3765vxvkdwda4q5ql7ikv3m786f";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base bytestring unix ];
librarySystemDepends = [ postgresql ];
+ testHaskellDepends = [ base bytestring ];
description = "low-level binding to libpq";
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) postgresql;};
@@ -162104,6 +166253,8 @@ self: {
pname = "postgresql-query";
version = "3.5.0";
sha256 = "1sh8kgfqy1kipz99v74xkxzfggbxxjq2gwswa94m1spy6r7k7avp";
+ revision = "1";
+ editedCabalFile = "11clkx7j4k3wgk6h1g0flq7frvkfxhh4dhbjjrchc5f7rd5gmjbp";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder bytestring containers
data-default exceptions file-embed haskell-src-meta hreader hset
@@ -162167,6 +166318,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "postgresql-simple_0_6" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+ , bytestring, bytestring-builder, case-insensitive, containers
+ , cryptohash, filepath, hashable, HUnit, Only, postgresql-libpq
+ , scientific, tasty, tasty-golden, tasty-hunit, template-haskell
+ , text, time, transformers, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "postgresql-simple";
+ version = "0.6";
+ sha256 = "1jp08vg040p2qbgy2hldkac1qy1m2k1r6r67hh6dziw5ak1kjs69";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring bytestring-builder
+ case-insensitive containers hashable Only postgresql-libpq
+ scientific template-haskell text time transformers uuid-types
+ vector
+ ];
+ testHaskellDepends = [
+ aeson base base16-bytestring bytestring case-insensitive containers
+ cryptohash filepath HUnit tasty tasty-golden tasty-hunit text time
+ vector
+ ];
+ benchmarkHaskellDepends = [ base vector ];
+ description = "Mid-Level PostgreSQL client library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"postgresql-simple-bind" = callPackage
({ mkDerivation, attoparsec, base, bytestring, data-default
, exceptions, heredoc, hspec, postgresql-simple, template-haskell
@@ -162218,8 +166397,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-simple-opts";
- version = "0.3.0.0";
- sha256 = "1lr9jj2dv01njjv2iqvirim1gv8bgb5pzaipni04f1dr5bhgkfhd";
+ version = "0.3.0.1";
+ sha256 = "19jhrz2lghiycb81dzzz5g2kwzaahn27q7diw6nn9qmcpwgw3rly";
libraryHaskellDepends = [
base bytestring data-default either generic-deriving
optparse-applicative optparse-generic postgresql-simple split
@@ -162297,6 +166476,8 @@ self: {
pname = "postgresql-simple-url";
version = "0.2.1.0";
sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk";
+ revision = "1";
+ editedCabalFile = "0ck0vrlsyj3vm8sk59jnyyqpvnv1l9mciifdnrzwr981pha147qp";
libraryHaskellDepends = [
base network-uri postgresql-simple split
];
@@ -162321,6 +166502,7 @@ self: {
testHaskellDepends = [ rerebase ];
description = "PostgreSQL SQL syntax utilities";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {pg_query = null;};
"postgresql-transactional" = callPackage
@@ -162386,15 +166568,15 @@ self: {
, hspec-wai, hspec-wai-json, HTTP, http-types
, insert-ordered-containers, interpolatedstring-perl6, jose, lens
, lens-aeson, monad-control, network-uri, optparse-applicative
- , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe
+ , parsec, process, protolude, Ranged-sets, regex-tdfa, retry
, scientific, swagger2, text, time, transformers-base, unix
, unordered-containers, vector, wai, wai-cors, wai-extra
, wai-middleware-static, warp
}:
mkDerivation {
pname = "postgrest";
- version = "0.5.0.0";
- sha256 = "1sixscxpx6dl7hj87yk6zz4a8rg4qwlcchqrxxg1m0gjhln0aqx3";
+ version = "5.1.0";
+ sha256 = "1x6jipc8ixv9wic5l0nlsirm3baddmrhphrr3snil1by5kz208g6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -162403,7 +166585,7 @@ self: {
contravariant-extras cookie either gitrev hasql hasql-pool
hasql-transaction heredoc HTTP http-types insert-ordered-containers
interpolatedstring-perl6 jose lens lens-aeson network-uri
- optparse-applicative parsec protolude Ranged-sets regex-tdfa safe
+ optparse-applicative parsec protolude Ranged-sets regex-tdfa
scientific swagger2 text time unordered-containers vector wai
wai-cors wai-extra wai-middleware-static
];
@@ -162485,8 +166667,8 @@ self: {
}:
mkDerivation {
pname = "postmark";
- version = "0.2.3";
- sha256 = "140z6r01byld665471dbk5zdqaf6lrcxwqp0wvbs5fbpjq37mfmp";
+ version = "0.2.6";
+ sha256 = "0x8nvxhw6wwq9w9dl16gvh6j6la224s2ldakx694518amqd4avrx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -162551,8 +166733,8 @@ self: {
({ mkDerivation, potoki-core }:
mkDerivation {
pname = "potoki";
- version = "2.0.6";
- sha256 = "1gjjs03kpvq544pada5a1r9vjv3dwiqkkgp7hb6ync41mpwvhssl";
+ version = "2.1.3";
+ sha256 = "1cg89jh2s2dim874h8vv52ab2dzvq01zvjn45fwdzs3j6815nlj4";
libraryHaskellDepends = [ potoki-core ];
description = "Simple streaming in IO";
license = stdenv.lib.licenses.mit;
@@ -162561,17 +166743,17 @@ self: {
"potoki-cereal" = callPackage
({ mkDerivation, acquire, attoparsec, base, base-prelude
- , bytestring, cereal, directory, potoki, potoki-core, QuickCheck
- , quickcheck-instances, rerebase, tasty, tasty-hunit
+ , bytestring, cereal, directory, potoki, potoki-core, profunctors
+ , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit
, tasty-quickcheck, text
}:
mkDerivation {
pname = "potoki-cereal";
- version = "0.3.0.1";
- sha256 = "0dm5yvh8a8sgrqvgkl48zpn5c8ymz9h83nw44icnhqirg1hrkhvi";
+ version = "0.3.2";
+ sha256 = "1fq36ahdrr16mxas2xh4qiwcagy61z2zfvc68p7r5hgdf36yz4d9";
libraryHaskellDepends = [
acquire attoparsec base base-prelude bytestring cereal potoki-core
- text
+ profunctors text
];
testHaskellDepends = [
directory potoki QuickCheck quickcheck-instances rerebase tasty
@@ -162583,25 +166765,28 @@ self: {
}) {};
"potoki-core" = callPackage
- ({ mkDerivation, acquire, attoparsec, base, bytestring, directory
- , foldl, hashable, ilist, primitive, profunctors, ptr, QuickCheck
- , quickcheck-instances, random, rerebase, scanner, stm, tasty
- , tasty-hunit, tasty-quickcheck, text, transformers
+ ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion
+ , deepseq, deferred-folds, directory, foldl, hashable, ilist
+ , primitive, profunctors, ptr, QuickCheck, quickcheck-instances
+ , random, rerebase, scanner, split, stm, tasty, tasty-hunit
+ , tasty-quickcheck, text, text-builder, time, transformers
, unordered-containers, vector
}:
mkDerivation {
pname = "potoki-core";
- version = "2.2.8.2";
- sha256 = "11d75dm2y1fw5kzbkf5vx55b0xa2sn1picbykfl6zypqbqmpa86g";
+ version = "2.3.3";
+ sha256 = "1f6rr75h4cqgy1qjh5qplcq1qz2pwc11mi4k61z691clz5yfmbm0";
libraryHaskellDepends = [
- acquire attoparsec base bytestring directory foldl hashable
- primitive profunctors ptr scanner stm text transformers
- unordered-containers vector
+ acquire attoparsec base bytestring deepseq deferred-folds directory
+ foldl hashable primitive profunctors ptr scanner stm text
+ text-builder time transformers unordered-containers vector
];
testHaskellDepends = [
- acquire attoparsec foldl ilist QuickCheck quickcheck-instances
- random rerebase tasty tasty-hunit tasty-quickcheck
+ acquire attoparsec deferred-folds foldl ilist QuickCheck
+ quickcheck-instances random rerebase split tasty tasty-hunit
+ tasty-quickcheck
];
+ benchmarkHaskellDepends = [ criterion rerebase ];
description = "Low-level components of \"potoki\"";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -162816,8 +167001,8 @@ self: {
({ mkDerivation, base, deepseq, QuickCheck }:
mkDerivation {
pname = "pqueue";
- version = "1.4.1.1";
- sha256 = "1zvwm1zcqqq5n101s1brjhgbay8rf9fviq6gxbplf40i63m57p1x";
+ version = "1.4.1.2";
+ sha256 = "1v4zhv2sc1zsw91hvnarkjhayx2dnf7ccxz6rrhsqpcs0szaranj";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [ base deepseq QuickCheck ];
description = "Reliable, persistent, fast priority queues";
@@ -162900,18 +167085,18 @@ self: {
({ mkDerivation, aeson, base, basic-prelude, exceptions
, fast-logger, lens, lifted-base, monad-control, monad-logger
, MonadRandom, mtl, network, resourcet, safe, template-haskell
- , text, text-manipulate, time, transformers-base, unliftio-core
+ , text, text-manipulate, time, transformers-base
, unordered-containers, uuid
}:
mkDerivation {
pname = "preamble";
- version = "0.0.64";
- sha256 = "1h7px6kz2plp5fix7i0dviv0hg3nzq31pvwwayh4q747lh3xjwp4";
+ version = "0.0.65";
+ sha256 = "1i11d46rrnlsjipy74rb9yfq0d91lk7wjkiz4z9sl099pgmgc9lw";
libraryHaskellDepends = [
aeson base basic-prelude exceptions fast-logger lens lifted-base
monad-control monad-logger MonadRandom mtl network resourcet safe
template-haskell text text-manipulate time transformers-base
- unliftio-core unordered-containers uuid
+ unordered-containers uuid
];
description = "Yet another prelude";
license = stdenv.lib.licenses.mit;
@@ -163521,14 +167706,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "pretty-show_1_8_1" = callPackage
+ "pretty-show_1_9_1" = callPackage
({ mkDerivation, array, base, filepath, ghc-prim, happy
, haskell-lexer, pretty, text
}:
mkDerivation {
pname = "pretty-show";
- version = "1.8.1";
- sha256 = "0s8bj7ymbc9pz91kls2blrpip7pphcc683wd5ig8kywjmix1ibsg";
+ version = "1.9.1";
+ sha256 = "0b5diwdkfb2wi6q872fjjnrvysgww7c8nhq55bvccp50n9vs4jhz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -163587,6 +167772,8 @@ self: {
pname = "pretty-sop";
version = "0.2.0.2";
sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn";
+ revision = "1";
+ editedCabalFile = "16j80587sfq4hm2p24awcv388sm2snrwj3fhg9l3x256fbl4bm4s";
libraryHaskellDepends = [ base generics-sop pretty-show ];
description = "A generic pretty-printer using generics-sop";
license = stdenv.lib.licenses.bsd3;
@@ -163757,6 +167944,8 @@ self: {
pname = "prettyprinter-vty";
version = "0.1.0.0";
sha256 = "12nj0v9p5bjbhwmkknc2ybdw52m5hngnf7c53qfi3crbrx4maxrd";
+ revision = "1";
+ editedCabalFile = "120lhr6g3grsybq5bp0vg38cdb78dysq8nwa206ghzigaxs34vcd";
libraryHaskellDepends = [ base prettyprinter vty ];
description = "prettyprinter backend for vty";
license = stdenv.lib.licenses.isc;
@@ -163785,6 +167974,8 @@ self: {
pname = "prim-array";
version = "0.2.2";
sha256 = "0lr7qni6wfiazn2gj6hnlkfzxdwvfhfqfkacj43w26s34irda4g3";
+ revision = "1";
+ editedCabalFile = "120v58dhida6ms5wd4skw32y2mc70594dhipmz2zp4kjcqmllmdq";
libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
description = "Primitive byte array with type variable";
license = stdenv.lib.licenses.bsd3;
@@ -163805,6 +167996,7 @@ self: {
];
description = "prim typeclass instances";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"prim-ref" = callPackage
@@ -163938,24 +168130,27 @@ self: {
}) {};
"primitive-containers" = callPackage
- ({ mkDerivation, base, containers, contiguous, gauge, ghc-prim
- , primitive, primitive-sort, QuickCheck, quickcheck-classes, random
- , tasty, tasty-quickcheck
+ ({ mkDerivation, aeson, base, containers, contiguous, deepseq
+ , gauge, ghc-prim, hashable, HUnit, primitive, primitive-sort
+ , quantification, QuickCheck, quickcheck-classes, random, tasty
+ , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
}:
mkDerivation {
pname = "primitive-containers";
- version = "0.2.0";
- sha256 = "11q0dvlsdabmsjsr0gznr8ndx1fyvbvv8jxfszj6na8jhrz7x84b";
+ version = "0.3.0";
+ sha256 = "0yk7gqngdkm3s3pmmzbvrjd52hiqjn0gg2j60iw7wnaalagcap6x";
libraryHaskellDepends = [
- base contiguous primitive primitive-sort
+ aeson base contiguous deepseq hashable primitive primitive-sort
+ quantification text unordered-containers vector
];
testHaskellDepends = [
- base containers primitive QuickCheck quickcheck-classes tasty
- tasty-quickcheck
+ aeson base containers HUnit primitive quantification QuickCheck
+ quickcheck-classes tasty tasty-hunit tasty-quickcheck text
];
benchmarkHaskellDepends = [
base containers gauge ghc-prim primitive random
];
+ description = "containers backed by arrays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -163968,8 +168163,8 @@ self: {
}:
mkDerivation {
pname = "primitive-extras";
- version = "0.6.7";
- sha256 = "0kh2cccy1pmvvsrl9sjvcar4l1i3igk9vf8lxxxlwypj43nm32ny";
+ version = "0.7.1";
+ sha256 = "1xfvp63qi21iiz1905l61726vp2nnx3sffpphwf53j8yn193c33n";
libraryHaskellDepends = [
base bytestring cereal deferred-folds focus foldl list-t primitive
profunctors vector
@@ -163996,13 +168191,18 @@ self: {
}) {};
"primitive-maybe" = callPackage
- ({ mkDerivation, base, primitive }:
+ ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes
+ , tagged, tasty, tasty-quickcheck
+ }:
mkDerivation {
pname = "primitive-maybe";
- version = "0.1.0";
- sha256 = "0pxkgkwlpphk5x38f2jv9gl3n74l1spnfs15sb34hxgyggrz4k6j";
+ version = "0.1.1";
+ sha256 = "00p9xrvv32wcj3ln9z1dk31bb47r95y4w4ny4y28wl6vyc6vl0ln";
libraryHaskellDepends = [ base primitive ];
- testHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base primitive QuickCheck quickcheck-classes tagged tasty
+ tasty-quickcheck
+ ];
description = "Arrays of Maybes";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -164032,8 +168232,8 @@ self: {
pname = "primitive-sort";
version = "0.1.0.0";
sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3";
- revision = "1";
- editedCabalFile = "0b148bc30nbfrmdx1k7d4ky6k129w8vy146di90v9q12rvsdaz8w";
+ revision = "2";
+ editedCabalFile = "1yn5nwdw5jmzg603ln626gz2ifjn8fssgzq17g4nyriscqfg1aki";
libraryHaskellDepends = [ base contiguous ghc-prim primitive ];
testHaskellDepends = [
base containers doctest HUnit primitive QuickCheck smallcheck tasty
@@ -164266,6 +168466,7 @@ self: {
];
description = "Convert colors to different color spaces, interpolate colors, and transform colors";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"probability" = callPackage
@@ -164273,8 +168474,8 @@ self: {
}:
mkDerivation {
pname = "probability";
- version = "0.2.5.1";
- sha256 = "0bgdyx562x91a3s79p293pz4qimwd2k35mfxap23ia6x6a5prrnk";
+ version = "0.2.5.2";
+ sha256 = "059l9by2zxb92dd2vshxx9f3sm1kazc2i2ll168hfsya9rrqqaqg";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base containers random transformers utility-ht
@@ -164637,18 +168838,6 @@ self: {
}) {};
"product-isomorphic" = callPackage
- ({ mkDerivation, base, template-haskell, th-data-compat }:
- mkDerivation {
- pname = "product-isomorphic";
- version = "0.0.3.2";
- sha256 = "1yqpfdbdq0zh69mbpgns8faj0ajc9a8wgp3c8sgn373py2as9jxl";
- libraryHaskellDepends = [ base template-haskell th-data-compat ];
- testHaskellDepends = [ base template-haskell ];
- description = "Weaken applicative functor on products";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "product-isomorphic_0_0_3_3" = callPackage
({ mkDerivation, base, template-haskell, th-data-compat }:
mkDerivation {
pname = "product-isomorphic";
@@ -164658,7 +168847,6 @@ self: {
testHaskellDepends = [ base template-haskell ];
description = "Weaken applicative functor on products";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"product-profunctors" = callPackage
@@ -164911,16 +169099,16 @@ self: {
, hashable, hashable-time, haskeline, http-api-data, http-types
, HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl
, network, network-transport, network-transport-tcp, old-locale
- , optparse-applicative, parallel, path-pieces, QuickCheck, random
- , random-shuffle, resourcet, rset, scotty, semigroups, stm
- , stm-containers, template-haskell, temporary, text, time
- , transformers, unix, unordered-containers, uuid, vector
- , vector-binary-instances, websockets, zlib
+ , optparse-applicative, parallel, path-pieces, QuickCheck
+ , quickcheck-instances, random, random-shuffle, resourcet, rset
+ , scotty, semigroups, stm, stm-containers, template-haskell
+ , temporary, text, time, transformers, unix, unordered-containers
+ , uuid, vector, vector-binary-instances, websockets, zlib
}:
mkDerivation {
pname = "project-m36";
- version = "0.5";
- sha256 = "0k9px4f4yn6fgzc7zaig33w4nqnjgrmizbmmq11yg76gk08f7mv1";
+ version = "0.5.1";
+ sha256 = "1i3g6x3447hy1df6kzh8afpp366lzi9jspqzwi7gjkhkqhxxc94q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -164932,10 +169120,10 @@ self: {
filepath foldl ghc ghc-boot ghc-paths ghci Glob gnuplot hashable
hashable-time haskeline http-api-data list-t monad-parallel
MonadRandom mtl network-transport network-transport-tcp old-locale
- optparse-applicative parallel path-pieces QuickCheck random-shuffle
- resourcet rset semigroups stm stm-containers temporary text time
- transformers unix unordered-containers uuid vector
- vector-binary-instances zlib
+ optparse-applicative parallel path-pieces QuickCheck
+ quickcheck-instances random-shuffle resourcet rset semigroups stm
+ stm-containers temporary text time transformers unix
+ unordered-containers uuid vector vector-binary-instances zlib
];
executableHaskellDepends = [
aeson attoparsec base base64-bytestring binary blaze-html
@@ -165312,8 +169500,8 @@ self: {
}:
mkDerivation {
pname = "propellor";
- version = "5.4.1";
- sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd";
+ version = "5.5.0";
+ sha256 = "0mcj3xsi125vcxf605h8fm4swg84b79iv01qnhv5vmp872dhmwbv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -165470,14 +169658,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "proto-lens_0_4_0_1" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+ , lens-family, lens-labels, parsec, pretty, text, transformers
+ , void
+ }:
+ mkDerivation {
+ pname = "proto-lens";
+ version = "0.4.0.1";
+ sha256 = "1ryz183ds1k28nvw6y1w84k29aq5mgrpv5yyqarj0g463gp137cm";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers deepseq lens-family
+ lens-labels parsec pretty text transformers void
+ ];
+ description = "A lens-based implementation of protocol buffers in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"proto-lens-arbitrary" = callPackage
({ mkDerivation, base, bytestring, containers, lens-family
, proto-lens, QuickCheck, text
}:
mkDerivation {
pname = "proto-lens-arbitrary";
- version = "0.1.2.1";
- sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2";
+ version = "0.1.2.2";
+ sha256 = "128r7g82yx4rs38yd9s4bwcpyiqm5yr4lyci3z88bhqsvkn4438i";
libraryHaskellDepends = [
base bytestring containers lens-family proto-lens QuickCheck text
];
@@ -165485,14 +169692,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "proto-lens-arbitrary_0_1_2_2" = callPackage
+ "proto-lens-arbitrary_0_1_2_4" = callPackage
({ mkDerivation, base, bytestring, containers, lens-family
, proto-lens, QuickCheck, text
}:
mkDerivation {
pname = "proto-lens-arbitrary";
- version = "0.1.2.2";
- sha256 = "128r7g82yx4rs38yd9s4bwcpyiqm5yr4lyci3z88bhqsvkn4438i";
+ version = "0.1.2.4";
+ sha256 = "0d17vkcv21qphs44ig5fdcvisxn20980m0lx693w52ikzsax5k4s";
libraryHaskellDepends = [
base bytestring containers lens-family proto-lens QuickCheck text
];
@@ -165508,8 +169715,8 @@ self: {
}:
mkDerivation {
pname = "proto-lens-combinators";
- version = "0.1.0.10";
- sha256 = "0yv6wrg3wsp6617mw02n3d9gmlb9nyvfabffrznpvlaywwk8cnir";
+ version = "0.1.0.11";
+ sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb";
setupHaskellDepends = [ base Cabal proto-lens-protoc ];
libraryHaskellDepends = [
base data-default-class lens-family proto-lens-protoc transformers
@@ -165523,22 +169730,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "proto-lens-combinators_0_1_0_11" = callPackage
- ({ mkDerivation, base, Cabal, data-default-class, HUnit
- , lens-family, lens-family-core, proto-lens, proto-lens-protoc
- , test-framework, test-framework-hunit, transformers
+ "proto-lens-combinators_0_4_0_1" = callPackage
+ ({ mkDerivation, base, Cabal, HUnit, lens-family, lens-family-core
+ , proto-lens, proto-lens-runtime, proto-lens-setup, test-framework
+ , test-framework-hunit, transformers
}:
mkDerivation {
pname = "proto-lens-combinators";
- version = "0.1.0.11";
- sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb";
- setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+ version = "0.4.0.1";
+ sha256 = "0dkd9jmmxf5r01di3q1r0qnyhkyxrjlnfxa40c2vq0fl16h68lkb";
+ setupHaskellDepends = [ base Cabal proto-lens-setup ];
libraryHaskellDepends = [
- base data-default-class lens-family proto-lens-protoc transformers
+ base lens-family proto-lens transformers
];
testHaskellDepends = [
base HUnit lens-family lens-family-core proto-lens
- proto-lens-protoc test-framework test-framework-hunit
+ proto-lens-runtime test-framework test-framework-hunit
];
description = "Utilities functions to proto-lens";
license = stdenv.lib.licenses.bsd3;
@@ -165566,27 +169773,13 @@ self: {
({ mkDerivation, base, optparse-applicative, proto-lens, text }:
mkDerivation {
pname = "proto-lens-optparse";
- version = "0.1.1.1";
- sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw";
- libraryHaskellDepends = [
- base optparse-applicative proto-lens text
- ];
- description = "Adapting proto-lens to optparse-applicative ReadMs";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "proto-lens-optparse_0_1_1_2" = callPackage
- ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
- mkDerivation {
- pname = "proto-lens-optparse";
- version = "0.1.1.2";
- sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55";
+ version = "0.1.1.4";
+ sha256 = "1dn5cjwbagcykh1fv99v6mmj7mlnl46nqlwpz1878fy7vl7i8lzh";
libraryHaskellDepends = [
base optparse-applicative proto-lens text
];
description = "Adapting proto-lens to optparse-applicative ReadMs";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"proto-lens-protobuf-types_0_2_2_0" = callPackage
@@ -165624,17 +169817,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) protobuf;};
- "proto-lens-protobuf-types_0_3_0_2" = callPackage
+ "proto-lens-protobuf-types_0_4_0_1" = callPackage
({ mkDerivation, base, Cabal, lens-labels, proto-lens
- , proto-lens-protoc, protobuf, text
+ , proto-lens-runtime, proto-lens-setup, protobuf, text
}:
mkDerivation {
pname = "proto-lens-protobuf-types";
- version = "0.3.0.2";
- sha256 = "0vslpjrhvkyz10g4fg1fbfkqggg7x0jd3vp68419aflgk293pgsx";
- setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+ version = "0.4.0.1";
+ sha256 = "091284pyp4b36hnvfjsrsg6zlgw1payzwfbsy66sgbbi285mwira";
+ setupHaskellDepends = [ base Cabal proto-lens-setup ];
libraryHaskellDepends = [
- base lens-labels proto-lens proto-lens-protoc text
+ base lens-labels proto-lens proto-lens-runtime text
];
libraryToolDepends = [ protobuf ];
description = "Basic protocol buffer message types";
@@ -165673,18 +169866,18 @@ self: {
({ mkDerivation, base, bytestring, Cabal, containers
, data-default-class, deepseq, directory, filepath
, haskell-src-exts, lens-family, lens-labels, pretty, process
- , proto-lens, protobuf, text
+ , proto-lens, protobuf, temporary, text
}:
mkDerivation {
pname = "proto-lens-protoc";
- version = "0.3.1.0";
- sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx";
+ version = "0.3.1.2";
+ sha256 = "15qypl2z5mccmxhq2bl86frzdalpcnsjiw6vypvnr6gxlr7mwhm7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring Cabal containers data-default-class deepseq
directory filepath haskell-src-exts lens-family lens-labels pretty
- process proto-lens text
+ process proto-lens temporary text
];
libraryToolDepends = [ protobuf ];
executableHaskellDepends = [
@@ -165695,33 +169888,63 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) protobuf;};
- "proto-lens-protoc_0_3_1_2" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers
- , data-default-class, deepseq, directory, filepath
- , haskell-src-exts, lens-family, lens-labels, pretty, process
- , proto-lens, protobuf, temporary, text
+ "proto-lens-protoc_0_4_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, filepath
+ , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text
}:
mkDerivation {
pname = "proto-lens-protoc";
- version = "0.3.1.2";
- sha256 = "15qypl2z5mccmxhq2bl86frzdalpcnsjiw6vypvnr6gxlr7mwhm7";
+ version = "0.4.0.1";
+ sha256 = "1vigmy8aq65yaspgq803a4vxsq5v3zwlaq95yrf47zrvcx1lw3ni";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring Cabal containers data-default-class deepseq
- directory filepath haskell-src-exts lens-family lens-labels pretty
- process proto-lens temporary text
+ base containers filepath haskell-src-exts lens-family pretty
+ proto-lens text
];
libraryToolDepends = [ protobuf ];
executableHaskellDepends = [
- base bytestring containers data-default-class deepseq filepath
- haskell-src-exts lens-family proto-lens text
+ base bytestring containers lens-family proto-lens text
];
description = "Protocol buffer compiler for the proto-lens library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) protobuf;};
+ "proto-lens-runtime" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, filepath
+ , lens-family, lens-labels, proto-lens, text
+ }:
+ mkDerivation {
+ pname = "proto-lens-runtime";
+ version = "0.4.0.2";
+ sha256 = "1k6biy5z890nn5b76sd3xr086sbrqr09rx1r2a7jxra2l2ymc4sr";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq filepath lens-family lens-labels
+ proto-lens text
+ ];
+ doHaddock = false;
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "proto-lens-setup" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, deepseq
+ , directory, filepath, process, proto-lens-protoc, temporary, text
+ }:
+ mkDerivation {
+ pname = "proto-lens-setup";
+ version = "0.4.0.1";
+ sha256 = "1x8lj5z2ih20757m0di0lg4kn3s3g90qpjpv5wkzj2xf097cwqjp";
+ libraryHaskellDepends = [
+ base bytestring Cabal containers deepseq directory filepath process
+ proto-lens-protoc temporary text
+ ];
+ description = "Cabal support for codegen with proto-lens";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"protobuf" = callPackage
({ mkDerivation, base, base-orphans, bytestring, cereal, containers
, data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
@@ -165774,8 +169997,8 @@ self: {
}:
mkDerivation {
pname = "protobuf-simple";
- version = "0.1.0.5";
- sha256 = "1w8nx700pyq0r909akyihcajsx5pgj76f2nfvwabib2fy4kv8ikb";
+ version = "0.1.1.0";
+ sha256 = "1i6dmf9nppjk2xd2s91bmbnb9r915h5ypq5923jpralry2ax6ach";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -165857,22 +170080,6 @@ self: {
}) {};
"protocol-radius" = callPackage
- ({ mkDerivation, base, bytestring, cereal, containers, cryptonite
- , dlist, memory, template-haskell, text, transformers
- }:
- mkDerivation {
- pname = "protocol-radius";
- version = "0.0.1.0";
- sha256 = "1ygn7kd6rdmgb4hy4iby0l9m1hm6w0linhjipgv7vczd8b0mw35f";
- libraryHaskellDepends = [
- base bytestring cereal containers cryptonite dlist memory
- template-haskell text transformers
- ];
- description = "parser and printer for radius protocol packet";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "protocol-radius_0_0_1_1" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, cryptonite
, dlist, memory, template-haskell, text, transformers
}:
@@ -165886,7 +170093,6 @@ self: {
];
description = "parser and printer for radius protocol packet";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"protocol-radius-test" = callPackage
@@ -165923,6 +170129,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "protolude_0_2_3" = callPackage
+ ({ mkDerivation, array, async, base, bytestring, containers
+ , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
+ , transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "protolude";
+ version = "0.2.3";
+ sha256 = "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj";
+ libraryHaskellDepends = [
+ array async base bytestring containers deepseq ghc-prim hashable
+ mtl mtl-compat stm text transformers transformers-compat
+ ];
+ description = "A small prelude";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"protolude-lifted" = callPackage
({ mkDerivation, async, base, lifted-async, lifted-base, protolude
}:
@@ -166073,10 +170297,8 @@ self: {
}:
mkDerivation {
pname = "pseudo-boolean";
- version = "0.1.6.0";
- sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra";
- revision = "2";
- editedCabalFile = "1wnp16zs9nx3b250cmh6j84scv821arc0grb8k08h0a3kphavqx1";
+ version = "0.1.7.0";
+ sha256 = "0y470jrqmc2k9j3zf2w2krjg3ial08v71bcq6zxh1g47iz4kszr7";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder containers deepseq
dlist hashable megaparsec parsec void
@@ -166774,28 +170996,33 @@ self: {
}) {};
"purescript-iso" = callPackage
- ({ mkDerivation, aeson, async, attoparsec-uri, base, bytestring
- , containers, monad-control, mtl, QuickCheck, quickcheck-instances
- , stm, strict, tasty, tasty-quickcheck, text, time, utf8-string
- , uuid, zeromq4-haskell, zeromq4-simple
+ ({ mkDerivation, aeson, aeson-attoparsec, aeson-diff, async
+ , attoparsec, attoparsec-uri, base, bytestring, containers, deepseq
+ , emailaddress, monad-control, mtl, QuickCheck
+ , quickcheck-instances, scientific, stm, strict, tasty
+ , tasty-quickcheck, text, time, utf8-string, uuid, zeromq4-haskell
+ , zeromq4-simple
}:
mkDerivation {
pname = "purescript-iso";
- version = "0.0.1.2";
- sha256 = "0mlrj4q40d71r61lc5h9a7wfycmj1kgn6appaqbffrdjz64hmrfh";
+ version = "0.0.3";
+ sha256 = "15y761jk2r95gdkv85p7ij9npf3a6dlsyidf8y8djzk3m7j8ya2g";
libraryHaskellDepends = [
- aeson async attoparsec-uri base bytestring containers monad-control
- mtl QuickCheck quickcheck-instances stm strict text time
+ aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
+ base bytestring containers deepseq emailaddress monad-control mtl
+ QuickCheck quickcheck-instances scientific stm strict text time
utf8-string uuid zeromq4-haskell zeromq4-simple
];
testHaskellDepends = [
- aeson async attoparsec-uri base bytestring containers monad-control
- mtl QuickCheck quickcheck-instances stm strict tasty
+ aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri
+ base bytestring containers deepseq emailaddress monad-control mtl
+ QuickCheck quickcheck-instances scientific stm strict tasty
tasty-quickcheck text time utf8-string uuid zeromq4-haskell
zeromq4-simple
];
description = "Isomorphic trivial data type definitions over JSON";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"purescript-tsd-gen" = callPackage
@@ -166981,8 +171208,8 @@ self: {
}:
mkDerivation {
pname = "pusher-http-haskell";
- version = "1.5.1.5";
- sha256 = "0bidqvyx5ss3zgw2ypbwnii1vqfqp0kwyf31h53pvza7c3xrpq4x";
+ version = "1.5.1.6";
+ sha256 = "0i5lf3aniff8lnvgkl3mmy5xbjr130baz1h25p6q3asapirbj1k0";
libraryHaskellDepends = [
aeson base base16-bytestring bytestring cryptonite hashable
http-client http-types memory text time transformers
@@ -167488,8 +171715,8 @@ self: {
}:
mkDerivation {
pname = "qr-imager";
- version = "2.0.0.1";
- sha256 = "0n3f5zhyp0pvrb4ixvrvzs9af2x1mjprlnyjbhhldb3rc64jl7yd";
+ version = "2.0.0.2";
+ sha256 = "18fhvvnmd7nv9ls5jy4ng807q01m2dr4m0znjav57v9mc37vspqk";
libraryHaskellDepends = [
base binary bytestring cryptonite directory haskell-qrencode
jose-jwt JuicyPixels microlens process split vector
@@ -167557,8 +171784,8 @@ self: {
}:
mkDerivation {
pname = "qtah-cpp-qt5";
- version = "0.5.0";
- sha256 = "14349jf69wvbcp18xi5jb0281qhrz38pw68qw91hwfr8vmqdx8h7";
+ version = "0.5.1";
+ sha256 = "1pwqc5i6viyk3ik8vh2zd9k25vj9y1r9mmikxwzjhv6jwc8sb5pb";
setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [ base process qtah-generator ];
librarySystemDepends = [ qtbase ];
@@ -167615,8 +171842,8 @@ self: {
}:
mkDerivation {
pname = "qtah-qt5";
- version = "0.5.0";
- sha256 = "0c4z56siw1kkqiyzmbpjk6jkzmcxqv6ji52rnivlavlyw3b4s2a3";
+ version = "0.5.1";
+ sha256 = "082mz3j3bk7hlagwdw0y399r8jid2wf6xzsdd2wnc4n6z6w6p8gx";
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator
@@ -167648,8 +171875,8 @@ self: {
}:
mkDerivation {
pname = "quadratic-irrational";
- version = "0.0.5";
- sha256 = "1z9a1q8px4sx7fq9i1lwfx98kz0nv8zhkz5vsfn31krvd4xvkndz";
+ version = "0.0.6";
+ sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0";
libraryHaskellDepends = [
arithmoi base containers mtl transformers
];
@@ -167700,15 +171927,15 @@ self: {
}) {};
"quantification" = callPackage
- ({ mkDerivation, aeson, base, containers, ghc-prim, hashable
- , path-pieces, text, unordered-containers, vector
+ ({ mkDerivation, aeson, base, binary, containers, ghc-prim
+ , hashable, path-pieces, text, unordered-containers, vector
}:
mkDerivation {
pname = "quantification";
- version = "0.4";
- sha256 = "0bsdfmzaaxq2mf6bbbphg2dy8q6lhc7n3mfcy20fp4la0cj49aj2";
+ version = "0.5.0";
+ sha256 = "0ls8rhy0idrgj9dnd5ajjfi55bhz4qsyncj3ghw3nyrbr0q7j0bk";
libraryHaskellDepends = [
- aeson base containers ghc-prim hashable path-pieces text
+ aeson base binary containers ghc-prim hashable path-pieces text
unordered-containers vector
];
description = "Rage against the quantification";
@@ -168089,8 +172316,8 @@ self: {
}:
mkDerivation {
pname = "quickcheck-classes";
- version = "0.4.14.1";
- sha256 = "0qk7nx855lrb9z1nkc74dshsij6p704rmggx0f9akwcpscsvhiim";
+ version = "0.5.0.0";
+ sha256 = "1jg4wkysz2hdfkl9ah9lyvasnr01dvp3lfzzn1cin2ac6b1inj6v";
libraryHaskellDepends = [
aeson base bifunctors containers primitive QuickCheck semigroupoids
semigroups semirings tagged transformers
@@ -168115,6 +172342,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "quickcheck-enum-instances" = callPackage
+ ({ mkDerivation, base, enum-types, QuickCheck }:
+ mkDerivation {
+ pname = "quickcheck-enum-instances";
+ version = "0.1.0.0";
+ sha256 = "117lpk15z288ad1bzakwf1z0jcdm7w5c0584lzwpgkmgqr3jgzdc";
+ libraryHaskellDepends = [ base enum-types QuickCheck ];
+ description = "arbitrary instances for small enum types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"quickcheck-instances" = callPackage
({ mkDerivation, array, base, base-compat, bytestring
, case-insensitive, containers, hashable, old-time, QuickCheck
@@ -168123,10 +172361,8 @@ self: {
}:
mkDerivation {
pname = "quickcheck-instances";
- version = "0.3.18";
- sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55";
- revision = "1";
- editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly";
+ version = "0.3.19";
+ sha256 = "0mls8095ylk5pq2j787ary5lyn4as64414silq3zn4sky3zsx92p";
libraryHaskellDepends = [
array base base-compat bytestring case-insensitive containers
hashable old-time QuickCheck scientific tagged text time
@@ -168302,31 +172538,30 @@ self: {
}) {};
"quickcheck-state-machine" = callPackage
- ({ mkDerivation, ansi-wl-pprint, async, base, bytestring
- , containers, directory, exceptions, filelock, filepath
- , http-client, lifted-async, lifted-base, matrix, monad-control
- , monad-logger, mtl, network, persistent, persistent-postgresql
- , persistent-template, pretty-show, process, QuickCheck
- , quickcheck-instances, random, resourcet, servant, servant-client
- , servant-server, split, stm, strict, string-conversions, tasty
- , tasty-quickcheck, text, tree-diff, vector, wai, warp
+ ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+ , directory, doctest, exceptions, filelock, filepath, http-client
+ , lifted-async, matrix, monad-control, monad-logger, mtl, network
+ , persistent, persistent-postgresql, persistent-template
+ , pretty-show, process, QuickCheck, quickcheck-instances, random
+ , resourcet, servant, servant-client, servant-server, split, stm
+ , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck
+ , text, tree-diff, vector, wai, warp
}:
mkDerivation {
pname = "quickcheck-state-machine";
- version = "0.4.0";
- sha256 = "1dzkqpl873hj2by15hlkf61x6a7fjzkhl6h4cwhg9krj2bh2lv5q";
+ version = "0.4.2";
+ sha256 = "1sa243hysdnlv8326jnbnmmlkbxhxmbhfssya5qx925x56qhd2d3";
libraryHaskellDepends = [
- ansi-wl-pprint async base containers exceptions lifted-async
- lifted-base matrix monad-control mtl pretty-show QuickCheck random
- split stm tree-diff vector
+ ansi-wl-pprint base containers exceptions lifted-async matrix
+ monad-control mtl pretty-show QuickCheck split stm tree-diff vector
];
testHaskellDepends = [
- base bytestring directory filelock filepath http-client
+ base bytestring directory doctest filelock filepath http-client
lifted-async matrix monad-control monad-logger mtl network
persistent persistent-postgresql persistent-template process
QuickCheck quickcheck-instances random resourcet servant
- servant-client servant-server strict string-conversions tasty
- tasty-quickcheck text tree-diff vector wai warp
+ servant-client servant-server stm strict string-conversions tasty
+ tasty-hunit tasty-quickcheck text tree-diff vector wai warp
];
description = "Test monadic programs using state machine based models";
license = stdenv.lib.licenses.bsd3;
@@ -168412,13 +172647,12 @@ self: {
({ mkDerivation, base, QuickCheck, template-haskell }:
mkDerivation {
pname = "quickcheck-with-counterexamples";
- version = "1.0";
- sha256 = "0pny7whz16mdmh51jpa7p9f8pa7jpcqqjks797wnj8848ia7ax87";
- revision = "3";
- editedCabalFile = "0wz7iwpgxx977y46xis4imrhds1i341fv6mpwydr1mzhzazifvz8";
+ version = "1.1";
+ sha256 = "13vnr98g9cds2jbg76z528lji5mfcxghwjj4sry0011wlrwrx1fd";
libraryHaskellDepends = [ base QuickCheck template-haskell ];
description = "Get counterexamples from QuickCheck as Haskell values";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"quicklz" = callPackage
@@ -168969,6 +173203,7 @@ self: {
];
description = "Radix tree data structive over short byte-strings";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"radixtree" = callPackage
@@ -169353,6 +173588,8 @@ self: {
pname = "random-bytestring";
version = "0.1.3.1";
sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k";
+ revision = "1";
+ editedCabalFile = "0gk5hcx1j06rklfd2cv63kh5dzjk8hr184riam784c7s9zg3s9a4";
libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
benchmarkHaskellDepends = [
async base bytestring criterion cryptonite entropy ghc-prim
@@ -169639,14 +173876,14 @@ self: {
}:
mkDerivation {
pname = "range";
- version = "0.1.2.0";
- sha256 = "028bigaq4vk5ykzf04f5hi3g37gxzzp6q24bjcb3gjfzcgy7z6ab";
+ version = "0.2.1.1";
+ sha256 = "13gfhzplk2ji1d8x4944lv4dy4qg69wjvdwkica407nm10j0lxmc";
libraryHaskellDepends = [ base free parsec ];
testHaskellDepends = [
base Cabal free QuickCheck random test-framework
test-framework-quickcheck2
];
- description = "This has a bunch of code for specifying and managing ranges in your code";
+ description = "An efficient and versatile range library";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -169659,6 +173896,8 @@ self: {
pname = "range-set-list";
version = "0.1.3";
sha256 = "1pwnriv5r093qvqzzg9s868613nf92d3h8qmqaqc5qq95hykj6z5";
+ revision = "1";
+ editedCabalFile = "00ddj7if8lcrqf5c882m4slm15sdwcghz7d2fz222c7jcw1ahvdr";
libraryHaskellDepends = [ base containers deepseq hashable ];
testHaskellDepends = [
base containers deepseq hashable tasty tasty-quickcheck
@@ -169712,12 +173951,19 @@ self: {
}) {};
"rank-product" = callPackage
- ({ mkDerivation, base, random-fu }:
+ ({ mkDerivation, base, bytestring, cassava, containers, lens
+ , optparse-generic, random-fu, text, vector
+ }:
mkDerivation {
pname = "rank-product";
- version = "0.2.0.1";
- sha256 = "1dn03zlh7n8qk7dir2qdijyk207g9p4nbsc0zw4p3cvfpl4xzzvr";
- libraryHaskellDepends = [ base random-fu ];
+ version = "0.2.2.0";
+ sha256 = "1nrvcgf61fg243zfp7cab5hxyhjhh2mlk4ysd6igf64w8di25lir";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers random-fu text vector ];
+ executableHaskellDepends = [
+ base bytestring cassava containers lens optparse-generic vector
+ ];
description = "Find the rank product of a data set";
license = stdenv.lib.licenses.gpl3;
}) {};
@@ -170023,10 +174269,8 @@ self: {
}:
mkDerivation {
pname = "rasterific-svg";
- version = "0.3.3.1";
- sha256 = "110ivmmgajv232hyg9pc30lzg3l72q8ykyp1zrjs3k5n309ymdfn";
- revision = "1";
- editedCabalFile = "0mhg2k786zx1cmblijnz73cf12h1s5grmkc0wb63612hnxxz53i7";
+ version = "0.3.3.2";
+ sha256 = "1i0pl1hin1ipi3l0074ywd1khacpbvz3x0frx0j0hmbfiv4n3nq2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -170047,8 +174291,10 @@ self: {
({ mkDerivation, base, stm, time, time-units }:
mkDerivation {
pname = "rate-limit";
- version = "1.4.0";
- sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb";
+ version = "1.4.1";
+ sha256 = "0gm5jmi779niqsbgmkqqx6dsfw6yvfp4wlfibg9fzzmcc4i968g2";
+ revision = "1";
+ editedCabalFile = "01f3wf7q6117g2q5b9pp2rranxqyccmyl961r81151dpx21fiar7";
libraryHaskellDepends = [ base stm time time-units ];
description = "A basic library for rate-limiting IO actions";
license = stdenv.lib.licenses.bsd3;
@@ -170142,6 +174388,37 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rattletrap_6_0_1" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
+ , bytestring, containers, filepath, http-client, http-client-tls
+ , HUnit, template-haskell, temporary, text, transformers
+ }:
+ mkDerivation {
+ pname = "rattletrap";
+ version = "6.0.1";
+ sha256 = "1chpivz9iprnj5p3kbqsgpviqg5d3dx41596ki1dydm1wmpn3bcj";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty base binary binary-bits bytestring containers
+ filepath http-client http-client-tls template-haskell text
+ transformers
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty base binary binary-bits bytestring containers
+ filepath http-client http-client-tls template-haskell text
+ transformers
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base binary binary-bits bytestring containers
+ filepath http-client http-client-tls HUnit template-haskell
+ temporary text transformers
+ ];
+ description = "Parse and generate Rocket League replays";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"raven-haskell" = callPackage
({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl
, network, random, resourcet, text, time, unordered-containers
@@ -170416,19 +174693,20 @@ self: {
"rdf4h" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, containers
, criterion, deepseq, directory, filepath, hashable, hgal, HTTP
- , HUnit, hxt, mtl, network-uri, parsec, parsers, QuickCheck, safe
- , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+ , http-conduit, HUnit, hxt, lifted-base, mtl, network-uri, parsec
+ , parsers, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck
+ , text, unordered-containers
}:
mkDerivation {
pname = "rdf4h";
- version = "3.1.0";
- sha256 = "1hsa96a11mi8zlhfp9mhg4m13r4iwyhp9rhsgmpcq4g06ff1d6n8";
+ version = "3.1.1";
+ sha256 = "0r93mra0r8xdqi062xpsv5svzcinq31k4jjbjay53an6zd1qg9n4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
attoparsec base binary bytestring containers deepseq filepath
- hashable hgal HTTP hxt mtl network-uri parsec parsers text
- unordered-containers
+ hashable hgal HTTP http-conduit hxt lifted-base mtl network-uri
+ parsec parsers text unordered-containers
];
executableHaskellDepends = [ base containers text ];
testHaskellDepends = [
@@ -170620,8 +174898,8 @@ self: {
}:
mkDerivation {
pname = "reactive-balsa";
- version = "0.4";
- sha256 = "0cmk386wjs6i7bnmawz0kcpm4sx5xa2ms9xhjisg83xhmacvqg7h";
+ version = "0.4.0.1";
+ sha256 = "1fhn7bxfrwaa5xb2ckfy2v4aw5cdzclayprjr40zg09s77qxclc1";
libraryHaskellDepends = [
alsa-core alsa-seq base containers data-accessor
data-accessor-transformers event-list extensible-exceptions midi
@@ -170677,8 +174955,8 @@ self: {
}:
mkDerivation {
pname = "reactive-banana-bunch";
- version = "1.0";
- sha256 = "11lfbf5gn8friwgkmm3vl3b3hqfxm1vww0a3aq9949irvrplajzn";
+ version = "1.0.0.1";
+ sha256 = "1k4l1zk7jm26iyaa2srillrq8qnwnqkwhpy6shdw6mg4nfby706c";
libraryHaskellDepends = [
base non-empty reactive-banana transformers utility-ht
];
@@ -170829,8 +175107,8 @@ self: {
}:
mkDerivation {
pname = "reactive-jack";
- version = "0.4.1";
- sha256 = "124fpfv486dm8cpgfdnrmckkk8y6ia4nwzapvnfghkslizzlbfab";
+ version = "0.4.1.1";
+ sha256 = "0kcb4sjj8499i5igl1fv8bjbz5d2zvs5nbqijfaw9pcg5zx7a0rr";
libraryHaskellDepends = [
base containers data-accessor event-list explicit-exception
extensible-exceptions jack midi non-negative random
@@ -170850,8 +175128,8 @@ self: {
}:
mkDerivation {
pname = "reactive-midyim";
- version = "0.4.1";
- sha256 = "1dx07c4d4sw7a797d1ap9ja48lhx37hbizhajgcf1qpilxgd4lvv";
+ version = "0.4.1.1";
+ sha256 = "1hsa7d79mf7r36grl9i41x84kg3s9j5gj2fy40mb1mhvr221pi9v";
libraryHaskellDepends = [
base containers data-accessor data-accessor-transformers event-list
midi non-negative random reactive-banana-bunch semigroups
@@ -171139,6 +175417,30 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rebase_1_3" = callPackage
+ ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+ , containers, contravariant, contravariant-extras, deepseq, dlist
+ , either, fail, hashable, mtl, profunctors, scientific
+ , semigroupoids, semigroups, stm, text, time, transformers
+ , unordered-containers, uuid, vector, void
+ }:
+ mkDerivation {
+ pname = "rebase";
+ version = "1.3";
+ sha256 = "02g14vv4qbzq9vakkr55960r386jmkivgm5ld782b1bqyvpfsfh7";
+ revision = "1";
+ editedCabalFile = "1yz51pghns6xanzdnlkagghpzwnkl7wjqnqcp5gs0zs1iywrbl45";
+ libraryHaskellDepends = [
+ base base-prelude bifunctors bytestring containers contravariant
+ contravariant-extras deepseq dlist either fail hashable mtl
+ profunctors scientific semigroupoids semigroups stm text time
+ transformers unordered-containers uuid vector void
+ ];
+ description = "A more progressive alternative to the \"base\" package";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"rebindable" = callPackage
({ mkDerivation, base, data-default-class, indexed }:
mkDerivation {
@@ -171198,8 +175500,8 @@ self: {
({ mkDerivation, base, extra, filepath }:
mkDerivation {
pname = "record-dot-preprocessor";
- version = "0.1.3";
- sha256 = "0sb9gfwq6kvldywmwxni8kgd9vhkpk8xxhidldrj5cwf8a2ipwbx";
+ version = "0.1.4";
+ sha256 = "1mj39kdnf3978cc51hh1fnnr0ax3gnqw4fan0f099b7li5y2xlwx";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base extra filepath ];
@@ -171307,8 +175609,8 @@ self: {
}:
mkDerivation {
pname = "records-sop";
- version = "0.1.0.0";
- sha256 = "0ipxs13mlkhndbssa218fiajj2c26l5q5dl8n0p3h1qk6gjyfqa1";
+ version = "0.1.0.2";
+ sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5";
libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ];
testHaskellDepends = [
base deepseq generics-sop hspec should-not-typecheck
@@ -171339,8 +175641,8 @@ self: {
({ mkDerivation, base, composition-prelude }:
mkDerivation {
pname = "recursion";
- version = "1.2.0.1";
- sha256 = "1j36fyyfml7i0dxxfammaaqmg6yg1whdar1ffsvpkjg4b8lkxlr4";
+ version = "1.2.1.1";
+ sha256 = "0dh50664y470281gjiwkmdz8abiwgqin9r1ymznldwm37c3jljv5";
libraryHaskellDepends = [ base composition-prelude ];
description = "A recursion schemes library for GHC";
license = stdenv.lib.licenses.bsd3;
@@ -171354,8 +175656,8 @@ self: {
pname = "recursion-schemes";
version = "5.0.3";
sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v";
- revision = "1";
- editedCabalFile = "0r0qwxa0yg6814w8zfdla3k25x971a7pdr06sqws7fz5zri8rrn8";
+ revision = "2";
+ editedCabalFile = "13n38bchrkkijvy6jvhjskqn1b2kahfa9rvjvjcdn4bih4ylivk7";
libraryHaskellDepends = [
base base-orphans comonad free template-haskell th-abstraction
transformers
@@ -171505,8 +175807,8 @@ self: {
}:
mkDerivation {
pname = "redis-io";
- version = "0.7.0";
- sha256 = "06g630jrb0zxbai4n251plprafn5s9nywd3hgg14vz999wccns0z";
+ version = "1.0.0";
+ sha256 = "119qga77xv0kq6cppgz6ry3f1ql4slswqwqg7qyiyg639sli9nfp";
libraryHaskellDepends = [
attoparsec auto-update base bytestring containers exceptions
iproute monad-control mtl network operational redis-resp
@@ -171543,8 +175845,8 @@ self: {
}:
mkDerivation {
pname = "redis-resp";
- version = "0.4.0";
- sha256 = "0clj5b6lbkdc64arb9z4qhbiqkx7mifja8ns7xxc619yhj9dbh4b";
+ version = "1.0.0";
+ sha256 = "12w00zjf901xi6wwb0g6wzbxkbh1iyyd7glxijx9sajv6jgd5365";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-conversion containers dlist
double-conversion operational semigroups split transformers
@@ -171837,6 +176139,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "refined_0_3_0_0" = callPackage
+ ({ mkDerivation, base, deepseq, exceptions, mtl, prettyprinter
+ , template-haskell, transformers
+ }:
+ mkDerivation {
+ pname = "refined";
+ version = "0.3.0.0";
+ sha256 = "106gh7wv6nldgl8rw722n7cam59x34vnr2an6l9hkivfp4pgkkks";
+ libraryHaskellDepends = [
+ base deepseq exceptions mtl prettyprinter template-haskell
+ transformers
+ ];
+ description = "Refinement types with static and runtime checking";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"reflection" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@@ -171988,8 +176307,8 @@ self: {
}:
mkDerivation {
pname = "reflex-dom-fragment-shader-canvas";
- version = "0.1.0.1";
- sha256 = "17b023xjz29n673q4a5bd9r5bj8hb7b1q6ms6qppmwdimk3glz4z";
+ version = "0.2";
+ sha256 = "08ayk3y22mmgrpd03128h60wmg698d0c1cxack9akm636hp83y7z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -172305,8 +176624,8 @@ self: {
pname = "regex-applicative-text";
version = "0.1.0.1";
sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh";
- revision = "2";
- editedCabalFile = "19sdafr0i252xyy017yxmz76ipl5bdg3hiv3ka8sjbwryj16gdwi";
+ revision = "3";
+ editedCabalFile = "1h911harqgfgkhdr22cndj2fdsl48sqhn8q0akgjngpf3p8z0bvv";
libraryHaskellDepends = [ base regex-applicative text ];
description = "regex-applicative on text";
license = stdenv.lib.licenses.bsd3;
@@ -172764,8 +177083,8 @@ self: {
}:
mkDerivation {
pname = "regexdot";
- version = "0.12.1.0";
- sha256 = "11hv0mc48y42dz0bjfcvjxjxcbag33kvdc2gxbx0lsgyb4lm0q8j";
+ version = "0.12.2.0";
+ sha256 = "12vbdljm38nnl76byik6fzar51v0nyjm1dp4ky8fh16f5ghnm5b8";
libraryHaskellDepends = [
base data-default deepseq extra parallel parsec toolshed
];
@@ -172915,6 +177234,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "registry" = callPackage
+ ({ mkDerivation, async, base, exceptions, hedgehog, hedgehog-corpus
+ , io-memoize, MonadRandom, protolude, random, resourcet, tasty
+ , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base
+ }:
+ mkDerivation {
+ pname = "registry";
+ version = "0.1.1.0";
+ sha256 = "0in2kb12848g4ggph2m2h2csc3j0jg9572vi25pdlvr5xrlvxm0m";
+ libraryHaskellDepends = [
+ base exceptions protolude resourcet text transformers-base
+ ];
+ testHaskellDepends = [
+ async base exceptions hedgehog hedgehog-corpus io-memoize
+ MonadRandom protolude random resourcet tasty tasty-discover
+ tasty-hedgehog tasty-th text transformers-base
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "data structure for assembling \"components\"";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"regress" = callPackage
({ mkDerivation, ad, base, vector }:
mkDerivation {
@@ -173332,7 +177673,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "relude_0_2_0" = callPackage
+ "relude_0_3_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, doctest
, gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
, tasty-hedgehog, text, transformers, unordered-containers
@@ -173340,10 +177681,10 @@ self: {
}:
mkDerivation {
pname = "relude";
- version = "0.2.0";
- sha256 = "097kiflrwvkb3mxpkydh6a6x84azv4xla9nlm5qscacl4kn5z3q5";
+ version = "0.3.0";
+ sha256 = "10cbgz1xzw67q3y9fw8px7wwxblv5qym51qpdljmjz4ilpy0k35j";
revision = "1";
- editedCabalFile = "10zqh8j0k7q6l5ag009c432has7zpwbi57drr12dpyqa1ldrk6h0";
+ editedCabalFile = "04jfgc38pwrqir1j91l8jfzsp0hzggxr7kmbnfqcgrlpqidpj7mh";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable mtl stm text
transformers unordered-containers utf8-string
@@ -173621,10 +177962,8 @@ self: {
}:
mkDerivation {
pname = "repa";
- version = "3.4.1.3";
- sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy";
- revision = "2";
- editedCabalFile = "0kmypfnpzjszdzhpd1lskp0plja8zyr8r2y9xyscx4g5md9hh0zp";
+ version = "3.4.1.4";
+ sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
libraryHaskellDepends = [
base bytestring ghc-prim QuickCheck template-haskell vector
];
@@ -173636,10 +177975,8 @@ self: {
({ mkDerivation, base, repa, vector }:
mkDerivation {
pname = "repa-algorithms";
- version = "3.4.1.2";
- sha256 = "11lqq5j4g7p1dd47y65mfhzfsj8r27h7qj6qpc43g7kmf7h9gd87";
- revision = "1";
- editedCabalFile = "1dj9gq4v9y8818d5vx2zlsdl4fspwi4aywfbminr7dvlljhf415k";
+ version = "3.4.1.3";
+ sha256 = "1bhg1vr85j9mqm9lg1577dvlgzdbkh9f48h0ll6h03jfw7knyn6y";
libraryHaskellDepends = [ base repa vector ];
description = "Algorithms using the Repa array library";
license = stdenv.lib.licenses.bsd3;
@@ -173723,10 +178060,8 @@ self: {
}:
mkDerivation {
pname = "repa-examples";
- version = "3.4.1.1";
- sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039";
- revision = "3";
- editedCabalFile = "0vdzcx1fixvgqzmjxra8gfwhzs56qdrzixscq074sddv7jh5iz2f";
+ version = "3.4.1.2";
+ sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -173784,8 +178119,8 @@ self: {
pname = "repa-io";
version = "3.4.1.1";
sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm";
- revision = "2";
- editedCabalFile = "0zslqm87abzrsbrw2dlnsmm8jnpvg7ldi2d83d7p5sih78ksfmmm";
+ revision = "3";
+ editedCabalFile = "027vn7an0hm3ysnzk19y0dbjpah0wpg96dgb55149x1310vwybxl";
libraryHaskellDepends = [
base binary bmp bytestring old-time repa vector
];
@@ -173970,6 +178305,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "repline_0_2_0_0" = callPackage
+ ({ mkDerivation, base, containers, haskeline, mtl, process }:
+ mkDerivation {
+ pname = "repline";
+ version = "0.2.0.0";
+ sha256 = "1ph21kbbanlcs8n5lwk16g9vqkb98mkbz5mzwrp8j2rls2921izc";
+ libraryHaskellDepends = [ base containers haskeline mtl process ];
+ description = "Haskeline wrapper for GHCi-like REPL interfaces";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"repo-based-blog" = callPackage
({ mkDerivation, base, blaze-html, containers, data-default
, directory, dyre, filepath, filestore, hspec, hspec-discover
@@ -174322,11 +178669,12 @@ self: {
({ mkDerivation, rebase }:
mkDerivation {
pname = "rerebase";
- version = "1.2.2";
- sha256 = "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks";
+ version = "1.3";
+ sha256 = "16c5r69shz9zg01awjpwh7jpw3hqy81p4hh22rwdm0scdc45n5fa";
libraryHaskellDepends = [ rebase ];
description = "Reexports from \"base\" with a bunch of other standard libraries";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"reroute" = callPackage
@@ -174423,10 +178771,8 @@ self: {
}:
mkDerivation {
pname = "resolv";
- version = "0.1.1.1";
- sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9";
- revision = "1";
- editedCabalFile = "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma";
+ version = "0.1.1.2";
+ sha256 = "0wczdy3vmpfcfwjn1m95bygc5d83m97xxmavhdvy5ayn8c402fp4";
libraryHaskellDepends = [
base base16-bytestring binary bytestring containers
];
@@ -174434,7 +178780,7 @@ self: {
base bytestring directory filepath tasty tasty-hunit
];
description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
- license = stdenv.lib.licenses.gpl3;
+ license = stdenv.lib.licenses.gpl2;
}) {};
"resolve" = callPackage
@@ -174599,8 +178945,8 @@ self: {
}:
mkDerivation {
pname = "resourcet";
- version = "1.2.1";
- sha256 = "0rzjzh34s36ssign7akqjnwnjxf11c3511wk7ky0xxy0dqmc2rg7";
+ version = "1.2.2";
+ sha256 = "1rfbfcv3r1h29y0yqr3x6a1s04lbc3vzm3jqnfg4f9rqp9d448qk";
libraryHaskellDepends = [
base containers exceptions mtl primitive transformers unliftio-core
];
@@ -174800,6 +179146,8 @@ self: {
pname = "rest-types";
version = "1.14.1.2";
sha256 = "0cjxnb4zvj7iafgy9h4wq8817wkm1mvas45xcb9346kwd3yqgvmy";
+ revision = "1";
+ editedCabalFile = "06wjl45ravvw4vjwpl15r6qdpj3va7hpsk04z1bh8xh1by0r2yhz";
libraryHaskellDepends = [
aeson base base-compat case-insensitive generic-aeson
generic-xmlpickler hxt json-schema rest-stringmap text uuid
@@ -174850,15 +179198,15 @@ self: {
}) {};
"restless-git" = callPackage
- ({ mkDerivation, base, bytestring, containers, HSH, tasty
+ ({ mkDerivation, base, bytestring, clock, containers, HSH, tasty
, tasty-hunit, temporary, text, time
}:
mkDerivation {
pname = "restless-git";
- version = "0.5.0";
- sha256 = "0rz3aqrlsyld6slxq9lbpf3ydngpkka6ksr4qbl9qq6f42hb0pwi";
+ version = "0.7";
+ sha256 = "0r344f4q9bvqfrh1ls1g90xq7r1p30anwhnwjckz5v26idiynxy3";
libraryHaskellDepends = [
- base bytestring containers HSH text time
+ base bytestring clock containers HSH text time
];
testHaskellDepends = [
base bytestring containers tasty tasty-hunit temporary text
@@ -174960,8 +179308,8 @@ self: {
pname = "rethinkdb-client-driver";
version = "0.0.25";
sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g";
- revision = "1";
- editedCabalFile = "1hblwarlxjxq2lp52bjlqwdjsqlwm8ffqi2pj1n8zpidjv6m8330";
+ revision = "3";
+ editedCabalFile = "1g4shgl944fd3qbqkd68jv6vh65plaivci4vjzfs4py7a2p62db1";
libraryHaskellDepends = [
aeson base binary bytestring containers hashable mtl network
old-locale scientific stm template-haskell text time
@@ -175022,8 +179370,8 @@ self: {
}:
mkDerivation {
pname = "retry";
- version = "0.7.6.3";
- sha256 = "19h3y5j2wim32cail0pix11vjhfbj3xiivlw2kyz1iqv4fxx8mby";
+ version = "0.7.7.0";
+ sha256 = "0v6irf01xykhv0mwr1k5i08jn77irqbz8h116j8p435d11xc5jrw";
libraryHaskellDepends = [
base data-default-class exceptions ghc-prim random transformers
];
@@ -175351,6 +179699,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rfc1751" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, hspec, QuickCheck
+ , vector
+ }:
+ mkDerivation {
+ pname = "rfc1751";
+ version = "0.1.2";
+ sha256 = "1jls5g6lch4mdspbyzx1kgysa21i2cid68qpvk9z7ggz4lbfhid3";
+ libraryHaskellDepends = [ base bytestring cereal vector ];
+ testHaskellDepends = [
+ base bytestring cereal hspec QuickCheck vector
+ ];
+ description = "RFC-1751 library for Haskell";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"rfc3339" = callPackage
({ mkDerivation, base, timerep }:
mkDerivation {
@@ -175368,8 +179732,8 @@ self: {
({ mkDerivation, base, bytestring, containers }:
mkDerivation {
pname = "rfc5051";
- version = "0.1.0.3";
- sha256 = "0av4c3qvwbkbzrjrrg601ay9pds7wscqqp2lc2z78mv2lllap3g3";
+ version = "0.1.0.4";
+ sha256 = "1lxkq414ni986ciml4gbvf463fn55z299knky7pq3ixb1qislpb1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring containers ];
@@ -175405,19 +179769,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "rhine_0_4_0_4" = callPackage
- ({ mkDerivation, base, containers, dunai, free, time, transformers
+ "rhine_0_5_0_1" = callPackage
+ ({ mkDerivation, base, containers, deepseq, dunai, free, time
+ , transformers, vector-sized
}:
mkDerivation {
pname = "rhine";
- version = "0.4.0.4";
- sha256 = "00s2rsj3h7wamlrh2p7a600pwqlrrishxy2q2f6av0pzyc8dkc89";
- isLibrary = true;
- isExecutable = true;
+ version = "0.5.0.1";
+ sha256 = "0mxqr441bav2gs856qmvivl9cd53gh28ycary112vxinalijjh23";
libraryHaskellDepends = [
- base containers dunai free time transformers
+ base containers deepseq dunai free time transformers vector-sized
];
- executableHaskellDepends = [ base ];
description = "Functional Reactive Programming with type-level clocks";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -175427,14 +179789,15 @@ self: {
({ mkDerivation, base, dunai, gloss, rhine }:
mkDerivation {
pname = "rhine-gloss";
- version = "0.4.0.4";
- sha256 = "0xbmqhznacmxvcrx1gaq4cy6f98fb2p4f07g16qp50zhs9mb2a63";
+ version = "0.5.0.1";
+ sha256 = "0pj0in2xyz3g81rf175m65gwbwndabd0k2icsdcp3jcyqakzwari";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base dunai gloss rhine ];
executableHaskellDepends = [ base ];
description = "Gloss backend for Rhine";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rhythm-game-tutorial" = callPackage
@@ -176180,6 +180543,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) rocksdb;};
+ "rocksdb-query" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, conduit, data-default
+ , hspec, resourcet, rocksdb-haskell, unliftio
+ }:
+ mkDerivation {
+ pname = "rocksdb-query";
+ version = "0.2.0";
+ sha256 = "01n2zlbpldhx8rxvq89i9hsp99dvlhm6s4rwlygxd3y989an8bcf";
+ libraryHaskellDepends = [
+ base bytestring cereal conduit resourcet rocksdb-haskell unliftio
+ ];
+ testHaskellDepends = [
+ base cereal data-default hspec rocksdb-haskell unliftio
+ ];
+ description = "RocksDB database querying library for Haskell";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {};
+
"roguestar" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, old-time
, process
@@ -176641,6 +181022,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rounded" = callPackage
+ ({ mkDerivation, base, ghc-prim, gmp, hgmp, long-double, mpfr
+ , reflection, singletons
+ }:
+ mkDerivation {
+ pname = "rounded";
+ version = "0.1";
+ sha256 = "02xlc369yi8wvf41z4d3291i63rcryl0yjp0k5lkn3c2f0k5w244";
+ libraryHaskellDepends = [
+ base ghc-prim hgmp long-double reflection singletons
+ ];
+ librarySystemDepends = [ gmp mpfr ];
+ testHaskellDepends = [ base long-double ];
+ description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
+ license = "LGPL";
+ }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
+
"rounding" = callPackage
({ mkDerivation, array, base, numeric-extras }:
mkDerivation {
@@ -176661,6 +181059,8 @@ self: {
pname = "roundtrip";
version = "0.2.0.5";
sha256 = "10b57yfcnsgrkx4djgiinnyh46hwbysskmlh27bajp82p91v7xfa";
+ revision = "1";
+ editedCabalFile = "1kxlgbgwlrln9pal7yq4i487yy6jyf04s6fpb63w7z16anxly4bs";
libraryHaskellDepends = [
base containers pretty safe template-haskell text xml-types
];
@@ -176676,8 +181076,8 @@ self: {
}:
mkDerivation {
pname = "roundtrip-aeson";
- version = "0.2.0.0";
- sha256 = "0m96447l2m0y4aapil077xpnzlkjla0yp2bzajfijik9gkjbiih4";
+ version = "0.3.0.2";
+ sha256 = "0qlsmmcidiagjyb3kfp1hplkkzpibgxw31j7cxhma3l2gs2yal6f";
libraryHaskellDepends = [
aeson base bytestring containers lens lens-aeson roundtrip
scientific text unordered-containers vector
@@ -176759,6 +181159,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "row" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+ , tasty, tasty-smallcheck, util
+ }:
+ mkDerivation {
+ pname = "row";
+ version = "0.0.0.0";
+ sha256 = "16iy0b0aqvpn1dnw96h8vp4354774c0lp7fq4qibqwd8bv99mmps";
+ libraryHaskellDepends = [ base base-unicode-symbols util ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ benchmarkHaskellDepends = [ base criterion ];
+ doHaddock = false;
+ description = "Row types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"row-types" = callPackage
({ mkDerivation, base, constraints, criterion, deepseq, hashable
, text, unordered-containers
@@ -176978,16 +181394,12 @@ self: {
}) {};
"rss" = callPackage
- ({ mkDerivation, base, HaXml, network, network-uri, old-locale
- , time
- }:
+ ({ mkDerivation, base, HaXml, network, network-uri, time }:
mkDerivation {
pname = "rss";
- version = "3000.2.0.6";
- sha256 = "03crzmi9903w6xsdc00wd9jhsr41b8pglz9n502h68w3jkm6zr4d";
- libraryHaskellDepends = [
- base HaXml network network-uri old-locale time
- ];
+ version = "3000.2.0.7";
+ sha256 = "0z48xb610k1h29rg03q19y08fp78agxp2gr48innw5y3rz00s6ym";
+ libraryHaskellDepends = [ base HaXml network network-uri time ];
description = "A library for generating RSS 2.0 feeds.";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -177573,8 +181985,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "safe-coerce";
- version = "0.1.0.0";
- sha256 = "0qv4a6p547cnyvchnjrya8paq39gqpnbska9v5l64lqn3a28yk8p";
+ version = "0.2.0.0";
+ sha256 = "059mn68pj57dvjzmv3vypv0askx02f4hlalbzsr34cn2h7ndw6df";
libraryHaskellDepends = [ base ];
description = "A friendly shorthand for an old friend";
license = stdenv.lib.licenses.bsd3;
@@ -177588,8 +182000,8 @@ self: {
pname = "safe-exceptions";
version = "0.1.7.0";
sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q";
- revision = "3";
- editedCabalFile = "0y1b9pw5wriyiffcmvk9g53imh6lm5fgfbjsgpn2w96qspaagdb5";
+ revision = "4";
+ editedCabalFile = "0fid41gishzsyb47wzxhd5falandfirqcp760hcja81qjpfmqd32";
libraryHaskellDepends = [ base deepseq exceptions transformers ];
testHaskellDepends = [ base hspec void ];
description = "Safe, consistent, and easy exception handling";
@@ -178110,6 +182522,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "salak" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+ , filepath, hspec, QuickCheck, scientific, text
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "salak";
+ version = "0.1.4";
+ sha256 = "17zlgk85yp6ihfppf0simrvc70sk2a3jkjzxzzsgibyxmsm2jmxr";
+ libraryHaskellDepends = [
+ aeson base directory filepath scientific text unordered-containers
+ vector yaml
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base bytestring directory filepath hspec
+ QuickCheck scientific text unordered-containers vector yaml
+ ];
+ description = "Configuration Loader";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"saltine" = callPackage
({ mkDerivation, base, bytestring, libsodium, profunctors
, QuickCheck, semigroups, test-framework
@@ -178117,8 +182550,8 @@ self: {
}:
mkDerivation {
pname = "saltine";
- version = "0.1.0.1";
- sha256 = "05m3w0xibnhk3whzp7rzn2y2hv9f2i8pyvjnmzsxwbs8ws30cac5";
+ version = "0.1.0.2";
+ sha256 = "0253m8n6s39fnr8wz1z240kaizw3chfm1fgwp51dgqgk0nwrv67x";
libraryHaskellDepends = [ base bytestring profunctors ];
libraryPkgconfigDepends = [ libsodium ];
testHaskellDepends = [
@@ -178153,8 +182586,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "salve";
- version = "1.0.4";
- sha256 = "0q9z7smss3lf33lq982ghrq8dhv71cppc73zi61b22f0b076njvd";
+ version = "1.0.6";
+ sha256 = "1vgpj0yg27n6hw1gb763hgxv99hpq7511n2ihys0qdi0ri8bpj1j";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "Semantic version numbers and constraints";
@@ -178411,6 +182844,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sandi_0_4_3" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, criterion, exceptions
+ , tasty, tasty-hunit, tasty-quickcheck, tasty-th
+ }:
+ mkDerivation {
+ pname = "sandi";
+ version = "0.4.3";
+ sha256 = "0ji1zn9nkh8rdm0m9zpxdnz5zw0q0qypzyp2k9fn6j9v08r17p3n";
+ libraryHaskellDepends = [ base bytestring conduit exceptions ];
+ testHaskellDepends = [
+ base bytestring tasty tasty-hunit tasty-quickcheck tasty-th
+ ];
+ benchmarkHaskellDepends = [ base bytestring criterion ];
+ description = "Data encoding library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sandlib" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -178758,24 +183209,24 @@ self: {
"sbv" = callPackage
({ mkDerivation, array, async, base, bytestring, containers
- , crackNum, data-binary-ieee754, deepseq, directory, doctest
- , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
- , process, QuickCheck, random, syb, tasty, tasty-golden
- , tasty-hunit, tasty-quickcheck, template-haskell, time, z3
+ , crackNum, deepseq, directory, doctest, filepath, generic-deriving
+ , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random
+ , reinterpret-cast, syb, tasty, tasty-golden, tasty-hunit
+ , tasty-quickcheck, template-haskell, time, z3
}:
mkDerivation {
pname = "sbv";
- version = "7.10";
- sha256 = "0bq3h0aidjdh7a9gp97mxfpng4x36mxyb4bgmj4pyjqdnbdgr05p";
+ version = "7.12";
+ sha256 = "1lbihjy2nbr77xm1jnvqdjqkabpxjlbdddsdvsr7n9a60bjcr2yx";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- array async base containers crackNum data-binary-ieee754 deepseq
- directory filepath generic-deriving ghc mtl pretty process
- QuickCheck random syb template-haskell time
+ array async base containers crackNum deepseq directory filepath
+ generic-deriving ghc mtl pretty process QuickCheck random
+ reinterpret-cast syb template-haskell time
];
testHaskellDepends = [
- base bytestring containers data-binary-ieee754 directory doctest
- filepath Glob hlint mtl QuickCheck random syb tasty tasty-golden
+ base bytestring containers directory doctest filepath Glob hlint
+ mtl QuickCheck random reinterpret-cast syb tasty tasty-golden
tasty-hunit tasty-quickcheck template-haskell
];
testSystemDepends = [ z3 ];
@@ -179545,6 +183996,8 @@ self: {
pname = "scotty";
version = "0.11.2";
sha256 = "18lxgnj05p4hk7pp4a84biz2dn387a5vxwzyh1kslns1bra6zn0x";
+ revision = "1";
+ editedCabalFile = "1h4fk7q8x7cvlqq4bbmdh465s6a8955bgchm121fvk08x7rm3yz3";
libraryHaskellDepends = [
aeson base blaze-builder bytestring case-insensitive
data-default-class exceptions fail http-types monad-control mtl
@@ -179685,6 +184138,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "scotty-path-normalizer" = callPackage
+ ({ mkDerivation, base, bytestring, doctest, scotty, text, wai }:
+ mkDerivation {
+ pname = "scotty-path-normalizer";
+ version = "0.1.0.0";
+ sha256 = "1hv95q3ikf25d9kxzr48fxb2x1331c24n3q5nb47qa7866gy2f4q";
+ libraryHaskellDepends = [ base bytestring scotty text wai ];
+ testHaskellDepends = [ base doctest ];
+ description = "Redirect to a normalized path";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"scotty-resource" = callPackage
({ mkDerivation, base, containers, http-types, scotty, text
, transformers, wai
@@ -179973,6 +184438,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "scythe" = callPackage
+ ({ mkDerivation, alex, array, base, bytestring, mtl, text }:
+ mkDerivation {
+ pname = "scythe";
+ version = "0.2.0.0";
+ sha256 = "0lh3f5xj6jc1jlg049vf63gvkw93nv8xd6b4b6jpk4nyv9fw2sqn";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ array base bytestring mtl text ];
+ libraryToolDepends = [ alex ];
+ executableHaskellDepends = [ base bytestring ];
+ description = "Fast CSV lexing on ByteString";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"scyther-proof" = callPackage
({ mkDerivation, alex, array, base, cmdargs, containers, directory
, filepath, json, mtl, parsec, pretty, process, safe, tagsoup, time
@@ -180453,27 +184934,50 @@ self: {
}) {};
"secp256k1" = callPackage
- ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal
- , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions
- , test-framework, test-framework-hunit, test-framework-quickcheck2
+ ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+ , cryptohash, entropy, hspec, hspec-discover, HUnit, mtl
+ , QuickCheck, secp256k1, string-conversions
}:
mkDerivation {
pname = "secp256k1";
- version = "0.5.3";
- sha256 = "1fb9n7r64h35822zsa0w2jb214gdfg85ib20ni3caszc1k8rsmck";
- setupHaskellDepends = [ base Cabal ];
+ version = "1.1.2";
+ sha256 = "0nm8xx9cfn5gj2rqhcmikdkl3grj88xs4wikjbrlazvpyj4rc0q2";
libraryHaskellDepends = [
- base base16-bytestring bytestring cereal entropy mtl QuickCheck
- string-conversions
+ base base16-bytestring bytestring cereal cryptohash entropy hspec
+ HUnit mtl QuickCheck string-conversions
];
+ librarySystemDepends = [ secp256k1 ];
testHaskellDepends = [
- base base16-bytestring bytestring cereal cryptohash entropy HUnit
- mtl QuickCheck string-conversions test-framework
- test-framework-hunit test-framework-quickcheck2
+ base base16-bytestring bytestring cereal cryptohash entropy hspec
+ HUnit mtl QuickCheck string-conversions
];
+ testToolDepends = [ hspec-discover ];
description = "Bindings for secp256k1 library from Bitcoin Core";
license = stdenv.lib.licenses.publicDomain;
- }) {};
+ }) {inherit (pkgs) secp256k1;};
+
+ "secp256k1-haskell" = callPackage
+ ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+ , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck
+ , secp256k1, string-conversions
+ }:
+ mkDerivation {
+ pname = "secp256k1-haskell";
+ version = "0.1.4";
+ sha256 = "1vfbn0fvrbk4hmfhsm8gj3yxyijzfdqlywwir64zrafla4yry73l";
+ libraryHaskellDepends = [
+ base base16-bytestring bytestring cereal entropy hashable
+ QuickCheck string-conversions
+ ];
+ librarySystemDepends = [ secp256k1 ];
+ testHaskellDepends = [
+ base base16-bytestring bytestring cereal entropy hashable hspec
+ HUnit mtl QuickCheck string-conversions
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Bindings for secp256k1 library from Bitcoin Core";
+ license = stdenv.lib.licenses.publicDomain;
+ }) {inherit (pkgs) secp256k1;};
"secret-santa" = callPackage
({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib
@@ -180602,14 +185106,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "selda_0_3_2_0" = callPackage
+ "selda_0_3_4_0" = callPackage
({ mkDerivation, base, bytestring, exceptions, hashable, mtl
, psqueues, text, time, unordered-containers
}:
mkDerivation {
pname = "selda";
- version = "0.3.2.0";
- sha256 = "1ngvh7w4s0w57qaizzxin641x9v4v2rm03lnkfcxklq93l3khgp6";
+ version = "0.3.4.0";
+ sha256 = "1ww4v30ywmdshcf4fpgqj5ycd9c197xdlvnby366hzsm7byqq8wj";
libraryHaskellDepends = [
base bytestring exceptions hashable mtl psqueues text time
unordered-containers
@@ -180766,8 +185270,8 @@ self: {
}:
mkDerivation {
pname = "self-extract";
- version = "0.3.4";
- sha256 = "11v5d4sjbax5dncirmhgbvcj3a2ynnvlq34x4yamx0d9pm9b1idm";
+ version = "0.4.0";
+ sha256 = "1zv84rdf5nzszy4qhp74jdzam613z9p86sjh8ag6kb5fxaxk91dh";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -181006,6 +185510,8 @@ self: {
pname = "semiring-num";
version = "1.6.0.1";
sha256 = "1l9j59r0ph34fqkjw1gdf3yzyzk8p6362cznixzx6qnhphbkqjsi";
+ revision = "1";
+ editedCabalFile = "123jk59i4ziv6ghmy8349icpvzgw90xjd6dxzlnayf0qg01adzsr";
libraryHaskellDepends = [
base containers deepseq hashable log-domain scientific
template-haskell time unordered-containers vector
@@ -181039,8 +185545,8 @@ self: {
}:
mkDerivation {
pname = "semirings";
- version = "0.2.0.1";
- sha256 = "1larh2rp9sa3zd0d7bn6wc0i3hy455dr5zixmp34i8v135wqay2b";
+ version = "0.2.1.1";
+ sha256 = "0s28qq6fk2zqzz6y76fa1ddrrmpax99mlkxhz89mw15hx04mnsjp";
libraryHaskellDepends = [
base containers hashable integer-gmp unordered-containers vector
];
@@ -181180,8 +185686,8 @@ self: {
}:
mkDerivation {
pname = "sensu-run";
- version = "0.6.0";
- sha256 = "1hzi5bkzc3wl031jhpr7j639zxijb33sdwg7zrb5xqdrpmfhg1zm";
+ version = "0.6.0.2";
+ sha256 = "1lxz3cr04f4bqlm4jph66ckab494vqlaf6jc67dbmmwia6if2fpw";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -181264,8 +185770,8 @@ self: {
pname = "separated";
version = "0.3.2.1";
sha256 = "0xnpxaz9qr2qqg7kmgv1qsbd4943r54m1vva3xivn4cxf1gnxcaw";
- revision = "1";
- editedCabalFile = "0d0721vf4lcixbrm24jlrvjjc1m1w1638ds7pkgz7hy4armznik1";
+ revision = "2";
+ editedCabalFile = "1q501zsxf5kl65aqp8cdaxj2y61jq3480r31cnr81w14ikrd5wdy";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bifunctors deriving-compat lens semigroupoids semigroups
@@ -181329,8 +185835,8 @@ self: {
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
pname = "seqid";
- version = "0.5.3";
- sha256 = "1wc7a66k42njc0zv0cp4ycfv7jbcqyf77j9m6fikhdppbvn3cbn4";
+ version = "0.6.0";
+ sha256 = "1zm1zmzp3i60wb17ghr4rp5ljlhvsblll69x2ibjk7kh5icvwfqc";
libraryHaskellDepends = [ base mtl transformers ];
description = "Sequence ID production and consumption";
license = stdenv.lib.licenses.bsd3;
@@ -181352,8 +185858,8 @@ self: {
({ mkDerivation, base, io-streams, seqid }:
mkDerivation {
pname = "seqid-streams";
- version = "0.6.3";
- sha256 = "1wmi4iqh6q45cm1s9ml2yi5b34m8cj7y5a0aicjfsc8nyy0pq48r";
+ version = "0.7.0";
+ sha256 = "0z80cclvzkr6dg81n96dpan9a7285rlq9nmchiy4raxsjw4cza58";
libraryHaskellDepends = [ base io-streams seqid ];
description = "Sequence ID IO-Streams";
license = stdenv.lib.licenses.bsd3;
@@ -181524,34 +186030,29 @@ self: {
}) {};
"serialise" = callPackage
- ({ mkDerivation, aeson, array, base, base16-bytestring
- , base64-bytestring, binary, bytestring, cborg, cereal
- , cereal-vector, containers, criterion, deepseq, directory
+ ({ mkDerivation, aeson, array, base, binary, bytestring, cborg
+ , cereal, cereal-vector, containers, criterion, deepseq, directory
, filepath, ghc-prim, half, hashable, pretty, primitive, QuickCheck
- , quickcheck-instances, scientific, store, tar, tasty, tasty-hunit
+ , quickcheck-instances, semigroups, store, tar, tasty, tasty-hunit
, tasty-quickcheck, text, time, unordered-containers, vector, zlib
}:
mkDerivation {
pname = "serialise";
- version = "0.2.0.0";
- sha256 = "1iqkawxy946dhldam30cc1k9h4g2w4cp34fg57ln9k7507mvcns0";
- revision = "2";
- editedCabalFile = "1wvqzrbf80ry5xc2s9va24024gfgwi6xj1yvm7578f7mq0k1zqvf";
+ version = "0.2.1.0";
+ sha256 = "19ary6ivzk8z7wcxhm860qmh7pwqj0qjqzav1h42y85l608zqgh4";
libraryHaskellDepends = [
array base bytestring cborg containers ghc-prim half hashable
primitive text time unordered-containers vector
];
testHaskellDepends = [
- aeson array base base16-bytestring base64-bytestring binary
- bytestring cborg containers deepseq directory filepath ghc-prim
- half hashable primitive QuickCheck quickcheck-instances scientific
- tasty tasty-hunit tasty-quickcheck text time unordered-containers
- vector
+ base bytestring cborg containers directory filepath primitive
+ QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck
+ text time unordered-containers vector
];
benchmarkHaskellDepends = [
aeson array base binary bytestring cborg cereal cereal-vector
containers criterion deepseq directory filepath ghc-prim half
- pretty store tar text time vector zlib
+ pretty semigroups store tar text time vector zlib
];
description = "A binary serialisation library for Haskell values";
license = stdenv.lib.licenses.bsd3;
@@ -181688,6 +186189,8 @@ self: {
pname = "servant";
version = "0.14.1";
sha256 = "083layvq76llq3y49k27cdqzxka6mjgw541jhzndxx4avlcjzym7";
+ revision = "1";
+ editedCabalFile = "1n9lwm77w0xi6jzqrhyn6akf71z140wngj4s5x2zkndq8wmg4rg4";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson attoparsec base base-compat bytestring case-insensitive
@@ -181712,6 +186215,8 @@ self: {
pname = "servant-JuicyPixels";
version = "0.3.0.4";
sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv";
+ revision = "1";
+ editedCabalFile = "185ym0ac6gx7f98pd92ykc1ib305lswzjzvykly4ij9vk85jn0ax";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -181888,8 +186393,40 @@ self: {
}:
mkDerivation {
pname = "servant-auth-server";
- version = "0.4.0.0";
- sha256 = "0fwa3v7nkyhrwxrp4sf0aikh5mgkdpn2grz8sr4sszhswp2js4ip";
+ version = "0.4.0.1";
+ sha256 = "196dcnh1ycb23x6wb5m1p3iy8bws2grlx5i9mnnsav9n95yf15n9";
+ revision = "1";
+ editedCabalFile = "0l35r80yf1i3hjwls9cvhmzrjkgxfs103qcb1m650y77w1h3xr9p";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring blaze-builder bytestring
+ bytestring-conversion case-insensitive cookie crypto-api
+ data-default-class entropy http-api-data http-types jose lens
+ monad-time mtl servant servant-auth servant-server tagged text time
+ unordered-containers wai
+ ];
+ testHaskellDepends = [
+ aeson base bytestring case-insensitive hspec http-client http-types
+ jose lens lens-aeson markdown-unlit mtl QuickCheck servant-auth
+ servant-server time transformers wai warp wreq
+ ];
+ testToolDepends = [ hspec-discover markdown-unlit ];
+ description = "servant-server/servant-auth compatibility";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "servant-auth-server_0_4_1_0" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+ , bytestring, bytestring-conversion, case-insensitive, cookie
+ , crypto-api, data-default-class, entropy, hspec, hspec-discover
+ , http-api-data, http-client, http-types, jose, lens, lens-aeson
+ , markdown-unlit, monad-time, mtl, QuickCheck, servant
+ , servant-auth, servant-server, tagged, text, time, transformers
+ , unordered-containers, wai, warp, wreq
+ }:
+ mkDerivation {
+ pname = "servant-auth-server";
+ version = "0.4.1.0";
+ sha256 = "1fxh50fjrdi5j88qs2vsrflqdwq3pc8s5h424nhjrpc24w277bqi";
libraryHaskellDepends = [
aeson base base64-bytestring blaze-builder bytestring
bytestring-conversion case-insensitive cookie crypto-api
@@ -181905,6 +186442,7 @@ self: {
testToolDepends = [ hspec-discover markdown-unlit ];
description = "servant-server/servant-auth compatibility";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-auth-swagger" = callPackage
@@ -181928,17 +186466,18 @@ self: {
}) {};
"servant-auth-token" = callPackage
- ({ mkDerivation, aeson-injector, base, bytestring, containers
- , http-api-data, mtl, pwstore-fast, servant, servant-auth-token-api
- , servant-server, text, time, transformers, uuid, wai
+ ({ mkDerivation, aeson-injector, base, byteable, bytestring
+ , containers, http-api-data, mtl, pwstore-fast, servant
+ , servant-auth-token-api, servant-server, text, time, transformers
+ , uuid, wai
}:
mkDerivation {
pname = "servant-auth-token";
- version = "0.5.3.0";
- sha256 = "04zg9a2brpca39gx0hk1s2mnccw8d5n3gxd082w31f3axji6rm3a";
+ version = "0.5.6.0";
+ sha256 = "1nbyzg13s3082mwmcd5q85a4i94ay7fac74x28ska01y2587p631";
libraryHaskellDepends = [
- aeson-injector base bytestring containers http-api-data mtl
- pwstore-fast servant servant-auth-token-api servant-server text
+ aeson-injector base byteable bytestring containers http-api-data
+ mtl pwstore-fast servant servant-auth-token-api servant-server text
time transformers uuid wai
];
description = "Servant based API and server for token based authorisation";
@@ -181955,8 +186494,8 @@ self: {
}:
mkDerivation {
pname = "servant-auth-token-acid";
- version = "0.5.3.1";
- sha256 = "0mndi1b0sgfik7yij3l65bcsqp820igbf09nnrk8dmznnama56y4";
+ version = "0.5.4.0";
+ sha256 = "1792zsnrm7s875bp72yi44kziaky7474z63pivmfba1jdhi33mj5";
libraryHaskellDepends = [
acid-state aeson-injector base bytestring containers ghc-prim
monad-control mtl safe safecopy servant-auth-token
@@ -181974,8 +186513,8 @@ self: {
}:
mkDerivation {
pname = "servant-auth-token-api";
- version = "0.5.2.0";
- sha256 = "1cb04lcqlb0iw729l97dm3xxxhwzinlsf4ipgda2dix8j29v7h5b";
+ version = "0.5.3.0";
+ sha256 = "0i9i89a9h9xq6r23p6xxyf7ywgr90p2dyw8862qz0pdj0qdbbi5v";
libraryHaskellDepends = [
aeson aeson-injector base lens raw-strings-qq servant servant-docs
servant-swagger swagger2 text
@@ -181986,22 +186525,21 @@ self: {
}) {};
"servant-auth-token-leveldb" = callPackage
- ({ mkDerivation, aeson-injector, base, bytestring, concurrent-extra
- , containers, exceptions, lens, leveldb-haskell, monad-control, mtl
- , resourcet, safe, safecopy-store, servant-auth-token
- , servant-auth-token-api, servant-server, store, text, time
- , transformers, transformers-base, uuid, vector
+ ({ mkDerivation, aeson-injector, base, bytestring, cereal
+ , concurrent-extra, containers, exceptions, lens, leveldb-haskell
+ , mtl, resourcet, safe, safecopy, servant-auth-token
+ , servant-auth-token-api, servant-server, text, time, transformers
+ , unliftio-core, uuid, vector
}:
mkDerivation {
pname = "servant-auth-token-leveldb";
- version = "0.5.3.0";
- sha256 = "0jj7px9w67d2kmcvap02ccmw6y4x9fz1mmwndhb4rjxyr1kkwkja";
+ version = "0.6.0.0";
+ sha256 = "0kqhcvs5ih4lj9i3jdpw8vyzpsim3j03lqfrdc0kqf06a0jyfbkp";
libraryHaskellDepends = [
- aeson-injector base bytestring concurrent-extra containers
- exceptions lens leveldb-haskell monad-control mtl resourcet safe
- safecopy-store servant-auth-token servant-auth-token-api
- servant-server store text time transformers transformers-base uuid
- vector
+ aeson-injector base bytestring cereal concurrent-extra containers
+ exceptions lens leveldb-haskell mtl resourcet safe safecopy
+ servant-auth-token servant-auth-token-api servant-server text time
+ transformers unliftio-core uuid vector
];
description = "Leveldb backend for servant-auth-token server";
license = stdenv.lib.licenses.bsd3;
@@ -182010,19 +186548,18 @@ self: {
"servant-auth-token-persistent" = callPackage
({ mkDerivation, aeson-injector, base, bytestring, containers
- , monad-control, mtl, persistent, persistent-template
+ , exceptions, mtl, persistent, persistent-template
, servant-auth-token, servant-auth-token-api, servant-server, text
- , time, transformers, transformers-base, uuid
+ , time, transformers, unliftio-core, uuid
}:
mkDerivation {
pname = "servant-auth-token-persistent";
- version = "0.6.3.0";
- sha256 = "1rxcmccfj0rirjngqm3p5azrwlrcf8bfr3fm7m046b6w031cfh9y";
+ version = "0.7.0.0";
+ sha256 = "1mxpq33dbam0zyc7fnrn6zdqirbri8nih1xcyzczpgs946j97zff";
libraryHaskellDepends = [
- aeson-injector base bytestring containers monad-control mtl
- persistent persistent-template servant-auth-token
- servant-auth-token-api servant-server text time transformers
- transformers-base uuid
+ aeson-injector base bytestring containers exceptions mtl persistent
+ persistent-template servant-auth-token servant-auth-token-api
+ servant-server text time transformers unliftio-core uuid
];
description = "Persistent backend for servant-auth-token server";
license = stdenv.lib.licenses.bsd3;
@@ -182149,8 +186686,8 @@ self: {
pname = "servant-client";
version = "0.14";
sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6";
- revision = "1";
- editedCabalFile = "1ywyb3mycpfcvv7dfgd72ajnkqr8cyiyp84hsfxcfvppq8cigmms";
+ revision = "3";
+ editedCabalFile = "1rjjqxyyf51bjq8li8yilng5pjd9a5n3d8zniqmfw3hys6dz8n8g";
libraryHaskellDepends = [
base base-compat bytestring containers exceptions http-client
http-media http-types monad-control mtl semigroupoids
@@ -182179,6 +186716,8 @@ self: {
pname = "servant-client-core";
version = "0.14.1";
sha256 = "0qfpakwl6yj6l2br9wa9zs0v7nzmj4bngspw6p536swx39npnkn2";
+ revision = "2";
+ editedCabalFile = "02pvrccfwvvy53gma56jcqnbia3pm1pncyghdkjp519bwff9iwvb";
libraryHaskellDepends = [
base base-compat base64-bytestring bytestring containers exceptions
free generics-sop http-api-data http-media http-types network-uri
@@ -182257,8 +186796,8 @@ self: {
pname = "servant-dhall";
version = "0.1.0.1";
sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll";
- revision = "1";
- editedCabalFile = "0p8ygb5l79zzawnmy992wnicxv2cbbr0860063mbchmjwjf39x33";
+ revision = "2";
+ editedCabalFile = "1zdvk0cx8s1n107yx95vdv0xziwjmr1d6kypr36f1cqdvdh02jir";
libraryHaskellDepends = [
base base-compat bytestring dhall http-media megaparsec
prettyprinter servant text
@@ -182281,8 +186820,8 @@ self: {
pname = "servant-docs";
version = "0.11.2";
sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b";
- revision = "5";
- editedCabalFile = "10b463waaa75aawjdag52yjv2bhkpnp3xygb39zyifpaf6iix100";
+ revision = "6";
+ editedCabalFile = "0w9yi4rmfq4irmnia9rl9pb66ix086ic9nd0grspnk54ib7970cl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -182432,8 +186971,8 @@ self: {
pname = "servant-foreign";
version = "0.11.1";
sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735";
- revision = "3";
- editedCabalFile = "1ln18qi2bb9xfk3phydci5r2x0mf6dbgc9lc8k8qpx08bkid65x4";
+ revision = "4";
+ editedCabalFile = "1alal6ps1lwl8yd2vwkpmkn4a69blr1ws2cba7mc7a2w63lg1pyz";
libraryHaskellDepends = [
base base-compat http-types lens servant text
];
@@ -182449,8 +186988,8 @@ self: {
pname = "servant-generate";
version = "0.1";
sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw";
- revision = "2";
- editedCabalFile = "00y5ji53sz59wys4nk2xcdpggydvkkqdxnm0aqj5raxzmakqnraq";
+ revision = "3";
+ editedCabalFile = "11hmn45fsl78kq6lladgz29yjycmr7lxmkswc8f41zbcb4m8rzyk";
libraryHaskellDepends = [ base servant servant-server ];
description = "Utilities for generating mock server implementations";
license = stdenv.lib.licenses.bsd3;
@@ -182547,6 +187086,57 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-hmac-auth" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
+ , case-insensitive, containers, cryptonite, http-client, http-types
+ , markdown-unlit, memory, mtl, servant, servant-client
+ , servant-client-core, servant-server, transformers, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-hmac-auth";
+ version = "0.0.0";
+ sha256 = "08873pwmn2wzhl2r87gx6db3f2j8848g4xq2i4gnwqj23s7sfy0z";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base64-bytestring binary bytestring case-insensitive
+ containers cryptonite http-client http-types memory mtl servant
+ servant-client servant-client-core servant-server transformers wai
+ ];
+ executableHaskellDepends = [
+ aeson base http-client servant servant-client servant-server warp
+ ];
+ executableToolDepends = [ markdown-unlit ];
+ testHaskellDepends = [ base ];
+ description = "Servant authentication with HMAC";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "servant-http2-client" = callPackage
+ ({ mkDerivation, aeson, async, base, binary, bytestring
+ , case-insensitive, containers, data-default-class, exceptions
+ , http-media, http-types, http2, http2-client, mtl, servant
+ , servant-client-core, text, tls, transformers
+ }:
+ mkDerivation {
+ pname = "servant-http2-client";
+ version = "0.1.0.2";
+ sha256 = "0rjzc1dyj0njmh590ays5ma6243240qakrjgzi9qinvkgb7lzad2";
+ libraryHaskellDepends = [
+ base binary bytestring case-insensitive containers exceptions
+ http-media http-types http2 http2-client mtl servant-client-core
+ text transformers
+ ];
+ testHaskellDepends = [
+ aeson async base binary bytestring case-insensitive containers
+ data-default-class exceptions http-media http-types http2
+ http2-client mtl servant servant-client-core text tls transformers
+ ];
+ description = "Generate HTTP2 clients from Servant API descriptions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"servant-iCalendar" = callPackage
({ mkDerivation, base, data-default, http-media, iCalendar, servant
}:
@@ -182592,8 +187182,8 @@ self: {
pname = "servant-js";
version = "0.9.3.2";
sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02";
- revision = "2";
- editedCabalFile = "1mz21yf77nzfb30hlqncyx3jwr50ab7qh0m0cv8pds6s76s6k9sj";
+ revision = "3";
+ editedCabalFile = "0j5kmqzhkyb1wmvyxz0r20473myzp9bqcdgjbi8i4k1lfvcjsigq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -182616,8 +187206,8 @@ self: {
}:
mkDerivation {
pname = "servant-kotlin";
- version = "0.1.1.2";
- sha256 = "1ad1n1yp6b125fa5gjjnbksnjqf714jf9d8cvxrvpwkl9lxn9ppb";
+ version = "0.1.1.3";
+ sha256 = "07adjx1smqg5x87dklgknlmkavns2axmhqw97fk0jnp99rb1rpb2";
libraryHaskellDepends = [
base containers directory formatting lens servant servant-foreign
text time wl-pprint-text
@@ -182695,8 +187285,8 @@ self: {
pname = "servant-mock";
version = "0.8.4";
sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr";
- revision = "2";
- editedCabalFile = "0brnvssfcg105kkkj646wih8apnhd5gvy25c576i93x0nxb0n39j";
+ revision = "3";
+ editedCabalFile = "13sbgnzr0yfrbrbvzc6v66lxrgvg3pb7h9alvmg77kmm95gmx8mm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -182867,8 +187457,8 @@ self: {
}:
mkDerivation {
pname = "servant-proto-lens";
- version = "0.1.0.2";
- sha256 = "1p97yp3x8lhdr9z33f0pdaxj1bqjqc36gs54j69laxfq2650v3nx";
+ version = "0.1.0.3";
+ sha256 = "0j85f64rjvkm2d487ahmg64x77iyldvdwyalbxw960sdv80mjavw";
libraryHaskellDepends = [
base bytestring http-media proto-lens servant
];
@@ -182959,10 +187549,8 @@ self: {
}:
mkDerivation {
pname = "servant-quickcheck";
- version = "0.0.7.2";
- sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh";
- revision = "1";
- editedCabalFile = "1slgq8q0hmh904ssn5sfmi6mbpd3vkqvc59m3g9kfgzf5j70py2h";
+ version = "0.0.7.3";
+ sha256 = "0d904xfw5q7qcwkp5n7v18drc1idssvfwic2ksfmqlxisnxmyp5r";
libraryHaskellDepends = [
aeson base base-compat-batteries bytestring case-insensitive clock
data-default-class hspec http-client http-media http-types mtl
@@ -182983,24 +187571,26 @@ self: {
"servant-rawm" = callPackage
({ mkDerivation, base, bytestring, doctest, filepath, Glob
, hspec-wai, http-client, http-media, http-types, lens, resourcet
- , servant, servant-client, servant-docs, servant-server, tasty
- , tasty-hspec, tasty-hunit, transformers, wai, wai-app-static, warp
+ , servant, servant-client, servant-client-core, servant-docs
+ , servant-server, tasty, tasty-hspec, tasty-hunit, text
+ , transformers, wai, wai-app-static, warp
}:
mkDerivation {
pname = "servant-rawm";
- version = "0.2.0.2";
- sha256 = "0nkwi6jxwx8hwsf7fazvr9xffjsy99y4pb3ikw27f8ag8dx8frm2";
+ version = "0.3.0.0";
+ sha256 = "09va9glqkyarxsq9296br55ka8j5jd5nlb833hndpf4ib10yxzp9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring filepath http-client http-media http-types lens
- resourcet servant-client servant-docs servant-server wai
- wai-app-static
+ resourcet servant-client servant-client-core servant-docs
+ servant-server wai wai-app-static
];
testHaskellDepends = [
base bytestring doctest Glob hspec-wai http-client http-media
- http-types servant servant-client servant-server tasty tasty-hspec
- tasty-hunit transformers wai warp
+ http-types servant servant-client servant-client-core
+ servant-server tasty tasty-hspec tasty-hunit text transformers wai
+ warp
];
description = "Embed a raw 'Application' in a Servant API";
license = stdenv.lib.licenses.bsd3;
@@ -183041,20 +187631,6 @@ self: {
}) {};
"servant-ruby" = callPackage
- ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
- , text
- }:
- mkDerivation {
- pname = "servant-ruby";
- version = "0.8.0.1";
- sha256 = "07pdz6zdax415virbx30cjbiywlzfwzsaq9426l14zwmgf7pw155";
- libraryHaskellDepends = [ base casing servant-foreign text ];
- testHaskellDepends = [ base doctest QuickCheck ];
- description = "Generate a Ruby client from a Servant API with Net::HTTP";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "servant-ruby_0_8_0_2" = callPackage
({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
, text
}:
@@ -183066,7 +187642,6 @@ self: {
testHaskellDepends = [ base doctest QuickCheck ];
description = "Generate a Ruby client from a Servant API with Net::HTTP";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-scotty" = callPackage
@@ -183102,6 +187677,8 @@ self: {
pname = "servant-server";
version = "0.14.1";
sha256 = "1fnxmy6k0ml11035ac4x2knvpraxpc0g076wx3a9k013xyqi0h02";
+ revision = "1";
+ editedCabalFile = "028vqbmqkc9gjsk34n74ssi0xfn085v26zdvpixgfi5yd7cvfg03";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -183339,27 +187916,25 @@ self: {
}) {};
"servant-swagger" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
- , cabal-doctest, directory, doctest, filepath, hspec
+ ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
+ , Cabal, cabal-doctest, directory, doctest, filepath, hspec
, hspec-discover, http-media, insert-ordered-containers, lens
- , QuickCheck, servant, singleton-bool, swagger2, text, time
- , unordered-containers
+ , QuickCheck, servant, singleton-bool, swagger2, template-haskell
+ , text, time, unordered-containers, utf8-string
}:
mkDerivation {
pname = "servant-swagger";
- version = "1.1.5";
- sha256 = "02m51kgwa2cp72wfq6a96zncywryrnxq778jh2cqmpzjrhml8yjg";
- revision = "5";
- editedCabalFile = "1c160wf4q0jyjg03w7hkwkbz0aprvmvzpwa5m944msik2kbvnyl5";
+ version = "1.1.6";
+ sha256 = "1gx61328ciprc6ps8xzawfj483s28h5z21zmqczqqh3wfvc8h77w";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
- aeson base bytestring hspec http-media insert-ordered-containers
- lens QuickCheck servant singleton-bool swagger2 text
- unordered-containers
+ aeson aeson-pretty base bytestring hspec http-media
+ insert-ordered-containers lens QuickCheck servant singleton-bool
+ swagger2 text unordered-containers
];
testHaskellDepends = [
- aeson aeson-qq base directory doctest filepath hspec lens
- QuickCheck servant swagger2 text time
+ aeson base base-compat directory doctest filepath hspec lens
+ QuickCheck servant swagger2 template-haskell text time utf8-string
];
testToolDepends = [ hspec-discover ];
description = "Generate Swagger specification for your servant API";
@@ -183384,6 +187959,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-swagger-ui_0_3_2_3_19_3" = callPackage
+ ({ mkDerivation, base, bytestring, file-embed-lzma, servant
+ , servant-server, servant-swagger-ui-core, swagger2, text
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui";
+ version = "0.3.2.3.19.3";
+ sha256 = "0s2y6fhm26gzs344ig86nh6d1sy2dxfqpwpgz6c2dcg65jcbbpc7";
+ libraryHaskellDepends = [
+ base bytestring file-embed-lzma servant servant-server
+ servant-swagger-ui-core swagger2 text
+ ];
+ description = "Servant swagger ui";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-swagger-ui-core" = callPackage
({ mkDerivation, base, blaze-markup, bytestring, http-media
, servant, servant-blaze, servant-server, swagger2, text
@@ -183404,16 +187996,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-swagger-ui-core_0_3_2" = callPackage
+ ({ mkDerivation, base, blaze-markup, bytestring, http-media
+ , servant, servant-blaze, servant-server, swagger2, text
+ , transformers, transformers-compat, wai-app-static
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui-core";
+ version = "0.3.2";
+ sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2";
+ libraryHaskellDepends = [
+ base blaze-markup bytestring http-media servant servant-blaze
+ servant-server swagger2 text transformers transformers-compat
+ wai-app-static
+ ];
+ description = "Servant swagger ui core components";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-swagger-ui-jensoleg" = callPackage
({ mkDerivation, base, bytestring, file-embed-lzma, servant
, servant-server, servant-swagger-ui-core, swagger2, text
}:
mkDerivation {
pname = "servant-swagger-ui-jensoleg";
- version = "0.3";
- sha256 = "1ymw2lkfn0bkmddvpmv0ikv45fqac2zidnli8bfyp92jf0b5dnik";
- revision = "2";
- editedCabalFile = "1rghdc3gbwcrp2iz8xaw82y48asbb84fxj574p38pwsb3lwfxrw4";
+ version = "0.3.2";
+ sha256 = "1ybkwa6dyi9v1rcqd0gzl1hqkinkmsqwz0ang0cmsa6d8ym3zmii";
libraryHaskellDepends = [
base bytestring file-embed-lzma servant servant-server
servant-swagger-ui-core swagger2 text
@@ -183428,10 +188037,8 @@ self: {
}:
mkDerivation {
pname = "servant-swagger-ui-redoc";
- version = "0.3.0.1.21.2";
- sha256 = "1p3mq7m5hvid7g7jwpf2jz923512wlprh6gikq5x2vcb14d40qwl";
- revision = "2";
- editedCabalFile = "0am6kh3r8av69n5778rr84k92xifi9gfgsrpfnw2vs9krq94gph8";
+ version = "0.3.2.1.22.2";
+ sha256 = "0d4r6rp48lkgd4903hfja14mlar1h17hrb4fhq05p3wga7kik6g0";
libraryHaskellDepends = [
base bytestring file-embed-lzma servant servant-server
servant-swagger-ui-core swagger2 text
@@ -183516,8 +188123,8 @@ self: {
pname = "servant-yaml";
version = "0.1.0.0";
sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
- revision = "21";
- editedCabalFile = "1xrlhbgh54ny4xiqcdbka7i86wkyyqndwwv3r3k47xdr5683iyc1";
+ revision = "22";
+ editedCabalFile = "1mi52j2c7960k0qmxqd7238yxgbccb0xgfj3ahh0zfckficn9bk7";
libraryHaskellDepends = [
base bytestring http-media servant yaml
];
@@ -183654,7 +188261,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "serverless-haskell_0_7_5" = callPackage
+ "serverless-haskell_0_8_1" = callPackage
({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
, amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
, hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
@@ -183662,8 +188269,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.7.5";
- sha256 = "13l5day4dlwyykwx17v2znyh0ck1paaxjzzawnjklcjzk1rzj0i3";
+ version = "0.8.1";
+ sha256 = "1s5i2l57s0crpk3lysdw0v7kvfx567bhl0v5i18mdsa331bifcpd";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -183976,6 +188583,8 @@ self: {
pname = "set-cover";
version = "0.0.9";
sha256 = "1qbk5y2pg6jlclszd2nras5240r0ahapsibykkcqrxhgq0hgvsxg";
+ revision = "1";
+ editedCabalFile = "0mcg15645maj1ymfrgs9ghi8n3hwwd72441zxcg9gn1w3pq7zsaw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -184000,14 +188609,25 @@ self: {
({ mkDerivation, base, containers, deepseq }:
mkDerivation {
pname = "set-monad";
- version = "0.2.0.0";
- sha256 = "1nxgn8d0qff4s66gcvfrnxjh0aq5q5jk0s453km28457qh946azb";
+ version = "0.3.0.0";
+ sha256 = "0iv1mphhhqla4bbr2lhy6zj8bp963jlcxqkib2nnl7vyw1ya1cd1";
libraryHaskellDepends = [ base containers deepseq ];
description = "Set monad";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "set-of" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "set-of";
+ version = "0.1.0.1";
+ sha256 = "13liv3nh6c8hbkjr119x6zvibkrkah0zslk283d2zl6qw7w7sngm";
+ libraryHaskellDepends = [ base containers ];
+ description = "Sets of fixed size, with typelits";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"set-with" = callPackage
({ mkDerivation, base, containers, invariant, QuickCheck
, quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
@@ -184076,17 +188696,6 @@ self: {
}) {};
"setlocale" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "setlocale";
- version = "1.0.0.6";
- sha256 = "1rl8qb8vzv8fdbczy2dxwgn4cb68lfrjdxf2w8nn9wy1acqzcyjq";
- libraryHaskellDepends = [ base ];
- description = "Haskell bindings to setlocale";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "setlocale_1_0_0_8" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "setlocale";
@@ -184095,7 +188704,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "Haskell bindings to setlocale";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"setoid" = callPackage
@@ -184359,8 +188967,8 @@ self: {
}:
mkDerivation {
pname = "sgd";
- version = "0.3.7";
- sha256 = "1z4w81mbk2syrxacfrjb690ik6lcsh1fb7m3d65zlz37y3pk5q04";
+ version = "0.4.0.1";
+ sha256 = "05ngij0zigjxplw76qaczpd4dmdmqj23h8bfls5cd5s5sbxv5irb";
libraryHaskellDepends = [
base binary bytestring containers deepseq filepath lazy-io logfloat
monad-par mtl primitive random temporary vector
@@ -184550,6 +189158,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shake_0_17" = callPackage
+ ({ mkDerivation, base, binary, bytestring, deepseq, directory
+ , extra, filepath, hashable, heaps, js-flot, js-jquery, primitive
+ , process, QuickCheck, random, time, transformers, unix
+ , unordered-containers, utf8-string
+ }:
+ mkDerivation {
+ pname = "shake";
+ version = "0.17";
+ sha256 = "18nlnxd8vad5vs4399lz1875dvapmk4fimpz3sp4b6z590d68rs1";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base binary bytestring deepseq directory extra filepath hashable
+ heaps js-flot js-jquery primitive process random time transformers
+ unix unordered-containers utf8-string
+ ];
+ executableHaskellDepends = [
+ base binary bytestring deepseq directory extra filepath hashable
+ heaps js-flot js-jquery primitive process random time transformers
+ unix unordered-containers utf8-string
+ ];
+ testHaskellDepends = [
+ base binary bytestring deepseq directory extra filepath hashable
+ heaps js-flot js-jquery primitive process QuickCheck random time
+ transformers unix unordered-containers utf8-string
+ ];
+ description = "Build system library, like Make, but more accurate dependencies";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"shake-ats" = callPackage
({ mkDerivation, base, binary, dependency, directory, hs2ats
, language-ats, microlens, shake, shake-c, shake-cabal, shake-ext
@@ -184557,8 +189198,8 @@ self: {
}:
mkDerivation {
pname = "shake-ats";
- version = "1.9.0.3";
- sha256 = "1c1vphg9vv4lizcsg681wxq5dmvg5fkhp6x15738j7sfbd0k87ja";
+ version = "1.10.1.0";
+ sha256 = "1b5mbb3azjn2wwagciayd5lyb6jd2siwn1l9ispnqrkrh1bqgzb5";
libraryHaskellDepends = [
base binary dependency directory hs2ats language-ats microlens
shake shake-c shake-cabal shake-ext text
@@ -184580,14 +189221,15 @@ self: {
}) {};
"shake-cabal" = callPackage
- ({ mkDerivation, base, Cabal, composition-prelude, directory, shake
+ ({ mkDerivation, base, Cabal, composition-prelude, directory
+ , filepath, shake
}:
mkDerivation {
pname = "shake-cabal";
- version = "0.1.0.4";
- sha256 = "1in3f31pm253vzcds66pa2ddjl983l2w8j3vj52rykg2dynl625q";
+ version = "0.2.0.0";
+ sha256 = "13fzc57jl52c6j1wjmp4z39jwbqrnlwl5l8vxqk6hz814apsd555";
libraryHaskellDepends = [
- base Cabal composition-prelude directory shake
+ base Cabal composition-prelude directory filepath shake
];
description = "Shake library for use with cabal";
license = stdenv.lib.licenses.bsd3;
@@ -184787,8 +189429,8 @@ self: {
}:
mkDerivation {
pname = "shakers";
- version = "0.0.49";
- sha256 = "0zhysqnr5vbmj04ippyipyqpml2zx3av3d5ikprdwksrsjhfgbp3";
+ version = "0.0.50";
+ sha256 = "0n1cr2bn2ar0iifjzmg714wa55r5dr0q8ygrs0lrdvanbg9s0ml6";
libraryHaskellDepends = [
base basic-prelude directory lifted-base shake
];
@@ -184804,8 +189446,8 @@ self: {
}:
mkDerivation {
pname = "shakespeare";
- version = "2.0.15";
- sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23";
+ version = "2.0.19";
+ sha256 = "0h1nmdpizw4bvpkxlnrwq02r3wnk01z4jqid12hp30bi577yqd5l";
libraryHaskellDepends = [
aeson base blaze-html blaze-markup bytestring containers directory
exceptions ghc-prim parsec process scientific template-haskell text
@@ -185174,8 +189816,8 @@ self: {
({ mkDerivation, base, containers, text, unix }:
mkDerivation {
pname = "shell-monad";
- version = "0.6.4";
- sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13";
+ version = "0.6.6";
+ sha256 = "1z3anvjcix25i2zzwnln2hnpzacwiss95xhyc0mclc33v0j5k038";
libraryHaskellDepends = [ base containers text unix ];
description = "shell monad";
license = stdenv.lib.licenses.bsd3;
@@ -185308,6 +189950,8 @@ self: {
pname = "shelly";
version = "1.8.1";
sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y";
+ revision = "1";
+ editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -185387,8 +190031,8 @@ self: {
}:
mkDerivation {
pname = "shikensu";
- version = "0.3.8";
- sha256 = "0sji1lw1ma8js9kylixn694108nv74g8qpbfd198fwqvcqx5jhwh";
+ version = "0.3.11";
+ sha256 = "041hqvlfi28ynfcln80dwm1i5g4pjl7ydx0bys35lw92fl39zxb9";
libraryHaskellDepends = [
aeson base bytestring directory filepath flow Glob text
unordered-containers
@@ -186045,6 +190689,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "simple-affine-space" = callPackage
+ ({ mkDerivation, base, deepseq, directory, filepath, hlint, process
+ , regex-posix
+ }:
+ mkDerivation {
+ pname = "simple-affine-space";
+ version = "0.1";
+ sha256 = "02cy4vnl3fy18dsfxazh60bqgk5c1gw2x460x6i1fb5qysw7q8nh";
+ libraryHaskellDepends = [ base deepseq ];
+ testHaskellDepends = [
+ base directory filepath hlint process regex-posix
+ ];
+ description = "A simple library for affine and vector spaces";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"simple-atom" = callPackage
({ mkDerivation, base, containers, deepseq }:
mkDerivation {
@@ -186093,6 +190753,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "simple-cmd" = callPackage
+ ({ mkDerivation, base, directory, filepath, process }:
+ mkDerivation {
+ pname = "simple-cmd";
+ version = "0.1.1";
+ sha256 = "0y9ga7m3zykrmgfzys6g7k1z79spp2319ln4sayw8i0abpwh63m9";
+ libraryHaskellDepends = [ base directory filepath process ];
+ description = "Simple String-based process commands";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "simple-cmd_0_1_2" = callPackage
+ ({ mkDerivation, base, directory, filepath, process }:
+ mkDerivation {
+ pname = "simple-cmd";
+ version = "0.1.2";
+ sha256 = "10jdyl1ghzczxw5bi8s1694fla42s1aknmj5grxndidwzf95b8g6";
+ libraryHaskellDepends = [ base directory filepath process ];
+ description = "Simple String-based process commands";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"simple-conduit" = callPackage
({ mkDerivation, base, bifunctors, bytestring, CC-delcont
, chunked-data, conduit, conduit-combinators, conduit-extra
@@ -186308,10 +190991,8 @@ self: {
}:
mkDerivation {
pname = "simple-log";
- version = "0.9.6";
- sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn";
- revision = "1";
- editedCabalFile = "0qifmlqxd2pwh5rm7pzfwn6nq09yvjs7nfg8si4b3q7xlgal2sbx";
+ version = "0.9.8";
+ sha256 = "1yn2nnvmzfw4v7bi6jchsd8y27vpd8m4in0shydyyglpjmaq751k";
libraryHaskellDepends = [
async base base-unicode-symbols containers data-default deepseq
directory exceptions filepath hformat microlens microlens-platform
@@ -186352,8 +191033,8 @@ self: {
}:
mkDerivation {
pname = "simple-logging";
- version = "0.2.0.3";
- sha256 = "12ayxv1j2zzql01gka1p8m7pixjh6f87r5hamz3ydcyzn4vrl5j1";
+ version = "0.2.0.5";
+ sha256 = "1xli7ypsqbqv0yx58z0g7fbg5i83rkwwgv65hlx5cpfip4ks3qnn";
libraryHaskellDepends = [
aeson base bytestring directory exceptions filepath hscolour
iso8601-time lens mtl simple-effects string-conv text time uuid
@@ -186458,6 +191139,8 @@ self: {
pname = "simple-pipe";
version = "0.0.0.29";
sha256 = "0ilc781520h1x65x3cqdzp2067g7rf7vdlnss8wsg2x1f5cxs6yh";
+ revision = "1";
+ editedCabalFile = "1bp8dwhympy43g43496vgp6dclbfjibdwgqsild681bn83yprsdz";
libraryHaskellDepends = [
base bytestring lifted-base monad-control monads-tf stm
transformers-base
@@ -186573,8 +191256,8 @@ self: {
({ mkDerivation, base, process }:
mkDerivation {
pname = "simple-smt";
- version = "0.9.1";
- sha256 = "13dg61jdgby49lpdb53anrg39wn8dwgvg6jpn8vh0y8rf2zilq9b";
+ version = "0.9.3";
+ sha256 = "17v8zpiiha8kyb4xbrqdnfibf1dwzf9lbhxj9kffvl948ygxdp8x";
libraryHaskellDepends = [ base process ];
description = "A simple way to interact with an SMT solver process";
license = stdenv.lib.licenses.bsd3;
@@ -186586,8 +191269,8 @@ self: {
}:
mkDerivation {
pname = "simple-sql-parser";
- version = "0.4.3";
- sha256 = "125k5vz05spmyd5gws1sfrqamp4pnbpyim21mvz1vx8avj548xi8";
+ version = "0.4.4";
+ sha256 = "1j1p94mfb7kzrayi39xcwmagxcf5j9lvxi7niqxc5jr70958csnl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl parsec pretty ];
@@ -186729,6 +191412,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "simple-vec3_0_4_0_9" = callPackage
+ ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
+ , QuickCheck, tasty, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "simple-vec3";
+ version = "0.4.0.9";
+ sha256 = "1rx4nifv75lpxrdgq6x3a61d56qp0ln9rhf2d10l2ds049dlq0pz";
+ libraryHaskellDepends = [ base QuickCheck vector ];
+ testHaskellDepends = [
+ base doctest doctest-driver-gen tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ base criterion vector ];
+ description = "Three-dimensional vectors of doubles with basic operations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"simple-zipper" = callPackage
({ mkDerivation, base, hspec, lens }:
mkDerivation {
@@ -186946,10 +191647,10 @@ self: {
({ mkDerivation, base, containers }:
mkDerivation {
pname = "simtreelo";
- version = "0.1.1.3";
- sha256 = "148j6z8rxqaiwfjgxz780fy8w8xv8a8gwida61lfir677jlkwgh9";
+ version = "0.1.1.4";
+ sha256 = "0a8414006gdya8b4dw38251kim3x2i5g7m03ga479ialghralrc8";
libraryHaskellDepends = [ base containers ];
- description = "Loader for data organized in a tree";
+ description = "Load data organized in a tree";
license = stdenv.lib.licenses.gpl3;
}) {};
@@ -186997,6 +191698,8 @@ self: {
pname = "singleton-bool";
version = "0.1.4";
sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581";
+ revision = "1";
+ editedCabalFile = "0ccd49z9xwa8gr8sclmmn0zc4xq39yyjws4zr6lrw3xjql130nsx";
libraryHaskellDepends = [ base ];
description = "Type level booleans";
license = stdenv.lib.licenses.bsd3;
@@ -187018,8 +191721,8 @@ self: {
({ mkDerivation, base, singletons }:
mkDerivation {
pname = "singleton-nats";
- version = "0.4.1";
- sha256 = "1fb87qgh35z31rwzrpclf7d071krffr5vvqr1nwvpgikggfjhlss";
+ version = "0.4.2";
+ sha256 = "1wcwks2acnql5ihkjn2543hgdnlw049z8av8x5dp5r552fq6k0cg";
libraryHaskellDepends = [ base singletons ];
description = "Unary natural numbers relying on the singletons infrastructure";
license = stdenv.lib.licenses.bsd3;
@@ -187056,6 +191759,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "singletons_2_5" = callPackage
+ ({ mkDerivation, base, Cabal, containers, directory, filepath
+ , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden
+ , template-haskell, text, th-desugar, transformers
+ }:
+ mkDerivation {
+ pname = "singletons";
+ version = "2.5";
+ sha256 = "0bk1ad4lk4vc5hw2j4r4nzs655k43v21d2s66hjvp679zxkvzz44";
+ setupHaskellDepends = [ base Cabal directory filepath ];
+ libraryHaskellDepends = [
+ base containers ghc-boot-th mtl pretty syb template-haskell text
+ th-desugar transformers
+ ];
+ testHaskellDepends = [ base filepath process tasty tasty-golden ];
+ description = "A framework for generating singleton types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"singnal" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -187188,8 +191911,8 @@ self: {
}:
mkDerivation {
pname = "sitepipe";
- version = "0.3.0.1";
- sha256 = "1iv0ndllixwn9vj7gqavv1ymfxfxqm4xqqzxqf1y8qiq240b3j6l";
+ version = "0.3.0.2";
+ sha256 = "0f26sqpf8rjrbpk6q9hp0q705hhmhyp71jyj5w9jgq6mnj34rxy8";
libraryHaskellDepends = [
aeson base bytestring containers directory exceptions filepath Glob
lens lens-aeson megaparsec MissingH mtl mustache
@@ -187236,8 +191959,8 @@ self: {
}:
mkDerivation {
pname = "size-based";
- version = "0.1.1.0";
- sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki";
+ version = "0.1.2.0";
+ sha256 = "06hmlic0n73ncwlkpx49xlv09bzsrr27ncnp5byhzlknak2gd7vp";
libraryHaskellDepends = [
base dictionary-sharing template-haskell testing-type-modifiers
];
@@ -187484,12 +192207,15 @@ self: {
pname = "skews";
version = "0.1.0.1";
sha256 = "03dn42hj50g4if1biln8m9rzf54iccqivkdciw06yrvx7q64hi5m";
+ revision = "1";
+ editedCabalFile = "0zvqfr9dfcap3ljpkq5hq95npmhrmndlh0gs4pa2zm8bwrh1nl66";
libraryHaskellDepends = [ base bytestring deque websockets ];
testHaskellDepends = [
async base bytestring deque envy hspec network websockets
];
description = "A very quick-and-dirty WebSocket server";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"skip-list" = callPackage
@@ -187550,8 +192276,8 @@ self: {
}:
mkDerivation {
pname = "skylighting";
- version = "0.7.2";
- sha256 = "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch";
+ version = "0.7.4";
+ sha256 = "0w1cv21rm4ssmr2zbn7bamlfc2pkswxg5plvqzrf7rs4h1y43672";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187574,10 +192300,8 @@ self: {
}:
mkDerivation {
pname = "skylighting-core";
- version = "0.7.2";
- sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq";
- revision = "1";
- editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw";
+ version = "0.7.4";
+ sha256 = "1awddq9cn5gyafz97ir21rncq97k2gzfxijn2xmxw35qhr2kbfl0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187704,8 +192428,8 @@ self: {
}:
mkDerivation {
pname = "slack-web";
- version = "0.2.0.6";
- sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a";
+ version = "0.2.0.7";
+ sha256 = "1jd8ca2d4bhq08ddqv87bnj2wqad89cqmsawvffl8mqki3hrca9x";
libraryHaskellDepends = [
aeson base containers errors http-api-data http-client
http-client-tls megaparsec mtl servant servant-client
@@ -187727,8 +192451,8 @@ self: {
}:
mkDerivation {
pname = "slate";
- version = "0.11.0.0";
- sha256 = "0y6l3cjlh0hkc3nch7fwvxpv2i5r9qv6r1kdi3savi0vp0dvgdy8";
+ version = "0.12.0.0";
+ sha256 = "01qi6k9gcz6y8x8hlvsmm2irfvcsbdqqvzg5kgf2x02idmh9zy1a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187768,15 +192492,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "slave-thread_1_0_2_1" = callPackage
+ "slave-thread_1_0_2_2" = callPackage
({ mkDerivation, base, deferred-folds, foldl, HTF, mmorph
, partial-handler, QuickCheck, quickcheck-instances, rerebase
, SafeSemaphore, stm-containers, transformers
}:
mkDerivation {
pname = "slave-thread";
- version = "1.0.2.1";
- sha256 = "1bnx07zy89ym45bs1dhnwgxls7jz8yv64j5j0wsym3qqzqdk04dh";
+ version = "1.0.2.2";
+ sha256 = "1jf8n989gsxbqkyxj8kd523dxp5bxs9cs4s6jd4j95mvij6pgpgl";
libraryHaskellDepends = [
base deferred-folds foldl mmorph partial-handler stm-containers
transformers
@@ -187827,8 +192551,8 @@ self: {
}:
mkDerivation {
pname = "slick";
- version = "0.1.0.2";
- sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm";
+ version = "0.1.1.0";
+ sha256 = "0gqc9z8w9m1dvsnv7g1rsi367akkzp95w96lvx20sdg1gnzbx5rc";
libraryHaskellDepends = [
aeson base binary bytestring containers lens lens-aeson mustache
pandoc shake text time
@@ -187944,6 +192668,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "slotmap" = callPackage
+ ({ mkDerivation, base, hspec, primitive, vector }:
+ mkDerivation {
+ pname = "slotmap";
+ version = "0.1.0.0";
+ sha256 = "00zc8n1divwak4r0q4ffnij2qxa3902ly7zbipn0zzjmvx5n1rh0";
+ libraryHaskellDepends = [ base primitive vector ];
+ testHaskellDepends = [ base hspec primitive vector ];
+ description = "Pure Haskell slotmap implementation over ST or IO";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"slug" = callPackage
({ mkDerivation, aeson, base, exceptions, hspec, http-api-data
, path-pieces, persistent, QuickCheck, text
@@ -188446,8 +193182,8 @@ self: {
}:
mkDerivation {
pname = "smuggler";
- version = "0.0.1";
- sha256 = "16f2s1gp5ww2ingil60fq5w6ghs3f1cscsl8qn7ibg0jqj0w5q89";
+ version = "0.1.0";
+ sha256 = "0iyisn5s39haik3g1wld67pdpnl8h3zafxhkgyd3ajx9lg9nf741";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -188456,7 +193192,7 @@ self: {
];
executableHaskellDepends = [ base ];
testHaskellDepends = [ base directory filepath ];
- description = "Smuggling";
+ description = "GHC Source Plugin that helps to manage imports";
license = stdenv.lib.licenses.mpl20;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -188621,8 +193357,8 @@ self: {
pname = "snap-core";
version = "1.0.3.2";
sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc";
- revision = "1";
- editedCabalFile = "08ll71h3rv9bppr7xrflg4y627vnmxgfhby1kli9cj0a7ryspam1";
+ revision = "3";
+ editedCabalFile = "0wlhn33r7c9g7j23y006ddq9d87lkmianvvfrbl8jd8mvjvj2gfa";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder case-insensitive
containers directory filepath hashable HUnit io-streams lifted-base
@@ -188699,8 +193435,8 @@ self: {
}:
mkDerivation {
pname = "snap-extras";
- version = "0.12.2.0";
- sha256 = "18d1gfpk2gzvaidb6l13y64540hfyqk5hw6gpx7z495ay1dafdzr";
+ version = "0.12.2.1";
+ sha256 = "0mzvw49v6i77ysdlxfrdva5kn0vj9p5h2br6qlwvhdwqq8269gqp";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -188825,8 +193561,8 @@ self: {
pname = "snap-server";
version = "1.1.0.0";
sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4";
- revision = "1";
- editedCabalFile = "1lyx51zr1cmjyvsfplxpzv87agvvv83v3ww8m01fdh7x31np1chc";
+ revision = "3";
+ editedCabalFile = "0a9d3nqb5rvgm25nak68lp6yj9m6cwhbgdbg5l7ib5i2czcg7yjh";
configureFlags = [ "-fopenssl" ];
isLibrary = true;
isExecutable = true;
@@ -189840,12 +194576,12 @@ self: {
}) {};
"snipcheck" = callPackage
- ({ mkDerivation, base, containers, pandoc, process }:
+ ({ mkDerivation, base, containers, pandoc, process, text }:
mkDerivation {
pname = "snipcheck";
- version = "0.1.0.2";
- sha256 = "15n6dwkkbr7yh1xvl0xj1kba5s3qy4s8zq01px552fm1qqa8wdzk";
- libraryHaskellDepends = [ base containers pandoc process ];
+ version = "0.1.0.3";
+ sha256 = "1x9jjfznvzz9pa4n54q6xja0axifnlgbp9aw93hvcr4w8f94gfp0";
+ libraryHaskellDepends = [ base containers pandoc process text ];
description = "Markdown tester";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -190176,8 +194912,8 @@ self: {
}:
mkDerivation {
pname = "socket-io";
- version = "1.3.10";
- sha256 = "0kq4xk1slgp2c7ik1gvpxwb0kxpwmxy943hxiq4g6bn5a1g3qis2";
+ version = "1.3.11";
+ sha256 = "078zbbhrpfb5a15vr2vjfxdyi1yabd07rg41ajvpcfqcwq4svw95";
libraryHaskellDepends = [
aeson attoparsec base bytestring engine-io mtl stm text
transformers unordered-containers vector
@@ -190345,6 +195081,7 @@ self: {
librarySystemDepends = [ softfloat ];
description = "Haskell bindings for SoftFloat";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {softfloat = null;};
"solga" = callPackage
@@ -190415,12 +195152,15 @@ self: {
}) {};
"solve" = callPackage
- ({ mkDerivation, base, containers }:
+ ({ mkDerivation, base, containers, filepath }:
mkDerivation {
pname = "solve";
- version = "1.0";
- sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq";
- libraryHaskellDepends = [ base containers ];
+ version = "1.1";
+ sha256 = "045bj6wskglwg0j0jk0jsqkp4m809g2fy350bi6m84smg64rr3y4";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers filepath ];
+ executableHaskellDepends = [ base containers filepath ];
description = "Solving simple games";
license = stdenv.lib.licenses.mit;
}) {};
@@ -190446,6 +195186,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "sop-core" = callPackage
+ ({ mkDerivation, base, deepseq }:
+ mkDerivation {
+ pname = "sop-core";
+ version = "0.4.0.0";
+ sha256 = "07ci2mh8cbjvipb576rxsj3iyhkj5c5dnsns4xkdppp2p3pv10d3";
+ libraryHaskellDepends = [ base deepseq ];
+ description = "True Sums of Products";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"sophia" = callPackage
({ mkDerivation, base, binary, bindings-sophia, bytestring
, criterion, directory, tasty, tasty-hunit
@@ -190664,8 +195415,8 @@ self: {
}:
mkDerivation {
pname = "sox";
- version = "0.2.3";
- sha256 = "145dmcj9vj58wrndidarnr7bbkybvzyda88awrxw4p3iqy8s2xb0";
+ version = "0.2.3.1";
+ sha256 = "0idab4rsqj4zjm7dlzbf38rzpvkp1z9psrkl4lrp2qp1s53sp9kh";
libraryHaskellDepends = [
base containers explicit-exception extensible-exceptions process
sample-frame semigroups transformers unix utility-ht
@@ -190675,18 +195426,18 @@ self: {
}) {};
"soxlib" = callPackage
- ({ mkDerivation, base, bytestring, containers, explicit-exception
+ ({ mkDerivation, base, bytestring, explicit-exception
, extensible-exceptions, sample-frame, sox, storablevector
, transformers, utility-ht
}:
mkDerivation {
pname = "soxlib";
- version = "0.0.3";
- sha256 = "12ydbn7l8zfnmbxx4jv551vlfs7cflss5vhgaljwxbzan2z5bd8q";
+ version = "0.0.3.1";
+ sha256 = "0f7ci58yls5rhq1vy1q1imlsgkbvadv8646fvvymg0jq2mjwgsfd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bytestring containers explicit-exception extensible-exceptions
+ base bytestring explicit-exception extensible-exceptions
sample-frame storablevector transformers utility-ht
];
libraryPkgconfigDepends = [ sox ];
@@ -190867,23 +195618,24 @@ self: {
, attoparsec-uri, base, bytestring, deepseq, exceptions
, extractable-singleton, hashable, http-client, http-client-tls
, http-types, list-t, monad-control, monad-control-aligned, mtl
- , nested-routes, path, path-extra, pred-trie, stm, strict, text
- , tmapchan, tmapmvar, transformers, unordered-containers, urlpath
- , uuid, wai, wai-middleware-content-type, wai-transformers
- , websockets, websockets-simple, wuss
+ , nested-routes, path, path-extra, pred-trie, purescript-iso, stm
+ , strict, text, tmapchan, tmapmvar, transformers
+ , unordered-containers, urlpath, uuid, wai
+ , wai-middleware-content-type, wai-transformers, websockets
+ , websockets-simple, wuss
}:
mkDerivation {
pname = "sparrow";
- version = "0.0.2.1";
- sha256 = "1j20536pjp4m26l8zvsaf8wv0vvj0fkwid1nkljl6zkggaqq5b8f";
+ version = "0.0.2.2";
+ sha256 = "0y1s22nfy234jgvvkxc77x0gcrlqb1g5vqni6vdwls6ww9n1jwba";
libraryHaskellDepends = [
aeson aeson-attoparsec async attoparsec attoparsec-uri base
bytestring deepseq exceptions extractable-singleton hashable
http-client http-client-tls http-types list-t monad-control
monad-control-aligned mtl nested-routes path path-extra pred-trie
- stm strict text tmapchan tmapmvar transformers unordered-containers
- urlpath uuid wai wai-middleware-content-type wai-transformers
- websockets websockets-simple wuss
+ purescript-iso stm strict text tmapchan tmapmvar transformers
+ unordered-containers urlpath uuid wai wai-middleware-content-type
+ wai-transformers websockets websockets-simple wuss
];
description = "Unified streaming dependency management for web apps";
license = stdenv.lib.licenses.bsd3;
@@ -191038,10 +195790,10 @@ self: {
}:
mkDerivation {
pname = "spatial-rotations";
- version = "0.1.0.0";
- sha256 = "1315zk74kznhizi7wvd48n0j06d1ja3z16240hv16cbsh14lsxhm";
+ version = "0.1.0.1";
+ sha256 = "02nysw4dbg5l37j83kdybxkrdzgjxn20h3lknnphwz0hr0n489ii";
revision = "1";
- editedCabalFile = "1qsnkxg0r68c675fsvg2wsqkkimlzx9zw92zwmpv69ww42qxrrhy";
+ editedCabalFile = "1g2ib60nhwwdb9fjdnmn7z0bzrsac6xcsl6bs7wi6s5rr991pp1c";
libraryHaskellDepends = [
base linear manifolds-core vector-space
];
@@ -191066,14 +195818,21 @@ self: {
}) {};
"spdx" = callPackage
- ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
+ ({ mkDerivation, base, base-compat, Cabal, containers, QuickCheck
+ , tasty, tasty-quickcheck, transformers
+ }:
mkDerivation {
pname = "spdx";
- version = "0.2.2.0";
- sha256 = "1jxxivxlhzjx4idy69qhqqv37sspqhk3f3i93mydzn8cyhn87aqp";
- libraryHaskellDepends = [ base transformers ];
- testHaskellDepends = [ base tasty tasty-quickcheck ];
- description = "SPDX license expression language";
+ version = "1";
+ sha256 = "1vw6pqj86slgzgbrd6kmsn5xlbxln0cys9qxxa47ypfy4spxmfkd";
+ libraryHaskellDepends = [ base Cabal containers transformers ];
+ testHaskellDepends = [
+ base base-compat Cabal tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base base-compat Cabal QuickCheck tasty-quickcheck
+ ];
+ description = "SPDX license expression language, Extras";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -191182,27 +195941,13 @@ self: {
({ mkDerivation, base, cmdargs, containers, leancheck }:
mkDerivation {
pname = "speculate";
- version = "0.3.2";
- sha256 = "0cf8121hfmyj1jrklf2i1bp2q4517627vgaz1flf363n93jnckfk";
- libraryHaskellDepends = [ base cmdargs containers leancheck ];
- testHaskellDepends = [ base leancheck ];
- benchmarkHaskellDepends = [ base leancheck ];
- description = "discovery of properties about Haskell functions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "speculate_0_3_4" = callPackage
- ({ mkDerivation, base, cmdargs, containers, leancheck }:
- mkDerivation {
- pname = "speculate";
- version = "0.3.4";
- sha256 = "10b6ka8rws62byxi4whncs77hl2jcx6pr3gibbh804v07dnl2dnv";
+ version = "0.3.5";
+ sha256 = "0i7a6mq0f46iihq7kd3a1780pqqhmmdi706c42y4dmmj32nb4v3h";
libraryHaskellDepends = [ base cmdargs containers leancheck ];
testHaskellDepends = [ base leancheck ];
benchmarkHaskellDepends = [ base leancheck ];
description = "discovery of properties about Haskell functions";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"speculation" = callPackage
@@ -191298,6 +196043,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "spherical" = callPackage
+ ({ mkDerivation, base, composition-prelude }:
+ mkDerivation {
+ pname = "spherical";
+ version = "0.1.2.1";
+ sha256 = "0c6c5pf39dd9zpk8g3kcbg6hagsjvxcmqxmfk1imv5fmd2g8cv8p";
+ libraryHaskellDepends = [ base composition-prelude ];
+ description = "Geometry on a sphere";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"sphero" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, mtl
, simple-bluetooth
@@ -191605,6 +196361,8 @@ self: {
pname = "splitmix";
version = "0.0.1";
sha256 = "0bvpx3hnyhz449s2c2mi5h78024yysnqldfwp7m0qr21m41q0v1a";
+ revision = "1";
+ editedCabalFile = "0c38sajdpqcmicdh4lfy6vpg8wnzpiyamvbximdsqs605frs3mqs";
libraryHaskellDepends = [ base deepseq random time ];
testHaskellDepends = [
async base base-compat-batteries bytestring deepseq process random
@@ -191717,8 +196475,8 @@ self: {
}:
mkDerivation {
pname = "spreadsheet";
- version = "0.1.3.7";
- sha256 = "180vv2bka5b97gl1g6vdsri2yrfyy6ivdq4jw98qiw50pz66c2l4";
+ version = "0.1.3.8";
+ sha256 = "0rd7qi6wy17fcz1a6pfqjxl3z816r8p6gyvz4zq85kgkjpkicrv4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -191729,48 +196487,47 @@ self: {
}) {};
"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
+ ({ mkDerivation, aeson, aeson-pretty, array, async, base
+ , base64-bytestring, bcrypt, bytestring, Cabal, case-insensitive
+ , cereal, containers, css-syntax, curl, data-default, directory
+ , extra, file-embed, 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
+ , http-types, lens, memcache, mime-types, mtl, network-uri, nonce
+ , pandoc, pandoc-types, parsec, process, random, random-shuffle
+ , regex-base, regex-pcre, safe, scientific, SHA, split, stm
+ , system-locale, tagsoup, 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
+ , unix-compat, unix-time, unordered-containers, utf8-string, vector
+ , wai, wai-extra, wai-handler-fastcgi, warp, yaml, yeshql-hdbc
}:
mkDerivation {
pname = "sprinkles";
- version = "0.3.5.0";
- sha256 = "1xsq4rxslz53ki9ivjs7chfyqnrdy6q1yn1sb1bf4bcd09255rxn";
+ version = "0.6.0.0";
+ sha256 = "0kc4zg3brys6w7ccih74k4drsrahkbr66islgv1kjqpbkjfh5bk7";
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
+ aeson aeson-pretty array base base64-bytestring bcrypt bytestring
+ Cabal case-insensitive cereal containers css-syntax curl
+ data-default directory extra file-embed filepath ginger Glob
+ hashable HDBC HDBC-mysql HDBC-postgresql HDBC-sqlite3 heredoc
+ hsyslog HTTP http-types lens memcache mime-types mtl network-uri
+ nonce pandoc pandoc-types parsec process random random-shuffle
+ regex-base regex-pcre safe scientific SHA split stm system-locale
+ tagsoup template-haskell text time transformers unix-compat
+ unix-time unordered-containers utf8-string vector wai wai-extra
+ wai-handler-fastcgi warp yaml yeshql-hdbc
];
executableHaskellDepends = [
- base classy-prelude data-default parsec safe
+ async base data-default parsec safe text
];
testHaskellDepends = [
- base classy-prelude data-default directory filepath heredoc
- regex-base regex-pcre tasty tasty-hunit tasty-quickcheck temporary
- wai-extra
+ base data-default directory filepath heredoc regex-base regex-pcre
+ tasty tasty-hunit tasty-quickcheck temporary wai-extra
];
description = "JSON API to HTML website wrapper";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {pandoc-creole = null;};
+ }) {};
"spritz" = callPackage
({ mkDerivation, base, lens, mtl, vector }:
@@ -192170,6 +196927,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "squeal-postgresql_0_4_0_0" = callPackage
+ ({ mkDerivation, aeson, base, binary-parser, bytestring
+ , bytestring-strict-builder, deepseq, doctest, generics-sop, hspec
+ , lifted-base, mmorph, monad-control, mtl, network-ip
+ , postgresql-binary, postgresql-libpq, records-sop, resource-pool
+ , scientific, text, time, transformers, transformers-base
+ , uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "squeal-postgresql";
+ version = "0.4.0.0";
+ sha256 = "10z1rq6jz8g6sv52bh9hjmjsw0pml9m4l04gzi19zxnwa597xk2b";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base binary-parser bytestring bytestring-strict-builder
+ deepseq generics-sop lifted-base mmorph monad-control mtl
+ network-ip postgresql-binary postgresql-libpq records-sop
+ resource-pool scientific text time transformers transformers-base
+ uuid-types vector
+ ];
+ executableHaskellDepends = [
+ base bytestring generics-sop mtl text transformers
+ transformers-base vector
+ ];
+ testHaskellDepends = [
+ base bytestring doctest generics-sop hspec text transformers
+ transformers-base vector
+ ];
+ description = "Squeal PostgreSQL Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"squeeze" = callPackage
({ mkDerivation, base, Cabal, data-default, directory, extra
, factory, filepath, mtl, QuickCheck, random, toolshed
@@ -192592,17 +197383,47 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "stache_2_0_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, criterion
+ , deepseq, directory, file-embed, filepath, hspec, hspec-discover
+ , hspec-megaparsec, megaparsec, mtl, template-haskell, text
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "stache";
+ version = "2.0.1";
+ sha256 = "0awyh8zjvly18s4gnqy4970fj1hr4zpb38lisfy6px42m38g17vk";
+ revision = "1";
+ editedCabalFile = "1mpx4wddn17vki1yz8kq4ra5yzxnrndx8rg8w21lg6cjgvlp81f0";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers deepseq directory filepath
+ megaparsec mtl template-haskell text unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers file-embed hspec hspec-megaparsec
+ megaparsec template-haskell text yaml
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ aeson base criterion deepseq megaparsec text
+ ];
+ 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, base64-bytestring, bindings-uname, bytestring
, Cabal, conduit, conduit-extra, containers, cryptonite
, cryptonite-conduit, deepseq, directory, echo, exceptions, extra
, file-embed, filelock, filepath, fsnotify, generic-deriving
- , gitrev, hackage-security, hashable, hpack, hpc, hspec
- , http-client, http-client-tls, http-conduit, http-types, memory
- , microlens, mintty, monad-logger, mono-traversable, mtl, mustache
+ , hackage-security, hashable, hpack, hpc, hspec, http-client
+ , http-client-tls, http-conduit, http-types, memory, microlens
+ , mintty, monad-logger, mono-traversable, mtl, mustache
, neat-interpolation, network-uri, open-browser
- , optparse-applicative, optparse-simple, path, path-io, persistent
+ , optparse-applicative, path, path-io, persistent
, persistent-sqlite, persistent-template, pretty, primitive
, process, project-template, QuickCheck, regex-applicative-text
, resourcet, retry, rio, semigroups, smallcheck, split, stm, store
@@ -192613,10 +197434,14 @@ self: {
}:
mkDerivation {
pname = "stack";
- version = "1.7.1";
- sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
- revision = "9";
- editedCabalFile = "12gbrnhmci2kpz42x7nwfzcq3syp0z2l14fjcakw8bhjmgd9wp34";
+ version = "1.9.1";
+ sha256 = "0s4n7as8zfs1k1ay0h5rzw6r3q1fhf5fa9w7xrzh4a4p1k09ldhk";
+ revision = "2";
+ editedCabalFile = "0vl61spx2jmq2hzjvvw7a270s3lhg1m7faxlxpd4zkyabpwba9ky";
+ configureFlags = [
+ "-fdisable-git-info" "-fhide-dependency-versions"
+ "-fsupported-build"
+ ];
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -192642,15 +197467,15 @@ self: {
base64-bytestring bindings-uname bytestring Cabal conduit
conduit-extra containers cryptonite cryptonite-conduit deepseq
directory echo exceptions extra file-embed filelock filepath
- fsnotify generic-deriving gitrev hackage-security hashable hpack
- hpc http-client http-client-tls http-conduit http-types memory
+ fsnotify generic-deriving hackage-security hashable hpack hpc
+ http-client http-client-tls http-conduit http-types memory
microlens mintty monad-logger mono-traversable mtl mustache
neat-interpolation network-uri open-browser optparse-applicative
- optparse-simple path path-io persistent persistent-sqlite
- persistent-template pretty primitive process project-template
- regex-applicative-text resourcet retry rio semigroups split stm
- store store-core streaming-commons tar template-haskell temporary
- text text-metrics th-reify-many time tls transformers typed-process
+ path path-io persistent persistent-sqlite persistent-template
+ pretty primitive process project-template regex-applicative-text
+ resourcet retry rio semigroups split stm store store-core
+ streaming-commons tar template-haskell temporary text text-metrics
+ th-reify-many time tls transformers typed-process
unicode-transforms unix unix-compat unliftio unordered-containers
vector yaml zip-archive zlib
];
@@ -192858,6 +197683,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "stack-tag" = callPackage
+ ({ mkDerivation, async, base, containers, directory, hasktags, mtl
+ , optparse-applicative, process, text
+ }:
+ mkDerivation {
+ pname = "stack-tag";
+ version = "0.2.0";
+ sha256 = "08610hacra5sq22addh4fsqz4pwg98576lvwvvi4q8bly4ai23zb";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async base containers directory hasktags mtl process text
+ ];
+ executableHaskellDepends = [
+ async base containers directory hasktags mtl optparse-applicative
+ process text
+ ];
+ description = "Create etags for Haskell projects based on Stack snapshots";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"stack-type" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
@@ -192893,8 +197739,8 @@ self: {
}:
mkDerivation {
pname = "stack2nix";
- version = "0.2";
- sha256 = "103cimrwr8j0b1zjpw195mjkfrgcgkicrpygcc5y82nyrl1cc74f";
+ version = "0.2.1";
+ sha256 = "0rwl6fzxv2ly20mn0pgv63r0ik4zpjigbkc4771ni7zazkxvx1gy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -192909,6 +197755,7 @@ self: {
testHaskellDepends = [ base hspec ];
description = "Convert stack.yaml files into Nix build instructions.";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"stackage" = callPackage
@@ -193242,6 +198089,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "stacked-dag" = callPackage
+ ({ mkDerivation, base, containers, doctest, graphviz
+ , optparse-applicative, text
+ }:
+ mkDerivation {
+ pname = "stacked-dag";
+ version = "0.1.1.0";
+ sha256 = "0bvifa45dlqnyybydi5lbwhhnkqv1bvjdp6fvsmjnsf7mi5m0fq3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers graphviz text ];
+ executableHaskellDepends = [
+ base containers graphviz optparse-applicative text
+ ];
+ testHaskellDepends = [ base containers doctest graphviz text ];
+ description = "Ascii DAG(Directed acyclic graph) for visualization of dataflow";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"staf" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -193530,8 +198396,8 @@ self: {
pname = "statestack";
version = "0.2.0.5";
sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl";
- revision = "2";
- editedCabalFile = "0c10cv107ls0wm7gs3gvknd8a1gqvrkk97frn8lp1ch697mz44rp";
+ revision = "3";
+ editedCabalFile = "0s9v88gcc5wnfj4c6xq86asadmh4y8z8ycv2wz5nwfwfazfgzcy3";
libraryHaskellDepends = [
base mtl transformers transformers-compat
];
@@ -193661,8 +198527,8 @@ self: {
}:
mkDerivation {
pname = "static-text";
- version = "0.2.0.2";
- sha256 = "04sbf0zydgf18ajb20wd8wfbw4gdjmxx3f4h62w0qmafgvrr8w5c";
+ version = "0.2.0.3";
+ sha256 = "189x85skhzms3iydzh4gd5hmklx7ps2skzymls514drg8cz7m7ar";
libraryHaskellDepends = [
base bytestring template-haskell text vector
];
@@ -193714,6 +198580,34 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "statistics_0_15_0_0" = callPackage
+ ({ mkDerivation, aeson, base, base-orphans, binary
+ , data-default-class, deepseq, dense-linear-algebra, erf, HUnit
+ , ieee754, math-functions, monad-par, mwc-random, primitive
+ , QuickCheck, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, vector, vector-algorithms
+ , vector-binary-instances, vector-th-unbox
+ }:
+ mkDerivation {
+ pname = "statistics";
+ version = "0.15.0.0";
+ sha256 = "0wk4pv4fjpqq49vf8zanb9801lbgcbbfhhvlpp3ka6p8jmfc9scm";
+ libraryHaskellDepends = [
+ aeson base base-orphans binary data-default-class deepseq
+ dense-linear-algebra math-functions monad-par mwc-random primitive
+ vector vector-algorithms vector-binary-instances vector-th-unbox
+ ];
+ testHaskellDepends = [
+ aeson base binary dense-linear-algebra erf HUnit ieee754
+ math-functions mwc-random primitive QuickCheck test-framework
+ test-framework-hunit test-framework-quickcheck2 vector
+ vector-algorithms
+ ];
+ description = "A library of statistical types, data, and functions";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"statistics-dirichlet" = callPackage
({ mkDerivation, base, deepseq, hmatrix-special
, nonlinear-optimization, vector
@@ -193836,6 +198730,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "statsdi" = callPackage
+ ({ mkDerivation, base, bytestring, dequeue, ether, hashable, hspec
+ , network, random, stm, tasty, tasty-hspec, template-haskell, time
+ , transformers, transformers-lift, unordered-containers
+ }:
+ mkDerivation {
+ pname = "statsdi";
+ version = "0.2.0.0";
+ sha256 = "1gbaxrvn8ilrj808hplqlibawy9kdmfb5pc2yzzdghmcsjys24g1";
+ revision = "1";
+ editedCabalFile = "02kf7pigkvqsm720l8rn6m3gdjqrdhli5yijsjf8n11mj6k8xrk0";
+ libraryHaskellDepends = [
+ base bytestring dequeue ether hashable network random stm
+ template-haskell time transformers transformers-lift
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring hspec network stm tasty tasty-hspec time
+ ];
+ description = "A lovely [Dog]StatsD implementation";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"status-notifier-item" = callPackage
({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger
, filepath, hslogger, lens, network, optparse-applicative, spool
@@ -194059,6 +198976,8 @@ self: {
pname = "step-function";
version = "0.2";
sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j";
+ revision = "1";
+ editedCabalFile = "03ga9vwaxsf0c73fciavkm925l7lkgya1a6xghyb8ainrav0bfq4";
libraryHaskellDepends = [
base base-compat-batteries containers deepseq QuickCheck
];
@@ -194134,12 +199053,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "stm_2_4_5_0" = callPackage
+ "stm_2_5_0_0" = callPackage
({ mkDerivation, array, base }:
mkDerivation {
pname = "stm";
- version = "2.4.5.0";
- sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri";
+ version = "2.5.0.0";
+ sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr";
libraryHaskellDepends = [ array base ];
description = "Software Transactional Memory";
license = stdenv.lib.licenses.bsd3;
@@ -194193,8 +199112,8 @@ self: {
}:
mkDerivation {
pname = "stm-conduit";
- version = "4.0.0";
- sha256 = "0paapljn7nqfzrx889y0n8sszci38mdiaxkgr0bb00ph9246rr7z";
+ version = "4.0.1";
+ sha256 = "0hhlxvpp7mah8dcvkknh6skx44jfk3092zz2w52zlr255bkmn3p8";
libraryHaskellDepends = [
async base cereal cereal-conduit conduit conduit-extra directory
exceptions monad-loops resourcet stm stm-chans transformers
@@ -194238,15 +199157,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "stm-containers_1_0_1_1" = callPackage
+ "stm-containers_1_1_0_2" = callPackage
({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable
, HTF, list-t, QuickCheck, quickcheck-text, rerebase, stm-hamt
, transformers
}:
mkDerivation {
pname = "stm-containers";
- version = "1.0.1.1";
- sha256 = "16yds93abv9nmrbd5dcwbvmrq2ag0hdprs01khvnn9qg0nqs3lfn";
+ version = "1.1.0.2";
+ sha256 = "1yhivblfxycr2vk09gwg904n6fqkzn5g5rvg3whm40fnabdfa9av";
libraryHaskellDepends = [
base deferred-folds focus hashable list-t stm-hamt transformers
];
@@ -194309,8 +199228,8 @@ self: {
}:
mkDerivation {
pname = "stm-hamt";
- version = "1.1.2.1";
- sha256 = "1xbd1kcmiq1qah8hc3bkzf9wlhwrnf2qlh8rah8dyln0dcwapi6q";
+ version = "1.2.0.2";
+ sha256 = "17ywv40vxclkg2lgl52r3j30r1n0jcvahamcfnr3n5a1lh86149w";
libraryHaskellDepends = [
base deferred-folds focus hashable list-t primitive
primitive-extras transformers
@@ -194347,6 +199266,8 @@ self: {
pname = "stm-lifted";
version = "0.1.1.0";
sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c";
+ revision = "1";
+ editedCabalFile = "0mh0gdfwky4qxyhxrysqj1sr913pffvf420mf8cl9i53fsx4f255";
libraryHaskellDepends = [ base stm transformers ];
description = "Software Transactional Memory lifted to MonadIO";
license = stdenv.lib.licenses.bsd3;
@@ -194413,8 +199334,8 @@ self: {
({ mkDerivation, base, stm }:
mkDerivation {
pname = "stm-split";
- version = "0.0.2";
- sha256 = "01rqf5b75p3np5ym0am98mibmsw6vrqryad5nwjj9h5ci4wa81iw";
+ version = "0.0.2.1";
+ sha256 = "06c41p01x62p79bzwryjxr34l7cj65gl227fwwsvd9l6ihk8grp8";
libraryHaskellDepends = [ base stm ];
description = "TMVars, TVars and TChans with distinguished input and output side";
license = stdenv.lib.licenses.bsd3;
@@ -194708,7 +199629,7 @@ self: {
"store" = callPackage
({ mkDerivation, array, async, base, base-orphans
, base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
- , containers, contravariant, criterion, cryptohash, deepseq
+ , clock, containers, contravariant, criterion, cryptohash, deepseq
, directory, filepath, free, ghc-prim, hashable, hspec
, hspec-smallcheck, integer-gmp, lifted-base, monad-control
, mono-traversable, network, primitive, resourcet, safe, semigroups
@@ -194719,8 +199640,8 @@ self: {
}:
mkDerivation {
pname = "store";
- version = "0.5.0";
- sha256 = "1ivr2pvfja2plhp625wjv9lbd47vmydp33f31ljwdyzqik2j7vij";
+ version = "0.5.0.1";
+ sha256 = "0dpm7752p8lhlwq5nlhqxwq1c5nyi97rnj83j2im3i9wvs2qb3i3";
libraryHaskellDepends = [
array async base base-orphans base64-bytestring bifunctors
bytestring containers contravariant cryptohash deepseq directory
@@ -194733,11 +199654,11 @@ self: {
];
testHaskellDepends = [
array async base base-orphans base64-bytestring bifunctors
- bytestring cereal cereal-vector containers contravariant criterion
- cryptohash deepseq directory filepath free ghc-prim hashable hspec
- hspec-smallcheck integer-gmp lifted-base monad-control
- mono-traversable network primitive resourcet safe semigroups
- smallcheck store-core syb template-haskell text th-lift
+ bytestring cereal cereal-vector clock containers contravariant
+ criterion cryptohash deepseq directory filepath free ghc-prim
+ hashable hspec hspec-smallcheck integer-gmp lifted-base
+ monad-control mono-traversable network primitive resourcet safe
+ semigroups smallcheck store-core syb template-haskell text th-lift
th-lift-instances th-orphans th-reify-many th-utilities time
transformers unordered-containers vector vector-binary-instances
void weigh
@@ -194834,15 +199755,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_25_0" = callPackage
+ "stratosphere_0_26_2" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.25.0";
- sha256 = "0blrdrqhjh3cfddx8y3ra3vzicrcp8zin8fxnjk8hpz546d3a5a4";
+ version = "0.26.2";
+ sha256 = "0f4vqll4bfwrf6hysdnh1gkjl79qcs1pwn3p6224xlqzmajb9hc5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -195048,8 +199969,8 @@ self: {
}:
mkDerivation {
pname = "streaming";
- version = "0.2.1.0";
- sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1";
+ version = "0.2.2.0";
+ sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss";
libraryHaskellDepends = [
base containers ghc-prim mmorph mtl semigroups transformers
transformers-base
@@ -195287,6 +200208,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "streaming-fft" = callPackage
+ ({ mkDerivation, base, contiguous-fft, ghc-prim, prim-instances
+ , primitive, streaming
+ }:
+ mkDerivation {
+ pname = "streaming-fft";
+ version = "0.1.0.1";
+ sha256 = "1bs0wqcns0nn62rw04a1574qakqhflxhsybchf9pzig0gyrj4538";
+ libraryHaskellDepends = [
+ base contiguous-fft ghc-prim prim-instances primitive streaming
+ ];
+ description = "online streaming fft";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"streaming-histogram" = callPackage
({ mkDerivation, base, containers, criterion, tasty, tasty-hunit
, tasty-quickcheck
@@ -195482,6 +200419,8 @@ self: {
pname = "streaming-with";
version = "0.2.2.1";
sha256 = "005krn43z92x1v8w8pgfx489h3livkklgrr7s2i2wijgsz55xp09";
+ revision = "1";
+ editedCabalFile = "0z1jy02hc4k1xv0bd4981cblnm4pr022hakrj6zmi4zds74m9wzm";
libraryHaskellDepends = [
base exceptions managed streaming-bytestring temporary transformers
];
@@ -195512,28 +200451,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "streamly_0_4_1" = callPackage
- ({ mkDerivation, atomic-primops, base, containers, deepseq
+ "streamly_0_5_2" = callPackage
+ ({ mkDerivation, atomic-primops, base, clock, containers, deepseq
, exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
, monad-control, mtl, QuickCheck, random, transformers
, transformers-base
}:
mkDerivation {
pname = "streamly";
- version = "0.4.1";
- sha256 = "0xxkb8vdnbyq5l590wh3ig68xw4ny44aymx4k816cbif2da5w7zy";
+ version = "0.5.2";
+ sha256 = "1pla9356yhf6zv2yz4mh8g1dslzdkkych4jrjyi4rw66frvw0jg6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- atomic-primops base containers exceptions ghc-prim heaps
+ atomic-primops base clock containers exceptions ghc-prim heaps
lockfree-queue monad-control mtl transformers transformers-base
];
testHaskellDepends = [
base containers exceptions hspec mtl QuickCheck random transformers
];
benchmarkHaskellDepends = [
- atomic-primops base containers deepseq exceptions gauge ghc-prim
- heaps lockfree-queue monad-control mtl random transformers
+ atomic-primops base clock containers deepseq exceptions gauge
+ ghc-prim heaps lockfree-queue monad-control mtl random transformers
transformers-base
];
description = "Beautiful Streaming, Concurrent and Reactive Composition";
@@ -195667,8 +200606,8 @@ self: {
({ mkDerivation, base, deepseq }:
mkDerivation {
pname = "strict-concurrency";
- version = "0.2.4.2";
- sha256 = "0vzqhd0sqcs2ci3zw7rm3ydmc9brl2sdc8k3jq47kd9l878xanmz";
+ version = "0.2.4.3";
+ sha256 = "1h2nk5fn6gclzkwn5mbkb7gcqisms8y5m3kr64hd9lska3n39n82";
libraryHaskellDepends = [ base deepseq ];
description = "Strict concurrency abstractions";
license = stdenv.lib.licenses.bsd3;
@@ -195740,8 +200679,8 @@ self: {
}:
mkDerivation {
pname = "strict-types";
- version = "0.1.2";
- sha256 = "0yapmsia9lmgjgvmcpk9m1z6gc63qic6vvnmnxvmh2k9887n41li";
+ version = "0.1.3";
+ sha256 = "0rkycz6fxwqnx5lz3ycmd29402iw8p4896lrmwksphqyl957c0ks";
libraryHaskellDepends = [
array base bytestring containers deepseq hashable text
unordered-containers vector
@@ -196055,6 +200994,8 @@ self: {
pname = "stringsearch";
version = "0.3.6.6";
sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9";
+ revision = "1";
+ editedCabalFile = "0z5pz5dccapz9k39r2zmf056m0x2m2lj3jahhnw3mfxlmps07378";
libraryHaskellDepends = [ array base bytestring containers ];
description = "Fast searching, splitting and replacing of ByteStrings";
license = stdenv.lib.licenses.bsd3;
@@ -196302,8 +201243,8 @@ self: {
}:
mkDerivation {
pname = "structured-cli";
- version = "0.9.4.1";
- sha256 = "15dyr7a122d43ddkadn6syy356yccp0gk087bw5slv80isgp95zi";
+ version = "2.2.0.0";
+ sha256 = "1ia9xbbshzx0p69i8gq3y88qbg60cks52kb6hxm2ylkm7jnzgxzj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -196322,6 +201263,8 @@ self: {
pname = "structured-haskell-mode";
version = "1.1.0";
sha256 = "1d1qv9d8qifcxbxqb6a6j0fsi65lg8sndn7hn2s38hgnxdb7llf5";
+ revision = "1";
+ editedCabalFile = "0z3rd0wpnw9xrz2jrda6n8lg0mnzmgkjrjc48vzdjsf76ysjnfka";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -196446,18 +201389,19 @@ self: {
"stutter" = callPackage
({ mkDerivation, attoparsec, base, bytestring, conduit
- , conduit-combinators, conduit-extra, mtl, optparse-applicative
- , resourcet, snipcheck, tasty, tasty-ant-xml, tasty-hunit, text
+ , conduit-combinators, conduit-extra, exceptions, mtl
+ , optparse-applicative, resourcet, snipcheck, tasty, tasty-ant-xml
+ , tasty-hunit, text
}:
mkDerivation {
pname = "stutter";
- version = "0.1.0.1";
- sha256 = "1s3bwwylbf7mcjzpnl8681aaw92q8kcyp074gns5cazsi0slfzl4";
+ version = "0.1.0.2";
+ sha256 = "1cha46fnx9balwkvwcc5b7irq410mr357rqvw85g91vv8ww209sj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
attoparsec base bytestring conduit conduit-combinators
- conduit-extra mtl resourcet text
+ conduit-extra exceptions mtl resourcet text
];
executableHaskellDepends = [
attoparsec base conduit conduit-combinators optparse-applicative
@@ -196854,27 +201798,32 @@ self: {
}) {};
"summoner" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
- , filepath, generic-deriving, hedgehog, neat-interpolation
- , optparse-applicative, process, relude, tasty, tasty-discover
- , tasty-hedgehog, text, time, tomland
+ ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring
+ , directory, filepath, generic-deriving, gitrev, hedgehog
+ , neat-interpolation, optparse-applicative, process, relude, tasty
+ , tasty-discover, tasty-hedgehog, text, time, tomland
}:
mkDerivation {
pname = "summoner";
- version = "1.0.6";
- sha256 = "0sb877846l34qp2cjl7gayb517fi5igf9vcmksryasnjxlbhs7vx";
+ version = "1.1.0.1";
+ sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83";
+ revision = "1";
+ editedCabalFile = "1r98ypwda43kb5rqzl4jgrbmmvw4wambpp6bmbximjv2glkz13x7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson ansi-terminal base bytestring directory filepath
- generic-deriving neat-interpolation optparse-applicative process
- relude text time tomland
+ aeson ansi-terminal base-noprelude bytestring directory filepath
+ generic-deriving gitrev neat-interpolation optparse-applicative
+ process relude text time tomland
+ ];
+ executableHaskellDepends = [ base-noprelude relude ];
+ testHaskellDepends = [
+ base-noprelude hedgehog relude tasty tasty-hedgehog tomland
];
- executableHaskellDepends = [ base relude ];
- testHaskellDepends = [ base hedgehog relude tasty tasty-hedgehog ];
testToolDepends = [ tasty-discover ];
description = "Tool for creating completely configured production Haskell projects";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"sump" = callPackage
@@ -196988,28 +201937,27 @@ self: {
"super-user-spark" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
, filepath, genvalidity, genvalidity-hspec, genvalidity-hspec-aeson
- , genvalidity-path, hashable, hspec, hspec-core, HUnit, iostring
- , mtl, optparse-applicative, parsec, path, path-io, process
- , QuickCheck, text, transformers, unix, validity, validity-path
+ , genvalidity-path, hashable, hspec, hspec-core, mtl
+ , optparse-applicative, parsec, path, path-io, process, QuickCheck
+ , text, transformers, unix, validity, validity-path
}:
mkDerivation {
pname = "super-user-spark";
- version = "0.4.0.0";
- sha256 = "1yk0kkp9rj63m7vqvki7zs3l8r5da8as7hpw1l6qk2gf74lpkfdy";
+ version = "0.4.0.1";
+ sha256 = "0pxkvc1vjarh4p5rqnai6nlsqxv9as8jvqs2vpywl1525nsfyvy5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty base bytestring directory filepath hashable
- iostring mtl optparse-applicative parsec path path-io process text
- unix validity validity-path
+ aeson aeson-pretty base bytestring directory filepath hashable mtl
+ optparse-applicative parsec path path-io process text unix validity
+ validity-path
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
aeson aeson-pretty base bytestring directory filepath genvalidity
genvalidity-hspec genvalidity-hspec-aeson genvalidity-path hashable
- hspec hspec-core HUnit iostring mtl optparse-applicative parsec
- path path-io process QuickCheck text transformers unix validity
- validity-path
+ hspec hspec-core mtl optparse-applicative parsec path path-io
+ process QuickCheck text transformers unix validity validity-path
];
description = "Configure your dotfile deployment with a DSL";
license = stdenv.lib.licenses.mit;
@@ -197265,15 +202213,17 @@ self: {
"sv" = callPackage
({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava
- , contravariant, hedgehog, hw-dsv, lens, Only, parsers
- , semigroupoids, semigroups, sv-core, tasty, tasty-hedgehog
- , tasty-hunit, text, transformers, trifecta, utf8-string
- , validation, vector
+ , contravariant, criterion, deepseq, hedgehog, hw-dsv, lens, Only
+ , parsers, semigroupoids, semigroups, sv-core, tasty
+ , tasty-hedgehog, tasty-hunit, text, transformers, trifecta
+ , utf8-string, validation, vector
}:
mkDerivation {
pname = "sv";
- version = "1.1.1";
- sha256 = "1d4f7l2k8vpskwf6iywfj7ivmfhdk2b10c9k8qrk6lms2mx0mwmh";
+ version = "1.2";
+ sha256 = "148d8jircfyrp0y2rqchs1k3kfmis3bdvc6rib39fkbj699pyw2s";
+ revision = "2";
+ editedCabalFile = "1aa4pxzqyk3xqqadi52aa257h7440jawws9mh9l02qswypn87jq4";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring contravariant hw-dsv
semigroupoids sv-core transformers utf8-string validation
@@ -197283,6 +202233,10 @@ self: {
semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text
trifecta utf8-string validation vector
];
+ benchmarkHaskellDepends = [
+ attoparsec base bytestring criterion deepseq hw-dsv lens text
+ vector
+ ];
description = "Encode and decode separated values (CSV, PSV, ...)";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -197294,10 +202248,8 @@ self: {
}:
mkDerivation {
pname = "sv-cassava";
- version = "0.2";
- sha256 = "01bhh3b85gsbgm3fb0ppb1ihcm2p0rkv6bsmw16l3b2jgj806zin";
- revision = "1";
- editedCabalFile = "1manx0gs4rzsrg9mg83g7ipv36bplxl466c2ypf5dx5f2pn1xvjx";
+ version = "0.3";
+ sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b";
libraryHaskellDepends = [
attoparsec base bytestring cassava sv-core utf8-string validation
vector
@@ -197319,8 +202271,8 @@ self: {
}:
mkDerivation {
pname = "sv-core";
- version = "0.2.2";
- sha256 = "08wd9ajzzhkqg5ghqr3vilq1w8h8vypd3yy63ql6amnqdnjw02mf";
+ version = "0.3";
+ sha256 = "12mjv13rgix4h064ch01hbmkxxz7dp69nazpksvj1fjx16m5dvw6";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
deepseq lens mtl parsec profunctors readable semigroupoids
@@ -197342,8 +202294,8 @@ self: {
}:
mkDerivation {
pname = "sv-svfactor";
- version = "0.1";
- sha256 = "0j97va25p30x3q07084mbv4lsls6p2yky8y7zmf9w6i7i42r3bi0";
+ version = "0.2";
+ sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb";
libraryHaskellDepends = [
base bytestring lens profunctors sv-core svfactor validation
];
@@ -197383,6 +202335,8 @@ self: {
pname = "svg-builder";
version = "0.1.1";
sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g";
+ revision = "1";
+ editedCabalFile = "1bhp9gvid2iis411k1vvyj5krzc4ahxcqcd9cwx9h37jxg180xw1";
libraryHaskellDepends = [
base blaze-builder bytestring hashable text unordered-containers
];
@@ -197413,8 +202367,8 @@ self: {
}:
mkDerivation {
pname = "svg-tree";
- version = "0.6.2.2";
- sha256 = "1iva5vb76z2laygvlh31zbhhcfzympk9s765499j7p356ycl0s1s";
+ version = "0.6.2.3";
+ sha256 = "0snvv2l7fpj7nl1sxnpxz5h2xpskjxxl0l2c7bqkwhcj7571br99";
libraryHaskellDepends = [
attoparsec base bytestring containers JuicyPixels lens linear mtl
scientific text transformers vector xml
@@ -197642,19 +202596,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "swagger2_2_3" = callPackage
- ({ mkDerivation, aeson, aeson-qq, base, base-compat-batteries
- , bytestring, Cabal, cabal-doctest, containers, doctest
- , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
- , HUnit, insert-ordered-containers, lens, mtl, network, QuickCheck
+ "swagger2_2_3_0_1" = callPackage
+ ({ mkDerivation, aeson, base, base-compat-batteries, bytestring
+ , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob
+ , hashable, hspec, hspec-discover, http-media, HUnit
+ , insert-ordered-containers, lens, mtl, network, QuickCheck
, quickcheck-instances, scientific, template-haskell, text, time
, transformers, transformers-compat, unordered-containers
- , uuid-types, vector
+ , utf8-string, uuid-types, vector
}:
mkDerivation {
pname = "swagger2";
- version = "2.3";
- sha256 = "0r1bkx667727h4wvcq1l6295c78s24s6qk9p62jdiafq3844bwm3";
+ version = "2.3.0.1";
+ sha256 = "1l8piv2phl8kq3rgna8wld80b569vazqk2ll1rgs5iakm42lxr1f";
+ revision = "2";
+ editedCabalFile = "0dfxf47mzzb5rmln2smsk0qx53kj1lc3a087r52g2rzz6971zivb";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson base base-compat-batteries bytestring containers generics-sop
@@ -197663,10 +202619,10 @@ self: {
transformers-compat unordered-containers uuid-types vector
];
testHaskellDepends = [
- aeson aeson-qq base base-compat-batteries bytestring containers
- doctest Glob hashable hspec HUnit insert-ordered-containers lens
- mtl QuickCheck quickcheck-instances text time unordered-containers
- vector
+ aeson base base-compat-batteries bytestring containers doctest Glob
+ hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+ quickcheck-instances template-haskell text time
+ unordered-containers utf8-string vector
];
testToolDepends = [ hspec-discover ];
description = "Swagger 2.0 data model";
@@ -197798,8 +202754,8 @@ self: {
}:
mkDerivation {
pname = "sws";
- version = "0.4.2.0";
- sha256 = "0bwfpw348g167a195f8g4cp3h553hkanm6s67bairhn8qprh8az4";
+ version = "0.4.3.0";
+ sha256 = "0zwh7az9pgsgvx9wbjnz8lzy2v8lrkkwv3h72jfy5sj50xylrzbr";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -197857,8 +202813,8 @@ self: {
}:
mkDerivation {
pname = "syb-with-class";
- version = "0.6.1.9";
- sha256 = "1apvvzzc19lbchmbginmhxzcrvrcg76dvdgsk51pxrnr4glnva86";
+ version = "0.6.1.10";
+ sha256 = "0fhkxzcvalaqv554cmjmc56b3h7vxai3k2dd1fsp7ca124ikyzm7";
libraryHaskellDepends = [
array base bytestring containers template-haskell
];
@@ -197956,8 +202912,8 @@ self: {
}:
mkDerivation {
pname = "symantic";
- version = "6.3.1.20180213";
- sha256 = "16bbby4lcyna842gvf95ss8fvsp5kgzpn996yxzv3jjhxg00ls5d";
+ version = "6.3.2.20180208";
+ sha256 = "1a6ifwhrn35wfx0lf2gbq203rb882p7hl0yji7rwfrvxrp4ax518";
libraryHaskellDepends = [
base containers mono-traversable symantic-document symantic-grammar
text transformers
@@ -197966,13 +202922,33 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "symantic-cli" = callPackage
+ ({ mkDerivation, base, containers, megaparsec, symantic-document
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "symantic-cli";
+ version = "0.0.0.20180410";
+ sha256 = "0025rgjjz198sh6gb8zzy7283pnb6vza3q3d7x5xl27c77mpivpx";
+ libraryHaskellDepends = [
+ base containers megaparsec symantic-document text transformers
+ ];
+ description = "Library for Command Line Interface (CLI)";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"symantic-document" = callPackage
- ({ mkDerivation, ansi-terminal, base, text }:
+ ({ mkDerivation, ansi-terminal, base, containers, tasty
+ , tasty-hunit, text, transformers
+ }:
mkDerivation {
pname = "symantic-document";
- version = "0.0.0.20180213";
- sha256 = "0f3rr8117cr78nkcw7kpddcpisbmvsyw03ym7cq6ms0z8zqynwpm";
- libraryHaskellDepends = [ ansi-terminal base text ];
+ version = "0.1.2.20180831";
+ sha256 = "1vlxgn9gdd03azqf2csxjiyqsplg68wv3qr6d08zj5dvqskz27by";
+ libraryHaskellDepends = [ ansi-terminal base text transformers ];
+ testHaskellDepends = [
+ base containers tasty tasty-hunit text transformers
+ ];
description = "Document symantics";
license = stdenv.lib.licenses.gpl3;
}) {};
@@ -197983,8 +202959,8 @@ self: {
}:
mkDerivation {
pname = "symantic-grammar";
- version = "0.3.0.20180213";
- sha256 = "0kqy27c4ix16v7n7zqhc57alrg1n1xksdf7ijsbvpjs4597vpwih";
+ version = "0.3.1.20180831";
+ sha256 = "0n2x5sb5gv9lkhfmq9yfjxfk6q19h71xqbskkg7ar8nglz0jhldp";
libraryHaskellDepends = [ base text ];
testHaskellDepends = [
base megaparsec tasty tasty-hunit text transformers
@@ -198000,8 +202976,8 @@ self: {
}:
mkDerivation {
pname = "symantic-lib";
- version = "0.0.3.20180213";
- sha256 = "17y4rmw9l4j3j9g2i60las3q6y7rlklzr48xr8arkhi0i5zi1qw2";
+ version = "0.0.4.20180831";
+ sha256 = "1agqlz7drckjm8a2swvqiryy7y6kdahq8d24rwkbzn3nw1bnyvk1";
libraryHaskellDepends = [
base containers mono-traversable symantic symantic-grammar text
transformers
@@ -198022,8 +202998,8 @@ self: {
pname = "symbol";
version = "0.2.4";
sha256 = "0cc8kdm68pirb0s7n46v0yvw5b718qf7qip40jkg5q3c3xsafx6h";
- revision = "1";
- editedCabalFile = "01ab7600ja88wfvg9x8zmxksw44j9klmm71y9zmig7qxs1qslb25";
+ revision = "2";
+ editedCabalFile = "0jdbaap11pkgb6m98v57k7qnx62pqxy7pa2i7293ywa4q305qgm1";
libraryHaskellDepends = [ base containers deepseq ];
description = "A 'Symbol' type for fast symbol comparison";
license = stdenv.lib.licenses.bsd3;
@@ -198449,8 +203425,8 @@ self: {
}:
mkDerivation {
pname = "synthesizer-core";
- version = "0.8.2";
- sha256 = "0r8lik2gmaxn1ay0wyjvq2r51jb8vy99hypvrnhbc6hsjybdh8aa";
+ version = "0.8.2.1";
+ sha256 = "1sdvqabxlgiqqb3kppxwyvmkmvcqrmrzicbmcmy6mr5c4npjxffj";
libraryHaskellDepends = [
array base binary bytestring containers deepseq event-list
explicit-exception filepath non-empty non-negative numeric-prelude
@@ -198497,8 +203473,8 @@ self: {
}:
mkDerivation {
pname = "synthesizer-filter";
- version = "0.4.1";
- sha256 = "1gbyb50lj5k69vn316lzb27jx5l2p8jn90b4k6zlqb050sp9c26s";
+ version = "0.4.1.1";
+ sha256 = "0130y7v7r6fhclyg4fg4jj07x1lvn8cvh40w43m2j3sdcmzaa25a";
libraryHaskellDepends = [
base containers numeric-prelude numeric-quest synthesizer-core
transformers utility-ht
@@ -198564,8 +203540,8 @@ self: {
}:
mkDerivation {
pname = "synthesizer-midi";
- version = "0.6.1";
- sha256 = "02z6sywk047vn2is9fq9nr4agdy9xis9ydbl15pmrb0vlmvpx3qr";
+ version = "0.6.1.1";
+ sha256 = "1f57i0lz8wy9kz6qkpbrpywlf0lxwq44yqgzc9kgrb4gy97p0cm5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -198706,8 +203682,8 @@ self: {
}:
mkDerivation {
pname = "system-fileio";
- version = "0.3.16.3";
- sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i";
+ version = "0.3.16.4";
+ sha256 = "1iy6g1f35gzyj12g9mdiw4zf75mmxpv1l8cyaldgyscsl648pr9l";
libraryHaskellDepends = [
base bytestring system-filepath text time unix
];
@@ -199070,6 +204046,8 @@ self: {
pname = "tabl";
version = "1.0.3";
sha256 = "1pxh6g1xjbp37fsab3hl2ldrpnbxdnp4s7pcr3mqxv62qi9b3m2f";
+ revision = "1";
+ editedCabalFile = "15zmgsylfmm8pf355i0ph1dcczy0z6jw0d9dh4xfmfba8ailvcdg";
libraryHaskellDepends = [ base safe text ];
description = "Table layout";
license = "unknown";
@@ -199326,8 +204304,8 @@ self: {
}:
mkDerivation {
pname = "tagchup";
- version = "0.4.1";
- sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j";
+ version = "0.4.1.1";
+ sha256 = "127ffhggdcbapizddhzwy538h3znppvr28mh9y2lv9ihbwcfxd75";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -199570,8 +204548,8 @@ self: {
}:
mkDerivation {
pname = "tagset-positional";
- version = "0.3.0";
- sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf";
+ version = "0.3.1";
+ sha256 = "1fhc0qzfqs2jw8lr8j7vsx72dv15vsvnvqvbim5jqjmq43f8h1zv";
libraryHaskellDepends = [
base binary containers parsec text text-binary
];
@@ -199597,8 +204575,8 @@ self: {
}:
mkDerivation {
pname = "tagsoup";
- version = "0.14.6";
- sha256 = "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb";
+ version = "0.14.7";
+ sha256 = "09gcy5fd5nsk1b7zdrf7yb329fyr8hq5apd6w3cyh3nxd60z504r";
libraryHaskellDepends = [ base bytestring containers text ];
testHaskellDepends = [
base bytestring deepseq directory process QuickCheck time
@@ -199979,6 +204957,8 @@ self: {
pname = "tar";
version = "0.5.1.0";
sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8";
+ revision = "1";
+ editedCabalFile = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x";
libraryHaskellDepends = [
array base bytestring containers deepseq directory filepath time
];
@@ -200001,8 +204981,33 @@ self: {
}:
mkDerivation {
pname = "tar-conduit";
- version = "0.2.3.1";
- sha256 = "0z108pzvh4r87dykapxl36bhby4jhkya53dy2pglb891m54wswpc";
+ version = "0.2.5";
+ sha256 = "0gnklkw9qv496m8nxm1mlfddyiw8c5lsj5pcshxv7c6rv9n3vva3";
+ libraryHaskellDepends = [
+ base bytestring conduit conduit-combinators directory filepath
+ safe-exceptions text unix
+ ];
+ testHaskellDepends = [
+ base bytestring conduit conduit-combinators conduit-extra
+ containers deepseq directory filepath hspec QuickCheck weigh
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring conduit conduit-combinators containers criterion
+ deepseq directory filepath hspec
+ ];
+ description = "Extract and create tar files using conduit for streaming";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "tar-conduit_0_3_0" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+ , conduit-extra, containers, criterion, deepseq, directory
+ , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh
+ }:
+ mkDerivation {
+ pname = "tar-conduit";
+ version = "0.3.0";
+ sha256 = "0g35wiqn0bi31sqnzknq90iy265c7lw15rkyrzc6c2vp6nl86j08";
libraryHaskellDepends = [
base bytestring conduit conduit-combinators directory filepath
safe-exceptions text unix
@@ -200017,6 +205022,7 @@ self: {
];
description = "Extract and create tar files using conduit for streaming";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tardis" = callPackage
@@ -200175,8 +205181,8 @@ self: {
}:
mkDerivation {
pname = "tasty";
- version = "1.1.0.3";
- sha256 = "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22";
+ version = "1.1.0.4";
+ sha256 = "1gzf1gqi5p78m8rc21g9a8glc69r68igxr9n4qn4bs6wqyi3ykiv";
libraryHaskellDepends = [
ansi-terminal async base clock containers mtl optparse-applicative
stm tagged unbounded-delays unix wcwidth
@@ -200266,6 +205272,8 @@ self: {
pname = "tasty-expected-failure";
version = "0.11.1.1";
sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji";
+ revision = "1";
+ editedCabalFile = "1b3fn7d3zwhhwm3gp8cmmsdcrvn9dhshd665xrx1mk6cmy4m8k16";
libraryHaskellDepends = [ base tagged tasty ];
description = "Mark tasty tests as failure expected";
license = stdenv.lib.licenses.mit;
@@ -200335,8 +205343,8 @@ self: {
pname = "tasty-hedgehog";
version = "0.2.0.0";
sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
- revision = "4";
- editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
+ revision = "5";
+ editedCabalFile = "1ykmjb00whqq1hap4l8d4187qflxi6xdnm86czxrzmz4l3lj33gr";
libraryHaskellDepends = [ base hedgehog tagged tasty ];
testHaskellDepends = [
base hedgehog tasty tasty-expected-failure
@@ -200354,6 +205362,8 @@ self: {
pname = "tasty-hedgehog-coverage";
version = "0.1.0.0";
sha256 = "1d2hnhkpk71k0xjw63jsn6fa4ih01xqn4dgdbflp6yrs0zw6p95c";
+ revision = "1";
+ editedCabalFile = "1p3d9w24q39fnljv9m5a8anpv3j3cvazbca4d3hqrjx5w06ik42f";
libraryHaskellDepends = [
base containers hedgehog mtl tagged tasty tasty-hedgehog text
transformers wl-pprint-annotated
@@ -200373,8 +205383,8 @@ self: {
pname = "tasty-hspec";
version = "1.1.5";
sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v";
- revision = "1";
- editedCabalFile = "0zgbcrahzfg37bnni6fj0qb0fpbk5rdha589mh960d5sbq58pljf";
+ revision = "3";
+ editedCabalFile = "14198y7w9y4h36b6agzmsyappkhz4gmmi6nlzj137z5siwic7igm";
libraryHaskellDepends = [
base hspec hspec-core QuickCheck tasty tasty-quickcheck
tasty-smallcheck
@@ -200508,6 +205518,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "tasty-leancheck" = callPackage
+ ({ mkDerivation, base, leancheck, tasty }:
+ mkDerivation {
+ pname = "tasty-leancheck";
+ version = "0.0.1";
+ sha256 = "06nki1l05hh5r0q2lkn4rmj0cl8hz7r7zc71r64fx2k9z65n5497";
+ libraryHaskellDepends = [ base leancheck tasty ];
+ testHaskellDepends = [ base leancheck tasty ];
+ description = "LeanCheck support for the Tasty test framework";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"tasty-lens" = callPackage
({ mkDerivation, base, lens, smallcheck, smallcheck-lens, tasty
, tasty-smallcheck
@@ -200563,8 +205585,8 @@ self: {
}:
mkDerivation {
pname = "tasty-rerun";
- version = "1.1.12";
- sha256 = "05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8";
+ version = "1.1.13";
+ sha256 = "1lf7i3ifszvghy0v1ahgif08bb1pgf7hhf147yr43d0r0hb2vrgp";
libraryHaskellDepends = [
base containers mtl optparse-applicative reducers split stm tagged
tasty transformers
@@ -200581,8 +205603,8 @@ self: {
}:
mkDerivation {
pname = "tasty-silver";
- version = "3.1.11";
- sha256 = "1rvky2661s77wnm8c0jh0hkp3jjp5c1vndv9ilg4s47kw77708az";
+ version = "3.1.12";
+ sha256 = "0s6cz0z8xmhc3gqyb68lkx0j94kagbdgc5gagknmfj6an2i33fly";
libraryHaskellDepends = [
ansi-terminal async base bytestring containers deepseq directory
filepath mtl optparse-applicative process process-extras regex-tdfa
@@ -200659,8 +205681,8 @@ self: {
({ mkDerivation, base, tasty, tasty-hunit }:
mkDerivation {
pname = "tasty-travis";
- version = "0.2.0.1";
- sha256 = "05k9zddmhbcs2xf9n6ln3591cscxix7pakc42j4arw4iwrfiqp17";
+ version = "0.2.0.2";
+ sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg";
libraryHaskellDepends = [ base tasty ];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Fancy Travis CI output for tasty tests";
@@ -201195,12 +206217,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "template-haskell_2_13_0_0" = callPackage
+ "template-haskell_2_14_0_0" = callPackage
({ mkDerivation, base, ghc-boot-th, pretty }:
mkDerivation {
pname = "template-haskell";
- version = "2.13.0.0";
- sha256 = "0j61d0xnlsywgn33k72a6dmnp9i93zjn0gba1fhxs9qwdb1xcfk3";
+ version = "2.14.0.0";
+ sha256 = "1y8l2g95mhd2j09bq05q2rj6rn2ni86yhf4kgha3y5qig7j8lyy9";
libraryHaskellDepends = [ base ghc-boot-th pretty ];
description = "Support library for Template Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -201566,7 +206588,6 @@ self: {
];
description = "TensorFlow bindings";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libtensorflow;};
"tensorflow-core-ops" = callPackage
@@ -201587,7 +206608,6 @@ self: {
];
description = "Haskell wrappers for Core Tensorflow Ops";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-logging" = callPackage
@@ -201616,7 +206636,6 @@ self: {
];
description = "TensorBoard related functionality";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-mnist" = callPackage
@@ -201669,7 +206688,6 @@ self: {
];
description = "Code generation for TensorFlow operations";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-ops" = callPackage
@@ -201699,7 +206717,6 @@ self: {
];
description = "Friendly layer around TensorFlow bindings";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-proto" = callPackage
@@ -201717,7 +206734,6 @@ self: {
libraryToolDepends = [ protobuf ];
description = "TensorFlow protocol buffers";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) protobuf;};
"tensorflow-records" = callPackage
@@ -201763,14 +206779,26 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "tensors" = callPackage
+ ({ mkDerivation, base, hspec, QuickCheck, singletons, vector }:
+ mkDerivation {
+ pname = "tensors";
+ version = "0.1.0";
+ sha256 = "1kwj1ii70cazw64yhhhkcby4kqjm21zzncdr4av0majr07kcbaz5";
+ libraryHaskellDepends = [ base singletons vector ];
+ testHaskellDepends = [ base hspec QuickCheck singletons vector ];
+ description = "Tensor in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"term-rewriting" = callPackage
({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit
, mtl, multiset, parsec, QuickCheck, union-find-array
}:
mkDerivation {
pname = "term-rewriting";
- version = "0.2.1.1";
- sha256 = "0kp6hwlki99aqi4dmm0xp26y9f6zqbxz4a9ch27nyfxg283jmsl1";
+ version = "0.3.0.1";
+ sha256 = "0fa2yqdhw93r7byx47z050sq2yc0arfsvwnzl4jp1vyhdzarfwqd";
libraryHaskellDepends = [
ansi-wl-pprint array base containers mtl multiset parsec
union-find-array
@@ -201787,6 +206815,8 @@ self: {
pname = "termbox";
version = "0.1.0";
sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa";
+ revision = "1";
+ editedCabalFile = "0qwab9ayd9b8gmcnvy6pbbp16vwnqdzji9qi71jmgvviayqdlly5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base ];
@@ -201953,7 +206983,6 @@ self: {
];
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {gtk3 = pkgs.gnome3.gtk;};
"termplot" = callPackage
@@ -202121,6 +207150,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "test-framework-leancheck" = callPackage
+ ({ mkDerivation, base, leancheck, test-framework }:
+ mkDerivation {
+ pname = "test-framework-leancheck";
+ version = "0.0.1";
+ sha256 = "0bwzc0vq28cmy5r966jxhacijd2hkna4magd9aw5wz34dcp4qv13";
+ libraryHaskellDepends = [ base leancheck test-framework ];
+ testHaskellDepends = [ base leancheck test-framework ];
+ description = "LeanCheck support for test-framework";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"test-framework-program" = callPackage
({ mkDerivation, base, directory, process, test-framework }:
mkDerivation {
@@ -202154,10 +207195,8 @@ self: {
}:
mkDerivation {
pname = "test-framework-quickcheck2";
- version = "0.3.0.4";
- sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
- revision = "1";
- editedCabalFile = "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff";
+ version = "0.3.0.5";
+ sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9";
libraryHaskellDepends = [
base extensible-exceptions QuickCheck random test-framework
];
@@ -202285,8 +207324,8 @@ self: {
}:
mkDerivation {
pname = "test-karya";
- version = "0.0.2";
- sha256 = "16vrpp8qilhfk47fmcvbvdjfgzjh878kn1d4cq0bacihkv79zmf3";
+ version = "0.0.3";
+ sha256 = "1z9zyva8cqrz04ckg7dny297jp5k961nk1l7pp9kz8z78pd7p19q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -202636,8 +207675,8 @@ self: {
}:
mkDerivation {
pname = "texmath";
- version = "0.11.0.1";
- sha256 = "11dc09hfnyfsz20ch2c867w0zdgjkzq41506lm61i3dk87ngdisf";
+ version = "0.11.1.2";
+ sha256 = "1wac48qlcwrfm5j1yng27929iqnj2x0zkj7ffrwkj3rchf0i4grp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -202660,6 +207699,8 @@ self: {
pname = "texrunner";
version = "0.0.1.2";
sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy";
+ revision = "1";
+ editedCabalFile = "137bbyxrrg9yn1060aqkamdk1mb7x12nwndradwp57057ix79fp4";
libraryHaskellDepends = [
attoparsec base bytestring directory filepath io-streams mtl
process semigroups temporary
@@ -202671,7 +207712,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "text_1_2_3_0" = callPackage
+ "text_1_2_3_1" = callPackage
({ mkDerivation, array, base, binary, bytestring, deepseq
, directory, ghc-prim, HUnit, integer-gmp, QuickCheck
, quickcheck-unicode, random, test-framework, test-framework-hunit
@@ -202679,8 +207720,8 @@ self: {
}:
mkDerivation {
pname = "text";
- version = "1.2.3.0";
- sha256 = "06iir7q99rnffzxi8gagn8w1k9m49368sbidgz634fv1gxib3q10";
+ version = "1.2.3.1";
+ sha256 = "19j725g8xma1811avl3nz2vndwynsmpx3sqf6bd7iwh1bm6n4q43";
libraryHaskellDepends = [
array base binary bytestring deepseq ghc-prim integer-gmp
];
@@ -202745,8 +207786,8 @@ self: {
}:
mkDerivation {
pname = "text-builder";
- version = "0.5.3.1";
- sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q";
+ version = "0.5.4.3";
+ sha256 = "1xcyi3bw44anzah5c4c0wm18vnyqsr3q7ww2kp2psk41ql6gan2h";
libraryHaskellDepends = [
base base-prelude bytestring semigroups text
];
@@ -202760,17 +207801,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "text-builder_0_5_4_1" = callPackage
+ "text-builder_0_6_4" = callPackage
({ mkDerivation, base, base-prelude, bytestring, criterion
- , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty
- , tasty-hunit, tasty-quickcheck, text
+ , deferred-folds, QuickCheck, quickcheck-instances, rerebase
+ , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+ , transformers
}:
mkDerivation {
pname = "text-builder";
- version = "0.5.4.1";
- sha256 = "1ipmfnjbkp2qllqdahdf9jwbks6vhalaw65clv9izbhp7d20gjai";
+ version = "0.6.4";
+ sha256 = "0s3rphrp9d3pbagmlzz3xdm4fym38j8vg55wlqw1j1pkbdvm2cgg";
libraryHaskellDepends = [
- base base-prelude bytestring semigroups text
+ base base-prelude bytestring deferred-folds semigroups text
+ transformers
];
testHaskellDepends = [
QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -202846,6 +207889,8 @@ self: {
pname = "text-format";
version = "0.3.2";
sha256 = "1qxs8xyjk8nzzzam62lqqml9s0p08m749jri0lfaa844mnw3frij";
+ revision = "1";
+ editedCabalFile = "155bddqabsxdfzdr7wl67qw9w777c2qkwxgjpx625875cvyhqkpa";
libraryHaskellDepends = [
array base double-conversion ghc-prim integer-gmp old-locale text
time transformers
@@ -202860,8 +207905,8 @@ self: {
}:
mkDerivation {
pname = "text-format-heavy";
- version = "0.1.5.1";
- sha256 = "14hmzsxhbqr95r7sbpziv897akdw8p54fhwh56j0h9hqnpwxxwgd";
+ version = "0.1.5.2";
+ sha256 = "1rzzdbi16zndbsbsc83zd24ni2z1g6ndvjn3ylwagxr9xhh0iwp5";
libraryHaskellDepends = [
base bytestring containers data-default parsec text time
];
@@ -202891,6 +207936,8 @@ self: {
pname = "text-generic-pretty";
version = "1.2.1";
sha256 = "1isj8wccd0yrgpmlggd2zykb8d9r77blngsqlbwmqs9gxbyk3wyg";
+ revision = "1";
+ editedCabalFile = "1m512nd5w4z6f12qy10bpjqfmpwkm5wg0kdrvvzc45s4dxmzwbxz";
libraryHaskellDepends = [
base containers ghc-prim groom ixset-typed protolude QuickCheck
string-conversions text time unordered-containers wl-pprint-text
@@ -202964,6 +208011,7 @@ self: {
];
description = "ICU transliteration";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) icu;};
"text-json-qq" = callPackage
@@ -202999,27 +208047,6 @@ self: {
}) {};
"text-ldap" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers, dlist
- , memory, QuickCheck, quickcheck-simple, random, transformers
- }:
- mkDerivation {
- pname = "text-ldap";
- version = "0.1.1.12";
- sha256 = "1kfp77nm8mvzi6h44334djr88z2w6syrwrvrqy2jfb65d0p9crbx";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- attoparsec base bytestring containers dlist memory transformers
- ];
- executableHaskellDepends = [ base bytestring ];
- testHaskellDepends = [
- base bytestring QuickCheck quickcheck-simple random
- ];
- description = "Parser and Printer for LDAP text data stream";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "text-ldap_0_1_1_13" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers, dlist
, memory, QuickCheck, quickcheck-simple, random, transformers
}:
@@ -203038,7 +208065,6 @@ self: {
];
description = "Parser and Printer for LDAP text data stream";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"text-lens" = callPackage
@@ -203131,8 +208157,8 @@ self: {
pname = "text-metrics";
version = "0.3.0";
sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q";
- revision = "3";
- editedCabalFile = "0wgkpc8zsfgc8rwbzylpf7r2nnrwhw6rani2chzc9r7lfygpqmn1";
+ revision = "4";
+ editedCabalFile = "017drxq9x56b345d8w5m8xdsi1zzs0z16pbdx8j35cd1lsnh3kf1";
libraryHaskellDepends = [ base containers text vector ];
testHaskellDepends = [ base hspec QuickCheck text ];
benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
@@ -203286,8 +208312,8 @@ self: {
}:
mkDerivation {
pname = "text-replace";
- version = "0.0.0.2";
- sha256 = "1qd3i8sj6z0vgb2yn345wh16w0lvmqdvywrkpcdsmbc00j8cwkjq";
+ version = "0.0.0.4";
+ sha256 = "18hiy0d18wxh8v4zd6vg69fwd8vp9b2yd3ngf04yh9y1bl8wwwhb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers ];
@@ -203333,6 +208359,40 @@ self: {
pname = "text-show";
version = "3.7.4";
sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry";
+ revision = "2";
+ editedCabalFile = "10hmmrm5qjc1lhrqgbh7yyyij9v0rpsv9fakynm5myfcc2ayif82";
+ libraryHaskellDepends = [
+ array base base-compat-batteries bifunctors bytestring
+ bytestring-builder containers contravariant generic-deriving
+ ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
+ template-haskell text th-abstraction th-lift transformers
+ transformers-compat void
+ ];
+ testHaskellDepends = [
+ array base base-compat-batteries base-orphans bytestring
+ bytestring-builder deriving-compat generic-deriving ghc-prim hspec
+ nats QuickCheck quickcheck-instances semigroups tagged
+ template-haskell text transformers transformers-compat
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
+ description = "Efficient conversion of values into Text";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "text-show_3_7_5" = callPackage
+ ({ mkDerivation, array, base, base-compat-batteries, base-orphans
+ , bifunctors, bytestring, bytestring-builder, containers
+ , contravariant, criterion, deepseq, deriving-compat
+ , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover
+ , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
+ , tagged, template-haskell, text, th-abstraction, th-lift
+ , transformers, transformers-compat, void
+ }:
+ mkDerivation {
+ pname = "text-show";
+ version = "3.7.5";
+ sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r";
libraryHaskellDepends = [
array base base-compat-batteries bifunctors bytestring
bytestring-builder containers contravariant generic-deriving
@@ -203350,6 +208410,7 @@ self: {
benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
description = "Efficient conversion of values into Text";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"text-show-instances" = callPackage
@@ -203365,8 +208426,8 @@ self: {
pname = "text-show-instances";
version = "3.6.5";
sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql";
- revision = "1";
- editedCabalFile = "12k3hmn36w2mffhxjb5bx1g1gh3y0y4fync9hvk4gklh1w6dbs0a";
+ revision = "2";
+ editedCabalFile = "1lqvwm9ciazk13jabyr81rl4hsmwksjmks7ckxrdgz3jk201yr6i";
libraryHaskellDepends = [
base base-compat-batteries bifunctors binary containers directory
ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
@@ -203388,6 +208449,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "text-show-instances_3_7" = callPackage
+ ({ mkDerivation, base, base-compat-batteries, bifunctors, binary
+ , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
+ , haskeline, hpc, hspec, hspec-discover, old-locale, old-time
+ , pretty, QuickCheck, quickcheck-instances, random, semigroups
+ , tagged, template-haskell, terminfo, text, text-show, th-orphans
+ , time, transformers, transformers-compat, unix
+ , unordered-containers, vector, xhtml
+ }:
+ mkDerivation {
+ pname = "text-show-instances";
+ version = "3.7";
+ sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c";
+ libraryHaskellDepends = [
+ base base-compat-batteries bifunctors binary containers directory
+ ghc-boot-th haskeline hpc old-locale old-time pretty random
+ semigroups tagged template-haskell terminfo text text-show time
+ transformers transformers-compat unix unordered-containers vector
+ xhtml
+ ];
+ testHaskellDepends = [
+ base base-compat-batteries bifunctors binary containers directory
+ generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec
+ old-locale old-time pretty QuickCheck quickcheck-instances random
+ tagged template-haskell terminfo text-show th-orphans time
+ transformers transformers-compat unix unordered-containers vector
+ xhtml
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Additional instances for text-show";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-stream-decode" = callPackage
({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text
}:
@@ -203535,10 +208630,8 @@ self: {
}:
mkDerivation {
pname = "text1";
- version = "0.0.6";
- sha256 = "105y6dbmc3bdbh02v5m6bjsm932d68i262csii1n8kls6rggnfy2";
- revision = "1";
- editedCabalFile = "0qlgv9aabmj7lky55ah8qq7x2w0w6j3m1kykq8iy2d3ymss2jasw";
+ version = "0.0.6.1";
+ sha256 = "10kzl1gwi08pxzs8flr5bhfcwqgcl0jz9cadw3hqmbmynpij95ij";
libraryHaskellDepends = [ base binary lens semigroups text ];
testHaskellDepends = [
base HUnit lens QuickCheck semigroups text
@@ -203800,17 +208893,6 @@ self: {
}) {};
"th-data-compat" = callPackage
- ({ mkDerivation, base, template-haskell }:
- mkDerivation {
- pname = "th-data-compat";
- version = "0.0.2.6";
- sha256 = "1gbqrrpib065yw53063i7ydvm9ghwja30zc6s13mr2pp1l5a4bs2";
- libraryHaskellDepends = [ base template-haskell ];
- description = "Compatibility for data definition template of TH";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "th-data-compat_0_0_2_7" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "th-data-compat";
@@ -203819,7 +208901,6 @@ self: {
libraryHaskellDepends = [ base template-haskell ];
description = "Compatibility for data definition template of TH";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"th-desugar" = callPackage
@@ -203844,6 +208925,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "th-desugar_1_9" = callPackage
+ ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
+ , template-haskell, th-expand-syns, th-lift, th-orphans
+ }:
+ mkDerivation {
+ pname = "th-desugar";
+ version = "1.9";
+ sha256 = "1vxg0jvc239ngmv53yx564b7wkgd0b10xvx5phxvnnpm9n2pljpi";
+ libraryHaskellDepends = [
+ base containers mtl syb template-haskell th-expand-syns th-lift
+ th-orphans
+ ];
+ testHaskellDepends = [
+ base containers hspec HUnit mtl syb template-haskell th-expand-syns
+ th-lift th-orphans
+ ];
+ description = "Functions to desugar Template Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"th-dict-discovery" = callPackage
({ mkDerivation, base, constraints, template-haskell }:
mkDerivation {
@@ -203862,6 +208964,8 @@ self: {
pname = "th-expand-syns";
version = "0.4.4.0";
sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc";
+ revision = "1";
+ editedCabalFile = "1zbdg3hrqv7rzlsrw4a2vjr3g4nzny32wvjcpxamlvx77b1jvsw9";
libraryHaskellDepends = [ base containers syb template-haskell ];
testHaskellDepends = [ base template-haskell ];
description = "Expands type synonyms in Template Haskell ASTs";
@@ -203996,21 +209100,6 @@ self: {
}) {};
"th-lift" = callPackage
- ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
- }:
- mkDerivation {
- pname = "th-lift";
- version = "0.7.10";
- sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr";
- libraryHaskellDepends = [
- base ghc-prim template-haskell th-abstraction
- ];
- testHaskellDepends = [ base ghc-prim template-haskell ];
- description = "Derive Template Haskell's Lift class for datatypes";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "th-lift_0_7_11" = callPackage
({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
}:
mkDerivation {
@@ -204023,7 +209112,6 @@ self: {
testHaskellDepends = [ base ghc-prim template-haskell ];
description = "Derive Template Haskell's Lift class for datatypes";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"th-lift-instances" = callPackage
@@ -204128,17 +209216,6 @@ self: {
}) {};
"th-reify-compat" = callPackage
- ({ mkDerivation, base, template-haskell }:
- mkDerivation {
- pname = "th-reify-compat";
- version = "0.0.1.4";
- sha256 = "08lal845ixcw62skw2rsi98y9v3dgj7bq4ygmlxm6k3lfgd9v7q8";
- libraryHaskellDepends = [ base template-haskell ];
- description = "Compatibility for the result type of TH reify";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "th-reify-compat_0_0_1_5" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "th-reify-compat";
@@ -204147,7 +209224,6 @@ self: {
libraryHaskellDepends = [ base template-haskell ];
description = "Compatibility for the result type of TH reify";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"th-reify-many" = callPackage
@@ -204308,8 +209384,8 @@ self: {
}:
mkDerivation {
pname = "themoviedb";
- version = "1.1.4.0";
- sha256 = "0sx59hi3cv5b71x6gdm8vpj5hchw52vndhksnshblndm8kgxnfa6";
+ version = "1.1.5.0";
+ sha256 = "05za904yimkf9vpkksyxw6j488xyd0wigjdkj25hf2xx4nw36j0v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -204409,10 +209485,8 @@ self: {
}:
mkDerivation {
pname = "these";
- version = "0.7.4";
- sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw";
- revision = "8";
- editedCabalFile = "0j3ps7ngrzgxvkbr5gf8zkfkd1ci4dnfh425ndbr2xp9ipy00nkd";
+ version = "0.7.5";
+ sha256 = "1yrmxkpka0b6hzb7h2j603rjvyzhldrsq8h7336jr7b0ml929b6v";
libraryHaskellDepends = [
aeson base bifunctors binary containers data-default-class deepseq
hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -204664,17 +209738,17 @@ self: {
"threepenny-editors" = callPackage
({ mkDerivation, base, bifunctors, casing, containers, generics-sop
- , profunctors, text, threepenny-gui
+ , profunctors, semigroups, text, threepenny-gui
}:
mkDerivation {
pname = "threepenny-editors";
- version = "0.5.6";
- sha256 = "0gnbzf3a3xykkf8xc5bnn1wznszyrnllf5s6cb4gqz6cbqnf2mnw";
+ version = "0.5.6.1";
+ sha256 = "0x6x4cfs52lwdcxjyqirrb8ka5pm40l89xsxaz9vvz44hmixqjrj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bifunctors casing containers generics-sop profunctors text
- threepenny-gui
+ base bifunctors casing containers generics-sop profunctors
+ semigroups text threepenny-gui
];
description = "Composable algebraic editors";
license = stdenv.lib.licenses.bsd3;
@@ -204690,8 +209764,8 @@ self: {
}:
mkDerivation {
pname = "threepenny-gui";
- version = "0.8.2.4";
- sha256 = "0fy8mwg4h78c7h1k6igc9i8k5r7avj59jkljbg47wlr0x8fs06yb";
+ version = "0.8.3.0";
+ sha256 = "173aacscvf2llk6n5nnxvww22673cg2hclkb3s18av3xk03b4qf6";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -204851,6 +209925,7 @@ self: {
testToolDepends = [ tasty-discover ];
description = "throwable-exceptions gives the easy way to throw exceptions";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"thumbnail" = callPackage
@@ -204873,6 +209948,8 @@ self: {
pname = "thumbnail-plus";
version = "1.0.5";
sha256 = "0320yfgnsazl7bxm9zf077mi4dgfmlcfnzy1qpdl9w3jl5i7z441";
+ revision = "1";
+ editedCabalFile = "0ghmlvcwy8klfq2f0brsg0zyqd0rbclfb990b50clmd2dsmx83wl";
libraryHaskellDepends = [
base bytestring conduit conduit-extra data-default directory either
gd imagesize-conduit resourcet temporary transformers
@@ -204962,8 +210039,26 @@ self: {
pname = "tibetan-utils";
version = "0.1.1.5";
sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q";
- revision = "1";
- editedCabalFile = "0wmfv4dxjhjwsnkc8n7jfhbkvc7zwgcmkj7pvabmhcjzn5ch0dck";
+ revision = "2";
+ editedCabalFile = "17zyhdxwnq85kr60bnxirmyvw3b1679j5mhm3i30ri65896pjdwf";
+ libraryHaskellDepends = [
+ base composition-prelude either megaparsec text text-show
+ ];
+ testHaskellDepends = [
+ base hspec hspec-megaparsec megaparsec text
+ ];
+ description = "Parse and display tibetan numerals";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "tibetan-utils_0_1_1_9" = callPackage
+ ({ mkDerivation, base, composition-prelude, either, hspec
+ , hspec-megaparsec, megaparsec, text, text-show
+ }:
+ mkDerivation {
+ pname = "tibetan-utils";
+ version = "0.1.1.9";
+ sha256 = "04xpncn9nnc51mzyvw1naydk47acbpkzpxipq1fgvvgclzda2gn8";
libraryHaskellDepends = [
base composition-prelude either megaparsec text text-show
];
@@ -204972,6 +210067,7 @@ self: {
];
description = "Parse and display tibetan numerals";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tic-tac-toe" = callPackage
@@ -205176,6 +210272,8 @@ self: {
pname = "tighttp";
version = "0.0.0.10";
sha256 = "0q0177nm71c6sl7qdw0za740m52bhqavkn4b7f6dxwvfw15icxdz";
+ revision = "1";
+ editedCabalFile = "077s20c7cl29h65v5sgh4df5r41574srll20r6cmbdbb339jr4nr";
libraryHaskellDepends = [
base bytestring handle-like monads-tf old-locale papillon
simple-pipe time
@@ -205364,17 +210462,6 @@ self: {
}) {};
"time-locale-compat" = callPackage
- ({ mkDerivation, base, old-locale, time }:
- mkDerivation {
- pname = "time-locale-compat";
- version = "0.1.1.4";
- sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj";
- libraryHaskellDepends = [ base old-locale time ];
- description = "Compatibile module for time-format locale";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "time-locale-compat_0_1_1_5" = callPackage
({ mkDerivation, base, old-locale, time }:
mkDerivation {
pname = "time-locale-compat";
@@ -205383,7 +210470,6 @@ self: {
libraryHaskellDepends = [ base old-locale time ];
description = "Compatibile module for time-format locale";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"time-locale-vietnamese" = callPackage
@@ -205435,8 +210521,8 @@ self: {
pname = "time-parsers";
version = "0.1.2.0";
sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f";
- revision = "2";
- editedCabalFile = "1qvhmwkdb4a0msxpfssyqdz0fmi45iv7iwmw7b1mf4flqz6jvaql";
+ revision = "3";
+ editedCabalFile = "0im963wjcmwf6ii9a00mbi8lhmx5cy7cs6rmp0qi2j2jddba78j2";
libraryHaskellDepends = [ base parsers template-haskell time ];
testHaskellDepends = [
attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -205835,6 +210921,8 @@ self: {
pname = "timer-wheel";
version = "0.1.0";
sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j";
+ revision = "1";
+ editedCabalFile = "0vk0p21x90wiazss30zkbzr5fnsc4gih9a6xaa9myyycw078600v";
libraryHaskellDepends = [
atomic-primops base ghc-prim primitive psqueues
];
@@ -206323,12 +211411,13 @@ self: {
"tldr" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
- , filepath, optparse-applicative, semigroups, text, typed-process
+ , filepath, optparse-applicative, semigroups, tasty, tasty-golden
+ , text, typed-process
}:
mkDerivation {
pname = "tldr";
- version = "0.3.0";
- sha256 = "1wnc1l1c9d56y64d5hlkj2z1m4vl87shfya7ix49h22l77df0jq7";
+ version = "0.4.0";
+ sha256 = "017x3lqphbyayl9gx9ykn62i73xzb180df0a8r6ic6chk6yhivfg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -206338,7 +211427,7 @@ self: {
base directory filepath optparse-applicative semigroups
typed-process
];
- testHaskellDepends = [ base ];
+ testHaskellDepends = [ base tasty tasty-golden ];
description = "Haskell tldr client";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -206725,6 +211814,7 @@ self: {
executableHaskellDepends = [ base ];
description = "TokTok C code style checker";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"toktok" = callPackage
@@ -206821,6 +211911,8 @@ self: {
pname = "tomland";
version = "0.3.1";
sha256 = "0kpgcqix32m0nik54rynpphm4mpd8r05mspypjiwj9sidjxn11gw";
+ revision = "1";
+ editedCabalFile = "0pxc2065zjvsw3qwxhj2iw4d08f4j6y40nr51k6nxkz1px855gyk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -206847,6 +211939,8 @@ self: {
pname = "tomland";
version = "0.4.0";
sha256 = "1rkdlq6js5ia807wh9hga6y9r92bxj8j5g7nynba1ilc3x70znfr";
+ revision = "1";
+ editedCabalFile = "1d02r17m15s5z4xqyy05s515lbsqxc3kcipk25xvn24inz42qg4r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -206870,8 +211964,8 @@ self: {
}:
mkDerivation {
pname = "tomlcheck";
- version = "0.1.0.29";
- sha256 = "1blq3yjzd39fjpavjl5k3567algdl424l0al0rvr25xd239kvwzg";
+ version = "0.1.0.36";
+ sha256 = "16a15449pfdlan93ynrv3gh42vjlv95160nr1lwvqh91m7fvpnc3";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -206879,6 +211973,28 @@ self: {
];
description = "Command-line tool to check syntax of TOML files";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "toodles" = callPackage
+ ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory
+ , megaparsec, MissingH, regex-posix, servant, servant-blaze
+ , servant-server, strict, text, wai, warp, yaml
+ }:
+ mkDerivation {
+ pname = "toodles";
+ version = "0.1.0.16";
+ sha256 = "1xr9cl69v5m08d44xgprlpk9j5j2lby84lzcp3fjzlvfdnnx0q72";
+ isLibrary = false;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ executableHaskellDepends = [
+ aeson base blaze-html cmdargs directory megaparsec MissingH
+ regex-posix servant servant-blaze servant-server strict text wai
+ warp yaml
+ ];
+ description = "Manage the TODO entries in your code";
+ license = stdenv.lib.licenses.mit;
}) {};
"toolshed" = callPackage
@@ -207014,12 +212130,12 @@ self: {
}) {};
"total-map" = callPackage
- ({ mkDerivation, base, containers }:
+ ({ mkDerivation, base, containers, semiring-num }:
mkDerivation {
pname = "total-map";
- version = "0.0.6";
- sha256 = "11dgcl7ab7akkfnmprnmphj4kazh3x3k09lz7m5glyg39kw8pzrj";
- libraryHaskellDepends = [ base containers ];
+ version = "0.0.8";
+ sha256 = "0qzlpcczj5nh786070qp5ln1l8j5qbzdx7dmx08lmc69gf6dwf4i";
+ libraryHaskellDepends = [ base containers semiring-num ];
description = "Finitely represented /total/ maps";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -207386,6 +212502,7 @@ self: {
base hedgehog mmorph postgresql-simple resource-pool text
];
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tracy" = callPackage
@@ -207407,8 +212524,10 @@ self: {
}:
mkDerivation {
pname = "traildb";
- version = "0.1.4.0";
- sha256 = "1qp3m8vfjy9kim9jikhxplyp6c21scj18n9qnb0pfd0hpjyigd9b";
+ version = "0.1.4.1";
+ sha256 = "1h3pscbxjl3cpcxbch4ydiv6y5j54k99v8kq61jv01gv1vjisd2r";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base bytestring containers directory exceptions primitive
profunctors text time transformers unix vector
@@ -207916,6 +213035,7 @@ self: {
];
description = "Type safe http requests";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"trasa-reflex" = callPackage
@@ -208076,8 +213196,8 @@ self: {
pname = "tree-diff";
version = "0.0.1";
sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
- revision = "4";
- editedCabalFile = "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp";
+ revision = "6";
+ editedCabalFile = "1wyhygrpqphxzzwlrk6nl4h5xbyx6zi0y34i1nxvsy726fl5idai";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -209122,8 +214242,8 @@ self: {
}:
mkDerivation {
pname = "turtle";
- version = "1.5.10";
- sha256 = "0c2bfwfj1pf3s4kjr4k9g36166pj9wfpp2rrs5blzh77hjmak4rs";
+ version = "1.5.12";
+ sha256 = "0hacgsgs64fgp8k562gyly8i19zz18fj0v1v2m5g26vaj356ys5k";
libraryHaskellDepends = [
ansi-wl-pprint async base bytestring clock containers directory
exceptions foldl hostname managed optional-args
@@ -209194,6 +214314,7 @@ self: {
];
description = "An equational theorem prover";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"twee-lib" = callPackage
@@ -209220,8 +214341,8 @@ self: {
}:
mkDerivation {
pname = "tweet-hs";
- version = "1.0.1.41";
- sha256 = "1ybrsnppy7lnj5z2f8m38cd6ix89j6dlvgc2icl7lj3w14g6cfxm";
+ version = "1.0.1.43";
+ sha256 = "10bxkllxiwm1xbvpz4wh1gd24qkz8y0b7z4ciwqk13jz5ha966x0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -210188,6 +215309,8 @@ self: {
pname = "type-level-sets";
version = "0.8.7.0";
sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7";
+ revision = "1";
+ editedCabalFile = "0x03wqriksvdcvhlg3nxpnjgr5w22qkhny6aic6npjgnwjsamvxr";
libraryHaskellDepends = [ base ghc-prim ];
description = "Type-level sets and finite maps (with value-level counterparts)";
license = stdenv.lib.licenses.bsd3;
@@ -210670,16 +215793,12 @@ self: {
}) {};
"typelits-witnesses" = callPackage
- ({ mkDerivation, base, base-compat, constraints, reflection
- , transformers
- }:
+ ({ mkDerivation, base, constraints, reflection }:
mkDerivation {
pname = "typelits-witnesses";
- version = "0.3.0.2";
- sha256 = "0k76ir1c6ga44cj3qmjcsnikzz2nnb2kyzkcirb3ila7yfgwc9kf";
- libraryHaskellDepends = [
- base base-compat constraints reflection transformers
- ];
+ version = "0.3.0.3";
+ sha256 = "078r9pbkzwzm1q821zqisj0wrx1rdk9w8c3ip0g1m5j97zzlmpaf";
+ libraryHaskellDepends = [ base constraints reflection ];
description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
license = stdenv.lib.licenses.mit;
}) {};
@@ -210688,8 +215807,8 @@ self: {
({ mkDerivation, base, hspec, QuickCheck }:
mkDerivation {
pname = "typenums";
- version = "0.1.2";
- sha256 = "1729iws0m6xr8y5aqcrxv4br1ihvly6fagkkgfp9kj71a5jzaw7l";
+ version = "0.1.2.1";
+ sha256 = "06wrsvbddv2ga7k39954697jnclb5r6g4m95pr0fmv34ws1y1d66";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec QuickCheck ];
description = "Type level numbers using existing Nat functionality";
@@ -210788,8 +215907,8 @@ self: {
}:
mkDerivation {
pname = "typesafe-precure";
- version = "0.7.0.1";
- sha256 = "1v8kzhjyxznj9xj4x5n34ybhzy5nmldsscawnmcaqf96f4w0i178";
+ version = "0.7.1.1";
+ sha256 = "1csg945w81qqa5fipj9fyzqy1f2n6blf55cjcqg7gm1k1jln768k";
libraryHaskellDepends = [
aeson aeson-pretty autoexporter base bytestring dlist
monad-skeleton template-haskell text th-data-compat
@@ -210832,6 +215951,33 @@ self: {
license = "GPL";
}) {};
+ "typograffiti" = callPackage
+ ({ mkDerivation, base, bytestring, containers, filepath, freetype2
+ , gl, linear, mtl, pretty-show, sdl2, stm, template-haskell, vector
+ }:
+ mkDerivation {
+ pname = "typograffiti";
+ version = "0.1.0.0";
+ sha256 = "0wd7p6hyn0v8rkvcpbqyjarhv47hi1r3fjzmrldfkylfwnhzj0lf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring containers freetype2 gl linear mtl pretty-show stm
+ template-haskell vector
+ ];
+ executableHaskellDepends = [
+ base bytestring containers filepath freetype2 gl linear mtl
+ pretty-show sdl2 stm template-haskell vector
+ ];
+ testHaskellDepends = [
+ base bytestring containers freetype2 gl linear mtl pretty-show stm
+ template-haskell vector
+ ];
+ description = "Display TTF fonts in OpenGL. Includes caching for fast rendering.";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"typography-geometry" = callPackage
({ mkDerivation, base, containers, parallel, polynomials-bernstein
, vector
@@ -210902,8 +216048,10 @@ self: {
}:
mkDerivation {
pname = "tzdata";
- version = "0.1.20180122.0";
- sha256 = "17fv2jvmbplyaxw4jpq78kqws4cmwc53mlnnjw70vmagx52xh6x3";
+ version = "0.1.20180501.0";
+ sha256 = "0nnzvkm6r7cq4g14zjxzgxx63sy8pxkg2whfgq6knpzhgran9n45";
+ revision = "1";
+ editedCabalFile = "19iqfzmh8xvd3cqlr1lp673232gk59z335xqbv18d4yy5qxc2fj0";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers deepseq vector
@@ -211046,6 +216194,8 @@ self: {
pname = "udbus";
version = "0.2.3";
sha256 = "1ifl280n2ib26j4h7h46av6k7ms0j1n2wy4shbqk5xli5bbj3k9n";
+ revision = "1";
+ editedCabalFile = "036yscknrmc7dcm111bsjk7q0ghb6ih5b6z1ffsqf442dg83x8w7";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -211207,8 +216357,8 @@ self: {
pname = "uhttpc";
version = "0.1.1.0";
sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb";
- revision = "3";
- editedCabalFile = "1s35m2mrcaamj0293yb78ya185fzm71zdx0jq62im7rc5fdhfiry";
+ revision = "4";
+ editedCabalFile = "0g4rcm7kbanayv18bad7pakrnghqg2qpxq4aib1n4d8h7ximgly2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -211319,6 +216469,8 @@ self: {
pname = "unagi-chan";
version = "0.4.1.0";
sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb";
+ revision = "1";
+ editedCabalFile = "0hfyjcngxj7wksjpkpf20w94xjbisi690bzx9clclqillzcqvq4p";
libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
testHaskellDepends = [
atomic-primops base containers ghc-prim primitive
@@ -211370,8 +216522,8 @@ self: {
}:
mkDerivation {
pname = "unbound";
- version = "0.5.1";
- sha256 = "0cjfd6fdxpi94dac5aslgfggm81fdspbywfyl5m20ah5drgpsr12";
+ version = "0.5.1.1";
+ sha256 = "1pr06iii1pm6dkdm4rxc4cr817p5iri877573p06kj53w1xk5scj";
libraryHaskellDepends = [
base binary containers mtl RepLib transformers
];
@@ -211392,8 +216544,8 @@ self: {
}:
mkDerivation {
pname = "unbound-generics";
- version = "0.3.3";
- sha256 = "06md35jmm8xas8dywxxc62nq4d6gi66m7bm4h3920jpvknqwbvbz";
+ version = "0.3.4";
+ sha256 = "01g8zhf9plgl3fcj57fkma3rkdwmh28rla3r1cr0bfmbd03q3fva";
libraryHaskellDepends = [
ansi-wl-pprint base containers contravariant deepseq exceptions mtl
profunctors template-haskell transformers transformers-compat
@@ -211406,6 +216558,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unbound-generics_0_4_0" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant
+ , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck
+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell
+ , transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "unbound-generics";
+ version = "0.4.0";
+ sha256 = "04amv54wrabzdmlig1mxi51ikq1lmfcm504184y0nm0xjahfssmx";
+ libraryHaskellDepends = [
+ ansi-wl-pprint base containers contravariant deepseq exceptions mtl
+ profunctors template-haskell transformers transformers-compat
+ ];
+ testHaskellDepends = [
+ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ base criterion deepseq ];
+ description = "Support for programming with names and binders using GHC Generics";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unbounded-delays" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -211500,6 +216675,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unescaping-print" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "unescaping-print";
+ version = "0.1";
+ sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5";
+ libraryHaskellDepends = [ base ];
+ description = "Tiny package providing unescaping versions of show and print";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"unexceptionalio" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -211523,6 +216709,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "unfix-binders" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "unfix-binders";
+ version = "0.1.0";
+ sha256 = "0aw4ihkzwz220pgg84p47zp37i5dqn7cxqcqa2lfzi23y9sp5iss";
+ libraryHaskellDepends = [ base ];
+ description = "Unfixing and recursion schemes for data types with binders";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unfoldable" = callPackage
({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
, random, transformers
@@ -211531,8 +216729,8 @@ self: {
pname = "unfoldable";
version = "0.9.6";
sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d";
- revision = "1";
- editedCabalFile = "1lgyfmv339zfkrf6s4bw1ksk0757vcc1vx07yc4l33idmpsgz77c";
+ revision = "2";
+ editedCabalFile = "08rx8ci2jpa77q1dl4lghlyhd27if990ic9kaz30hczsazlzi44b";
libraryHaskellDepends = [
base containers ghc-prim one-liner QuickCheck random transformers
];
@@ -211681,8 +216879,8 @@ self: {
({ mkDerivation, base, containers, semigroups, utility-ht }:
mkDerivation {
pname = "unicode";
- version = "0.0.1";
- sha256 = "10cv8kk3c028bylkjz8jx0xhmkzrjbmhm1hhbdsyvszl9mfykga9";
+ version = "0.0.1.1";
+ sha256 = "1hgqnplpgaw0pwz0lfr59vmljcf4l5b4ynrhdcic94g18lpsmnvg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base containers semigroups ];
@@ -211858,28 +217056,32 @@ self: {
}) {inherit (pkgs) openssl;};
"uniform-pair" = callPackage
- ({ mkDerivation, base, deepseq, prelude-extras }:
+ ({ mkDerivation, adjunctions, base, deepseq, distributive
+ , prelude-extras
+ }:
mkDerivation {
pname = "uniform-pair";
- version = "0.1.13";
- sha256 = "17dz0car02w2x5m23hlqlgjnpl86darc8vvr4axpsc9xim4sf7nk";
+ version = "0.1.15";
+ sha256 = "087wwdhkma76akzjzi053by43xv18c2a4q1babdsxapzjqpnr19k";
enableSeparateDataOutput = true;
- libraryHaskellDepends = [ base deepseq prelude-extras ];
+ libraryHaskellDepends = [
+ adjunctions base deepseq distributive prelude-extras
+ ];
description = "Uniform pairs with class instances";
license = stdenv.lib.licenses.bsd3;
}) {};
"union" = callPackage
- ({ mkDerivation, base, criterion, deepseq, lens, profunctors
- , tagged, vinyl
+ ({ mkDerivation, base, criterion, deepseq, hashable, lens
+ , profunctors, tagged, vinyl
}:
mkDerivation {
pname = "union";
- version = "0.1.1.2";
- sha256 = "10nkcmql6ryh3vp02yxk3i1f6fbxdcsjk6s5ani89qa05448xqkw";
- revision = "5";
- editedCabalFile = "0mphzzvvr8lh1x8mb6n9nzzskx32cmr6ycihdy68qw35ybrqb0aj";
- libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
+ version = "0.1.2";
+ sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3";
+ libraryHaskellDepends = [
+ base deepseq hashable profunctors tagged vinyl
+ ];
benchmarkHaskellDepends = [ base criterion deepseq lens ];
description = "Extensible type-safe unions";
license = stdenv.lib.licenses.bsd3;
@@ -211944,6 +217146,8 @@ self: {
pname = "uniprot-kb";
version = "0.1.2.0";
sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l";
+ revision = "1";
+ editedCabalFile = "0kvw9mzgjz6m1sslywn09n4axkjnwqpi4c5p00p9c81mr9fpbild";
libraryHaskellDepends = [ attoparsec base text ];
testHaskellDepends = [
attoparsec base hspec neat-interpolation QuickCheck text
@@ -212002,8 +217206,8 @@ self: {
}:
mkDerivation {
pname = "unique-logic-tf";
- version = "0.5";
- sha256 = "05v9ky3lrh4yzjsfgxa2sz44l7dlsvi5iv4h9rnsj2sd3hj2xcsa";
+ version = "0.5.0.1";
+ sha256 = "1v37bv5bjpkm5085sg4rf7ssbigsivib6fdxjhxyd36zhh08pdjy";
libraryHaskellDepends = [
base containers data-ref semigroups transformers utility-ht
];
@@ -212124,8 +217328,8 @@ self: {
}:
mkDerivation {
pname = "units-parser";
- version = "0.1.1.2";
- sha256 = "06kmrqswlivsas183jswsnqi21rmdh6cqw392b3ycj2x5avghqqa";
+ version = "0.1.1.3";
+ sha256 = "0lyy8nh86b0nq2znkli8y1zcg87l6acaaxi8b1m6falb6xnfi0nw";
libraryHaskellDepends = [ base containers mtl multimap parsec ];
testHaskellDepends = [
base containers mtl multimap parsec syb tasty tasty-hunit
@@ -212210,6 +217414,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "universal" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+ , tasty, tasty-smallcheck, util
+ }:
+ mkDerivation {
+ pname = "universal";
+ version = "0.0.0.0";
+ sha256 = "0qcv0xi65l782yvn25an0qiavn942szs16j8p328i2pc6ggfymb2";
+ libraryHaskellDepends = [ base base-unicode-symbols util ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ benchmarkHaskellDepends = [ base criterion ];
+ doHaddock = false;
+ description = "Universal";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"universal-binary" = callPackage
({ mkDerivation, base, binary, bytestring }:
mkDerivation {
@@ -212256,8 +217476,8 @@ self: {
pname = "universe-instances-base";
version = "1.0";
sha256 = "04njgl32lk5a0masjdjkm4l2wsyrr29g0fsp599864mp7gp504d2";
- revision = "1";
- editedCabalFile = "13s8gxsvkw6phwvd79h9f3xaqbyzsx1svpysbmq72z1hv3mqyz8a";
+ revision = "2";
+ editedCabalFile = "0c9zxmifhy2qjvsikgm168n8k8ka8ia88ldy8qjqkz5pqknlr9sj";
libraryHaskellDepends = [ base containers universe-base ];
description = "Universe instances for types from the base package";
license = stdenv.lib.licenses.bsd3;
@@ -212303,8 +217523,8 @@ self: {
pname = "universe-reverse-instances";
version = "1.0";
sha256 = "0jcd7qyvzq8xxv9d3hfi0f1h48xdsy9r9xnxgxc7ggga4szirm79";
- revision = "1";
- editedCabalFile = "0rq6h7yghnzrnv56pxnlfr6cfih8dbnhc6hh5416pgy5bxsa0ydj";
+ revision = "2";
+ editedCabalFile = "0cpnsip1iakwkgnwnd21gwrc8qbifzpff6agjwm34jgkq9j646k8";
libraryHaskellDepends = [
base containers universe-instances-base
];
@@ -212362,7 +217582,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "universum_1_3_0" = callPackage
+ "universum_1_4_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, doctest
, gauge, ghc-prim, Glob, hashable, hedgehog, microlens
, microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -212370,8 +217590,8 @@ self: {
}:
mkDerivation {
pname = "universum";
- version = "1.3.0";
- sha256 = "17ggcbkfympmj0y99ycdvck2iliqscz4hp1wz6qgl0gmb3ywx0gp";
+ version = "1.4.0";
+ sha256 = "1qhpz4wlvhrdjb1pvs0lgm0pghrciqasb3378zw32lqh3pv2pnrk";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable microlens
microlens-mtl mtl safe-exceptions stm text transformers
@@ -212395,8 +217615,8 @@ self: {
pname = "unix";
version = "2.7.2.2";
sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq";
- revision = "1";
- editedCabalFile = "0cag1vm2pmzgy0v1j27lhp37iipck06n6gjlphpl26p5xw3gwd31";
+ revision = "2";
+ editedCabalFile = "0d6dv944rp8g69p336b1ik9xl1f182jd8lz82ykhfjhasw8d1waf";
libraryHaskellDepends = [ base bytestring time ];
description = "POSIX functionality";
license = stdenv.lib.licenses.bsd3;
@@ -212415,19 +217635,6 @@ self: {
}) {};
"unix-compat" = callPackage
- ({ mkDerivation, base, unix }:
- mkDerivation {
- pname = "unix-compat";
- version = "0.5.0.1";
- sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2";
- revision = "1";
- editedCabalFile = "0yrdy4dz0zskgpw7c4wgkwskgayqxvch37axwka5z4g5gmic4mnn";
- libraryHaskellDepends = [ base unix ];
- description = "Portable POSIX-compatibility layer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "unix-compat_0_5_1" = callPackage
({ mkDerivation, base, unix }:
mkDerivation {
pname = "unix-compat";
@@ -212436,7 +217643,6 @@ self: {
libraryHaskellDepends = [ base unix ];
description = "Portable POSIX-compatibility layer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"unix-fcntl" = callPackage
@@ -212587,8 +217793,10 @@ self: {
}:
mkDerivation {
pname = "unliftio";
- version = "0.2.7.0";
- sha256 = "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs";
+ version = "0.2.8.1";
+ sha256 = "18v8rzm2nxpck5xvg8qixkarhliy16yswgvj6vbjzq8bn4n6nydz";
+ revision = "1";
+ editedCabalFile = "1zx2h1mnjcjszjdchg17gqrnj3d56x46947jm92snmdjw8x231wg";
libraryHaskellDepends = [
async base deepseq directory filepath process stm time transformers
unix unliftio-core
@@ -212605,10 +217813,10 @@ self: {
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "unliftio-core";
- version = "0.1.1.0";
- sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m";
+ version = "0.1.2.0";
+ sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4";
revision = "1";
- editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2";
+ editedCabalFile = "0s6xfg9d0i3sfil5gjbamlq017wdxa69csk73bcqjkficg43vm29";
libraryHaskellDepends = [ base transformers ];
description = "The MonadUnliftIO typeclass for unlifting monads to IO";
license = stdenv.lib.licenses.mit;
@@ -212629,6 +217837,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unliftio-streams" = callPackage
+ ({ mkDerivation, base, bytestring, io-streams, text, unliftio-core
+ }:
+ mkDerivation {
+ pname = "unliftio-streams";
+ version = "0.1.0.0";
+ sha256 = "0ylyk1g00isqzr7nbhrkf3m0yc36lfjb020lb1ip4s3ymlvkkp22";
+ libraryHaskellDepends = [
+ base bytestring io-streams text unliftio-core
+ ];
+ description = "Generalization of io-streams to MonadUnliftIO";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"unlit" = callPackage
({ mkDerivation, base, directory, text }:
mkDerivation {
@@ -212958,8 +218180,8 @@ self: {
}:
mkDerivation {
pname = "unused";
- version = "0.8.0.0";
- sha256 = "1bs87ii03dydrcyx70drmbd1nrb5z1xj5bzrrqgbq2fzhh7rmb1n";
+ version = "0.9.0.0";
+ sha256 = "1qxz70a9gry1d4a2bgixssq29hkdvck3s0yccbjgksiy98rk463y";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -213039,6 +218261,16 @@ self: {
license = "unknown";
}) {};
+ "update-monad" = callPackage
+ ({ mkDerivation, base, mtl }:
+ mkDerivation {
+ pname = "update-monad";
+ version = "0.1.0.0";
+ sha256 = "0l6gbfw0rmhkk2iq3wd2zzyld2nvjmbrlg7rqqv962cahs5mydns";
+ libraryHaskellDepends = [ base mtl ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"update-nix-fetchgit" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, async, base, bytestring
, data-fix, errors, hnix, process, text, time, transformers
@@ -213171,11 +218403,12 @@ self: {
({ mkDerivation, base, parsec, safe, utf8-string }:
mkDerivation {
pname = "uri";
- version = "0.1.6.4";
- sha256 = "02g49smrq4j3wnk4f9w73a80fxva4rrlgw9jqw6p8cqxrb9x6359";
+ version = "0.1.6.5";
+ sha256 = "0gfv54ys1h4ac3dhaypnpnm4w781857n2k8680jflnjbkqlandrr";
libraryHaskellDepends = [ base parsec safe utf8-string ];
description = "Library for working with URIs";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"uri-bytestring" = callPackage
@@ -213188,8 +218421,8 @@ self: {
}:
mkDerivation {
pname = "uri-bytestring";
- version = "0.3.2.0";
- sha256 = "1q04j5ybvk37zk2m0bkjwyhblz0ymdj0cn4rvsvdca1ikn5xdv5c";
+ version = "0.3.2.1";
+ sha256 = "1z61l4l8sg8vyrf7cri0awj5pnpzly8gp7dw9j26v9pcs6z1dgb4";
libraryHaskellDepends = [
attoparsec base blaze-builder bytestring containers
template-haskell th-lift-instances
@@ -213469,6 +218702,7 @@ self: {
];
description = "Painfully simple URL deployment";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"urlpath_9_0_0_1" = callPackage
@@ -213826,17 +219060,6 @@ self: {
}) {};
"util" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "util";
- version = "0.1.10.1";
- sha256 = "1z3k6x6ap1hjp53w9dnqx8d7pwpbgsabj3dlxcdg5pvr6m3ns184";
- libraryHaskellDepends = [ base ];
- description = "Utilities";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "util_0_1_11_0" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "util";
@@ -213845,7 +219068,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "Utilities";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"util-exception" = callPackage
@@ -213857,6 +219079,7 @@ self: {
libraryHaskellDepends = [ base basic control lifted-base-tf util ];
description = "Exceptional utilities";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"util-plus" = callPackage
@@ -213884,6 +219107,39 @@ self: {
libraryHaskellDepends = [ base primitive ];
description = "Primitive memory-related utilities";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "util-primitive-control" = callPackage
+ ({ mkDerivation, base, control, primitive, smallcheck, tasty
+ , tasty-smallcheck, util
+ }:
+ mkDerivation {
+ pname = "util-primitive-control";
+ version = "0.1.0.0";
+ sha256 = "104p69sw8jyc2dvarv7573cks3p6fvk5d61qhp9y47nylp4q8iqx";
+ libraryHaskellDepends = [ base control primitive util ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ doHaddock = false;
+ description = "Utilities for stateful primitive types and types based on them";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "util-universe" = callPackage
+ ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck
+ , universe-base, universe-instances-base
+ }:
+ mkDerivation {
+ pname = "util-universe";
+ version = "0.1.0.0";
+ sha256 = "1jpi5ic14knr3g8qmz6ls430ll4m9wi5ag1ngmlz46h1zlw53l8y";
+ libraryHaskellDepends = [
+ base universe-base universe-instances-base
+ ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ description = "Utilities for universal types";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"utility-ht" = callPackage
@@ -214421,6 +219677,8 @@ self: {
pname = "validate-input";
version = "0.4.0.0";
sha256 = "1yd187xa762b6zwjsyh3qp11sn3cnwh8g5imp0izk7a22x5y5yi0";
+ revision = "1";
+ editedCabalFile = "0qfwr05111adjfy6j0cbhrzyxgl3ngfpm0irf1hcgmfxnb8psqli";
libraryHaskellDepends = [
base bytestring either mtl pcre-heavy semigroups string-conversions
text
@@ -214432,12 +219690,18 @@ self: {
}) {};
"validated-literals" = callPackage
- ({ mkDerivation, base, bytestring, template-haskell }:
+ ({ mkDerivation, base, bytestring, deepseq, tasty, tasty-hunit
+ , tasty-travis, template-haskell
+ }:
mkDerivation {
pname = "validated-literals";
- version = "0.2.0";
- sha256 = "0wd4dyv2gfmcxqbhmcil884bdcw8a1qw441280j7rrqy6fp442q2";
- libraryHaskellDepends = [ base bytestring template-haskell ];
+ version = "0.2.0.1";
+ sha256 = "0gvqsmyhcjf1l5a6vkhr7ffnw81l01y0dp05lzkmy8n177412pr4";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [
+ base bytestring deepseq tasty tasty-hunit tasty-travis
+ template-haskell
+ ];
description = "Compile-time checking for partial smart-constructors";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -214464,6 +219728,8 @@ self: {
pname = "validation";
version = "1";
sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh";
+ revision = "1";
+ editedCabalFile = "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3";
libraryHaskellDepends = [
base bifunctors deepseq lens semigroupoids semigroups
];
@@ -214524,6 +219790,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "validity_0_8_0_0" = callPackage
+ ({ mkDerivation, base, hspec }:
+ mkDerivation {
+ pname = "validity";
+ version = "0.8.0.0";
+ sha256 = "0yr342gd8ylji7nqa8w3ssik8qcgb4v3h3j30qf5nbzg900k5rsn";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec ];
+ description = "Validity typeclass";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"validity-aeson" = callPackage
({ mkDerivation, aeson, base, validity, validity-scientific
, validity-text, validity-unordered-containers, validity-vector
@@ -214575,22 +219854,6 @@ self: {
}) {};
"validity-path" = callPackage
- ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
- , validity
- }:
- mkDerivation {
- pname = "validity-path";
- version = "0.3.0.1";
- sha256 = "1mfd062p9wh63qnz4a06rj7179lyllfc97g60cmpnjspmcdgy1ky";
- libraryHaskellDepends = [ base filepath path validity ];
- testHaskellDepends = [
- base filepath genvalidity-hspec hspec path validity
- ];
- description = "Validity instances for Path";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-path_0_3_0_2" = callPackage
({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
, validity
}:
@@ -214604,7 +219867,6 @@ self: {
];
description = "Validity instances for Path";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-primitive" = callPackage
@@ -214619,17 +219881,6 @@ self: {
}) {};
"validity-scientific" = callPackage
- ({ mkDerivation, base, scientific, validity }:
- mkDerivation {
- pname = "validity-scientific";
- version = "0.2.0.1";
- sha256 = "1iphzdh9vqa51im1mx3sg7gpqczm39bcdc6li84lssyflg20kraw";
- libraryHaskellDepends = [ base scientific validity ];
- description = "Validity instances for scientific";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-scientific_0_2_0_2" = callPackage
({ mkDerivation, base, scientific, validity }:
mkDerivation {
pname = "validity-scientific";
@@ -214638,21 +219889,9 @@ self: {
libraryHaskellDepends = [ base scientific validity ];
description = "Validity instances for scientific";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-text" = callPackage
- ({ mkDerivation, base, bytestring, text, validity }:
- mkDerivation {
- pname = "validity-text";
- version = "0.3.0.1";
- sha256 = "0ccy6b21lxgqp9q2cmddip1r0axwh6ny4c2vrw1a16712yrhrcdf";
- libraryHaskellDepends = [ base bytestring text validity ];
- description = "Validity instances for text";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-text_0_3_1_0" = callPackage
({ mkDerivation, base, bytestring, text, validity }:
mkDerivation {
pname = "validity-text";
@@ -214661,21 +219900,9 @@ self: {
libraryHaskellDepends = [ base bytestring text validity ];
description = "Validity instances for text";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-time" = callPackage
- ({ mkDerivation, base, time, validity }:
- mkDerivation {
- pname = "validity-time";
- version = "0.2.0.1";
- sha256 = "1m8wsm97s7cwax183qsbmr8p010k9czigwlqbqr6qha3bk83n4bf";
- libraryHaskellDepends = [ base time validity ];
- description = "Validity instances for time";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-time_0_2_0_2" = callPackage
({ mkDerivation, base, time, validity }:
mkDerivation {
pname = "validity-time";
@@ -214684,23 +219911,9 @@ self: {
libraryHaskellDepends = [ base time validity ];
description = "Validity instances for time";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-unordered-containers" = callPackage
- ({ mkDerivation, base, hashable, unordered-containers, validity }:
- mkDerivation {
- pname = "validity-unordered-containers";
- version = "0.2.0.1";
- sha256 = "11pwrd1jbxdffw1lqq6zxgpgzvxrg4y01wnrn5bzwksiqzach742";
- libraryHaskellDepends = [
- base hashable unordered-containers validity
- ];
- description = "Validity instances for unordered-containers";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-unordered-containers_0_2_0_2" = callPackage
({ mkDerivation, base, hashable, unordered-containers, validity }:
mkDerivation {
pname = "validity-unordered-containers";
@@ -214711,21 +219924,9 @@ self: {
];
description = "Validity instances for unordered-containers";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-uuid" = callPackage
- ({ mkDerivation, base, uuid, validity }:
- mkDerivation {
- pname = "validity-uuid";
- version = "0.1.0.1";
- sha256 = "15lk4hig0j6xhz1b7m2hwpvyfwhlrvncgwb1830lpmgvvg18qb9n";
- libraryHaskellDepends = [ base uuid validity ];
- description = "Validity instances for uuid";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-uuid_0_1_0_2" = callPackage
({ mkDerivation, base, uuid, validity }:
mkDerivation {
pname = "validity-uuid";
@@ -214734,21 +219935,9 @@ self: {
libraryHaskellDepends = [ base uuid validity ];
description = "Validity instances for uuid";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-vector" = callPackage
- ({ mkDerivation, base, hashable, validity, vector }:
- mkDerivation {
- pname = "validity-vector";
- version = "0.2.0.1";
- sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4";
- libraryHaskellDepends = [ base hashable validity vector ];
- description = "Validity instances for vector";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "validity-vector_0_2_0_2" = callPackage
({ mkDerivation, base, hashable, validity, vector }:
mkDerivation {
pname = "validity-vector";
@@ -214757,7 +219946,6 @@ self: {
libraryHaskellDepends = [ base hashable validity vector ];
description = "Validity instances for vector";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"valor" = callPackage
@@ -214899,16 +220087,16 @@ self: {
}) {};
"varying" = callPackage
- ({ mkDerivation, base, criterion, hspec, QuickCheck, time
- , transformers
+ ({ mkDerivation, base, contravariant, criterion, hspec, QuickCheck
+ , time, transformers
}:
mkDerivation {
pname = "varying";
- version = "0.7.0.3";
- sha256 = "0283cjsl7siyjyvppwpss5nc5jwy0lfx47d0sndqy3dksvx1gm3c";
+ version = "0.7.1.0";
+ sha256 = "0lb76yqhb6jyfi046cy0axadi10n2h155dhi9c8sqrlwyc0n7hlx";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base transformers ];
+ libraryHaskellDepends = [ base contravariant transformers ];
executableHaskellDepends = [ base time transformers ];
testHaskellDepends = [ base hspec QuickCheck time transformers ];
benchmarkHaskellDepends = [ base criterion time transformers ];
@@ -214983,6 +220171,7 @@ self: {
];
description = "A monad transformer for vault-tool";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"vaultaire-common" = callPackage
@@ -215176,8 +220365,8 @@ self: {
pname = "vec";
version = "0.1";
sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y";
- revision = "2";
- editedCabalFile = "00z6y4a5hi5pwnnakj00qs3kglaykf4i3kwd9iz8bi2kmm6b09lx";
+ revision = "3";
+ editedCabalFile = "093q5qlhlia12ckhvax322lyy3sb554pg46ghabvsvx8znixw2hh";
libraryHaskellDepends = [
adjunctions base base-compat deepseq distributive fin hashable lens
semigroupoids
@@ -215275,10 +220464,8 @@ self: {
}:
mkDerivation {
pname = "vector-algorithms";
- version = "0.7.0.1";
- sha256 = "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd";
- revision = "2";
- editedCabalFile = "186nxwg02m16v68gi186f0z99cafp4g87flhfccnzlrvshlfb83m";
+ version = "0.7.0.4";
+ sha256 = "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring primitive vector ];
@@ -215289,20 +220476,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "vector-algorithms_0_7_0_4" = callPackage
- ({ mkDerivation, base, bytestring, containers, primitive
- , QuickCheck, vector
+ "vector-algorithms_0_8_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, mwc-random
+ , primitive, QuickCheck, vector
}:
mkDerivation {
pname = "vector-algorithms";
- version = "0.7.0.4";
- sha256 = "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg";
- isLibrary = true;
- isExecutable = true;
+ version = "0.8.0.1";
+ sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m";
libraryHaskellDepends = [ base bytestring primitive vector ];
testHaskellDepends = [
base bytestring containers QuickCheck vector
];
+ benchmarkHaskellDepends = [ base mwc-random vector ];
description = "Efficient algorithms for vector arrays";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -215325,16 +220511,14 @@ self: {
}:
mkDerivation {
pname = "vector-binary-instances";
- version = "0.2.4";
- sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb";
- revision = "1";
- editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i";
+ version = "0.2.5";
+ sha256 = "0l9zj58a4sbpic1dc9if7iwv4rihya2bj4zb4qfna5fb3pf6plwc";
libraryHaskellDepends = [ base binary vector ];
testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
benchmarkHaskellDepends = [
base binary bytestring criterion deepseq vector
];
- description = "Instances of Data.Binary and Data.Serialize for vector";
+ description = "Instances of Data.Binary for vector";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -215437,6 +220621,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "vector-extras" = callPackage
+ ({ mkDerivation, base, containers, deferred-folds, foldl, hashable
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "vector-extras";
+ version = "0.2.1";
+ sha256 = "1s9syai0bfdmwzj5r9snxi5plfl2bwnjyyh8dd2w7jmgdy0pkbiz";
+ libraryHaskellDepends = [
+ base containers deferred-folds foldl hashable unordered-containers
+ vector
+ ];
+ description = "Utilities for the \"vector\" library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vector-fftw" = callPackage
({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
mkDerivation {
@@ -215580,17 +220781,31 @@ self: {
pname = "vector-space";
version = "0.13";
sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482";
+ revision = "2";
+ editedCabalFile = "1p9vibym0ggr1rjyak0wphswdl4vik2b2w85afgvyj9zn32w28bw";
+ libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
+ description = "Vector & affine spaces, linear maps, and derivatives";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "vector-space_0_15" = callPackage
+ ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
+ mkDerivation {
+ pname = "vector-space";
+ version = "0.15";
+ sha256 = "03swlbn0x8gfb7bilxmh3zckprjc6v64bildmhwzlimjvd1v8jb8";
libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
description = "Vector & affine spaces, linear maps, and derivatives";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"vector-space-map" = callPackage
({ mkDerivation, base, containers, doctest, vector-space }:
mkDerivation {
pname = "vector-space-map";
- version = "0.2.0";
- sha256 = "092lr61hi8sm0i4302r7zy2s08b4d97k5hyrbnkvnyhfi1529v6f";
+ version = "0.2.1.1";
+ sha256 = "1sg5jgk0kll0jbi66m70ymr085hgvz4kcbvcbn9427w1imbnjfdq";
libraryHaskellDepends = [ base containers vector-space ];
testHaskellDepends = [ base doctest ];
description = "vector-space operations for finite maps using Data.Map";
@@ -215889,6 +221104,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "versions_3_5_0" = callPackage
+ ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable
+ , megaparsec, microlens, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "versions";
+ version = "3.5.0";
+ sha256 = "1g6db0ah78yk1m5wyxp0az7bzlbxsfkychqjcj423wzx90z7ww4w";
+ revision = "1";
+ editedCabalFile = "13gb4n3bdkbgf199q3px7ihaqycbx76cb8isrs3qn16n67mx5b2f";
+ libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
+ testHaskellDepends = [
+ base base-prelude checkers megaparsec microlens QuickCheck tasty
+ tasty-hunit tasty-quickcheck text
+ ];
+ description = "Types and parsers for software version numbers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vfr-waypoints" = callPackage
({ mkDerivation, base, containers, dimensional, fuzzy
, geodetic-types, lens, monoid-subclasses, optparse-applicative
@@ -216001,8 +221237,8 @@ self: {
}:
mkDerivation {
pname = "viewprof";
- version = "0.0.0.22";
- sha256 = "07sa15nrwdjyzqmzvrdvl0nggdx5ca6w7qijhv7na9ivr0p2h495";
+ version = "0.0.0.23";
+ sha256 = "0nxivlnzvnhsk9gn2d7x240n7803fy14pb5knjkxvsw0h0pj8kc6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -216075,8 +221311,8 @@ self: {
}:
mkDerivation {
pname = "vimeta";
- version = "0.2.4.0";
- sha256 = "1pa1l1rirj19cnvdaqkf5jscsfkfyam60yk3gqiypbpd102zas6d";
+ version = "0.2.5.0";
+ sha256 = "03ykd8pz7wn9dcj78zgq15ip04g8b4b7945g6fj5a7bfz0y9asbf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -216164,18 +221400,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "vinyl_0_9_3" = callPackage
- ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec
- , lens, linear, microlens, mwc-random, primitive
- , should-not-typecheck, singletons, tagged, vector
+ "vinyl_0_10_0" = callPackage
+ ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim
+ , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random
+ , primitive, should-not-typecheck, singletons, tagged, text
+ , unordered-containers, vector
}:
mkDerivation {
pname = "vinyl";
- version = "0.9.3";
- sha256 = "1sxkkmnq7vl5bmpljs3riaqb2kqpx1kkkllqiz4zawmhw6wmw1nj";
+ version = "0.10.0";
+ sha256 = "1d1lm9mi9gkcaw0lczbmbn81c3kc5yji3jbp2rjabiwhyi61mj4m";
libraryHaskellDepends = [ array base ghc-prim ];
testHaskellDepends = [
- base doctest hspec lens microlens should-not-typecheck singletons
+ aeson base doctest hspec lens lens-aeson microlens mtl
+ should-not-typecheck singletons text unordered-containers vector
];
benchmarkHaskellDepends = [
base criterion linear microlens mwc-random primitive tagged vector
@@ -216192,8 +221430,8 @@ self: {
}:
mkDerivation {
pname = "vinyl-gl";
- version = "0.3.3";
- sha256 = "09nd2v7550ivgjfby3kd27rf4b5b5ih8l7nx6v5h7r9s42vadb0r";
+ version = "0.3.4";
+ sha256 = "1r4vpilk8l0fm1v5n5lz27l57ciglbr82g5wsj3g4j7rghr14jpf";
libraryHaskellDepends = [
base containers GLUtil linear OpenGL tagged transformers vector
vinyl
@@ -216442,6 +221680,20 @@ self: {
license = "GPL";
}) {};
+ "vivid-osc_0_4_0_0" = callPackage
+ ({ mkDerivation, base, binary, bytestring, cereal, microspec, time
+ }:
+ mkDerivation {
+ pname = "vivid-osc";
+ version = "0.4.0.0";
+ sha256 = "10wbl11xwkahjsnvy14ysvkbylh615x7i8v4hwrji81rfy2bs29n";
+ libraryHaskellDepends = [ base binary bytestring cereal time ];
+ testHaskellDepends = [ base bytestring cereal microspec time ];
+ description = "Open Sound Control encode/decode";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vivid-supercollider" = callPackage
({ mkDerivation, base, binary, bytestring, cereal, microspec
, QuickCheck, split, utf8-string, vivid-osc
@@ -216507,22 +221759,24 @@ self: {
}) {};
"voicebase" = callPackage
- ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client
- , http-client-openssl, json-autotype, lens, mime-types, options
- , text, wreq
+ ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL
+ , http-client, http-client-openssl, json-autotype, lens, mime-types
+ , optparse-applicative, text, wreq
}:
mkDerivation {
pname = "voicebase";
- version = "0.1.1.1";
- sha256 = "1nc2cmfmdalggb7f9xw4xrhms31cky478wxxkq50as6bryl3k3q3";
+ version = "0.1.1.4";
+ sha256 = "17yrdrvvd3kyd6qnkfhqdwjxc5ripmzwa056rvn38ny3cxcfkd78";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring HsOpenSSL http-client http-client-openssl
json-autotype lens mime-types text wreq
];
- executableHaskellDepends = [ base bytestring mime-types options ];
- testHaskellDepends = [ base ];
+ executableHaskellDepends = [
+ aeson base bytestring filepath mime-types optparse-applicative text
+ ];
+ testHaskellDepends = [ aeson base ];
description = "Upload audio files to voicebase to get a transcription";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -216681,7 +221935,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "vty_5_23_1" = callPackage
+ "vty_5_25" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
, deepseq, directory, filepath, hashable, HUnit, microlens
, microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -216692,8 +221946,8 @@ self: {
}:
mkDerivation {
pname = "vty";
- version = "5.23.1";
- sha256 = "1cd328prv1pddza87a2kfh93l101jg1afs5s951yhr9z93mgd7d9";
+ version = "5.25";
+ sha256 = "1m37q8l4ynnhyln1hkwxrmgysslb5d6nvnvx667q4q004dhrcr91";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -217104,53 +222358,22 @@ self: {
({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
, bytestring, case-insensitive, containers, cookie
, data-default-class, deepseq, directory, fast-logger, hspec
- , http-types, HUnit, iproute, lifted-base, network, old-locale
- , resourcet, streaming-commons, stringsearch, text, time
- , transformers, unix, unix-compat, vault, void, wai, wai-logger
- , word8, zlib
- }:
- mkDerivation {
- pname = "wai-extra";
- version = "3.0.24.1";
- sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson ansi-terminal base base64-bytestring bytestring
- case-insensitive containers cookie data-default-class deepseq
- directory fast-logger http-types iproute lifted-base network
- old-locale resourcet streaming-commons stringsearch text time
- transformers unix unix-compat vault void wai wai-logger word8 zlib
- ];
- testHaskellDepends = [
- base bytestring case-insensitive cookie fast-logger hspec
- http-types HUnit resourcet text time transformers wai zlib
- ];
- description = "Provides some basic WAI handlers and middleware";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "wai-extra_3_0_24_2" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
- , bytestring, case-insensitive, containers, cookie
- , data-default-class, deepseq, directory, fast-logger, hspec
- , http-types, HUnit, iproute, lifted-base, network, old-locale
- , resourcet, streaming-commons, stringsearch, text, time
- , transformers, unix, unix-compat, vault, void, wai, wai-logger
- , word8, zlib
+ , http-types, HUnit, iproute, network, old-locale, resourcet
+ , streaming-commons, text, time, transformers, unix, unix-compat
+ , vault, void, wai, wai-logger, word8, zlib
}:
mkDerivation {
pname = "wai-extra";
- version = "3.0.24.2";
- sha256 = "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci";
+ version = "3.0.24.3";
+ sha256 = "0ff4mzxqj3h5zn27q9pq0q89x087dy072z24bczn4irry0zzks21";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson ansi-terminal base base64-bytestring bytestring
case-insensitive containers cookie data-default-class deepseq
- directory fast-logger http-types iproute lifted-base network
- old-locale resourcet streaming-commons stringsearch text time
- transformers unix unix-compat vault void wai wai-logger word8 zlib
+ directory fast-logger http-types iproute network old-locale
+ resourcet streaming-commons text time transformers unix unix-compat
+ vault void wai wai-logger word8 zlib
];
testHaskellDepends = [
base bytestring case-insensitive cookie fast-logger hspec
@@ -217158,7 +222381,6 @@ self: {
];
description = "Provides some basic WAI handlers and middleware";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-frontend-monadcgi" = callPackage
@@ -217918,6 +223140,7 @@ self: {
testHaskellDepends = [ base doctest prometheus-client ];
description = "WAI middlware for exposing http://prometheus.io metrics.";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-middleware-rollbar" = callPackage
@@ -217926,8 +223149,8 @@ self: {
}:
mkDerivation {
pname = "wai-middleware-rollbar";
- version = "0.10.0";
- sha256 = "1905cgmcgmsy0v2c84q33aharlklffqxhr6bwr1zvi138c9bivd6";
+ version = "0.11.0";
+ sha256 = "1nsnkf9wk61lj092z56knwfrdjyazql16y2kj5h0iamnf4gmxa7w";
libraryHaskellDepends = [
aeson base bytestring hostname http-client http-conduit http-types
rollbar-hs text time uuid wai
@@ -218037,21 +223260,23 @@ self: {
}) {};
"wai-middleware-throttle" = callPackage
- ({ mkDerivation, base, bytestring, bytestring-builder, containers
- , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm
- , text, token-bucket, transformers, wai, wai-extra
+ ({ mkDerivation, base, bytestring, bytestring-builder, cache, clock
+ , containers, hashable, hspec, http-types, HUnit, mtl, network
+ , QuickCheck, safe-exceptions, stm, text, token-bucket
+ , transformers, wai, wai-extra
}:
mkDerivation {
pname = "wai-middleware-throttle";
- version = "0.2.2.1";
- sha256 = "1z4n7ja5kq7cl2117w8wx0kz3fjdzr3mlvx6m76jbgp0504vjgja";
+ version = "0.3.0.0";
+ sha256 = "16qhfqc0f5ahz2qc04a4by6iw1agxzcf14aqqkf1arf0hknvbvvv";
libraryHaskellDepends = [
- base bytestring bytestring-builder containers hashable http-types
- mtl network stm text token-bucket transformers wai
+ base bytestring bytestring-builder cache clock containers hashable
+ http-types mtl network safe-exceptions stm text token-bucket
+ transformers wai
];
testHaskellDepends = [
- base bytestring hspec http-types HUnit QuickCheck stm transformers
- wai wai-extra
+ base bytestring cache clock hspec http-types HUnit QuickCheck stm
+ transformers wai wai-extra
];
description = "WAI Middleware for Request Throttling";
license = stdenv.lib.licenses.bsd3;
@@ -218065,6 +223290,8 @@ self: {
pname = "wai-middleware-travisci";
version = "0.1.0";
sha256 = "0a58mlgimr6137aiwcdxjk15zy3y58dds4zxffd3vvn0lkzg5jdv";
+ revision = "1";
+ editedCabalFile = "0fd99j9lyb562p3rsdb8d7swg31bwahzhgjm6afijc5f6i5awcw3";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring cryptonite http-types text
transformers vault wai
@@ -218640,8 +223867,8 @@ self: {
}:
mkDerivation {
pname = "warp";
- version = "3.2.23";
- sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0";
+ version = "3.2.25";
+ sha256 = "0rl59bs99c3wwwyc1ibq0v11mkc7pxpy28r9hdlmjsqmdwn8y2vy";
libraryHaskellDepends = [
array async auto-update base bsb-http-chunked bytestring
case-insensitive containers ghc-prim hashable http-date http-types
@@ -218681,6 +223908,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "warp-grpc" = callPackage
+ ({ mkDerivation, async, base, binary, bytestring, case-insensitive
+ , http-types, http2-grpc-types, proto-lens, wai, warp, warp-tls
+ }:
+ mkDerivation {
+ pname = "warp-grpc";
+ version = "0.1.0.3";
+ sha256 = "1x40jskp4c2dj4w3pfrw4f3ys9c64nlas2068s7zl05qayw21srf";
+ revision = "1";
+ editedCabalFile = "18mnn9wdhx8kv3y8nagkn7z7qmcyxnrcvigjyy378sfipcgjmdwc";
+ libraryHaskellDepends = [
+ async base binary bytestring case-insensitive http-types
+ http2-grpc-types proto-lens wai warp warp-tls
+ ];
+ description = "A minimal gRPC server on top of Warp";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"warp-static" = callPackage
({ mkDerivation, base, bytestring, cmdargs, containers, directory
, mime-types, text, wai-app-static, wai-extra, warp
@@ -218743,8 +223988,8 @@ self: {
}:
mkDerivation {
pname = "warped";
- version = "0.0.7";
- sha256 = "04090z3sz551q604kkpaqwy2i0wsnzbqrnanvkw0wg3nikh9a3s6";
+ version = "0.0.8";
+ sha256 = "13s9z1vlgi29rb4ay5d508snh982gp04vclv6y4fsga2gia4sbhz";
libraryHaskellDepends = [
aeson base blaze-builder conduit http-types lifted-async
monad-control preamble uuid wai wai-conduit wai-cors warp
@@ -218882,8 +224127,8 @@ self: {
}:
mkDerivation {
pname = "wavefront";
- version = "0.7.1.2";
- sha256 = "047hdcvrkh4xwyp8i18w45qx7nhd59iii34nrh6ih9k77l6rr4qj";
+ version = "0.7.1.3";
+ sha256 = "1sly9gxq06n4x262fav0zvfzhgnxca1xwh4q7b4lq6g3gpwld9s5";
libraryHaskellDepends = [
attoparsec base dlist filepath mtl text transformers vector
];
@@ -218961,6 +224206,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "weak-bag" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "weak-bag";
+ version = "0.1.0.0";
+ sha256 = "0jh5xv02wlifjqdvm2cr9mi3wjj4f14s1ap5pphin2rdzklhl3rc";
+ libraryHaskellDepends = [ base containers ];
+ description = "Mutable bag backed by weak pointers to each item";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"weather-api" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, HTTP, network
, network-uri, utf8-string, vector
@@ -219054,6 +224311,7 @@ self: {
testHaskellDepends = [ base bytestring HUnit network-uri text ];
description = "Composable, reversible, efficient web routing using invertible invariants and bijections";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"web-mongrel2" = callPackage
@@ -219332,6 +224590,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "web3_0_8_1_0" = callPackage
+ ({ mkDerivation, aeson, async, base, basement, bytestring, cereal
+ , cryptonite, data-default, exceptions, generics-sop, hspec
+ , hspec-contrib, hspec-discover, hspec-expectations, http-client
+ , http-client-tls, machines, memory, microlens, microlens-aeson
+ , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random
+ , relapse, secp256k1-haskell, split, stm, tagged, template-haskell
+ , text, time, transformers, vinyl
+ }:
+ mkDerivation {
+ pname = "web3";
+ version = "0.8.1.0";
+ sha256 = "0aliq3iblnlz7waswzprb8z28v82sjq8qpc2bbcyknmpp52p2r26";
+ libraryHaskellDepends = [
+ aeson async base basement bytestring cereal cryptonite data-default
+ exceptions generics-sop http-client http-client-tls machines memory
+ microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple
+ parsec relapse secp256k1-haskell tagged template-haskell text
+ transformers vinyl
+ ];
+ testHaskellDepends = [
+ aeson async base basement bytestring cereal cryptonite data-default
+ exceptions generics-sop hspec hspec-contrib hspec-discover
+ hspec-expectations http-client http-client-tls machines memory
+ microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple
+ parsec random relapse secp256k1-haskell split stm tagged
+ template-haskell text time transformers vinyl
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Ethereum API for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"webapi" = callPackage
({ mkDerivation, aeson, base, binary, blaze-builder, bytestring
, bytestring-lexing, bytestring-trie, case-insensitive, containers
@@ -219854,8 +225146,8 @@ self: {
}:
mkDerivation {
pname = "websockets";
- version = "0.12.5.1";
- sha256 = "1v9zmd34bmh0y02njff4n1vkp1d5jdpq9dlva0z7sr0glv8c3drz";
+ version = "0.12.5.2";
+ sha256 = "0wacifjbskkfv6xq1sbmc8p60wn767xcjhz8hn8hyijxrrmjabci";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -220367,8 +225659,8 @@ self: {
}:
mkDerivation {
pname = "wild-bind";
- version = "0.1.2.1";
- sha256 = "1jklfafgv9i2xzsrcz77wzf5p4sxz6cgk1nw3ydzsar5f3jyqxmf";
+ version = "0.1.2.3";
+ sha256 = "1dl3vh4xn6mml2mydapyqwlg872pczgz7lv912skzwnzv55hxg12";
libraryHaskellDepends = [
base containers semigroups text transformers
];
@@ -220417,8 +225709,8 @@ self: {
}:
mkDerivation {
pname = "wild-bind-x11";
- version = "0.2.0.4";
- sha256 = "0wfhva3xkjykf6nl4ghvmp7lx2g0isg09hhb4m44qg0cgv7rzh5z";
+ version = "0.2.0.6";
+ sha256 = "0dqxcmdx3dinqkpwdnkb5nlc0cvn1gnwril5qmzixzshh03c8va9";
libraryHaskellDepends = [
base containers fold-debounce mtl semigroups stm text transformers
wild-bind X11
@@ -220434,8 +225726,8 @@ self: {
({ mkDerivation, aeson, base, bytestring, utf8-string }:
mkDerivation {
pname = "wilton-ffi";
- version = "0.2.0.0";
- sha256 = "1n2cgf0cnpr7f9rgf2369qnz3mm1qvylpzncc7s42vcrrq4x3wj7";
+ version = "0.3.0.3";
+ sha256 = "1kpr1rg3nbvjvj29pa4b8ls52x0j6ixidnh6nm2jw3c2gplhmr5d";
libraryHaskellDepends = [ aeson base bytestring utf8-string ];
description = "Haskell modules support for Wilton JavaScript runtime";
license = stdenv.lib.licenses.mit;
@@ -220459,14 +225751,12 @@ self: {
({ mkDerivation, base, bytestring, deepseq, dnsapi }:
mkDerivation {
pname = "windns";
- version = "0.1.0.0";
- sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c";
- revision = "2";
- editedCabalFile = "19n1nb65mgz9rdp37z7sdmjxwcl2wnlrflqcwbhr99ly2anx0sy7";
+ version = "0.1.0.1";
+ sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8";
libraryHaskellDepends = [ base bytestring deepseq ];
librarySystemDepends = [ dnsapi ];
- description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library";
- license = stdenv.lib.licenses.gpl3;
+ description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library";
+ license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none;
}) {dnsapi = null;};
@@ -220504,35 +225794,35 @@ self: {
({ mkDerivation, aeson, base, binary, bytestring, cassava
, containers, cpu, deepseq, directory, gauge, hashable, megaparsec
, mtl, prettyprinter, prettyprinter-ansi-terminal, QuickCheck
- , scientific, serialise, text, transformers, unordered-containers
- , vector
+ , scientific, semigroups, serialise, text, time, transformers
+ , unordered-containers, vector
}:
mkDerivation {
pname = "winery";
- version = "0.2.1";
- sha256 = "09j7s44j5v6754g1v10yvmb7l9azn2p738x3c4p1iv6qlwghilbj";
+ version = "0.3.1";
+ sha256 = "1f63fgw7ky6kd0dk41rhqjxgvi33pa5ffrv0vk2i7dr88bmc1wgy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring containers cpu hashable megaparsec mtl
- prettyprinter prettyprinter-ansi-terminal scientific text
- transformers unordered-containers vector
+ prettyprinter prettyprinter-ansi-terminal scientific semigroups
+ text time transformers unordered-containers vector
];
executableHaskellDepends = [
aeson base bytestring containers cpu hashable megaparsec mtl
- prettyprinter prettyprinter-ansi-terminal scientific text
- transformers unordered-containers vector
+ prettyprinter prettyprinter-ansi-terminal scientific semigroups
+ text time transformers unordered-containers vector
];
testHaskellDepends = [
aeson base bytestring containers cpu hashable megaparsec mtl
prettyprinter prettyprinter-ansi-terminal QuickCheck scientific
- text transformers unordered-containers vector
+ semigroups text time transformers unordered-containers vector
];
benchmarkHaskellDepends = [
aeson base binary bytestring cassava containers cpu deepseq
directory gauge hashable megaparsec mtl prettyprinter
- prettyprinter-ansi-terminal scientific serialise text transformers
- unordered-containers vector
+ prettyprinter-ansi-terminal scientific semigroups serialise text
+ time transformers unordered-containers vector
];
description = "Sustainable serialisation library";
license = stdenv.lib.licenses.bsd3;
@@ -220630,6 +225920,16 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "with" = callPackage
+ ({ mkDerivation }:
+ mkDerivation {
+ pname = "with";
+ version = "0.1.0";
+ sha256 = "0jgm6w1xisyww81ak9rrrqmhgaiwdgk5rgvzax72rknzg9rb6701";
+ description = "Simple open product type";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"with-index" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -220758,6 +226058,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "wkt-geom" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+ , containers, geojson, hspec, lens, QuickCheck, scientific
+ , trifecta, utf8-string, vector
+ }:
+ mkDerivation {
+ pname = "wkt-geom";
+ version = "0.0.4";
+ sha256 = "00v2zqgy41zd13yyadiw9x3s2napz0wl3jcq10xbb3i59jb03fa2";
+ libraryHaskellDepends = [
+ base binary bytestring containers geojson scientific trifecta
+ utf8-string vector
+ ];
+ testHaskellDepends = [
+ ansi-wl-pprint base binary bytestring containers geojson hspec lens
+ QuickCheck scientific trifecta vector
+ ];
+ description = "A parser of WKT, WKB and eWKB";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wl-pprint" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -221619,6 +226941,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "writer-cps-exceptions" = callPackage
+ ({ mkDerivation, base, exceptions, transformers
+ , writer-cps-transformers
+ }:
+ mkDerivation {
+ pname = "writer-cps-exceptions";
+ version = "0.1.0.0";
+ sha256 = "1s44h5d0f847w3j65frvjq2g6khz2ipsch109qnq5h2vcbgxid4v";
+ libraryHaskellDepends = [
+ base exceptions transformers writer-cps-transformers
+ ];
+ description = "Control.Monad.Catch instances for the stricter CPS WriterT and RWST";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"writer-cps-full" = callPackage
({ mkDerivation, base, writer-cps-lens, writer-cps-morph
, writer-cps-mtl, writer-cps-transformers
@@ -221738,6 +227075,7 @@ self: {
];
description = "A simple CLI utility for interacting with a websocket";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ws-chans" = callPackage
@@ -221827,6 +227165,8 @@ self: {
pname = "wss-client";
version = "0.2.1.1";
sha256 = "1wgqd8hh22ld72c1ccfr191ydqb5fija6c1l0vbg7n8pldhmi92w";
+ revision = "1";
+ editedCabalFile = "03q6mpdy93y8kjmjcxpjasg6q1mg64az28z99gm2w2iih3mqa702";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -221835,6 +227175,7 @@ self: {
testHaskellDepends = [ base bytestring envy hspec skews text ];
description = "A-little-higher-level WebSocket client";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wtk" = callPackage
@@ -222197,10 +227538,10 @@ self: {
}:
mkDerivation {
pname = "x509";
- version = "1.7.3";
- sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21";
+ version = "1.7.4";
+ sha256 = "1vm1ir0q7nxcyq65bmw7hbwlmf3frya077v9jikcrh8igg18m717";
revision = "1";
- editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx";
+ editedCabalFile = "0p9zzzj118n8ymacj6yp7nkf22d09mj31wnzc1alq26w2ybcrifz";
libraryHaskellDepends = [
asn1-encoding asn1-parse asn1-types base bytestring containers
cryptonite hourglass memory mtl pem
@@ -222916,8 +228257,8 @@ self: {
}:
mkDerivation {
pname = "xml-basic";
- version = "0.1.3";
- sha256 = "0ma3bjjsvijknmdnywfk5ch9v5pymxbmkwgzzq58iiv26hkd3n4q";
+ version = "0.1.3.1";
+ sha256 = "1qm3g00zavdal1f1yj2jrg7lb6b845fbf63b4pym5p49wkw3yx4d";
libraryHaskellDepends = [
base containers data-accessor explicit-exception semigroups
utility-ht
@@ -222970,20 +228311,20 @@ self: {
"xml-conduit" = callPackage
({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
, bytestring, conduit, conduit-extra, containers
- , data-default-class, deepseq, hspec, HUnit, monad-control
- , resourcet, text, transformers, xml-types
+ , data-default-class, deepseq, doctest, hspec, HUnit, resourcet
+ , text, transformers, xml-types
}:
mkDerivation {
pname = "xml-conduit";
- version = "1.8.0";
- sha256 = "0di0ll2p4ykqnlipf2jrlalirxdf9wkli292245rgr3vcb9vz0h3";
+ version = "1.8.0.1";
+ sha256 = "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq";
libraryHaskellDepends = [
attoparsec base blaze-html blaze-markup bytestring conduit
- conduit-extra containers data-default-class deepseq monad-control
- resourcet text transformers xml-types
+ conduit-extra containers data-default-class deepseq resourcet text
+ transformers xml-types
];
testHaskellDepends = [
- base blaze-markup bytestring conduit containers hspec HUnit
+ base blaze-markup bytestring conduit containers doctest hspec HUnit
resourcet text transformers xml-types
];
description = "Pure-Haskell utilities for dealing with XML with the conduit package";
@@ -223609,8 +228950,8 @@ self: {
pname = "xmlhtml";
version = "0.2.5.2";
sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4";
- revision = "1";
- editedCabalFile = "15lvbvdcagnqr62wfs3zz9xlcv553jr4ixbl50fsaxhkvlnymk45";
+ revision = "2";
+ editedCabalFile = "1d7q7acdv72zbbqq2n0swf3ia3lz1zplni6q5r97sp2w1a3xm6hf";
libraryHaskellDepends = [
base blaze-builder blaze-html blaze-markup bytestring
bytestring-builder containers parsec text unordered-containers
@@ -223688,8 +229029,8 @@ self: {
}:
mkDerivation {
pname = "xmobar";
- version = "0.28";
- sha256 = "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd";
+ version = "0.28.1";
+ sha256 = "1zrpvr1nr6a55sxmjbacacflrxvnw6aibsdal19wx404r74qjgz5";
configureFlags = [
"-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
"-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -223726,8 +229067,8 @@ self: {
}:
mkDerivation {
pname = "xmonad";
- version = "0.14.2";
- sha256 = "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949";
+ version = "0.15";
+ sha256 = "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -223775,8 +229116,8 @@ self: {
}:
mkDerivation {
pname = "xmonad-contrib";
- version = "0.14";
- sha256 = "1660w3xhbfrlq8b8s1rviq2mcn1vyqpypli4023gqxwry52brk6y";
+ version = "0.15";
+ sha256 = "0r9yzgy67j4mi3dyxx714f0ssk5qzca5kh4zw0fhiz1pf008cxms";
libraryHaskellDepends = [
base bytestring containers directory extensible-exceptions filepath
mtl old-locale old-time process random semigroups unix utf8-string
@@ -223885,16 +229226,12 @@ self: {
}) {};
"xmonad-spotify" = callPackage
- ({ mkDerivation, base, containers, dbus, X11, xmonad
- , xmonad-contrib
- }:
+ ({ mkDerivation, base, containers, dbus, X11 }:
mkDerivation {
pname = "xmonad-spotify";
- version = "0.1.0.0";
- sha256 = "1sl26ffaklasgyns8iz4jwm4736vfkflcv3gayn9bvb1kfr6g7rm";
- libraryHaskellDepends = [
- base containers dbus X11 xmonad xmonad-contrib
- ];
+ version = "0.1.0.1";
+ sha256 = "11j2kd3l8yh3fn7smcggmi8jv66x80df52vwa7kmxchbsxf5qrpi";
+ libraryHaskellDepends = [ base containers dbus X11 ];
description = "Bind media keys to work with Spotify";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -223919,13 +229256,12 @@ self: {
}:
mkDerivation {
pname = "xmonad-vanessa";
- version = "2.0.0.0";
- sha256 = "1j1sd4lvhcg2g5s4bx9pmjnvsj495lksm3v6p4v8y8g5gc488njf";
+ version = "2.1.0.0";
+ sha256 = "1np1rq4rn7xm1wqj3bvb279xab7vv95vxhnnbrn6xjygzd7iblxx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
alsa-mixer base composition-prelude containers process X11 xmonad
- xmonad-contrib
];
executableHaskellDepends = [
base containers xmonad xmonad-contrib xmonad-spotify xmonad-volume
@@ -223938,14 +229274,16 @@ self: {
"xmonad-volume" = callPackage
({ mkDerivation, alsa-mixer, base, composition-prelude, containers
- , X11, xmonad
+ , X11
}:
mkDerivation {
pname = "xmonad-volume";
- version = "0.1.0.0";
- sha256 = "0n517ddbjpy6ylg3d1amz7asgc6sww2yy0bxasp0xsd40jc77cfx";
+ version = "0.1.0.1";
+ sha256 = "0lv1009d8w2xyx98c6g65z4mxp31jz79lqayvdw26a02kq63cild";
+ revision = "1";
+ editedCabalFile = "0wj87ijsfdzibx0k6m1pq2m47gkaddbdy282hcqiishfibkqrig5";
libraryHaskellDepends = [
- alsa-mixer base composition-prelude containers X11 xmonad
+ alsa-mixer base composition-prelude containers X11
];
description = "XMonad volume controls";
license = stdenv.lib.licenses.bsd3;
@@ -224442,6 +229780,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yak" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, hspec, lens
+ , template-haskell, text, time
+ }:
+ mkDerivation {
+ pname = "yak";
+ version = "0.1.0.0";
+ sha256 = "1zw522pijmad87986m663myzfkvm40y7w3g04z0f67yfzby4s19a";
+ libraryHaskellDepends = [
+ attoparsec base bytestring lens template-haskell text time
+ ];
+ testHaskellDepends = [ base bytestring hspec ];
+ description = "A strongly typed IRC library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yall" = callPackage
({ mkDerivation, base, categories, transformers }:
mkDerivation {
@@ -224625,15 +229980,15 @@ self: {
"yaml" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
- , conduit, containers, directory, filepath, hspec, HUnit, libyaml
- , mockery, resourcet, scientific, semigroups, template-haskell
- , temporary, text, transformers, unordered-containers, vector
+ , conduit, containers, directory, filepath, hspec, HUnit, mockery
+ , resourcet, scientific, semigroups, template-haskell, temporary
+ , text, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "yaml";
version = "0.8.32";
sha256 = "0cbsyh4ilvjzq1q7pxls43k6pdqxg1l85xzibcwpbvmlvrizh86w";
- configureFlags = [ "-fsystem-libyaml" ];
+ configureFlags = [ "-f-system-libyaml" ];
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -224641,7 +229996,6 @@ self: {
filepath resourcet scientific semigroups template-haskell text
transformers unordered-containers vector
];
- librarySystemDepends = [ libyaml ];
testHaskellDepends = [
aeson attoparsec base base-compat bytestring conduit containers
directory filepath hspec HUnit mockery resourcet scientific
@@ -224650,38 +230004,37 @@ self: {
];
description = "Support for parsing and rendering YAML documents";
license = stdenv.lib.licenses.bsd3;
- }) {inherit (pkgs) libyaml;};
+ }) {};
- "yaml_0_10_0" = callPackage
+ "yaml_0_11_0_0" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
, conduit, containers, directory, filepath, hspec, HUnit, libyaml
- , mockery, mtl, raw-strings-qq, resourcet, scientific, semigroups
+ , mockery, mtl, raw-strings-qq, resourcet, scientific
, template-haskell, temporary, text, transformers
, unordered-containers, vector
}:
mkDerivation {
pname = "yaml";
- version = "0.10.0";
- sha256 = "0kyfzcp3hlb44rpf28ipz0m5cpanj91hlhvr9kidvg71826s9xcm";
+ version = "0.11.0.0";
+ sha256 = "1gr72lb3zan7g9pxqzxn3zxcbnrkc0vapm2dvp1mdlm4576ncr76";
configureFlags = [ "-fsystem-libyaml" ];
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson attoparsec base bytestring conduit containers directory
- filepath mtl resourcet scientific semigroups template-haskell text
+ filepath libyaml mtl resourcet scientific template-haskell text
transformers unordered-containers vector
];
- librarySystemDepends = [ libyaml ];
testHaskellDepends = [
aeson attoparsec base base-compat bytestring conduit containers
- directory filepath hspec HUnit mockery mtl raw-strings-qq resourcet
- scientific semigroups template-haskell temporary text transformers
+ directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq
+ resourcet scientific template-haskell temporary text transformers
unordered-containers vector
];
description = "Support for parsing and rendering YAML documents";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs) libyaml;};
+ }) {};
"yaml-combinators" = callPackage
({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
@@ -224884,8 +230237,8 @@ self: {
pname = "yampa-canvas";
version = "0.2.2";
sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n";
- revision = "5";
- editedCabalFile = "18my271nsvb26sh5l45ng2zvwnm6fzw589cr9cipbpdaaqhyppfg";
+ revision = "7";
+ editedCabalFile = "1bj5ncrkwjpvjvrx0s23ksvwwsrybj7zl3sghl1d034wd9r89mxx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
@@ -224911,6 +230264,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yampa-gloss" = callPackage
+ ({ mkDerivation, base, gloss, Yampa }:
+ mkDerivation {
+ pname = "yampa-gloss";
+ version = "0.1.0.0";
+ sha256 = "1h9x76swrq64add2v6935542gh5l5rpf5nqdy1nl2q78ksk6r04g";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base gloss Yampa ];
+ description = "A GLOSS backend for Yampa";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"yampa-glut" = callPackage
({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space
, Yampa-core
@@ -224948,6 +230314,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yampa-test" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-test-quickcheck
+ , normaldistribution, QuickCheck, random, Yampa
+ }:
+ mkDerivation {
+ pname = "yampa-test";
+ version = "0.1.1";
+ sha256 = "1qc1aic4apml5akq056i5c460x12hf613r1zkisshjm0na4gx5mb";
+ libraryHaskellDepends = [
+ base normaldistribution QuickCheck Yampa
+ ];
+ testHaskellDepends = [
+ base Cabal cabal-test-quickcheck QuickCheck random Yampa
+ ];
+ description = "Testing library for Yampa";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"yampa2048" = callPackage
({ mkDerivation, base, gloss, random, Yampa }:
mkDerivation {
@@ -225231,8 +230615,8 @@ self: {
}:
mkDerivation {
pname = "yeshql-core";
- version = "4.1.0.1";
- sha256 = "1v15n7h69j6v3zgvdbvy08l8in9z3yl9cbbfny4998i4p7fl2nzn";
+ version = "4.1.0.2";
+ sha256 = "1zhpccdqy8y5ynyn2ax7p9l2lvz573f559iqkip26ijq84pjmny0";
libraryHaskellDepends = [
base containers convertible filepath parsec template-haskell
];
@@ -225250,8 +230634,8 @@ self: {
}:
mkDerivation {
pname = "yeshql-hdbc";
- version = "4.1.0.1";
- sha256 = "0a5wkjkq1lfqk5cv7wmxbx28j6r3xqj8bbkafxfjvs2s02x4qvvc";
+ version = "4.1.0.2";
+ sha256 = "1p2j0fys7kdgb9882hiifnc1r4768c8jp7qy69ns1nbhd4f55b7l";
libraryHaskellDepends = [
base containers convertible filepath HDBC parsec template-haskell
yeshql-core
@@ -225270,8 +230654,8 @@ self: {
}:
mkDerivation {
pname = "yeshql-postgresql-simple";
- version = "4.1.0.1";
- sha256 = "09sypmx1w5shn8sazhll02a4yjdhrrxr3cic74vr7ch08pjpkkyq";
+ version = "4.1.0.2";
+ sha256 = "0mpha4lwb8z89cqlqly6ipssx37abpq10wbrhl979gm25s9yp4ab";
libraryHaskellDepends = [
base containers convertible filepath parsec postgresql-simple
template-haskell yeshql-core
@@ -225420,8 +230804,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth";
- version = "1.6.4.1";
- sha256 = "1s1z39j7csp57py15w0il5bhi60y05b81abwfmccjllzzgs97m7j";
+ version = "1.6.5";
+ sha256 = "1crpqcx8zynwmas4ja5yv1jg4xvcv0hw7h11d5m8vld4fcs9dpdr";
libraryHaskellDepends = [
aeson authenticate base base16-bytestring base64-bytestring binary
blaze-builder blaze-html blaze-markup bytestring conduit
@@ -225563,8 +230947,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth-fb";
- version = "1.9.0";
- sha256 = "1hj6xb7rv28dz8jzygckqg5m5igy78zx0gpc6zmp7g5j0dvinxg8";
+ version = "1.9.1";
+ sha256 = "1368hxic51vnilwp6dygc98yfclqi0vn1vwkxpvdd9vzy73kdj0i";
libraryHaskellDepends = [
aeson base bytestring conduit fb http-conduit resourcet shakespeare
text time transformers unliftio wai yesod-auth yesod-core yesod-fb
@@ -225705,15 +231089,15 @@ self: {
"yesod-auth-oauth" = callPackage
({ mkDerivation, authenticate-oauth, base, bytestring, text
- , transformers, unliftio, yesod-auth, yesod-core, yesod-form
+ , unliftio, yesod-auth, yesod-core, yesod-form
}:
mkDerivation {
pname = "yesod-auth-oauth";
- version = "1.6.0";
- sha256 = "1czm2zs9w8aicpqxmcn97c6skrhcy7g57q51vvnf40pffblvh33g";
+ version = "1.6.0.1";
+ sha256 = "0b9sp2rbj8yd343whcgg1ph4ybfk136d0ln09q7z56xqxn4brl3s";
libraryHaskellDepends = [
- authenticate-oauth base bytestring text transformers unliftio
- yesod-auth yesod-core yesod-form
+ authenticate-oauth base bytestring text unliftio yesod-auth
+ yesod-core yesod-form
];
description = "OAuth Authentication for Yesod";
license = stdenv.lib.licenses.bsd3;
@@ -225726,8 +231110,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth-oauth2";
- version = "0.5.1.0";
- sha256 = "18mm1394rs93cchzglwdhzh5sc025bglgrqi4c0hi5hhw893k38z";
+ version = "0.5.2.0";
+ sha256 = "0pf1bplly18rjhagzkqacbpi5wq78kisg0vz217yml5z0xwy1rkj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -225970,20 +231354,20 @@ self: {
, clientsession, conduit, conduit-extra, containers, cookie
, deepseq, fast-logger, gauge, hspec, hspec-expectations
, http-types, HUnit, monad-logger, mtl, network, parsec
- , path-pieces, random, resourcet, rio, shakespeare
+ , path-pieces, primitive, random, resourcet, rio, shakespeare
, streaming-commons, template-haskell, text, time, transformers
, unix-compat, unliftio, unordered-containers, vector, wai
, wai-extra, wai-logger, warp, word8
}:
mkDerivation {
pname = "yesod-core";
- version = "1.6.6";
- sha256 = "0xahf6m5c7mkl74p0gimy4wb5w4s3lh92wwxmk517fbq666c92kb";
+ version = "1.6.8.1";
+ sha256 = "0kqgpcz1jihc80haidzx6cm75ak139q41195j8l3gz1vwbf94i9j";
libraryHaskellDepends = [
aeson auto-update base blaze-html blaze-markup byteable bytestring
case-insensitive cereal clientsession conduit conduit-extra
containers cookie deepseq fast-logger http-types monad-logger mtl
- parsec path-pieces random resourcet rio shakespeare
+ parsec path-pieces primitive random resourcet rio shakespeare
template-haskell text time transformers unix-compat unliftio
unordered-containers vector wai wai-extra wai-logger warp word8
];
@@ -226206,8 +231590,8 @@ self: {
}:
mkDerivation {
pname = "yesod-fay";
- version = "0.8.0";
- sha256 = "0inx11w4wdgnbxqghm9738qs19519dcdgyjmm3aah12wzv4i68gf";
+ version = "0.9.0";
+ sha256 = "186mxq6b5hl0ylsx9lajisywkc9klvbfbhq39pq497wk519ppc8s";
libraryHaskellDepends = [
aeson base bytestring data-default directory fay fay-dom filepath
monad-loops process pureMD5 shakespeare template-haskell text
@@ -226267,8 +231651,8 @@ self: {
}:
mkDerivation {
pname = "yesod-form";
- version = "1.6.2";
- sha256 = "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057";
+ version = "1.6.3";
+ sha256 = "15wvgrkqp57wrh8xv1ix86navy6llvagwp393w4b6azv758dims0";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder blaze-html blaze-markup
byteable bytestring containers data-default email-validate
@@ -226589,17 +231973,17 @@ self: {
"yesod-paginator" = callPackage
({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
, persistent, safe, text, transformers, uri-encode, yesod-core
- , yesod-persistent, yesod-test
+ , yesod-test
}:
mkDerivation {
pname = "yesod-paginator";
- version = "1.1.0.0";
- sha256 = "03h9zpplsglblcdf0cm36i3kmmfbhk6iqwq2vsh8nw5ygizcqh0n";
+ version = "1.1.0.1";
+ sha256 = "140b4cikshl5f229awnp5jcbnyln0bmzlqjfcwxzxssxwnviy93f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base blaze-markup path-pieces persistent safe text transformers
- uri-encode yesod-core yesod-persistent
+ uri-encode yesod-core
];
testHaskellDepends = [ base doctest hspec yesod-core yesod-test ];
description = "A pagination approach for yesod";
@@ -226649,8 +232033,8 @@ self: {
}:
mkDerivation {
pname = "yesod-persistent";
- version = "1.6.0";
- sha256 = "1gd59xf7b6v3cald58mzwnfbdzjr49cz60rm4wc5w9pvfx12pgj2";
+ version = "1.6.0.1";
+ sha256 = "0kxxm43d64lp4p7kmmpc9c0rany9nblf5dd1424m8wg3105cr2kl";
libraryHaskellDepends = [
base blaze-builder conduit persistent persistent-template
resource-pool resourcet transformers yesod-core
@@ -226909,6 +232293,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yesod-recaptcha2_0_3_0" = callPackage
+ ({ mkDerivation, aeson, base, classy-prelude, http-conduit
+ , yesod-auth, yesod-core, yesod-form
+ }:
+ mkDerivation {
+ pname = "yesod-recaptcha2";
+ version = "0.3.0";
+ sha256 = "12bgj16vfmvk6ri55wmx444njhlmf11v4cins8c1a6isjk8alhhc";
+ libraryHaskellDepends = [
+ aeson base classy-prelude http-conduit yesod-auth yesod-core
+ yesod-form
+ ];
+ description = "yesod recaptcha2";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yesod-routes" = callPackage
({ mkDerivation, base, bytestring, containers, hspec, HUnit
, path-pieces, template-haskell, text, vector
@@ -227087,33 +232488,31 @@ self: {
"yesod-static" = callPackage
({ mkDerivation, async, attoparsec, base, base64-bytestring
- , blaze-builder, byteable, bytestring, conduit, containers
- , cryptonite, cryptonite-conduit, css-text, data-default, directory
- , exceptions, file-embed, filepath, hashable, hjsmin, hspec
- , http-types, HUnit, memory, mime-types, old-time, process
- , resourcet, template-haskell, text, transformers, unix-compat
- , unordered-containers, wai, wai-app-static, wai-extra, yesod-core
- , yesod-test
+ , blaze-builder, bytestring, conduit, containers, cryptonite
+ , cryptonite-conduit, css-text, data-default, directory, file-embed
+ , filepath, hashable, hjsmin, hspec, http-types, HUnit, memory
+ , mime-types, process, template-haskell, text, transformers
+ , unix-compat, unordered-containers, wai, wai-app-static, wai-extra
+ , yesod-core, yesod-test
}:
mkDerivation {
pname = "yesod-static";
- version = "1.6.0";
- sha256 = "03l8jjn3pw7j38i91hakf1lgr4lf2lc610a783i7zhmr9f9ga2xx";
+ version = "1.6.0.1";
+ sha256 = "1jd0ryfr2vyrwasyvbqmc6j4ngv1lgz78w427f169l7gyl1firxb";
libraryHaskellDepends = [
- async attoparsec base base64-bytestring blaze-builder byteable
- bytestring conduit containers cryptonite cryptonite-conduit
- css-text data-default directory exceptions file-embed filepath
- hashable hjsmin http-types memory mime-types old-time process
- resourcet template-haskell text transformers unix-compat
- unordered-containers wai wai-app-static yesod-core
+ async attoparsec base base64-bytestring blaze-builder bytestring
+ conduit containers cryptonite cryptonite-conduit css-text
+ data-default directory file-embed filepath hashable hjsmin
+ http-types memory mime-types process template-haskell text
+ transformers unix-compat unordered-containers wai wai-app-static
+ yesod-core
];
testHaskellDepends = [
- async base base64-bytestring byteable bytestring conduit containers
- cryptonite cryptonite-conduit data-default directory exceptions
- file-embed filepath hjsmin hspec http-types HUnit memory mime-types
- old-time process resourcet template-haskell text transformers
- unix-compat unordered-containers wai wai-app-static wai-extra
- yesod-core yesod-test
+ async base base64-bytestring bytestring conduit containers
+ cryptonite cryptonite-conduit data-default directory file-embed
+ filepath hjsmin hspec http-types HUnit memory mime-types process
+ template-haskell text transformers unix-compat unordered-containers
+ wai wai-app-static wai-extra yesod-core yesod-test
];
description = "Static file serving subsite for Yesod Web Framework";
license = stdenv.lib.licenses.mit;
@@ -227207,8 +232606,8 @@ self: {
}:
mkDerivation {
pname = "yesod-test";
- version = "1.6.5";
- sha256 = "1n03h7rx9ixgvlf8isnr7b1g73fkpg8paiklr20b40x0yzvlc0my";
+ version = "1.6.5.1";
+ sha256 = "080m46nbjblna2b9gq8j4ngqsv0r5ww06p1v8cj3ia1qiqgjygsj";
libraryHaskellDepends = [
attoparsec base blaze-builder blaze-html bytestring
case-insensitive conduit containers cookie hspec-core html-conduit
@@ -227377,8 +232776,8 @@ self: {
}:
mkDerivation {
pname = "yet-another-logger";
- version = "0.3.0";
- sha256 = "0j58lamn7rxvkl0nha9mqpykwiklfg2hj9rm1cxfjlxciz1wg0ri";
+ version = "0.3.1";
+ sha256 = "1dbwrkya2c7wf5ccsvhnk7isc90pp7vwi8ff6yq15vsn4jbirpsq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -227399,6 +232798,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yggdrasil" = callPackage
+ ({ mkDerivation, base, cryptonite, hspec, memory, mtl, QuickCheck
+ , transformers
+ }:
+ mkDerivation {
+ pname = "yggdrasil";
+ version = "0.1.0.0";
+ sha256 = "1w1nlas5fb7zmd0kvzb68ihylpsg7pf084vd1xk60l6n60cc9m4j";
+ libraryHaskellDepends = [
+ base cryptonite memory mtl transformers
+ ];
+ testHaskellDepends = [ base cryptonite hspec QuickCheck ];
+ description = "Executable specifications of composable cryptographic protocols";
+ license = stdenv.lib.licenses.agpl3;
+ }) {};
+
"yhccore" = callPackage
({ mkDerivation, base, containers, mtl, pretty, uniplate }:
mkDerivation {
@@ -227986,12 +233401,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yoda" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "yoda";
+ version = "0.1.0.0";
+ sha256 = "1p8zvxf63fbj2dpp3pa9awq1jc0makyka42j1aqsljfp08nx4pzn";
+ libraryHaskellDepends = [ base ];
+ description = "Parser combinators for young padawans";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"yoga" = callPackage
({ mkDerivation, base, bindings-DSL, ieee754 }:
mkDerivation {
pname = "yoga";
- version = "0.0.0.2";
- sha256 = "1gkql9c7dd7h0wfq98mfhgjmqlxkdf4b66qympc7r8vyx38jps1c";
+ version = "0.0.0.5";
+ sha256 = "14az05jh60ncsyw859b9v9m7lb5xcgsv2478pa3if93vxy1h40ih";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bindings-DSL ieee754 ];
@@ -228409,13 +233835,14 @@ self: {
({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
, base-compat, boxes, bytestring, containers, directory, filepath
, formatting, Glob, hspec, hspec-core, HUnit, language-javascript
- , mtl, optparse-applicative, process, purescript, safe, text
- , transformers, transformers-base, transformers-compat, utf8-string
+ , mtl, optparse-applicative, process, purescript, QuickCheck, safe
+ , text, transformers, transformers-base, transformers-compat
+ , utf8-string
}:
mkDerivation {
pname = "zephyr";
- version = "0.1.4";
- sha256 = "0zsqn8rbrzdh1l2m44nqhcdx3y3lbxdvik4scs5lb0sz5a0rdx5q";
+ version = "0.2.0";
+ sha256 = "0n0z7s71gjlpra4ghfd51rcz5yqddzzwfdpjnhlxciakrabc5m3f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -228433,8 +233860,8 @@ self: {
testHaskellDepends = [
aeson ansi-terminal base base-compat bytestring containers
directory filepath hspec hspec-core HUnit language-javascript mtl
- optparse-applicative process purescript text transformers
- transformers-base transformers-compat utf8-string
+ optparse-applicative process purescript QuickCheck text
+ transformers transformers-base transformers-compat utf8-string
];
description = "Zephyr tree shaking for PureScript Language";
license = stdenv.lib.licenses.mpl20;
@@ -228637,6 +234064,7 @@ self: {
];
description = "More constrained extensions to zeromq4-haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zeroth" = callPackage
@@ -228843,6 +234271,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "zip_1_2_0" = callPackage
+ ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+ , cereal, conduit, conduit-extra, containers, digest, directory
+ , dlist, exceptions, filepath, hspec, monad-control, mtl
+ , QuickCheck, resourcet, temporary, text, time, transformers
+ , transformers-base
+ }:
+ mkDerivation {
+ pname = "zip";
+ version = "1.2.0";
+ sha256 = "1jbxnbiizdklv0pw8f22h38xbmk6d4wggy27w8injdsfi18f27dn";
+ revision = "1";
+ editedCabalFile = "084dfylc1h45r4v2zyld1vvrxs6x1ljq8hzinqrkv2ii748cmzdb";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring bzlib-conduit case-insensitive cereal conduit
+ conduit-extra containers digest directory dlist exceptions filepath
+ monad-control mtl resourcet text time transformers
+ transformers-base
+ ];
+ executableHaskellDepends = [ base filepath ];
+ testHaskellDepends = [
+ base bytestring conduit containers directory dlist exceptions
+ filepath hspec QuickCheck temporary text time transformers
+ ];
+ description = "Operations on zip archives";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"zip-archive" = callPackage
({ mkDerivation, array, base, binary, bytestring, Cabal, containers
, digest, directory, filepath, HUnit, mtl, pretty, process
@@ -228921,6 +234380,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "zip-stream_0_2_0_1" = callPackage
+ ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit
+ , conduit-extra, digest, directory, exceptions, filepath, mtl
+ , primitive, resourcet, text, time, transformers, transformers-base
+ , zlib
+ }:
+ mkDerivation {
+ pname = "zip-stream";
+ version = "0.2.0.1";
+ sha256 = "11x58s5w1lr8hw86grxijd94sw5r8k376b8n4dlm8lqz5xhmri5p";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary binary-conduit bytestring conduit conduit-extra digest
+ exceptions mtl primitive resourcet text time transformers-base zlib
+ ];
+ executableHaskellDepends = [
+ base bytestring conduit conduit-extra directory filepath resourcet
+ text time transformers
+ ];
+ description = "ZIP archive streaming using conduits";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"zipedit" = callPackage
({ mkDerivation, base, directory, mtl, process }:
mkDerivation {
@@ -229406,20 +234890,20 @@ self: {
"ztar" = callPackage
({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq
- , directory, extra, filepath, path, path-io, process, QuickCheck
- , tasty, tasty-quickcheck, text, unix-compat, zip, zlib
+ , directory, filepath, path, path-io, process, QuickCheck, tasty
+ , tasty-quickcheck, text, unix-compat, zip, zlib
}:
mkDerivation {
pname = "ztar";
- version = "0.2.0";
- sha256 = "1y6kkfwx3aw2fi46r7dg4q84mbhl54f2x4vpvwvzd9alz1nvv90i";
+ version = "1.0.0";
+ sha256 = "03a1amca24xpcjsx795pr1dqd78i8ickjqclbr5xcv74zzkhixp2";
libraryHaskellDepends = [
base bytestring deepseq directory filepath path process text
unix-compat zip zlib
];
testHaskellDepends = [
- base bytestring bytestring-arbitrary extra path path-io QuickCheck
- tasty tasty-quickcheck
+ base bytestring bytestring-arbitrary filepath path path-io
+ QuickCheck tasty tasty-quickcheck
];
description = "Creating and extracting arbitrary archives";
license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 10edf69478b..942163ea209 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -245,12 +245,13 @@ rec {
on hackage. This can be used as a test for the source distribution,
assuming the build fails when packaging mistakes are in the cabal file.
*/
- buildFromSdist = pkg: lib.overrideDerivation pkg (drv: {
- unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in ''
- echo "Source tarball is at ${src}/${tarname}.tar.gz"
- tar xf ${src}/${tarname}.tar.gz
- cd ${pkg.pname}-*
- '';
+ buildFromSdist = pkg: overrideCabal pkg (drv: {
+ src = "${sdistTarball pkg}/${pkg.pname}-${pkg.version}.tar.gz";
+
+ # Revising and jailbreaking the cabal file has been handled in sdistTarball
+ revision = null;
+ editedCabalFile = null;
+ jailbreak = false;
});
/* Build the package in a strict way to uncover potential problems.
@@ -299,12 +300,7 @@ rec {
overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
# Get all of the build inputs of a haskell package, divided by category.
- getBuildInputs = p:
- (overrideCabal p (args: {
- passthru = (args.passthru or {}) // {
- _getBuildInputs = extractBuildInputs p.compiler args;
- };
- }))._getBuildInputs;
+ getBuildInputs = p: p.getBuildInputs;
# Extract the haskell build inputs of a haskell package.
# This is useful to build environments for developing on that
@@ -339,55 +335,6 @@ rec {
, ...
}: { inherit doCheck doBenchmark; };
- # Divide the build inputs of the package into useful sets.
- extractBuildInputs = ghc:
- { setupHaskellDepends ? [], extraLibraries ? []
- , librarySystemDepends ? [], executableSystemDepends ? []
- , pkgconfigDepends ? [], libraryPkgconfigDepends ? []
- , executablePkgconfigDepends ? [], testPkgconfigDepends ? []
- , benchmarkPkgconfigDepends ? [], testDepends ? []
- , testHaskellDepends ? [], testSystemDepends ? []
- , testToolDepends ? [], benchmarkDepends ? []
- , benchmarkHaskellDepends ? [], benchmarkSystemDepends ? []
- , benchmarkToolDepends ? [], buildDepends ? []
- , libraryHaskellDepends ? [], executableHaskellDepends ? []
- , ...
- }@args:
- let inherit (ghcInfo ghc) isGhcjs nativeGhc;
- inherit (controlPhases ghc args) doCheck doBenchmark;
- isHaskellPkg = x: x ? isHaskellLibrary;
- allPkgconfigDepends =
- pkgconfigDepends ++ libraryPkgconfigDepends ++
- executablePkgconfigDepends ++
- lib.optionals doCheck testPkgconfigDepends ++
- lib.optionals doBenchmark benchmarkPkgconfigDepends;
- otherBuildInputs =
- setupHaskellDepends ++ extraLibraries ++
- librarySystemDepends ++ executableSystemDepends ++
- allPkgconfigDepends ++
- lib.optionals doCheck ( testDepends ++ testHaskellDepends ++
- testSystemDepends ++ testToolDepends
- ) ++
- # ghcjs's hsc2hs calls out to the native hsc2hs
- lib.optional isGhcjs nativeGhc ++
- lib.optionals doBenchmark ( benchmarkDepends ++
- benchmarkHaskellDepends ++
- benchmarkSystemDepends ++
- benchmarkToolDepends
- );
- propagatedBuildInputs =
- buildDepends ++ libraryHaskellDepends ++
- executableHaskellDepends;
- allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
- isHaskellPartition =
- lib.partition isHaskellPkg allBuildInputs;
- in
- { haskellBuildInputs = isHaskellPartition.right;
- systemBuildInputs = isHaskellPartition.wrong;
- inherit propagatedBuildInputs otherBuildInputs
- allPkgconfigDepends;
- };
-
# Utility to convert a directory full of `cabal2nix`-generated files into a
# package override set
#
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 45cc3711788..5803e2946bf 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -43,7 +43,7 @@ let
mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
inherit stdenv;
nodejs = buildPackages.nodejs-slim;
- inherit (self) buildHaskellPackages ghc;
+ inherit (self) buildHaskellPackages ghc shellFor;
inherit (self.buildHaskellPackages) jailbreak-cabal;
hscolour = overrideCabal self.buildHaskellPackages.hscolour (drv: {
isLibrary = false;
@@ -176,34 +176,39 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version);
# Creates a Haskell package from a source package by calling cabal2nix on the source.
- callCabal2nix = name: src: args: let
- filter = path: type:
- pkgs.lib.hasSuffix "${name}.cabal" path ||
- baseNameOf path == "package.yaml";
- expr = self.haskellSrc2nix {
- inherit name;
- src = if pkgs.lib.canCleanSource src
- then pkgs.lib.cleanSourceWith { inherit src filter; }
- else src;
- };
- in overrideCabal (callPackageKeepDeriver expr args) (orig: {
- inherit src;
- });
+ callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args:
+ let
+ filter = path: type:
+ pkgs.lib.hasSuffix "${name}.cabal" path ||
+ baseNameOf path == "package.yaml";
+ expr = self.haskellSrc2nix {
+ inherit name extraCabal2nixOptions;
+ src = if pkgs.lib.canCleanSource src
+ then pkgs.lib.cleanSourceWith { inherit src filter; }
+ else src;
+ };
+ in overrideCabal (callPackageKeepDeriver expr args) (orig: {
+ inherit src;
+ });
+
+ callCabal2nix = name: src: args: self.callCabal2nixWithOptions name src "" args;
# : { root : Path
+ # , name : Defaulted String
# , source-overrides : Defaulted (Either Path VersionNumber)
# , overrides : Defaulted (HaskellPackageOverrideSet)
# , modifier : Defaulted
# , returnShellEnv : Defaulted
# } -> NixShellAwareDerivation
- # Given a path to a haskell package directory whose cabal file is
- # named the same as the directory name, an optional set of
- # source overrides as appropriate for the 'packageSourceOverrides'
- # function, an optional set of arbitrary overrides, and an optional
- # haskell package modifier, return a derivation appropriate
- # for nix-build or nix-shell to build that package.
+ # Given a path to a haskell package directory, an optional package name
+ # which defaults to the base name of the path, an optional set of source
+ # overrides as appropriate for the 'packageSourceOverrides' function, an
+ # optional set of arbitrary overrides, and an optional haskell package
+ # modifier, return a derivation appropriate for nix-build or nix-shell to
+ # build that package.
developPackage =
{ root
+ , name ? builtins.baseNameOf root
, source-overrides ? {}
, overrides ? self: super: {}
, modifier ? drv: drv
@@ -213,7 +218,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
(pkgs.lib.composeExtensions
(self.packageSourceOverrides source-overrides)
overrides))
- .callCabal2nix (builtins.baseNameOf root) root {};
+ .callCabal2nix name root {};
in if returnShellEnv then (modifier drv).env else modifier drv;
ghcWithPackages = selectFrom: withPackages (selectFrom self);
@@ -256,20 +261,46 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
shellFor = { packages, withHoogle ? false, ... } @ args:
let
selected = packages self;
- packageInputs = builtins.map getBuildInputs selected;
- haskellInputs =
- builtins.filter
- (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)
- (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs);
+
+ packageInputs = map getBuildInputs selected;
+
+ name = if pkgs.lib.length selected == 1
+ then "ghc-shell-for-${(pkgs.lib.head selected).name}"
+ else "ghc-shell-for-packages";
+
+ # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`,
+ # because cabal will end up ignoring that built version, assuming
+ # new-style commands.
+ haskellInputs = pkgs.lib.filter
+ (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)
+ (pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs);
systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs;
+
withPackages = if withHoogle then self.ghcWithHoogle else self.ghcWithPackages;
+ ghcEnv = withPackages (p: haskellInputs);
+ nativeBuildInputs = pkgs.lib.concatMap (p: p.nativeBuildInputs) selected;
+
+ ghcCommand' = if ghc.isGhcjs or false then "ghcjs" else "ghc";
+ ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
+ ghcCommandCaps= pkgs.lib.toUpper ghcCommand';
+
mkDrvArgs = builtins.removeAttrs args ["packages" "withHoogle"];
in pkgs.stdenv.mkDerivation (mkDrvArgs // {
- name = "ghc-shell-for-packages";
- nativeBuildInputs = [(withPackages (_: haskellInputs))] ++ mkDrvArgs.nativeBuildInputs or [];
+ name = mkDrvArgs.name or name;
+
buildInputs = systemInputs ++ mkDrvArgs.buildInputs or [];
+ nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs ++ mkDrvArgs.nativeBuildInputs or [];
phases = ["installPhase"];
installPhase = "echo $nativeBuildInputs $buildInputs > $out";
+ LANG = "en_US.UTF-8";
+ LOCALE_ARCHIVE = pkgs.lib.optionalString (stdenv.hostPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
+ "NIX_${ghcCommandCaps}" = "${ghcEnv}/bin/${ghcCommand}";
+ "NIX_${ghcCommandCaps}PKG" = "${ghcEnv}/bin/${ghcCommand}-pkg";
+ # TODO: is this still valid?
+ "NIX_${ghcCommandCaps}_DOCDIR" = "${ghcEnv}/share/doc/ghc/html";
+ "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
+ then "${ghcEnv}/lib/HaLVM-${ghc.version}"
+ else "${ghcEnv}/lib/${ghcCommand}-${ghc.version}";
});
ghc = ghc // {
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
new file mode 100644
index 00000000000..68fcbdb79a5
--- /dev/null
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -0,0 +1,18 @@
+# EXTRA HASKELL PACKAGES NOT ON HACKAGE
+#
+# This file should only contain packages that are not in ./hackage-packages.nix.
+# Attributes in this set should be nothing more than a callPackage call.
+# Overrides to these packages should go to either configuration-nix.nix,
+# configuration-common.nix or to one of the compiler specific configuration
+# files.
+self: super: {
+
+ multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed"
+ + "to haskell-ci, which is now on hackage");
+
+ # https://github.com/channable/vaultenv/issues/1
+ vaultenv = self.callPackage ../tools/haskell/vaultenv { };
+
+ # https://github.com/diku-dk/futhark/issues/614
+ futhark = self.callPackage ../compilers/futhark { };
+}
diff --git a/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch b/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch
new file mode 100644
index 00000000000..d0df9b774e4
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/fgl-monad-fail.patch
@@ -0,0 +1,61 @@
+From 344a7e452630ace0f5c647e525e0299d99de5902 Mon Sep 17 00:00:00 2001
+From: Alex Washburn
+Date: Mon, 20 Aug 2018 23:46:32 -0400
+Subject: [PATCH] Fixing issue with MonadFailDesugaring.
+
+---
+ .travis.yml | 9 +++++++++
+ Data/Graph/Inductive/Monad.hs | 14 ++++++++++++--
+ fgl.cabal | 3 ++-
+ 3 files changed, 23 insertions(+), 3 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index db5eeb1..f026dd1 100644
+--- a/Data/Graph/Inductive/Monad.hs
++++ b/Data/Graph/Inductive/Monad.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE MultiParamTypeClasses #-}
++{-# LANGUAGE CPP, MultiParamTypeClasses #-}
+
+ -- (c) 2002 by Martin Erwig [see file COPYRIGHT]
+ -- | Monadic Graphs
+@@ -19,6 +19,10 @@ module Data.Graph.Inductive.Monad(
+
+
+ import Data.Graph.Inductive.Graph
++#if MIN_VERSION_base(4,12,0)
++import Control.Monad.Fail
++import Prelude hiding (fail)
++#endif
+
+ {-# ANN module "HLint: ignore Redundant lambda" #-}
+
+@@ -39,7 +43,13 @@ import Data.Graph.Inductive.Graph
+
+ -- Monadic Graph
+ --
+-class (Monad m) => GraphM m gr where
++class
++#if MIN_VERSION_base(4,12,0)
++ (MonadFail m)
++#else
++ (Monad m)
++#endif
++ => GraphM m gr where
+ {-# MINIMAL emptyM, isEmptyM, matchM, mkGraphM, labNodesM #-}
+
+ emptyM :: m (gr a b)
+diff --git a/fgl.cabal b/fgl.cabal
+index 4251a21..4b2a039 100644
+--- a/fgl.cabal
++++ b/fgl.cabal
+@@ -18,7 +18,8 @@ extra-source-files:
+ ChangeLog
+
+ tested-with: GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.2, GHC == 7.6.3,
+- GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.1.*
++ GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2,
++ GHC == 8.4.3, GHC == 8.6.1
+
+ source-repository head
+ type: git
diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix
index d16d9b2245d..844ce98cd4c 100644
--- a/pkgs/development/idris-modules/bi.nix
+++ b/pkgs/development/idris-modules/bi.nix
@@ -8,6 +8,7 @@ build-idris-package {
name = "bi";
version = "2018-06-25";
+ ipkgName = "Bi";
idrisDeps = [ contrib pruviloj ];
src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix
index 53b4fb0a004..3a915cd67f4 100644
--- a/pkgs/development/idris-modules/bifunctors.nix
+++ b/pkgs/development/idris-modules/bifunctors.nix
@@ -13,10 +13,6 @@ build-idris-package {
sha256 = "0cfp58lhm2g0g1vrpb0mh71qb44n2yvg5sil9ndyf2sqd5ria6yq";
};
- postUnpack = ''
- rm source/test.ipkg
- '';
-
meta = {
description = "A small bifunctor library for idris";
homepage = https://github.com/japesinator/Idris-Bifunctors;
diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix
index 3ed1404fef7..5e1288685a7 100644
--- a/pkgs/development/idris-modules/build-idris-package.nix
+++ b/pkgs/development/idris-modules/build-idris-package.nix
@@ -5,6 +5,7 @@
, noBase ? false
, name
, version
+ , ipkgName ? name
, extraBuildInputs ? []
, ...
}@attrs:
@@ -13,7 +14,10 @@ let
++ lib.optional (!noPrelude) idrisPackages.prelude
++ lib.optional (!noBase) idrisPackages.base;
idris-with-packages = idrisPackages.with-packages allIdrisDeps;
- newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "extraBuildInputs" "name" "version" ] // {
+ newAttrs = builtins.removeAttrs attrs [
+ "idrisDeps" "noPrelude" "noBase"
+ "name" "version" "ipkgName" "extraBuildInputs"
+ ] // {
meta = attrs.meta // {
platforms = attrs.meta.platforms or idrisPackages.idris.meta.platforms;
};
@@ -29,22 +33,29 @@ stdenv.mkDerivation ({
# opts = -i ../../path/to/package
# rather than the declarative pkgs attribute so we have to rewrite the path.
postPatch = ''
- sed -i *.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g"
+ runHook prePatch
+ sed -i ${ipkgName}.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g"
'';
buildPhase = ''
- idris --build *.ipkg
+ runHook preBuild
+ idris --build ${ipkgName}.ipkg
+ runHook postBuild
'';
checkPhase = ''
- if grep -q test *.ipkg; then
- idris --testpkg *.ipkg
+ runHook preCheck
+ if grep -q tests ${ipkgName}.ipkg; then
+ idris --testpkg ${ipkgName}.ipkg
fi
+ runHook postCheck
'';
installPhase = ''
- idris --install *.ipkg --ibcsubdir $out/libs
- IDRIS_DOC_PATH=$out/doc idris --installdoc *.ipkg || true
+ runHook preInstall
+ idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs
+ IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true
+ runHook postInstall
'';
} // newAttrs)
diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix
index 72e5e3f5be7..0f6e258ee20 100644
--- a/pkgs/development/idris-modules/canvas.nix
+++ b/pkgs/development/idris-modules/canvas.nix
@@ -6,6 +6,8 @@ build-idris-package {
name = "canvas";
version = "2017-11-09";
+ ipkgName = "idriscanvas";
+
src = fetchFromGitHub {
owner = "JinWuZhao";
repo = "idriscanvas";
diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix
index 1e234b3f693..91ee174dadf 100644
--- a/pkgs/development/idris-modules/categories.nix
+++ b/pkgs/development/idris-modules/categories.nix
@@ -6,11 +6,10 @@ build-idris-package {
name = "categories";
version = "2018-07-02";
- # https://github.com/danilkolikov/categories/pull/5
src = fetchFromGitHub {
- owner = "infinisil";
+ owner = "danilkolikov";
repo = "categories";
- rev = "9722d62297e5025431e91b271ab09c5d14867236";
+ rev = "a1e0ac0f0da2e336a7d3900051892ff7ed504c35";
sha256 = "1bbmm8zif5d5wckdaddw6q3c39w6ms1cxrlrmkdn7bik88dawff2";
};
diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix
index 7dbd1211088..c5e33f4594f 100644
--- a/pkgs/development/idris-modules/coda.nix
+++ b/pkgs/development/idris-modules/coda.nix
@@ -6,6 +6,8 @@ build-idris-package {
name = "coda";
version = "2018-01-25";
+ ipkgName = "Coda";
+
src = fetchFromGitHub {
owner = "ostera";
repo = "idris-coda";
diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix
index c12ea54f5f9..2fe783da448 100644
--- a/pkgs/development/idris-modules/containers.nix
+++ b/pkgs/development/idris-modules/containers.nix
@@ -17,10 +17,6 @@ build-idris-package {
sha256 = "0vyjadd9sb8qcbzvzhnqwc8wa7ma770c10xhn96jsqsnzr81k52d";
};
- postUnpack = ''
- rm source/containers-travis.ipkg
- '';
-
meta = {
description = "Various data structures for use in the Idris Language.";
homepage = https://github.com/jfdm/idris-containers;
diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix
index 7b6cb64cfe3..7f3164f3160 100644
--- a/pkgs/development/idris-modules/derive.nix
+++ b/pkgs/development/idris-modules/derive.nix
@@ -10,12 +10,11 @@ build-idris-package {
idrisDeps = [ contrib pruviloj ];
- # https://github.com/david-christiansen/derive-all-the-instances/pull/9
src = fetchFromGitHub {
- owner = "infinisil";
+ owner = "david-christiansen";
repo = "derive-all-the-instances";
- rev = "61c3e12e26f599379299fcbb9c40a81bfc3e0604";
- sha256 = "0g2lb8nrwqwf3gm5fir43cxz6db84n19xiwkv8cmmqc1fgy6v0qn";
+ rev = "0a9a5082d4ab6f879a2c141d1a7b645fa73fd950";
+ sha256 = "06za15m1kv9mijzll5712crry4iwx3b0fjv76gy9vv1p10gy2g4m";
};
meta = {
diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix
index 3989b8f4113..8b968c9732a 100644
--- a/pkgs/development/idris-modules/electron.nix
+++ b/pkgs/development/idris-modules/electron.nix
@@ -18,11 +18,6 @@ build-idris-package {
sha256 = "1rpa7yjvfpzl06h0qbk54jd2n52nmgpf7nq5aamcinqh7h5gbiwn";
};
- postUnpack = ''
- rm source/example_main.ipkg
- rm source/example_view.ipkg
- '';
-
meta = {
description = "Electron bindings for Idris";
homepage = https://github.com/jheiling/idris-electron;
diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix
index 8e979ea796e..06b8ec5e82d 100644
--- a/pkgs/development/idris-modules/free.nix
+++ b/pkgs/development/idris-modules/free.nix
@@ -6,6 +6,8 @@ build-idris-package {
name = "free";
version = "2017-07-03";
+ ipkgName = "idris-free";
+
src = fetchFromGitHub {
owner = "idris-hackers";
repo = "idris-free";
diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix
index 17706d1b096..79df925323e 100644
--- a/pkgs/development/idris-modules/hamt.nix
+++ b/pkgs/development/idris-modules/hamt.nix
@@ -5,7 +5,7 @@
, lib
}:
build-idris-package {
- name = "idris-hamt";
+ name = "hamt";
version = "2016-11-15";
idrisDeps = [ contrib effects ];
diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix
index 09fabb6715d..9e9736d2566 100644
--- a/pkgs/development/idris-modules/hrtime.nix
+++ b/pkgs/development/idris-modules/hrtime.nix
@@ -7,6 +7,7 @@ build-idris-package {
name = "hrtime";
version = "2017-04-16";
+ ipkgName = "hrTime";
idrisDeps = [ idrisscript ];
src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix
index d8b469ca768..5629221d601 100644
--- a/pkgs/development/idris-modules/idrishighlighter.nix
+++ b/pkgs/development/idris-modules/idrishighlighter.nix
@@ -8,6 +8,7 @@ build-idris-package {
name = "idrishighlighter";
version = "2018-02-22";
+ ipkgName = "idris-code-highlighter";
idrisDeps = [ effects lightyear ];
src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix
index 2281e4821f7..dae310cda05 100644
--- a/pkgs/development/idris-modules/jheiling-js.nix
+++ b/pkgs/development/idris-modules/jheiling-js.nix
@@ -8,6 +8,7 @@ build-idris-package {
name = "jheiling-js";
version = "2016-03-09";
+ ipkgName = "js";
idrisDeps = [ contrib jheiling-extras ];
src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix
index 9f4af7cc3b8..197cb1552cb 100644
--- a/pkgs/development/idris-modules/mhd.nix
+++ b/pkgs/development/idris-modules/mhd.nix
@@ -9,6 +9,7 @@ build-idris-package {
name = "mhd";
version = "2016-04-22";
+ ipkgName = "MHD";
idrisDeps = [ contrib effects ];
extraBuildInputs = [ libmicrohttpd ];
diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix
index 9ba8c6bb2d4..5ce9ad7e915 100644
--- a/pkgs/development/idris-modules/patricia.nix
+++ b/pkgs/development/idris-modules/patricia.nix
@@ -16,10 +16,6 @@ build-idris-package {
sha256 = "093q3qjmr93wv8pqwk0zfm3hzf14c235k9c9ip53rhg6yzcm0yqz";
};
- postUnpack = ''
- rm source/patricia-nix.ipkg
- '';
-
meta = {
description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array.";
homepage = https://github.com/ChShersh/idris-patricia;
diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix
index 8bcb67fa759..21b81f4a95c 100644
--- a/pkgs/development/idris-modules/permutations.nix
+++ b/pkgs/development/idris-modules/permutations.nix
@@ -13,10 +13,6 @@ build-idris-package {
sha256 = "1dirzqy40fczbw7gp2jr51lzqsnq5vcx9z5l6194lcrq2vxgzv1s";
};
- postUnpack = ''
- rm source/test.ipkg
- '';
-
meta = {
description = "Type-safe way of working with permutations in Idris";
homepage = https://github.com/vmchale/permutations;
diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix
index 78f3674aeab..dab6913ee8b 100644
--- a/pkgs/development/idris-modules/recursion_schemes.nix
+++ b/pkgs/development/idris-modules/recursion_schemes.nix
@@ -20,10 +20,6 @@ build-idris-package {
sha256 = "0rbx0yqa0fb7h7qfsvqvirc5q85z51rcwbivn6351jgn3a0inmhf";
};
- postUnpack = ''
- rm source/test.ipkg
- '';
-
meta = {
description = "Recursion schemes for Idris";
homepage = https://github.com/vmchale/recursion_schemes;
diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix
index 00252b6a7cd..433fdf64769 100644
--- a/pkgs/development/idris-modules/refined.nix
+++ b/pkgs/development/idris-modules/refined.nix
@@ -6,6 +6,8 @@ build-idris-package {
name = "refined";
version = "2017-12-28";
+ ipkgName = "idris-refined";
+
src = fetchFromGitHub {
owner = "janschultecom";
repo = "idris-refined";
@@ -13,10 +15,6 @@ build-idris-package {
sha256 = "1am7kfc51p2zlml954v8cl9xvx0g0f1caq7ni3z36xvsd7fh47yh";
};
- postUnpack = ''
- rm source/idris-refined-test.ipkg
- '';
-
meta = {
description = "Port of Scala/Haskell Refined library to Idris";
homepage = https://github.com/janschultecom/idris-refined;
diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix
index c8d993ccb8a..6d752fed0f9 100644
--- a/pkgs/development/idris-modules/snippets.nix
+++ b/pkgs/development/idris-modules/snippets.nix
@@ -7,6 +7,7 @@ build-idris-package {
name = "snippets";
version = "2018-03-17";
+ ipkgName = "idris-snippets";
idrisDeps = [ contrib ];
src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix
index 7f80a1ce3c5..98f4b4ea4d6 100644
--- a/pkgs/development/idris-modules/tap.nix
+++ b/pkgs/development/idris-modules/tap.nix
@@ -7,6 +7,7 @@ build-idris-package {
name = "tap";
version = "2017-04-08";
+ ipkgName = "TAP";
idrisDeps = [ contrib ];
src = fetchFromGitHub {
@@ -16,10 +17,6 @@ build-idris-package {
sha256 = "0fhlmmivq9xv89r7plrnhmvay1j7bapz3wh7y8lygwvcrllh9zxs";
};
- postUnpack = ''
- rm source/Draft.ipkg
- '';
-
meta = {
description = "A simple TAP producer and consumer/reporter for Idris";
homepage = https://github.com/ostera/tap-idris;
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index bd895a33bae..00d4adba5dc 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -6,6 +6,8 @@ build-idris-package {
name = "tparsec";
version = "2018-06-26";
+ ipkgName = "TParsec";
+
src = fetchFromGitHub {
owner = "gallais";
repo = "idris-tparsec";
diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix
index 7f1ecb61c8e..f6fdaf7a75e 100644
--- a/pkgs/development/idris-modules/vdom.nix
+++ b/pkgs/development/idris-modules/vdom.nix
@@ -6,6 +6,8 @@ build-idris-package {
name = "vdom";
version = "0.6.0";
+ ipkgName = "idris-vdom";
+
src = fetchFromGitHub {
owner = "brandondyck";
repo = "idris-vdom";
diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix
index ec689ce4805..61efb8cd575 100644
--- a/pkgs/development/idris-modules/yaml.nix
+++ b/pkgs/development/idris-modules/yaml.nix
@@ -8,6 +8,7 @@ build-idris-package {
name = "yaml";
version = "2018-01-25";
+ ipkgName = "Yaml";
idrisDeps = [ contrib lightyear ];
src = fetchFromGitHub {
diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix
index 0231555b4ad..ebe92f46898 100644
--- a/pkgs/development/idris-modules/yampa.nix
+++ b/pkgs/development/idris-modules/yampa.nix
@@ -7,6 +7,7 @@ build-idris-package {
name = "yampa";
version = "2016-07-05";
+ ipkgName = "idris-yampa";
idrisDeps = [ bifunctors ];
src = fetchFromGitHub {
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 14b9a78af46..cc88b32119e 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -4,15 +4,20 @@
let hashes = {
"8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
+ "8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd";
+};
+revs = {
+ "8.0" = "8.0";
+ "8.1" = "8.1";
};
in stdenv.mkDerivation rec {
name = "acl2-${version}";
- version = "8.0";
+ version = "8.1";
src = fetchFromGitHub {
owner = "acl2-devel";
repo = "acl2-devel";
- rev = "${version}";
+ rev = revs."${version}";
sha256 = hashes."${version}";
};
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 081f1a547d6..85794b09ae0 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchzip, gnugrep }:
stdenv.mkDerivation rec {
name = "bats-${version}";
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz";
};
- patchPhase = "patchShebangs ./install.sh";
+ patchPhase = ''
+ patchShebangs ./install.sh
+ substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep
+ '';
installPhase = "./install.sh $out";
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 0a54a916ba7..e6112c5a334 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -96,7 +96,8 @@ 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;
+ broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
};
}
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 4c697ec4e80..fa8996f0fb5 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, version ? "1.24.3" }:
+{ stdenv, fetchurl, unzip, version ? "2.0.0" }:
let
@@ -25,6 +25,14 @@ let
url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
sha256 = "d67b8f8f9186e7d460320e6bce25ab343c014b6af4b2f61369ee83755d4da528";
};
+ "2.0.0-x86_64-linux" = fetchurl {
+ url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip";
+ sha256 = "4014a1e8755d2d32cc1573b731a4a53acdf6dfca3e26ee437f63fe768501d336";
+ };
+ "2.0.0-i686-linux" = fetchurl {
+ url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
+ sha256 = "3164a9de70bf11ab5b20af0d51c8b3303f2dce584604dce33bea0040bdc0bbba";
+ };
"2.0.0-dev.26.0-x86_64-linux" = fetchurl {
url = "${dev}/${version}/sdk/dartsdk-linux-x64-release.zip";
sha256 = "18360489a7914d5df09b34934393e16c7627ba673c1e9ab5cfd11cd1d58fd7df";
diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix
index d97d416bc27..adbbbaff890 100644
--- a/pkgs/development/interpreters/elixir/1.7.nix
+++ b/pkgs/development/interpreters/elixir/1.7.nix
@@ -1,7 +1,7 @@
{ mkDerivation }:
mkDerivation rec {
- version = "1.7.3";
- sha256 = "0d7rj4khmvy76z12njzwzknm1j9rhjadgj9k1chjd4gnjffkb1aa";
+ version = "1.7.4";
+ sha256 = "0f8j4pib13kffiihagdwl3xqs3a1ak19qz3z8fpyfxn9dnjiinla";
minimumOTPVersion = "19";
}
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index ee524feb4c6..58b7fd71f0b 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -11,6 +11,16 @@ let
sha256 = "00fx5wc88ki3z71z5q4xzi9h3whhjw1zblpn09w995ygn07m9qhm";
};
+ makeOrderingPatch = fetchpatch {
+ url = "https://github.com/erlang/otp/commit/2f1a37f1011ff9d129bc35a6efa0ab937a2aa0e9.patch";
+ sha256 = "0xfa6hzxh9d7qllkyidcgh57xrrx11w65y7s1hyg52alm06l6b9n";
+ };
+
+ makeParallelInstallPatch = fetchpatch {
+ url ="https://github.com/erlang/otp/commit/de8fe86f67591dd992bae33f7451523dab36e5bd.patch";
+ sha256 = "1cj9fjhdng6yllajjm3gkk04ag9bwyb3n70hrb5nk6c292v8a45c";
+ };
+
in mkDerivation rec {
version = "18.3.4.8";
sha256 = "16c0h25hh5yvkv436ks5jbd7qmxzb6ndvk64mr404347a20iib0g";
@@ -18,5 +28,7 @@ in mkDerivation rec {
patches = [
rmAndPwdPatch
envAndCpPatch
+ makeOrderingPatch
+ makeParallelInstallPatch
];
}
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index d94d4a5a14d..e0d4ecbc95a 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -1,8 +1,8 @@
{ mkDerivation, fetchpatch }:
mkDerivation rec {
- version = "19.3.6.6";
- sha256 = "05l81gig0hmr951pjvwknc9x2qvpm95ph9z072hn4jqg13rzbgvg";
+ version = "19.3.6.11";
+ sha256 = "0b02iv8dly1vkc2xnqqi030sdj34h4gji2h4qgilllajr1f868vm";
patches = [
# macOS 10.13 crypto fix from OTP-20.1.2
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
index 19ac6d35592..c408d21d9b3 100644
--- a/pkgs/development/interpreters/erlang/R20.nix
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -1,8 +1,8 @@
{ mkDerivation }:
mkDerivation rec {
- version = "20.3.8";
- sha256 = "1griiszz1x34idmwi6234br7bqd1d7mimim63amjgi9ds79jh6jj";
+ version = "20.3.8.9";
+ sha256 = "0v2iiyzss8hiih98wvj0gi2qzdmmhh7bvc9p025wlfm4k7r1109a";
prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix
index e9aa2a3dc42..381ffc75f8c 100644
--- a/pkgs/development/interpreters/erlang/R21.nix
+++ b/pkgs/development/interpreters/erlang/R21.nix
@@ -1,8 +1,8 @@
{ mkDerivation }:
mkDerivation rec {
- version = "21.0";
- sha256 = "0khprgawmbdpn9b8jw2kksmvs6b45mibpjralsc0ggxym1397vm8";
+ version = "21.1.1";
+ sha256 = "1kgny4nvw40d93jn5f4y5bcfhdlshg79n2w7lr0xj35kgwkyci39";
prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index eb685f1d718..f6ff1e0db86 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -3,6 +3,7 @@
, openjdk ? null # javacSupport
, unixODBC ? null # odbcSupport
, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
+, withSystemd ? stdenv.isLinux, systemd # systemd support in epmd
}:
{ baseName ? "erlang"
@@ -17,7 +18,7 @@
, enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
-, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ]
+, wxSupport ? !stdenv.isDarwin, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ]
, preUnpack ? "", postUnpack ? ""
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""
@@ -53,6 +54,7 @@ in stdenv.mkDerivation ({
++ optionals wxSupport wxPackages2
++ optionals odbcSupport odbcPackages
++ optionals javacSupport javacPackages
+ ++ optional withSystemd systemd
++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]);
debugInfo = enableDebugInfo;
@@ -84,6 +86,7 @@ in stdenv.mkDerivation ({
++ optional javacSupport "--with-javac"
++ optional odbcSupport "--with-odbc=${unixODBC}"
++ optional wxSupport "--enable-wx"
+ ++ optional withSystemd "--enable-systemd"
++ optional stdenv.isDarwin "--enable-darwin-64bit";
# install-docs will generate and install manpages and html docs
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index 3f08ca8f7c2..02ce07bdf47 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -2,20 +2,20 @@
pythonPackages.buildPythonApplication rec {
name = "hy-${version}";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchurl {
url = "mirror://pypi/h/hy/${name}.tar.gz";
- sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98";
+ sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1";
};
- propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ];
-
- # The build generates a .json parser file in the home directory under .cache.
- # This is needed to get it to not try and open files in /homeless-shelter
- preConfigure = ''
- export HOME=$TMP
- '';
+ propagatedBuildInputs = with pythonPackages; [
+ appdirs
+ astor
+ clint
+ funcparserlib
+ rply
+ ];
meta = {
description = "A LISP dialect embedded in Python";
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index cb351446301..11feb1170c2 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchFromGitHub, readline, libedit }:
+{ stdenv, fetchFromGitHub, readline, libedit, bc }:
stdenv.mkDerivation rec {
name = "j-${version}";
- version = "808";
+ version = "807";
jtype = "release";
src = fetchFromGitHub {
owner = "jsoftware";
repo = "jsource";
rev = "j${version}-${jtype}";
- sha256 = "1sshm04p3yznlhfp6vyc7g8qxw95y67vhnh92cmz3lfy69n2q6bf";
+ sha256 = "1qciw2yg9x996zglvj2461qby038x89xcmfb3qyrh3myn8m1nq2n";
};
- buildInputs = [ readline libedit ];
+ buildInputs = [ readline libedit bc ];
bits = if stdenv.is64bit then "64" else "32";
platform =
- /*if stdenv.isRaspberryPi then "raspberry" else*/
+ if (stdenv.isAarch32 || stdenv.isAarch64) then "raspberry" else
if stdenv.isLinux then "linux" else
if stdenv.isDarwin then "darwin" else
"unknown";
@@ -24,18 +24,24 @@ stdenv.mkDerivation rec {
buildPhase = ''
export SOURCE_DIR=$(pwd)
export HOME=$TMPDIR
- export JBIN=$HOME/j${bits}/bin
export JLIB=$SOURCE_DIR/jlibrary
+
+ export jbld=$HOME/bld
+ export jplatform=${platform}
+ export jmake=$SOURCE_DIR/make
+ export jgit=$SOURCE_DIR
+ export JBIN=$jbld/j${bits}/bin
mkdir -p $JBIN
+ echo $OUT_DIR
+
cd make
patchShebangs .
- sed -i jvars.sh -e '
- s@~/gitdev/jsource@$SOURCE_DIR@;
+ sed -i jvars.sh -e "
+ s@~/git/jsource@$SOURCE_DIR@;
s@~/jbld@$HOME@;
- s@linux@${platform}@;
- '
+ "
sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;"
@@ -48,7 +54,7 @@ stdenv.mkDerivation rec {
#define jplatform "${platform}"
#define jtype "${jtype}" // release,beta,...
#define jlicense "GPL3"
- #define jbuilder "unknown" // website or email
+ #define jbuilder "nixpkgs" // website or email
' > ../jsrc/jversion.h
./build_jconsole.sh j${bits}
@@ -60,16 +66,17 @@ stdenv.mkDerivation rec {
# Now run the real tests
cd $SOURCE_DIR/test
- # for f in *.ijs
- # do
- # echo $f
- # $JBIN/jconsole < $f
- # done
+ for f in *.ijs
+ do
+ echo $f
+ $JBIN/jconsole < $f > /dev/null || echo FAIL && echo PASS
+ done
'';
installPhase = ''
mkdir -p "$out"
cp -r $JBIN "$out/bin"
+ rm $out/bin/*.txt # Remove logs from the bin folder
mkdir -p "$out/share/j"
cp -r $JLIB/{addons,system} "$out/share/j"
@@ -78,8 +85,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "J programming language, an ASCII-based APL successor";
- maintainers = with maintainers; [ raskin ];
- platforms = platforms.linux;
+ maintainers = with maintainers; [ raskin synthetica ];
+ platforms = with platforms; linux ++ darwin;
license = licenses.gpl3Plus;
homepage = http://jsoftware.com/;
};
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 5b8ae7e9ecc..1342d6c34d2 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "joker-${version}";
- version = "0.9.5";
+ version = "0.9.7";
goPackagePath = "github.com/candid82/joker";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "candid82";
repo = "joker";
- sha256 = "1sgxz0z6p92k1rhs5095l952a2db5w9yb2jy6cgglxw2arihxxb7";
+ sha256 = "0fl04xdpqmr5xpd4pvj72gdy3v1fr9z6h3ja7dmkama8fw2x4diz";
};
preBuild = "go generate ./...";
diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix
deleted file mode 100644
index be49d2dd921..00000000000
--- a/pkgs/development/interpreters/lua-4/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
- name = "lua-4.0.1";
-
- src = fetchurl {
- url = https://www.lua.org/ftp/lua-4.0.1.tar.gz;
- sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z";
- };
-
- configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config";
- buildFlags = "all so sobin";
- installFlags = "INSTALL_ROOT=$$out";
-
- hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
-
- meta = {
- homepage = http://www.lua.org;
- description = "Powerful, fast, lightweight, embeddable scripting language";
- longDescription = ''
- Lua combines simple procedural syntax with powerful data
- description constructs based on associative arrays and extensible
- semantics. Lua is dynamically typed, runs by interpreting bytecode
- for a register-based virtual machine, and has automatic memory
- management with incremental garbage collection, making it ideal
- for configuration, scripting, and rapid prototyping.
- '';
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux;
- branch = "4";
- };
-}
diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix
deleted file mode 100644
index d343ec6c63b..00000000000
--- a/pkgs/development/interpreters/lua-5/5.0.3.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
- name = "lua-5.0.3";
-
- src = fetchurl {
- url = https://www.lua.org/ftp/lua-5.0.3.tar.gz;
- sha256 = "1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671";
- };
-
- hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
-
- configurePhase = "sed -i -e 's/MYCFLAGS=.*/MYCFLAGS=-O3 -fomit-frame-pointer -fPIC/' config";
- buildFlags = "all so sobin";
- installFlags = "INSTALL_ROOT=$$out";
- installTargets = "install soinstall";
-
- meta = {
- homepage = http://www.lua.org;
- description = "Powerful, fast, lightweight, embeddable scripting language";
- longDescription = ''
- Lua combines simple procedural syntax with powerful data
- description constructs based on associative arrays and extensible
- semantics. Lua is dynamically typed, runs by interpreting bytecode
- for a register-based virtual machine, and has automatic memory
- management with incremental garbage collection, making it ideal
- for configuration, scripting, and rapid prototyping.
- '';
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 6d8de7bae27..a8badf647c0 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -10,11 +10,11 @@ in
stdenv.mkDerivation rec {
name = "lua-${version}";
luaversion = "5.2";
- version = "${luaversion}.3";
+ version = "${luaversion}.4";
src = fetchurl {
url = "https://www.lua.org/ftp/${name}.tar.gz";
- sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk";
+ sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
};
buildInputs = [ readline ];
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f6bd96af40f..cbe919c7092 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -18,11 +18,11 @@ let
in
stdenv.mkDerivation rec {
- version = "4.2.2";
+ version = "4.4.1";
name = "octave-${version}";
src = fetchurl {
url = "mirror://gnu/octave/${name}.tar.gz";
- sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p";
+ sha256 = "15xfcx6dc7p204b92i7va2a7ygff637l370x7zjj3vzl2brd1yq9";
};
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
@@ -46,17 +46,15 @@ stdenv.mkDerivation rec {
substituteInPlace libinterp/corefcn/help.cc \
--replace 'Vmakeinfo_program = "makeinfo"' \
'Vmakeinfo_program = "${texinfo}/bin/makeinfo"'
- ''
- # REMOVE ON VERSION BUMP
- # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234
- + stdenv.lib.optionalString stdenv.isDarwin ''
- sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc
'';
doCheck = !stdenv.isDarwin;
enableParallelBuilding = true;
+ # See https://savannah.gnu.org/bugs/?50339
+ F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else "";
+
configureFlags =
[ "--enable-readline"
"--enable-dl"
@@ -82,6 +80,7 @@ stdenv.mkDerivation rec {
homepage = http://octave.org/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [raskin];
+ description = "Scientific Pragramming Language";
platforms = if overridePlatforms == null then
(with stdenv.lib.platforms; linux ++ darwin)
else overridePlatforms;
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index ec4f971eeef..42cc2a518d6 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -37,20 +37,20 @@ let
stdenv.lib.optional crossCompiling "dev";
setOutputFlags = false;
+ disallowedReferences = [ stdenv.cc ];
+
patches =
- [ ]
- # Do not look in /usr etc. for dependencies.
- ++ optional (versionOlder version "5.26") ./no-sys-dirs.patch
- ++ optional (versionAtLeast version "5.26") ./no-sys-dirs-5.26.patch
- ++ optional (versionAtLeast version "5.24") (
+ [
+ # Do not look in /usr etc. for dependencies.
+ ./no-sys-dirs-5.26.patch
# Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360
- fetchurlBoot {
+ (fetchurlBoot {
url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch";
sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0";
})
+ ]
++ optional stdenv.isSunOS ./ld-shared.patch
- ++ optional stdenv.isDarwin ./cpp-precomp.patch
- ++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch
+ ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
++ optional crossCompiling ./MakeMaker-cross.patch;
postPatch = ''
@@ -77,6 +77,7 @@ let
"-Dlocincpth=${libcInc}/include"
"-Dloclibpth=${libcLib}/lib"
]
+ ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ]
++ optional stdenv.isSunOS "-Dcc=gcc"
++ optional enableThreading "-Dusethreads";
@@ -118,6 +119,7 @@ let
--replace "${
if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path"
}" /no-such-path \
+ --replace "${stdenv.cc}" /no-such-path \
--replace "$man" /no-such-path
'' + stdenv.lib.optionalString crossCompiling
''
@@ -151,11 +153,11 @@ let
platforms = platforms.all;
};
} // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
- crossVersion = "1.2";
+ crossVersion = "ab8d05c9e695d3db4f7dc15c70f23623349c2f49"; # Oct 03, 2018
perl-cross-src = fetchurlBoot {
- url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz";
- sha256 = "02cic7lk91hgmsg8klkm2kv88m2a8y22m4m8gl4ydxbap2z7g42r";
+ url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
+ sha256 = "1g7p7mqmx8x3diqvbh881gr72d106cn6yvm4gx7f0ars3n3b3wj0";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@@ -171,23 +173,20 @@ let
setupHook = ./setup-hook-cross.sh;
});
in rec {
- perl522 = common {
- version = "5.22.4";
- sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms";
- };
-
- perl524 = common {
- version = "5.24.4";
- sha256 = "0w0r6v5k5hw5q1k3p4c7krcxidkj2qzsj5dlrlrxhm01n7fksbxz";
- };
-
perl526 = common {
version = "5.26.2";
sha256 = "03gpnxx1g6hvlh0v4aqx00580h787sfywp1vlvw64q2xcbm9qbsp";
};
+ # the latest Maint version
perl528 = common {
version = "5.28.0";
sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky";
};
+
+ # the latest Devel version
+ perldevel = common {
+ version = "5.29.3";
+ sha256 = "054xi629408p2hv9475jghv6zd1bj69qqpiby8cy9qw5vismgi17";
+ };
}
diff --git a/pkgs/development/interpreters/perl/no-sys-dirs.patch b/pkgs/development/interpreters/perl/no-sys-dirs.patch
deleted file mode 100644
index 1793273a76f..00000000000
--- a/pkgs/development/interpreters/perl/no-sys-dirs.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
---- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200
-+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200
-@@ -106,15 +106,7 @@
- fi
-
- : Proper PATH setting
--paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
--paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
--paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
--paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
--paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
--paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
--paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
--paths="$paths /sbin /usr/sbin /usr/libexec"
--paths="$paths /system/gnu_library/bin"
-+paths=''
-
- for p in $paths
- do
-@@ -1337,8 +1329,7 @@
- archname=''
- : Possible local include directories to search.
- : Set locincpth to "" in a hint file to defeat local include searches.
--locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
--locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
-+locincpth=""
- :
- : no include file wanted by default
- inclwanted=''
-@@ -1349,17 +1340,12 @@
-
- libnames=''
- : change the next line if compiling for Xenix/286 on Xenix/386
--xlibpth='/usr/lib/386 /lib/386'
-+xlibpth=''
- : Possible local library directories to search.
--loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
--loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
-+loclibpth=""
-
- : general looking path for locating libraries
--glibpth="/lib /usr/lib $xlibpth"
--glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
--test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
--test -f /shlib/libc.so && glibpth="/shlib $glibpth"
--test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
-+glibpth=""
-
- : Private path used by Configure to find libraries. Its value
- : is prepended to libpth. This variable takes care of special
-@@ -1391,8 +1377,6 @@
- libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
--glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
--glibpth="/usr/shlib $glibpth"
- : Do not use vfork unless overridden by a hint file.
- usevfork=false
-
-@@ -2446,7 +2430,6 @@
- zip
- "
- pth=`echo $PATH | sed -e "s/$p_/ /g"`
--pth="$pth $sysroot/lib $sysroot/usr/lib"
- for file in $loclist; do
- eval xxx=\$$file
- case "$xxx" in
-@@ -4936,7 +4919,7 @@
- : Set private lib path
- case "$plibpth" in
- '') if ./mips; then
-- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
-+ plibpth="$incpath/usr/lib"
- fi;;
- esac
- case "$libpth" in
-@@ -8600,13 +8583,8 @@
- echo " "
- case "$sysman" in
- '')
-- syspath='/usr/share/man/man1 /usr/man/man1'
-- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
-- syspath="$syspath /usr/man/u_man/man1"
-- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
-- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
-- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
-- sysman=`./loc . /usr/man/man1 $syspath`
-+ syspath=''
-+ sysman=''
- ;;
- esac
- if $test -d "$sysman"; then
-@@ -19900,9 +19878,10 @@
- case "$full_ar" in
- '') full_ar=$ar ;;
- esac
-+full_ar=ar
-
- : Store the full pathname to the sed program for use in the C program
--full_sed=$sed
-+full_sed=sed
-
- : see what type gids are declared as in the kernel
- echo " "
-Only in perl-5.20.0/: Configure.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL
---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200
-@@ -126,11 +126,7 @@
- if ($dep =~ /(\S+errno\.h)/) {
- $file{$1} = 1;
- }
-- } elsif ($^O eq 'linux' &&
-- $Config{gccversion} ne '' &&
-- $Config{gccversion} !~ /intel/i
-- # might be using, say, Intel's icc
-- ) {
-+ } elsif (0) {
- # When cross-compiling we may store a path for gcc's "sysroot" option:
- my $sysroot = $Config{sysroot} || '';
- # Some Linuxes have weird errno.hs which generate
-Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh
---- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100
-+++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200
-@@ -119,21 +119,21 @@
- objformat=`/usr/bin/objformat`
- if [ x$objformat = xaout ]; then
- if [ -e /usr/lib/aout ]; then
-- libpth="/usr/lib/aout /usr/local/lib /usr/lib"
-- glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
-+ libpth=""
-+ glibpth=""
- fi
- lddlflags='-Bshareable'
- else
-- libpth="/usr/lib /usr/local/lib"
-- glibpth="/usr/lib /usr/local/lib"
-+ libpth=""
-+ glibpth=""
- ldflags="-Wl,-E "
- lddlflags="-shared "
- fi
- cccdlflags='-DPIC -fPIC'
- ;;
- *)
-- libpth="/usr/lib /usr/local/lib"
-- glibpth="/usr/lib /usr/local/lib"
-+ libpth=""
-+ glibpth=""
- ldflags="-Wl,-E "
- lddlflags="-shared "
- cccdlflags='-DPIC -fPIC'
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
---- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200
-@@ -150,25 +150,6 @@
- ;;
- esac
-
--# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
--# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us
--# where to look. We don't want gcc's own libraries, however, so we
--# filter those out.
--# This could be conditional on Unbuntu, but other distributions may
--# follow suit, and this scheme seems to work even on rather old gcc's.
--# This unconditionally uses gcc because even if the user is using another
--# compiler, we still need to find the math library and friends, and I don't
--# know how other compilers will cope with that situation.
--# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
--# we don't want its libraries. So we try to prefer the system gcc
--# Still, as an escape hatch, allow Configure command line overrides to
--# plibpth to bypass this check.
--if [ -x /usr/bin/gcc ] ; then
-- gcc=/usr/bin/gcc
--else
-- gcc=gcc
--fi
--
- case "$plibpth" in
- '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
- cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
-@@ -178,32 +159,6 @@
- ;;
- esac
-
--case "$libc" in
--'')
--# If you have glibc, then report the version for ./myconfig bug reporting.
--# (Configure doesn't need to know the specific version since it just uses
--# gcc to load the library for all tests.)
--# We don't use __GLIBC__ and __GLIBC_MINOR__ because they
--# are insufficiently precise to distinguish things like
--# libc-2.0.6 and libc-2.0.7.
-- for p in $plibpth
-- do
-- for trylib in libc.so.6 libc.so
-- do
-- if $test -e $p/$trylib; then
-- libc=`ls -l $p/$trylib | awk '{print $NF}'`
-- if $test "X$libc" != X; then
-- break
-- fi
-- fi
-- done
-- if $test "X$libc" != X; then
-- break
-- fi
-- done
-- ;;
--esac
--
- # Are we using ELF? Thanks to Kenneth Albanowski
- # for this test.
- cat >try.c <<'EOM'
-@@ -367,33 +322,6 @@
- ;;
- esac
-
--# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
--# true libraries. The scripts cause binding against static
--# version of -lgdbm which is a bad idea. So if we have 'nm'
--# make sure it can read the file
--# NI-S 2003/08/07
--case "$nm" in
-- '') ;;
-- *)
-- for p in $plibpth
-- do
-- if $test -r $p/libndbm.so; then
-- if $nm $p/libndbm.so >/dev/null 2>&1 ; then
-- echo 'Your shared -lndbm seems to be a real library.'
-- _libndbm_real=1
-- break
-- fi
-- fi
-- done
-- if $test "X$_libndbm_real" = X; then
-- echo 'Your shared -lndbm is not a real library.'
-- set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
-- shift
-- libswanted="$*"
-- fi
-- ;;
--esac
--
- # Linux on Synology.
- if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
- # Tested on Synology DS213 and DS413
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 37a51ffded3..f9938de6f59 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -3,7 +3,7 @@
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy
+, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
}:
with lib;
@@ -51,6 +51,7 @@ let
, calendarSupport ? config.php.calendar or true
, sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
, tidySupport ? (config.php.tidy or false)
+ , argon2Support ? (config.php.argon2 or true) && (versionAtLeast version "7.2")
}:
let
@@ -92,7 +93,8 @@ let
++ optional bz2Support bzip2
++ optional (mssqlSupport && !stdenv.isDarwin) freetds
++ optional sodiumSupport libsodium
- ++ optional tidySupport html-tidy;
+ ++ optional tidySupport html-tidy
+ ++ optional argon2Support libargon2;
CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
@@ -131,6 +133,7 @@ let
++ optionals mysqliSupport [
"--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}"
]
+ ++ optional ( pdo_mysqlSupport || mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
++ optional bcmathSupport "--enable-bcmath"
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
++ optionals gdSupport [
@@ -157,7 +160,8 @@ let
++ optional ztsSupport "--enable-maintainer-zts"
++ optional calendarSupport "--enable-calendar"
++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
- ++ optional tidySupport "--with-tidy=${html-tidy}";
+ ++ optional tidySupport "--with-tidy=${html-tidy}"
+ ++ optional argon2Support "--with-password-argon2=${libargon2}";
hardeningDisable = [ "bindnow" ];
@@ -219,13 +223,35 @@ let
};
in {
- php71 = generic {
- version = "7.1.21";
- sha256 = "104mn4kppklb21hgz1a50kgmc0ak5y996sx990xpc8yy9dbrqh62";
- };
-
- php72 = generic {
- version = "7.2.8";
- sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
- };
+ # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826
+ # We can't update the darwin versions because they simply don't compile at
+ # all due to a bug in the intl extensions.
+ #
+ # The bug so far is present in 7.1.21, 7.1.22, 7.1.23, 7.2.9, 7.2.10, 7.2.11.
+
+ php71 = generic (
+ if stdenv.isDarwin then
+ {
+ version = "7.1.20";
+ sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
+ }
+ else
+ {
+ version = "7.1.23";
+ sha256 = "0jyc5q666xh808sgy78cfylkhy5ma2zdg88jlxhagyphv23aly9d";
+ }
+ );
+
+ php72 = generic (
+ if stdenv.isDarwin then
+ {
+ version = "7.2.8";
+ sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
+ }
+ else
+ {
+ version = "7.2.11";
+ sha256 = "1idlv04j1l2d0bn5nvfrapcpjh6ayj1n4y80lqvnp5h75m07y3aa";
+ }
+ );
}
diff --git a/pkgs/development/interpreters/wasm/default.nix b/pkgs/development/interpreters/proglodyte-wasm/default.nix
similarity index 100%
rename from pkgs/development/interpreters/wasm/default.nix
rename to pkgs/development/interpreters/proglodyte-wasm/default.nix
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 7d6f2541d3d..976d30819db 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -43,6 +43,15 @@ stdenv.mkDerivation rec {
./deterministic-build.patch
];
+ # Hack hack hack to stop shit from failing from a missing _scproxy on Darwin. Since
+ # we only use this python for bootstrappy things, it doesn't really matter if it
+ # doesn't have perfect proxy support in urllib :) this just makes it fall back on env
+ # vars instead of attempting to read the proxy configuration automatically, so not a
+ # huge loss even if for whatever reason we did want proxy support.
+ postPatch = ''
+ substituteInPlace Lib/urllib.py --replace "if sys.platform == 'darwin'" "if False"
+ '';
+
DETERMINISTIC_BUILD = 1;
preConfigure = ''
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 8d4e68bf57c..27d01e4e1f5 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -4,6 +4,8 @@
, postBuild ? ""
, ignoreCollisions ? false
, requiredPythonModules
+# Wrap executables with the given argument.
+, makeWrapperArgs ? []
, }:
# Create a python executable that knows about additional packages.
@@ -32,7 +34,7 @@ let
if [ -f "$prg" ]; then
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
- makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true"
+ makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set PYTHONHOME "$out" --set PYTHONNOUSERSITE "true" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index e8b6cc93c2c..ee7d9dd6813 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -36,7 +36,7 @@ in
stdenv.mkDerivation rec {
name = "racket-${version}";
- version = "7.0";
+ version = "7.1"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
fetchurl rec {
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
}
)) {
inherit name;
- sha256 = "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a";
+ sha256 = "180z0z6srzyipi9wfnbh61nbvzxr5d1cls7wxapv6fw92y52jwz9";
};
FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index ba4e94cbf13..114023defcd 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
- sha256 = "0ivpr1a2w1ln1lx91q11rj9wp3rbfq33acrz2gxxvd80qqaq3zyh";
+ sha256 = "11vcqxdgyarv89ijd46wzrdl2wk7xjirg7ynlz7r0smdcqrcl711";
};
meta = oldAttrs.meta // {
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 4dff7e6974e..22b4f93b136 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -7,7 +7,7 @@ with pythonPackages;
stdenv.mkDerivation rec {
name = "renpy-${version}";
- version = "7.0.0";
+ version = "7.1.1";
meta = with stdenv.lib; {
description = "Ren'Py Visual Novel Engine";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
- sha256 = "0yrwp5iw4fjg7kbd041qv8gh2p0dnbrnkrgmn0ndk5k10pjij82g";
+ sha256 = "1lmahwgy5jyak0bdbh4jlr23x35f87k7jcydkywns3mph6q7r01i";
};
patches = [
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 9e6d35b818f..f1d48578541 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -111,8 +111,8 @@ let
postPatch = if isRuby25 then ''
sed -i configure.ac -e '/config.guess/d'
- cp ${config}/config.guess tool/
- cp ${config}/config.sub tool/
+ cp --remove-destination ${config}/config.guess tool/
+ cp --remove-destination ${config}/config.sub tool/
''
else opString useRailsExpress ''
sed -i configure.in -e '/config.guess/d'
@@ -202,26 +202,26 @@ let
in {
ruby_2_3 = generic {
- version = rubyVersion "2" "3" "7" "";
+ version = rubyVersion "2" "3" "8" "";
sha256 = {
- src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m";
- git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk";
+ src = "1gwsqmrhpx1wanrfvrsj3j76rv888zh7jag2si2r14qf8ihns0dm";
+ git = "0158fg1sx6l6applbq0831kl8kzx5jacfl9lfg0shfzicmjlys3f";
};
};
ruby_2_4 = generic {
- version = rubyVersion "2" "4" "4" "";
+ version = rubyVersion "2" "4" "5" "";
sha256 = {
- src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5";
- git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5";
+ src = "162izk7c72y73vmdgcbsh8kqihrbm65xvp53r1s139pzwqd78dv7";
+ git = "181za4h6bd2bkyzyknxc18i5gq0pnqag60ybc17p0ixw3q7pdj43";
};
};
ruby_2_5 = generic {
- version = rubyVersion "2" "5" "1" "";
+ version = rubyVersion "2" "5" "3" "";
sha256 = {
- src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s";
- git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj";
+ src = "0v4442aqqlzxwc792kbkfs2k61qg97r680is6gx20z63a8wd0a4q";
+ git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2";
};
};
}
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index ca180b3c229..c87cb120b40 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,17 +1,17 @@
{ patchSet, useRailsExpress, ops, patchLevel }:
rec {
- "2.3.7" = ops useRailsExpress [
+ "2.3.8" = 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"
];
- "2.4.4" = ops useRailsExpress [
+ "2.4.5" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
];
- "2.5.1" = ops useRailsExpress [
+ "2.5.3" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index ecbb1abb40c..ea96e5ed334 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -10,6 +10,9 @@ in stdenv.mkDerivation rec {
sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0";
};
+ outputs = [ "out" "dev" ];
+ setOutputFlags = false; # Configure script only understands --includedir
+
buildInputs = [ readline icu zlib nspr ];
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
@@ -32,6 +35,7 @@ in stdenv.mkDerivation rec {
export CXXFLAGS="-fpermissive"
export LIBXUL_DIST=$out
export PYTHON="${python2.interpreter}"
+ configureFlagsArray+=("--includedir=$dev/include")
cd js/src
@@ -45,10 +49,16 @@ in stdenv.mkDerivation rec {
"--with-intl-api"
"--enable-readline"
"--enable-shared-js"
- ];
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-jemalloc";
enableParallelBuilding = true;
+ postInstall = ''
+ moveToOutput bin/js52-config "$dev"
+ # Nuke a static lib.
+ rm $out/lib/libjs_static.ajs
+ '';
+
meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey;
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 2737fd6fae0..7109ec68d3c 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "Programming language for real time audio synthesis";
homepage = http://supercollider.sourceforge.net/;
license = stdenv.lib.licenses.gpl3Plus;
- platforms = stdenv.lib.platforms.linux;
+ platforms = [ "x686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix
new file mode 100644
index 00000000000..cf0fad18d1c
--- /dev/null
+++ b/pkgs/development/interpreters/wasm-gc/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ name = "wasm-gc-${version}";
+ version = "0.1.6";
+
+ src = fetchFromGitHub {
+ owner = "alexcrichton";
+ repo = "wasm-gc";
+ rev = version;
+ sha256 = "1lc30xxqp3vv1r269xzznh2lf2dzdq89bi5f1vmqjw4yc3xmawm7";
+ };
+
+ cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date
+
+ cargoSha256 = "1jvk9n324p3x3j6q6x0p5diig3b5c683k74cfflff25i7gsmmvc7";
+
+ meta = with stdenv.lib; {
+ description = "gc-sections for wasm";
+ homepage = "https://github.com/alexcrichton/wasm-gc";
+ maintainers = with maintainers; [ ekleog ];
+ platforms = platforms.all;
+ license = with licenses; [ mit asl20 ];
+ };
+}
diff --git a/pkgs/development/interpreters/wasm-gc/fix-build.patch b/pkgs/development/interpreters/wasm-gc/fix-build.patch
new file mode 100644
index 00000000000..3144dd89837
--- /dev/null
+++ b/pkgs/development/interpreters/wasm-gc/fix-build.patch
@@ -0,0 +1,34 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 923ed91..71f17c8 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -212,16 +212,16 @@ dependencies = [
+
+ [[package]]
+ name = "wasm-gc"
+-version = "0.1.1"
++version = "0.1.6"
+ dependencies = [
+ "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "wasm-gc-api 0.1.5",
++ "wasm-gc-api 0.1.6",
+ ]
+
+ [[package]]
+ name = "wasm-gc-api"
+-version = "0.1.5"
++version = "0.1.6"
+ dependencies = [
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parity-wasm 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -234,7 +234,7 @@ version = "0.1.0"
+ dependencies = [
+ "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "wasm-gc-api 0.1.5",
++ "wasm-gc-api 0.1.6",
+ ]
+
+ [[package]]
+
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 23a539491d0..787c54c1b0a 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
stdenv.mkDerivation rec {
- version = "4.12";
+ version = "4.13";
name = "cgal-" + version;
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
- sha256 = "0n4yvg2rkrlb1bwhykrg4iyqg4whxadcs441k10xx0r75i6220mn";
+ sha256 = "1gzfz0fz7q5qyhzwfl3n1f5jrqa1ijq9kjjms7hb0ywpagipq6ax";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 36d7912d0f8..66d540f8d66 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -1,22 +1,26 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper, shadow
-, libtool, gobjectIntrospection, polkit, systemd, coreutils }:
+, gobjectIntrospection, polkit, systemd, coreutils, meson, dbus
+, ninja, python3 }:
stdenv.mkDerivation rec {
name = "accountsservice-${version}";
- version = "0.6.50";
+ version = "0.6.54";
src = fetchurl {
url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
- sha256 = "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83";
+ sha256 = "1b115n0a4yfa06kgxc69qfc1rc0w4frgs3id3029czkrhhn0ds96";
};
- nativeBuildInputs = [ pkgconfig makeWrapper ];
+ nativeBuildInputs = [ pkgconfig makeWrapper meson ninja python3 ];
- buildInputs = [ glib intltool libtool gobjectIntrospection polkit systemd ];
+ buildInputs = [ glib intltool gobjectIntrospection polkit systemd dbus ];
- configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
- "--localstatedir=/var" ];
+ mesonFlags = [ "-Dsystemdsystemunitdir=etc/systemd/system"
+ "-Dlocalstatedir=/var" ];
prePatch = ''
+ chmod +x meson_post_install.py
+ patchShebangs meson_post_install.py
+
substituteInPlace src/daemon.c --replace '"/usr/sbin/useradd"' '"${shadow}/bin/useradd"' \
--replace '"/usr/sbin/userdel"' '"${shadow}/bin/userdel"'
substituteInPlace src/user.c --replace '"/usr/sbin/usermod"' '"${shadow}/bin/usermod"' \
diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch
index f26f5c73822..ef1a59b0249 100644
--- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch
+++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch
@@ -1,13 +1,15 @@
---- a/src/Makefile.in 2014-04-23 22:30:00.276005326 +0200
-+++ b/src/Makefile.in 2014-04-23 22:30:16.809409113 +0200
-@@ -881,8 +881,8 @@
- gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml
+diff --git a/meson_post_install.py b/meson_post_install.py
+index ba95055..17f7926 100644
+--- a/meson_post_install.py
++++ b/meson_post_install.py
+@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1])
+ # FIXME: meson will not track the creation of these directories
+ # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
+ dst_dirs = [
+- os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'),
+- os.path.join(localstatedir, 'lib', 'AccountsService', 'users'),
++ #os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'),
++ #os.path.join(localstatedir, 'lib', 'AccountsService', 'users'),
+ ]
- install-data-hook:
-- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users"
-- $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons"
-+# $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users"
-+# $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons"
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ for dst_dir in dst_dirs:
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index a1741513642..560ccb768b1 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ace-${version}";
- version = "6.5.1";
+ version = "6.5.2";
src = fetchurl {
url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
- sha256 = "1vwhyk0lrpnn78xx212d16lf7vl2q6651wc8vxqbd296x6wbnh2y";
+ sha256 = "1ibc62r3nh33c5w9mbnmzzhalb0jry6ccfb5ph62xsayy9nksfgh";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index a1c46660522..5ccb7f95ee1 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "3.7.16";
+ version = "3.7.17";
name = "afflib-${version}";
src = fetchFromGitHub {
owner = "sshock";
repo = "AFFLIBv3";
rev = "v${version}";
- sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6";
+ sha256 = "11q20n6p5nvwmd9wwk0addlfxpxagf47ly89scn3jvc7k484ksan";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
index ce25521ad2e..3ab4ed3e962 100644
--- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, agda, fetchsvn }:
+{ stdenv, agda, fetchFromGitHub }:
agda.mkDerivation (self: rec {
- version = "18734";
+ version = "1.4.0";
name = "agda-iowa-stdlib-${version}";
- src = fetchsvn {
- url = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib";
- rev = version;
- sha256 = "0aqib88m5n6aqb5lmns9nl62x40yqhg6zpj0zjxibbn4s4qjw9ky";
+ src = fetchFromGitHub {
+ owner = "cedille";
+ repo = "ial";
+ rev = "v${version}";
+ sha256 = "1gwxpybxwdj5ipbb3gapm7r5hfl3g6sj9kp13954pdmx8d5b0gma";
};
sourceDirectories = [ "./." ];
@@ -22,7 +23,5 @@ agda.mkDerivation (self: rec {
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-
- broken = true;
};
})
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index bd4270e8b93..12d35e27020 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -1,14 +1,14 @@
{ stdenv, agda, fetchFromGitHub, ghcWithPackages }:
agda.mkDerivation (self: rec {
- version = "0.16";
+ version = "0.16.1";
name = "agda-stdlib-${version}";
src = fetchFromGitHub {
repo = "agda-stdlib";
owner = "agda";
rev = "v${version}";
- sha256 = "0kqfx6742vbyyr8glqm5bkvj0z0y0dkaajlw10p3pzidrc17767r";
+ sha256 = "17dv5r3ygmbwwh7k8qaffp2965sv165b47i53ymc0gbfcwr6cy2n";
};
nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 015c48d0141..7dd0fcb5590 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec
{
name = "alembic-${version}";
- version = "1.7.8";
+ version = "1.7.9";
src = fetchFromGitHub {
owner = "alembic";
repo = "alembic";
rev = "${version}";
- sha256 = "1xmndhcliz25cgdzb7ybkvb05w4klmngpk76fzghamwyi79zfs2c";
+ sha256 = "0xyclln1m4079akr31vib242912004lln678prda0qwmwvsdrf7z";
};
outputs = [ "bin" "dev" "out" "lib" ];
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 21d9ce23d31..f53aa873b48 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version="4.4.2";
src = fetchurl {
- url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
+ url = "https://github.com/liballeg/allegro5/releases/download/${version}/${name}.tar.gz";
sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
};
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 48dfe9ad894..2aacfd07364 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -4,7 +4,7 @@
, libuuid, json-glib, meson, gperf, ninja
}:
stdenv.mkDerivation rec {
- name = "appstream-glib-0.7.10";
+ name = "appstream-glib-0.7.13";
outputs = [ "out" "dev" "man" "installedTests" ];
outputBin = "dev";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "hughsie";
repo = "appstream-glib";
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
- sha256 = "1m4gww09id7hwzh4hri1y3hp7p0mdrf6fk9f924r2w66hlsdil0d";
+ sha256 = "0r1gb806p68axspzwvpn1ygmd6pfc17mncg3i6yazk3n10k5cl06";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 4e2de01e9ad..fe159afe685 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -61,10 +61,11 @@ stdenv.mkDerivation rec {
inherit sslSupport bdbSupport ldapSupport;
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://apr.apache.org/;
description = "A companion library to APR, the Apache Portable Runtime";
- maintainers = [ stdenv.lib.maintainers.eelco ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.eelco ];
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 705f61445b5..ea84609868c 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "apr-1.6.3";
+ name = "apr-1.6.5";
src = fetchurl {
url = "mirror://apache/apr/${name}.tar.bz2";
- sha256 = "0wiik6amxn6lkc55fv9yz5i3kbxnqbp36alrzabx1avsdp8hc7qk";
+ sha256 = "01d1n1ql66bxsjx0wyzazmkqdqdmr0is6a7lwyy5kzy4z7yajz56";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
homepage = http://apr.apache.org/;
description = "The Apache Portable Runtime library";
platforms = platforms.all;
+ license = licenses.asl20;
maintainers = [ maintainers.eelco ];
};
}
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index bca519c7628..f94e0a3ee78 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "arb";
- version = "2.14.0";
+ version = "2.15.1";
src = fetchFromGitHub {
owner = "fredrik-johansson";
repo = "${pname}";
rev = "${version}";
- sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554";
+ sha256 = "148mn31xy4wgja2cainn2yaw1bjrppf1dxw2ngnvp7x5j7fms1am";
};
buildInputs = [mpir gmp mpfr flint];
configureFlags = [
diff --git a/pkgs/development/libraries/arrow-cpp/darwin.patch b/pkgs/development/libraries/arrow-cpp/darwin.patch
new file mode 100644
index 00000000000..de9b1986ffe
--- /dev/null
+++ b/pkgs/development/libraries/arrow-cpp/darwin.patch
@@ -0,0 +1,11 @@
+diff --git a/cmake_modules/FindPythonLibsNew.cmake b/cmake_modules/FindPythonLibsNew.cmake
+--- a/cmake_modules/FindPythonLibsNew.cmake
++++ b/cmake_modules/FindPythonLibsNew.cmake
+@@ -117,6 +117,7 @@ list(GET _PYTHON_VALUES 6 PYTHON_SIZEOF_VOID_P)
+ list(GET _PYTHON_VALUES 7 PYTHON_LIBRARY_SUFFIX)
+ list(GET _PYTHON_VALUES 8 PYTHON_LIBRARY_PATH)
+ list(GET _PYTHON_VALUES 9 PYTHON_OTHER_LIBS)
++string(REPLACE "-lncurses" "" PYTHON_OTHER_LIBS "${PYTHON_OTHER_LIBS}")
+
+ # Make sure the Python has the same pointer-size as the chosen compiler
+ # Skip the check on OS X, it doesn't consistently have CMAKE_SIZEOF_VOID_P defined
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 8e89aeb21a2..96259dc6694 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -1,39 +1,78 @@
-{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, python, rapidjson, snappy, zlib, zstd }:
+{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }:
+
+let
+ parquet-testing = fetchFromGitHub {
+ owner = "apache";
+ repo = "parquet-testing";
+ rev = "46ae2605c2de306f5740587107dcf333a527f2d1";
+ sha256 = "07ps745gas2zcfmg56m3vwl63yyzmalnxwb5dc40vd004cx5hdik";
+ };
+in
stdenv.mkDerivation rec {
name = "arrow-cpp-${version}";
- version = "0.10.0";
+ version = "0.11.0";
src = fetchurl {
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
- sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
+ sha256 = "0pc5pqr0dbnx8s1ji102dhw9bbrsq3ml4ac3mmi2022yfyizlf0q";
};
sourceRoot = "apache-arrow-${version}/cpp";
+ patches = [
+ # fix ARROW-3467
+ ./double-conversion_cmake.patch
+
+ # patch to fix python-test
+ ./darwin.patch
+
+ # facebook/zstd#1385
+ ./zstd136.patch
+ ];
+
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost python.pkgs.python python.pkgs.numpy ];
+ buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ];
preConfigure = ''
+ substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
substituteInPlace cmake_modules/FindBrotli.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
+ substituteInPlace cmake_modules/FindGLOG.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
substituteInPlace cmake_modules/FindLz4.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
+
+ patchShebangs build-support/
'';
BROTLI_HOME = symlinkJoin { name="brotli-wrap"; paths = [ brotli.lib brotli.dev ]; };
+ DOUBLE_CONVERSION_HOME = double-conversion;
FLATBUFFERS_HOME = flatbuffers;
- GTEST_HOME = gtest;
GFLAGS_HOME = gflags;
+ GLOG_HOME = glog;
+ GTEST_HOME = gtest;
LZ4_HOME = symlinkJoin { name="lz4-wrap"; paths = [ lz4 lz4.dev ]; };
RAPIDJSON_HOME = rapidjson;
SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; };
- ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; };
+ THRIFT_HOME = thrift;
+ ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib zlib.dev ]; };
ZSTD_HOME = zstd;
cmakeFlags = [
"-DARROW_PYTHON=ON"
+ "-DARROW_PARQUET=ON"
];
+ doInstallCheck = true;
+ PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null;
+ installCheckInputs = [ perl which ];
+ installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
+ for f in release/*-test; do
+ install_name_tool -add_rpath "$out"/lib "$f"
+ done
+ '') + ''
+ ctest -L unittest -V
+ '';
+
meta = {
description = "A cross-language development platform for in-memory data";
homepage = https://arrow.apache.org/;
diff --git a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch
new file mode 100644
index 00000000000..336fdde9e8f
--- /dev/null
+++ b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/cpp/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -615,7 +615,7 @@ endif(UNIX)
+ set(ARROW_LINK_LIBS)
+
+ # Libraries to link statically with libarrow.so
+-set(ARROW_STATIC_LINK_LIBS double-conversion)
++set(ARROW_STATIC_LINK_LIBS ${DOUBLE_CONVERSION_TARGET})
+
+ if (ARROW_WITH_BROTLI)
+ SET(ARROW_STATIC_LINK_LIBS
+@@ -694,7 +694,7 @@ else ()
+ set(ARROW_MIN_TEST_LIBS
+ arrow_shared
+ ${ARROW_LINK_LIBS}
+- double-conversion
++ ${DOUBLE_CONVERSION_TARGET}
+ ${BOOST_SYSTEM_LIBRARY}
+ ${BOOST_FILESYSTEM_LIBRARY}
+ ${BOOST_REGEX_LIBRARY}
+diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
+--- a/cmake_modules/ThirdpartyToolchain.cmake
++++ b/cmake_modules/ThirdpartyToolchain.cmake
+@@ -469,14 +469,16 @@ if("${DOUBLE_CONVERSION_HOME}" STREQUAL "")
+ set(DOUBLE_CONVERSION_VENDORED 1)
+ else()
+ find_package(double-conversion REQUIRED)
++ set(DOUBLE_CONVERSION_TARGET double-conversion::double-conversion)
+ set(DOUBLE_CONVERSION_VENDORED 0)
+ endif()
+
+ include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR})
+-ADD_THIRDPARTY_LIB(double-conversion
+- STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB})
+
+ if (DOUBLE_CONVERSION_VENDORED)
++ ADD_THIRDPARTY_LIB(double-conversion
++ STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB})
++ set(DOUBLE_CONVERSION_TARGET double-conversion)
+ add_dependencies(arrow_dependencies double-conversion_ep)
+ endif()
+
diff --git a/pkgs/development/libraries/arrow-cpp/zstd136.patch b/pkgs/development/libraries/arrow-cpp/zstd136.patch
new file mode 100644
index 00000000000..1bdeecaef99
--- /dev/null
+++ b/pkgs/development/libraries/arrow-cpp/zstd136.patch
@@ -0,0 +1,17 @@
+--- a/src/arrow/util/compression_zstd.cc
++++ b/src/arrow/util/compression_zstd.cc
+@@ -35,8 +35,13 @@ namespace util {
+
+ Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input, int64_t output_len,
+ uint8_t* output_buffer) {
++ void *safe_output_buffer = static_cast(output_buffer);
++ int dummy {};
++ if ((output_len == 0) && (output_buffer == NULL)) {
++ safe_output_buffer = static_cast(&dummy);
++ }
+ int64_t decompressed_size =
+- ZSTD_decompress(output_buffer, static_cast(output_len), input,
++ ZSTD_decompress(safe_output_buffer, static_cast(output_len), input,
+ static_cast(input_len));
+ if (decompressed_size != output_len) {
+ return Status::IOError("Corrupt ZSTD compressed data.");
diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix
index 58dd4f61423..72305cb633f 100644
--- a/pkgs/development/libraries/asio/generic.nix
+++ b/pkgs/development/libraries/asio/generic.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
homepage = http://asio.sourceforge.net/;
description = "Cross-platform C++ library for network and low-level I/O programming";
license = licenses.boost;
+ broken = stdenv.isDarwin; # test when updating to >=1.12.1
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 813f8c3c964..288bd9a9dd0 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd";
};
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index adcb86cedf8..8c8fe25f500 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "aubio-0.4.6";
+ name = "aubio-0.4.7";
src = fetchurl {
url = "https://aubio.org/pub/${name}.tar.bz2";
- sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx";
+ sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb";
};
nativeBuildInputs = [ pkgconfig python ];
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index e3c0f039477..320fc41f76c 100644
--- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
+++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "zita-alsa-pcmi-${version}";
- version = "0.2.0";
+ version = "0.3.2";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
- sha256 = "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9";
+ sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s";
};
buildInputs = [ alsaLib ];
buildPhase = ''
- cd libs
+ cd source
make PREFIX="$out"
# create lib link for building apps
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
# apps
cd ../apps
- CXXFLAGS+=" -I../libs" \
- LDFLAGS+=" -L../libs" \
+ CXXFLAGS+=" -I../source" \
+ LDFLAGS+=" -L../source" \
make PREFIX="$out"
'';
@@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
mkdir "$out/include"
mkdir "$out/bin"
- cd ../libs
+ cd ../source
- # libs
+ # source
install -Dm755 libzita-alsa-pcmi.so.$version \
"$out/lib/libzita-alsa-pcmi.so.$version"
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
install -Dm755 ../apps/alsa_delay \
"$out/bin/alsa_delay"
install -Dm755 ../apps/alsa_loopback \
- "$out/bin/alsa_delay"
+ "$out/bin/alsa_loopback"
'';
meta = {
diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix
index 11a06d4f39a..4fc5c12ccc4 100644
--- a/pkgs/development/libraries/audio/zita-convolver/default.nix
+++ b/pkgs/development/libraries/audio/zita-convolver/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "zita-convolver-${version}";
- version = "4.0.0";
+ version = "4.0.3";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
- sha256 = "0fx7f48ls0rlndqrmd4k7ifpnml39yxzc2f0n6xyysypgn06y673";
+ sha256 = "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs";
};
buildInputs = [ fftwFloat ];
patchPhase = ''
- cd libs
+ cd source
sed -e "s@ldconfig@@" -i Makefile
'';
diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix
index 00a0a508213..e9cccab39f0 100644
--- a/pkgs/development/libraries/audio/zita-resampler/default.nix
+++ b/pkgs/development/libraries/audio/zita-resampler/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "zita-resampler-${version}";
- version = "1.6.0";
+ version = "1.6.2";
src = fetchurl {
url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
- sha256 = "1w48lp99jn4wh687cvbnbnjgaraqzkb4bgir16cp504x55v8v20h";
+ sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3";
};
makeFlags = [
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
];
patchPhase = ''
- cd libs
+ cd source
sed -e "s@ldconfig@@" -i Makefile
'';
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 53e3f5468ab..971637bc787 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser
+{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages
, expat, gettext, intltool, glib, libiconv
, qt4 ? null
, qt4Support ? false
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
patches = [ ./no-mkdir-localstatedir.patch ];
- buildInputs = [ libdaemon dbus perl perlXMLParser glib expat libiconv ]
+ buildInputs = [ libdaemon dbus glib expat libiconv ]
+ ++ (with perlPackages; [ perl XMLParser ])
++ (stdenv.lib.optional qt4Support qt4);
nativeBuildInputs = [ pkgconfig gettext intltool glib ];
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 9afb03e0d0c..a7c918ee01a 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
else throw "Unsupported system!";
in stdenv.mkDerivation rec {
name = "aws-sdk-cpp-${version}";
- version = "1.5.17";
+ version = "1.6.20";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
- sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z";
+ sha256 = "0b6ahy748i29jqzzrjh8vybk7dv8qda3ir277mqflg4a8xxg9bj1";
};
# FIXME: might be nice to put different APIs in different outputs
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 1e341d3124b..027b86a9774 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "babl-0.1.56";
+ name = "babl-0.1.58";
src = fetchurl {
url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
- sha256 = "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla";
+ sha256 = "0mgdii9v89ay0nra36cz9i0q7cqv8wi8hk01jsc4bf0rc1bsxjbr";
};
doCheck = true;
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index 0a2badea7cb..3fcdbca34f5 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,54 +1,66 @@
-{ stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig
-, libstartup_notification, gobjectIntrospection, gtk-doc
+{ stdenv, autoconf, automake, libtool, gnome3, which, fetchgit, libgtop, libwnck3, glib, vala, pkgconfig
+, libstartup_notification, gobjectIntrospection, gtk-doc, docbook_xsl
, xorgserver, dbus, python2 }:
stdenv.mkDerivation rec {
- pname = "bamf";
- version = "0.5.3";
- name = "${pname}-${version}";
+ name = "bamf-2018-02-07";
outputs = [ "out" "dev" "devdoc" ];
- src = fetchurl {
- url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz";
- sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
+ src = fetchgit {
+ url = https://git.launchpad.net/~unity-team/bamf;
+ rev = "0.5.3+18.04.20180207.2-0ubuntu1";
+ sha256 = "0hvbgzi0mzzzvcamd9mi1ykbk2l6zxffspyk5fpik8bij56nhzym";
};
nativeBuildInputs = [
- pkgconfig
- gtk-doc
+ autoconf
+ automake
+ docbook_xsl
+ gnome3.gnome-common
gobjectIntrospection
+ gtk-doc
+ libtool
+ pkgconfig
vala
+ which
# Tests
- xorgserver
+ python2
+ python2.pkgs.libxslt
+ python2.pkgs.libxml2
dbus
- (python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ]))
+ xorgserver
];
buildInputs = [
+ glib
libgtop
- libwnck3
libstartup_notification
- glib
+ libwnck3
];
# Fix hard-coded path
# https://bugs.launchpad.net/bamf/+bug/1780557
postPatch = ''
- substituteInPlace data/Makefile.in \
+ substituteInPlace data/Makefile.am \
--replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user'
'';
configureFlags = [
"--enable-headless-tests"
+ "--enable-gtk-doc"
];
# fix paths
makeFlags = [
- "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/"
- "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+ "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/"
+ "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0"
];
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
# TODO: Requires /etc/machine-id
doCheck = false;
diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix
new file mode 100644
index 00000000000..da71e40187f
--- /dev/null
+++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix
@@ -0,0 +1,74 @@
+{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libatomic_ops
+, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
+}:
+
+stdenv.mkDerivation rec {
+ name = "boehm-gc-${version}";
+ version = "7.6.6";
+
+ src = fetchurl {
+ urls = [
+ "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
+ "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
+ ];
+ sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79";
+ };
+
+ buildInputs = [ libatomic_ops ];
+ nativeBuildInputs = [ pkgconfig ];
+
+ outputs = [ "out" "dev" "doc" ];
+ separateDebugInfo = stdenv.isLinux;
+
+ preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
+ export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
+ '';
+
+ patches = [ (fetchpatch {
+ url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch";
+ sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";
+ }) ] ++
+ # https://github.com/ivmai/bdwgc/pull/208
+ lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
+
+ configureFlags =
+ [ "--enable-cplusplus" ]
+ ++ lib.optional enableLargeConfig "--enable-large-config"
+ ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static";
+
+ doCheck = true; # not cross;
+
+ # Don't run the native `strip' when cross-compiling.
+ dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++";
+
+ longDescription = ''
+ The Boehm-Demers-Weiser conservative garbage collector can be used as a
+ garbage collecting replacement for C malloc or C++ new. It allows you
+ to allocate memory basically as you normally would, without explicitly
+ deallocating memory that is no longer useful. The collector
+ automatically recycles memory when it determines that it can no longer
+ be otherwise accessed.
+
+ The collector is also used by a number of programming language
+ implementations that either use C as intermediate code, want to
+ facilitate easier interoperation with C libraries, or just prefer the
+ simple collector interface.
+
+ Alternatively, the garbage collector may be used as a leak detector for
+ C or C++ programs, though that is not its primary goal.
+ '';
+
+ homepage = http://hboehm.info/gc/;
+
+ # non-copyleft, X11-style license
+ license = http://hboehm.info/gc/license.txt;
+
+ maintainers = [ ];
+ platforms = stdenv.lib.platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index da71e40187f..012c1d123b6 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
name = "boehm-gc-${version}";
- version = "7.6.6";
+ version = "7.6.8";
src = fetchurl {
urls = [
"http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
];
- sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79";
+ sha256 = "0n720a0i584ghcwmdsjiq6bl9ig0p9mrja29rp4cgsqvpz6wa2h4";
};
buildInputs = [ libatomic_ops ];
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 617484e5a40..c79b874ecb6 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -47,10 +47,24 @@ let
# To avoid library name collisions
layout = if taggedLayout then "tagged" else "system";
+ # Versions of b2 before 1.65 have job limits; specifically:
+ # - Versions before 1.58 support up to 64 jobs[0]
+ # - Versions before 1.65 support up to 256 jobs[1]
+ #
+ # [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632
+ # [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8
+ jobs =
+ if versionOlder version "1.58" then
+ "$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))"
+ else if versionOlder version "1.65" then
+ "$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))"
+ else
+ "$NIX_BUILD_CORES";
+
b2Args = concatStringsSep " " ([
"--includedir=$dev/include"
"--libdir=$out/lib"
- "-j$NIX_BUILD_CORES"
+ "-j${jobs}"
"--layout=${layout}"
"variant=${variant}"
"threading=${threading}"
@@ -74,6 +88,7 @@ let
] ++ optional (link != "static") "runtime-link=${runtime-link}"
++ optional (variant == "release") "debug-symbols=off"
++ optional (toolset != null) "toolset=${toolset}"
+ ++ optional (!enablePython) "--without-python"
++ optional (mpi != null || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam"
++ optionals (stdenv.hostPlatform.libc == "msvcrt") [
"threadapi=win32"
@@ -86,21 +101,17 @@ stdenv.mkDerivation {
inherit src;
- patchFlags = optionalString (stdenv.hostPlatform.libc == "msvcrt") "-p0";
+ patchFlags = "";
+
patches = patches
- ++ optional stdenv.isDarwin ./darwin-no-system-python.patch
- ++ optional (stdenv.hostPlatform.libc == "msvcrt") (fetchurl {
- url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"
- + "boost-mingw.patch";
- sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";
- });
+ ++ optional stdenv.isDarwin ./darwin-no-system-python.patch;
meta = {
homepage = http://boost.org/;
description = "Collection of C++ libraries";
license = stdenv.lib.licenses.boost;
- platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) platforms.unix;
+ platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) (platforms.unix ++ platforms.windows);
maintainers = with maintainers; [ peti wkennington ];
};
@@ -124,7 +135,8 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- nativeBuildInputs = [ which buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ which ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ expat zlib bzip2 libiconv ]
++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu
++ optional stdenv.isDarwin fixDarwinDylibNames
@@ -156,7 +168,7 @@ stdenv.mkDerivation {
postFixup = ''
# Make boost header paths relative so that they are not runtime dependencies
cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
- -exec sed '1i#line 1 "{}"' -i '{}' \;
+ -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \;
'' + optionalString (stdenv.hostPlatform.libc == "msvcrt") ''
$RANLIB "$out/lib/"*.a
'';
diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index ff48ffe67f0..9d65fb554ff 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -27,10 +27,11 @@ stdenv.mkDerivation rec {
mv ../include/openssl $out/include
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Free TLS/SSL implementation";
homepage = "https://boringssl.googlesource.com";
- platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+ platforms = platforms.all;
+ maintainers = [ maintainers.thoughtpolice ];
+ license = with licenses; [ openssl isc mit bsd3 ];
};
}
diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix
new file mode 100644
index 00000000000..b4a57396cc8
--- /dev/null
+++ b/pkgs/development/libraries/brigand/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ name = "brigand-${version}";
+ version = "1.3.0";
+
+ src = fetchFromGitHub {
+ owner = "edouarda";
+ repo = "brigand";
+ rev = "4db9f665b4ece31b51aaf35b499b2c8e5811efa3";
+ sha256 = "14b8r3s24zq0l3addy3irzxs5cyqn3763y5s310lmzzswgj1v7r4";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ description = "Instant compile time C++ 11 metaprogramming library";
+ longDescription = ''
+ Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.
+ Everything you were doing with Boost.MPL can be done with Brigand. And if that's not the case, open an issue!'';
+ homepage = https://github.com/edouarda/brigand;
+ license = licenses.boost;
+ maintainers = with maintainers; [ pmiddend ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 4d94faa9566..fca5e8d70a3 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut, darwin }:
+{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut
+, Cocoa, OpenGL
+}:
stdenv.mkDerivation rec {
name = "bullet-${version}";
@@ -11,10 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "1msp7w3563vb43w70myjmqsdb97kna54dcfa7yvi9l3bvamb92w3";
};
- buildInputs = [ cmake ] ++
- (if stdenv.isDarwin
- then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ]
- else [libGLU_combined freeglut]);
+ nativeBuildInputs = [ cmake ];
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ]
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
patches = [ ./gwen-narrowing.patch ];
@@ -28,25 +29,26 @@ stdenv.mkDerivation rec {
"-DBUILD_CPU_DEMOS=OFF"
"-DINSTALL_EXTRA_LIBS=ON"
] ++ 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"
+ "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework"
+ "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework"
+ "-DBUILD_BULLET2_DEMOS=OFF"
+ "-DBUILD_UNIT_TESTS=OFF"
];
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
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.
'';
homepage = http://bulletphysics.org;
- license = stdenv.lib.licenses.zlib;
- maintainers = with stdenv.lib.maintainers; [ aforemny ];
- platforms = with stdenv.lib.platforms; unix;
+ license = licenses.zlib;
+ maintainers = with maintainers; [ aforemny ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 1835356e627..099d02c8263 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
};
+ configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null;
+
# ares_android.h header is missing
# see issue https://github.com/c-ares/c-ares/issues/216
postPatch = if stdenv.hostPlatform.isAndroid then ''
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 397e80961e0..09c1560d6f6 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "actor-framework-${version}";
- version = "0.15.7";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = "${version}";
- sha256 = "0qmb18k162xdvf8z03mybjazkwb2vqda5xd1qh5bwkvxracwq3sb";
+ sha256 = "01i6sclxwa7k91ngi7jw9vlss8wjpv1hz4y5934jq0lx8hdf7s02";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index db46412ceb5..7c0664533b8 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -10,14 +10,14 @@
assert glSupport -> libGL != null;
let
- version = "1.15.12";
+ version = "1.15.14";
inherit (stdenv.lib) optional optionals;
in stdenv.mkDerivation rec {
name = "cairo-${version}";
src = fetchurl {
url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
- sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn";
+ sha256 = "1399jfdpdhn4hf812hxlj1gyi3bznxwzhp2rnyq1nxjs05n6nmhn";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index 78fcad5c1fe..b175250872f 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "capnproto-${version}";
- version = "0.6.1";
+ version = "0.7.0";
src = fetchurl {
url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
- sha256 = "010s9yhq4531wvdfrdf2477zswhck6cjfby79w73rff3v06090l0";
+ sha256 = "0hfdnhlbskagzgvby8wy6lrxj53zfzpfqimbhga68c0ji2yw1969";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 432e49c4354..043b9e263d8 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -2,7 +2,7 @@
, eigen
, fetchurl
, cmake
-, google-gflags ? null
+, google-gflags
, glog
, runTests ? false
}:
@@ -21,7 +21,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ eigen glog ]
- ++ stdenv.lib.optional (google-gflags != null) google-gflags;
+ ++ stdenv.lib.optional runTests google-gflags;
+
+ # The Basel BUILD file conflicts with the cmake build directory on
+ # case-insensitive filesystems, eg. darwin.
+ preConfigure = ''
+ rm BUILD
+ '';
doCheck = runTests;
diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index 7cb75d8de0f..1890d2b25a0 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, rebar, erlang, opencl-headers, ocl-icd }:
stdenv.mkDerivation rec {
- version = "1.2.3";
+ version = "1.2.4";
name = "cl-${version}";
src = fetchFromGitHub {
owner = "tonyrog";
repo = "cl";
rev = "cl-${version}";
- sha256 = "1dk0k03z0ipxvrnn0kihph135hriw96jpnd31lbq44k6ckh6bm03";
+ sha256 = "1gwkjl305a0231hz3k0w448dsgbgdriaq764sizs5qfn59nzvinz";
};
buildInputs = [ erlang rebar opencl-headers ocl-icd ];
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index e39386dca3f..7764e9c67ed 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp ];
- meta = {
+ meta = with stdenv.lib; {
description = "C/C++ library for numbers, a part of GiNaC";
homepage = http://www.ginac.de/CLN/;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.unix; # Once had cygwin problems
+ license = licenses.gpl2;
+ platforms = platforms.unix; # Once had cygwin problems
};
}
diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix
index 0db253bbec2..a14dec37047 100644
--- a/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/pkgs/development/libraries/clucene-core/2.x.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
doCheck = false; # fails with "Unable to find executable: /build/clucene-core-2.3.3.4/build/bin/cl_test"
- meta = {
+ meta = with stdenv.lib; {
description = "Core library for full-featured text search engine";
longDescription = ''
CLucene is a high-performance, scalable, cross platform, full-featured,
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
CLucene is a port of the very popular Java Lucene text search engine API.
'';
homepage = http://clucene.sourceforge.net;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = with licenses; [ asl20 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index b65e794a92a..8451b085372 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
patches = [ ./gcc6.patch ];
- meta = {
+ meta = with stdenv.lib; {
description = "Core library for full-featured text search engine";
longDescription = ''
CLucene is a high-performance, scalable, cross platform, full-featured,
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
CLucene is a port of the very popular Java Lucene text search engine API.
'';
homepage = http://clucene.sourceforge.net;
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = with licenses; [ asl20 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index a06691d5c71..428114986d1 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0fnblqm4igdx4rn3681bp1gm1y2i00if3iblhlm0zv6ck9nqlqfq";
};
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 9759e4904b2..6c895116531 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -10,10 +10,12 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
};
+ outputs = [ "out" "dev" ];
+
propagatedBuildInputs = [ clutter gtk3 ];
nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 705aa7252d1..090f85554b6 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib,
-gobjectIntrospection, gtk3, gnome3
+, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib
+, gobjectIntrospection, gtk3, gnome3, libinput, libgudev, libxkbcommon
}:
let
@@ -11,15 +11,17 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7";
};
+ outputs = [ "out" "dev" ];
+
buildInputs = [ gtk3 ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs =
[ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango
- atk json-glib gobjectIntrospection libxcb
+ atk json-glib gobjectIntrospection libxcb libinput libgudev libxkbcommon
];
configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
index 81df7e86319..fce02dac950 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/jgm/cmark;
maintainers = [ maintainers.michelk ];
platforms = platforms.unix;
+ license = licenses.bsd2;
};
}
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index e06c71c15db..f35335e4be7 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3
, mesa_noglu
, gstreamerSupport ? true, gst_all_1 }:
@@ -10,10 +10,29 @@ in stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "03f0ha3qk7ca0nnkkcr1garrm1n1vvfqhkz9lwjm592fnv6ii9rr";
};
+ patches = [
+ # Some deepin packages need the following patches. They have been
+ # submitted by Fedora on the GNOME Bugzilla
+ # (https://bugzilla.gnome.org/787443). Upstream thinks the patch
+ # could be merged, but dev can not make a new release.
+
+ (fetchpatch {
+ url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589;
+ sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998";
+ })
+
+ (fetchpatch {
+ url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056;
+ sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
+ })
+ ];
+
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ pkgconfig libintl ];
configureFlags = [
@@ -56,6 +75,7 @@ in stdenv.mkDerivation rec {
render without stepping on each other's toes.
'';
- platforms = stdenv.lib.platforms.mesaPlatforms;
+ platforms = platforms.mesaPlatforms;
+ license = with licenses; [ mit bsd3 publicDomain sgi-b-20 ];
};
}
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index 1f4b43db16c..f08077a9a3c 100644
--- a/pkgs/development/libraries/cpp-hocon/default.nix
+++ b/pkgs/development/libraries/cpp-hocon/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "cpp-hocon-${version}";
- version = "0.1.7";
+ version = "0.2.0";
src = fetchFromGitHub {
- sha256 = "0mfpz349c3arihvngw1a1gfhwlcw6wiwyc44bghjx1q109w7wm1m";
+ sha256 = "084vsn080z8mp5s54jaq0qdwlx0p62nbw1i0rffkag477h8vq68i";
rev = version;
repo = "cpp-hocon";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix
index 8f66b65e49a..6ec18b9514d 100644
--- a/pkgs/development/libraries/csfml/default.nix
+++ b/pkgs/development/libraries/csfml/default.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
'';
license = licenses.zlib;
maintainers = [ maintainers.jpdoyle ];
-
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix
index d50aca1679b..fd81de5139d 100644
--- a/pkgs/development/libraries/ctpl/default.nix
+++ b/pkgs/development/libraries/ctpl/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
description = "Template engine library written in C";
platforms = platforms.linux;
maintainers = [ maintainers.lethalman ];
+ license = licenses.gpl3Plus;
};
}
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index 55835cdb63d..5a2a53ef24d 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
doCheck = false; # fails
- meta = {
+ meta = with stdenv.lib; {
description = "A high performance templating engine";
homepage = http://ctpp.havoc.ru;
- maintainers = with stdenv.lib.maintainers; [ robbinch ];
- platforms = with stdenv.lib.platforms; linux;
+ maintainers = [ maintainers.robbinch ];
+ platforms = platforms.linux;
+ license = licenses.bsd2;
};
}
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 7a9e3991aad..cec7e1a2d51 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -36,15 +36,15 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-openssl=${openssl.dev}"
+ "--with-plugindir=${placeholder "out"}/lib/sasl2"
+ "--with-saslauthd=/run/saslauthd"
+ "--enable-login"
+ "--enable-shared"
] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}";
- # Set this variable at build-time to make sure $out can be evaluated.
- preConfigure = ''
- configureFlagsArray=( --with-plugindir=$out/lib/sasl2
- --with-saslauthd=/run/saslauthd
- --enable-login
- )
- '';
+ # Avoid triggering regenerating using broken autoconf/libtool bits.
+ # (many distributions carry patches to remove/replace, but this works for now)
+ dontUpdateAutotoolsGnuConfigScripts = if stdenv.hostPlatform.isMusl then true else null;
installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
@@ -55,8 +55,9 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = http://cyrusimap.web.cmu.edu/;
+ homepage = https://www.cyrusimap.org/sasl;
description = "Library for adding authentication support to connection-based protocols";
platforms = platforms.unix;
+ license = licenses.bsdOriginal;
};
}
diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix
index 840fa34d6ae..67e005943fa 100644
--- a/pkgs/development/libraries/czmq/4.x.nix
+++ b/pkgs/development/libraries/czmq/4.x.nix
@@ -1,21 +1,14 @@
{ stdenv, fetchurl, fetchpatch, zeromq }:
stdenv.mkDerivation rec {
- version = "4.0.2";
+ version = "4.1.1";
name = "czmq-${version}";
src = fetchurl {
url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz";
- sha256 = "12gbh57xnz2v82x1g80gv4bwapmyzl00lbin5ix3swyac8i7m340";
+ sha256 = "1h5hrcsc30fcwb032vy5gxkq4j4vv1y4dj460rfs1hhxi0cz83zh";
};
- patches = [
- (fetchpatch {
- url = https://patch-diff.githubusercontent.com/raw/zeromq/czmq/pull/1618.patch;
- sha256 = "1dssy7k0fni6djail8rz0lk8p777158jvrqhgn500i636gkxaxhp";
- })
- ];
-
# Needs to be propagated for the .pc file to work
propagatedBuildInputs = [ zeromq ];
diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
index 208288bfca1..0f897d97467 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "D-Bus for .NET: GLib integration module";
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix
index ef1ddd9bfff..cd020317f4c 100644
--- a/pkgs/development/libraries/dbus-sharp-glib/default.nix
+++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "D-Bus for .NET: GLib integration module";
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
index 013913e5297..18ea3ad3ecb 100644
--- a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
+++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "D-Bus for .NET";
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix
index 40c633dda52..2704ef2de9f 100644
--- a/pkgs/development/libraries/dbus-sharp/default.nix
+++ b/pkgs/development/libraries/dbus-sharp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, pkgconfig, mono, autoreconfHook }:
+{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }:
stdenv.mkDerivation rec {
name = "dbus-sharp-${version}";
@@ -13,12 +13,16 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ mono ];
+
+ # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
+ # See: https://github.com/NixOS/nixpkgs/pull/46060
+ buildInputs = [ mono48 ];
dontStrip = true;
meta = with stdenv.lib; {
description = "D-Bus for .NET";
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix
index 47f3794f5ad..1f8f9a4e69c 100644
--- a/pkgs/development/libraries/dclxvi/default.nix
+++ b/pkgs/development/libraries/dclxvi/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library";
maintainers = with maintainers; [ wkennington ];
platforms = platforms.x86_64;
+ license = licenses.publicDomain;
};
}
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index e5e3c2d662c..a88b3f1b9b6 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "19.13";
+ version = "19.16";
name = "dlib-${version}";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
- sha256 = "11ia4pd2lm2s9hzwrdvimj3r2qcnvjdp3g4fry2j1a6z9f99zvz3";
+ sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p";
};
postPatch = ''
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 7a33559cbc7..96375fcd5be 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "double-conversion-${version}";
- version = "3.0.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "google";
repo = "double-conversion";
rev = "v${version}";
- sha256 = "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz";
+ sha256 = "123rb2p4snqagrybw66vnapchqdwn2rfpr1wcq0ya9gwbyl7xccx";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
new file mode 100644
index 00000000000..8cc7a0bba62
--- /dev/null
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libuv, sqlite-replication }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ name = "dqlite-${version}";
+ version = "0.2.4";
+
+ src = fetchFromGitHub {
+ owner = "CanonicalLtd";
+ repo = "dqlite";
+ rev = "v${version}";
+ sha256 = "03dikhjppraagyvjx4zbp7f5jfg74jivighxkwrbzrcy0g8pmcvd";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+ buildInputs = [ libuv sqlite-replication ];
+
+ meta = {
+ description = "Expose a SQLite database over the network and replicate it across a cluster of peers";
+ homepage = https://github.com/CanonicalLtd/dqlite/;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ joko ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index 8c6337cfaf6..96e294ab2fb 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/pkgs/development/libraries/easyloggingpp/default.nix
@@ -4,12 +4,12 @@
{ stdenv, fetchFromGitHub, cmake, gtest }:
stdenv.mkDerivation rec {
name = "easyloggingpp-${version}";
- version = "9.96.4";
+ version = "9.96.5";
src = fetchFromGitHub {
owner = "muflihun";
repo = "easyloggingpp";
rev = "v${version}";
- sha256 = "0l0b8cssxkj0wlfqjj8hfnfvrjcxa81h947d54w86iadrilrsprb";
+ sha256 = "03jycliki3h6lc8kci26s6lnx5bap47xsnsjd375qgr9l11g76f5";
};
nativeBuildInputs = [cmake];
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 5cd004c8d13..23d20f418c3 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -3,16 +3,20 @@
, enablePython ? false, pythonPackages
, enablePosixThreads ? false
, enableOpenMPThreads ? false}:
-with stdenv.lib;
+with stdenv.lib;
stdenv.mkDerivation rec {
name = "eccodes-${version}";
- version = "2.8.2";
+ version = "2.9.0";
src = fetchurl {
- url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
- sha256 = "0aki7llrdfj6273yjy8yv0d027sdbv8xs3iv68fb69s0clyygrin";
+ url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
+ sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z";
};
+ postPatch = ''
+ substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir}
+ '';
+
nativeBuildInputs = [ cmake ];
buildInputs = [ netcdf
@@ -43,7 +47,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = https://software.ecmwf.int/wiki/display/ECC/;
+ homepage = https://confluence.ecmwf.int/display/ECC/;
license = licenses.asl20;
maintainers = with maintainers; [ knedlsepp ];
platforms = platforms.unix;
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index d9b5a2b64d6..90e3ee9af5b 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -2,17 +2,17 @@
stdenv.mkDerivation rec {
name = "editline-${version}";
- version = "1.15.3";
+ version = "1.16.0";
src = fetchFromGitHub {
owner = "troglobit";
repo = "editline";
rev = version;
- sha256 = "0dm5fgq0acpprr938idwml64nclg9l6c6avirsd8r6f40qicbgma";
+ sha256 = "0a751dp34mk9hwv59ss447csknpm5i5cgd607m3fqf24rszyhbf2";
};
nativeBuildInputs = [ autoreconfHook ];
- dontDisableStatic = true;
+ outputs = [ "out" "dev" "man" "doc" ];
meta = with stdenv.lib; {
homepage = http://troglobit.com/editline.html;
diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index e6d13a5915a..e3367f661ca 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, fetchpatch, cmake}:
let
- version = "3.3.4";
+ version = "3.3.5";
in
stdenv.mkDerivation {
name = "eigen-${version}";
@@ -9,18 +9,9 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
- sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2";
+ sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04";
};
- patches = [
- # Remove for > 3.3.4
- # Upstream commit from 6 Apr 2018 "Fix cmake scripts with no fortran compiler"
- (fetchpatch {
- url = "https://bitbucket.org/eigen/eigen/commits/ba14974d054ae9ae4ba88e5e58012fa6c2729c32/raw";
- sha256 = "0fskiy9sbzvp693fcyv3pfq8kxxx3d3mgmaqvjbl5bpfjivij8l1";
- })
- ];
-
nativeBuildInputs = [ cmake ];
postInstall = ''
diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix
index 48e5b73d9e7..ab8c217dce4 100644
--- a/pkgs/development/libraries/elf-header/default.nix
+++ b/pkgs/development/libraries/elf-header/default.nix
@@ -32,6 +32,7 @@ stdenvNoCC.mkDerivation {
'';
meta = libc.meta // {
+ outputsToInstall = [ "out" ];
description = "The datastructures of ELF according to the target platform's libc";
longDescription = ''
The Executable and Linkable Format (ELF, formerly named Extensible Linking
diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix
index c51475ecc2a..a9446306d33 100644
--- a/pkgs/development/libraries/enchant/default.nix
+++ b/pkgs/development/libraries/enchant/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ aspell glib hunspell hspell ];
- meta = {
+ meta = with stdenv.lib; {
description = "Generic spell checking library";
homepage = http://www.abisource.com/enchant;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index cc62b2776ed..7c3dd19a479 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "epoxy-${version}";
- version = "1.5.1";
+ version = "1.5.2";
src = fetchFromGitHub {
owner = "anholt";
repo = "libepoxy";
rev = "${version}";
- sha256 = "1811agxr7g9wd832np8sw152j468kg3qydmfkc564v54ncfcgaci";
+ sha256 = "0frs42s7d3ff2wlw0jns6vb3myx2bhz9m5nkzbnfyn436s2qqls3";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/epoxy/libgl-path.patch b/pkgs/development/libraries/epoxy/libgl-path.patch
index 6f50b9d262b..8f38ee27174 100644
--- a/pkgs/development/libraries/epoxy/libgl-path.patch
+++ b/pkgs/development/libraries/epoxy/libgl-path.patch
@@ -1,20 +1,11 @@
-From 4046e0ac8ed93354c01de5f3b5cae790cce70404 Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Thu, 29 Mar 2018 07:21:02 -0500
-Subject: [PATCH] Explicitly search LIBGL_PATH as fallback, if defined.
-
----
- src/dispatch_common.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
-index bc2fb94..776237b 100644
+index b3e4f5f..303e8f5 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
-@@ -306,6 +306,18 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail)
- pthread_mutex_lock(&api.mutex);
- if (!*handle) {
- *handle = dlopen(lib_name, RTLD_LAZY | RTLD_LOCAL);
+@@ -310,6 +310,19 @@ get_dlopen_handle(void **handle, const char *lib_name, bool exit_on_fail, bool l
+ flags |= RTLD_NOLOAD;
+
+ *handle = dlopen(lib_name, flags);
+#ifdef LIBGL_PATH
+ if (!*handle) {
+ char pathbuf[sizeof(LIBGL_PATH) + 1 + 1024 + 1];
@@ -24,12 +15,10 @@ index bc2fb94..776237b 100644
+ fprintf(stderr, "Error prefixing library pathname\n");
+ exit(1);
+ }
-+ *handle = dlopen(pathbuf, RTLD_LAZY | RTLD_LOCAL);
++ *handle = dlopen(pathbuf, flags);
+ }
+#endif
++
if (!*handle) {
if (exit_on_fail) {
fprintf(stderr, "Couldn't open %s: %s\n", lib_name, dlerror());
---
-2.16.3
-
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index ac2c21d4cf0..3bc5270f053 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }:
+{ stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }:
stdenv.mkDerivation rec {
name = "exempi-2.4.5";
@@ -8,6 +8,17 @@ stdenv.mkDerivation rec {
sha256 = "07i29xmg8bqriviaf4vi1mwha4lrw85kfla29cfym14fp3z8aqa0";
};
+ patches = [
+ # CVE-2018-12648
+ # https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
+ # remove with exempi > 2.4.5
+ (fetchpatch {
+ name = "CVE-2018-12648.patch";
+ url = https://gitlab.freedesktop.org/libopenraw/exempi/commit/8ed2f034705fd2d032c81383eee8208fd4eee0ac.patch;
+ sha256 = "1nh8irk5p26868875wq5n8g92xp4crfb8fdd8gyna76ldyzqqx9q";
+ })
+ ];
+
configureFlags = [
"--with-boost=${boost.dev}"
];
@@ -15,6 +26,8 @@ stdenv.mkDerivation rec {
buildInputs = [ expat zlib boost ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.CoreServices ];
+ doCheck = stdenv.isLinux;
+
meta = with stdenv.lib; {
homepage = https://libopenraw.freedesktop.org/wiki/Exempi/;
platforms = platforms.linux ++ platforms.darwin;
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 020d0454286..924fb52b090 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -24,10 +24,10 @@ in stdenv.mkDerivation rec {
gst-plugins-good gst-plugins-bad gst-libav
];
- meta = {
+ meta = with stdenv.lib; {
homepage = https://www.freedesktop.org/wiki/Software/Farstream;
description = "Audio/Video Communications Framework formely known as farsight";
- maintainers = [ ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix
index 660cdfa6414..49e929821f7 100644
--- a/pkgs/development/libraries/fcppt/default.nix
+++ b/pkgs/development/libraries/fcppt/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, boost }:
+{ stdenv, fetchFromGitHub, cmake, boost, brigand }:
stdenv.mkDerivation rec {
name = "fcppt-${version}";
- version = "2.5.0";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "freundlich";
repo = "fcppt";
rev = version;
- sha256 = "0pjldwwxgnzjfd04cy29a9mn2szq4v2mjnw0367kxd141q2iglqi";
+ sha256 = "0zyqgmi1shjbwin1lx428v7vbi6jnywb1d47dascdn89r5gz6klv";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ boost ];
- cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ];
+ cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" "-DBrigand_INCLUDE_DIR=${brigand}/include" ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 7d72de2a2de..d11ef732a01 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
-, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
-, x264, x265, xvidcore, zlib, libopus
+, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
+, x264, x265, xvidcore, zlib, libopus, speex
, openglSupport ? false, libGLU_combined ? null
# Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -128,7 +128,9 @@ stdenv.mkDerivation rec {
"--enable-libmp3lame"
(ifMinVer "1.2" "--enable-iconv")
"--enable-libtheora"
+ (ifMinVer "2.1" "--enable-libssh")
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
+ (ifMinVer "3.4" (enableFeature vaapiSupport "libdrm"))
"--enable-vdpau"
"--enable-libvorbis"
(ifMinVer "0.6" (enableFeature vpxSupport "libvpx"))
@@ -141,6 +143,7 @@ stdenv.mkDerivation rec {
"--enable-libxvid"
"--enable-zlib"
(ifMinVer "2.8" "--enable-libopus")
+ "--enable-libspeex"
(ifMinVer "2.8" "--enable-libx265")
# Developer flags
(enableFeature debugDeveloper "debug")
@@ -157,12 +160,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
buildInputs = [
- bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
- libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
+ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
+ libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex
] ++ optional openglSupport libGLU_combined
++ optional vpxSupport libvpx
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
+ ++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm
++ optional isLinux alsaLib
++ optionals isDarwin darwinFrameworks
++ optional vdpauSupport libvdpau
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index fb74c4ff4d2..504b58b6aa4 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -2,21 +2,24 @@
stdenv.mkDerivation rec {
name = "flatbuffers-${version}";
- version = "1.8.0";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "google";
repo = "flatbuffers";
rev = "v${version}";
- sha256 = "1qq8qbv8wkiiizj8s984f17bsbjsrhbs9q1nw1yjgrw0grcxlsi9";
+ sha256 = "1b32kc5jp83l43w2gs1dkw2vqm2j0wi7xfxqa86m18n3l41ca734";
};
- buildInputs = [ cmake ];
+ preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin ''
+ rm BUILD
+ '';
+
+ nativeBuildInputs = [ cmake ];
enableParallelBuilding = true;
- # Not sure how tests are supposed to be run.
- # "make: *** No rule to make target 'check'. Stop."
- doCheck = false;
+ doCheck = true;
+ checkTarget = "test";
meta = {
description = "Memory Efficient Serialization Library.";
@@ -29,6 +32,6 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.teh ];
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
- homepage = http://google.github.io/flatbuffers;
+ homepage = https://google.github.io/flatbuffers/;
};
}
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 6591b13834e..dc77ab8601a 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,27 +1,32 @@
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
-, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
+, gobjectIntrospection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:
let
- version = "0.99.3";
+ version = "1.0.4";
desktop_schemas = gnome3.gsettings-desktop-schemas;
in stdenv.mkDerivation rec {
name = "flatpak-${version}";
+ # TODO: split out lib once we figure out what to do with triggerdir
outputs = [ "out" "man" "doc" "installedTests" ];
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
- sha256 = "0wd6ix1qyz8wmjkfrmr6j99gwywqs7ak1ilsn1ljp72g2z449ayk";
+ sha256 = "1x1vqz6k8hhgyr46wg05gwr4zdv313q2hwcwp4nb6n1f7whc7yx0";
};
patches = [
(substituteAll {
src = ./fix-test-paths.patch;
- inherit coreutils python2 glibcLocales;
+ inherit coreutils glibcLocales;
hicolorIconTheme = hicolor-icon-theme;
})
+ (substituteAll {
+ src = ./fix-paths.patch;
+ p11 = p11-kit;
+ })
# patch taken from gtk_doc
./respect-xml-catalog-files-var.patch
./use-flatpak-from-path.patch
@@ -30,7 +35,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
- ] ++ stdenv.lib.optionals doCheck checkInputs;
+ ];
buildInputs = [
bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
@@ -45,6 +50,7 @@ in stdenv.mkDerivation rec {
configureFlags = [
"--with-system-bubblewrap=${bubblewrap}/bin/bwrap"
+ "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy"
"--localstatedir=/var"
"--enable-installed-tests"
];
diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch
new file mode 100644
index 00000000000..49fcaa2b3f9
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/fix-paths.patch
@@ -0,0 +1,20 @@
+--- a/session-helper/flatpak-session-helper.c
++++ b/session-helper/flatpak-session-helper.c
+@@ -624,7 +624,7 @@
+ g_auto(GStrv) stdout_lines = NULL;
+ int i;
+ char *p11_argv[] = {
+- "p11-kit", "server",
++ "@p11@/bin/p11-kit", "server",
+ /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
+ * this flag. This is good, because those earlier versions did not properly daemonize and caused
+ * the spawn_sync to hang forever, waiting for the pipe to close.
+@@ -770,7 +770,7 @@
+ exit (1);
+ }
+
+- if (g_find_program_in_path ("p11-kit"))
++ if (TRUE)
+ start_p11_kit_server (flatpak_dir);
+ else
+ g_debug ("p11-kit not found");
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch
index 3f4bc56721e..d00e4fa7f89 100644
--- a/pkgs/development/libraries/flatpak/fix-test-paths.patch
+++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch
@@ -1,6 +1,6 @@
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
-@@ -315,7 +315,7 @@
+@@ -296,7 +296,7 @@
# running installed-tests: assume we know what we're doing
:
elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
@@ -9,16 +9,7 @@
sed -e 's/^/# /' < bwrap-result
echo "1..0 # SKIP Cannot run bwrap"
exit 0
-@@ -323,7 +323,7 @@
- }
-
- skip_without_python2 () {
-- if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
-+ if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
- echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support"
- exit 0
- fi
-@@ -335,12 +335,12 @@
+@@ -309,12 +309,12 @@
export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
@@ -43,7 +34,7 @@
mkdir -p ${DIR}/usr/bin
mkdir -p ${DIR}/usr/lib
ln -s ../lib ${DIR}/usr/lib64
-@@ -35,73 +36,27 @@
+@@ -35,48 +36,27 @@
else
cp `which ldconfig` ${DIR}/usr/bin
fi
@@ -73,31 +64,6 @@
for i in $@; do
- I=`which $i`
- add_bin $I
-- if test $i == python2; then
-- mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload
-- # This is a hardcoded minimal set of modules we need in the current tests.
-- # Pretty hacky stuff. Add modules as needed.
-- PYDIR=/usr/lib/python2.7
-- if test -d /usr/lib64/python2.7; then PYDIR=/usr/lib64/python2.7; fi
-- for py in site os stat posixpath genericpath warnings \
-- linecache types UserDict abc _abcoll \
-- _weakrefset copy_reg traceback sysconfig \
-- re sre_compile sre_parse sre_constants \
-- _sysconfigdata ; do
-- cp ${PYDIR}/$py.py ${DIR}/usr/lib/python2.7
-- done
-- # These might not exist, depending how Python was configured; and the
-- # part after ${so} might be "module" or ".x86_64-linux-gnu" or
-- # something else
-- for so in _locale strop ; do
-- cp ${PYDIR}/lib-dynload/${so}*.so ${DIR}/usr/lib/python2.7/lib-dynload || :
-- done
-- for plat in $( cd ${PYDIR} && echo plat-* ); do
-- test -e ${PYDIR}/${plat} || continue
-- mkdir -p ${DIR}/usr/lib/python2.7/${plat}
-- cp ${PYDIR}/${plat}/*.py ${DIR}/usr/lib/python2.7/${plat}/
-- done
-- fi
-done
-for i in `cat $BINS`; do
- echo Adding binary $i 1>&2
diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
index e855902a930..408198bda5c 100644
--- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
+++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch
@@ -1,6 +1,6 @@
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
-@@ -5467,7 +5467,7 @@ export_desktop_file (const char *app,
+@@ -5758,7 +5758,7 @@ export_desktop_file (const char *app,
new_exec = g_string_new ("");
g_string_append_printf (new_exec,
@@ -9,7 +9,7 @@
escaped_branch,
escaped_arch);
-@@ -6644,8 +6644,8 @@ flatpak_dir_deploy (FlatpakDir *self,
+@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir *self,
error))
return FALSE;
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
new file mode 100644
index 00000000000..fbe947e3afb
--- /dev/null
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, cmake, enableShared ? true }:
+
+stdenv.mkDerivation rec {
+ version = "5.2.1";
+ name = "fmt-${version}";
+
+ src = fetchFromGitHub {
+ owner = "fmtlib";
+ repo = "fmt";
+ rev = "${version}";
+ sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-DFMT_TEST=TRUE"
+ "-DBUILD_SHARED_LIBS=${if enableShared then "TRUE" else "FALSE"}"
+ ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+ # preCheckHook ensures the test binaries can find libfmt.so.5
+ preCheck = if enableShared
+ then "export LD_LIBRARY_PATH=\"$PWD\""
+ else "";
+
+ meta = with stdenv.lib; {
+ description = "Small, safe and fast formatting library";
+ longDescription = ''
+ fmt (formerly cppformat) is an open-source formatting library. It can be
+ used as a fast and safe alternative to printf and IOStreams.
+ '';
+ homepage = http://fmtlib.net/;
+ downloadPage = https://github.com/fmtlib/fmt/;
+ maintainers = [ maintainers.jdehaas ];
+ license = licenses.bsd2;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index d188cb9810a..9694765bb93 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 = "2018.08.13.00";
+ version = "2018.08.27.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "1lhq3l7rirhi4vwgiym0r3rff1i69c7bdpi1hm8r4axs2dfjvxdr";
+ sha256 = "0slnhn8q26mj23gm36c61b4ar857q8c844ifpvw4q329nndbrgcz";
};
nativeBuildInputs = [ autoreconfHook python pkgconfig ];
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 8dd78c41b14..40430f34334 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
homepage = http://fox-toolkit.org;
license = licenses.lgpl3;
maintainers = [];
+ broken = stdenv.isDarwin;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index fce052aeb22..5a11d03c591 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,4 +1,5 @@
{ stdenv, fetchurl
+, buildPackages
, pkgconfig, which, makeWrapper
, zlib, bzip2, libpng, gnumake, glib
@@ -50,6 +51,9 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ];
+ # native compiler to generate building tool
+ CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
+
# The asm for armel is written with the 'asm' keyword.
CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99";
diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix
new file mode 100644
index 00000000000..68f3c9d0ee5
--- /dev/null
+++ b/pkgs/development/libraries/fstrcmp/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip, libtool, ghostscript, groff }:
+
+stdenv.mkDerivation rec {
+ name = "fstrcmp-${version}";
+ version = "0.7";
+
+ src = fetchzip {
+ url = "https://sourceforge.net/projects/fstrcmp/files/fstrcmp/${version}/fstrcmp-${version}.D001.tar.gz";
+ sha256 = "0yg3y3k0wz50gmhgigfi2dx725w1gc8snb95ih7vpcnj6kabgz9a";
+ };
+
+ outputs = [ "out" "dev" "doc" "man" "devman" ];
+
+ nativeBuildInputs = [ libtool ghostscript groff ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Make fuzzy comparisons of strings and byte arrays";
+ longDescription = ''
+ The fstrcmp project provides a library that is used to make fuzzy
+ comparisons of strings and byte arrays, including multi-byte character
+ strings.
+ '';
+ homepage = http://fstrcmp.sourceforge.net/;
+ downloadPage = https://sourceforge.net/projects/fstrcmp/;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.sephalon ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index f6d8cd6fa4c..642063220b2 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
, postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
-, libiconv
+, libiconv, libxml2
, netcdfSupport ? true, netcdf, hdf5, curl
}:
@@ -9,15 +9,15 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "gdal-${version}";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchurl {
url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz";
- sha256 = "0nkjnznrp7dr41zsh8j923c9zpc3i5vj3wjfc2df9rrybb22ailw";
+ sha256 = "191jknma0vricrgdcdmwh8588rwly6a77lmynypxdl87i3z7hv9z";
};
buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
- libspatialite poppler hdf4 qhull giflib expat ]
+ libspatialite poppler hdf4 qhull giflib expat libxml2 ]
++ (with pythonPackages; [ python numpy wrapPython ])
++ stdenv.lib.optional stdenv.isDarwin libiconv
++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
"--with-proj=${proj}" # optional
"--with-geos=${geos}/bin/geos-config"# optional
"--with-hdf4=${hdf4.dev}" # optional
+ "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional
(if netcdfSupport then "--with-netcdf=${netcdf}" else "")
];
diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 685775e2918..8d88dc04924 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
- name = "gdbm-1.17";
- # FIXME: remove on update to > 1.17
+ name = "gdbm-1.18";
+ # FIXME: remove on update to > 1.18
NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null;
src = fetchurl {
url = "mirror://gnu/gdbm/${name}.tar.gz";
- sha256 = "0zcp2iv5dbab18859a5fvacg8lkp8k4pr9af13kfvami6lpcrn3w";
+ sha256 = "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq";
};
doCheck = true; # not cross;
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 3fb50e98c1c..9fece4cb7a5 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball
# src = fetchurl {
- # url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ # url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
# sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
# };
src = fetchFromGitLab {
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 56d8cd21f84..fa3aa77cd3a 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
};
- NIX_CFLAGS_COMPILE = "-Wno-format -Wno-misleading-indentation -Wno-error";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" "-Wno-error=pointer-compare" ];
+
+ hardeningDisable = [ "format" ];
pythonPath = with python3Packages;
[ pygobject3 ];
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index c1b4c88aa47..2417af3dbfd 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- name = "geos-3.6.3";
+ name = "geos-3.7.0";
src = fetchurl {
url = "https://download.osgeo.org/geos/${name}.tar.bz2";
- sha256 = "0jrypv61rbyp7vi9qpnnaiigjj8cgdqvyk8ymik8h1ppcw5am7mb";
+ sha256 = "1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 4531a5a01d4..1b2f6bbc222 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
gettextNeedsLdflags = stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isMusl;
enableParallelBuilding = true;
+ enableParallelChecking = false; # fails sometimes
meta = with lib; {
description = "Well integrated set of translation tools and documentation";
diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix
index 357ca751ccf..6336d30aeba 100644
--- a/pkgs/development/libraries/giflib/libungif.nix
+++ b/pkgs/development/libraries/giflib/libungif.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Library and utilities for processing GIFs";
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/git2/0.27.nix b/pkgs/development/libraries/git2/0.27.nix
index bafd6be37df..db627449e1b 100644
--- a/pkgs/development/libraries/git2/0.27.nix
+++ b/pkgs/development/libraries/git2/0.27.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- version = "0.27.4";
+ version = "0.27.5";
name = "libgit2-${version}";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
- sha256 = "1cmc8ldhpyp62pswb7dmjjya3ng0ssaggcsxs1labvp6xyxjvp6s";
+ sha256 = "1f6jxgw4pf6jln439v1pj8a0kgym5sq5xry8x0gq18dr5gv3wims";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 3deaf28373d..4ac6e87b9dd 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "14vw8xwajd7m31bpavg2psk693plhjikwpk8bzf3jl1fmsy11za7";
};
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 428b9ee482e..508a012c690 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
name = "glib-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/glib/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc";
};
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
./gobject_init_on_demand.patch
] ++ [ ./schema-override-variable.patch ];
- outputs = [ "out" "dev" "devdoc" ];
+ outputs = [ "bin" "out" "dev" "devdoc" ];
outputBin = "dev";
setupHook = ./setup-hook.sh;
@@ -104,12 +104,16 @@ stdenv.mkDerivation rec {
DETERMINISTIC_BUILD = 1;
postInstall = ''
+ mkdir -p $bin/bin
+ for app in gapplication gdbus gio gsettings; do
+ mv "$dev/bin/$app" "$bin/bin"
+ done
+
moveToOutput "share/glib-2.0" "$dev"
substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
- ''
- # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
- + ''
+
+ # This file is *included* in gtk3 and would introduce runtime reference via __FILE__.
sed '1i#line 1 "${name}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \
-i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c
'';
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index a7a4c2fbacd..b77c450bdec 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -133,7 +133,9 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison ];
- buildInputs = lib.optionals withGd [ gd libpng ];
+ # TODO make linuxHeaders unconditional next mass rebuild
+ buildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) linuxHeaders
+ ++ lib.optionals withGd [ gd libpng ];
# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to
# prevent a retained dependency on the bootstrap tools in the stdenv-linux
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 65c99610a5c..63d00f1dd1a 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobjectIntrospection }:
stdenv.mkDerivation rec {
- version = "3.2.0";
+ version = "3.2.1";
name = "gmime-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
- sha256 = "1q6palbpf6lh6bvy9ly26q5apl5k0z0r4mvl6zzqh90rz4rn1v3m";
+ sha256 = "0q65nalxzpyjg37gdlpj9v6028wp0qx47z96q0ff6znw217nzzjn";
};
outputs = [ "out" "dev" ];
- buildInputs = [ gobjectIntrospection zlib gpgme libidn ];
+ buildInputs = [ gobjectIntrospection zlib gpgme libidn2 libunistring ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib ];
configureFlags = [ "--enable-introspection=yes" ];
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
checkInputs = [ gnupg ];
+ doCheck = true;
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 7f8a2276ef2..6423e1fce98 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
name = "gmm-${version}";
- version = "5.1";
+ version = "5.3";
src = fetchurl {
- url ="http://download.gna.org/getfem/stable/${name}.tar.gz";
- sha256 = "0di68vdn34kznf96rnwrpb3bbm3ahaczwxd306s9dx41kcqbzrlh";
+ url = "mirror://savannah/getfem/stable/${name}.tar.gz";
+ sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46";
};
meta = with stdenv.lib; {
description = "Generic C++ template library for sparse, dense and skyline matrices";
- homepage = http://home.gna.org/getfem/gmm_intro.html;
+ homepage = http://getfem.org/gmm.html;
license = licenses.lgpl21Plus;
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f5ab5005bad..482710f18df 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d";
};
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
homepage = http://live.gnome.org/GObjectIntrospection;
maintainers = with maintainers; [ lovek323 lethalman ];
platforms = platforms.unix;
+ license = with licenses; [ gpl2 lgpl2 ];
longDescription = ''
GObject introspection is a middleware layer between C libraries (using
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 6155b8b18bd..4795f45812b 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -2,11 +2,11 @@
, libgsf, libxml2, libxslt, cairo, pango, librsvg }:
stdenv.mkDerivation rec {
- name = "goffice-0.10.39";
+ name = "goffice-0.10.43";
src = fetchurl {
url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
- sha256 = "73f23fbf05f3fa98343208b751db04b31a7ff743c2d828e1a0a130c566f1bc4f";
+ sha256 = "550fceefa74622b8fe57dd0b030003e31db50edf7f87068ff5e146365108b64e";
};
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 71fe23ea6b0..44086538cd0 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
-, file, which
+, file, which, ncurses
, autoreconfHook
, git
-, texinfo5
+, texinfo
, qtbase ? null
-, withPython ? false, swig2 ? null, python ? null
+, pythonSupport ? false, swig2 ? null, python ? null
}:
let
@@ -14,11 +14,11 @@ in
stdenv.mkDerivation rec {
name = "gpgme-${version}";
- version = "1.11.1";
+ version = "1.12.0";
src = fetchurl {
url = "mirror://gnupg/gpgme/${name}.tar.bz2";
- sha256 = "0vxx5xaag3rhp4g2arp5qm77gvz4kj0m3hnpvhkdvqyjfhbi26rd";
+ sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l";
};
outputs = [ "out" "dev" "info" ];
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
[ libgpgerror glib libassuan pth ]
++ lib.optional (qtbase != null) qtbase;
- nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo5 ]
- ++ lib.optionals withPython [ python swig2 which ];
+ nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
+ ++ lib.optionals pythonSupport [ python swig2 which ncurses ];
postPatch =''
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-fixed-path=${gnupg}/bin"
"--with-libgpg-error-prefix=${libgpgerror.dev}"
- ] ++ lib.optional withPython "--enable-languages=python";
+ ] ++ lib.optional pythonSupport "--enable-languages=python";
NIX_CFLAGS_COMPILE =
# qgpgme uses Q_ASSERT which retains build inputs at runtime unless
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
checkInputs = [ which ];
- doCheck = false; # fails 8 out of 26 tests with "GPGME: Decryption failed". Spooky!
+ doCheck = true;
meta = with stdenv.lib; {
homepage = https://gnupg.org/software/gpgme/index.html;
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index aa670cd4c86..52c087b1914 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -46,6 +46,7 @@ mkDerivation rec {
homepage = http://gitorious.org/grantlee;
maintainers = [ maintainers.ttuegel ];
+ license = licenses.lgpl21;
inherit (qtbase.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix
index 9dde67b5c79..1446e339745 100644
--- a/pkgs/development/libraries/grantlee/default.nix
+++ b/pkgs/development/libraries/grantlee/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
and the design of Django is reused in Grantlee.'';
homepage = http://gitorious.org/grantlee;
- maintainers = [ ];
+ license = stdenv.lib.licenses.lgpl21;
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 7f680b6b59b..a21e2aacde2 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
+{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
stdenv.mkDerivation rec {
- version = "1.10.1";
+ version = "1.15.0";
name = "grpc-${version}";
- src = fetchurl {
- url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz";
- sha256 = "0l721r24d6wz889vz4g6i67ijz0zc0ah967i3immi90zdmjwlyjg";
+ src = fetchFromGitHub {
+ owner = "grpc";
+ repo = "grpc";
+ rev= "d2c7d4dea492b9a86a53555aabdbfa90c2b01730";
+ sha256 = "1dpnhc5kw7znivrnjx1gva57v6b548am4v5nvh3dkwwzsa1k6vkv";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch
new file mode 100644
index 00000000000..0aa2034e399
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/conf.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index cb1e0df..d90c85c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -95,6 +95,6 @@ endif
+ configure_file(
+ input: 'gsignond.conf.in',
+ configuration: conf_data,
+- install_dir: sysconf_dir,
++ install_dir: 'etc/',
+ output: 'gsignond.conf'
+ )
diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix
new file mode 100644
index 00000000000..11dcc2a2ee9
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking
+, sqlite, gobjectIntrospection, vala, gtk-doc, libsecret, docbook_xsl
+, docbook_xml_dtd_43, docbook_xml_dtd_45, glibcLocales, makeWrapper
+, symlinkJoin, gsignondPlugins, plugins }:
+
+let
+unwrapped = stdenv.mkDerivation rec {
+ pname = "gsignond";
+ version = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
+
+ name = "${pname}-2018-10-04";
+
+ outputs = [ "out" "dev" "devdoc" ];
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = pname;
+ rev = version;
+ sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff";
+ };
+
+ nativeBuildInputs = [
+ docbook_xml_dtd_43
+ docbook_xml_dtd_45
+ docbook_xsl
+ glibcLocales
+ gobjectIntrospection
+ gtk-doc
+ meson
+ ninja
+ pkgconfig
+ vala
+ ];
+
+ buildInputs = [
+ glib
+ glib-networking
+ libsecret
+ ];
+
+ propagatedBuildInputs = [ sqlite ];
+
+ mesonFlags = [
+ "-Dbus_type=session"
+ "-Dextension=desktop"
+ ];
+
+ LC_ALL = "en_US.UTF-8";
+
+ patches = [
+ ./conf.patch
+ ./plugin-load-env.patch
+ ];
+
+ meta = with stdenv.lib; {
+ description = "D-Bus service which performs user authentication on behalf of its clients";
+ homepage = https://gitlab.com/accounts-sso/gsignond;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+};
+
+in if plugins == [] then unwrapped
+ else import ./wrapper.nix {
+ inherit stdenv makeWrapper symlinkJoin gsignondPlugins plugins;
+ gsignond = unwrapped;
+ }
+
diff --git a/pkgs/development/libraries/gsignond/plugin-load-env.patch b/pkgs/development/libraries/gsignond/plugin-load-env.patch
new file mode 100644
index 00000000000..5da2b4c157e
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugin-load-env.patch
@@ -0,0 +1,35 @@
+diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c
+index 5497b32..979e1b4 100644
+--- a/src/gplugind/gsignond-plugin-loader.c
++++ b/src/gplugind/gsignond-plugin-loader.c
+@@ -38,11 +38,10 @@ gsignond_load_plugin (
+ gchar *plugin_filename;
+ GSignondPlugin *plugin;
+
+-# ifdef ENABLE_DEBUG
+ const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
+ if (env_val)
+ plugin_path = env_val;
+-# endif
++
+ plugin_filename = g_module_build_path (plugin_path, plugin_type);
+ plugin = gsignond_load_plugin_with_filename (plugin_type,
+ plugin_filename);
+diff --git a/src/gplugind/main.c b/src/gplugind/main.c
+index 1c6cdb6..c85c623 100644
+--- a/src/gplugind/main.c
++++ b/src/gplugind/main.c
+@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop)
+ static const gchar* _plugin_path(void)
+ {
+ const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
+-# ifdef ENABLE_DEBUG
++
+ const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
+ if (env_val)
+ plugin_path = env_val;
+-# endif
++
+ return plugin_path;
+ }
+
diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
new file mode 100644
index 00000000000..a23c1487881
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, json-glib, libsoup, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gsignond-plugin-lastfm-${version}";
+ version = "2018-05-07";
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = "gsignond-plugin-lastfm";
+ rev = "0a7a5f8511282e45cfe35987b81f27f158f0648c";
+ sha256 = "0ay6ir9zg9l0264x5xwd7c6j8qmwlhrifkkkjd1yrjh9sqxyfj7f";
+ };
+
+ nativeBuildInputs = [
+ gobjectIntrospection
+ meson
+ ninja
+ pkgconfig
+ vala
+ ];
+
+ buildInputs = [
+ glib
+ gsignond
+ json-glib
+ libsoup
+ ];
+
+ PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
+
+ meta = with stdenv.lib; {
+ description = "Plugin for the Accounts-SSO gSignOn daemon handles the Last.FM credentials.";
+ homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix
new file mode 100644
index 00000000000..763e76c9cc9
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gsignond-plugin-mail-${version}";
+ version = "2018-10-04";
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = "gsignond-plugin-mail";
+ rev = "fbc6f34b246fec4ad2b37c696f8de7fdb9bde346";
+ sha256 = "1wvwz7qiwvj8iixprip3qd8lplzfnwcjfrbg2vd8xfsvid2zbviw";
+ };
+
+ nativeBuildInputs = [
+ gobjectIntrospection
+ meson
+ ninja
+ pkgconfig
+ vala
+ ];
+
+ buildInputs = [
+ glib
+ gsignond
+ ];
+
+ PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
+
+ meta = with stdenv.lib; {
+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles the E-Mail credentials.";
+ homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix
new file mode 100644
index 00000000000..ee45430122c
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, check
+, json-glib, libsoup, gnutls, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45
+, docbook_xsl, glibcLocales, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gsignond-plugin-oauth-${version}";
+ version = "2018-10-15";
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = "gsignond-plugin-oa";
+ rev = "d471cebfd7c50567b1244277a9559f18f8d58691";
+ sha256 = "00axl8wwp2arc6h4bpr4m3ik2hy8an0lbm48q2a9r94krmq56hnx";
+ };
+
+ nativeBuildInputs = [
+ check
+ docbook_xml_dtd_43
+ docbook_xml_dtd_45
+ docbook_xsl
+ glibcLocales
+ gobjectIntrospection
+ gtk-doc
+ meson
+ ninja
+ pkgconfig
+ ];
+
+ buildInputs = [
+ glib
+ gnutls
+ gsignond
+ json-glib
+ libsoup
+ ];
+
+ LC_ALL = "en_US.UTF-8";
+
+ PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
+
+ meta = with stdenv.lib; {
+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols.";
+ homepage = https://gitlab.com/accounts-sso/gsignond-plugin-oa;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix
new file mode 100644
index 00000000000..25f20557906
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitLab, fetchpatch, pkgconfig, meson, ninja, glib, gsignond, gsasl, check
+, gtk-doc, docbook_xml_dtd_43, docbook_xml_dtd_45, docbook_xsl, glibcLocales, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ name = "gsignond-plugin-sasl-${version}";
+ version = "2018-10-15";
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = "gsignond-plugin-sasl";
+ rev = "b304c70b7dad9368b23b1205122d10de684c896a";
+ sha256 = "0knzw7c2fm2kzs1gxbrm4kk67522w9cpwqj7xvn86473068k90va";
+ };
+
+ nativeBuildInputs = [
+ check
+ docbook_xml_dtd_43
+ docbook_xml_dtd_45
+ docbook_xsl
+ glibcLocales
+ gobjectIntrospection
+ gtk-doc
+ meson
+ ninja
+ pkgconfig
+ ];
+
+ buildInputs = [
+ glib
+ gsasl
+ gsignond
+ ];
+
+ LC_ALL = "en_US.UTF-8";
+
+ PKG_CONFIG_GSIGNOND_GPLUGINSDIR = "${placeholder "out"}/lib/gsignond/gplugins";
+
+ meta = with stdenv.lib; {
+ description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol.";
+ homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/gsignond/wrapper.nix b/pkgs/development/libraries/gsignond/wrapper.nix
new file mode 100644
index 00000000000..a5df6bbeafb
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/wrapper.nix
@@ -0,0 +1,23 @@
+{ stdenv, makeWrapper, symlinkJoin, gsignond, gsignondPlugins, plugins }:
+
+symlinkJoin {
+ name = "gsignond-with-plugins-${gsignond.version}";
+
+ paths = [ gsignond ] ++ plugins;
+
+ buildInputs = [ makeWrapper ];
+
+ postBuild = ''
+ wrapProgram $out/bin/gsignond \
+ --set SSO_GPLUGINS_DIR "$out/lib/gsignond/gplugins"
+
+ rm $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service
+ rm $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service
+
+ substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.gSingleSignOn.service \
+ --replace ${gsignond} $out
+
+ substitute ${gsignond}/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service $out/share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service \
+ --replace ${gsignond} $out
+ '';
+}
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index 051228aeb15..0145272c281 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
outputBin = "dev";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1rdv873ixhwr15jwgc2z6k6y0hj353fqnwsy7zkh0c30qwiiv6l1";
};
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index d48ba9082af..0d77018eee5 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,22 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, libsoup, glib }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }:
stdenv.mkDerivation rec {
name = "gssdp-${version}";
version = "1.0.2";
+ outputs = [ "out" "bin" "dev" "devdoc" ];
+
src = fetchurl {
- url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz";
+ url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libsoup ];
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+ buildInputs = [ libsoup gtk3 ];
propagatedBuildInputs = [ glib ];
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
meta = with stdenv.lib; {
description = "GObject-based API for handling resource discovery and announcement over SSDP";
homepage = http://www.gupnp.org/;
- license = licenses.lgpl2;
+ license = licenses.lgpl2Plus;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 96e02c605f5..3f030b7469e 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -17,7 +17,8 @@ let
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
- name = "gst-plugins-bad-1.14.0";
+ name = "gst-plugins-bad-${version}";
+ version = "1.14.2";
meta = with stdenv.lib; {
description = "Gstreamer Bad Plugins";
@@ -53,7 +54,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
- sha256 = "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd";
+ sha256 = "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index dd4007bd142..a5f8e340642 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -9,7 +9,8 @@
, enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }:
stdenv.mkDerivation rec {
- name = "gst-plugins-base-1.14.0";
+ name = "gst-plugins-base-${version}";
+ version = "1.14.2";
meta = with lib; {
description = "Base plugins and helper libraries";
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
- sha256 = "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y";
+ sha256 = "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 5845c8c50db..b4a324d68d9 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -6,7 +6,8 @@
}:
stdenv.mkDerivation rec {
- name = "gstreamer-1.14.0";
+ name = "gstreamer-${version}";
+ version = "1.14.2";
meta = with lib ;{
description = "Open source multimedia framework";
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
- sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw";
+ sha256 = "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb";
};
patches = [
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 895f298c826..d2c3cbcc6ac 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -4,7 +4,8 @@
}:
stdenv.mkDerivation rec {
- name = "gstreamer-editing-services-1.14.0";
+ name = "gstreamer-editing-services-${version}";
+ version = "1.14.2";
meta = with stdenv.lib; {
description = "Library for creation of audio/video non-linear editors";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
- sha256 = "14cdd6y9p4k603hsnyhdjw2igg855gwpx0362jmg8k1gagmr0pwd";
+ sha256 = "0d0zqvgxp51mmffz5vvscsdzqqw9mjsv6bnk6ivg2dxnkv8q1ch5";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 99d27523b1c..45f700e158a 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -15,7 +15,8 @@ let
inherit (stdenv.lib) optional optionals;
in
stdenv.mkDerivation rec {
- name = "gst-plugins-good-1.14.0";
+ name = "gst-plugins-good-${version}";
+ version = "1.14.2";
meta = with stdenv.lib; {
description = "Gstreamer Good Plugins";
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
- sha256 = "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka";
+ sha256 = "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 564b37fab79..f78015704fc 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,8 @@
assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec {
- name = "gst-libav-1.14.0";
+ name = "gst-libav-${version}";
+ version = "1.14.2";
meta = {
homepage = https://gstreamer.freedesktop.org;
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
- sha256 = "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv";
+ sha256 = "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index a9e7f9fcff3..a099643061a 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 9ff799b0a27..4166f357cda 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -3,7 +3,8 @@
}:
stdenv.mkDerivation rec {
- name = "gst-rtsp-server-1.14.0";
+ name = "gst-rtsp-server-${version}";
+ version = "1.14.2";
meta = with stdenv.lib; {
description = "Gstreamer RTSP server";
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
- sha256 = "0mlp9ms5hfbyzyvmc9xgi7934g4zrh1sbgky2p9zc5fqprvs0rbb";
+ sha256 = "161c49hg21xpkdw5ppc7ljbg6kyslxd1y3v1shsg7ibarxapff7p";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 004bb0715f2..b5256bf4b4c 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -6,7 +6,8 @@
}:
stdenv.mkDerivation rec {
- name = "gst-plugins-ugly-1.14.0";
+ name = "gst-plugins-ugly-${version}";
+ version = "1.14.2";
meta = with lib; {
description = "Gstreamer Ugly Plugins";
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
- sha256 = "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z";
+ sha256 = "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 7255894f3b1..be7ee8f1278 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gst-vaapi-${version}";
- version = "1.14.0";
+ version = "1.14.2";
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
- sha256 = "1whxk428badv8ibji00sn6hj17cp8l9n93rr948bz2gjbq41zqz4";
+ sha256 = "12hdyfma2lnfj38dj6y891vsxnxrlbqjbd36xx13mgasgzi6843z";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index bd33d9c5280..63893bbc523 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,7 +3,8 @@
}:
stdenv.mkDerivation rec {
- name = "gst-validate-1.14.0";
+ name = "gst-validate-${version}";
+ version = "1.14.2";
meta = {
description = "Integration testing infrastructure for the GStreamer framework";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
- sha256 = "1pzzxqkv1spjrzpzpazdm2h4s2wk7gg5gag8nxj5v2gjfyzhiprk";
+ sha256 = "17zilvmwv13l6rbj0a7dnbg4kz5bwwa1gshaibpqbvvhahz457pa";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index f5fc635a5a4..cf4069871d1 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -1,33 +1,16 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ stdenv, cmake, ninja, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "gtest-${version}";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "google";
repo = "googletest";
rev = "release-${version}";
- sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399";
+ sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk";
};
- buildInputs = [ cmake ];
-
- configurePhase = ''
- mkdir build
- cd build
- cmake ../ -DCMAKE_INSTALL_PREFIX=$out
- '';
-
- installPhase = ''
- mkdir -p $out/lib
- cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib
- ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a
- mkdir -p $out/include
- cp -v -r ../googlemock/include/gmock $out/include
- cp -v -r ../googletest/include/gtest $out/include
- mkdir -p $out/src
- cp -v -r ../googlemock/src/* ../googletest/src/* $out/src
- '';
+ nativeBuildInputs = [ cmake ninja ];
meta = with stdenv.lib; {
description = "Google's framework for writing C++ tests";
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 27052d1922f..015843c0539 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
name = "gtk+3-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz";
+ url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951";
};
diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix
index b92bbf64514..7f35f088da2 100644
--- a/pkgs/development/libraries/gtk-sharp-beans/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
dontStrip = true;
meta = with stdenv.lib; {
- description = "gtk-sharp-beans binds some API from Gtk+ that isn't in Gtk# 2.12.x";
+ description = "Binds some API from Gtk+ that isn't in Gtk# 2.12.x";
platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix
index 5b3ca828a3f..c037db97c04 100644
--- a/pkgs/development/libraries/gtk-sharp/2.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/2.0.nix
@@ -46,7 +46,10 @@ stdenv.mkDerivation {
gtk = gtk2;
};
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "Graphical User Interface Toolkit for mono and .Net";
+ homepage = https://www.mono-project.com/docs/gui/gtksharp;
+ platforms = platforms.linux;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix
index 3a473d6303a..f8f1f20cc2f 100644
--- a/pkgs/development/libraries/gtk-sharp/3.0.nix
+++ b/pkgs/development/libraries/gtk-sharp/3.0.nix
@@ -47,5 +47,6 @@ stdenv.mkDerivation {
meta = {
platforms = stdenv.lib.platforms.linux;
+ broken = true; # 2018-09-21, build has failed since 2018-04-28
};
}
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index c0dc0753cd0..d89b00af4ce 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
--replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \
--replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib
substituteInPlace generated/gtkd/gobject/c/functions.d \
- --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
- --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
+ --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
+ --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib
substituteInPlace generated/gtkd/rsvg/c/functions.d \
--replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \
--replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib
@@ -63,15 +63,15 @@ stdenv.mkDerivation rec {
--replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \
--replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib
substituteInPlace generated/gtkd/glib/c/functions.d \
- --replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \
- --replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \
- --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
- --replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \
- --replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \
- --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
+ --replace libglib-2.0.so.0 ${glib.out}/lib/libglib-2.0.so.0 \
+ --replace libgmodule-2.0.so.0 ${glib.out}/lib/libgmodule-2.0.so.0 \
+ --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
+ --replace libglib-2.0.0.dylib ${glib.out}/lib/libglib-2.0.0.dylib \
+ --replace libgmodule-2.0.0.dylib ${glib.out}/lib/libgmodule-2.0.0.dylib \
+ --replace libgobject-2.0.0.dylib ${glib.out}/lib/libgobject-2.0.0.dylib
substituteInPlace generated/gtkd/gio/c/functions.d \
- --replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \
- --replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib
+ --replace libgio-2.0.so.0 ${glib.out}/lib/libgio-2.0.so.0 \
+ --replace libgio-2.0.0.dylib ${glib.out}/lib/libgio-2.0.0.dylib
substituteInPlace generated/gstreamer/gstreamer/c/functions.d \
--replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \
--replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index fe81c97ab6e..9e1bc5363a1 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
version = "3.24.6";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
};
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 2501e0253b3..7cd9de4b06b 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
version = "4.0.0";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0amkspjsvxr3rjznmnwjwsgw030hayf6bw49ya4nligslwl7lp3f";
};
diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix
index 22094f3a3f6..14676be0dcb 100644
--- a/pkgs/development/libraries/gtkspell/default.nix
+++ b/pkgs/development/libraries/gtkspell/default.nix
@@ -2,16 +2,19 @@
stdenv.mkDerivation {
name = "gtkspell-2.0.16";
-
+
src = fetchurl {
url = mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz;
sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg";
};
-
+
nativeBuildInputs = [ pkgconfig ];
buildInputs = [aspell gtk2 enchant intltool];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Word-processor-style highlighting and replacement of misspelled words";
+ homepage = http://gtkspell.sourceforge.net;
+ platforms = platforms.unix;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix
index 04456b44019..cb141f8c556 100644
--- a/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/pkgs/development/libraries/gtkspellmm/default.nix
@@ -3,18 +3,14 @@
, gtk3, glib, glibmm, gtkmm3, gtkspell3
}:
-let
- version = "3.0.4";
-
-in
-
stdenv.mkDerivation rec {
name = "gtkspellmm-${version}";
+ version = "3.0.5";
src = fetchurl {
url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" +
- "${name}.tar.gz";
- sha256 = "0x6zx928dl62f0c0x6b2s32i06lvn18wx7crrgs1j9yjgkim4k4k";
+ "${name}.tar.xz";
+ sha256 = "0i8mxwyfv5mskachafa4qlh315q0cfph7s66s1s34nffadbmm1sv";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix
index 9b61f4b648e..7491da7c3e2 100644
--- a/pkgs/development/libraries/gupnp-av/default.nix
+++ b/pkgs/development/libraries/gupnp-av/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, gupnp, glib, libxml2 }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, glib, libxml2 }:
stdenv.mkDerivation rec {
name = "gupnp-av-${version}";
- majorVersion = "0.12";
- version = "${majorVersion}.10";
+ version = "0.12.10";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp-av/${majorVersion}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40";
};
-
- nativeBuildInputs = [ pkgconfig ];
+
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
buildInputs = [ gupnp glib libxml2 ];
- meta = {
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
homepage = http://gupnp.org/;
description = "A collection of helpers for building AV (audio/video) applications using GUPnP";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix
index 75818f75692..aba95889b69 100644
--- a/pkgs/development/libraries/gupnp-dlna/default.nix
+++ b/pkgs/development/libraries/gupnp-dlna/default.nix
@@ -1,22 +1,34 @@
-{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, gupnp, gst-plugins-base }:
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }:
stdenv.mkDerivation rec {
name = "gupnp-dlna-${version}";
- majorVersion = "0.10";
- version = "${majorVersion}.5";
+ version = "0.10.5";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp-dlna/${majorVersion}/${name}.tar.xz";
+ url = "mirror://gnome/sources/gupnp-dlna/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj";
};
- nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
- buildInputs = [ gupnp gst-plugins-base ];
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+ buildInputs = [ gupnp gst_all_1.gst-plugins-base ];
+
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ postPatch = ''
+ chmod +x tests/test-discoverer.sh.in
+ patchShebangs tests/test-discoverer.sh.in
+ '';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GUPnP/;
description = "Library to ease DLNA-related bits for applications using GUPnP";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix
index 182905e9546..50107959786 100644
--- a/pkgs/development/libraries/gupnp-igd/default.nix
+++ b/pkgs/development/libraries/gupnp-igd/default.nix
@@ -1,22 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp }:
-
+{ stdenv, fetchurl, pkgconfig, gettext, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }:
+
stdenv.mkDerivation rec {
name = "gupnp-igd-${version}";
- majorVersion = "0.2";
- version = "${majorVersion}.4";
+ version = "0.2.5";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp-igd/${majorVersion}/${name}.tar.xz";
- sha256 = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44";
+ url = "mirror://gnome/sources/gupnp-igd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
propagatedBuildInputs = [ glib gupnp ];
- meta = {
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "Library to handle UPnP IGD port mapping";
homepage = http://www.gupnp.org/;
- license = stdenv.lib.licenses.lgpl21;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
};
}
-
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 963b93ef691..45adf46ff36 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -1,28 +1,39 @@
-{ stdenv, fetchurl, pkgconfig, glib, gssdp, libsoup, libxml2, libuuid }:
-
+{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, glib, gssdp, libsoup, libxml2, libuuid }:
+
stdenv.mkDerivation rec {
name = "gupnp-${version}";
- majorVersion = "1.0";
- version = "${majorVersion}.2";
+ version = "1.0.3";
+
+ outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
- url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz";
- sha256 = "043nqxlj030a3wvd6x4c9z8fjarjjjsl2pjarl0nn70ig6kzswsi";
+ url = "mirror://gnome/sources/gupnp/${stdenv.lib.versions.majorMinor version}/gupnp-${version}.tar.xz";
+ sha256 = "1fyb6yn75vf2y1b8nbc1df572swzr74yiwy3v3g5xn36wlp1cjvr";
};
- nativeBuildInputs = [ pkgconfig ];
+ patches = [
+ # Nix’s pkg-config ignores Requires.private
+ # https://github.com/NixOS/nixpkgs/commit/1e6622f4d5d500d6e701bd81dd4a22977d10637d
+ # We are essentialy reverting the following patch for now
+ # https://bugzilla.gnome.org/show_bug.cgi?id=685477
+ # at least until Requires.internal or something is implemented
+ # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/7
+ ./fix-requires.patch
+ ];
+
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ];
propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ];
- postInstall = ''
- ln -sv ${libsoup.dev}/include/libsoup-2*/libsoup $out/include
- ln -sv ${libxml2.dev}/include/*/libxml $out/include
- ln -sv ${gssdp}/include/*/libgssdp $out/include
- '';
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.gupnp.org/;
description = "An implementation of the UPnP specification";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gupnp/fix-requires.patch b/pkgs/development/libraries/gupnp/fix-requires.patch
new file mode 100644
index 00000000000..4538fc55460
--- /dev/null
+++ b/pkgs/development/libraries/gupnp/fix-requires.patch
@@ -0,0 +1,9 @@
+--- a/gupnp-1.0.pc.in
++++ b/gupnp-1.0.pc.in
+@@ -8,4 +8,5 @@
+ Version: @VERSION@
+ Libs: -L${libdir} -lgupnp-1.0
+ Cflags: -I${includedir}/gupnp-1.0
+-Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@
++Requires: glib-2.0 gobject-2.0 gssdp-1.0 libxml-2.0 libsoup-2.4
++Requires.private: @UUID_LIBS@
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 4da9db3ef04..f445f90f308 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -1,30 +1,38 @@
-{stdenv, fetchurl
-, automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt
-, glib, systemd, libusb1, vala_0_38
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gobjectIntrospection
+, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44
+, glib, systemd, libusb1, vala, hwdata
}:
stdenv.mkDerivation rec {
name = "gusb-${version}";
- version = "0.2.11";
- enableParallelBuilding = true;
+ version = "0.3.0";
+
+ outputs = [ "bin" "out" "dev" "devdoc" ];
src = fetchurl {
url = "https://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
- sha256 = "1pppz17lw3khyz8by1dddxdqrv6qn4a23fpxs38c67db7x4l7ccw";
+ sha256 = "1p4f6jdjw6zl986f93gzdjg2hdcn5dlz6rcckcz4rbmnk47rbryq";
};
- preConfigure = "./autogen.sh";
-
- nativeBuildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext
- gobjectIntrospection libxslt vala_0_38 ];
- buildInputs = [ systemd glib ];
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext
+ gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44
+ gobjectIntrospection vala
+ ];
+ buildInputs = [ systemd glib ];
propagatedBuildInputs = [ libusb1 ];
- meta = {
+ mesonFlags = [
+ "-Dusb_ids=${hwdata}/share/hwdata/usb.ids"
+ ];
+
+ doCheck = false; # tests try to access USB
+
+ meta = with stdenv.lib; {
description = "GLib libusb wrapper";
- homepage = https://people.freedesktop.org/~hughsient/releases/;
- license = stdenv.lib.licenses.lgpl21;
- maintainers = [stdenv.lib.maintainers.marcweber];
- platforms = stdenv.lib.platforms.linux;
+ homepage = https://github.com/hughsie/libgusb;
+ license = licenses.lgpl21;
+ maintainers = [ maintainers.marcweber ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 360c1fb41f4..6bcf72b8a7e 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
};
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 383f7f60f9b..130bc6f97bf 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,7 +8,7 @@
}:
let
- version = "1.8.8";
+ version = "1.9.0";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
- sha256 = "1ag3scnm1fcviqgx2p4858y433mr0ndqw6zccnccrqcr9mpcird8";
+ sha256 = "004b4j812wgfv8pmcypyrlwrjfa6149lwpz5df6rnm5cy0msdv0i";
};
postPatch = ''
@@ -63,6 +63,7 @@ stdenv.mkDerivation {
homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz;
downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/";
maintainers = [ maintainers.eelco ];
+ license = licenses.mit;
platforms = with platforms; linux ++ darwin;
inherit version;
updateWalker = true;
diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix
index 75dd8693d2c..a5f8f00a6bf 100644
--- a/pkgs/development/libraries/herqq/default.nix
+++ b/pkgs/development/libraries/herqq/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
description = "A software library for building UPnP devices and control points";
platforms = platforms.linux;
maintainers = [ ];
+ broken = true; # 2018-09-21, built with qt510 (which was removed) but neither qt59 nor qt511
};
}
diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index 7ff8ed61cab..0f68d7df298 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "hiredis-${version}";
- version = "0.13.3";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "redis";
repo = "hiredis";
rev = "v${version}";
- sha256 = "1qxiv61bsp6s847hhkxqj7vnbdlac089r2qdp3zgxhhckaflhb7r";
+ sha256 = "0ik38lwpmm780jqrry95ckf6flmvd172444p3q8d1k9n99jwij9c";
};
PREFIX = "\${out}";
diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index 20dda589b9c..32743e61797 100644
--- a/pkgs/development/libraries/hspell/default.nix
+++ b/pkgs/development/libraries/hspell/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "1.1";
};
- PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1";
+ PERL_USE_UNSAFE_INC = "1";
src = fetchurl {
url = "${meta.homepage}${name}.tar.gz";
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
patchPhase = ''patchShebangs .'';
buildInputs = [ perl zlib ];
- meta = {
+ meta = with stdenv.lib; {
description = "Hebrew spell checker";
homepage = http://hspell.ivrix.org.il/;
- platforms = stdenv.lib.platforms.all;
- maintainers = [ ];
+ platforms = platforms.all;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index b3914a4438b..62c3d79cf9a 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
* Delphi, Java (JNA, JNI), Perl, .NET, Python, Ruby ([1], [2]), UNO.
'';
platforms = platforms.all;
+ license = with licenses; [ gpl2 lgpl21 mpl11 ];
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 90a16bcf7f9..8f38170d87e 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -7,15 +7,16 @@ assert x11Support -> libX11 != null && cairo != null;
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "hwloc-1.11.10";
+ name = "hwloc-2.0.2";
src = fetchurl {
- url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2";
- sha256 = "1ryibcng40xcq22lsj85fn2vcvrksdx9rr3wwxpq8dw37lw0is1b";
+ url = "http://www.open-mpi.org/software/hwloc/v2.0/downloads/${name}.tar.bz2";
+ sha256 = "1phc863d5b2fvwpyyq4mlh4rkjdslh6h0h197zmyk3prwrq7si8l";
};
configureFlags = [
"--localstatedir=/var"
+ "--enable-netloc"
];
# XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
# http://www.open-mpi.org/projects/hwloc/license.php
license = licenses.bsd3;
homepage = https://www.open-mpi.org/projects/hwloc/;
- maintainers = with maintainers; [ fpletz ];
+ maintainers = with maintainers; [ fpletz markuskowa ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix
index f99aa0b6f0c..516e4184623 100644
--- a/pkgs/development/libraries/hyena/default.nix
+++ b/pkgs/development/libraries/hyena/default.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.all;
maintainers = with maintainers; [ obadz ];
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index dda1435c1da..ddce76b10f7 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -17,7 +17,10 @@ stdenv.mkDerivation {
doCheck = false; # fails to compile
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags";
+ homepage = http://id3lib.sourceforge.net;
+ platforms = platforms.unix;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix
index 99f6df9c5f0..bb6e23937c0 100644
--- a/pkgs/development/libraries/ilixi/default.nix
+++ b/pkgs/development/libraries/ilixi/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Lightweight C++ GUI toolkit for embedded Linux systems";
- homepage = http://ilixi.org/;
+ homepage = https://github.com/ilixi/ilixi;
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index d78c59e9c25..80154f504d4 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
buildInputs = [ gettext python3 ];
meta = with stdenv.lib; {
- homepage = http://pkg-isocodes.alioth.debian.org/;
+ homepage = https://salsa.debian.org/iso-codes-team/iso-codes;
description = "Various ISO codes packaged as XML files";
- maintainers = [ ];
+ license = licenses.lgpl21;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index cf9c554d57f..3c729f42320 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "1.17";
+ version = "1.18";
name = "commons-compress-${version}";
src = fetchurl {
url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
- sha256 = "1ydm6mhy0kja47mns674iyrhz5mqlhhnh2l8rglzxnq5iawpi2m0";
+ sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1";
};
installPhase = ''
diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix
index d43dcd2a91d..10c39f03789 100644
--- a/pkgs/development/libraries/java/commons/math/default.nix
+++ b/pkgs/development/libraries/java/commons/math/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "3.3";
+ version = "3.6.1";
name = "commons-math-${version}";
src = fetchurl {
url = "mirror://apache/commons/math/binaries/commons-math3-${version}-bin.tar.gz";
- sha256 = "1xs71c4vbai6zr84982g4ggv6c18dhkilkzw9n1irjqnjbgm5kzc";
+ sha256 = "0x4nx5pngv2n4ga11c1s4w2mf6cwydwkgs7da6wwvcjraw57bhkz";
};
installPhase = ''
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index ca9aa8fc36e..687e1e8a1de 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -71,12 +71,12 @@ in {
saxon-he = common {
pname = "saxon-he";
- version = "9.8.0.6";
+ version = "9.9.0.1";
prog = "saxon-he";
jar = "saxon9he";
src = fetchurl {
- url = mirror://sourceforge/saxon/Saxon-HE/9.8/SaxonHE9-8-0-6J.zip;
- sha256 = "03r4djm298rxz8q7jph63h9niglrl3rifxskq1b3bclx5rgxi2lk";
+ url = mirror://sourceforge/saxon/Saxon-HE/9.9/SaxonHE9-9-0-1J.zip;
+ sha256 = "1inxd7ia7rl9fxfrw8dy9sb7rqv76ipblaki5262688wf2dscs60";
};
description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1";
};
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index cc838be0f4f..04a165866fa 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "jbig2dec-0.14";
src = fetchurl {
- url = "http://downloads.ghostscript.com/public/jbig2dec/${name}.tar.gz";
+ url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs922/${name}.tar.gz";
sha256 = "0k01hp0q4275fj4rbr1gy64svfraw5w7wvwl08yjhvsnpb1rid11";
};
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 1 of 4 tests
meta = {
- homepage = https://www.ghostscript.com/jbig2dec.html;
+ homepage = https://www.jbig2dec.com/;
description = "Decoder implementation of the JBIG2 image compression format";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index d8866ae3ff8..593f4411f19 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -12,11 +12,7 @@ stdenv.mkDerivation (rec {
# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
# then stops downstream builds (mariadb in particular) from detecting it. This
# option should remove the prefix and give us a working jemalloc.
- configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="
- # jemalloc is unable to correctly detect transparent hugepage support on
- # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
- # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support
- ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp";
+ configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";
doCheck = true;
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 40c06cbffdf..8cb7c1f9673 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,10 +1,6 @@
{ stdenv, fetchurl, fetchpatch }:
import ./common.nix {
inherit stdenv fetchurl;
- version = "5.0.1";
- sha256 = "4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9";
- patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/jemalloc/jemalloc/pull/1035.patch";
- sha256 = "02y0q3dp253bipxv4r954nqipbjbj92p6ww9bx5bk3d8pa81wkqq";
- });
+ version = "5.1.0";
+ sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk";
}
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
new file mode 100644
index 00000000000..175097ef785
--- /dev/null
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+ name = "jitterentropy-${version}";
+ version = "2.1.2";
+
+ src = fetchFromGitHub {
+ owner = "smuellerDD";
+ repo = "jitterentropy-library";
+ rev = "v${version}";
+ sha256 = "10yl1hi0hysr53wzy2i8brs0qqnxh46mz3dcjh5mk0ad03wvbfsl";
+ };
+
+ enableParallelBuilding = true;
+
+ preInstall = ''
+ mkdir -p $out/include
+ '';
+
+ installFlags = [
+ "PREFIX=$(out)"
+ ];
+
+ meta = {
+ description = "Provides a noise source using the CPU execution timing jitter";
+ homepage = https://github.com/smuellerDD/jitterentropy-library;
+ license = with stdenv.lib.licenses; [ gpl2 bsd3 ];
+ platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ johnazoidberg ];
+ };
+}
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ea8f30f0bba..62ae433ff71 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -145,6 +145,7 @@ let
kpackage = callPackage ./kpackage {};
kpty = callPackage ./kpty.nix {};
kunitconversion = callPackage ./kunitconversion.nix {};
+ syndication = callPackage ./syndication.nix {};
# TIER 3
baloo = callPackage ./baloo.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 48f009f8d3e..43ead0391e4 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.49/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.51/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index e4e4c90bfe1..281778d9d07 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -4,7 +4,7 @@
karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
- qtbase, qtscript, qtx11extras, solid,
+ qtbase, qtscript, qtx11extras, solid, kcrash
}:
mkDerivation {
@@ -14,6 +14,7 @@ mkDerivation {
buildInputs = [
karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras
+ kcrash
];
propagatedBuildInputs = [
kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 4f866974b61..34d0317ea99 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,635 @@
{
attica = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/attica-5.49.0.tar.xz";
- sha256 = "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn";
- name = "attica-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/attica-5.51.0.tar.xz";
+ sha256 = "1lxfrqw6b162sq9254y4hm3gd3w0ck0l4hbi7cgy32rdk0n16sy4";
+ name = "attica-5.51.0.tar.xz";
};
};
baloo = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/baloo-5.49.0.tar.xz";
- sha256 = "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph";
- name = "baloo-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/baloo-5.51.0.tar.xz";
+ sha256 = "1y10ccji9rlazj4h3zpzzcilf777907kizxlbynqya79h20nzjkq";
+ name = "baloo-5.51.0.tar.xz";
};
};
bluez-qt = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/bluez-qt-5.49.0.tar.xz";
- sha256 = "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard";
- name = "bluez-qt-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/bluez-qt-5.51.0.tar.xz";
+ sha256 = "1pjkngd9wx0355lv76y5cb7zhmwabinm2pxfz3mf708azml1gsxg";
+ name = "bluez-qt-5.51.0.tar.xz";
};
};
breeze-icons = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/breeze-icons-5.49.0.tar.xz";
- sha256 = "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph";
- name = "breeze-icons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/breeze-icons-5.51.0.tar.xz";
+ sha256 = "16wcmjaz25j0jqfcbfww5h873wxb19v36b8dvryhbv38ybx30v6i";
+ name = "breeze-icons-5.51.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/extra-cmake-modules-5.49.0.tar.xz";
- sha256 = "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0";
- name = "extra-cmake-modules-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/extra-cmake-modules-5.51.0.tar.xz";
+ sha256 = "151m4pw97sxwarlx67irrikpmy7183dx0dgg1vrmayssyzidvr4n";
+ name = "extra-cmake-modules-5.51.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/frameworkintegration-5.49.0.tar.xz";
- sha256 = "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx";
- name = "frameworkintegration-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/frameworkintegration-5.51.0.tar.xz";
+ sha256 = "0bg4avnwxq06xyjxs1fqqb7scx7qpm2rbvcphz1n9mgg4lqwmgbl";
+ name = "frameworkintegration-5.51.0.tar.xz";
};
};
kactivities = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kactivities-5.49.0.tar.xz";
- sha256 = "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim";
- name = "kactivities-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kactivities-5.51.0.tar.xz";
+ sha256 = "0nfmfb1j56lc8ys99cslaz9d10l09mmky5gxvgchmsbm5lqg3abm";
+ name = "kactivities-5.51.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kactivities-stats-5.49.0.tar.xz";
- sha256 = "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f";
- name = "kactivities-stats-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kactivities-stats-5.51.0.tar.xz";
+ sha256 = "057lxj8i5rdnh0lr8gnb4b3k0bg3dm2xam3fmrfllm81pvq8bq7l";
+ name = "kactivities-stats-5.51.0.tar.xz";
};
};
kapidox = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kapidox-5.49.0.tar.xz";
- sha256 = "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559";
- name = "kapidox-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kapidox-5.51.0.tar.xz";
+ sha256 = "0k7zlyr9gwq45vkzs3pvny5hgqkfd399fw7kwvi01lfkwha0d82n";
+ name = "kapidox-5.51.0.tar.xz";
};
};
karchive = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/karchive-5.49.0.tar.xz";
- sha256 = "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0";
- name = "karchive-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/karchive-5.51.0.tar.xz";
+ sha256 = "1cr80dyxs0zq568x6ll30zr6dzym8pk27q1facw0nlyha4246rvn";
+ name = "karchive-5.51.0.tar.xz";
};
};
kauth = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kauth-5.49.0.tar.xz";
- sha256 = "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8";
- name = "kauth-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kauth-5.51.0.tar.xz";
+ sha256 = "0pgrn9lkhgn9fifywlqqlrx4h295s8wnvjjn6a1saiib2pjaiyhm";
+ name = "kauth-5.51.0.tar.xz";
};
};
kbookmarks = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kbookmarks-5.49.0.tar.xz";
- sha256 = "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53";
- name = "kbookmarks-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kbookmarks-5.51.0.tar.xz";
+ sha256 = "1xsy1n4di28aj53gmvks9ajqh96xnbjcg8rlmkxsyrs9facfm24l";
+ name = "kbookmarks-5.51.0.tar.xz";
};
};
kcmutils = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcmutils-5.49.0.tar.xz";
- sha256 = "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q";
- name = "kcmutils-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kcmutils-5.51.0.tar.xz";
+ sha256 = "018kc5ynz0554bwmpzb0npn3hznrccv2vik2vablhcc73rkx8f68";
+ name = "kcmutils-5.51.0.tar.xz";
};
};
kcodecs = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcodecs-5.49.0.tar.xz";
- sha256 = "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz";
- name = "kcodecs-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kcodecs-5.51.0.tar.xz";
+ sha256 = "15hwqzc10k53dldhm6sq854l7pqmkrkgyrlxhbnygn91wi14zg2m";
+ name = "kcodecs-5.51.0.tar.xz";
};
};
kcompletion = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcompletion-5.49.0.tar.xz";
- sha256 = "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi";
- name = "kcompletion-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kcompletion-5.51.0.tar.xz";
+ sha256 = "1am6bsxy3hnc2d8ssmrx6njyw35vrsszmlrd4szimm4qajkj63zk";
+ name = "kcompletion-5.51.0.tar.xz";
};
};
kconfig = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kconfig-5.49.0.tar.xz";
- sha256 = "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf";
- name = "kconfig-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kconfig-5.51.0.tar.xz";
+ sha256 = "1h7iax57qxb08slf7dzs0dzmn9bhzb0hy3z0pwbc62bg6lvigcbq";
+ name = "kconfig-5.51.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kconfigwidgets-5.49.0.tar.xz";
- sha256 = "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz";
- name = "kconfigwidgets-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kconfigwidgets-5.51.0.tar.xz";
+ sha256 = "10zgqv5l4178kkzcl0jw36l7f34cv6yfamk459jj8rbnkjncrhxw";
+ name = "kconfigwidgets-5.51.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcoreaddons-5.49.0.tar.xz";
- sha256 = "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj";
- name = "kcoreaddons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kcoreaddons-5.51.0.tar.xz";
+ sha256 = "05xvf07z7f1qzz0h7kf987l4qhc75r26ckwv3a417h3aavgjpmqb";
+ name = "kcoreaddons-5.51.0.tar.xz";
};
};
kcrash = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kcrash-5.49.0.tar.xz";
- sha256 = "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3";
- name = "kcrash-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kcrash-5.51.0.tar.xz";
+ sha256 = "1yfph8ban1pcljzhyg8rq6pkmwlwk4qg3nsdskfrkcjq96za2732";
+ name = "kcrash-5.51.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdbusaddons-5.49.0.tar.xz";
- sha256 = "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh";
- name = "kdbusaddons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kdbusaddons-5.51.0.tar.xz";
+ sha256 = "1i54jdhci3w2929vlh43pqc1pzv0b17s5qx6fm2cwq2hbvpqd3kb";
+ name = "kdbusaddons-5.51.0.tar.xz";
};
};
kdeclarative = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdeclarative-5.49.0.tar.xz";
- sha256 = "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9";
- name = "kdeclarative-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kdeclarative-5.51.0.tar.xz";
+ sha256 = "145hasi0g46bbdqyhvw6yfr086c1j73cy46k9vjfw7vx79ksixvj";
+ name = "kdeclarative-5.51.0.tar.xz";
};
};
kded = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kded-5.49.0.tar.xz";
- sha256 = "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc";
- name = "kded-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kded-5.51.0.tar.xz";
+ sha256 = "1g7wc5jbmpqjknbq0ax6gx0rqkrkq020ypcjmah40vv045wq9abk";
+ name = "kded-5.51.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kdelibs4support-5.49.0.tar.xz";
- sha256 = "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi";
- name = "kdelibs4support-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/portingAids/kdelibs4support-5.51.0.tar.xz";
+ sha256 = "05mq7zzjy21a2wsd836n5zbz8cm035c9yph4fq61f723rr4840iq";
+ name = "kdelibs4support-5.51.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdesignerplugin-5.49.0.tar.xz";
- sha256 = "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd";
- name = "kdesignerplugin-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kdesignerplugin-5.51.0.tar.xz";
+ sha256 = "08n1q0ym6abj28k3ii3grr4qrj9gq8kq0vnygw2nv2q2yalvhvj0";
+ name = "kdesignerplugin-5.51.0.tar.xz";
};
};
kdesu = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdesu-5.49.0.tar.xz";
- sha256 = "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k";
- name = "kdesu-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kdesu-5.51.0.tar.xz";
+ sha256 = "11j0hl6fv4az1dhmv8nnrqb8ahqwf75l5gyimsx2lzabqr5qh5p9";
+ name = "kdesu-5.51.0.tar.xz";
};
};
kdewebkit = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdewebkit-5.49.0.tar.xz";
- sha256 = "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n";
- name = "kdewebkit-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kdewebkit-5.51.0.tar.xz";
+ sha256 = "0zkg2qfhs60lmfx10kw30q6wvh01ldflcnzyngkmqrnlv28mwycg";
+ name = "kdewebkit-5.51.0.tar.xz";
};
};
kdnssd = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdnssd-5.49.0.tar.xz";
- sha256 = "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr";
- name = "kdnssd-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kdnssd-5.51.0.tar.xz";
+ sha256 = "0bkxplw69a0lkwzqzqqpj46w6xgmkzac2mncxi9widla67c1ry0l";
+ name = "kdnssd-5.51.0.tar.xz";
};
};
kdoctools = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kdoctools-5.49.0.tar.xz";
- sha256 = "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl";
- name = "kdoctools-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kdoctools-5.51.0.tar.xz";
+ sha256 = "127fmlq16zlm9ai4y09c9dyxnp5n9aj6bbpsg60yaarazfdgzhxw";
+ name = "kdoctools-5.51.0.tar.xz";
};
};
kemoticons = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kemoticons-5.49.0.tar.xz";
- sha256 = "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn";
- name = "kemoticons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kemoticons-5.51.0.tar.xz";
+ sha256 = "1f0af48mxzq9690vf820ysvv6kb6sxhimlhmqwwqgn4b31mg0zrq";
+ name = "kemoticons-5.51.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kfilemetadata-5.49.0.tar.xz";
- sha256 = "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80";
- name = "kfilemetadata-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kfilemetadata-5.51.0.tar.xz";
+ sha256 = "04yyvdm1agpmrjifcphfirsrjl326z20qfvibx4nzxaxzzqkbnyn";
+ name = "kfilemetadata-5.51.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kglobalaccel-5.49.0.tar.xz";
- sha256 = "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl";
- name = "kglobalaccel-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kglobalaccel-5.51.0.tar.xz";
+ sha256 = "1bq5g4ff0zkgrvwvy4zk6b03zr6syqz00hsldb3ki3gxld246gkh";
+ name = "kglobalaccel-5.51.0.tar.xz";
};
};
kguiaddons = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kguiaddons-5.49.0.tar.xz";
- sha256 = "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk";
- name = "kguiaddons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kguiaddons-5.51.0.tar.xz";
+ sha256 = "1p8db1sxh9n1pb4f96wc0b1rzgfyxafawfrcxflcbxxmfb4fj29f";
+ name = "kguiaddons-5.51.0.tar.xz";
};
};
kholidays = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kholidays-5.49.0.tar.xz";
- sha256 = "0yc4i4qsk3w1v0andw737ps1ad70696q140k0ycfhk6qmv1wvsdp";
- name = "kholidays-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kholidays-5.51.0.tar.xz";
+ sha256 = "0nkmk7kb3jywc4p47k7hr5dzlzz47a20bjynvzx3rhn1rhfr0b5s";
+ name = "kholidays-5.51.0.tar.xz";
};
};
khtml = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/khtml-5.49.0.tar.xz";
- sha256 = "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64";
- name = "khtml-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/portingAids/khtml-5.51.0.tar.xz";
+ sha256 = "1p61cn9wixs0zph79zlqsw9bqz0izysvag4b45jbxa8r9lfjr8cc";
+ name = "khtml-5.51.0.tar.xz";
};
};
ki18n = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/ki18n-5.49.0.tar.xz";
- sha256 = "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz";
- name = "ki18n-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/ki18n-5.51.0.tar.xz";
+ sha256 = "14yk52r9zabnhy8hs2xw9iq325f2q13cv41rbss24l99iggxq6bj";
+ name = "ki18n-5.51.0.tar.xz";
};
};
kiconthemes = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kiconthemes-5.49.0.tar.xz";
- sha256 = "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m";
- name = "kiconthemes-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kiconthemes-5.51.0.tar.xz";
+ sha256 = "13swrvqsh9n9sp54kkmw3kj10z37ykf4185n3l3dsbfb7qm3m0c9";
+ name = "kiconthemes-5.51.0.tar.xz";
};
};
kidletime = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kidletime-5.49.0.tar.xz";
- sha256 = "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv";
- name = "kidletime-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kidletime-5.51.0.tar.xz";
+ sha256 = "08galc5l9a479fm1xmraic60gf0y5r614r3075az22af4hvn37d0";
+ name = "kidletime-5.51.0.tar.xz";
};
};
kimageformats = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kimageformats-5.49.0.tar.xz";
- sha256 = "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4";
- name = "kimageformats-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kimageformats-5.51.0.tar.xz";
+ sha256 = "1g1xsy7n9bw7qjv74wchfdb1kibl1h81bf2f6w1j9d4pfdvks19z";
+ name = "kimageformats-5.51.0.tar.xz";
};
};
kinit = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kinit-5.49.0.tar.xz";
- sha256 = "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95";
- name = "kinit-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kinit-5.51.0.tar.xz";
+ sha256 = "1ds4yqxicq659rdq1nmlvm74r50ibbyypfgp93nh5hv6j8m90r0l";
+ name = "kinit-5.51.0.tar.xz";
};
};
kio = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kio-5.49.0.tar.xz";
- sha256 = "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k";
- name = "kio-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kio-5.51.0.tar.xz";
+ sha256 = "1iqwj9fcrlvfish8pqx1wfg9cy9pv9jhddghf0vi83z56ysxz0y0";
+ name = "kio-5.51.0.tar.xz";
};
};
kirigami2 = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kirigami2-5.49.0.tar.xz";
- sha256 = "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz";
- name = "kirigami2-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kirigami2-5.51.0.tar.xz";
+ sha256 = "1adsfvg7jffpvgcxiicwfxki6pgqp8fiiy0waklp5v6pw7ilfymx";
+ name = "kirigami2-5.51.0.tar.xz";
};
};
kitemmodels = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kitemmodels-5.49.0.tar.xz";
- sha256 = "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg";
- name = "kitemmodels-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kitemmodels-5.51.0.tar.xz";
+ sha256 = "02dh3bbjzm5mps2q9ngacwqs1lj6f77pfsgj6205nl4y2q19x0vf";
+ name = "kitemmodels-5.51.0.tar.xz";
};
};
kitemviews = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kitemviews-5.49.0.tar.xz";
- sha256 = "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp";
- name = "kitemviews-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kitemviews-5.51.0.tar.xz";
+ sha256 = "1jarijishc1a84bvz70bq5sjnhr4hfk15dvbhs7lzrf7pnf8cac4";
+ name = "kitemviews-5.51.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kjobwidgets-5.49.0.tar.xz";
- sha256 = "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g";
- name = "kjobwidgets-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kjobwidgets-5.51.0.tar.xz";
+ sha256 = "07lbnwmlrf09pwx123ccwafjkcf0kindxyh33icwld7bac2jaxip";
+ name = "kjobwidgets-5.51.0.tar.xz";
};
};
kjs = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kjs-5.49.0.tar.xz";
- sha256 = "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0";
- name = "kjs-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/portingAids/kjs-5.51.0.tar.xz";
+ sha256 = "01g02m3frb4cq690wqr0f45848ghhyf2xrz3cizg93m70i5c393w";
+ name = "kjs-5.51.0.tar.xz";
};
};
kjsembed = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kjsembed-5.49.0.tar.xz";
- sha256 = "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m";
- name = "kjsembed-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/portingAids/kjsembed-5.51.0.tar.xz";
+ sha256 = "0ml07jbjhzd67f486dawb7hi6dybcya81hmz2ma1dqrxlbyv4kml";
+ name = "kjsembed-5.51.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kmediaplayer-5.49.0.tar.xz";
- sha256 = "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx";
- name = "kmediaplayer-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/portingAids/kmediaplayer-5.51.0.tar.xz";
+ sha256 = "09xa925zzqi3ga1rja81f7zzk6yfr3pflagr3i8k5z60m3gzalh6";
+ name = "kmediaplayer-5.51.0.tar.xz";
};
};
knewstuff = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/knewstuff-5.49.0.tar.xz";
- sha256 = "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk";
- name = "knewstuff-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/knewstuff-5.51.0.tar.xz";
+ sha256 = "1kj8hs8wzagbd7g9ryc5jgwfwk97m4q64yk0nz297jviakfdkcwa";
+ name = "knewstuff-5.51.0.tar.xz";
};
};
knotifications = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/knotifications-5.49.0.tar.xz";
- sha256 = "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9";
- name = "knotifications-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/knotifications-5.51.0.tar.xz";
+ sha256 = "0v37bi67r0i7bk3nk6hyvmz2jgf1hpfsy64qgg4c836l3bcfp8kz";
+ name = "knotifications-5.51.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/knotifyconfig-5.49.0.tar.xz";
- sha256 = "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa";
- name = "knotifyconfig-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/knotifyconfig-5.51.0.tar.xz";
+ sha256 = "0bnlgbpslsbzxfkwns5m8n5dydz61w50giyynl1yjjrkknz2qisn";
+ name = "knotifyconfig-5.51.0.tar.xz";
};
};
kpackage = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kpackage-5.49.0.tar.xz";
- sha256 = "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd";
- name = "kpackage-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kpackage-5.51.0.tar.xz";
+ sha256 = "0zlpw2i6q470xrn9h8i9c7siwnm5z355li4c0q431hjj1nrmh6b8";
+ name = "kpackage-5.51.0.tar.xz";
};
};
kparts = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kparts-5.49.0.tar.xz";
- sha256 = "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k";
- name = "kparts-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kparts-5.51.0.tar.xz";
+ sha256 = "0m7qrigy6hsrxfkcc17ciqnk5inikpw0ksaj1s31hjkgfpnp40hh";
+ name = "kparts-5.51.0.tar.xz";
};
};
kpeople = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kpeople-5.49.0.tar.xz";
- sha256 = "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv";
- name = "kpeople-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kpeople-5.51.0.tar.xz";
+ sha256 = "0639adbg61drp58c6gz0xca0rhgqzk3ny3cz4p5w95r9c8mq4wvr";
+ name = "kpeople-5.51.0.tar.xz";
};
};
kplotting = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kplotting-5.49.0.tar.xz";
- sha256 = "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0";
- name = "kplotting-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kplotting-5.51.0.tar.xz";
+ sha256 = "0dngxcaw49i05kz5rk48k7pd85bklbiinv3444xvz8rg1xq1vvhh";
+ name = "kplotting-5.51.0.tar.xz";
};
};
kpty = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kpty-5.49.0.tar.xz";
- sha256 = "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg";
- name = "kpty-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kpty-5.51.0.tar.xz";
+ sha256 = "1wqg42a72gqgr94p780i2vhzl3m16dc0kf9nsqyaaalw9k31qk0p";
+ name = "kpty-5.51.0.tar.xz";
};
};
kross = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/portingAids/kross-5.49.0.tar.xz";
- sha256 = "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz";
- name = "kross-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/portingAids/kross-5.51.0.tar.xz";
+ sha256 = "139kgp052zqy51r8fyv0d62ci01ampg8na1hkkvmz69x0wqgqwv1";
+ name = "kross-5.51.0.tar.xz";
};
};
krunner = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/krunner-5.49.0.tar.xz";
- sha256 = "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19";
- name = "krunner-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/krunner-5.51.0.tar.xz";
+ sha256 = "0ij0ql1v0263891kcbpg8bjgf3v73lx298qdjysr01ib3jpy7r7f";
+ name = "krunner-5.51.0.tar.xz";
};
};
kservice = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kservice-5.49.0.tar.xz";
- sha256 = "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z";
- name = "kservice-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kservice-5.51.0.tar.xz";
+ sha256 = "1q0m9cvdb67dv81v4vsxql3cg7g7j6ibrb49c1y0wy3bxg7ahn7g";
+ name = "kservice-5.51.0.tar.xz";
};
};
ktexteditor = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/ktexteditor-5.49.0.tar.xz";
- sha256 = "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj";
- name = "ktexteditor-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/ktexteditor-5.51.0.tar.xz";
+ sha256 = "0gyb2sy759crw5xx9dhwk5wdrl3hxalab9c7v6aikfhn5c1jhd1w";
+ name = "ktexteditor-5.51.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/ktextwidgets-5.49.0.tar.xz";
- sha256 = "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1";
- name = "ktextwidgets-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/ktextwidgets-5.51.0.tar.xz";
+ sha256 = "185pyxq97ggv2yxnhiw0kw8ykfvqgj2y4qbrhl2xji00fgmgbsb3";
+ name = "ktextwidgets-5.51.0.tar.xz";
};
};
kunitconversion = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kunitconversion-5.49.0.tar.xz";
- sha256 = "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79";
- name = "kunitconversion-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kunitconversion-5.51.0.tar.xz";
+ sha256 = "0acnpnc1k1n1z4nfrnnr1jq4a301qdvsap19s3if6cahn1g9f1c6";
+ name = "kunitconversion-5.51.0.tar.xz";
};
};
kwallet = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kwallet-5.49.0.tar.xz";
- sha256 = "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z";
- name = "kwallet-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kwallet-5.51.0.tar.xz";
+ sha256 = "1n5wzqk7cxssaxmw7ginl57gl0kg7ihzi57znzjzpffpfzl67faj";
+ name = "kwallet-5.51.0.tar.xz";
};
};
kwayland = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kwayland-5.49.0.tar.xz";
- sha256 = "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6";
- name = "kwayland-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kwayland-5.51.0.tar.xz";
+ sha256 = "1d5nbwyx6n17cbif9nmj9lxnxj1bvcs20hri8q6750h5x5ad7xp2";
+ name = "kwayland-5.51.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kwidgetsaddons-5.49.0.tar.xz";
- sha256 = "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92";
- name = "kwidgetsaddons-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kwidgetsaddons-5.51.0.tar.xz";
+ sha256 = "04ryzr9p08jw4azbnvdmvr6ac157vp5l5lng2dvk8fmsvda9nx2p";
+ name = "kwidgetsaddons-5.51.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kwindowsystem-5.49.0.tar.xz";
- sha256 = "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp";
- name = "kwindowsystem-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kwindowsystem-5.51.0.tar.xz";
+ sha256 = "1hl1dh21rxq58k799iyfcr6mwmc8pgbd8w3mcav61ls0217apxx1";
+ name = "kwindowsystem-5.51.0.tar.xz";
};
};
kxmlgui = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kxmlgui-5.49.0.tar.xz";
- sha256 = "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa";
- name = "kxmlgui-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kxmlgui-5.51.0.tar.xz";
+ sha256 = "0cj2rwbas6rs61hk5w8gklcdpxhsycdfhymg94cdkmdsmkrqvdnw";
+ name = "kxmlgui-5.51.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/kxmlrpcclient-5.49.0.tar.xz";
- sha256 = "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06";
- name = "kxmlrpcclient-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/kxmlrpcclient-5.51.0.tar.xz";
+ sha256 = "0fsfplx5dk0p327r0cncxv0b0mdqfbrj4778a5fbyh3zr17rgd47";
+ name = "kxmlrpcclient-5.51.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/modemmanager-qt-5.49.0.tar.xz";
- sha256 = "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2";
- name = "modemmanager-qt-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/modemmanager-qt-5.51.0.tar.xz";
+ sha256 = "0pvypijbwb95nzx58mhkcz06br6x7z5gagkxgwi5qbgkjg57nf0a";
+ name = "modemmanager-qt-5.51.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/networkmanager-qt-5.49.0.tar.xz";
- sha256 = "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z";
- name = "networkmanager-qt-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/networkmanager-qt-5.51.0.tar.xz";
+ sha256 = "15isj6gma8vb7kpaniq2qacfsl4qzdancxbbndbx4vz452wn8vdx";
+ name = "networkmanager-qt-5.51.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/oxygen-icons5-5.49.0.tar.xz";
- sha256 = "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g";
- name = "oxygen-icons5-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/oxygen-icons5-5.51.0.tar.xz";
+ sha256 = "0c6jbd5m3k98bsmapaaaqsrbk3d4ij0k41gb1j2dpc8hfni1i7gh";
+ name = "oxygen-icons5-5.51.0.tar.xz";
};
};
plasma-framework = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/plasma-framework-5.49.0.tar.xz";
- sha256 = "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv";
- name = "plasma-framework-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/plasma-framework-5.51.0.tar.xz";
+ sha256 = "1ps40ch729fsn4g3mnjk0ka1jldj8lzg2mh3lh7afm0vkcxm9b4n";
+ name = "plasma-framework-5.51.0.tar.xz";
};
};
prison = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/prison-5.49.0.tar.xz";
- sha256 = "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d";
- name = "prison-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/prison-5.51.0.tar.xz";
+ sha256 = "1km2zkj26ymc7lr32x1a001070jj12qnckb2spv67p5cakxrlhan";
+ name = "prison-5.51.0.tar.xz";
};
};
purpose = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/purpose-5.49.0.tar.xz";
- sha256 = "014izz6vvk3vqw7s2qy33dqfflyylk8vqr9srkf391f6yfld9ygz";
- name = "purpose-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/purpose-5.51.0.tar.xz";
+ sha256 = "0pmmwjxaplccc7shyb4199adg0gmm7w1jj4z21mds1mj37p4n0l8";
+ name = "purpose-5.51.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/qqc2-desktop-style-5.49.0.tar.xz";
- sha256 = "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj";
- name = "qqc2-desktop-style-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/qqc2-desktop-style-5.51.0.tar.xz";
+ sha256 = "1ahga7q6z1d9s2xm9fa4xvdikvywzpdk9098lms7cgzk3jrh0dxi";
+ name = "qqc2-desktop-style-5.51.0.tar.xz";
};
};
solid = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/solid-5.49.0.tar.xz";
- sha256 = "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp";
- name = "solid-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/solid-5.51.0.tar.xz";
+ sha256 = "0rgsjz44jxqiy1nqxa03mymz7bjzcxf5xfyf0cnn0gkz4w8wc1bd";
+ name = "solid-5.51.0.tar.xz";
};
};
sonnet = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/sonnet-5.49.0.tar.xz";
- sha256 = "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3";
- name = "sonnet-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/sonnet-5.51.0.tar.xz";
+ sha256 = "05srs168psqpsdlgx2b4f4ik613yl2cgn4zz495c0wd36500zza4";
+ name = "sonnet-5.51.0.tar.xz";
+ };
+ };
+ syndication = {
+ version = "5.51.0";
+ src = fetchurl {
+ url = "${mirror}/stable/frameworks/5.51/syndication-5.51.0.tar.xz";
+ sha256 = "0ngygkwmc8a9132a02x29k998i5l5a6lnk8j6lf0phpp6pvwi9yf";
+ name = "syndication-5.51.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/syntax-highlighting-5.49.0.tar.xz";
- sha256 = "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v";
- name = "syntax-highlighting-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/syntax-highlighting-5.51.0.tar.xz";
+ sha256 = "0lhdm55x23289nmjk12g5f6l4glmw2jmi9cj7792scxqfrwnv8s7";
+ name = "syntax-highlighting-5.51.0.tar.xz";
};
};
threadweaver = {
- version = "5.49.0";
+ version = "5.51.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.49/threadweaver-5.49.0.tar.xz";
- sha256 = "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7";
- name = "threadweaver-5.49.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.51/threadweaver-5.51.0.tar.xz";
+ sha256 = "17daaaj6p8bsmcllxqs2a1ywidcb6rg1s1ichn0isk69gzyv5xlm";
+ name = "threadweaver-5.51.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/kde-frameworks/syndication.nix b/pkgs/development/libraries/kde-frameworks/syndication.nix
new file mode 100644
index 00000000000..71ee520995c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/syndication.nix
@@ -0,0 +1,13 @@
+{ mkDerivation, lib
+, extra-cmake-modules
+, kcodecs
+}:
+
+mkDerivation {
+ name = "syndication";
+ meta = {
+ maintainers = [ lib.maintainers.bkchr ];
+ };
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [ kcodecs ];
+}
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 24adb2a141e..5b92458d89e 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -2,16 +2,11 @@
, texinfo, perlPackages
, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
, CoreFoundation, Security, SystemConfiguration
-# Extra Args
-, type ? ""
}:
-let
- libOnly = type == "lib";
-in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "${type}heimdal-${version}";
+ name = "heimdal-${version}";
version = "7.5.0";
src = fetchFromGitHub {
@@ -21,28 +16,31 @@ stdenv.mkDerivation rec {
sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d";
};
+ outputs = [ "out" "dev" "man" "info" ];
+
patches = [ ./heimdal-make-missing-headers.patch ];
- nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]
- ++ (with perlPackages; [ JSON ])
- ++ optional (!libOnly) texinfo;
+ nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ]
+ ++ (with perlPackages; [ JSON ]);
buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
- ++ [ db sqlite openssl libedit ]
- ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]
- ++ optionals (!libOnly) [ openldap pam ];
+ ++ [ db sqlite openssl libedit openldap pam]
+ ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ];
## ugly, X should be made an option
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
+ "--infodir=$info/share/info"
"--enable-hdb-openldap-module"
"--with-sqlite3=${sqlite.dev}"
- "--with-libedit=${libedit}"
+
+ # ugly, --with-libedit is not enought, it fall back to bundled libedit
+ "--with-libedit-include=${libedit.dev}/include"
+ "--with-libedit-lib=${libedit}/lib"
"--with-openssl=${openssl.dev}"
"--without-x"
"--with-berkeley-db"
"--with-berkeley-db-include=${db.dev}/include"
- ] ++ optionals (!libOnly) [
"--with-openldap=${openldap.dev}"
] ++ optionals (stdenv.isLinux) [
"--with-capng"
@@ -50,24 +48,17 @@ stdenv.mkDerivation rec {
postUnpack = ''
sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common
+ sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac
'';
- buildPhase = optionalString libOnly ''
- (cd include; make -j $NIX_BUILD_CORES)
- (cd lib; make -j $NIX_BUILD_CORES)
- (cd tools; make -j $NIX_BUILD_CORES)
- (cd include/hcrypto; make -j $NIX_BUILD_CORES)
- (cd lib/hcrypto; make -j $NIX_BUILD_CORES)
- '';
-
- installPhase = optionalString libOnly ''
- (cd include; make -j $NIX_BUILD_CORES install)
- (cd lib; make -j $NIX_BUILD_CORES install)
- (cd tools; make -j $NIX_BUILD_CORES install)
- (cd include/hcrypto; make -j $NIX_BUILD_CORES install)
- (cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
- rm -rf $out/{libexec,sbin,share}
- find $out/bin -type f | grep -v 'krb5-config' | xargs rm
+ preConfigure = ''
+ configureFlagsArray+=(
+ "--bindir=$out/bin"
+ "--sbindir=$out/sbin"
+ "--libexecdir=$out/libexec/heimdal"
+ "--mandir=$man/share/man"
+ "--infodir=$man/share/info"
+ "--includedir=$dev/include")
'';
# We need to build hcrypt for applications like samba
@@ -81,9 +72,15 @@ stdenv.mkDerivation rec {
(cd include/hcrypto; make -j $NIX_BUILD_CORES install)
(cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
- # Doesn't succeed with --libexec=$out/sbin, so
- mv "$out/libexec/"* $out/sbin/
- rmdir $out/libexec
+ # Do we need it?
+ rm $out/bin/su
+
+ mkdir -p $dev/bin
+ mv $out/bin/krb5-config $dev/bin/
+
+ # asn1 compilers, move them to $dev
+ mv $out/libexec/heimdal/heimdal/* $dev/bin
+ rmdir $out/libexec/heimdal/heimdal
'';
# Issues with hydra
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index 8be8eb71357..d270e2f0678 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
pname = "kmsxx";
- version = "2017-10-10";
+ version = "2018-09-10";
name = pname + "-" + version;
src = fetchFromGitHub {
owner = "tomba";
repo = "kmsxx";
fetchSubmodules = true;
- rev = "f32b82c17cd357ae1c8ed2636266113955293feb";
- sha256 = "14panqdqq83wh6wym5afdiyrr78mb12ga63pgrppj27kgv398yjj";
+ rev = "524176c33ee2b79f78d454fa621e0d32e7e72488";
+ sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index a269069fb04..259975815d8 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "leatherman-${version}";
- version = "1.4.2";
+ version = "1.5.2";
src = fetchFromGitHub {
- sha256 = "0lhdncwg2xbd3gy65rx8w2qcxvcwfirzkl762zdwqxf6bj6p2hvb";
+ sha256 = "0drn8wdl4mwqz84lwc7cjmc6pxj2jwpx7n2dxwzwj43ps624zhbj";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 04e8eab4d28..b678a089386 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -14,12 +14,15 @@ stdenv.mkDerivation rec {
# in Debian, so we assume they have been sent upstream.
#
patches = [
- ./c-missing_xm_h.patch
- ./c-render_table_crash.patch
+ ./c-missing_xm_h.patch
+ ./c-render_table_crash.patch
./c-xpmpipethrough.patch
];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "An open source clone of the Motif widget set";
+ homepage = http://lesstif.sourceforge.net;
+ platforms = platforms.unix;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix
index 7de72ed73a6..39f493d821c 100644
--- a/pkgs/development/libraries/libHX/default.nix
+++ b/pkgs/development/libraries/libHX/default.nix
@@ -16,14 +16,15 @@ stdenv.mkDerivation rec {
sh autogen.sh
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://libhx.sourceforge.net/;
longDescription = ''
libHX is a C library (with some C++ bindings available) that provides data structures
and functions commonly needed, such as maps, deques, linked lists, string formatting
and autoresizing, option and config file parsing, type checking casts and more.
'';
- maintainers = [ stdenv.lib.maintainers.tstrobel ];
- platforms = stdenv.lib.platforms.linux;
+ maintainers = [ maintainers.tstrobel ];
+ platforms = platforms.linux;
+ license = with licenses; [ gpl3 lgpl21Plus wtfpl ];
};
}
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
index de796307de1..7bd2a1ec573 100644
--- a/pkgs/development/libraries/libLAS/default.nix
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset";
- homepage = https://www.liblas.org;
+ homepage = https://liblas.org;
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.michelk ];
diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix
index 4bb806b91d8..16e9f213ed4 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -25,7 +25,9 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "Library for managing accounts which can be used from GLib applications";
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index b94c845479a..a08a1e33523 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
homepage = https://aomedia.org/av1-features/get-started/;
maintainers = with maintainers; [ kiloreux ];
platforms = platforms.all;
+ license = licenses.bsd2;
};
}
diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix
new file mode 100644
index 00000000000..e63bfd20c79
--- /dev/null
+++ b/pkgs/development/libraries/libaosd/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, cairo, pango,
+ libX11, libXcomposite, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+ version = "0.2.7-9-g177589f";
+ name = "libaosd-${version}";
+
+ src = fetchFromGitHub {
+ owner = "atheme-legacy";
+ repo = "libaosd";
+ rev = "${version}";
+ sha256 = "1cn7k0n74p6jp25kxwcyblhmbdvgw3mikvj0m2jh4c6xccfrgb9a";
+ };
+
+ nativeBuildInputs = [ autoconf automake pkgconfig ];
+ buildInputs = [ cairo pango libX11 libXcomposite ];
+ enableParallelBuilding = true;
+
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
+ meta = with stdenv.lib; {
+ longDescription = ''
+ libaosd is an advanced on screen display library.
+
+ It supports many modern features like anti-aliased text and
+ composited rendering via XComposite, as well as support for
+ rendering Cairo and Pango layouts.
+ '';
+ homepage = https://github.com/atheme-legacy/libaosd;
+ license = licenses.mit;
+ maintainers = with maintainers; [ unode ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 0c0fc3861c9..a887384f94d 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "libatomic_ops-${version}";
- version = "7.6.4";
+ version = "7.6.6";
src = fetchurl {
urls = [
"http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
"https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
];
- sha256 = "0knxncsjhbknlyy6lx7ycxhpzfk3sykhvicgxyp0rmsxd1d3v0jv";
+ sha256 = "0x7071z707msvyrv9dmgahd1sghbkw8fpbagvcag6xs8yp2spzlr";
};
outputs = [ "out" "dev" "doc" ];
diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix
index 54fb89df045..5153b63e91c 100644
--- a/pkgs/development/libraries/libbap/default.nix
+++ b/pkgs/development/libraries/libbap/default.nix
@@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/include
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/binaryanalysisplatform/bap-bindings;
description = "A C library for interacting with BAP";
- maintainers = [ stdenv.lib.maintainers.maurer ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.maurer ];
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index 585f6f18bba..b99a3c7059a 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -4,7 +4,7 @@
}:
let
- version = "2.19";
+ version = "2.20";
in stdenv.mkDerivation rec {
name = "libblockdev-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
owner = "storaged-project";
repo = "libblockdev";
rev = "${version}-1";
- sha256 = "1ny31vaarzbpw0h863p2r5cvjsfs77d33nnisf8bhjc6ps6js3ys";
+ sha256 = "13xy8vx2dnnxczpnwapchc5ncigcxb2fhpmrmglbpkjqmhn2zbdj";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch
deleted file mode 100644
index 81822654aeb..00000000000
--- a/pkgs/development/libraries/libbsd/cdefs.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001
-From: Guillem Jover
-Date: Tue, 6 Mar 2018 01:41:35 +0100
-Subject: Handle systems missing
-
-This is a non-portable header, and we cannot expect it to be provided by
-the system libc (e.g. musl). We just need and rely on declaration that
-we have defined ourselves in our own . So we switch to
-only ever assume that.
-
-Fixes: https://bugs.freedesktop.org/105281
----
- include/bsd/libutil.h | 4 ++++
- include/bsd/md5.h | 4 ++++
- include/bsd/nlist.h | 4 ++++
- include/bsd/readpassphrase.h | 4 ++++
- include/bsd/stdlib.h | 4 ++++
- include/bsd/string.h | 4 ++++
- include/bsd/stringlist.h | 5 +++++
- include/bsd/sys/queue.h | 4 ++++
- include/bsd/sys/tree.h | 4 ++++
- include/bsd/timeconv.h | 4 ++++
- include/bsd/vis.h | 4 ++++
- include/bsd/wchar.h | 4 ++++
- 12 files changed, 49 insertions(+)
-
-diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
-index 45b3b15..ccca29a 100644
---- a/include/bsd/libutil.h
-+++ b/include/bsd/libutil.h
-@@ -40,7 +40,11 @@
- #define LIBBSD_LIBUTIL_H
-
- #include
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
- #include
- #include
- #include
-diff --git a/include/bsd/md5.h b/include/bsd/md5.h
-index 5f3ae46..bf36a30 100644
---- a/include/bsd/md5.h
-+++ b/include/bsd/md5.h
-@@ -27,7 +27,11 @@ typedef struct MD5Context {
- uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */
- } MD5_CTX;
-
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
- #include
-
- __BEGIN_DECLS
-diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h
-index cb297e8..8767117 100644
---- a/include/bsd/nlist.h
-+++ b/include/bsd/nlist.h
-@@ -27,7 +27,11 @@
- #ifndef LIBBSD_NLIST_H
- #define LIBBSD_NLIST_H
-
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
-
- struct nlist {
- union {
-diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h
-index 14744b8..5eb8021 100644
---- a/include/bsd/readpassphrase.h
-+++ b/include/bsd/readpassphrase.h
-@@ -31,7 +31,11 @@
- #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */
- #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */
-
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
- #include
-
- __BEGIN_DECLS
-diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
-index ebc9638..8d33d1f 100644
---- a/include/bsd/stdlib.h
-+++ b/include/bsd/stdlib.h
-@@ -42,7 +42,11 @@
- #ifndef LIBBSD_STDLIB_H
- #define LIBBSD_STDLIB_H
-
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
- #include
- #include
-
-diff --git a/include/bsd/string.h b/include/bsd/string.h
-index 6798bf6..29097f6 100644
---- a/include/bsd/string.h
-+++ b/include/bsd/string.h
-@@ -33,7 +33,11 @@
- #ifndef LIBBSD_STRING_H
- #define LIBBSD_STRING_H
-
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
- #include
-
- __BEGIN_DECLS
-diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h
-index ff30cac..dd71496 100644
---- a/include/bsd/stringlist.h
-+++ b/include/bsd/stringlist.h
-@@ -31,7 +31,12 @@
-
- #ifndef LIBBSD_STRINGLIST_H
- #define LIBBSD_STRINGLIST_H
-+
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
- #include
-
- /*
-diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h
-index 4a94ea7..ac00026 100644
---- a/include/bsd/sys/queue.h
-+++ b/include/bsd/sys/queue.h
-@@ -33,7 +33,11 @@
- #ifndef LIBBSD_SYS_QUEUE_H
- #define LIBBSD_SYS_QUEUE_H
-
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
-
- /*
- * This file defines four types of data structures: singly-linked lists,
-diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h
-index 628bec0..325b382 100644
---- a/include/bsd/sys/tree.h
-+++ b/include/bsd/sys/tree.h
-@@ -30,7 +30,11 @@
- #ifndef LIBBSD_SYS_TREE_H
- #define LIBBSD_SYS_TREE_H
-
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
-
- /*
- * This file defines data structures for different types of trees:
-diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h
-index e2a2c55..a426bd3 100644
---- a/include/bsd/timeconv.h
-+++ b/include/bsd/timeconv.h
-@@ -41,7 +41,11 @@
- #ifndef LIBBSD_TIMECONV_H
- #define LIBBSD_TIMECONV_H
-
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
- #include
- #include
-
-diff --git a/include/bsd/vis.h b/include/bsd/vis.h
-index 970dfdd..ab5430c 100644
---- a/include/bsd/vis.h
-+++ b/include/bsd/vis.h
-@@ -72,7 +72,11 @@
- */
- #define UNVIS_END 1 /* no more characters */
-
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
-
- __BEGIN_DECLS
- char *vis(char *, int, int, int);
-diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h
-index 33a500e..7216503 100644
---- a/include/bsd/wchar.h
-+++ b/include/bsd/wchar.h
-@@ -40,7 +40,11 @@
- #define LIBBSD_WCHAR_H
-
- #include
-+#ifdef LIBBSD_OVERLAY
- #include
-+#else
-+#include
-+#endif
- #include
-
- __BEGIN_DECLS
---
-cgit v1.1
-
diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch
index 4bddec6b0ff..0f9cc9aaf96 100644
--- a/pkgs/development/libraries/libbsd/darwin.patch
+++ b/pkgs/development/libraries/libbsd/darwin.patch
@@ -1,497 +1,103 @@
diff --git a/configure.ac b/configure.ac
-index 88ccd91..0857782 100644
+index 55fcfe6..1e26c93 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -59,7 +59,7 @@ AS_CASE([$host_os],
- )
+@@ -51,15 +51,19 @@ AS_CASE([$host_os],
+ AC_SEARCH_LIBS([clock_gettime], [rt], [CLOCK_GETTIME_LIBS="-lrt"])
+ AC_SUBST([CLOCK_GETTIME_LIBS])
+ LIBS="$saved_LIBS"
++ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1])
+ ],
+ [*-musl*], [
+ # Upstream refuses to define this, we will do it ourselves then.
+ AC_DEFINE([__MUSL__], [1], [Define to 1 if we are building for musl])
++ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1])
+ ],
+-)
++ [
++ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1])
++ ])
# Checks for header files.
-AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h])
-+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h])
++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h nlist.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
-@@ -146,6 +146,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
- pstat_getproc sysconf])
+@@ -143,7 +147,8 @@ AC_LINK_IFELSE(
+
+ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
+ getauxval getentropy getexecname getline \
+- pstat_getproc sysconf])
++ pstat_getproc sysconf \
++ strlcpy strlcat strnstr strmode fpurge])
AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"])
-+HostOS=`echo "$host" | sed 's/.*-//'`
-+os_is_macosx=false
-+nonLinuxOS=false
-+AC_SUBST(HostOS)
-+case ${HostOS} in
-+ darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*)
-+ os_is_macosx=true
-+ nonLinuxOS=true
-+ echo HostOS="$HostOS"
-+ ;;
-+ *)
-+ echo host="$host"
-+ echo HostOS="$HostOS"
-+ os_is_macosx=false
-+ nonLinuxOS=false
-+ ;;
-+esac
-+AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue])
-+AM_COND_IF([IS_DARWIN],
-+ [AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])])
-+
-+AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue])
-+AM_COND_IF([NON_LINUX],
-+ [AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])])
-+
AC_CONFIG_FILES([
- Makefile
- include/Makefile
-diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
-index 45b3b15..d0d4043 100644
---- a/include/bsd/libutil.h
-+++ b/include/bsd/libutil.h
-@@ -39,7 +39,9 @@
- #ifndef LIBBSD_LIBUTIL_H
- #define LIBBSD_LIBUTIL_H
-
-+#ifdef HAVE_FEATURES_H
- #include
-+#endif
- #include
- #include
- #include
-diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
-index 4b69983..c75151b 100644
---- a/include/bsd/stdio.h
-+++ b/include/bsd/stdio.h
-@@ -48,12 +48,16 @@
- __BEGIN_DECLS
- const char *fmtcheck(const char *, const char *);
-
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
- /* XXX: The function requires cooperation from the system libc to store the
- * line buffer in the FILE struct itself. */
- char *fgetln(FILE *fp, size_t *lenp)
-- LIBBSD_DEPRECATED("This functions cannot be safely ported, "
-- "use getline(3) instead, as it is supported "
-- "by GNU and POSIX.1-2008.");
-+ __attribute__((deprecated("This functions cannot be safely ported, "
-+ "use getline(3) instead, as it is supported "
-+ "by GNU and POSIX.1-2008.")));
-+#else
-+char *fgetln(FILE *fp, size_t *lenp);
-+#endif
-
- /*
- * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,
-diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
-index ebc9638..6cd7943 100644
---- a/include/bsd/stdlib.h
-+++ b/include/bsd/stdlib.h
-@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb,
- const unsigned char *table, unsigned endbyte);
-
- void *reallocf(void *ptr, size_t size);
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
-+#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-+#if !__GLIBC_PREREQ(2, 26)
- void *reallocarray(void *ptr, size_t nmemb, size_t size);
- #endif
-+#endif
-
- long long strtonum(const char *nptr, long long minval, long long maxval,
- const char **errstr);
diff --git a/include/bsd/string.h b/include/bsd/string.h
-index 6798bf6..6baaa14 100644
+index f987fee..a1e17ed 100644
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
-@@ -37,6 +37,12 @@
+@@ -41,10 +41,21 @@
#include
__BEGIN_DECLS
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+size_t bsd_strlcpy(char *dst, const char *src, size_t siz);
-+size_t bsd_strlcat(char *dst, const char *src, size_t siz);
-+char *bsd_strnstr(const char *str, const char *find, size_t str_len);
-+void bsd_strmode(mode_t mode, char *str);
-+#else
++#if !HAVE_STRLCPY
size_t strlcpy(char *dst, const char *src, size_t siz);
++#endif
++
++#if !HAVE_STRLCAT
size_t strlcat(char *dst, const char *src, size_t siz);
++#endif
++
++#if !HAVE_STRNSTR
char *strnstr(const char *str, const char *find, size_t str_len);
-@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str);
- #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
- void explicit_bzero(void *buf, size_t len);
- #endif
+#endif
- __END_DECLS
++
++#if !HAVE_STRMODE
+ void strmode(mode_t mode, char *str);
++#endif
- #endif
+ #if !defined(__GLIBC__) || \
+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE)))
diff --git a/src/Makefile.am b/src/Makefile.am
-index ad83dbf..0f2a7ee 100644
+index f3cc0fa..3aaecd4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \
- libbsd.map
+@@ -56,8 +56,10 @@ libbsd_la_DEPENDENCIES = \
libbsd_la_LIBADD = \
$(CLOCK_GETTIME_LIBS)
-+
-+if IS_DARWIN
-+libbsd_la_LDFLAGS = \
-+ -Wl \
-+ -version-number $(LIBBSD_ABI)
-+else
libbsd_la_LDFLAGS = \
- -Wl,--version-script=$(srcdir)/libbsd.map \
+- -Wl,--version-script=$(srcdir)/libbsd.map \
-version-number $(LIBBSD_ABI)
++if BUILD_LINK_VERSION_SCRIPT
++libbsd_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libbsd.map
+endif
-+
libbsd_la_SOURCES = \
arc4random.c \
-- arc4random.h \
-- arc4random_unix.h \
-- arc4random_openbsd.h \
- arc4random_uniform.c \
- bsd_getopt.c \
-- chacha_private.h \
- closefrom.c \
- dehumanize_number.c \
- err.c \
-@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \
- $(nil)
- endif
-
-+noinst_HEADERS = \
-+ arc4random.h \
-+ arc4random_bsd.h \
-+ arc4random_linux.h \
-+ arc4random_unix.h \
-+ arc4random_osx.h \
-+ arc4random_openbsd.h \
-+ chacha_private.h
-+
- libbsd_ctor_a_SOURCES = \
- setproctitle_ctor.c \
- $(nil)
-diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h
-new file mode 100644
-index 0000000..ece2f85
---- /dev/null
-+++ b/src/arc4random_bsd.h
-@@ -0,0 +1,86 @@
-+/* $OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $ */
-+
-+/*
-+ * Copyright (c) 1996, David Mazieres
-+ * Copyright (c) 2008, Damien Miller
-+ * Copyright (c) 2013, Markus Friedl
-+ * Copyright (c) 2014, Theo de Raadt
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+/*
-+ * Stub functions for portability.
-+ */
-+
-+#include
-+
-+#include
-+#include
-+
-+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx)
-+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
-+
-+/*
-+ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if
-+ * a program does not link to -lthr. Callbacks registered with pthread_atfork()
-+ * appear to fail silently. So, it is not always possible to detect a PID
-+ * wraparound.
-+ */
-+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
-+
-+static inline void
-+_getentropy_fail(void)
-+{
-+ raise(SIGKILL);
-+}
-+
-+static volatile sig_atomic_t _rs_forked;
-+
-+static inline void
-+_rs_forkhandler(void)
-+{
-+ _rs_forked = 1;
-+}
-+
-+static inline void
-+_rs_forkdetect(void)
-+{
-+ static pid_t _rs_pid = 0;
-+ pid_t pid = getpid();
-+
-+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
-+ _rs_pid = pid;
-+ _rs_forked = 0;
-+ if (rs)
-+ memset(rs, 0, sizeof(*rs));
-+ }
-+}
-+
-+static inline int
-+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-+{
-+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-+ return (-1);
-+
-+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
-+ munmap(*rsp, sizeof(**rsp));
-+ return (-1);
-+ }
-+
-+ _ARC4_ATFORK(_rs_forkhandler);
-+ return (0);
-+}
-diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h
-new file mode 100644
-index 0000000..d61a8db
---- /dev/null
-+++ b/src/arc4random_linux.h
-@@ -0,0 +1,86 @@
-+/* $OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $ */
-+
-+/*
-+ * Copyright (c) 1996, David Mazieres
-+ * Copyright (c) 2008, Damien Miller
-+ * Copyright (c) 2013, Markus Friedl
-+ * Copyright (c) 2014, Theo de Raadt
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+/*
-+ * Stub functions for portability.
-+ */
-+
-+#include
-+
-+#include
-+#include
-+
-+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx)
-+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
-+
-+#ifdef __GLIBC__
-+extern void *__dso_handle;
-+extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *);
-+#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle)
-+#else
-+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
-+#endif
-+
-+static inline void
-+_getentropy_fail(void)
-+{
-+ raise(SIGKILL);
-+}
-+
-+static volatile sig_atomic_t _rs_forked;
-+
-+static inline void
-+_rs_forkhandler(void)
-+{
-+ _rs_forked = 1;
-+}
-+
-+static inline void
-+_rs_forkdetect(void)
-+{
-+ static pid_t _rs_pid = 0;
-+ pid_t pid = getpid();
-+
-+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
-+ _rs_pid = pid;
-+ _rs_forked = 0;
-+ if (rs)
-+ memset(rs, 0, sizeof(*rs));
-+ }
-+}
-+
-+static inline int
-+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-+{
-+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-+ return (-1);
-+
-+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
-+ munmap(*rsp, sizeof(**rsp));
-+ return (-1);
-+ }
-+
-+ _ARC4_ATFORK(_rs_forkhandler);
-+ return (0);
-+}
-diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h
-new file mode 100644
-index 0000000..14771a6
---- /dev/null
-+++ b/src/arc4random_osx.h
-@@ -0,0 +1,82 @@
-+/* $OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $ */
-+
-+/*
-+ * Copyright (c) 1996, David Mazieres
-+ * Copyright (c) 2008, Damien Miller
-+ * Copyright (c) 2013, Markus Friedl
-+ * Copyright (c) 2014, Theo de Raadt
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+/*
-+ * Stub functions for portability.
-+ */
-+
-+#include
-+
-+#include
-+#include
-+#include
-+
-+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx)
-+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
-+
-+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
-+
-+static inline void
-+_getentropy_fail(void)
-+{
-+ raise(SIGKILL);
-+}
-+
-+static volatile sig_atomic_t _rs_forked;
-+
-+static inline void
-+_rs_forkhandler(void)
-+{
-+ _rs_forked = 1;
-+}
-+
-+static inline void
-+_rs_forkdetect(void)
-+{
-+ static pid_t _rs_pid = 0;
-+ pid_t pid = getpid();
-+
-+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
-+ _rs_pid = pid;
-+ _rs_forked = 0;
-+ if (rs)
-+ memset(rs, 0, sizeof(*rs));
-+ }
-+}
-+
-+static inline int
-+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-+{
-+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-+ return (-1);
-+
-+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
-+ munmap(*rsp, sizeof(**rsp));
-+ *rsp = NULL;
-+ return (-1);
-+ }
-+
-+ _ARC4_ATFORK(_rs_forkhandler);
-+ return (0);
-+}
-diff --git a/src/fgetln.c b/src/fgetln.c
-index 4d1726e..9c73788 100644
---- a/src/fgetln.c
-+++ b/src/fgetln.c
-@@ -30,7 +30,9 @@
- #include
- #include
-
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
- #include "local-link.h"
-+#endif
-
- #ifdef HAVE_GETLINE
- struct filebuf {
-@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len)
- return fb->buf;
- }
- }
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
- libbsd_link_warning(fgetln,
- "This functions cannot be safely ported, use getline(3) "
- "instead, as it is supported by GNU and POSIX.1-2008.")
-+#endif
- #else
- #error "Function fgetln() needs to be ported."
- #endif
+ arc4random.h \
diff --git a/src/fpurge.c b/src/fpurge.c
-index 462535a..e7eb46f 100644
+index 462535a..a8941db 100644
--- a/src/fpurge.c
+++ b/src/fpurge.c
-@@ -26,9 +26,11 @@
+@@ -26,9 +26,10 @@
#include
#include
-+#if HAVE___FPURGE
- #include
-+#endif
+-#include
--#ifdef HAVE___FPURGE
-+#ifdef HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7 */
+ #ifdef HAVE___FPURGE
++#include
++
int
fpurge(FILE *fp)
{
-@@ -42,5 +44,55 @@ fpurge(FILE *fp)
+@@ -41,6 +42,36 @@ fpurge(FILE *fp)
+
return 0;
}
- #else
--#error "Function fpurge() needs to be ported."
-+#define fp_ fp
-+//#error "Function fpurge() needs to be ported."
-+//#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */
++/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */
++#elif HAVE_FPURGE
+int
+fpurge(FILE *fp)
+{
@@ -501,12 +107,13 @@ index 462535a..e7eb46f 100644
+ }
+
+ /* Call the system's fpurge function. */
-+# undef fpurge
-+# if !HAVE_DECL_FPURGE
++#undef fpurge
++#if !HAVE_DECL_FPURGE
+ extern int fpurge (FILE *);
-+# endif
++#endif
+ int result = fpurge (fp);
-+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
++/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
++#if defined(__sferror) || defined(__DragonFly__)
+ if (result == 0)
+ /* Correct the invariants that fpurge broke.
+ on BSD systems says:
@@ -514,69 +121,35 @@ index 462535a..e7eb46f 100644
+ If this invariant is not fulfilled and the stream is read-write but
+ currently reading, subsequent putc or fputc calls will write directly
+ into the buffer, although they shouldn't be allowed to. */
-+ if ((fp_->_flags & __SRD) != 0)
-+ fp_->_w = 0;
++ if ((fp->_flags & __SRD) != 0)
++ fp->_w = 0;
+#endif
+ return result;
+}
-+//#endif
-+#endif
-+
-+#ifdef TEST
-+int
-+main()
-+{
-+ static FILE fp_bad;
-+ FILE *fp;
-+
-+ if (fpurge(&fp_bad) == 0)
-+ return 1;
-+
-+ fp = fopen("/dev/zero", "r");
-+ if (fpurge(fp) < 0)
-+ return 1;
-+
-+ fclose(fp);
-+
-+ return 0;
-+}
+ #else
+ #error "Function fpurge() needs to be ported."
#endif
diff --git a/src/funopen.c b/src/funopen.c
-index 1e05c7e..75e61ea 100644
+index 1e05c7e..65ba5a8 100644
--- a/src/funopen.c
+++ b/src/funopen.c
@@ -143,6 +143,7 @@ funopen(const void *cookie,
* they will not add the needed support to implement it. Just ignore this
* interface there, as it has never been provided anyway.
*/
-+#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#elif defined(__MACH__)
#else
#error "Function funopen() needs to be ported or disabled."
#endif
-diff --git a/src/getentropy.c b/src/getentropy.c
-index 3f11a1e..8a23a07 100644
---- a/src/getentropy.c
-+++ b/src/getentropy.c
-@@ -28,9 +28,7 @@
- #include "getentropy_linux.c"
- #elif defined(__GNU__)
- #include "getentropy_hurd.c"
--#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--#include "getentropy_bsd.c"
--#elif defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- #include "getentropy_bsd.c"
- #elif defined(__sun)
- #include "getentropy_solaris.c"
diff --git a/src/hash/sha512.h b/src/hash/sha512.h
-index 4f368a1..ab22fc1 100644
+index 4f368a1..7632e25 100644
--- a/src/hash/sha512.h
+++ b/src/hash/sha512.h
@@ -29,7 +29,11 @@
#ifndef _SHA512_H_
#define _SHA512_H_
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#ifdef __MACH__
+#include
+#else
#include
@@ -585,16 +158,15 @@ index 4f368a1..ab22fc1 100644
#define SHA512_DIGEST_LENGTH 64
diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c
-index b3c8d5e..f69013d 100644
+index b3c8d5e..602f54e 100644
--- a/src/hash/sha512c.c
+++ b/src/hash/sha512c.c
-@@ -25,7 +25,13 @@
+@@ -25,7 +25,12 @@
*/
#include
-+__FBSDID("$FreeBSD$");
+
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#ifdef __MACH__
+#include
+#else
#include
@@ -602,102 +174,188 @@ index b3c8d5e..f69013d 100644
#include
#include
+diff --git a/src/local-link.h b/src/local-link.h
+index d518dcf..84694a2 100644
+--- a/src/local-link.h
++++ b/src/local-link.h
+@@ -27,7 +27,11 @@
+ #ifndef LIBBSD_LOCAL_LINK_H
+ #define LIBBSD_LOCAL_LINK_H
+
++#ifdef __MACH__
++#define libbsd_link_warning(symbol, msg)
++#else
+ #define libbsd_link_warning(symbol, msg) \
+ static const char libbsd_emit_link_warning_##symbol[] \
+ __attribute__((used,section(".gnu.warning." #symbol))) = msg;
+ #endif
++#endif
diff --git a/src/nlist.c b/src/nlist.c
-index 0932f59..598a329 100644
+index 0932f59..4502048 100644
--- a/src/nlist.c
+++ b/src/nlist.c
-@@ -27,6 +27,10 @@
- * SUCH DAMAGE.
- */
+@@ -41,6 +41,7 @@
+ #include
+ #include
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
-+#if defined(LIBC_SCCS) && !defined(lint)
-+static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
-+#endif /* LIBC_SCCS and not lint */
- #include
++#if !HAVE_NLIST_H
+ #include "local-elf.h"
- #include
-@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list)
+ #define SIZE_T_MAX 0xffffffffU
+@@ -265,3 +266,4 @@ nlist(const char *name, struct nlist *list)
(void)close(fd);
return (n);
}
-+#endif /* _NLIST_DO_ELF */
++#endif
+diff --git a/src/readpassphrase.c b/src/readpassphrase.c
+index f9f6195..2bc5fb4 100644
+--- a/src/readpassphrase.c
++++ b/src/readpassphrase.c
+@@ -36,6 +36,14 @@
+ #define TCSASOFT 0
+ #endif
+
++#ifndef _SIGMAX
++#define _SIGMAX 64
++#endif
++
++#ifndef _NSIG
++#define _NSIG (_SIGMAX + 1)
++#endif
++
+ static volatile sig_atomic_t signo[_NSIG];
+
+ static void handler(int);
diff --git a/src/setproctitle.c b/src/setproctitle.c
-index 038ac7d..d0ef01b 100644
+index 038ac7d..e9ee09c 100644
--- a/src/setproctitle.c
+++ b/src/setproctitle.c
-@@ -32,6 +32,11 @@
+@@ -32,6 +32,10 @@
#include
#include
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+#define __asm__(x)
++#ifdef __MACH__
+extern char **environ;
+#endif
+
static struct {
/* Original value. */
const char *arg0;
-@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5");
+@@ -280,16 +284,22 @@ setproctitle_impl(const char *fmt, ...)
+ *++nul = '\0';
+ }
+ }
++#ifndef __MACH__
+ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5");
++#endif
+
+ /* The original function introduced in 0.2 was a stub, it only got implemented
+ * in 0.5, make the implementation available in the old version as an alias
* for code linking against that version, and change the default to use the
* new version, so that new code depends on the implemented version. */
- #ifdef HAVE_TYPEOF
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+//
-+// HACK: even weak aliasing breaks in clang so just comment this out for now
-+//
-+// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl")));
-+#else
+-#ifdef HAVE_TYPEOF
++#ifdef __MACH__
++void setproctitle_stub(const char *fmt, ...);
++#elif HAVE_TYPEOF
extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl")));
-+#endif
#else
void setproctitle_stub(const char *fmt, ...)
__attribute__((alias("setproctitle_impl")));
+ #endif
++#ifndef __MACH__
+ __asm__(".symver setproctitle_stub,setproctitle@LIBBSD_0.2");
++#endif
diff --git a/src/strlcat.c b/src/strlcat.c
-index 14c53a1..e01cb60 100644
+index 14c53a1..5961c17 100644
--- a/src/strlcat.c
+++ b/src/strlcat.c
-@@ -27,7 +27,11 @@
+@@ -26,6 +26,7 @@
+ * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
* If retval >= dsize, truncation occurred.
*/
++#if !HAVE_STRLCAT
size_t
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+bsd_strlcat(char *dst, const char *src, size_t dsize)
-+#else
strlcat(char *dst, const char *src, size_t dsize)
-+#endif
{
- const char *odst = dst;
- const char *osrc = src;
+@@ -53,3 +54,4 @@ strlcat(char *dst, const char *src, size_t dsize)
+
+ return(dlen + (src - osrc)); /* count does not include NUL */
+ }
++#endif
diff --git a/src/strlcpy.c b/src/strlcpy.c
-index e9a7fe4..10a855f 100644
+index e9a7fe4..5137acb 100644
--- a/src/strlcpy.c
+++ b/src/strlcpy.c
-@@ -25,7 +25,11 @@
+@@ -24,6 +24,7 @@
+ * chars will be copied. Always NUL terminates (unless dsize == 0).
* Returns strlen(src); if retval >= dsize, truncation occurred.
*/
++#if !HAVE_STRLCPY
size_t
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+bsd_strlcpy(char *dst, const char *src, size_t dsize)
-+#else
strlcpy(char *dst, const char *src, size_t dsize)
-+#endif
{
- const char *osrc = src;
- size_t nleft = dsize;
+@@ -48,3 +49,4 @@ strlcpy(char *dst, const char *src, size_t dsize)
+
+ return(src - osrc - 1); /* count does not include NUL */
+ }
++#endif
diff --git a/src/strmode.c b/src/strmode.c
-index e6afde5..c463243 100644
+index e6afde5..da680c9 100644
--- a/src/strmode.c
+++ b/src/strmode.c
-@@ -33,7 +33,11 @@
+@@ -32,6 +32,7 @@
+ #include
#include
++#if !HAVE_STRMODE
void
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+bsd_strmode(mode_t mode, char *p)
-+#else
strmode(mode_t mode, char *p)
+ {
+@@ -141,3 +142,4 @@ strmode(mode_t mode, char *p)
+ *p++ = ' '; /* will be a '+' if ACL's implemented */
+ *p = '\0';
+ }
++#endif
+diff --git a/src/unvis.c b/src/unvis.c
+index 94e3e7a..fba4c66 100644
+--- a/src/unvis.c
++++ b/src/unvis.c
+@@ -565,11 +565,15 @@ strnunvis_openbsd(char *dst, const char *src, size_t dlen)
+ {
+ return strnunvisx(dst, dlen, src, 0);
+ }
++#ifndef __MACH__
+ __asm__(".symver strnunvis_openbsd,strnunvis@@LIBBSD_0.2");
++#endif
+
+ int
+ strnunvis_netbsd(char *dst, size_t dlen, const char *src)
+ {
+ return strnunvisx(dst, dlen, src, 0);
+ }
++#ifndef __MACH__
+ __asm__(".symver strnunvis_netbsd,strnunvis@LIBBSD_0.9.1");
+#endif
+diff --git a/src/vis.c b/src/vis.c
+index c2cd2d8..2d84330 100644
+--- a/src/vis.c
++++ b/src/vis.c
+@@ -723,14 +723,18 @@ strnvis_openbsd(char *mbdst, const char *mbsrc, size_t dlen, int flags)
{
- /* print type */
- switch (mode & S_IFMT) {
+ return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL);
+ }
++#ifndef __MACH__
+ __asm__(".symver strnvis_openbsd,strnvis@@LIBBSD_0.2");
++#endif
+
+ int
+ strnvis_netbsd(char *mbdst, size_t dlen, const char *mbsrc, int flags)
+ {
+ return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL);
+ }
++#ifndef __MACH__
+ __asm__(".symver strnvis_netbsd,strnvis@LIBBSD_0.9.1");
++#endif
+
+ int
+ stravis(char **mbdstp, const char *mbsrc, int flags)
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 36410e842a5..a8d1925e5c0 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libbsd-${version}";
- version = "0.8.7";
+ version = "0.9.1";
src = fetchurl {
url = "https://libbsd.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m";
+ sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
};
# darwin changes configure.ac which means we need to regenerate
@@ -14,15 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch
- # Suitable for all, but limited to musl to avoid rebuilds
- ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
- # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490
- ./non-glibc.patch
- # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd
- ./cdefs.patch
- # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404
- ./features.patch
- ];
+ # Suitable for all but limited to musl to avoid rebuild
+ ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./musl.patch;
meta = with stdenv.lib; {
description = "Common functions found on BSD systems";
diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch
deleted file mode 100644
index 66bd1e9232b..00000000000
--- a/pkgs/development/libraries/libbsd/features.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001
-From: Guillem Jover
-Date: Tue, 6 Mar 2018 01:42:52 +0100
-Subject: Remove inclusion from
-
-This is a non-portable header, and we should not assume it is present.
-Let the first system header pull it in if needed.
----
- include/bsd/libutil.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
-index ccca29a..e5f148a 100644
---- a/include/bsd/libutil.h
-+++ b/include/bsd/libutil.h
-@@ -39,7 +39,6 @@
- #ifndef LIBBSD_LIBUTIL_H
- #define LIBBSD_LIBUTIL_H
-
--#include
- #ifdef LIBBSD_OVERLAY
- #include
- #else
---
-cgit v1.1
-
diff --git a/pkgs/development/libraries/libbsd/musl.patch b/pkgs/development/libraries/libbsd/musl.patch
new file mode 100644
index 00000000000..fc07cfb6e85
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/musl.patch
@@ -0,0 +1,14 @@
+Source: maxice8
+Upstream: no
+Reason: fixes compilation
+
+--- a/src/flopen.c
++++ b/src/flopen.c
+@@ -34,6 +34,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+
diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch
deleted file mode 100644
index f61e0d24294..00000000000
--- a/pkgs/development/libraries/libbsd/non-glibc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001
-From: Guillem Jover
-Date: Tue, 6 Mar 2018 01:39:45 +0100
-Subject: Fix function declaration protection for glibc already providing them
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On non-glibc based systems we cannot unconditionally use the
-__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead,
-if it is undefined, define it to 0.
-
-We should also always declare these functions on non-glibc based
-systems. And on systems with a new enough glibc, which provides these
-functions, we should still provide the declarations if _GNU_SOURCE
-is *not* defined.
-
-Reported-by: Jörg Krause
----
- include/bsd/stdlib.h | 3 ++-
- include/bsd/string.h | 3 ++-
- include/bsd/sys/cdefs.h | 8 ++++++++
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
-index 8d33d1f..a5b063c 100644
---- a/include/bsd/stdlib.h
-+++ b/include/bsd/stdlib.h
-@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb,
- const unsigned char *table, unsigned endbyte);
-
- void *reallocf(void *ptr, size_t size);
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
-+#if !defined(__GLIBC__) || \
-+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE)))
- void *reallocarray(void *ptr, size_t nmemb, size_t size);
- #endif
-
-diff --git a/include/bsd/string.h b/include/bsd/string.h
-index 29097f6..f987fee 100644
---- a/include/bsd/string.h
-+++ b/include/bsd/string.h
-@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz);
- char *strnstr(const char *str, const char *find, size_t str_len);
- void strmode(mode_t mode, char *str);
-
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
-+#if !defined(__GLIBC__) || \
-+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE)))
- void explicit_bzero(void *buf, size_t len);
- #endif
- __END_DECLS
-diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
-index b4c8f30..d1cc419 100644
---- a/include/bsd/sys/cdefs.h
-+++ b/include/bsd/sys/cdefs.h
-@@ -59,6 +59,14 @@
- #endif
-
- /*
-+ * On non-glibc based systems, we cannot unconditionally use the
-+ * __GLIBC_PREREQ macro as it gets expanded before evaluation.
-+ */
-+#ifndef __GLIBC_PREREQ
-+#define __GLIBC_PREREQ(maj, min) 0
-+#endif
-+
-+/*
- * Some kFreeBSD headers expect those macros to be set for sanity checks.
- */
- #ifndef _SYS_CDEFS_H_
---
-cgit v1.1
-
diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix
index 76977b74519..f68141ef3b4 100644
--- a/pkgs/development/libraries/libburn/default.nix
+++ b/pkgs/development/libraries/libburn/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libburn-${version}";
- version = "1.4.8";
+ version = "1.5.0";
src = fetchurl {
url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
- sha256 = "19lxnzn8bz70glrrrn2hs43gf5g7gfbcka9rcbckhv1pb7is509y";
+ sha256 = "1gg2kgnqvaa2fwghai62prxz6slpak1f6bvgjh8m4dn16v114asq";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix
new file mode 100644
index 00000000000..f116360474e
--- /dev/null
+++ b/pkgs/development/libraries/libcacard/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, nss }:
+
+stdenv.mkDerivation rec {
+ name = "libcacard-${version}";
+ version = "2.6.1";
+
+ src = fetchurl {
+ url = "https://www.spice-space.org/download/libcacard/${name}.tar.xz";
+ sha256 = "1w6y0kiakhg7dgyf8yqpm4jj6jiv17zhy9lp3d7z32q1pniccxk2";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib nss ];
+
+ meta = with stdenv.lib; {
+ description = "Smart card emulation library";
+ homepage = https://gitlab.freedesktop.org/spice/libcacard;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ yegortimoshenko ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 8addb6128f0..460a58a19a7 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,6 +1,7 @@
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libtool
, gtk ? null
, libpulseaudio, gst_all_1, libvorbis, libcap
+, CoreServices
, withAlsa ? stdenv.isLinux, alsaLib }:
stdenv.mkDerivation rec {
@@ -15,6 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libpulseaudio libvorbis gtk
] ++ (with gst_all_1; [ gstreamer gst-plugins-base ])
+ ++ lib.optional stdenv.isDarwin CoreServices
++ lib.optional stdenv.isLinux libcap
++ lib.optional withAlsa alsaLib;
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 22debc6d68a..9e7d608b512 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -14,12 +14,10 @@ let
in
stdenv.mkDerivation rec {
name = "cef-binary-${version}";
- # Not very recent but more recent versions have problems:
- # https://github.com/bazukas/obs-linuxbrowser/issues/63
- version = "3.3325.1750.gaabe4c4";
+ version = "3.3497.1833.g13f506f";
src = fetchurl {
url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
- sha256 = "06pj1ci1lwammz1vwmbgw2fri7gkvbpv4iw67pqckd9xz0cfhwzr";
+ sha256 = "02v22yx1ga2yxagjblzkfw0ax7zkrdpc959l1a15m8nah3y7xf9p";
};
nativeBuildInputs = [ cmake ];
makeFlags = "libcef_dll_wrapper";
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index e4864aded27..95b1ad074b0 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -9,10 +9,12 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "13chvc2n074i0jw5jlb8i7cysda4yqx58ca6y3mrlrl9g37k2zja";
};
+ outputs = [ "out" "dev" ];
+
nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ];
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index 6d37eb19c71..a2f6858a05c 100644
--- a/pkgs/development/libraries/libclthreads/default.nix
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -2,20 +2,17 @@
stdenv.mkDerivation rec {
name = "libclthreads-${version}";
- version = "2.4.0";
+ version = "2.4.2";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2";
- sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6";
+ sha256 = "0cbs1w89q8wfjrrhvxf6xk0y02nkjl5hd0yb692c8ma01i6b2nf6";
};
patchPhase = ''
- # Fix hardcoded paths to executables
- sed -e "s@/usr/bin/install@install@" -i ./Makefile
- sed -e "s@/sbin/ldconfig@ldconfig@" -i ./Makefile
-
- # Remove useless symlink: /lib64 -> /lib
- sed -e '/ln -sf \$(CLTHREADS_MIN) \$(PREFIX)\/\$(LIBDIR)\/\$(CLTHREADS_SO)/d' -i ./Makefile
+ cd source
+ # don't run ldconfig:
+ sed -e "/ldconfig/d" -i ./Makefile
'';
makeFlags = [
@@ -24,12 +21,13 @@ stdenv.mkDerivation rec {
];
preInstall = ''
- # The Makefile does not create the include directory
+ # The Makefile does not create the include and lib directories
mkdir -p $out/include
+ mkdir -p $out/lib
'';
postInstall = ''
- ln -s $out/lib/libclthreads.so.${version} $out/lib/libclthreads.so
+ ln $out/lib/libclthreads.so $out/lib/libclthreads.so.2
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
index ce67a8efa80..6e6ca647fc0 100644
--- a/pkgs/development/libraries/libclxclient/default.nix
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -1,20 +1,28 @@
-{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg }:
+{ stdenv, fetchurl, libclthreads, libX11, libXft, xorg, pkgconfig }:
stdenv.mkDerivation rec {
name = "libclxclient-${version}";
- version = "3.9.0";
+ version = "3.9.2";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2";
- sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0";
+ sha256 = "10bq6fy8d3pr1x2x3xx9qhf2hdxrwdgvg843a2y6lx70y1jfj0c5";
};
buildInputs = [ libclthreads libX11 libXft xorg.xproto ];
+ nativeBuildInputs = [ pkgconfig ];
+
NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include";
patchPhase = ''
- sed -e "s@ldconfig@@" -i Makefile
+ cd source
+ # use pkg-config instead of pkgcon:
+ sed -e 's/pkgconf/pkg-config/g' -i ./Makefile
+ # don't run ldconfig:
+ sed -e "/ldconfig/d" -i ./Makefile
+ # make sure it can find clxclient.h:
+ sed -e 's//"clxclient.h"/' -i ./enumip.cc
'';
makeFlags = [
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 347e3218c1d..516702e2afe 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libcouchbase-${version}";
- version = "2.9.2";
+ version = "2.10.0";
src = fetchFromGitHub {
owner = "couchbase";
repo = "libcouchbase";
rev = version;
- sha256 = "1ca3jp1nr5dk2w35wwyhsf96pblbw6n6n7a3ja264ivc9nhpkz4z";
+ sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2";
};
cmakeFlags = "-DLCB_NO_MOCK=ON";
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index 59e576fd392..5dc153dd5cc 100644
--- a/pkgs/development/libraries/libdaemon/default.nix
+++ b/pkgs/development/libraries/libdaemon/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl}:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
name = "libdaemon-0.14";
src = fetchurl {
@@ -8,6 +8,8 @@ stdenv.mkDerivation (rec {
sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx";
};
+ patches = [ ./fix-includes.patch ];
+
configureFlags = [ "--disable-lynx" ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
[ # Can't run this test while cross-compiling
@@ -16,16 +18,8 @@ stdenv.mkDerivation (rec {
meta = {
description = "Lightweight C library that eases the writing of UNIX daemons";
-
homepage = http://0pointer.de/lennart/projects/libdaemon/;
-
license = stdenv.lib.licenses.lgpl2Plus;
-
platforms = stdenv.lib.platforms.unix;
- maintainers = [ ];
};
-} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl {
- # This patch should be applied unconditionally, but doing so will cause mass rebuild.
- patches = ./fix-includes.patch;
-})
-
+}
diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index 5a0006ad6c6..d399998455e 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
stdenv.mkDerivation rec {
- version = "3.19.1";
+ version = "3.20.0";
name = "libdap-${version}";
nativeBuildInputs = [ bison flex ];
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://www.opendap.org/pub/source/${name}.tar.gz";
- sha256 = "0gnki93z3kkzp65x7n1kancy7bd503j4qja5fhzvm1gkmi5l65aj";
+ sha256 = "0cr3d7dlzq583dqqrkbs1bkcrwag4hp7hwrx5c0mjk7q4vrslh92";
};
meta = with stdenv.lib; {
description = "A C++ SDK which contains an implementation of DAP";
- homepage = https://www.opendap.org/download/libdap;
+ homepage = https://www.opendap.org/software/libdap;
license = licenses.lgpl2;
maintainers = [ maintainers.bzizou ];
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 1342ee6773f..72c3ca0e2b0 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Provides a Qt implementation of the DBusMenu spec";
inherit homepage;
- maintainers = [ ];
inherit (qt4.meta) platforms;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 9c25757efb0..32b0c9758f7 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchbzr, cmake, qtbase }:
+{ stdenv, fetchgit, cmake, qtbase }:
-stdenv.mkDerivation {
- name = "libdbusmenu-qt-0.9.3+14";
+stdenv.mkDerivation rec {
+ name = "libdbusmenu-qt-${version}";
+ version = "0.9.3+16";
- src = fetchbzr {
- url = "https://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk";
- rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2";
- sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd";
+ src = fetchgit {
+ url = https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt;
+ rev = "import/${version}.04.20160218-1";
+ sha256 = "039yvklhbmfbcynrbqq9n5ywmj8bjfslnkzcnwpzyhnxdzb6yxlx";
};
buildInputs = [ qtbase ];
@@ -19,5 +20,6 @@ stdenv.mkDerivation {
description = "Provides a Qt implementation of the DBusMenu spec";
maintainers = [ maintainers.ttuegel ];
inherit (qtbase.meta) platforms;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 5107d8898d4..761216f420b 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
stdenv.mkDerivation rec {
- name = "libdrm-2.4.93";
+ name = "libdrm-2.4.94";
src = fetchurl {
url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2";
- sha256 = "0g6d9wsnb7lx8r1m4kq8js0wsc5jl20cz1csnlh6z9s8jpfd313f";
+ sha256 = "1ghn3l1dv1rsp9z6jpmy4ryna1s8rm4xx0ds532041bnlfq5jg5p";
};
outputs = [ "out" "dev" "bin" ];
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index 8d264c929a5..7b3df42c24c 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/pkgs/development/libraries/libexttextcat/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k";
};
- meta = {
+ meta = with stdenv.lib; {
description = "An N-Gram-Based Text Categorization library primarily intended for language guessing";
homepage = https://wiki.documentfoundation.org/Libexttextcat;
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix
new file mode 100644
index 00000000000..a6fe2bc1435
--- /dev/null
+++ b/pkgs/development/libraries/libgaminggear/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, cmake, pkgconfig, gettext
+, gtk2, libcanberra, libnotify, pcre, sqlite, xorg
+}:
+
+stdenv.mkDerivation rec {
+ name = "libgaminggear-${version}";
+ version = "0.15.1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libgaminggear/${name}.tar.bz2";
+ sha256 = "0jf5i1iv8j842imgiixbhwcr6qcwa93m27lzr6gb01ri5v35kggz";
+ };
+
+ outputs = [ "dev" "out" "bin" ];
+
+ nativeBuildInputs = [ cmake pkgconfig gettext ];
+
+ propagatedBuildInputs = [
+ gtk2 libcanberra libnotify pcre sqlite xorg.libXdmcp xorg.libpthreadstubs
+ ];
+
+ enableParallelBuilding = true;
+
+ cmakeFlags = [
+ "-DINSTALL_CMAKE_MODULESDIR=lib/cmake"
+ "-DINSTALL_PKGCONFIGDIR=lib/pkgconfig"
+ "-DINSTALL_LIBDIR=lib"
+ ];
+
+ postFixup = ''
+ moveToOutput bin "$bin"
+ '';
+
+ meta = {
+ description = "Provides functionality for gaming input devices";
+ homepage = https://sourceforge.net/projects/libgaminggear/;
+ platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 5e94d00dcdb..d54f9203d23 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so
'';
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
+ homepage = https://www.mono-project.com/docs/gui/libgdiplus/;
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 29f346e9acf..0af0a1227f3 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3,
- libstartup_notification, libgtop, perl, perlXMLParser,
+ libstartup_notification, libgtop, perlPackages,
autoreconfHook, intltool, docbook_xsl, xauth
}:
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk2 gnome2.GConf libstartup_notification
- gnome3.libgnome-keyring libgtop gnome2.libglade perl perlXMLParser
- ];
+ gnome3.libgnome-keyring libgtop gnome2.libglade
+ ] ++ (with perlPackages; [ perl XMLParser ]);
enableParallelBuilding = true;
@@ -30,26 +30,26 @@ stdenv.mkDerivation rec {
# Patches from the gentoo ebuild
# Fix compilation on bsdc
- ./libgksu-2.0.0-fbsd.patch
+ ./libgksu-2.0.0-fbsd.patch
# Fix wrong usage of LDFLAGS, gentoo bug #226837
- ./libgksu-2.0.7-libs.patch
+ ./libgksu-2.0.7-libs.patch
# Use po/LINGUAS
- ./libgksu-2.0.7-polinguas.patch
+ ./libgksu-2.0.7-polinguas.patch
# Don't forkpty; gentoo bug #298289
- ./libgksu-2.0.12-revert-forkpty.patch
+ ./libgksu-2.0.12-revert-forkpty.patch
# Make this gmake-3.82 compliant, gentoo bug #333961
- ./libgksu-2.0.12-fix-make-3.82.patch
+ ./libgksu-2.0.12-fix-make-3.82.patch
# Do not build test programs that are never executed; also fixes gentoo bug #367397 (underlinking issues).
- ./libgksu-2.0.12-notests.patch
+ ./libgksu-2.0.12-notests.patch
# Fix automake-1.11.2 compatibility, gentoo bug #397411
- ./libgksu-2.0.12-automake-1.11.2.patch
- ];
+ ./libgksu-2.0.12-automake-1.11.2.patch
+ ];
postPatch = ''
# gentoo bug #467026
diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index e7157afbaee..8dcbab95e97 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation {
meta = {
inherit (glib.meta) platforms maintainers;
+ license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 33276b424e7..6938cfd8c51 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -1,31 +1,24 @@
-{ stdenv, fetchurl, autoreconfHook, perl, zlib, gnutls, gss, openssl
-, libidn }:
+{ stdenv, fetchurl, libtool, groff, perl, pkgconfig, python2, zlib, gnutls,
+ libidn2, libunistring, nghttp2 }:
stdenv.mkDerivation rec {
- version = "7.54.1";
+ version = "7.61.1";
name = "libgnurl-${version}";
src = fetchurl {
- url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2";
- sha256 = "0szbj352h95sgc9kbx9wzkgjksmg3g5k6cvlc7hz3wrbdh5gb0a4";
+ url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
+ sha256 = "0y56k15vp3m2r8q6mnc6ivflwq9lv6npdhbbvxxcf4r8vwjhv91q";
};
- nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ perl gnutls gss openssl zlib libidn ];
-
- preConfigure = ''
- sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
- '';
+ nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
+
+ buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ];
configureFlags = [
- "--enable-ipv6" "--with-gnutls" "--without-libmetalink" "--without-winidn"
- "--without-librtmp" "--without-nghttp2" "--without-nss" "--without-cyassl"
- "--without-polarssl" "--without-ssl" "--without-winssl"
- "--without-darwinssl" "--disable-sspi" "--disable-ntlm-wb" "--disable-ldap"
- "--disable-rtsp" "--disable-dict" "--disable-telnet" "--disable-tftp"
- "--disable-pop3" "--disable-imap" "--disable-smtp" "--disable-gopher"
- "--disable-file" "--disable-ftp" "--disable-smb"
+ "--disable-ntlm-wb"
+ "--without-ca-bundle"
+ "--with-ca-fallback"
];
meta = with stdenv.lib; {
@@ -33,5 +26,6 @@ stdenv.mkDerivation rec {
homepage = https://gnunet.org/gnurl;
maintainers = with maintainers; [ falsifian vrthra ];
platforms = platforms.linux;
+ license = licenses.curl;
};
}
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 9d1427f7f45..52d0f6f05cc 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -17,21 +17,13 @@
};
in stdenv.mkDerivation (rec {
name = "libgpg-error-${version}";
- version = "1.28";
+ version = "1.32";
src = fetchurl {
url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
- sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry";
+ sha256 = "1jj08ns4sh1hmafqp1giskvdicdz18la516va26jycy27kkwaif3";
};
- patches = [
- # Fix builds on ARM, AArch64
- (fetchpatch {
- url = "https://github.com/gpg/libgpg-error/commit/791177de023574223eddf7288eb7c5a0721ac623.patch";
- sha256 = "0vqfw0ak1j37wf6sk9y9vmdyk3kxdxkldhs0bv2waa76s11cmdx0";
- })
- ];
-
postPatch = ''
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index 74aee0f39c7..f178af34908 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
+{stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib,
libimobiledevice, pythonPackages, mutagen,
monoSupport ? true, mono, gtk-sharp-2_0
@@ -25,8 +25,9 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ];
- nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl] ++
- lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
+ nativeBuildInputs = [ gettext intltool pkgconfig ]
+ ++ (with perlPackages; [ perl XMLParser ])
+ ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
meta = {
homepage = http://gtkpod.sourceforge.net/;
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 20a08885142..bcd37396bf7 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -2,11 +2,11 @@
, python, perl, gdk_pixbuf, libiconv, libintl }:
stdenv.mkDerivation rec {
- name = "libgsf-1.14.42";
+ name = "libgsf-1.14.44";
src = fetchurl {
url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
- sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9";
+ sha256 = "1ppzfk3zmmgrg9jh8vc4dacddbfngjslq2wpj94pcr3i0c8dxgk8";
};
nativeBuildInputs = [ pkgconfig intltool libintl ];
diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
index d0be9e25b87..bab7ede2d6e 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "04mnxgzyb26wqk6qij4iw8cxwl82r8pcsna5dg8vz2j3pdi0wv2g";
};
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index 54760549a16..e07622eb13a 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
};
diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/pkgs/development/libraries/libguestfs/appliance.nix
index d47b0902818..9c2b317ab08 100644
--- a/pkgs/development/libraries/libguestfs/appliance.nix
+++ b/pkgs/development/libraries/libguestfs/appliance.nix
@@ -4,4 +4,8 @@ fetchzip {
name = "libguestfs-appliance-1.38.0";
url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz";
sha256 = "15rxwj5qjflizxk7slpbrj9lcwkd2lgm52f5yv101qba4yyn3g76";
+
+ meta = {
+ hydraPlatforms = []; # Hydra fails with "Output limit exceeded"
+ };
}
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 6001946cb97..aad6365e4c2 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -11,11 +11,11 @@ assert javaSupport -> jdk != null;
stdenv.mkDerivation rec {
name = "libguestfs-${version}";
- version = "1.38.4";
+ version = "1.38.6";
src = fetchurl {
url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
- sha256 = "1xsazw6yrbgmc647j8l896fzv534157sqmdzac09rxkxwiy0wm16";
+ sha256 = "1v2mggx2jlaq4m3p5shc46gzf7vmaayha6r0nwdnyzd7x6q0is7p";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index 5d120f61e08..0830b45b308 100644
--- a/pkgs/development/libraries/libharu/default.nix
+++ b/pkgs/development/libraries/libharu/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
homepage = http://libharu.org/;
license = stdenv.lib.licenses.zlib;
maintainers = [ stdenv.lib.maintainers.marcweber ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 91e8e2d50f1..81e5f0fe73e 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
};
diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix
index 08d80bcf985..298d6124505 100644
--- a/pkgs/development/libraries/libicns/default.nix
+++ b/pkgs/development/libraries/libicns/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libpng jasper ];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Library for manipulation of the Mac OS icns resource format";
+ homepage = https://icns.sourceforge.io;
+ license = with licenses; [ gpl2 lgpl2 lgpl21 ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
new file mode 100644
index 00000000000..51cdc289d62
--- /dev/null
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub
+, cmake, flex, bison
+, libxml2, python
+}:
+
+stdenv.mkDerivation rec {
+ name = "libiio-${version}";
+ version = "0.15";
+
+ src = fetchFromGitHub {
+ owner = "analogdevicesinc";
+ repo = "libiio";
+ rev = "refs/tags/v${version}";
+ sha256 = "05sbvvjka03qi080ad6g2y6gfwqp3n3zv7dpv237dym0zjyxqfa7";
+ };
+
+ outputs = [ "out" "lib" "dev" "python" ];
+
+ nativeBuildInputs = [ cmake flex bison ];
+ buildInputs = [ libxml2 ];
+
+ postInstall = ''
+ mkdir -p $python/lib/${python.libPrefix}/site-packages/
+ touch $python/lib/${python.libPrefix}/site-packages/
+ cp ../bindings/python/iio.py $python/lib/${python.libPrefix}/site-packages/
+
+ substitute ../bindings/python/iio.py $python/lib/${python.libPrefix}/site-packages/iio.py \
+ --replace 'libiio.so.0' $lib/lib/libiio.so.0
+ '';
+
+ meta = with stdenv.lib; {
+ description = "API for interfacing with the Linux Industrial I/O Subsystem";
+ homepage = https://github.com/analogdevicesinc/libiio;
+ license = licenses.lgpl21;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ thoughtpolice ];
+ };
+}
diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix
new file mode 100644
index 00000000000..d232e268f30
--- /dev/null
+++ b/pkgs/development/libraries/libimagequant/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, unzip }:
+
+with stdenv;
+
+let
+ version = "2.12.1";
+in
+ mkDerivation {
+ name = "libimagequant-${version}";
+ src = fetchFromGitHub {
+ owner = "ImageOptim";
+ repo = "libimagequant";
+ rev = "${version}";
+ sha256 = "0r7zgsnhqci2rjilh9bzw43miwp669k6b7q16hdjzrq4nr0xpvbl";
+ };
+
+ preConfigure = ''
+ patchShebangs ./configure
+ '';
+
+ meta = {
+ homepage = https://pngquant.org/lib/;
+ description = "Image quantization library";
+ longDescription = "Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.";
+ license = lib.licenses.gpl3Plus;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ ma9e ];
+ };
+ }
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 5498a32e709..87c6bb03d4b 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,14 +16,14 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-${version}";
- version = "1.11.3";
+ version = "1.12.2";
src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
- sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk";
+ sha256 = "1w8wkh03j5zdgbamyj7wv2f6k76kd0w4z04abxxf5b0mnplrb6vb";
};
- outputs = [ "out" "dev" ];
+ outputs = [ "bin" "out" "dev" ];
mesonFlags = [
(mkFlag documentationSupport "documentation")
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
(mkFlag testsSupport "tests")
];
+ preConfigure = ''
+ mesonFlags="$mesonFlags --libexecdir=$bin/libexec"
+ '';
+
nativeBuildInputs = [ pkgconfig meson ninja ]
++ optionals documentationSupport [ doxygen graphviz ]
++ optionals testsSupport [ check valgrind python3Packages.pyparsing ];
@@ -42,12 +46,6 @@ stdenv.mkDerivation rec {
patches = [ ./udev-absolute-path.patch ];
- preBuild = ''
- # meson setup-hook changes the directory so the files are located one level up
- patchShebangs ../udev/parse_hwdb.py
- patchShebangs ../test/symbols-leak-test.in
- '';
-
doCheck = testsSupport;
meta = {
diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch
index fb22fea40e8..5c85b863948 100644
--- a/pkgs/development/libraries/libinput/udev-absolute-path.patch
+++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch
@@ -5,7 +5,7 @@
udev_rules_config = configuration_data()
-udev_rules_config.set('UDEV_TEST_PATH', '')
-+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/')
++udev_rules_config.set('UDEV_TEST_PATH', dir_udev + '/')
configure_file(input : 'udev/80-libinput-device-groups.rules.in',
output : '80-libinput-device-groups.rules',
install : true,
diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix
index 738c1116195..faa070b3468 100644
--- a/pkgs/development/libraries/libiodbc/default.nix
+++ b/pkgs/development/libraries/libiodbc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }:
+{ stdenv, fetchurl, pkgconfig, gtk2, Carbon, useGTK ? false }:
stdenv.mkDerivation rec {
name = "libiodbc-3.52.12";
@@ -9,16 +9,18 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = stdenv.lib.optionals useGTK [ gtk2 ];
+ buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]
+ ++ stdenv.lib.optional stdenv.isDarwin Carbon;
preBuild =
''
export NIX_LDFLAGS_BEFORE="-rpath $out/lib"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "iODBC driver manager";
homepage = http://www.iodbc.org;
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix
index 6e776417609..ce2028e805d 100644
--- a/pkgs/development/libraries/libisoburn/default.nix
+++ b/pkgs/development/libraries/libisoburn/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libisoburn-${version}";
- version = "1.4.8";
+ version = "1.5.0";
src = fetchurl {
url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
- sha256 = "19d53j17pn18vfxxqqlqwam5lm21ljyp8nai5434068g7x3m1kwi";
+ sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs";
};
buildInputs = [ attr zlib libburn libisofs ];
diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix
index d0217a908b9..d5281448387 100644
--- a/pkgs/development/libraries/libisofs/default.nix
+++ b/pkgs/development/libraries/libisofs/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libisofs-${version}";
- version = "1.4.8";
+ version = "1.5.0";
src = fetchurl {
url = "http://files.libburnia-project.org/releases/${name}.tar.gz";
- sha256 = "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw";
+ sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys";
};
buildInputs = [ attr zlib ];
diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 7580c1b092e..0b00cf90ba0 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ];
+ license = with licenses; [ mit isc bsd2 bsd3 ];
};
}
diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix
index a53918fd5f7..c83143dd6b1 100644
--- a/pkgs/development/libraries/libjson/default.nix
+++ b/pkgs/development/libraries/libjson/default.nix
@@ -11,10 +11,17 @@ in stdenv.mkDerivation rec {
buildInputs = [ unzip ];
makeFlags = [ "prefix=$(out)" ];
preInstall = "mkdir -p $out/lib";
- meta = {
+
+ meta = with stdenv.lib; {
homepage = http://libjson.sourceforge.net/;
description = "A JSON reader and writer";
- longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language.";
- platforms = stdenv.lib.platforms.unix;
+ longDescription = ''
+ A JSON reader and writer which is super-efficient and
+ usually runs circles around other JSON libraries.
+ It's highly customizable to optimize for your particular project, and
+ very lightweight. For Windows, OSX, or Linux. Works in any language.
+ '';
+ platforms = platforms.unix;
+ license = licenses.bsd2;
};
}
diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix
index 6c7e5881a78..7eff302397a 100644
--- a/pkgs/development/libraries/libkate/default.nix
+++ b/pkgs/development/libraries/libkate/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libogg libpng ];
- meta = {
+ meta = with stdenv.lib; {
description = "A library for encoding and decoding Kate streams";
longDescription = ''
This is libkate, the reference implementation of a codec for the Kate
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
in an Ogg container. It can carry Unicode text, images, and animate
them.'';
homepage = https://code.google.com/archive/p/libkate/;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
index 6d9085e1741..d57d75c5cae 100644
--- a/pkgs/development/libraries/liblangtag/default.nix
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -16,13 +16,13 @@ stdenv.mkDerivation rec {
core_zip = fetchurl {
# please update if an update is available
- url = "http://www.unicode.org/Public/cldr/33/core.zip";
- sha256 = "1faq1p5dmxpkczz6cjfsry7piksgym19cq2kf4jj2v885h490d7s";
+ url = "http://www.unicode.org/Public/cldr/33.1/core.zip";
+ sha256 = "0f195aald02ng3ch2q1wf59b5lwp2bi1cd8ia7572pbyy2w8w8cp";
};
language_subtag_registry = fetchurl {
url = "http://www.iana.org/assignments/language-subtag-registry";
- sha256 = "1qfkvllyqcy40vmnvjn5w9fxw7g6ww46cb306vkgcfghnjjfhv3b";
+ sha256 = "0y9x5gra6jri4sk16f0dp69p06almnsl48rs85605f035kf539qm";
};
postPatch = ''
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias''
];
- buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common
+ buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common
unzip ];
nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ];
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index 331422dd892..b7d90100837 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -18,11 +18,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig which cmake ];
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration;
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/lastfm/liblastfm;
repositories.git = git://github.com/lastfm/liblastfm.git;
description = "Official LastFM library";
inherit (qt4.meta) platforms;
- maintainers = with stdenv.lib.maintainers; [ phreedom ];
+ maintainers = [ maintainers.phreedom ];
+ license = licenses.gpl3;
};
}
diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix
index 73d996c5ec8..d9f460d44e8 100644
--- a/pkgs/development/libraries/liblastfmSF/default.nix
+++ b/pkgs/development/libraries/liblastfmSF/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://liblastfm.sourceforge.net;
description = "Unofficial C lastfm library";
+ license = stdenv.lib.licenses.gpl3;
};
}
diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index ea05df45169..5f295009b99 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "liblinear-${version}";
- version = "2.20";
+ version = "2.21";
src = fetchurl {
url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz";
- sha256 = "13q48azqy9pd8jyhk0c2hzj5xav1snbdrj8pp38vwrv2wwhfz7rz";
+ sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs";
};
buildPhase = ''
diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix
index 4b445c93175..aa6922ea342 100644
--- a/pkgs/development/libraries/liblqr-1/default.nix
+++ b/pkgs/development/libraries/liblqr-1/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
homepage = http://liblqr.wikidot.com;
description = "Seam-carving C/C++ library called Liquid Rescaling";
platforms = platforms.all;
- maintainers = [ ];
+ license = with licenses; [ gpl3 lgpl3 ];
};
}
diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix
index 2da8e5ebf73..de8baa7ad19 100644
--- a/pkgs/development/libraries/libmd/default.nix
+++ b/pkgs/development/libraries/libmd/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "libmd";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj";
+ sha256 = "0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 3ba513f9078..1ef2c6914ae 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
stdenv.mkDerivation rec {
- version = "18.05";
+ version = "18.08.1";
name = "libmediainfo-${version}";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
- sha256 = "08ajrmbvqn2cvfq3jjdh64lma77kx4di5vg632c6bmbir89rcxbn";
+ sha256 = "1h6brg98i39xprcl54gvs1scmv8d6f3iw5h2diwz5bbz4lspy8vs";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix
index 1becd0ee8ef..e46eb9208de 100644
--- a/pkgs/development/libraries/libmesode/default.nix
+++ b/pkgs/development/libraries/libmesode/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libmesode-${version}";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "boothj5";
repo = "libmesode";
rev = version;
- sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh";
+ sha256 = "06f5nfaypvxrbsinxa1k2vrxrs7kqmg38g4wwwk5d63hpn1pj8ak";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index c509fcd2b4f..c83d2610dbf 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
};
buildInputs = [ texinfo ]
- ++ optionals stdenv.isLinux [ alsaLib libpulseaudio ]
+ ++ optional stdenv.isLinux alsaLib
++ optional stdenv.isDarwin CoreAudio;
propagatedBuildInputs =
optional stdenv.isLinux libpulseaudio;
diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix
index bd0cd9fe904..7e3c45634d9 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
description = "Sendmail Milter mail filtering API library";
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ];
+ license = licenses.sendmail;
};
}
diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix
index d1dd7860de4..7f73fb09cd1 100644
--- a/pkgs/development/libraries/libmms/default.nix
+++ b/pkgs/development/libraries/libmms/default.nix
@@ -12,9 +12,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
- meta = {
+ meta = with stdenv.lib; {
+ description = "Library for downloading (streaming) media files using the mmst and mmsh protocols";
homepage = http://libmms.sourceforge.net;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix
index b23701837fa..512add5616a 100644
--- a/pkgs/development/libraries/libmowgli/default.nix
+++ b/pkgs/development/libraries/libmowgli/default.nix
@@ -3,15 +3,16 @@
stdenv.mkDerivation rec {
name = "libmowgli-${version}";
version = "2.1.3";
-
+
src = fetchurl {
url = "https://github.com/atheme/libmowgli-2/archive/v${version}.tar.gz";
sha256 = "0xx4vndmwz40pxa5gikl8z8cskpdl9a30i2i5fjncqzlp4pspymp";
};
-
- meta = {
+
+ meta = with stdenv.lib; {
description = "A development framework for C providing high performance and highly flexible algorithms";
- homepage = http://www.atheme.org/projects/mowgli.shtml;
- platforms = stdenv.lib.platforms.unix;
+ homepage = https://github.com/atheme/libmowgli-2;
+ license = licenses.isc;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix
index af8297e9854..52072000115 100644
--- a/pkgs/development/libraries/libmp3splt/default.nix
+++ b/pkgs/development/libraries/libmp3splt/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
maintainers = with maintainers; [ bosu ];
platforms = platforms.unix;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index c3061626a6a..1d8dd7e20f1 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# tried to install files to /lib/udev, hopefully OK
configureFlags = [ "--with-udev=$$bin/lib/udev" ];
- meta = {
+ meta = with stdenv.lib; {
homepage = http://libmtp.sourceforge.net;
description = "An implementation of Microsoft's Media Transfer Protocol";
longDescription = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
in the form of a library suitable primarily for POSIX compliant operating
systems. We implement MTP Basic, the stuff proposed for standardization.
'';
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ ];
+ platforms = platforms.unix;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix
index f197d5bcef9..2b59adf8f92 100644
--- a/pkgs/development/libraries/libmusicbrainz/5.x.nix
+++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix
@@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
dontUseCmakeBuildDir=true;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://musicbrainz.org/doc/libmusicbrainz;
description = "MusicBrainz Client Library (5.x version)";
longDescription = ''
The libmusicbrainz (also known as mb_client or MusicBrainz Client
Library) is a development library geared towards developers who wish to
add MusicBrainz lookup capabilities to their applications.'';
- maintainers = [ ];
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
index 596399c4fa8..5335b6577f0 100644
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ b/pkgs/development/libraries/libmusicbrainz/default.nix
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://musicbrainz.org/doc/libmusicbrainz;
description = "MusicBrainz Client Library (3.x version)";
longDescription = ''
The libmusicbrainz (also known as mb_client or MusicBrainz Client
Library) is a development library geared towards developers who wish to
add MusicBrainz lookup capabilities to their applications.'';
- maintainers = [ ];
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index 9b692e9e3b2..db4f6f5d468 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -12,11 +12,11 @@ stdenv.mkDerivation (rec {
buildInputs = [ popt ];
- meta = {
+ meta = with stdenv.lib; {
homepage = http://natspec.sourceforge.net/ ;
description = "A library intended to smooth national specificities in using of programs";
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ ];
+ platforms = platforms.unix;
+ license = licenses.lgpl21;
};
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
propagatedBuildInputs = [ libiconv ];
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index 685518efbd2..925154e1d45 100644
--- a/pkgs/development/libraries/libndtypes/default.nix
+++ b/pkgs/development/libraries/libndtypes/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "0dpvv13mrid8l5zkjlz18qvirz3nr0v98agx9bcvkqbiahlfgjli";
};
- makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ];
+ # Override linker with cc (symlink to either gcc or clang)
+ # Library expects to use cc for linking
+ configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
meta = {
description = "Dynamic types for data description and in-memory computations";
@@ -22,4 +24,4 @@ stdenv.mkDerivation rec {
license = lib.licenses.bsdOriginal;
maintainers = with lib.maintainers; [ costrouc ];
};
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix
index 12a45d088ef..94b3dc90a0b 100644
--- a/pkgs/development/libraries/libnetfilter_queue/default.nix
+++ b/pkgs/development/libraries/libnetfilter_queue/default.nix
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libmnl libnfnetlink ];
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.netfilter.org/projects/libnetfilter_queue/;
description = "Userspace API to packets queued by the kernel packet filter";
-
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index b6d5912581b..5a34910924c 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -3,11 +3,11 @@
# Note that this does not provide the ngspice command-line utility. For that see
# the ngspice derivation.
stdenv.mkDerivation {
- name = "libngspice-26";
+ name = "libngspice-28";
src = fetchurl {
- url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
- sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
+ url = "mirror://sourceforge/ngspice/ngspice-28.tar.gz";
+ sha256 = "0rnz2rdgyav16w7wfn3sfrk2lwvvgz1fh0l9107zkcldijklz04l";
};
nativeBuildInputs = [ flex bison ];
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index 1f58545574c..8582dc4e1d9 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory"
- meta = {
+ meta = with stdenv.lib; {
homepage = https://nice.freedesktop.org/wiki/;
description = "The GLib ICE implementation";
longDescription = ''
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
It provides a GLib-based library, libnice and a Glib-free library,
libstun as well as GStreamer elements.'';
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = with licenses; [ lgpl21 mpl11 ];
};
}
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index fbde49a54d0..11f2731eb72 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -17,9 +17,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook gobjectIntrospection ];
buildInputs = [ glib gdk_pixbuf ];
- meta = {
+ meta = with stdenv.lib; {
homepage = https://developer.gnome.org/notification-spec/;
description = "A library that sends desktop notifications to a notification daemon";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix
index a66a1a88c74..cb70d803ac0 100644
--- a/pkgs/development/libraries/libnova/default.nix
+++ b/pkgs/development/libraries/libnova/default.nix
@@ -2,15 +2,16 @@
stdenv.mkDerivation rec {
name = "libnova-0.12.3";
-
+
src = fetchurl {
url = "mirror://sourceforge/libnova/${name}.tar.gz";
sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc";
};
-
- meta = {
+
+ meta = with stdenv.lib; {
description = "Celestial Mechanics, Astrometry and Astrodynamics Library";
homepage = http://libnova.sf.net;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index 855d921206e..ea792b007ba 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
description = "C library implementing the OAuth secure authentication protocol";
homepage = http://liboauth.sourceforge.net/;
repositories.git = https://github.com/x42/liboauth.git;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index 531e30ba755..8131420cfd6 100644
--- a/pkgs/development/libraries/libofa/default.nix
+++ b/pkgs/development/libraries/libofa/default.nix
@@ -27,12 +27,13 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ expat curl fftw ];
- meta = {
+ meta = with stdenv.lib; {
homepage = https://code.google.com/archive/p/musicip-libofa/;
description = "Library Open Fingerprint Architecture";
longDescription = ''
LibOFA (Library Open Fingerprint Architecture) is an open-source audio
fingerprint created and provided by MusicIP'';
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix
index f6fe9ecd03a..d7c3b747924 100644
--- a/pkgs/development/libraries/liboggz/default.nix
+++ b/pkgs/development/libraries/liboggz/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
- meta = {
+ meta = with stdenv.lib; {
homepage = https://xiph.org/oggz/;
description = "A C library and tools for manipulating with Ogg files and streams";
longDescription = ''
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
interleaving data container developed by Monty at Xiph.Org, originally to
support the Ogg Vorbis audio format but now used for many free codecs
including Dirac, FLAC, Speex and Theora.'';
- maintainers = [ ];
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index 111bea61eb6..d4c324d4f23 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, vala ? null
}:
stdenv.mkDerivation rec {
- name = "libosinfo-1.1.0";
+ name = "libosinfo-1.2.0";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${name}.tar.gz";
- sha256 = "0diigllgni6m0sc2h8aid6hmyaq9qb54pm5305m0irfsm2j463v0";
+ sha256 = "0y2skfrcg38y212qqd26vs3sg566j3qnsgvvm23pfi4j7z7ly9gf";
};
outputs = [ "out" "dev" "devdoc" ];
@@ -20,6 +20,16 @@ stdenv.mkDerivation rec {
patches = [
./osinfo-db-data-dir.patch
+ # Fix bug causing tests to fail (and presumably the real scenarios they're representative of)
+ # using upstream commits:
+ (fetchpatch {
+ url = "https://gitlab.com/libosinfo/libosinfo/commit/b9cb227842948b1b2289cdd3e9b8d925664c2ee7.patch";
+ sha256 = "0nj0wmibq52j8qbzmxfzj76fpkqjs18kssbb9lmfhz16s30darbw";
+ })
+ (fetchpatch {
+ url = "https://gitlab.com/libosinfo/libosinfo/commit/e6168463f4fc659b9827b5c8694dc1c6d7d5239a.patch";
+ sha256 = "135yfhjm2wxip5dnng3r9k9igfhdi1083ys4a4f3ipjxfskcs9rv";
+ })
];
postPatch = ''
@@ -28,8 +38,8 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--with-usb-ids-path=${hwdata}/data/hwdata/usb.ids"
- "--with-pci-ids-path=${hwdata}/data/hwdata/pci.ids"
+ "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids"
+ "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids"
"--enable-gtk-doc"
];
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 1304aff9e3b..8c0094a3152 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -1,17 +1,29 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libowfat-0.31";
+ name = "libowfat-0.32";
src = fetchurl {
url = "https://www.fefe.de/libowfat/${name}.tar.xz";
- sha256 = "04lagr62bd2cr0k8h59qfnx2klh2cf73k5kxsx8xrdybzhfarr6i";
+ sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl";
};
+ # Dirty patch because 0.32 "moved headers to upon install"
+ # but it breaks gatling-0.15 and opentracker-2018-05-26 ...
+ postPatch = ''
+ substituteInPlace GNUmakefile --replace \
+ 'install -d $(DESTDIR)$(INCLUDEDIR)/libowfat' \
+ 'install -d $(DESTDIR)$(INCLUDEDIR)'
+ substituteInPlace GNUmakefile --replace \
+ 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)/libowfat' \
+ 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)'
+ '';
+
makeFlags = "prefix=$(out)";
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://www.fefe.de/libowfat/;
+ homepage = https://www.fefe.de/libowfat/;
license = licenses.gpl2;
platforms = platforms.linux;
};
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index f94f327ea02..267859cb217 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
description = "Packet Capture Library";
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz ];
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index 25e55e45d1e..ffd195b6462 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
meta = with stdenv.lib; {
description = "Helper library to program the performance monitoring events";
longDescription = ''
diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index 5afed2b2a2f..fbee81ab677 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libpqxx-${version}";
- version = "6.2.4";
+ version = "6.2.5";
src = fetchFromGitHub {
owner = "jtv";
repo = "libpqxx";
rev = version;
- sha256 = "18fkyfa3a917ljmarf3jy8ycdhqzpc47cj87542sjpxnpaj9hy59";
+ sha256 = "15x9xlj2v66w81j90cb438qkrrcqaq4dqrvhllwyqfz4lprqnhh9";
};
nativeBuildInputs = [ gnused python2 ];
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 377d9fe50be..2c25d418119 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
description = "An advanced calculator library";
homepage = http://qalculate.github.io;
maintainers = with maintainers; [ gebner ];
+ license = licenses.gpl2Plus;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index 8cca5333d08..2f20150ad16 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "libqmatrixclient-${version}";
- version = "0.3.0.2";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "libqmatrixclient";
rev = "v${version}";
- sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5";
+ sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn";
};
buildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index b291ec2fdf0..048ba48bb67 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -1,6 +1,6 @@
{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
, qtbase, qtmultimedia, qtquick1, qttools
-, libGLU_combined, libX11
+, libGL, libX11
, libass, openal, ffmpeg, libuchardet
, alsaLib, libpulseaudio, libva
}:
@@ -14,7 +14,7 @@ mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules qttools ];
buildInputs = [
qtbase qtmultimedia qtquick1
- libGLU_combined libX11
+ libGL libX11
libass openal ffmpeg libuchardet
alsaLib libpulseaudio libva
];
@@ -27,18 +27,20 @@ mkDerivation rec {
fetchSubmodules = true;
};
- # Make sure libqtav finds its libGL dependancy at both link and run time
- # by adding libGLU_combined to rpath. Not sure why it wasn't done automatically like
- # the other libraries as `libGLU_combined` is part of our `buildInputs`.
- NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGLU_combined}/lib"];
+ # Make sure libqtav finds its libGL dependency at both link and run time
+ # by adding libGL to rpath. Not sure why it wasn't done automatically like
+ # the other libraries as `libGL` is part of our `buildInputs`.
+ NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGL}/lib"];
preFixup = ''
mkdir -p "$out/bin"
cp -a "./bin/"* "$out/bin"
'';
+ stripDebugList = [ "lib" "libexec" "bin" "qml" ];
+
meta = {
- description = "A multimedia playback framework based on Qt + FFmpeg.";
+ description = "A multimedia playback framework based on Qt + FFmpeg";
#license = licenses.lgpl21; # For the libraries / headers only.
license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used.
homepage = http://www.qtav.org/;
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 9803e09610e..e009a9f920b 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libraw-${version}";
- version = "0.18.12";
+ version = "0.19.0";
src = fetchurl {
url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
- sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap";
+ sha256 = "0nfj7s7qmgfy1cl8s3ck7dxjvprfq5glfi6iidmvmy8r7gl52gz8";
};
outputs = [ "out" "lib" "dev" "doc" ];
diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 422ace462a9..30d8d8a94e9 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -38,8 +38,10 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 1 out of 17 tests with a segmentation fault
- meta = {
+ meta = with stdenv.lib; {
+ description = "C libraries that provide support for the Resource Description Framework (RDF)";
homepage = http://librdf.org/;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index c996c5c25f9..50b485c4822 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
{stdenv, fetchurl, zlib, openssl}:
stdenv.mkDerivation rec {
- version = "0.5.8";
+ version = "0.5.9";
name = "libre-${version}";
src = fetchurl {
url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
- sha256 = "0w0f8j43j0nzgvkmv3ayzrssppgjmsh6z8mpa5iqsz8nv99dc3qr";
+ sha256 = "04lnnlhifzyhv231abgnzvfzq21xhsal3lnimncp1q3pmrfa0aw8";
};
buildInputs = [ zlib openssl ];
makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index ea24c9da88b..f91fa192c03 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "librealsense-${version}";
- version = "2.15.0";
+ version = "2.16.1";
src = fetchFromGitHub {
owner = "IntelRealSense";
repo = "librealsense";
rev = "v${version}";
- sha256 = "12918gcn0w5h6bqgx6s44w44bs1x2pcndn2833xzya69rddkdv6x";
+ sha256 = "0vs2vcfmsb574bvdqrfgdmam0p631c738apk0w9mjdqk59zy1bz2";
};
buildInputs = [
diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 521f963e277..e5d64c4143f 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gnutls, zlib }:
stdenv.mkDerivation rec {
- name = "librelp-1.2.17";
+ name = "librelp-1.2.18";
src = fetchurl {
url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
- sha256 = "1w6blhfr3rlmvjj0fbr8rsycrkm5b92n44zaaijg1jnvxjfqpy0v";
+ sha256 = "0grrnxhazd9iirj07al524xykk0k33vs0dgnpajz5vpqig4qyk53";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index e30f2b0af5d..154e84cfd0a 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -46,7 +46,7 @@ in {
};
libressl_2_8 = generic {
- version = "2.8.0";
- sha256 = "1hwxg14d6a9wgk360dvi0wfzw7b327a95wf6xqc3a1h6bfbblaxg";
+ version = "2.8.2";
+ sha256 = "1mag4lf3lmg2fh2yzkh663l69h4vjriadwl0zixmb50jkzjk3jxq";
};
}
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 76b7e7ccaee..7c94919f344 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1qsd0j7s97ab5fzy5b5gix5b7hbw57cr46ia8pkcrr4ylsi80li2";
};
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index fde3c7a7b30..4fc0d6688d4 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1cychxc3ff8fp857iikw0n2s13s2mhw2dn1mr632f7w3sn6vvrww";
};
diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix
index 9fc6ff86773..fa27a80e22e 100644
--- a/pkgs/development/libraries/libsigcxx/1.2.nix
+++ b/pkgs/development/libraries/libsigcxx/1.2.nix
@@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ m4];
- meta = {
- homepage = http://libsigc.sourceforge.net/;
+ meta = with stdenv.lib; {
+ homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
description = "A typesafe callback system for standard C++";
branch = "1.2";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.lgpl3;
};
}
diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix
index def5ee0e19a..8eba5377bc3 100644
--- a/pkgs/development/libraries/libsigcxx/default.nix
+++ b/pkgs/development/libraries/libsigcxx/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
- homepage = http://libsigc.sourceforge.net/;
+ homepage = https://libsigcplusplus.github.io/libsigcplusplus/;
description = "A typesafe callback system for standard C++";
license = licenses.lgpl21;
platforms = platforms.all;
diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix
new file mode 100644
index 00000000000..379361a7031
--- /dev/null
+++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, openssl }:
+
+stdenv.mkDerivation rec {
+ name = "libsignal-protocol-c";
+ version = "2.3.2";
+
+ src = fetchFromGitHub {
+ owner = "signalapp";
+ repo = "libsignal-protocol-c";
+ rev = "v${version}";
+ sha256 = "1qj2w4csy6j9jg1jy66n1qwysx7hgjywk4n35hlqcnh1kpa14k3p";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ openssl ];
+
+ cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+
+ outputs = [ "out" "dev" ];
+
+ meta = with stdenv.lib; {
+ description = "Signal Protocol C Library";
+ homepage = https://github.com/signalapp/libsignal-protocol-c;
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ orivej ];
+ };
+}
diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix
new file mode 100644
index 00000000000..2c0ef60bc63
--- /dev/null
+++ b/pkgs/development/libraries/libsignon-glib/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchgit, pkgconfig, meson, ninja, vala, python3, gtk-doc, docbook_xsl, docbook_xml_dtd_43, docbook_xml_dtd_412, glib, check, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+ pname = "libsignon-glib";
+ version = "3639a2e90447e4640a03a44972560afe8f61aa48";
+
+ name = "${pname}-2018-10-24";
+
+ outputs = [ "out" "dev" "devdoc" "py" ];
+
+ src = fetchgit {
+ url = "https://gitlab.com/accounts-sso/${pname}";
+ rev = version;
+ fetchSubmodules = true;
+ sha256 = "1cq19zbsx4c57dc5gp3shp8lzcr1hw2ynylpn1nkvfyyrx80m60w";
+ };
+
+ nativeBuildInputs = [
+ check
+ docbook_xml_dtd_412
+ docbook_xml_dtd_43
+ docbook_xsl
+ gobjectIntrospection
+ gtk-doc
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ ];
+
+ buildInputs = [
+ glib
+ python3.pkgs.pygobject3
+ ];
+
+ mesonFlags = [
+ "-Dintrospection=true"
+ "-Dpy-overrides-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
+ ];
+
+ postPatch = ''
+ chmod +x build-aux/gen-error-map.py
+ patchShebangs build-aux/gen-error-map.py
+ '';
+
+ meta = with stdenv.lib; {
+ description = ''
+ A library for managing single signon credentials which can be used from GLib applications
+ '';
+ homepage = https://gitlab.com/accounts-sso/libsignon-glib;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index a68b5b2b6d5..b150dd0f59c 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/erikd/libsndfile/commit/85c877d5072866aadbe8ed0c3e0590fbb5e16788.patch";
sha256 = "0kc7vp22qsxidhvmlc6nfamw7k92n0hcfpmwhb3gaksjamwhb2df";
})
+ (fetchurl {
+ name = "CVE-2018-13139.patch";
+ url = "https://github.com/erikd/libsndfile/commit/aaea680337267bfb6d2544da878890ee7f1c5077.patch";
+ sha256 = "01q3m7pa3xqkh05ijmfgv064v8flkg4p24bgy9wxnc6wfcdifggx";
+ })
];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index ad8120d3591..51b6cbd4ed5 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
- rev = "0.6.35";
+ rev = "0.7.0";
name = "libsolv-${rev}";
src = fetchFromGitHub {
inherit rev;
owner = "openSUSE";
repo = "libsolv";
- sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq";
+ sha256 = "02vz1yp516nh4vv0jdckll37mc373ddd363ip005xfbrbb2jr1xh";
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 2804486e2f0..9849e2600bb 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "2.62.2";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy";
};
diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 9b5c3d530eb..1ec15e88f13 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }:
stdenv.mkDerivation rec {
- name = "libssh-0.7.5";
+ name = "libssh-0.7.6";
src = fetchurl {
- url = "https://red.libssh.org/attachments/download/218/${name}.tar.xz";
- sha256 = "15bh6dm9c50ndddzh3gqcgw7axp3ghrspjpkb1z3dr90vkanvs2l";
+ url = "https://www.libssh.org/files/0.7/libssh-0.7.6.tar.xz";
+ sha256 = "14hhdpn2hflywsi9d5bz2pfjxqkyi07znjij89cpakr7b4w7sq0x";
};
patches = [
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index a6802a7f518..b050dede8c6 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -13,10 +13,11 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl zlib ]
++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
- meta = {
+ meta = with stdenv.lib; {
description = "A client-side C library implementing the SSH2 protocol";
homepage = https://www.libssh2.org;
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.bsd3;
maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix
index 2671199ab0e..99e0ab0a476 100644
--- a/pkgs/development/libraries/libtap/default.nix
+++ b/pkgs/development/libraries/libtap/default.nix
@@ -14,16 +14,16 @@ stdenv.mkDerivation rec{
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ cmake perl ];
- meta = {
+ meta = with stdenv.lib; {
description = "A library to implement a test protocol";
longDescription = ''
libtap is a library to implement the Test Anything Protocol for
C originally created by Nik Clayton. This is a maintenance
branch by Shlomi Fish.
'';
- homepage = http://www.shlomifish.org/open-source/projects/libtap/;
+ homepage = https://www.shlomifish.org/open-source/projects/libtap/;
license = licenses.bsd3;
maintainers = [ maintainers.AndersonTorres ];
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix
index 8123bf7ba84..481e7ad83cc 100644
--- a/pkgs/development/libraries/libtar/default.nix
+++ b/pkgs/development/libraries/libtar/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "C library for manipulating POSIX tar files";
- homepage = http://www.feep.net/libtar/;
+ homepage = http://repo.or.cz/libtar;
license = licenses.bsd3;
platforms = with platforms; linux ++ darwin;
maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix
index b4e616409c4..f41f6303e01 100644
--- a/pkgs/development/libraries/libtensorflow/default.nix
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@@ -31,19 +31,19 @@ let
in stdenv.mkDerivation rec {
pname = "libtensorflow";
- version = "1.10.0";
+ version = "1.9.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz";
sha256 =
if system == "linux-x86_64" then
if cudaSupport
- then "0v66sscxpyixjrf9yjshl001nix233i6chc61akx0kx7ial4l1wn"
- else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb"
+ then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3"
+ else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21"
else if system == "darwin-x86_64" then
if cudaSupport
then unavailable
- else "11p0f77m4wycpc024mh7jx0kbdhgm0wp6ir6dsa8lkcpdb59bn59"
+ else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657"
else unavailable;
};
@@ -57,6 +57,17 @@ in stdenv.mkDerivation rec {
${patchLibs}
chmod -w $out/lib/libtensorflow.so
chmod -w $out/lib/libtensorflow_framework.so
+
+ # Write pkgconfig file.
+ mkdir $out/lib/pkgconfig
+ cat > $out/lib/pkgconfig/tensorflow.pc << EOF
+ Name: TensorFlow
+ Version: ${version}
+ Description: Library for computation using data flow graphs for scalable machine learning
+ Requires:
+ Libs: -L$out/lib -ltensorflow
+ Cflags: -I$out/include/tensorflow
+ EOF
'';
meta = {
diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix
index bd0084dbaaf..7a72fa2b7a3 100644
--- a/pkgs/development/libraries/libtiger/default.nix
+++ b/pkgs/development/libraries/libtiger/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
homepage = https://code.google.com/archive/p/libtiger/;
description = "A rendering library for Kate streams using Pango and Cairo";
platforms = lib.platforms.unix;
+ license = lib.licenses.lgpl21Plus;
maintainers = with lib.maintainers; [ matthewbauer ];
};
}
diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix
index efd63148fb1..1af7548ac96 100644
--- a/pkgs/development/libraries/libtins/default.nix
+++ b/pkgs/development/libraries/libtins/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libtins-${version}";
- version = "3.5";
+ version = "4.0";
src = fetchFromGitHub {
owner = "mfontanini";
repo = "libtins";
rev = "v${version}";
- sha256 = "00d1fxyg8q6djljm79ms69gcrsqxxksny3b16v99bzf3aivfss5x";
+ sha256 = "13sdqad976j7gq2k1il6g51yxwr8rlqdkzf1kj9mzhihjq8541qs";
};
postPatch = ''
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index f19e9d27431..6b5182fa992 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "1.1.9";
+ version = "1.1.10";
formattedVersion = lib.replaceChars ["."] ["_"] version;
# Make sure we override python, so the correct version is chosen
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
owner = "arvidn";
repo = "libtorrent";
rev = "libtorrent-${formattedVersion}";
- sha256 = "04w3pjzd6q9wplj1dcphylxn1i2b2x0iw1l0ma58ymh14swdah7a";
+ sha256 = "0qj1rz52jk95m43cr7l3fi9jmf4pwxncp5mq4hi2vzacfnf79yms";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index b3636eef262..4a8dfc40d4a 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -49,7 +49,7 @@ in rec {
};
libtoxcore_0_2 = generic {
- version = "0.2.3";
- sha256 = "1z8638cmxssc4jvbf64x549m84pz28729xbxc4c4ss1k792x30ya";
+ version = "0.2.8";
+ sha256 = "0xgnraysz25fbws5zwjk92mwnl8k1yih701qam8kgm3rxh50kyhm";
};
}
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
index 21e3a15449c..b0be3cb3c12 100644
--- a/pkgs/development/libraries/libtxc_dxtn/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libGLU_combined ];
- meta = {
+ meta = with stdenv.lib; {
homepage = http://dri.freedesktop.org/wiki/S3TC;
repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn;
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.mit;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix
index b1e6938a149..9eb2fe04fe6 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -49,9 +49,10 @@ in
install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/andlabs/libui;
description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports.";
- platforms = stdenv.lib.platforms.unix;
+ license = licenses.mit;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 24da3a8e2c7..312a5c11810 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -19,7 +19,19 @@ stdenv.mkDerivation rec {
doCheck = true;
- enableParallelBuilding = true;
+ /* This seems to cause several random failures like these, which I assume
+ is because of bad or missing target dependencies in their build system:
+
+ ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+ FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1)
+
+ FAIL: unistdio/test-u16-vasnprintf3.sh
+ ======================================
+
+ ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+ FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1)
+ */
+ enableParallelBuilding = false;
meta = {
homepage = http://www.gnu.org/software/libunistring/;
diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix
index 4704a1e5c33..adf354c45f2 100644
--- a/pkgs/development/libraries/libusb/default.nix
+++ b/pkgs/development/libraries/libusb/default.nix
@@ -16,7 +16,15 @@ stdenv.mkDerivation {
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ homepage = "https://libusb.info/";
+ repositories.git = "https://github.com/libusb/libusb-compat-0.1";
+ description = "cross-platform user-mode USB device library";
+ longDescription = ''
+ libusb is a cross-platform user-mode library that provides access to USB devices.
+ The current API is of 1.0 version (libusb-1.0 API), this library is a wrapper exposing the legacy API.
+ '';
+ license = licenses.lgpl2Plus;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 7ec714f0223..ac5c38a34f1 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -21,10 +21,15 @@ stdenv.mkDerivation rec {
sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
'';
- meta = {
- homepage = http://www.libusb.info;
- description = "User-space USB library";
- platforms = stdenv.lib.platforms.all;
+ meta = with stdenv.lib; {
+ homepage = "https://libusb.info/";
+ repositories.git = "https://github.com/libusb/libusb";
+ description = "cross-platform user-mode USB device library";
+ longDescription = ''
+ libusb is a cross-platform user-mode library that provides access to USB devices.
+ '';
+ platforms = platforms.all;
+ license = licenses.lgpl21Plus;
maintainers = [ ];
};
}
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index a0ace84bc67..68c35c49ef3 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
stdenv.mkDerivation rec {
- version = "1.21.0";
+ version = "1.23.1";
name = "libuv-${version}";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${version}";
- sha256 = "1jjg34ppnlrnb634q9mla7whl7rm9xmjgnzckrznqcycwzir074b";
+ sha256 = "14h8dcyx81sbckbgmqhagncyz8s6z6qzpx0fy8p79whq5hb3f4jg";
};
patches = [
@@ -40,7 +40,11 @@ stdenv.mkDerivation rec {
"tcp_open" "tcp_write_queue_order" "tcp_try_write" "tcp_writealot"
"multiple_listen" "delayed_accept"
"shutdown_close_tcp" "shutdown_eof" "shutdown_twice" "callback_stack"
- "tty_pty"
+ "tty_pty" "condvar_5"
+ ] ++ stdenv.lib.optionals stdenv.isAarch32 [
+ # I observe this test failing with some regularity on ARMv7:
+ # https://github.com/libuv/libuv/issues/1871
+ "shutdown_close_pipe"
];
tdRegexp = lib.concatStringsSep "\\|" toDisable;
in lib.optionalString doCheck ''
@@ -62,6 +66,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/libuv/libuv;
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; linux ++ darwin;
+ license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ];
};
}
diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix
index 6e7005195bf..6ca7b11321b 100644
--- a/pkgs/development/libraries/libversion/default.nix
+++ b/pkgs/development/libraries/libversion/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake }:
let
- version = "2.6.0";
+ version = "2.7.0";
in
stdenv.mkDerivation {
name = "libversion-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
owner = "repology";
repo = "libversion";
rev = version;
- sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601";
+ sha256 = "0brk2mbazc7yz0h4zsvbybbaymf497dgxnc74qihnvbi4z4rlqpj";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 2d83955de69..d26b830e249 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -6,13 +6,13 @@
let
inherit (pythonPackages) python pygobject2;
in stdenv.mkDerivation rec {
- name = "libvirt-glib-1.0.0";
+ name = "libvirt-glib-2.0.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://libvirt.org/sources/glib/${name}.tar.gz";
- sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa";
+ sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l";
};
nativeBuildInputs = [ pkgconfig vala ];
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index fd35864fe34..733482ce268 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -16,19 +16,19 @@ let
buildFromTarball = stdenv.isDarwin;
in stdenv.mkDerivation rec {
name = "libvirt-${version}";
- version = "4.5.0";
+ version = "4.7.0";
src =
if buildFromTarball then
fetchurl {
url = "http://libvirt.org/sources/${name}.tar.xz";
- sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7";
+ sha256 = "1r37aw1xxlwjkk4n6k503mw1caldijz8n7x86xdaq90n6bvpkhlj";
}
else
fetchgit {
url = git://libvirt.org/libvirt.git;
rev = "v${version}";
- sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6";
+ sha256 = "17byylhx0bny4b771hqv92d87a5dg21a5qjv861y50sckgwwi6f1";
fetchSubmodules = true;
};
diff --git a/pkgs/development/libraries/libvmi/default.nix b/pkgs/development/libraries/libvmi/default.nix
index 28cfe56d59b..44b2a81b2d3 100644
--- a/pkgs/development/libraries/libvmi/default.nix
+++ b/pkgs/development/libraries/libvmi/default.nix
@@ -15,6 +15,7 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "libvmi-${version}";
version = "0.12.0";
+ libVersion = "0.0.12";
src = fetchFromGitHub {
owner = "libvmi";
@@ -28,6 +29,13 @@ stdenv.mkDerivation rec {
configureFlags = optional (!xenSupport) "--disable-xen";
+ # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here
+ postFixup = optionalString xenSupport ''
+ libvmi="$out/lib/libvmi.so.${libVersion}"
+ oldrpath=$(patchelf --print-rpath "$libvmi")
+ patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi"
+ '';
+
meta = with stdenv.lib; {
homepage = "http://libvmi.com/";
description = "A C library for virtual machine introspection";
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index cc3f19ab7d3..67563e41d01 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
platforms = platforms.linux;
- homepage = https://sourceforge.net/projects/linuxwacom/;
+ homepage = https://linuxwacom.github.io/;
description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux";
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 1147c9606ad..8c0db4a7396 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libwebsockets-${version}";
- version = "3.0.0";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "warmcat";
repo = "libwebsockets";
rev = "v${version}";
- sha256 = "0cz4f05qd9b2bm27h5pkwym2cl7ff73lgirzwjppwf9b18if58yv";
+ sha256 = "1x3qrz2hqsrv2lg0y9irdx37c8r9j9vf9mwzgw61znzvk6hc9ymq";
};
buildInputs = [ cmake openssl zlib libuv ];
@@ -21,9 +21,8 @@ stdenv.mkDerivation rec {
use minimal CPU and memory resources, and provide fast
throughput in both directions.
'';
- homepage = https://libwebsockets.org/trac/libwebsockets;
+ homepage = https://libwebsockets.org;
license = stdenv.lib.licenses.lgpl21;
- maintainers = [ ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index eed0c77af80..bf685862adf 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -22,8 +22,10 @@ stdenv.mkDerivation {
})
];
- meta = {
+ meta = with stdenv.lib; {
description = "WMF library from wvWare";
- platforms = stdenv.lib.platforms.unix;
+ homepage = http://wvware.sourceforge.net/libwmf.html;
+ license = licenses.gpl2;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index f2d05d14d69..3137ac2c8f2 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -7,7 +7,7 @@ in stdenv.mkDerivation rec{
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg";
};
diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix
index 49012f8bddf..736b1a45fa2 100644
--- a/pkgs/development/libraries/libwpd/0.8.nix
+++ b/pkgs/development/libraries/libwpd/0.8.nix
@@ -2,19 +2,22 @@
stdenv.mkDerivation rec {
name = "libwpd-0.8.14";
-
+
src = fetchurl {
url = "mirror://sourceforge/libwpd/${name}.tar.gz";
sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
};
-
+
patches = [ ./gcc-0.8.patch ];
buildInputs = [ glib libgsf libxml2 ];
nativeBuildInputs = [ pkgconfig bzip2 ];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Library for importing WordPerfect documents";
+ homepage = http://libwpd.sourceforge.net;
+ license = with licenses; [ lgpl21 mpl20 ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index 9d262910e14..99808be2b21 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libwpd zlib librevenge ];
nativeBuildInputs = [ pkgconfig ];
- meta = {
+ meta = with stdenv.lib; {
homepage = http://libwpg.sourceforge.net;
description = "C++ library to parse WPG";
- maintainers = [ ];
- platforms = stdenv.lib.platforms.all;
+ license = with licenses; [ lgpl21 mpl20 ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index b0730452db8..591a3e451ab 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libx86emu-${version}";
- version = "2.0";
+ version = "2.1";
src = fetchFromGitHub {
owner = "wfeldt";
repo = "libx86emu";
rev = version;
- sha256 = "12rlkwnl5zgmmpm6n6cqnkyhkji4jw1d27y8x1krvlpi1z4bjidx";
+ sha256 = "16k16xcw2w2c69sn04jfdy9fd7cxs463d2rwb948xchyvfla958j";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index c359ea10b66..36606999f53 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch
-, zlib, xz, python2, findXMLCatalogs
+, zlib, xz, python2, ncurses, findXMLCatalogs
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null
, enableShared ? stdenv.hostPlatform.libc != "msvcrt"
@@ -37,6 +37,7 @@ in stdenv.mkDerivation rec {
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
buildInputs = lib.optional pythonSupport python
+ ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses
# Libxml2 has an optional dependency on liblzma. However, on impure
# platforms, it may end up using that from /usr/lib, and thus lack a
# RUNPATH for that, leading to undefined references for its users.
diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix
index c99c3f42bfc..6b9375c7381 100644
--- a/pkgs/development/libraries/libxnd/default.nix
+++ b/pkgs/development/libraries/libxnd/default.nix
@@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
buildInputs = [ libndtypes ];
- configureFlags = [ "XND_INCLUDE='-I${libndtypes}/include'"
- "XND_LINK='-L${libndtypes}/lib'" ];
-
- makeFlags = [ "CONFIGURE_LDFLAGS='-shared'" ];
+ # Override linker with cc (symlink to either gcc or clang)
+ # Library expects to use cc for linking
+ configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ];
meta = {
description = "General container that maps a wide range of Python values directly to memory";
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index f2a8d75a9cb..ab0e51bae26 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, automake
-, autoreconfHook, zlib
-, enableGrpc ? false
+{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, cmake, zlib
+, opentracing-cpp, enableGrpc ? false
}:
let
@@ -9,33 +8,31 @@ let
fetchFromGitHub {
owner = "lightstep";
repo = "lightstep-tracer-common";
- rev = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded";
- sha256 = "1qqpjxfrjmhnhs15nhbfv28fsgzi57vmfabxlzc99j4vl78h5iln";
+ rev = "5fe3bf885bcece14c3c65df06c86c826ba45ad69";
+ sha256 = "1q39a0zaqbnqyhl2hza2xzc44235p65bbkfkzs2981niscmggq8w";
};
in
stdenv.mkDerivation rec {
name = "lightstep-tracer-cpp-${version}";
- version = "0.36";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "lightstep";
repo = "lightstep-tracer-cpp";
- rev = "v0_36";
- sha256 = "1sfj91bn7gw7fga7xawag076c8j9l7kiwhm4x3zh17qhycmaqq16";
+ rev = "v${version}";
+ sha256 = "1m4kl70lhvy1bsmkdh6bf2fddz5v1ikb27vgi99i2akpq40g4fvf";
};
postUnpack = ''
cp -r ${common}/* $sourceRoot/lightstep-tracer-common
'';
- preConfigure = lib.optionalString (!enableGrpc) ''
- configureFlagsArray+=("--disable-grpc")
- '';
+ cmakeFlags = ["-DOPENTRACING_INCLUDE_DIR=${opentracing-cpp}/include" "-DOPENTRACING_LIBRARY=${opentracing-cpp}/lib/libopentracing.so"] ++ lib.optional (!enableGrpc) [ "-DWITH_GRPC=OFF" ];
nativeBuildInputs = [
- pkgconfig automake autoreconfHook
+ pkgconfig cmake
];
buildInputs = [
@@ -48,6 +45,5 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
- broken = true; # 2018-02-16
};
}
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index ad6d2df1d8b..13fbe2b55b6 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, alsaLib, help2man, pkgconfig, xlibsWrapper, python3
-, libxslt, systemd, libusb, libftdi1 }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3,
+ alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }:
stdenv.mkDerivation rec {
name = "lirc-0.10.1";
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1whlyifvvc7w04ahq07nnk1h18wc8j7c6wnvlb6mszravxh3qxcb";
};
+ # Fix installation of Python bindings
+ patches = [ (fetchpatch {
+ url = "https://sourceforge.net/p/lirc/tickets/339/attachment/0001-Fix-Python-bindings.patch";
+ sha256 = "088a39x8c1qd81qwvbiqd6crb2lk777wmrs8rdh1ga06lglyvbly";
+ }) ];
+
postPatch = ''
patchShebangs .
@@ -24,17 +30,17 @@ stdenv.mkDerivation rec {
touch lib/lirc/input_map.inc
'';
- nativeBuildInputs = [ pkgconfig help2man ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig help2man
+ (python3.withPackages (p: with p; [ pyyaml setuptools ])) ];
- buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ]
- ++ (with python3.pkgs; [ python pyyaml setuptools ]);
+ buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ];
configureFlags = [
"--sysconfdir=/etc"
"--localstatedir=/var"
"--with-systemdsystemunitdir=$(out)/lib/systemd/system"
- "--enable-uinput" # explicite activation because build env has no uinput
- "--enable-devinput" # explicite activation because build env has not /dev/input
+ "--enable-uinput" # explicit activation because build env has no uinput
+ "--enable-devinput" # explicit activation because build env has no /dev/input
];
installFlags = [
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix
index 34dfe26ad70..232a67c23f3 100644
--- a/pkgs/development/libraries/lmdbxx/default.nix
+++ b/pkgs/development/libraries/lmdbxx/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.9.14.0";
src = fetchFromGitHub {
- owner = "bendiken";
+ owner = "drycpp";
repo = "lmdbxx";
rev = "${version}";
sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
meta = {
- homepage = "https://github.com/bendiken/lmdbxx#readme";
+ homepage = "https://github.com/drycpp/lmdbxx#readme";
description = "C++11 wrapper for the LMDB embedded B+ tree database library";
license = stdenv.lib.licenses.unlicense;
maintainers = with stdenv.lib.maintainers; [ fgaz ];
diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix
index 3fdad73d9fa..7a390021d1f 100644
--- a/pkgs/development/libraries/log4cplus/default.nix
+++ b/pkgs/development/libraries/log4cplus/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl }:
let
- name = "log4cplus-1.2.0";
+ name = "log4cplus-2.0.2";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/log4cplus/${name}.tar.bz2";
- sha256 = "1fb3g9l12sps3mv4xjiql2kcvj439mww3skz735y7113cnlcf338";
+ sha256 = "0y9yy32lhgrcss8i2gcc9incdy55rcrr16dx051gkia1vdzfkay4";
};
meta = {
diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix
index 7b672aebe44..b2fba7df509 100644
--- a/pkgs/development/libraries/log4shib/default.nix
+++ b/pkgs/development/libraries/log4shib/default.nix
@@ -15,5 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A forked version of log4cpp that has been created for the Shibboleth project";
maintainers = [ maintainers.jammerful ];
+ license = licenses.lgpl21;
+ homepage = http://log4cpp.sf.net;
};
}
diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix
index aecd75656da..cad5d0d7eca 100644
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@@ -18,11 +18,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
- meta = {
+ meta = with stdenv.lib; {
description = "A lightweight C library for the Jabber protocol";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
downloadPage = "http://mcabber.com/files/loudmouth/";
downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$";
updateWalker = true;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 0546bdc6359..693260af1c7 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchzip, fetchpatch
, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
-, libwebp, libxml2, proj, python2, scons, sqlite, zlib
+, libwebp, libxml2, proj, python, scons, sqlite, zlib
# supply a postgresql package to enable the PostGIS input plugin
, postgresql ? null
@@ -8,28 +8,22 @@
stdenv.mkDerivation rec {
name = "mapnik-${version}";
- version = "3.0.13";
+ version = "3.0.21";
src = fetchzip {
# this one contains all git submodules and is cheaper than fetchgit
url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
- sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065";
+ sha256 = "0cq2gbmf1sssg72sq4b5s3x1z6wvl1pzxliymm06flw5bpim5as2";
};
- patches = [(fetchpatch {
- name = "icu-59.diff";
- url = https://github.com/mapnik/mapnik/commit/9e58c890430d.diff;
- sha256 = "0h546qq8g19gw9s4979hla9vkq5kcwh3q45ryajyjhmlr2z9fi6p";
- })];
-
# a distinct dev output makes python-mapnik fail
outputs = [ "out" ];
- nativeBuildInputs = [ python2 scons ];
+ nativeBuildInputs = [ python scons ];
buildInputs =
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
- libwebp libxml2 proj python2 sqlite zlib
+ libwebp libxml2 proj python sqlite zlib
# optional inputs
postgresql
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 3b610271539..064f04f220c 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
homepage = http://martyr.sourceforge.net/;
+ license = stdenv.lib.licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix
index 57321522736..f28ff1b0a21 100644
--- a/pkgs/development/libraries/matio/default.nix
+++ b/pkgs/development/libraries/matio/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "matio-1.5.12";
+ name = "matio-1.5.13";
src = fetchurl {
url = "mirror://sourceforge/matio/${name}.tar.gz";
- sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6";
+ sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix
index 11bd437d377..e1dd7586f92 100644
--- a/pkgs/development/libraries/mdds/0.12.1.nix
+++ b/pkgs/development/libraries/mdds/0.12.1.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = https://gitlab.com/mdds/mdds;
description = "A collection of multi-dimensional data structure and indexing algorithm";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix
index 8ff1d6d5e9a..2b61668d5c6 100644
--- a/pkgs/development/libraries/mdds/0.7.1.nix
+++ b/pkgs/development/libraries/mdds/0.7.1.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = https://gitlab.com/mdds/mdds/;
description = "A collection of multi-dimensional data structure and indexing algorithm";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 43fee9ccead..3b0a0441cc4 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -16,10 +16,11 @@ stdenv.mkDerivation rec {
checkInputs = [ boost ];
- meta = {
+ meta = with stdenv.lib; {
inherit version;
homepage = https://gitlab.com/mdds/mdds;
description = "A collection of multi-dimensional data structure and indexing algorithm";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix
deleted file mode 100644
index 2bfdb679156..00000000000
--- a/pkgs/development/libraries/mesa-darwin/default.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, flex, bison
-, python, libxml2Python, expat, makedepend, xorg, llvm, libffi, libvdpau
-, OpenGL, apple_sdk, Xplugin
-}:
-
-let
- version = "8.0.5";
- self = stdenv.mkDerivation rec {
- name = "mesa-${version}";
-
- src = fetchurl {
- url = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/${version}/MesaLib-${version}.tar.bz2";
- sha256 = "0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si";
- };
-
- nativeBuildInputs = [ pkgconfig python makedepend flex bison ];
-
- buildInputs = with xorg; [
- glproto dri2proto libXfixes libXi libXmu
- intltool expat libxml2Python llvm
- presentproto
- libX11 libXext libxcb libXt libxshmfence
- libffi libvdpau
- ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL apple_sdk.sdk Xplugin ];
-
- propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ OpenGL ];
-
- postUnpack = ''
- ln -s darwin $sourceRoot/configs/current
- '';
-
- preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
- substituteInPlace bin/mklib --replace g++ clang++
- '';
-
- patches = [
- ./patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
- ./patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
- ./patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
- ./patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
- ./patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
- ./patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
- ./patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
- ./patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
- ./patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
- ./patches/patch-src-mapi-vgapi-Makefile.diff
- ];
-
- postPatch = "patchShebangs .";
-
- configurePhase = ":";
-
- configureFlags = [
- # NOTE: Patents expired on June 17 2018.
- # For details see: https://www.phoronix.com/scan.php?page=news_item&px=OpenGL-Texture-Float-Freed
- "texture-float"
- ];
-
- makeFlags = "INSTALL_DIR=\${out} CC=cc CXX=c++";
-
- enableParallelBuilding = true;
-
- passthru = { inherit version; };
-
- meta = {
- description = "An open source implementation of OpenGL";
- homepage = http://www.mesa3d.org/;
- license = "bsd";
- platforms = stdenv.lib.platforms.darwin;
- maintainers = with stdenv.lib.maintainers; [ cstrahan ];
- };
- };
-in self // { driverLink = self; }
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch b/pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
deleted file mode 100644
index 5466ffc9085..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 9cf1afbf8ae87ddbb29b24a0f9f2724e9e2935c1 Mon Sep 17 00:00:00 2001
-From: Brian Paul
-Date: Tue, 4 Sep 2012 20:17:15 -0600
-Subject: [PATCH 03/13] mesa: fix per-level max texture size error checking
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a long-standing omission in Mesa's texture image size checking.
-We need to take the mipmap level into consideration when checking if the
-width, height and depth are too large.
-
-Fixes the new piglit max-texture-size-level test.
-Thanks to Stéphane Marchesin for finding this problem.
-
-Note: This is a candidate for the stable branches.
-
-Reviewed-by: Michel Dänzer
-(cherry picked from commit 771e7b6d884bb4294a89f276a904d90b28efb90a)
----
- src/mesa/main/teximage.c | 36 +++++++++++++++++++++---------------
- 1 file changed, 21 insertions(+), 15 deletions(-)
-
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 3aecc0f..ed22fa9 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -1251,11 +1251,12 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
-
- switch (target) {
- case GL_PROXY_TEXTURE_1D:
-- maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-- if (width < 2 * border || width > 2 * border + maxSize)
-- return GL_FALSE;
- if (level >= ctx->Const.MaxTextureLevels)
- return GL_FALSE;
-+ maxSize = 1 << (ctx->Const.MaxTextureLevels - 1); /* level zero size */
-+ maxSize >>= level; /* level size */
-+ if (width < 2 * border || width > 2 * border + maxSize)
-+ return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1263,13 +1264,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_2D:
-+ if (level >= ctx->Const.MaxTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 2 * border || height > 2 * border + maxSize)
- return GL_FALSE;
-- if (level >= ctx->Const.MaxTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1279,15 +1281,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_3D:
-+ if (level >= ctx->Const.Max3DTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 2 * border || height > 2 * border + maxSize)
- return GL_FALSE;
- if (depth < 2 * border || depth > 2 * border + maxSize)
- return GL_FALSE;
-- if (level >= ctx->Const.Max3DTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1299,23 +1302,24 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_RECTANGLE_NV:
-+ if (level != 0)
-+ return GL_FALSE;
- maxSize = ctx->Const.MaxTextureRectSize;
- if (width < 0 || width > maxSize)
- return GL_FALSE;
- if (height < 0 || height > maxSize)
- return GL_FALSE;
-- if (level != 0)
-- return GL_FALSE;
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
-+ if (level >= ctx->Const.MaxCubeTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 2 * border || height > 2 * border + maxSize)
- return GL_FALSE;
-- if (level >= ctx->Const.MaxCubeTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1325,13 +1329,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-+ if (level >= ctx->Const.MaxTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 1 || height > ctx->Const.MaxArrayTextureLayers)
- return GL_FALSE;
-- if (level >= ctx->Const.MaxTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
-@@ -1339,15 +1344,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
- return GL_TRUE;
-
- case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-+ if (level >= ctx->Const.MaxTextureLevels)
-+ return GL_FALSE;
- maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
-+ maxSize >>= level;
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
- if (height < 2 * border || height > 2 * border + maxSize)
- return GL_FALSE;
- if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers)
- return GL_FALSE;
-- if (level >= ctx->Const.MaxTextureLevels)
-- return GL_FALSE;
- if (!ctx->Extensions.ARB_texture_non_power_of_two) {
- if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
- return GL_FALSE;
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch b/pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
deleted file mode 100644
index ff933b2ec28..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From db8cb2250335a93cad6e877e634116e5cd6b42fc Mon Sep 17 00:00:00 2001
-From: Dave Airlie
-Date: Tue, 13 Mar 2012 14:53:25 +0000
-Subject: [PATCH 08/13] glsl: initialise const force glsl extension warning in
- fake ctx
-
-valgrind complained about an uninitialised value being used in
-glsl_parser_extras.cpp, and this was the one it was giving out about.
-
-Just initialise the value in the fakectx.
-
-Signed-off-by: Dave Airlie
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48057
-(cherry picked from commit b78a77f979b21a84aecb6fa4f19a2ed51a48c306)
----
- src/glsl/builtins/tools/generate_builtins.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
-index 72d12bb..bd15c4d 100755
---- a/src/glsl/builtins/tools/generate_builtins.py
-+++ b/src/glsl/builtins/tools/generate_builtins.py
-@@ -156,6 +156,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
- fakeCtx.API = API_OPENGL;
- fakeCtx.Const.GLSLVersion = 130;
- fakeCtx.Extensions.ARB_ES2_compatibility = true;
-+ fakeCtx.Const.ForceGLSLExtensionsWarn = false;
- gl_shader *sh = _mesa_new_shader(NULL, 0, target);
- struct _mesa_glsl_parse_state *st =
- new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch b/pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
deleted file mode 100644
index 919443045e4..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2286bd68a832a4d4908d50e1a4496853e1f3305a Mon Sep 17 00:00:00 2001
-From: Brian Paul
-Date: Mon, 27 Aug 2012 21:52:07 -0600
-Subject: [PATCH 09/13] mesa: test for GL_EXT_framebuffer_sRGB in glPopAttrib()
-
-To avoid spurious GL_INVALID_ENUM errors if the extension isn't supported.
-(cherry picked from commit 1aee8803f83f7ae24d9c2150c70afff2b1ee4c2f)
----
- src/mesa/main/attrib.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
-index 225ac89..cc384c7 100644
---- a/src/mesa/main/attrib.c
-+++ b/src/mesa/main/attrib.c
-@@ -993,7 +993,8 @@ _mesa_PopAttrib(void)
- _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
-
- /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
-- _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
-+ if (ctx->Extensions.EXT_framebuffer_sRGB)
-+ _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
- }
- break;
- case GL_CURRENT_BIT:
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch b/pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
deleted file mode 100644
index 565d5e6c273..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9c50093adff0c7531ab32a7ec9ce3b91712b4d20 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Sat, 20 Jul 2013 10:25:28 -0700
-Subject: [PATCH 11/13] Apple: glFlush() is not needed with CGLFlushDrawable()
-
-
-
-Signed-off-by: Jeremy Huddleston Sequoia
-(cherry picked from commit fa5ed99d8e809fb86e486a40273a4a6971055398)
----
- src/glx/apple/apple_glx.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/glx/apple/apple_glx.c b/src/glx/apple/apple_glx.c
-index 56cff64..4e2aa33 100644
---- a/src/glx/apple/apple_glx.c
-+++ b/src/glx/apple/apple_glx.c
-@@ -132,8 +132,6 @@ apple_glx_swap_buffers(void *ptr)
- {
- struct apple_glx_context *ac = ptr;
-
-- /* This may not be needed with CGLFlushDrawable: */
-- glFlush();
- apple_cgl.flush_drawable(ac->context_obj);
- }
-
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch b/pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
deleted file mode 100644
index 58ac66bd551..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 629600450b3845a768c0edc92ea3f444d03a2738 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Tue, 20 May 2014 01:37:58 -0700
-Subject: [PATCH 12/13] glapi: Avoid heap corruption in _glapi_table
-
-Signed-off-by: Jeremy Huddleston Sequoia
-Reviewed-by: Chia-I Wu
-(cherry picked from commit ff5456d1acf6f627a6837be3f3f37c6a268c9e8e)
----
- src/mapi/glapi/gen/gl_gentable.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py
-index 5657e32..0d0a02d 100644
---- a/src/mapi/glapi/gen/gl_gentable.py
-+++ b/src/mapi/glapi/gen/gl_gentable.py
-@@ -111,7 +111,7 @@ __glapi_gentable_set_remaining_noop(struct _glapi_table *disp) {
-
- struct _glapi_table *
- _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
-- struct _glapi_table *disp = calloc(1, sizeof(struct _glapi_table));
-+ struct _glapi_table *disp = calloc(1, _glapi_get_dispatch_table_size() * sizeof(_glapi_proc));
- char symboln[512];
-
- if(!disp)
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch b/pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
deleted file mode 100644
index 5ec0d9024ef..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/0013-darwin-Fix-test-for-kCGLPFAOpenGLProfile-support-at-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ba59a779ed41e08fa16805c1c60da39885546d0e Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Tue, 20 May 2014 10:53:00 -0700
-Subject: [PATCH 13/13] darwin: Fix test for kCGLPFAOpenGLProfile support at
- runtime
-
-Signed-off-by: Jeremy Huddleston Sequoia
-(cherry picked from commit 7a109268ab5b3544e7f7b99e84ef1fdf54023fb4)
----
- src/glx/apple/apple_visual.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 282934f..238c248 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -73,11 +73,15 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- GLint vsref = 0;
- CGLError error = 0;
-
-- /* Request an OpenGL 3.2 profile if one is available */
-- if(apple_cgl.version_major > 1 || (apple_cgl.version_major == 1 && apple_cgl.version_minor >= 3)) {
-- attr[numattr++] = kCGLPFAOpenGLProfile;
-- attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-- }
-+ /* Request an OpenGL 3.2 profile if one is available and supported */
-+ attr[numattr++] = kCGLPFAOpenGLProfile;
-+ attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-+
-+ /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
-+ attr[numattr] = 0;
-+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-+ if (error == kCGLBadAttribute)
-+ numattr -= 2;
-
- if (offscreen) {
- apple_glx_diagnostic
---
-1.9.2
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch b/pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
deleted file mode 100644
index 372ce4a27a3..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f0702d6e631bb912a230c081463bb51a0dde1bff Mon Sep 17 00:00:00 2001
-From: Jon TURNEY
-Date: Mon, 12 May 2014 15:38:26 +0100
-Subject: [PATCH 1001/1003] appleglx: Improve error reporting if
- CGLChoosePixelFormat() didn't find any matching pixel formats.
-
-Signed-off-by: Jon TURNEY
-Reviewed-by: Jeremy Huddleston Sequoia
-(cherry picked from commit 002a3a74273b81dfb226e1c3f0a8c18525ed0af4)
----
- src/glx/apple/apple_visual.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 238c248..c6ede51 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -167,4 +167,9 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
- abort();
- }
-+
-+ if (!*pfobj) {
-+ fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+ abort();
-+ }
- }
---
-1.9.2 (Apple Git-49)
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch b/pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
deleted file mode 100644
index 4818ee63d4c..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1b2f877c8ef052b183c1f20ece6c6e4a7bfd237c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Sat, 24 May 2014 14:13:33 -0700
-Subject: [PATCH 1002/1003] darwin: Write errors in choosing the pixel format
- to the crash log
-
-Signed-off-by: Jeremy Huddleston Sequoia
-(cherry picked from commit 9eb1d36c978a9b15ae2e999c630492dfffd7f165)
----
- src/glx/apple/apple_visual.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index c6ede51..951b213 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -63,6 +63,16 @@ enum
- MAX_ATTR = 60
- };
-
-+static char __crashreporter_info_buff__[4096] = { 0 };
-+static const char *__crashreporter_info__ __attribute__((__used__)) =
-+ &__crashreporter_info_buff__[0];
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-+// This is actually a toolchain requirement, but I'm not sure the correct check,
-+// but it should be fine to just only include it for Leopard and later. This line
-+// just tells the linker to never strip this symbol (such as for space optimization)
-+__asm__ (".desc ___crashreporter_info__, 0x10");
-+#endif
-+
- void
- apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * mode,
- bool * double_buffered, bool * uses_stereo,
-@@ -164,12 +174,16 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-
- if (error) {
-- fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
-+ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-+ "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
-+ fprintf(stderr, "%s", __crashreporter_info_buff__);
- abort();
- }
-
- if (!*pfobj) {
-- fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
-+ "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
-+ fprintf(stderr, "%s", __crashreporter_info_buff__);
- abort();
- }
- }
---
-1.9.2 (Apple Git-49)
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch b/pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
deleted file mode 100644
index 72841e2a2cc..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9d6e12eb6b06202519e48a7321f32944d7a34b0f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia
-Date: Sat, 24 May 2014 14:08:16 -0700
-Subject: [PATCH 1003/1003] darwin: Guard Core Profile usage behind a testing
- envvar
-
-Signed-off-by: Jeremy Huddleston Sequoia
-(cherry picked from commit 04ce3be4010305902cc5ae81e8e0c8550d043a1e)
----
- src/glx/apple/apple_visual.c | 30 ++++++++++++++++++++----------
- 1 file changed, 20 insertions(+), 10 deletions(-)
-
-diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
-index 951b213..046581b 100644
---- a/src/glx/apple/apple_visual.c
-+++ b/src/glx/apple/apple_visual.c
-@@ -82,16 +82,7 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- int numattr = 0;
- GLint vsref = 0;
- CGLError error = 0;
--
-- /* Request an OpenGL 3.2 profile if one is available and supported */
-- attr[numattr++] = kCGLPFAOpenGLProfile;
-- attr[numattr++] = kCGLOGLPVersion_3_2_Core;
--
-- /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
-- attr[numattr] = 0;
-- error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-- if (error == kCGLBadAttribute)
-- numattr -= 2;
-+ bool use_core_profile = getenv("LIBGL_PROFILE_CORE");
-
- if (offscreen) {
- apple_glx_diagnostic
-@@ -167,12 +158,31 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
- attr[numattr++] = mode->samples;
- }
-
-+ /* Debugging support for Core profiles to support newer versions of OpenGL */
-+ if (use_core_profile) {
-+ attr[numattr++] = kCGLPFAOpenGLProfile;
-+ attr[numattr++] = kCGLOGLPVersion_3_2_Core;
-+ }
-+
- attr[numattr++] = 0;
-
- assert(numattr < MAX_ATTR);
-
- error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-
-+ if ((error == kCGLBadAttribute || vsref == 0) && use_core_profile) {
-+ apple_glx_diagnostic
-+ ("Trying again without CoreProfile: error=%s, vsref=%d\n", apple_cgl.error_string(error), vsref);
-+
-+ if (!error)
-+ apple_cgl.destroy_pixel_format(*pfobj);
-+
-+ numattr -= 3;
-+ attr[numattr++] = 0;
-+
-+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
-+ }
-+
- if (error) {
- snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
- "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
---
-1.9.2 (Apple Git-49)
-
diff --git a/pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff b/pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff
deleted file mode 100644
index e29a8464076..00000000000
--- a/pkgs/development/libraries/mesa-darwin/patches/patch-src-mapi-vgapi-Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/mapi/vgapi/Makefile 2012-11-30 12:06:24.000000000 -0500
-+++ b/src/mapi/vgapi/Makefile 2012-11-30 12:06:52.000000000 -0500
-@@ -75,6 +75,8 @@
- install-headers:
- $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/VG
- $(INSTALL) -m 644 $(TOP)/include/VG/*.h $(DESTDIR)$(INSTALL_INC_DIR)/VG
-+ $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/KHR
-+ $(INSTALL) -m 644 $(TOP)/include/KHR/*.h $(DESTDIR)$(INSTALL_INC_DIR)/KHR
-
- install: default install-headers install-pc
- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
diff --git a/pkgs/development/libraries/mesa/darwin-clock-gettime.patch b/pkgs/development/libraries/mesa/darwin-clock-gettime.patch
new file mode 100644
index 00000000000..94e90a1c587
--- /dev/null
+++ b/pkgs/development/libraries/mesa/darwin-clock-gettime.patch
@@ -0,0 +1,76 @@
+diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
+index 45cb6075e6..62937311b9 100644
+--- a/include/c11/threads_posix.h
++++ b/include/c11/threads_posix.h
+@@ -36,6 +36,11 @@
+ #include
+ #include /* for intptr_t */
+
++#ifdef __MACH__
++#include
++#include
++#endif
++
+ /*
+ Configuration macro:
+
+@@ -383,12 +388,25 @@ tss_set(tss_t key, void *val)
+ /*-------------------- 7.25.7 Time functions --------------------*/
+ // 7.25.6.1
+ #ifndef HAVE_TIMESPEC_GET
++
+ static inline int
+ timespec_get(struct timespec *ts, int base)
+ {
+ if (!ts) return 0;
+ if (base == TIME_UTC) {
++#ifdef __MACH__
++ if (ts != NULL) {
++ clock_serv_t cclock;
++ mach_timespec_t mts;
++ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
++ clock_get_time(cclock, &mts);
++ mach_port_deallocate(mach_task_self(), cclock);
++ ts->tv_sec = mts.tv_sec;
++ ts->tv_nsec = mts.tv_nsec;
++ }
++#else
+ clock_gettime(CLOCK_REALTIME, ts);
++#endif
+ return base;
+ }
+ return 0;
+diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
+index 1208ebb315..e1378fb1f0 100644
+--- a/src/egl/drivers/dri2/egl_dri2.c
++++ b/src/egl/drivers/dri2/egl_dri2.c
+@@ -65,6 +65,11 @@
+ #include "util/u_vector.h"
+ #include "mapi/glapi/glapi.h"
+
++#ifdef __MACH__
++#include
++#include
++#endif
++
+ #define NUM_ATTRIBS 12
+
+ static void
+@@ -3092,7 +3097,17 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
+
+ /* We override the clock to monotonic when creating the condition
+ * variable. */
++#ifdef __MACH__
++ clock_serv_t cclock;
++ mach_timespec_t mts;
++ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
++ clock_get_time(cclock, &mts);
++ mach_port_deallocate(mach_task_self(), cclock);
++ current.tv_sec = mts.tv_sec;
++ current.tv_nsec = mts.tv_nsec;
++#else
+ clock_gettime(CLOCK_MONOTONIC, ¤t);
++#endif
+
+ /* calculating when to expire */
+ expire.tv_nsec = timeout % 1000000000L;
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 0a8a3c75a1c..ff45162c5a8 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -8,6 +8,8 @@
, galliumDrivers ? null
, driDrivers ? null
, vulkanDrivers ? null
+, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
+, OpenGL, Xplugin
}:
/** Packaging design:
@@ -29,19 +31,21 @@ else
let
defaultGalliumDrivers =
- if stdenv.isAarch32
+ optionals (builtins.elem "drm" eglPlatforms)
+ (if stdenv.isAarch32
then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"]
else if stdenv.isAarch64
then ["virgl" "nouveau" "vc4" ]
- else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"];
+ else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"]);
defaultDriDrivers =
- if (stdenv.isAarch32 || stdenv.isAarch64)
+ optionals (builtins.elem "drm" eglPlatforms)
+ (if (stdenv.isAarch32 || stdenv.isAarch64)
then ["nouveau"]
- else ["i915" "i965" "nouveau" "radeon" "r200"];
+ else ["i915" "i965" "nouveau" "radeon" "r200"]);
defaultVulkanDrivers =
- if (stdenv.isAarch32 || stdenv.isAarch64)
+ optionals stdenv.isLinux (if (stdenv.isAarch32 || stdenv.isAarch64)
then []
- else ["intel"] ++ lib.optional enableRadv "radeon";
+ else ["intel"] ++ lib.optional enableRadv "radeon");
in
let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in
@@ -51,11 +55,11 @@ let
(if gallium_ == null
then defaultGalliumDrivers
else gallium_)
- ++ ["swrast" "virgl"];
+ ++ lib.optional stdenv.isLinux "swrast";
driDrivers =
(if dri_ == null
- then defaultDriDrivers
- else dri_) ++ ["swrast"];
+ then optionals (elem "drm" eglPlatforms) defaultDriDrivers
+ else dri_) ++ lib.optional stdenv.isLinux "swrast";
vulkanDrivers =
if vulkan_ == null
then defaultVulkanDrivers
@@ -63,7 +67,7 @@ let
in
let
- version = "18.1.7";
+ version = "18.2.2";
branch = head (splitString "." version);
in
@@ -77,7 +81,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
- sha256 = "655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306";
+ sha256 = "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3";
};
prePatch = "patchShebangs .";
@@ -89,9 +93,10 @@ let self = stdenv.mkDerivation {
./symlink-drivers.patch
./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
./disk_cache-include-dri-driver-path-in-cache-key.patch
- ];
+ ] ++ lib.optional stdenv.isDarwin ./darwin-clock-gettime.patch;
- outputs = [ "out" "dev" "drivers" "osmesa" ];
+ outputs = [ "out" "dev" "drivers" ]
+ ++ lib.optional (elem "swrast" galliumDrivers) "osmesa";
# TODO: Figure out how to enable opencl without having a runtime dependency on clang
configureFlags = [
@@ -99,19 +104,11 @@ let self = stdenv.mkDerivation {
"--localstatedir=/var"
"--with-dri-driverdir=$(drivers)/lib/dri"
"--with-dri-searchpath=${libglvnd.driverLink}/lib/dri"
- "--with-platforms=x11,wayland,drm"
+ "--with-platforms=${concatStringsSep "," eglPlatforms}"
+ "--with-gallium-drivers=${concatStringsSep "," galliumDrivers}"
+ "--with-dri-drivers=${concatStringsSep "," driDrivers}"
+ "--with-vulkan-drivers=${concatStringsSep "," vulkanDrivers}"
"--enable-texture-float"
- ]
- ++ (optional (galliumDrivers != [])
- ("--with-gallium-drivers=" +
- builtins.concatStringsSep "," galliumDrivers))
- ++ (optional (driDrivers != [])
- ("--with-dri-drivers=" +
- builtins.concatStringsSep "," driDrivers))
- ++ (optional (vulkanDrivers != [])
- ("--with-vulkan-drivers=" +
- builtins.concatStringsSep "," vulkanDrivers))
- ++ [
(enableFeature stdenv.isLinux "dri3")
(enableFeature stdenv.isLinux "nine") # Direct3D in Wine
"--enable-libglvnd"
@@ -122,17 +119,18 @@ let self = stdenv.mkDerivation {
"--enable-glx"
# https://bugs.freedesktop.org/show_bug.cgi?id=35268
(enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls")
- "--enable-gallium-osmesa" # used by wine
+ # used by wine
+ (enableFeature (elem "swrast" galliumDrivers) "gallium-osmesa")
"--enable-llvm"
- "--enable-egl"
- "--enable-xa" # used in vmware driver
- "--enable-gbm"
+ (enableFeature stdenv.isLinux "egl")
+ (enableFeature stdenv.isLinux "xa") # used in vmware driver
+ (enableFeature stdenv.isLinux "gbm")
"--enable-xvmc"
"--enable-vdpau"
"--enable-shared-glapi"
"--enable-llvm-shared-libs"
- "--enable-omx-bellagio"
- "--enable-va"
+ (enableFeature stdenv.isLinux "omx-bellagio")
+ (enableFeature stdenv.isLinux "va")
"--disable-opencl"
];
@@ -140,16 +138,18 @@ let self = stdenv.mkDerivation {
propagatedBuildInputs = with xorg;
[ libXdamage libXxf86vm ]
- ++ optional stdenv.isLinux libdrm;
+ ++ optional stdenv.isLinux libdrm
+ ++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
buildInputs = with xorg; [
expat llvmPackages.llvm libglvnd
glproto dri2proto dri3proto presentproto
- libX11 libXext libxcb libXt libXfixes libxshmfence
- libffi wayland wayland-protocols libvdpau libelf libXvMC
- libomxil-bellagio libva-minimal libpthreadstubs openssl/*or another sha1 provider*/
+ libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
+ libffi libvdpau libelf libXvMC
+ libpthreadstubs openssl/*or another sha1 provider*/
valgrind-light python2 python2.pkgs.Mako
- ];
+ ] ++ lib.optionals stdenv.isLinux [ wayland wayland-protocols
+ libomxil-bellagio libva-minimal ];
enableParallelBuilding = true;
doCheck = false;
@@ -161,7 +161,7 @@ let self = stdenv.mkDerivation {
];
# TODO: probably not all .la files are completely fixed, but it shouldn't matter;
- postInstall = ''
+ postInstall = optionalString (galliumDrivers != []) ''
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
mv -t "$drivers/lib/" \
$out/lib/libXvMC* \
@@ -215,7 +215,7 @@ let self = stdenv.mkDerivation {
# TODO:
# check $out doesn't depend on llvm: builder failures are ignored
# for some reason grep -qv '${llvmPackages.llvm}' -R "$out";
- postFixup = ''
+ postFixup = optionalString (galliumDrivers != []) ''
# add RPATH so the drivers can find the moved libgallium and libdricore9
# moved here to avoid problems with stripping patchelfed files
for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do
@@ -235,7 +235,9 @@ let self = stdenv.mkDerivation {
# Use stub libraries from libglvnd and headers from Mesa.
buildCommand = ''
- ln -s ${libglvnd.out} $out
+ mkdir -p $out/nix-support
+ ln -s ${libglvnd.out}/lib $out/lib
+
mkdir -p $dev/{,lib/pkgconfig,nix-support}
echo "$out" > $dev/nix-support/propagated-build-inputs
ln -s ${self.dev}/include $dev/include
@@ -257,6 +259,8 @@ let self = stdenv.mkDerivation {
genPkgConfig egl EGL
genPkgConfig glesv1_cm GLESv1_CM
genPkgConfig glesv2 GLESv2
+ '' + lib.optionalString stdenv.isDarwin ''
+ echo ${OpenGL} > $out/nix-support/propagated-build-inputs
'';
};
};
@@ -265,7 +269,7 @@ let self = stdenv.mkDerivation {
description = "An open source implementation of OpenGL";
homepage = https://www.mesa3d.org/;
license = licenses.mit; # X11 variant, in most files
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ vcunat ];
};
};
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
index feb6ffe428c..18e7d5437b1 100644
--- a/pkgs/development/libraries/mesa/missing-includes.patch
+++ b/pkgs/development/libraries/mesa/missing-includes.patch
@@ -32,16 +32,6 @@
#include
#include
#else
---- ./src/mesa/drivers/dri/i965/brw_bufmgr.h
-+++ ./src/mesa/drivers/dri/i965/brw_bufmgr.h
-@@ -37,6 +37,7 @@
- #include
- #include
- #include
-+#include
- #include "util/u_atomic.h"
- #include "util/list.h"
-
--- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -28,6 +28,8 @@
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index e68661b44ec..ca72557242f 100644
--- a/pkgs/development/libraries/mono-addins/default.nix
+++ b/pkgs/development/libraries/mono-addins/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }:
stdenv.mkDerivation rec {
name = "mono-addins-${version}";
- version = "1.2";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "mono";
repo = "mono-addins";
rev = "mono-addins-${version}";
- sha256 = "1hnn0a2qsjcjprsxas424bzvhsdwy0yc2jj5xbp698c0m9kfk24y";
+ sha256 = "018g3bd8afjc39h22h2j5r6ldsdn08ynx7wg889gdvnxg3hrxgl2";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ mono gtk-sharp-2_0 ];
+
+ # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
+ buildInputs = [ mono48 gtk-sharp-2_0 ];
dontStrip = true;
@@ -25,5 +27,6 @@ stdenv.mkDerivation rec {
and for creating libraries which extend those applications.
'';
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix
index d96f90b4bfd..37195d38562 100644
--- a/pkgs/development/libraries/mono-zeroconf/default.nix
+++ b/pkgs/development/libraries/mono-zeroconf/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
description = "A cross platform Zero Configuration Networking library for Mono and .NET";
homepage = http://www.mono-project.com/archived/monozeroconf/;
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
index 306becf0c18..de277329961 100644
--- a/pkgs/development/libraries/msgpack/generic.nix
+++ b/pkgs/development/libraries/msgpack/generic.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
cmakeFlags = []
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"-DMSGPACK_BUILD_EXAMPLES=OFF"
- ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "msvcrt")
- "-DCMAKE_SYSTEM_NAME=Windows"
;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix
index cfb02ddbf9d..601e70427a1 100644
--- a/pkgs/development/libraries/msilbc/default.nix
+++ b/pkgs/development/libraries/msilbc/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
"MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include"
];
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "Mediastreamer plugin for the iLBC audio codec";
+ platforms = platforms.linux;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix
new file mode 100644
index 00000000000..15c82cb1282
--- /dev/null
+++ b/pkgs/development/libraries/mtxclient/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }:
+
+stdenv.mkDerivation rec {
+ name = "mtxclient-${version}";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "mujx";
+ repo = "mtxclient";
+ rev = "v${version}";
+ sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs";
+ };
+
+ postPatch = ''
+ ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp
+ '';
+
+ cmakeFlags = [ "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" ];
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ boost openssl zlib libsodium olm ];
+
+ meta = with stdenv.lib; {
+ description = "Client API library for Matrix, built on top of Boost.Asio";
+ homepage = https://github.com/mujx/mtxclient;
+ license = licenses.mit;
+ maintainers = with maintainers; [ fpletz ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix
index dd40a396244..28888e551ef 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://hunspell.sourceforge.net/;
description = "Thesaurus library from Hunspell project";
+ license = stdenv.lib.licenses.bsd3;
inherit (hunspell.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index b5d4ea0f4eb..f29fb9564f3 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, cmake}:
stdenv.mkDerivation rec {
- version = "1.2.3";
+ version = "1.3.0";
name = "nanoflann-${version}";
src = fetchFromGitHub {
owner = "jlblancoc";
repo = "nanoflann";
rev = "v${version}";
- sha256 = "1jrh73kjvdv7s7zc1sc3z254i17lpvn77b19wx32nvzsfxs4g44i";
+ sha256 = "1bwdmrz1qygp9qy2nzrp1axa1i4nvm0ljkn6mnhlcvbfsyvhzigv";
};
buildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index f50b64fca3e..8f72b333aa4 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -1,14 +1,14 @@
{ stdenv, cmake, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "1.1.4";
+ version = "1.1.5";
name = "nanomsg-${version}";
src = fetchFromGitHub {
owner = "nanomsg";
repo = "nanomsg";
rev = version;
- sha256 = "11mxbhkxkzqwdmpl79mfiiqby7zawgkalips7zr0bbdfyhq7jyrl";
+ sha256 = "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64";
};
buildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index 1040cb9a934..a8d7f654a9f 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchgit, openssl, doxygen, boost, sqlite, cryptopp, pkgconfig, python, pythonPackages }:
+{ stdenv, fetchFromGitHub, openssl, doxygen, boost, sqlite, pkgconfig, python, pythonPackages }:
let
- version = "4c32e7";
+ version = "0.6.3";
in
stdenv.mkDerivation {
- name = "ndn-cxx-0.1-${version}";
- src = fetchgit {
- url = "https://github.com/named-data/ndn-cxx.git";
- rev = "4c32e748863d5165cc0e3d6b54a8383f4836cdf1";
- sha256 = "18szs3j3ig8wlcqngran0daxaj7j2qsmch0212ids6fymj1hgax4";
+ name = "ndn-cxx-${version}";
+ src = fetchFromGitHub {
+ owner = "named-data";
+ repo = "ndn-cxx";
+ rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00";
+ sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ openssl doxygen boost sqlite cryptopp python pythonPackages.sphinx];
+ buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx];
preConfigure = ''
patchShebangs waf
./waf configure \
- --with-cryptopp=${cryptopp} \
+ --prefix=$out \
+ --with-openssl=${openssl.dev} \
--boost-includes=${boost.dev}/include \
- --boost-libs=${boost.out}/lib \
- --with-examples \
- --prefix=$out
+ --boost-libs=${boost.out}/lib
'';
buildPhase = ''
./waf
@@ -45,6 +45,5 @@ stdenv.mkDerivation {
license = licenses.lgpl3;
platforms = stdenv.lib.platforms.unix;
maintainers = [ maintainers.sjmackenzie ];
- broken = true; # 2018-04-11
};
}
diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix
index d0f992efb2b..87f9b5effac 100644
--- a/pkgs/development/libraries/neon/0.29.nix
+++ b/pkgs/development/libraries/neon/0.29.nix
@@ -40,9 +40,10 @@ stdenv.mkDerivation rec {
checkInputs = [ perl ];
doCheck = false; # fails, needs the net
- meta = {
+ meta = with stdenv.lib; {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 7aad5be36f7..61a40753a56 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -40,9 +40,10 @@ stdenv.mkDerivation rec {
checkInputs = [ perl ];
doCheck = false; # fails, needs the net
- meta = {
+ meta = with stdenv.lib; {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 7d0e934d911..0c597fc4b33 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -43,5 +43,8 @@ in stdenv.mkDerivation rec {
meta = {
platforms = stdenv.lib.platforms.unix;
homepage = https://www.unidata.ucar.edu/software/netcdf/;
+ license = {
+ url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html;
+ };
};
}
diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index a10f52462a8..1a5656b7ca1 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -22,10 +22,9 @@ stdenv.mkDerivation rec {
unset CPP
'';
- # Use `lib.optionalString` next mass rebuild.
- makeFlags = if stdenv.buildPlatform == stdenv.hostPlatform
- then null
- else "CROSS_COMPILE=${stdenv.cc.targetPrefix}";
+ makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+ "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+ ];
meta = with stdenv.lib; {
homepage = https://fedorahosted.org/newt/;
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 68bffd4032d..471684ea7dd 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -6,6 +6,7 @@
, enableAsioLib ? false, boost ? null
, enableGetAssets ? false, libxml2 ? null
, enableJemalloc ? false, jemalloc ? null
+, enableApp ? !stdenv.hostPlatform.isWindows
}:
assert enableHpack -> jansson != null;
@@ -35,8 +36,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" "--enable-app" ]
- ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib";
+ configureFlags = [
+ "--with-spdylay=no"
+ "--disable-examples"
+ "--disable-python-bindings"
+ (stdenv.lib.enableFeature enableApp "app")
+ ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib";
#doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index ff8a54f87f2..cc5a115ed71 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
-let version = "4.0.5"; in
+let version = "6.0.0"; in
stdenv.mkDerivation {
name = "nix-plugins-${version}";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
owner = "shlevy";
repo = "nix-plugins";
rev = version;
- sha256 = "170f365rnik62fp9wllbqlspr8lf1yb96pmn2z708i2wjlkdnrny";
+ sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 15bdbb1b48e..25d4386cec2 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "nlohmann_json-${version}";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
- sha256 = "0585r6ai9x1bhspffn5w5620wxfl1q1gj476brsnaf7wwnr60hwk";
+ sha256 = "1plg9l1avnjsg6khrd88yj9cbzbbkwzpc5synmicqndb35wndn5h";
};
nativeBuildInputs = [ cmake ];
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBuildTests=${if doCheck then "ON" else "OFF"}"
- ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [
- "-DCMAKE_SYSTEM_NAME=Windows"
];
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix
index c7e133d94b2..3c5ae8537a4 100644
--- a/pkgs/development/libraries/notify-sharp/default.nix
+++ b/pkgs/development/libraries/notify-sharp/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "D-Bus for .NET";
platforms = platforms.linux;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index ce18498ee85..cdbd57d785f 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchurl
, CoreServices ? null }:
-let version = "4.19"; in
+let version = "4.20"; in
stdenv.mkDerivation {
name = "nspr-${version}";
src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
- sha256 = "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f";
+ sha256 = "0vjms4j75zvv5b2siyafg7hh924ysx2cwjad8spzp7x87n8n929c";
};
outputs = [ "out" "dev" ];
@@ -35,9 +35,10 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.mozilla.org/projects/nspr/;
description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mpl20;
};
}
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 3089e6da23a..8a3de28b784 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -8,11 +8,11 @@ let
in stdenv.mkDerivation rec {
name = "nss-${version}";
- version = "3.38";
+ version = "3.39";
src = fetchurl {
- url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz";
- sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c";
+ url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz";
+ sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb";
};
buildInputs = [ perl zlib sqlite ]
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
preConfigure = "cd nss";
makeFlags = [
- "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr"
+ "NSPR_INCLUDE_DIR=${nspr.dev}/include"
"NSPR_LIB_DIR=${nspr.out}/lib"
"NSDISTMODE=copy"
"BUILD_OPT=1"
diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix
new file mode 100644
index 00000000000..6c4a23ccaf2
--- /dev/null
+++ b/pkgs/development/libraries/nsss/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, skawarePackages }:
+
+with skawarePackages;
+
+buildPackage {
+ pname = "nsss";
+ version = "0.0.1.0";
+ sha256 = "0f285bvpvhk40cqjpkc1jb36il0fkzzzjmc89gbbq3awl3w4r1i0";
+
+ description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
+
+ # TODO: nsss support
+ configureFlags = [
+ "--libdir=\${lib}/lib"
+ "--dynlibdir=\${lib}/lib"
+ "--bindir=\${bin}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
+ ];
+
+ postInstall = ''
+ # remove all nsss executables from build directory
+ rm $(find -name "nsssd-*" -type f -mindepth 1 -maxdepth 1 -executable)
+ rm libnsss.* libnsssd.*
+
+ mv doc $doc/share/doc/nsss/html
+ mv examples $doc/share/doc/nsss/examples
+ '';
+
+}
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 63a51a90ccd..cd3034e8612 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;
stdenv.mkDerivation rec {
name = "ntl-${version}";
- version = "11.3.0";
+ version = "11.3.1";
src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
- sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s";
+ sha256 = "08a1v92js13ij6lpf75xkjc8iy2w89igd7hy58abll6wnjj107zs";
};
buildInputs = [
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 44c8f51e856..25e084bfb74 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Network Connectivity Tracking library for Desktop Applications";
homepage = https://launchpad.net/ntrack;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ ];
+ platforms = platforms.linux;
+ license = licenses.lgpl3Plus;
};
}
diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix
index b6728829660..aa188650860 100644
--- a/pkgs/development/libraries/ode/default.nix
+++ b/pkgs/development/libraries/ode/default.nix
@@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0l63ymlkgfp5cb0ggqwm386lxmc3al21nb7a07dd49f789d33ib5";
};
- meta = {
+ meta = with stdenv.lib; {
description = "Open Dynamics Engine";
- platforms = stdenv.lib.platforms.linux;
+ homepage = https://sourceforge.net/projects/opende;
+ platforms = platforms.linux;
+ license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ];
};
}
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index f9a75801e10..956c8b58ffc 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "onig-${version}";
- version = "6.8.2";
+ version = "6.9.0";
src = fetchFromGitHub {
owner = "kkos";
repo = "oniguruma";
rev = "v${version}";
- sha256 = "00ly5i26n7wajhyhq3xadsc7dxrf7qllhwilk8dza2qj5dhld4nd";
+ sha256 = "064nk8nxygqrk5b6n7zvrksf5shrsapn12zdi6crbbfbw0s7pn8h";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix
index f86e4d12097..1658e831ddd 100644
--- a/pkgs/development/libraries/opal/default.nix
+++ b/pkgs/development/libraries/opal/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ptlib srtp libtheora speex
ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ];
- propagatedBuildInputs = [ speex ];
+ propagatedBuildInputs = [ speex ];
configureFlags = [ "--enable-h323" ];
@@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98";
patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];
-
+
meta = with stdenv.lib; {
description = "VoIP library";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
+ license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ];
};
passthru = {
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 8d1a2876a37..3835822673c 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake
+{ stdenv, fetchFromGitHub, cmake
, alsaSupport ? !stdenv.isDarwin, alsaLib ? null
, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
, CoreServices, AudioUnit, AudioToolbox
@@ -10,12 +10,14 @@ assert alsaSupport -> alsaLib != null;
assert pulseSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
- version = "1.18.2";
+ version = "1.19.1";
name = "openal-soft-${version}";
- src = fetchurl {
- url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
- sha256 = "10kydm8701a2kppiss9sdidn1820cmzhqgx1b2bsa5dsgzic32lz";
+ src = fetchFromGitHub {
+ owner = "kcat";
+ repo = "openal-soft";
+ rev = name;
+ sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index a9559c6abfb..13666542528 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";
};
- patches = [ ./bsm-add-audit_token_to_pid.patch ];
+ patches = lib.optional stdenv.isDarwin [ ./bsm-add-audit_token_to_pid.patch ];
meta = {
homepage = http://www.openbsm.org/;
diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index 6af15d90cef..4a12217443c 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -25,10 +25,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation";
homepage = http://www.opencascade.org/;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ maintainers = [ maintainers.viric ];
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix
index 358c8cda592..b47c9a8e561 100644
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "opencollada-${version}";
- version = "1.6.63";
+ version = "1.6.65";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenCOLLADA";
rev = "v${version}";
- sha256 = "1x8hz5nkz4lxsf17jv8sdl92dmbbpkqck8jkkc6g32d8gbs3gha1";
+ sha256 = "1vxb0b1dqcfwyhb36gjbn0fjdgn3hb03l68jbs0jzx6i2lh8bsh9";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 2724976c5ae..e0a6c6a5705 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -26,13 +26,12 @@ stdenv.mkDerivation rec {
cp license.txt "$out/share/doc/opencsg"
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Constructive Solid Geometry library";
homepage = http://www.opencsg.org/;
- platforms = with stdenv.lib.platforms;
- linux;
- maintainers = with stdenv.lib.maintainers;
- [raskin];
+ platforms = platforms.linux;
+ maintainers = [ maintainers.raskin ];
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 81d106a2a40..64aa11e1763 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -35,20 +35,20 @@
}:
let
- version = "3.4.2";
+ version = "3.4.3";
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
- sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx";
+ sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2";
};
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
- sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz";
+ sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2";
};
# Contrib must be built in order to enable Tesseract support:
@@ -145,11 +145,6 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
'';
- # TODO: remove the following patch once commit
- # https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f
- # is released.
- patches = [ ./fix-dnn.patch ];
-
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
@@ -170,6 +165,11 @@ stdenv.mkDerivation rec {
${installExtraFiles face}
'');
+ postConfigure = ''
+ [ -e modules/core/version_string.inc ]
+ echo '"(build info elided)"' > modules/core/version_string.inc
+ '';
+
buildInputs =
[ zlib pcre hdf5 glog boost google-gflags protobuf ]
++ lib.optional enablePython pythonPackages.python
diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch
deleted file mode 100644
index 62234a43e46..00000000000
--- a/pkgs/development/libraries/opencv/fix-dnn.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp
-index 730c752ce..abbce0453 100644
---- a/modules/dnn/src/caffe/caffe_io.cpp
-+++ b/modules/dnn/src/caffe/caffe_io.cpp
-@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) {
- std::ifstream fs(filename, std::ifstream::in);
- CHECK(fs.is_open()) << "Can't open \"" << filename << "\"";
- IstreamInputStream input(&fs);
-- return google::protobuf::TextFormat::Parser(true).Parse(&input, proto);
-+ return google::protobuf::TextFormat::Parser().Parse(&input, proto);
- }
-
- bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix
index a073a29b507..f954aaf7245 100644
--- a/pkgs/development/libraries/opendbx/default.nix
+++ b/pkgs/development/libraries/opendbx/default.nix
@@ -15,4 +15,10 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ readline mysql.connector-c postgresql sqlite ];
+
+ meta = with stdenv.lib; {
+ description = "Extremely lightweight but extensible database access library written in C";
+ license = licenses.lgpl21;
+ platforms = platforms.all;
+ };
}
diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index bd7d252e1a0..49d70bc211a 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -1,14 +1,6 @@
-{ stdenv
-, fetchFromGitHub
-, autoconf
-, automake
-, libtool
-, pkgconfig
-, nettle
-, gnutls
-, msgpack
-, readline
-, libargon2
+{ stdenv, fetchFromGitHub
+, autoreconfHook, pkgconfig
+, nettle, gnutls, msgpack, readline, libargon2
}:
stdenv.mkDerivation rec {
@@ -22,27 +14,26 @@ stdenv.mkDerivation rec {
sha256 = "1wqib5plak9bw2bla7y4qyjqi0b00kf8mfwlml16qj3i0aq6h2cp";
};
- buildInputs = [
- autoconf
- automake
- libtool
- pkgconfig
- nettle
- gnutls
- msgpack
- readline
- libargon2
- ];
+ nativeBuildInputs =
+ [ autoreconfHook
+ pkgconfig
+ ];
- preConfigure = ''
- ./autogen.sh
- '';
+ buildInputs =
+ [ nettle
+ gnutls
+ msgpack
+ readline
+ libargon2
+ ];
+
+ outputs = [ "out" "lib" "dev" "man" ];
meta = with stdenv.lib; {
description = "A C++11 Kademlia distributed hash table implementation";
- homepage = https://github.com/savoirfairelinux/opendht;
- license = licenses.gpl3Plus;
- maintainers = with maintainers; [ taeer olynch ];
- platforms = platforms.linux;
+ homepage = https://github.com/savoirfairelinux/opendht;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ taeer olynch thoughtpolice ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index 0a0b4c8d549..c8208ce27ba 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "openh264-${version}";
- version = "1.7.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "cisco";
repo = "openh264";
rev = "v${version}";
- sha256 = "0ywrqni05bh925ws5fmd24bm6h9n6z2wp1q19v545v06biiwr46a";
+ sha256 = "1pl7hpk25nh7lcx1lbbv984gvnim0d6hxf4qfmrjjfjf6w37sjw4";
};
buildInputs = [ nasm ];
diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.x.nix
similarity index 100%
rename from pkgs/development/libraries/openjpeg/2.1.nix
rename to pkgs/development/libraries/openjpeg/2.x.nix
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index a279fe79940..b5651e8f02a 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -10,14 +10,14 @@
let
majorVersion = "3.1";
- minorVersion = "0";
+ minorVersion = "2";
in stdenv.mkDerivation rec {
name = "openmpi-${majorVersion}.${minorVersion}";
src = fetchurl {
url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
- sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j";
+ sha256 = "1ibniapqki763agpfh65y284las083fqmj8m5b2pi8ilgy2fsm66";
};
postPatch = ''
diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix
index 7d84392d204..339f6064999 100644
--- a/pkgs/development/libraries/openpam/default.nix
+++ b/pkgs/development/libraries/openpam/default.nix
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2";
};
- meta = {
+ meta = with lib; {
homepage = https://www.openpam.org;
description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness";
- platforms = lib.platforms.unix;
- maintainers = with lib.maintainers; [ matthewbauer ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ matthewbauer ];
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix
index 3e178d92013..537b67c5a3c 100644
--- a/pkgs/development/libraries/openslp/default.nix
+++ b/pkgs/development/libraries/openslp/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
];
meta = with stdenv.lib; {
- homepage = http://openslp.org/;
+ homepage = http://www.openslp.org/;
description = "An open-source implementation of the IETF Service Location Protocol";
maintainers = with maintainers; [ ttuegel ];
license = licenses.bsd3;
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index 86015abb981..973f8304273 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
description = "A cryptographic library that implements the SSL and TLS protocols";
platforms = [ "x86_64-linux" ];
maintainers = [ stdenv.lib.maintainers.cstrahan ];
+ license = licenses.openssl;
priority = 10; # resolves collision with ‘man-pages’
};
}
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index de13f963b67..2ad4b8d904b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPackages, perl
+{ stdenv, fetchurl, buildPackages, perl, coreutils
, withCryptodev ? false, cryptodevHeaders
, enableSSL2 ? false
, static ? false
@@ -31,6 +31,8 @@ let
substituteInPlace "$a" \
--replace /bin/rm rm
done
+ '' + optionalString (versionAtLeast version "1.1.1") ''
+ substituteInPlace config --replace '/usr/bin/env' '${coreutils}/bin/env'
'' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) ''
substituteInPlace crypto/async/arch/async_posix.h \
--replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \
@@ -49,6 +51,8 @@ let
configureScript = {
"x86_64-darwin" = "./Configure darwin64-x86_64-cc";
"x86_64-solaris" = "./Configure solaris64-x86_64-gcc";
+ "armv6l-linux" = "./Configure linux-armv4 -march=armv6";
+ "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a";
}.${stdenv.hostPlatform.system} or (
if stdenv.hostPlatform == stdenv.buildPlatform
then "./config"
@@ -125,9 +129,9 @@ in {
sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah";
};
- openssl_1_1_0 = common {
- version = "1.1.0i";
- sha256 = "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb";
+ openssl_1_1 = common {
+ version = "1.1.1";
+ sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8";
};
}
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
new file mode 100644
index 00000000000..3b0354b9fe8
--- /dev/null
+++ b/pkgs/development/libraries/opentracing-cpp/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, cmake }:
+stdenv.mkDerivation rec {
+ name = "opentracing-cpp-${version}";
+ version = "1.5.0";
+ src = fetchFromGitHub {
+ owner = "opentracing";
+ repo = "opentracing-cpp";
+ rev = "v${version}";
+ sha256 = "09hxj59vvz1ncbx4iblgfc3b5i74hvb3vx5245bwwwfkx5cnj1gg";
+ };
+ buildInputs = [ cmake ];
+
+ meta = {
+ description = "C++ implementation of the OpenTracing API";
+ homepage = http://opentracing.io;
+ license = stdenv.lib.licenses.asl20;
+ maintainers = with stdenv.lib.maintainers; [ rob ];
+ };
+
+}
+
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index e0e0b59a9a9..b4bdd200211 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "p11-kit-${version}";
- version = "0.23.13";
+ version = "0.23.14";
src = fetchFromGitHub {
owner = "p11-glue";
repo = "p11-kit";
rev = version;
- sha256 = "1z2rbw2qbwj64i88llc1mkf0263qa0kxc2350kg25r7mghxbw1y6";
+ sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw";
};
outputs = [ "out" "dev"];
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 28f8a221700..6b5a0a35971 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,37 +1,45 @@
{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
-, libintl, gobjectIntrospection, darwin, fribidi
+, libintl, gobjectIntrospection, darwin, fribidi, gnome3
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43, makeFontsConf, freefont_ttf
}:
with stdenv.lib;
let
- ver_maj = "1.42";
- ver_min = "1";
-in
-stdenv.mkDerivation rec {
- name = "pango-${ver_maj}.${ver_min}";
+ pname = "pango";
+ version = "1.42.4";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
- sha256 = "0cnfgcya3wbs9m8g44cl5ww6wbp6qbw96qvsgkr8ymwqn9b6fnli";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "17bwb7dgbncrfsmchlib03k9n3xaalirb39g3yb43gg8cg6p8aqx";
};
outputs = [ "bin" "dev" "out" "devdoc" ];
- buildInputs = [ gobjectIntrospection ];
- nativeBuildInputs = [ pkgconfig ]
- ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
- Carbon
- CoreGraphics
- CoreText
- ]);
+ nativeBuildInputs = [ pkgconfig gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+ buildInputs = optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ Carbon
+ CoreGraphics
+ CoreText
+ ]);
propagatedBuildInputs = [ cairo harfbuzz libXft libintl fribidi ];
enableParallelBuilding = true;
- configureFlags = optional stdenv.isDarwin "--without-x";
+ # Fontconfig error: Cannot load default config file
+ FONTCONFIG_FILE = makeFontsConf {
+ fontDirectories = [ freefont_ttf ];
+ };
+
+ doCheck = false; # /layout/valid-1.markup: FAIL
- doCheck = false; # fails 1 out of 12 tests with "Fontconfig error: Cannot load default config file"
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
meta = with stdenv.lib; {
description = "A library for laying out and rendering of text, with an emphasis on internationalization";
diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix
index aae6ed0f688..b69ded64839 100644
--- a/pkgs/development/libraries/pangoxsl/default.nix
+++ b/pkgs/development/libraries/pangoxsl/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation {
pango
];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango.";
+ homepage = https://sourceforge.net/projects/pangopdf;
+ platforms = platforms.unix;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/parquet-cpp/api.patch b/pkgs/development/libraries/parquet-cpp/api.patch
new file mode 100644
index 00000000000..3fd567ea098
--- /dev/null
+++ b/pkgs/development/libraries/parquet-cpp/api.patch
@@ -0,0 +1,12 @@
+diff --git a/src/parquet/arrow/reader.cc b/src/parquet/arrow/reader.cc
+--- a/src/parquet/arrow/reader.cc
++++ b/src/parquet/arrow/reader.cc
+@@ -1421,7 +1421,7 @@ Status StructImpl::DefLevelsToNullArray(std::shared_ptr* null_bitmap_out
+ const int16_t* def_levels_data;
+ size_t def_levels_length;
+ RETURN_NOT_OK(GetDefLevels(&def_levels_data, &def_levels_length));
+- RETURN_NOT_OK(AllocateEmptyBitmap(pool_, def_levels_length, &null_bitmap));
++ RETURN_NOT_OK(GetEmptyBitmap(pool_, def_levels_length, &null_bitmap));
+ uint8_t* null_bitmap_ptr = null_bitmap->mutable_data();
+ for (size_t i = 0; i < def_levels_length; i++) {
+ if (def_levels_data[i] < struct_def_level_) {
diff --git a/pkgs/development/libraries/parquet-cpp/default.nix b/pkgs/development/libraries/parquet-cpp/default.nix
deleted file mode 100644
index e281e604380..00000000000
--- a/pkgs/development/libraries/parquet-cpp/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, symlinkJoin, fetchurl, arrow-cpp, boost, cmake, gtest, snappy, thrift, zlib }:
-
-stdenv.mkDerivation rec {
- name = "parquet-cpp-${version}";
- version = "1.4.0";
-
- src = fetchurl {
- url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz";
- sha256 = "1kn7pjzi5san5f05qbl8l8znqsa3f9cq9bflfr4s2jfwr7k9p2aj";
- };
-
- nativeBuildInputs = [ cmake ];
- buildInputs = [ boost ];
-
- preConfigure = ''
- substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
- substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY
- '';
-
- ARROW_HOME = arrow-cpp;
- THRIFT_HOME = thrift;
- GTEST_HOME = gtest;
- SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; };
- ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; };
-
- cmakeFlags = [
- "-DPARQUET_BUILD_BENCHMARKS=OFF"
- ];
-
- meta = {
- description = "A C++ library to read and write the Apache Parquet columnar data format";
- homepage = http://parquet.apache.org;
- license = stdenv.lib.licenses.asl20;
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ veprbl ];
- };
-}
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index b29388790d0..67f343d6038 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
description = "GStreamer backend for Phonon";
platforms = platforms.linux;
maintainers = with maintainers; [ ttuegel ];
+ license = licenses.lgpl21;
};
src = fetchurl {
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 0487886a896..773478f4dc0 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
homepage = https://phonon.kde.org/;
description = "GStreamer backend for Phonon";
platforms = platforms.linux;
+ license = with licenses; [ bsd3 lgpl2Plus ];
};
src = fetchurl {
diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix
new file mode 100644
index 00000000000..3eb4ddaab69
--- /dev/null
+++ b/pkgs/development/libraries/physics/apfel/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }:
+
+stdenv.mkDerivation rec {
+ name = "apfel-${version}";
+ version = "3.0.3";
+
+ src = fetchFromGitHub {
+ owner = "scarrazza";
+ repo = "apfel";
+ rev = version;
+ sha256 = "13dvcc5ba6djflrcy5zf5ikaw8s78zd8ac6ickc0hxhbmx1gjb4j";
+ };
+
+ buildInputs = [ gfortran lhapdf python2 ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "A PDF Evolution Library";
+ license = licenses.gpl3;
+ homepage = http://apfel.mi.infn.it/;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix
new file mode 100644
index 00000000000..6509b04f011
--- /dev/null
+++ b/pkgs/development/libraries/physics/apfelgrid/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root }:
+
+stdenv.mkDerivation rec {
+ name = "apfelgrid-${version}";
+ version = "1.0.1";
+
+ src = fetchFromGitHub {
+ owner = "nhartland";
+ repo = "APFELgrid";
+ rev = "v${version}";
+ sha256 = "0l0cyxd00kmb5aggzwsxg83ah0qiwav0shbxkxwrz3dvw78n89jk";
+ };
+
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ apfel applgrid lhapdf root ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Ultra-fast theory predictions for collider observables";
+ license = licenses.mit;
+ homepage = http://nhartland.github.io/APFELgrid/;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/applgrid/bad_code.patch b/pkgs/development/libraries/physics/applgrid/bad_code.patch
new file mode 100644
index 00000000000..c1c8f618fbb
--- /dev/null
+++ b/pkgs/development/libraries/physics/applgrid/bad_code.patch
@@ -0,0 +1,39 @@
+diff --git a/appl_grid/appl_grid.h b/appl_grid/appl_grid.h
+index 5059622..a0651c9 100644
+--- a/appl_grid/appl_grid.h
++++ b/appl_grid/appl_grid.h
+@@ -56,7 +56,7 @@ public:
+ class exception : public std::exception {
+ public:
+ exception(const std::string& s) { std::cerr << what() << " " << s << std::endl; };
+- exception(std::ostream& s) { std::cerr << what() << " " << s << std::endl; };
++ exception(std::ostream& s) { s << what() << " " << std::endl; };
+ virtual const char* what() const throw() { return "appl::grid::exception"; }
+ };
+
+diff --git a/appl_grid/appl_pdf.h b/appl_grid/appl_pdf.h
+index c71fd84..2525527 100644
+--- a/appl_grid/appl_pdf.h
++++ b/appl_grid/appl_pdf.h
+@@ -51,7 +51,7 @@ public:
+ class exception : public std::exception {
+ public:
+ exception(const std::string& s="") { std::cerr << what() << " " << s << std::endl; };
+- exception(std::ostream& s) { std::cerr << what() << " " << s << std::endl; };
++ exception(std::ostream& s) { s << " " << std::endl; };
+ const char* what() const throw() { return "appl::appl_pdf::exception "; }
+ };
+
+diff --git a/src/appl_igrid.h b/src/appl_igrid.h
+index d25288e..be354df 100644
+--- a/src/appl_igrid.h
++++ b/src/appl_igrid.h
+@@ -52,7 +52,7 @@ private:
+ class exception {
+ public:
+ exception(const std::string& s) { std::cerr << s << std::endl; };
+- exception(std::ostream& s) { std::cerr << s << std::endl; };
++ exception(std::ostream& s) { s << std::endl; };
+ };
+
+ typedef double (igrid::*transform_t)(double) const;
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix
new file mode 100644
index 00000000000..1ad5dcb8b25
--- /dev/null
+++ b/pkgs/development/libraries/physics/applgrid/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }:
+
+stdenv.mkDerivation rec {
+ name = "applgrid-${version}";
+ version = "1.4.70";
+
+ src = fetchurl {
+ url = "https://www.hepforge.org/archive/applgrid/${name}.tgz";
+ sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
+ };
+
+ buildInputs = [ gfortran hoppet lhapdf root5 ];
+
+ patches = [
+ ./bad_code.patch
+ ];
+
+ preConfigure = ''
+ substituteInPlace src/Makefile.in \
+ --replace "-L\$(subst /libgfortran.a, ,\$(FRTLIB) )" "-L${gfortran.cc.lib}/lib"
+ '' + (if stdenv.isDarwin then ''
+ substituteInPlace src/Makefile.in \
+ --replace "gfortran -print-file-name=libgfortran.a" "gfortran -print-file-name=libgfortran.dylib"
+ '' else "");
+
+ enableParallelBuilding = false; # broken
+
+ # Install private headers required by APFELgrid
+ postInstall = ''
+ for header in src/*.h; do
+ install -Dm644 "$header" "$out"/include/appl_grid/"`basename $header`"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "The APPLgrid project provides a fast and flexible way to reproduce the results of full NLO calculations with any input parton distribution set in only a few milliseconds rather than the weeks normally required to gain adequate statistics";
+ license = licenses.gpl3;
+ homepage = http://applgrid.hepforge.org;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
index f837d807219..92d2ab96232 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://cernlib.web.cern.ch;
description = "Legacy collection of libraries and modules for data analysis in high energy physics";
+ broken = stdenv.isDarwin;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 87af069c18a..7123858b8ed 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -1,128 +1,101 @@
-{ enableMultiThreading ? false
+{ enableMultiThreading ? true
, enableG3toG4 ? false
, enableInventor ? false
, enableGDML ? false
, enableQT ? false
, enableXM ? false
-, enableOpenGLX11 ? false
+, enableOpenGLX11 ? true
, enableRaytracerX11 ? false
# Standard build environment with cmake.
, stdenv, fetchurl, cmake
# Optional system packages, otherwise internal GEANT4 packages are used.
-, clhep ? null
-, expat ? null
-, zlib ? null
+, clhep ? null # not packaged currently
+, expat
+, zlib
# For enableGDML.
-, xercesc ? null
+, xercesc
# For enableQT.
-, qt ? null # qt4SDK or qt5SDK
+, qtbase
# For enableXM.
-, motif ? null # motif or lesstif
+, motif
# For enableInventor
, coin3d
, soxt
-, libXpm ? null
+, libXpm
# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
-, libGLU_combined ? null
-, xlibsWrapper ? null
-, libXmu ? null
+, libGLU_combined
+, xlibsWrapper
+, libXmu
}:
-# G4persistency library with support for GDML
-assert enableGDML -> xercesc != null;
-
-# If enableQT, Qt4/5 User Interface and Visualization drivers.
-assert enableQT -> qt != null;
-
-# Motif User Interface and Visualisation drivers.
-assert enableXM -> motif != null;
-
-# OpenGL/X11 User Interface and Visualisation drivers.
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
-assert enableInventor -> libXpm != null;
-
-let
- buildGeant4 =
- { version, src, multiThreadingCapable ? false }:
-
- stdenv.mkDerivation rec {
- inherit version src;
- name = "geant4-${version}";
-
- multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else "";
-
- cmakeFlags = ''
- ${multiThreadingFlag}
- -DGEANT4_INSTALL_DATA=OFF
- -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}
- -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}
- -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}
- -DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}
- -DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}
- -DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}
- -DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}
- -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}
- -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}
- -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}
- -DINVENTOR_INCLUDE_DIR=${coin3d}/include
- -DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so
- '';
-
- enableParallelBuilding = true;
- buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
- propagatedBuildInputs = [ clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
-
- postFixup = ''
- # Don't try to export invalid environment variables.
- sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
- '';
-
- setupHook = ./geant4-hook.sh;
-
- passthru = {
- data = import ./datasets.nix { inherit stdenv fetchurl; };
- };
-
- # Set the myriad of envars required by Geant4 if we use a nix-shell.
- shellHook = ''
- source $out/nix-support/setup-hook
- '';
-
- meta = with stdenv.lib; {
- description = "A toolkit for the simulation of the passage of particles through matter";
- longDescription = ''
- Geant4 is a toolkit for the simulation of the passage of particles through matter.
- Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
- The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
- '';
- homepage = http://www.geant4.org;
- license = licenses.g4sl;
- maintainers = with maintainers; [ tmplt ];
- platforms = platforms.all;
- };
- };
-
- fetchGeant4 = import ./fetch.nix {
- inherit stdenv fetchurl;
+stdenv.mkDerivation rec {
+ version = "10.4.1";
+ name = "geant4-${version}";
+
+ src = fetchurl{
+ url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
+ sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
};
-in {
- v10_0_2 = buildGeant4 {
- inherit (fetchGeant4.v10_0_2) version src;
- multiThreadingCapable = true;
+ cmakeFlags = [
+ "-DGEANT4_INSTALL_DATA=OFF"
+ "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
+ "-DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}"
+ "-DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}"
+ "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
+ "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
+ "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
+ "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
+ "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
+ "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
+ ] ++ stdenv.lib.optionals enableInventor [
+ "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
+ "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
+ ];
+
+ enableParallelBuilding = true;
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
+ ++ stdenv.lib.optionals enableGDML [ xercesc ]
+ ++ stdenv.lib.optionals enableXM [ motif ]
+ ++ stdenv.lib.optionals enableQT [ qtbase ]
+ ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ];
+
+ postFixup = ''
+ # Don't try to export invalid environment variables.
+ sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
+ '';
+
+ setupHook = ./geant4-hook.sh;
+
+ passthru = {
+ data = import ./datasets.nix { inherit stdenv fetchurl; };
};
- v10_4_1 = buildGeant4 {
- inherit (fetchGeant4.v10_4_1) version src;
- multiThreadingCapable = true;
+ # Set the myriad of envars required by Geant4 if we use a nix-shell.
+ shellHook = ''
+ source $out/nix-support/setup-hook
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A toolkit for the simulation of the passage of particles through matter";
+ longDescription = ''
+ Geant4 is a toolkit for the simulation of the passage of particles through matter.
+ Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
+ The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
+ '';
+ homepage = http://www.geant4.org;
+ license = licenses.g4sl;
+ maintainers = with maintainers; [ tmplt ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix
deleted file mode 100644
index 5d539b480d7..00000000000
--- a/pkgs/development/libraries/physics/geant4/fetch.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
- fetch = { version, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null }:
- {
- inherit version src;
- };
-
-in {
- v10_0_2 = fetch {
- version = "10.0.2";
-
- src = fetchurl{
- url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz";
- sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848";
- };
- };
-
- v10_4_1 = fetch {
- version = "10.4.1";
-
- src = fetchurl{
- url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
- sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
- };
- };
-
-}
-
diff --git a/pkgs/development/libraries/physics/geant4/g4py/configure.patch b/pkgs/development/libraries/physics/geant4/g4py/configure.patch
deleted file mode 100644
index 886618abd34..00000000000
--- a/pkgs/development/libraries/physics/geant4/g4py/configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- environments/g4py/configure 2014-03-17 22:47:05.000000000 +1100
-+++ environments/g4py/configure 2014-09-01 15:33:46.523637686 +1000
-@@ -4,9 +4,6 @@
- # ======================================================================
- export LANG=C
-
--PATH=/bin:/usr/bin
--export PATH
--
- # ======================================================================
- # testing the echo features
- # ======================================================================
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index ee332171158..551d61af3ad 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, cmake, xercesc
# The target version of Geant4
, geant4
@@ -9,66 +9,55 @@
}:
let
- buildG4py =
- { version, src, geant4}:
-
- stdenv.mkDerivation rec {
- inherit version src geant4;
- name = "g4py-${version}";
-
- # ./configure overwrites $PATH, which clobbers everything.
- patches = [ ./configure.patch ];
- patchFlags = "-p0";
-
- configurePhase = ''
- export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
-
- source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
- cd environments/g4py
-
- ./configure linux64 --prefix=$prefix \
- --with-g4install-dir=${geant4} \
- --with-python-incdir=${python}/include/python${python.majorVersion} \
- --with-python-libdir=${python}/lib \
- --with-boost-incdir=${boost.dev}/include \
- --with-boost-libdir=${boost.out}/lib
- '';
-
- enableParallelBuilding = true;
- buildInputs = [ geant4 boost python ];
-
- setupHook = ./setup-hook.sh;
-
- # Make sure we set PYTHONPATH
- shellHook = ''
- source $out/nix-support/setup-hook
- '';
-
- meta = {
- description = "Python bindings and utilities for Geant4";
- longDescription = ''
- Geant4 is a toolkit for the simulation of the passage of particles
- through matter. Its areas of application include high energy,
- nuclear and accelerator physics, as well as studies in medical and
- space science. The two main reference papers for Geant4 are
- published in Nuclear Instruments and Methods in Physics Research A
- 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
- (2006) 270-278.
- '';
- homepage = http://www.geant4.org;
- license = stdenv.lib.licenses.g4sl;
- maintainers = [ ];
- platforms = stdenv.lib.platforms.all;
- };
- };
-
- fetchGeant4 = import ../fetch.nix {
- inherit stdenv fetchurl;
- };
-
-in {
- v10_0_2 = buildG4py {
- inherit (fetchGeant4.v10_0_2) version src;
- geant4 = geant4.v10_0_2;
+ # g4py does not support MT and will fail to build against MT geant
+ geant4_nomt = geant4.override { enableMultiThreading = false; };
+ boost_python = boost.override { enablePython = true; inherit python; };
+in
+
+stdenv.mkDerivation rec {
+ inherit (geant4_nomt) version src;
+ name = "g4py-${version}";
+
+ sourceRoot = "geant4.10.04.p01/environments/g4py";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ geant4_nomt xercesc boost_python python ];
+
+ GEANT4_INSTALL = geant4_nomt;
+
+ preConfigure = ''
+ # Fix for boost 1.67+
+ substituteInPlace CMakeLists.txt \
+ --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.majorVersion})"
+ for f in `find . -name CMakeLists.txt`; do
+ substituteInPlace "$f" \
+ --replace "boost_python" "\''${Boost_LIBRARIES}"
+ done
+ '';
+
+ enableParallelBuilding = true;
+
+ setupHook = ./setup-hook.sh;
+
+ # Make sure we set PYTHONPATH
+ shellHook = ''
+ source $out/nix-support/setup-hook
+ '';
+
+ meta = {
+ description = "Python bindings and utilities for Geant4";
+ longDescription = ''
+ Geant4 is a toolkit for the simulation of the passage of particles
+ through matter. Its areas of application include high energy,
+ nuclear and accelerator physics, as well as studies in medical and
+ space science. The two main reference papers for Geant4 are
+ published in Nuclear Instruments and Methods in Physics Research A
+ 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1
+ (2006) 270-278.
+ '';
+ homepage = http://www.geant4.org;
+ license = stdenv.lib.licenses.g4sl;
+ maintainers = [ ];
+ platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix
new file mode 100644
index 00000000000..55714afbdce
--- /dev/null
+++ b/pkgs/development/libraries/physics/hoppet/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gfortran }:
+
+stdenv.mkDerivation rec {
+ name = "hoppet-${version}";
+ version = "1.2.0";
+
+ src = fetchurl {
+ url = "https://hoppet.hepforge.org/downloads/${name}.tgz";
+ sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz";
+ };
+
+ buildInputs = [ gfortran ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Higher Order Perturbative Parton Evolution Toolkit";
+ license = licenses.gpl2;
+ homepage = https://hoppet.hepforge.org;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 7f89c92772c..11a2640e97c 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2 }:
+{ stdenv, fetchurl, python2, makeWrapper }:
stdenv.mkDerivation rec {
name = "lhapdf-${version}";
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0bi02xcmq5as0wf0jn6i3hx0qy0hj61m02sbrbzd1gwjhpccwmvd";
};
+ nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python2 ];
enableParallelBuilding = true;
@@ -17,6 +18,10 @@ stdenv.mkDerivation rec {
pdf_sets = import ./pdf_sets.nix { inherit stdenv fetchurl; };
};
+ postInstall = ''
+ wrapProgram $out/bin/lhapdf --prefix PYTHONPATH : "$(toPythonPath "$out")"
+ '';
+
meta = {
description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files";
license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix
new file mode 100644
index 00000000000..a608a7f6b0f
--- /dev/null
+++ b/pkgs/development/libraries/physics/mela/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, gfortran }:
+
+stdenv.mkDerivation rec {
+ name = "mela-${version}";
+ version = "2.0.1";
+
+ src = fetchFromGitHub {
+ owner = "vbertone";
+ repo = "MELA";
+ rev = version;
+ sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y";
+ };
+
+ buildInputs = [ gfortran ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "a Mellin Evolution LibrAry";
+ license = licenses.gpl3;
+ homepage = https://github.com/vbertone/MELA;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix
new file mode 100644
index 00000000000..1a333456264
--- /dev/null
+++ b/pkgs/development/libraries/physics/qcdnum/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gfortran }:
+
+stdenv.mkDerivation rec {
+ name = "QCDNUM-${version}";
+ version = "17-01-14";
+
+ src = fetchurl {
+ url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz";
+ sha256 = "199s6kgmszxgjzd9214mpx3kyplq2q6987sii67s5xkg10ynyv31";
+ };
+
+ nativeBuildInputs = [ gfortran ];
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "QCDNUM is a very fast QCD evolution program written in FORTRAN77";
+ license = stdenv.lib.licenses.gpl3;
+ homepage = https://www.nikhef.nl/~h24/qcdnum/index.html;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ };
+}
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index e87ed8e48a9..96b5239b7db 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, v4l_utils, alsaLib, ffmpeg, libjack2, udev, libva, xorg
+, glib, dbus, gst_all_1, libv4l, alsaLib, ffmpeg, libjack2, udev, libva, xorg
, sbc, SDL2, makeFontsConf, freefont_ttf
}:
let
- version = "0.1.9";
+ version = "0.2.3";
fontsConf = makeFontsConf {
fontDirectories = [ freefont_ttf ];
@@ -16,22 +16,22 @@ in stdenv.mkDerivation rec {
owner = "PipeWire";
repo = "pipewire";
rev = version;
- sha256 = "0r9mgwbggnnijhdz49fnv0qdka364xn1h8yml2jakyqpfrm3i2nm";
+ sha256 = "1y04brfi5bv4y0hdyqzrcbayr674njf6a5hiwjfv2yi6lazkqv1k";
};
- outputs = [ "out" "dev" "doc" ];
+ outputs = [ "out" "lib" "dev" "doc" ];
nativeBuildInputs = [
meson ninja pkgconfig doxygen graphviz valgrind
];
buildInputs = [
- glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer v4l_utils
+ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer libv4l
alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
];
mesonFlags = [
- "-Denable_docs=true"
- "-Denable_gstreamer=true"
+ "-Ddocs=true"
+ "-Dgstreamer=true"
];
PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 9a43470de3b..1704703f801 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,10 +1,11 @@
{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
-, openssl, libpng, lua5, pkgconfig, libidn, expat
+, openssl, libpng, lua5, pkgconfig, libidn, expat, fetchpatch
, gcc5 # TODO(@Dridus) remove this at next hash break
}:
stdenv.mkDerivation rec {
- name = "podofo-0.9.6";
+ version = "0.9.6";
+ name = "podofo-${version}";
src = fetchurl {
url = "mirror://sourceforge/podofo/${name}.tar.gz";
@@ -13,6 +14,15 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
+ patches = [
+ # https://sourceforge.net/p/podofo/tickets/24/
+ (fetchpatch {
+ url = "https://sourceforge.net/p/podofo/tickets/24/attachment/podofo-cmake-3.12.patch";
+ extraPrefix = "";
+ sha256 = "087h51x60zrakzx09baan77hwz99cwb5l1j802r5g4wj7pbjz0mb";
+ })
+ ];
+
# TODO(@Dridus) remove the ++ ghc5 at next hash break
nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5;
@@ -21,10 +31,16 @@ stdenv.mkDerivation rec {
cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
- meta = {
+ postFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+ for i in $out/bin/* ; do
+ install_name_tool -change libpodofo.${version}.dylib $out/lib/libpodofo.${version}.dylib "$i"
+ done
+ '';
+
+ meta = with stdenv.lib; {
homepage = http://podofo.sourceforge.net;
description = "A library to work with the PDF file format";
- platforms = stdenv.lib.platforms.all;
- maintainers = [ ];
+ platforms = platforms.all;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix
index f6e7ed56adc..51cc72ffd40 100644
--- a/pkgs/development/libraries/poker-eval/default.nix
+++ b/pkgs/development/libraries/poker-eval/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = http://pokersource.org/poker-eval/;
+ homepage = http://pokersource.sourceforge.net;
description = "Poker hand evaluator";
license = stdenv.lib.licenses.gpl3;
maintainers = [stdenv.lib.maintainers.mtreskin];
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
index 54e10b96592..b13335561ac 100644
--- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix
+++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
@@ -25,9 +25,10 @@ stdenv.mkDerivation {
done
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A Qt wrapper around PolKit";
- maintainers = with stdenv.lib.maintainers; [ ttuegel ];
- platforms = with stdenv.lib.platforms; linux;
+ maintainers = [ maintainers.ttuegel ];
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix
index 4456cd7ff28..1e86b19ad5a 100644
--- a/pkgs/development/libraries/poppler/0.61.nix
+++ b/pkgs/development/libraries/poppler/0.61.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
-, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
+, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
, introspectionSupport ? false, gobjectIntrospection ? null
@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
+ patches = [
+ (fetchpatch {
+ name = "CVE-2018-13988";
+ url = "https://cgit.freedesktop.org/poppler/poppler/patch/?id=004e3c10df0abda214f0c293f9e269fdd979c5ee";
+ sha256 = "1l8713s57xc6g81bldw934rsfm140fqc7ggd50ha5mxdl1b3app2";
+ })
+ ];
+
buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;
# TODO: reduce propagation to necessary libs
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index edec0b7f069..592a1f1470a 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
doCheck = false; # fails
- meta = {
+ meta = with stdenv.lib; {
description = "Command line option parsing library";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index a577d318523..37cf29c8658 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -16,7 +16,7 @@
### NixOS - usage:
==================
- services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ];
+ services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_5; }) ];
### important Postgis implementation details:
@@ -42,8 +42,8 @@
let
- version = "2.4.4";
- sha256 = "1hm8migjb53cymp4qvg1h20yqllmy9f7x0awv5450391i6syyqq6";
+ version = "2.5.0";
+ sha256 = "1m9n1shhqhjrhbq6fd9fyfccxcgpng37s3lffhlmyrp98zbsnwxy";
in stdenv.mkDerivation rec {
name = "postgis-${version}";
diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix
index 29ff988a226..d40b4442e38 100644
--- a/pkgs/development/libraries/prison/default.nix
+++ b/pkgs/development/libraries/prison/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt4 library for QR-codes";
- maintainers = [ ];
+ license = stdenv.lib.licenses.mit;
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 0ebf299a8bf..55af1d8573a 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
- name = "proj-4.9.3";
+ name = "proj-5.2.0";
src = fetchurl {
- url = https://download.osgeo.org/proj/proj-4.9.3.tar.gz;
- sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139";
+ url = https://download.osgeo.org/proj/proj-5.2.0.tar.gz;
+ sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg";
};
doCheck = stdenv.is64bit;
diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix
new file mode 100644
index 00000000000..0009209d9ce
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.6.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+ version = "3.6.1";
+ sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq";
+}
diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix
index 5f0006c0589..883dff56f2e 100644
--- a/pkgs/development/libraries/protobuf/generic-v3.nix
+++ b/pkgs/development/libraries/protobuf/generic-v3.nix
@@ -1,16 +1,17 @@
{ stdenv
, fetchFromGitHub
-, autoreconfHook, zlib, gmock
+, autoreconfHook, zlib, gmock, which, buildPackages
, version, sha256
, ...
}:
-stdenv.mkDerivation rec {
+let
+mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation rec {
name = "protobuf-${version}";
# make sure you test also -A pythonPackages.protobuf
src = fetchFromGitHub {
- owner = "google";
+ owner = "protocolbuffers";
repo = "protobuf";
rev = "v${version}";
inherit sha256;
@@ -28,8 +29,10 @@ stdenv.mkDerivation rec {
--replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
'';
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ];
+
buildInputs = [ zlib ];
+ configureFlags = if buildProtobuf == null then [] else [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
enableParallelBuilding = true;
@@ -54,4 +57,7 @@ stdenv.mkDerivation rec {
};
passthru.version = version;
-}
+};
+in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform)
+ then (mkProtobufDerivation null buildPackages.stdenv)
+ else null) stdenv
diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix
index 803f5a9ba79..4d53c42a347 100644
--- a/pkgs/development/libraries/protobufc/1.3.nix
+++ b/pkgs/development/libraries/protobufc/1.3.nix
@@ -1,11 +1,11 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "protobuf-c";
repo = "protobuf-c";
rev = "v${version}";
- sha256 = "0shk18rjhzn2lqrwk97ks3x8gj77isc8szyb3xsgjrbrvkzjgvaa";
+ sha256 = "1dmvs0bhyx94ipaq3c7jmwcz4hwjmznn7310kqkqx7ly0w5vxxxr";
};
})
diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index ae60a6f69d6..d425de243f5 100644
--- a/pkgs/development/libraries/ptlib/default.nix
+++ b/pkgs/development/libraries/ptlib/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
description = "Portable Tools from OPAL VoIP";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
+ license = with licenses; [ beerware bsdOriginal mpl10 ];
};
passthru = {
diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix
index 018a57ad057..b5a01698e5e 100644
--- a/pkgs/development/libraries/pupnp/default.nix
+++ b/pkgs/development/libraries/pupnp/default.nix
@@ -2,14 +2,15 @@
stdenv.mkDerivation rec {
name = "libupnp-${version}";
- version = "1.8.3";
+ version = "1.8.4";
src = fetchFromGitHub {
owner = "mrjimenez";
repo = "pupnp";
rev = "release-${version}";
- sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl";
+ sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx";
};
+ outputs = [ "dev" "out" ];
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
new file mode 100644
index 00000000000..3a3d3e0277c
--- /dev/null
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }:
+
+stdenv.mkDerivation rec {
+ name = "qgnomeplatform-${version}";
+ version = "0.4";
+
+ src = fetchFromGitHub {
+ owner = "FedoraQt";
+ repo = "QGnomePlatform";
+ rev = version;
+ sha256 = "1403300d435g7ngcxsgnllhryk63nrhl1ahx16b28wkxnh2vi9ly";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+ qmake
+ ];
+
+ buildInputs = [
+ gtk3
+ qtbase
+ ];
+
+ postPatch = ''
+ # Fix plugin dir
+ substituteInPlace qgnomeplatform.pro \
+ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "QPlatformTheme for a better Qt application inclusion in GNOME";
+ homepage = https://github.com/FedoraQt/QGnomePlatform;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 29202396c05..a7077c69dd8 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake qt4 ];
- meta = {
- maintainers = [ ];
+ meta = with stdenv.lib; {
+ description = "Lightweight data-interchange format";
+ homepage = http://qjson.sourceforge.net/;
+ license = licenses.lgpl21;
inherit (qt4.meta) platforms;
};
}
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index d09c0d9a6ce..0d9ae21e87e 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ];
NIX_LDFLAGS = [ "-lqca-qt5" ];
- meta = {
+ meta = with stdenv.lib; {
description = "Qt library for OAuth authentication";
inherit (qt5.qtbase.meta) platforms;
- maintainers = [ ];
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 79deb482161..456c28503e8 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -14,14 +14,6 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib libjpeg ];
- patches = [
- (fetchpatch {
- name = "CVE-2018-9918.patch";
- url = "https://github.com/qpdf/qpdf/commit/b4d6cf6836ce025ba1811b7bbec52680c7204223";
- sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73";
- })
- ];
-
postPatch = ''
patchShebangs qpdf/fix-qdf
'';
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index c8b01c46080..85e45d3fad0 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation {
buildInputs = [ gfortran openblas ];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Library for fast updating of qr and cholesky decompositions";
+ homepage = https://sourceforge.net/projects/qrupdate/;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 0691f26b471..95b82f8f3cf 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -84,7 +84,8 @@ stdenv.mkDerivation {
passthru = {inherit mysqlSupport;};
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ license = with licenses; [ gpl2 qpl ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index f7ddf8ff780..8715aaaa44d 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
./parallel-configure.patch
./clang-5-darwin.patch
./qt-4.8.7-unixmake-darwin.patch
+ ./kill-legacy-darwin-apis.patch
(substituteAll {
src = ./dlopen-absolute-paths.diff;
cups = if cups != null then lib.getLib cups else null;
diff --git a/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch b/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
new file mode 100644
index 00000000000..c1338e98d85
--- /dev/null
+++ b/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch
@@ -0,0 +1,330 @@
+diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
+index 4a9049b..c0ac9db 100644
+--- a/src/corelib/io/qfilesystemengine_unix.cpp
++++ b/src/corelib/io/qfilesystemengine_unix.cpp
+@@ -242,9 +242,8 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
+ #else
+ char *ret = 0;
+ # if defined(Q_OS_MAC) && !defined(Q_OS_IOS)
+- // When using -mmacosx-version-min=10.4, we get the legacy realpath implementation,
+- // which does not work properly with the realpath(X,0) form. See QTBUG-28282.
+- if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6) {
++ // In Nix-on-Darwin, we don't support ancient macOS anyway, and the deleted branch relies on
++ // a symbol that's been deprecated for years and that our CF doesn't have
+ ret = (char*)malloc(PATH_MAX + 1);
+ if (ret && realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) {
+ const int savedErrno = errno; // errno is checked below, and free() might change it
+@@ -252,19 +251,6 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
+ errno = savedErrno;
+ ret = 0;
+ }
+- } else {
+- // on 10.5 we can use FSRef to resolve the file path.
+- QString path = QDir::cleanPath(entry.filePath());
+- FSRef fsref;
+- if (FSPathMakeRef((const UInt8 *)path.toUtf8().data(), &fsref, 0) == noErr) {
+- CFURLRef urlref = CFURLCreateFromFSRef(NULL, &fsref);
+- CFStringRef canonicalPath = CFURLCopyFileSystemPath(urlref, kCFURLPOSIXPathStyle);
+- QString ret = QCFString::toQString(canonicalPath);
+- CFRelease(canonicalPath);
+- CFRelease(urlref);
+- return QFileSystemEntry(ret);
+- }
+- }
+ # else
+ # if _POSIX_VERSION >= 200801L
+ ret = realpath(entry.nativeFilePath().constData(), (char*)0);
+diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
+index 3bf7342..b6bcfc0 100644
+--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
++++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
+@@ -43,7 +43,6 @@ BOOL stringIsCaseInsensitiveEqualToString(NSString *first, NSString *second);
+ BOOL hasCaseInsensitiveSuffix(NSString *string, NSString *suffix);
+ BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring);
+ NSString *filenameByFixingIllegalCharacters(NSString *string);
+-CFStringEncoding stringEncodingForResource(Handle resource);
+
+ #ifdef __cplusplus
+ }
+diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
+index d6c3f0c..c88ca76 100644
+--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
++++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
+@@ -68,45 +68,4 @@ BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring)
+ return filename;
+ }
+
+-CFStringEncoding stringEncodingForResource(Handle resource)
+-{
+- short resRef = HomeResFile(resource);
+- if (ResError() != noErr)
+- return NSMacOSRomanStringEncoding;
+-
+- // Get the FSRef for the current resource file
+- FSRef fref;
+- OSStatus error = FSGetForkCBInfo(resRef, 0, NULL, NULL, NULL, &fref, NULL);
+- if (error != noErr)
+- return NSMacOSRomanStringEncoding;
+-
+- RetainPtr url(AdoptCF, CFURLCreateFromFSRef(NULL, &fref));
+- if (!url)
+- return NSMacOSRomanStringEncoding;
+-
+- NSString *path = [(NSURL *)url.get() path];
+-
+- // Get the lproj directory name
+- path = [path stringByDeletingLastPathComponent];
+- if (!stringIsCaseInsensitiveEqualToString([path pathExtension], @"lproj"))
+- return NSMacOSRomanStringEncoding;
+-
+- NSString *directoryName = [[path stringByDeletingPathExtension] lastPathComponent];
+- RetainPtr locale(AdoptCF, CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, (CFStringRef)directoryName));
+- if (!locale)
+- return NSMacOSRomanStringEncoding;
+-
+- LangCode lang;
+- RegionCode region;
+- error = LocaleStringToLangAndRegionCodes([(NSString *)locale.get() UTF8String], &lang, ®ion);
+- if (error != noErr)
+- return NSMacOSRomanStringEncoding;
+-
+- TextEncoding encoding;
+- error = UpgradeScriptInfoToTextEncoding(kTextScriptDontCare, lang, region, NULL, &encoding);
+- if (error != noErr)
+- return NSMacOSRomanStringEncoding;
+-
+- return encoding;
+-}
+
+diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
+index 865ea32..20bda8d 100644
+--- a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
++++ b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp
+@@ -101,33 +101,6 @@ static WTF::RetainPtr readPListFile(CFStringRef fileName, bool
+ return map;
+ }
+
+-static Vector stringListFromResourceId(SInt16 id)
+-{
+- Vector list;
+-
+- Handle handle = Get1Resource('STR#', id);
+- if (!handle)
+- return list;
+-
+- CFStringEncoding encoding = stringEncodingForResource(handle);
+-
+- unsigned char* p = (unsigned char*)*handle;
+- if (!p)
+- return list;
+-
+- SInt16 count = *(SInt16*)p;
+- p += sizeof(SInt16);
+-
+- for (SInt16 i = 0; i < count; ++i) {
+- unsigned char length = *p;
+- WTF::RetainPtr str = CFStringCreateWithPascalString(0, p, encoding);
+- list.append(str.get());
+- p += 1 + length;
+- }
+-
+- return list;
+-}
+-
+ bool PluginPackage::fetchInfo()
+ {
+ if (!load())
+@@ -202,36 +175,8 @@ bool PluginPackage::fetchInfo()
+ m_description = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(m_module, CFSTR("WebPluginDescription"));
+
+ } else {
+- int resFile = CFBundleOpenBundleResourceMap(m_module);
+-
+- UseResFile(resFile);
+-
+- Vector mimes = stringListFromResourceId(MIMEListStringStringNumber);
+-
+- if (mimes.size() % 2 != 0)
+- return false;
+-
+- Vector descriptions = stringListFromResourceId(MIMEDescriptionStringNumber);
+- if (descriptions.size() != mimes.size() / 2)
+- return false;
+-
+- for (size_t i = 0; i < mimes.size(); i += 2) {
+- String mime = mimes[i].lower();
+- Vector extensions;
+- mimes[i + 1].lower().split(UChar(','), extensions);
+-
+- m_mimeToExtensions.set(mime, extensions);
+-
+- m_mimeToDescriptions.set(mime, descriptions[i / 2]);
+- }
+-
+- Vector names = stringListFromResourceId(PluginNameOrDescriptionStringNumber);
+- if (names.size() == 2) {
+- m_description = names[0];
+- m_name = names[1];
+- }
+-
+- CFBundleCloseBundleResourceMap(m_module, resFile);
++ LOG(Plugins, "Nix removed ancient code that relies on long-deprecated functionality that we don't want to support!");
++ return false;
+ }
+
+ LOG(Plugins, "PluginPackage::fetchInfo(): Found plug-in '%s'", m_name.utf8().data());
+diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
+index b206e48..669d442 100644
+--- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
++++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm
+@@ -26,7 +26,6 @@
+ #import "config.h"
+ #import "NetscapePluginModule.h"
+
+-#import
+ #import
+
+ using namespace WebCore;
+@@ -196,132 +195,6 @@ static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginInfo& plugi
+ return true;
+ }
+
+-class ResourceMap {
+-public:
+- explicit ResourceMap(CFBundleRef bundle)
+- : m_bundle(bundle)
+- , m_currentResourceFile(CurResFile())
+- , m_bundleResourceMap(CFBundleOpenBundleResourceMap(m_bundle))
+- {
+- UseResFile(m_bundleResourceMap);
+- }
+-
+- ~ResourceMap()
+- {
+- // Close the resource map.
+- CFBundleCloseBundleResourceMap(m_bundle, m_bundleResourceMap);
+-
+- // And restore the old resource.
+- UseResFile(m_currentResourceFile);
+- }
+-
+- bool isValid() const { return m_bundleResourceMap != -1; }
+-
+-private:
+- CFBundleRef m_bundle;
+- ResFileRefNum m_currentResourceFile;
+- ResFileRefNum m_bundleResourceMap;
+-};
+-
+-static bool getStringListResource(ResID resourceID, Vector& stringList) {
+- Handle stringListHandle = Get1Resource('STR#', resourceID);
+- if (!stringListHandle || !*stringListHandle)
+- return false;
+-
+- // Get the string list size.
+- Size stringListSize = GetHandleSize(stringListHandle);
+- if (stringListSize < static_cast(sizeof(UInt16)))
+- return false;
+-
+- CFStringEncoding stringEncoding = stringEncodingForResource(stringListHandle);
+-
+- unsigned char* ptr = reinterpret_cast(*stringListHandle);
+- unsigned char* end = ptr + stringListSize;
+-
+- // Get the number of strings in the string list.
+- UInt16 numStrings = *reinterpret_cast(ptr);
+- ptr += sizeof(UInt16);
+-
+- for (UInt16 i = 0; i < numStrings; ++i) {
+- // We're past the end of the string, bail.
+- if (ptr >= end)
+- return false;
+-
+- // Get the string length.
+- unsigned char stringLength = *ptr++;
+-
+- RetainPtr cfString(AdoptCF, CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, ptr, stringLength, stringEncoding, false, kCFAllocatorNull));
+- if (!cfString.get())
+- return false;
+-
+- stringList.append(cfString.get());
+- ptr += stringLength;
+- }
+-
+- if (ptr != end)
+- return false;
+-
+- return true;
+-}
+-
+-static const ResID PluginNameOrDescriptionStringNumber = 126;
+-static const ResID MIMEDescriptionStringNumber = 127;
+-static const ResID MIMEListStringStringNumber = 128;
+-
+-static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& pluginInfo)
+-{
+- ResourceMap resourceMap(bundle);
+- if (!resourceMap.isValid())
+- return false;
+-
+- // Get the description and name string list.
+- Vector descriptionAndName;
+- if (!getStringListResource(PluginNameOrDescriptionStringNumber, descriptionAndName))
+- return false;
+-
+- // Get the MIME types and extensions string list. This list needs to be a multiple of two.
+- Vector mimeTypesAndExtensions;
+- if (!getStringListResource(MIMEListStringStringNumber, mimeTypesAndExtensions))
+- return false;
+-
+- if (mimeTypesAndExtensions.size() % 2)
+- return false;
+-
+- // Now get the MIME type descriptions string list. This string list needs to be the same length as the number of MIME types.
+- Vector mimeTypeDescriptions;
+- if (!getStringListResource(MIMEDescriptionStringNumber, mimeTypeDescriptions))
+- return false;
+-
+- // Add all MIME types.
+- for (size_t i = 0; i < mimeTypesAndExtensions.size() / 2; ++i) {
+- MimeClassInfo mimeClassInfo;
+-
+- const String& mimeType = mimeTypesAndExtensions[i * 2];
+- String description;
+- if (i < mimeTypeDescriptions.size())
+- description = mimeTypeDescriptions[i];
+-
+- mimeClassInfo.type = mimeType.lower();
+- mimeClassInfo.desc = description;
+-
+- Vector extensions;
+- mimeTypesAndExtensions[i * 2 + 1].split(',', extensions);
+-
+- for (size_t i = 0; i < extensions.size(); ++i)
+- mimeClassInfo.extensions.append(extensions[i].lower());
+-
+- pluginInfo.mimes.append(mimeClassInfo);
+- }
+-
+- // Set the description and name if they exist.
+- if (descriptionAndName.size() > 0)
+- pluginInfo.desc = descriptionAndName[0];
+- if (descriptionAndName.size() > 1)
+- pluginInfo.name = descriptionAndName[1];
+-
+- return true;
+-}
+-
+ bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginInfoStore::Plugin& plugin)
+ {
+ RetainPtr bundlePath(AdoptCF, pluginPath.createCFString());
+@@ -344,8 +217,7 @@ static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& plu
+ return false;
+
+ // Check that there's valid info for this plug-in.
+- if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info) &&
+- !getPluginInfoFromCarbonResources(bundle.get(), plugin.info))
++ if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info))
+ return false;
+
+ plugin.path = pluginPath;
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix
index 2a706fc7b6e..d65fe9d219c 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -34,7 +34,18 @@ let
qtCompatVersion = "5.11";
mirror = "http://download.qt.io";
- srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
+ srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
+ # Community port of the now unmaintained upstream qtwebkit.
+ qtwebkit = {
+ src = fetchFromGitHub {
+ owner = "annulen";
+ repo = "webkit";
+ rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
+ sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
+ };
+ version = "5.212-alpha-01-26-2018";
+ };
+ };
patches = {
qtbase = [
@@ -102,15 +113,7 @@ let
qtwayland = callPackage ../modules/qtwayland.nix {};
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
qtwebengine = callPackage ../modules/qtwebengine.nix {};
- qtwebkit = callPackage ../modules/qtwebkit.nix {
- src = fetchFromGitHub {
- owner = "annulen";
- repo = "webkit";
- rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
- sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
- };
- version = "5.212-alpha-01-26-2018";
- };
+ qtwebkit = callPackage ../modules/qtwebkit.nix {};
qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
qtx11extras = callPackage ../modules/qtx11extras.nix {};
qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
diff --git a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
index 888f627baab..d0be6ae7769 100644
--- a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
@@ -3,5 +3,5 @@
qtModule {
name = "qtgraphicaleffects";
qtInputs = [ qtdeclarative ];
- outputs = [ "out" ];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index aae15c62d73..ad54a49e50b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -189,6 +189,7 @@ EOF
description = "A web engine based on the Chromium web browser";
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.unix;
+ broken = qt56; # 2018-09-13, no successful build since 2018-04-25
};
}
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 833433fabec..6b61359c8aa 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -1,12 +1,10 @@
{ qtModule, stdenv, lib, fetchurl
-, qtbase, qtdeclarative, qtlocation, qtsensors, qtwebchannel
+, qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel
, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
, sqlite, systemd, glib, gst_all_1, cmake
, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
, darwin
, flashplayerFix ? false
-, src ? null
-, version ? null
}:
let
@@ -25,7 +23,9 @@ let
in
qtModule {
name = "qtwebkit";
- qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ qtwebchannel ];
+ qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ]
+ ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia
+ ++ optional (lib.versionAtLeast qtbase.version "5.11.0") qtwebchannel;
buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ])
++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ];
@@ -35,9 +35,6 @@ qtModule {
cmakeFlags = optionals (lib.versionAtLeast qtbase.version "5.11.0") [ "-DPORT=Qt" ];
- inherit src;
- inherit version;
-
__impureHostDeps = optionals (stdenv.isDarwin) [
"/usr/lib/libicucore.dylib"
];
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index e18564aaabe..84a9d30918b 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -8,7 +8,7 @@ args:
let
inherit (args) name;
- version = if (args.version or null) == null then srcs."${name}".version else args.version;
+ version = args.version or srcs."${name}".version;
src = args.src or srcs."${name}".src;
in
diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix
index 5cf49450422..ae99035d226 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/pkgs/development/libraries/qt-mobility/default.nix
@@ -42,11 +42,12 @@ stdenv.mkDerivation rec {
buildInputs = [ qt4 libX11 bluez perl ];
- meta = {
+ meta = with stdenv.lib; {
description = "Qt Mobility";
homepage = http://qt.nokia.com/products/qt-addons/mobility;
- maintainers = with stdenv.lib.maintainers; [qknight];
- platforms = with stdenv.lib.platforms; linux;
+ maintainers = [ maintainers.qknight ];
+ platforms = platforms.linux;
+ license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ];
};
}
diff --git a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
new file mode 100644
index 00000000000..4cd7214e61e
--- /dev/null
+++ b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
@@ -0,0 +1,25 @@
+From f72e5b67ee1137a0ccd57db5d077a197b01b3cdc Mon Sep 17 00:00:00 2001
+From: Samuel Dionne-Riel
+Date: Tue, 4 Sep 2018 23:19:29 -0400
+Subject: [PATCH] Fixes build with Qt4.
+
+---
+ keychain_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keychain_unix.cpp b/keychain_unix.cpp
+index 30b26c3..b27ebef 100644
+--- a/keychain_unix.cpp
++++ b/keychain_unix.cpp
+@@ -91,7 +91,7 @@ static bool isKwallet5Available()
+ // a wallet can be opened.
+
+ iface.setTimeout(500);
+- QDBusMessage reply = iface.call(QStringLiteral("networkWallet"));
++ QDBusMessage reply = iface.call("networkWallet");
+ return reply.type() == QDBusMessage::ReplyMessage;
+ }
+
+--
+2.16.4
+
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 220c6241096..2b3c88d5886 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
};
+ patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ];
+
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
++ stdenv.lib.optional stdenv.isDarwin [
# correctly detect the compiler
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index 040072cb463..88591e880de 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation {
description = "QtScript bindings generator";
homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/;
inherit (qt4.meta) platforms;
- maintainers = [ ];
+ license = stdenv.lib.licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index cd981f8947a..7fe4b504a99 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "range-v3-${version}";
- version = "0.3.6";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "ericniebler";
repo = "range-v3";
rev = version;
- sha256 = "050h9pa57kd57l73njxpjb331snybddl29x2vpy5ycygvqiw8kcp";
+ sha256 = "1s5gj799aa94nfg3r24whq7ck69g0zypf70w14wx64pgwg0424vf";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix
new file mode 100644
index 00000000000..9d8ce8cef20
--- /dev/null
+++ b/pkgs/development/libraries/rapidcheck/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, cmake, fetchFromGitHub }:
+
+stdenv.mkDerivation rec{
+ name = "rapidcheck-${version}";
+ version = "unstable-2018-09-27";
+
+ src = fetchFromGitHub {
+ owner = "emil-e";
+ repo = "rapidcheck";
+ rev = "de54478fa35c0d9cea14ec0c5c9dfae906da524c";
+ sha256 = "0n8l0mlq9xqmpkgcj5xicicd1my2cfwxg25zdy8347dqkl1ppgbs";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ postInstall = ''
+ cp ../extras/boost_test/include/rapidcheck/boost_test.h $out/include/rapidcheck
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A C++ framework for property based testing inspired by QuickCheck";
+ inherit (src.meta) homepage;
+ maintainers = with maintainers; [ jb55 ];
+ license = licenses.bsd2;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix
index 4446226fede..bd79e3628a1 100644
--- a/pkgs/development/libraries/rarian/default.nix
+++ b/pkgs/development/libraries/rarian/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
+{stdenv, fetchurl, pkgconfig, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}:
let
pname = "rarian";
version = "0.8.1";
@@ -6,12 +6,13 @@ in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.gz";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.gz";
sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ perl perlXMLParser libxml2 libxslt];
+ buildInputs = [ libxml2 libxslt ]
+ ++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ];
passthru = {
diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix
index 9e7c5c1d4e3..84062408d45 100644
--- a/pkgs/development/libraries/readline/5.x.nix
+++ b/pkgs/development/libraries/readline/5.x.nix
@@ -11,8 +11,10 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ncurses];
patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch;
- meta = {
+
+ meta = with stdenv.lib; {
branch = "5";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.gpl2;
};
}
diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix
index f96addffb1a..f8268b5eb7c 100644
--- a/pkgs/development/libraries/rlog/default.nix
+++ b/pkgs/development/libraries/rlog/default.nix
@@ -12,5 +12,6 @@ stdenv.mkDerivation {
homepage = http://www.arg0.net/rlog;
description = "A C++ logging library used in encfs";
platforms = stdenv.lib.platforms.linux;
+ license = stdenv.lib.licenses.lgpl3;
};
}
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index 0dc9c1afd2b..b9830b65ffb 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libsndfile }:
stdenv.mkDerivation rec {
- name = "sbc-1.3";
+ name = "sbc-1.4";
src = fetchurl {
url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz";
- sha256 = "02ckd2z51z0h85qgv7x8vv8ybp5czm9if1z78411j53gaz7j4476";
+ sha256 = "1jal98pnrjkzxlkiqy0ykh4qmgnydz9bmsp1jn581p5kddpg92si";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix
new file mode 100644
index 00000000000..f727728943b
--- /dev/null
+++ b/pkgs/development/libraries/science/benchmark/papi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+ version = "5.6.0";
+ name = "papi-${version}";
+
+ src = fetchurl {
+ url = "https://bitbucket.org/icl/papi/get/papi-5-6-0-t.tar.gz";
+ sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r";
+ };
+
+ buildInputs = [ stdenv ];
+
+ preConfigure = ''
+ cd src
+ '';
+
+ doCheck = true;
+ checkTarget = "test";
+
+ meta = with stdenv.lib; {
+ homepage = https://icl.utk.edu/papi/;
+ description = "PAPI provides the tool designer and application engineer with a consistent interface and methodology for use of the performance counter hardware found in most major microprocessors";
+ license = licenses.bsdOriginal;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 48548bd7265..2ee9144b316 100644
--- a/pkgs/development/libraries/science/biology/htslib/default.nix
+++ b/pkgs/development/libraries/science/biology/htslib/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "htslib";
- version = "1.7";
+ version = "1.9";
src = fetchurl {
url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2";
- sha256 = "be3d4e25c256acdd41bebb8a7ad55e89bb18e2fc7fc336124b1e2c82ae8886c6";
+ sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0";
};
# perl is only used during the check phase.
diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
new file mode 100644
index 00000000000..4668839ebb9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ name = "QuadProgpp-${version}";
+ version = "4b6bd65f09fbff99c172a86d6e96ca74449b323f";
+
+ src = fetchFromGitHub {
+ owner = "liuq";
+ repo = "QuadProgpp";
+ rev = version;
+ sha256 = "02r0dlk2yjpafknvm945vbgs4sl26w2i1gw3pllar9hi364y8hnx";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/liuq/QuadProgpp;
+ license = licenses.mit;
+ description = ''
+ A C++ library for Quadratic Programming which implements the
+ Goldfarb-Idnani active-set dual method.
+ '';
+ maintainers = with maintainers; [ fuuzetsu ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 55c1a641fc3..2a6c4af43fc 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -4,14 +4,14 @@
with stdenv.lib;
let
- version = "3.5.0";
+ version = "3.6.3";
in
stdenv.mkDerivation {
name = "arpack-${version}";
src = fetchurl {
url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz";
- sha256 = "0f8jx3fifmj9qdp289zr7r651y1q48k1jya859rqxq62mvis7xsh";
+ sha256 = "0lzlcsrjsi36pv5bnipwjnyg2fx3nrv31bw2klwrg11gb8g5bwv4";
};
nativeBuildInputs = [ autoconf automake gettext libtool ];
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 8b740bdb6f6..fb90ed754da 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -110,6 +110,7 @@ stdenv.mkDerivation {
homepage = http://math-atlas.sourceforge.net/;
description = "Automatically Tuned Linear Algebra Software (ATLAS)";
license = stdenv.lib.licenses.bsd3;
+ broken = stdenv.isDarwin; # test when updating to >=3.10.3
platforms = stdenv.lib.platforms.unix;
longDescription = ''
diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
new file mode 100644
index 00000000000..537fcb93a87
--- /dev/null
+++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, gfortran, suitesparse, openblas }:
+let
+ suitesparse_ = suitesparse;
+in let
+ # SuiteSparse must use the same openblas
+ suitesparse = suitesparse_.override { inherit openblas; };
+in stdenv.mkDerivation rec {
+
+ name = "${pname}-${version}";
+ pname = "cholmod-extra";
+ version = "1.2.0";
+
+ src = fetchFromGitHub {
+ repo = pname;
+ owner = "jluttine";
+ rev = version;
+ sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg";
+ };
+
+ buildInputs = [ suitesparse gfortran openblas ];
+
+ buildFlags = [
+ "BLAS=-lopenblas"
+ ];
+
+ installFlags = [
+ "INSTALL_LIB=$(out)/lib"
+ "INSTALL_INCLUDE=$(out)/include"
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/jluttine/cholmod-extra;
+ description = "A set of additional routines for SuiteSparse CHOLMOD Module";
+ license = with licenses; [ gpl2Plus ];
+ maintainers = with maintainers; [ jluttine ];
+ platforms = with platforms; unix;
+ };
+
+}
diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index c89e9e4296c..b41469c215e 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -1,13 +1,11 @@
-{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9 }:
+{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0 }:
let
generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
inherit (args) cudatoolkit;
};
-in
-
-{
+in rec {
cudnn_cudatoolkit_7 = generic rec {
# Old URL is v4 instead of v4.0 for some reason...
version = "4";
@@ -38,16 +36,34 @@ in
};
cudnn_cudatoolkit_9_0 = generic rec {
- version = "7.0.5";
+ version = "7.3.0";
cudatoolkit = cudatoolkit_9_0;
- srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
- sha256 = "03mbv4m5lhwnc181xz8li067pjzzhxqbxgnrfc68dffm8xj0fghs";
+ srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.0.29.tgz";
+ sha256 = "16z4vgbcmbayk4hppz0xshgs3g07blkp4j25cxcjqyrczx1r0gs0";
};
- cudnn_cudatoolkit_9 = generic rec {
- version = "7.0.5";
- cudatoolkit = cudatoolkit_9;
- srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
- sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y";
+ cudnn_cudatoolkit_9_1 = generic rec {
+ version = "7.1.3";
+ cudatoolkit = cudatoolkit_9_1;
+ srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.1.tgz";
+ sha256 = "0a0237gpr0p63s92njai0xvxmkbailzgfsvh7n9fnz0njhvnsqfx";
};
+
+ cudnn_cudatoolkit_9_2 = generic rec {
+ version = "7.2.1";
+ cudatoolkit = cudatoolkit_9_2;
+ srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.2.1.38.tgz";
+ sha256 = "1sf215wm6zgr17gs6sxfhw61b7a0qmcxiwhgy1b4nqdyxpqgay1y";
+ };
+
+ cudnn_cudatoolkit_9 = cudnn_cudatoolkit_9_2;
+
+ cudnn_cudatoolkit_10_0 = generic rec {
+ version = "7.3.1";
+ cudatoolkit = cudatoolkit_10_0;
+ srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.3.1.20.tgz";
+ sha256 = "1yp35mng4ym40g5rqp63dcpa6jg4q1pnjkspnhlakzzdy8is65af";
+ };
+
+ cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_0;
}
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 4a6aabb447f..7e58a4c7c98 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ipopt-${version}";
- version = "3.12.10";
+ version = "3.12.11";
src = fetchurl {
url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
- sha256 = "004pd90knnnzcx727knb7ffkabb1ggbskb8s607bfvfgdd7wlli9";
+ sha256 = "1qihlwwqsqpbwpp6zqfa7nrmb55dndppzmdy98897aiknaa2650h";
};
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];
diff --git a/pkgs/development/libraries/science/math/lrs/default.nix b/pkgs/development/libraries/science/math/lrs/default.nix
new file mode 100644
index 00000000000..3cf5c3619a9
--- /dev/null
+++ b/pkgs/development/libraries/science/math/lrs/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, gmp}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "lrs";
+ version = "7.0";
+
+ src = fetchurl {
+ url = "http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/lrslib-070.tar.gz";
+ sha256 = "1zjdmkjracz695k73c2pvipc0skpyn1wzagkhilsvcw9pqljpwg9";
+ };
+
+ buildInputs = [ gmp ];
+
+ preBuild = ''
+ export makeFlags="$makeFlags prefix=$out";
+ '';
+
+ meta = {
+ inherit version;
+ description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems";
+ license = stdenv.lib.licenses.gpl2 ;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "http://cgm.cs.mcgill.ca/~avis/C/lrs.html";
+ };
+}
diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
new file mode 100644
index 00000000000..37814047f97
--- /dev/null
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -0,0 +1,85 @@
+{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg }:
+/*
+ Some (but not all) mkl functions require openmp, but Intel does not add these
+ to SO_NEEDED and instructs users to put openmp on their LD_LIBRARY_PATH. If
+ you are using mkl and your library/application is using some of the functions
+ that require openmp, add a setupHook like this to your package:
+
+ setupHook = writeText "setup-hook.sh" ''
+ addOpenmp() {
+ addToSearchPath LD_LIBRARY_PATH ${openmp}/lib
+ }
+ addEnvHooks "$targetOffset" addOpenmp
+ '';
+
+ We do not add the setup hook here, because avoiding it allows this large
+ package to be a fixed-output derivation with better cache efficiency.
+ */
+
+stdenvNoCC.mkDerivation rec {
+ name = "mkl-${version}";
+ version = "${date}.${rel}";
+ date = "2019.0";
+ rel = "117";
+
+ src = if stdenvNoCC.isDarwin
+ then
+ (fetchurl {
+ url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13565/m_mkl_${version}.dmg";
+ sha256 = "1f1jppac7vqwn00hkws0p4njx38ajh0n25bsjyb5d7jcacwfvm02";
+ })
+ else
+ (fetchurl {
+ url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_${version}.tgz";
+ sha256 = "1bf7i54iqlf7x7fn8kqwmi06g30sxr6nq3ac0r871i6g0p3y47sf";
+ });
+
+ buildInputs = if stdenvNoCC.isDarwin then [ undmg ] else [ rpmextract ];
+
+ buildPhase = if stdenvNoCC.isDarwin then ''
+ for f in Contents/Resources/pkg/*.tgz; do
+ tar xzvf $f
+ done
+ '' else ''
+ rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm
+ rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm
+ '';
+
+ installPhase = if stdenvNoCC.isDarwin then ''
+ mkdir -p $out/lib
+ cp -r compilers_and_libraries_${version}/mac/mkl/include $out/
+ cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $out/lib/
+ cp -r compilers_and_libraries_${version}/licensing/mkl/en/license.txt $out/lib/
+ '' else ''
+ mkdir -p $out/lib
+ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/
+ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/
+ cp license.txt $out/lib/
+ '';
+
+ # Per license agreement, do not modify the binary
+ dontStrip = true;
+ dontPatchELF = true;
+
+ # Since these are unmodified binaries from Intel, they do not depend on stdenv
+ # and we can make them fixed-output derivations for cache efficiency.
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = if stdenvNoCC.isDarwin
+ then "1224dln7n8px1rk8biiggf77wjhxh8mzw0hd8zlyjm8i6j8w7i12"
+ else "0d8ai0wi8drp071acqkm1wv6vyg12010y843y56zzi1pql81xqvx";
+
+ meta = with stdenvNoCC.lib; {
+ description = "Intel Math Kernel Library";
+ longDescription = ''
+ Intel Math Kernel Library (Intel MKL) optimizes code with minimal effort
+ for future generations of Intel processors. It is compatible with your
+ choice of compilers, languages, operating systems, and linking and
+ threading models.
+ '';
+ homepage = https://software.intel.com/en-us/mkl;
+ license = [ licenses.issl licenses.unfreeRedistributable ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ maintainers = [ maintainers.bhipple ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 3f271d01502..b050a19db37 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -60,7 +60,7 @@ let
TARGET = "ATHLON";
DYNAMIC_ARCH = "1";
CC = "gcc";
- USE_OPENMP = if stdenv.hostPlatform.isMusl then "0" else "1";
+ USE_OPENMP = "1";
};
};
in
@@ -79,12 +79,12 @@ let
in
stdenv.mkDerivation rec {
name = "openblas-${version}";
- version = "0.3.1";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "xianyi";
repo = "OpenBLAS";
rev = "v${version}";
- sha256 = "1dkwp4gz1hzpmhzks9y9ipb4c5h0r6c7yff62x3s8x9z6f8knaqc";
+ sha256 = "0cpkvfvc14xm9mifrm919rp8vrq70gpl7r2sww4f0izrl39wklwx";
};
inherit blas64;
@@ -118,20 +118,7 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
++ mapAttrsToList (var: val: var + "=" + val) config;
- patches = [
- # Backport of https://github.com/xianyi/OpenBLAS/pull/1667, which
- # is causing problems and was already accepted upstream.
- (fetchpatch {
- url = "https://github.com/xianyi/OpenBLAS/commit/5f2a3c05cd0e3872be3c5686b9da6b627658eeb7.patch";
- sha256 = "1qvxhk92likrshw6z6hjqxvkblwzgsbzis2b2f71bsvx9174qfk1";
- })
- # Double "MAX_ALLOCATING_THREADS", fix with Go and Octave
- # https://github.com/xianyi/OpenBLAS/pull/1663 (see also linked issue)
- (fetchpatch {
- url = "https://github.com/xianyi/OpenBLAS/commit/a49203b48c4a3d6f86413fc8c4b1fbfaa1946463.patch";
- sha256 = "0v6kjkbgbw7hli6xkism48wqpkypxmcqvxpx564snll049l2xzq2";
- })
- ];
+ patches = [];
doCheck = true;
checkTarget = "tests";
@@ -140,7 +127,7 @@ stdenv.mkDerivation rec {
# Write pkgconfig aliases. Upstream report:
# https://github.com/xianyi/OpenBLAS/issues/1740
for alias in blas cblas lapack; do
- cat < $out/lib/pkgconfig/openblas-$alias.pc
+ cat < $out/lib/pkgconfig/$alias.pc
Name: $alias
Version: ${version}
Description: $alias provided by the OpenBLAS package.
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
new file mode 100644
index 00000000000..5294c779a32
--- /dev/null
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchFromGitHub, cmake, google-gflags, which
+, lsb-release, glog, protobuf, cbc, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "or-tools-${version}";
+ version = "v6.9.1";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "or-tools";
+ rev = version;
+ sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c";
+ };
+
+ # The original build system uses cmake which does things like pull
+ # in dependencies through git and Makefile creation time. We
+ # obviously don't want to do this so instead we provide the
+ # dependencies straight from nixpkgs and use the make build method.
+ configurePhase = ''
+ cat < Makefile.local
+ UNIX_GFLAGS_DIR=${google-gflags}
+ UNIX_GLOG_DIR=${glog}
+ UNIX_PROTOBUF_DIR=${protobuf}
+ UNIX_CBC_DIR=${cbc}
+ EOF
+ '';
+
+ buildPhase = ''
+ make cc
+ '';
+
+ installPhase = ''
+ make install_cc prefix=$out
+ '';
+
+ patches = [
+ # In "expected" way of compilation, the glog package is compiled
+ # with gflags support which then makes gflags header transitively
+ # included through glog. However in nixpkgs we don't compile glog
+ # with gflags so we have to include it ourselves. Upstream should
+ # always include gflags to support both ways I think.
+ #
+ # Upstream ticket: https://github.com/google/or-tools/issues/902
+ ./gflags-include.patch
+ ];
+
+ nativeBuildInputs = [
+ cmake lsb-release which zlib
+ ];
+ propagatedBuildInputs = [
+ google-gflags glog protobuf cbc
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/google/or-tools;
+ license = licenses.asl20;
+ description = ''
+ Google's software suite for combinatorial optimization.
+ '';
+ maintainers = with maintainers; [ fuuzetsu ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/development/libraries/science/math/or-tools/gflags-include.patch b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch
new file mode 100644
index 00000000000..08f76180638
--- /dev/null
+++ b/pkgs/development/libraries/science/math/or-tools/gflags-include.patch
@@ -0,0 +1,12 @@
+diff --git a/ortools/data/jobshop_scheduling_parser.cc b/ortools/data/jobshop_scheduling_parser.cc
+index cb0a360b..c2f055eb 100644
+--- a/ortools/data/jobshop_scheduling_parser.cc
++++ b/ortools/data/jobshop_scheduling_parser.cc
+@@ -14,6 +14,7 @@
+ #include "ortools/data/jobshop_scheduling_parser.h"
+
+ #include
++#include
+
+ #include "google/protobuf/wrappers.pb.h"
+ #include "ortools/base/filelineiter.h"
diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix
new file mode 100644
index 00000000000..ca35ce2f413
--- /dev/null
+++ b/pkgs/development/libraries/science/math/parmetis/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchurl
+, cmake
+, mpi
+}:
+
+stdenv.mkDerivation rec {
+ name = "parmetis-${version}";
+ version = "4.0.3";
+
+ src = fetchurl {
+ url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-${version}.tar.gz";
+ sha256 = "0pvfpvb36djvqlcc3lq7si0c5xpb2cqndjg8wvzg35ygnwqs5ngj";
+ };
+
+ buildInputs = [ cmake mpi ];
+
+ # metis and GKlib are packaged with distribution
+ # AUR https://aur.archlinux.org/packages/parmetis/ has reported that
+ # it easier to build with the included packages as opposed to using the metis
+ # package. Compilation time is short.
+ configurePhase = ''
+ make config metis_path=$PWD/metis gklib_path=$PWD/metis/GKlib prefix=$out
+ '';
+
+ meta = with stdenv.lib; {
+ description = "ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs, meshes, and for computing fill-reducing orderings of sparse matrices";
+ homepage = http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview;
+ platforms = platforms.all;
+ license = licenses.unfree;
+ maintainers = [ maintainers.costrouc ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
new file mode 100644
index 00000000000..83e177c66c1
--- /dev/null
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, fetchurl
+, gfortran
+, cmake
+, blas
+, liblapack
+, mpi
+}:
+
+stdenv.mkDerivation rec {
+ name = "scalapack-${version}";
+ version = "2.0.2";
+
+ src = fetchurl {
+ url = "http://www.netlib.org/scalapack/scalapack-${version}.tgz";
+ sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c";
+ };
+
+ buildInputs = [ cmake mpi liblapack blas gfortran ];
+
+ meta = with stdenv.lib; {
+ homepage = http://www.netlib.org/scalapack/;
+ description = "Library of high-performance linear algebra routines for parallel distributed memory machines";
+ license = licenses.bsdOriginal;
+ platforms = platforms.all;
+ maintainers = [ maintainers.costrouc ];
+ };
+
+}
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix
index 0539083e823..f9d1a84b1f0 100644
--- a/pkgs/development/libraries/science/math/scs/default.nix
+++ b/pkgs/development/libraries/science/math/scs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, blas, liblapack, gfortran }:
+{ stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
name = "scs-${version}";
@@ -11,24 +11,30 @@ stdenv.mkDerivation rec {
sha256 = "17lbcmcsniqlyzgbzmjipfd0rrk25a8hzh7l5wl2wp1iwsd8c3a9";
};
- buildInputs = [ blas liblapack gfortran.cc.lib ];
-
# Actually link and add libgfortran to the rpath
- patchPhase = ''
- sed -i 's/#-lgfortran/-lgfortran/' scs.mk
+ postPatch = ''
+ substituteInPlace scs.mk \
+ --replace "#-lgfortran" "-lgfortran" \
+ --replace "gcc" "cc"
'';
+ nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ buildInputs = [ blas liblapack gfortran.cc.lib ];
+
doCheck = true;
- # Test demo requires passing any int as $1; 42 chosen arbitrarily
- checkPhase = ''
- ./out/demo_socp_indirect 42
+ # Test demo requires passing data and seed; numbers chosen arbitrarily.
+ postCheck = ''
+ ./out/demo_socp_indirect 42 0.42 0.42 42
'';
installPhase = ''
+ runHook preInstall
mkdir -p $out/lib
cp -r include $out/
- cp out/*.a out/*.so $out/lib/
+ cp out/*.a out/*.so out/*.dylib $out/lib/
+ runHook postInstall
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix
new file mode 100644
index 00000000000..1ce56d1e49f
--- /dev/null
+++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix
@@ -0,0 +1,100 @@
+{ stdenv, fetchurl, gfortran, openblas
+, enableCuda ? false, cudatoolkit
+}:
+
+let
+ version = "4.4.4";
+ name = "suitesparse-${version}";
+
+ int_t = if openblas.blas64 then "int64_t" else "int32_t";
+ SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
+in
+stdenv.mkDerivation {
+ inherit name;
+
+ src = fetchurl {
+ url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
+ sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj";
+ };
+
+ preConfigure = ''
+ mkdir -p $out/lib
+ mkdir -p $out/include
+
+ sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+ -e 's/METIS .*$/METIS =/' \
+ -e 's/METIS_PATH .*$/METIS_PATH =/' \
+ -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
+ -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
+ ''
+ + stdenv.lib.optionalString stdenv.isDarwin ''
+ sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+ -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/'
+ ''
+ + stdenv.lib.optionalString enableCuda ''
+ sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+ -e 's|^[[:space:]]*\(CUDA_ROOT =\)|CUDA_ROOT = ${cudatoolkit}|' \
+ -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \
+ -e 's|^[[:space:]]*\(GPU_CONFIG =\)|GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=$(NIX_BUILD_CORES) |' \
+ -e 's|^[[:space:]]*\(CUDA_PATH =\)|CUDA_PATH = $(CUDA_ROOT)|' \
+ -e 's|^[[:space:]]*\(CUDART_LIB =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \
+ -e 's|^[[:space:]]*\(CUBLAS_LIB =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \
+ -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \
+ -e 's|^[[:space:]]*\(NV20 =\)|NV20 = -arch=sm_20 -Xcompiler -fPIC|' \
+ -e 's|^[[:space:]]*\(NV30 =\)|NV30 = -arch=sm_30 -Xcompiler -fPIC|' \
+ -e 's|^[[:space:]]*\(NV35 =\)|NV35 = -arch=sm_35 -Xcompiler -fPIC|' \
+ -e 's|^[[:space:]]*\(NVCC =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \
+ -e 's|^[[:space:]]*\(NVCCFLAGS =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
+ '';
+
+ makeFlags = [
+ "PREFIX=\"$(out)\""
+ "INSTALL_LIB=$(out)/lib"
+ "INSTALL_INCLUDE=$(out)/include"
+ "BLAS=-lopenblas"
+ "LAPACK="
+ ];
+
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
+
+ postInstall = ''
+ # Build and install shared library
+ (
+ cd "$(mktemp -d)"
+ for i in "$out"/lib/lib*.a; do
+ ar -x $i
+ done
+ ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"}
+ )
+ for i in umfpack cholmod amd camd colamd spqr; do
+ ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT}
+ done
+
+ # Install documentation
+ outdoc=$out/share/doc/${name}
+ mkdir -p $outdoc
+ cp -r AMD/Doc $outdoc/amd
+ cp -r BTF/Doc $outdoc/bft
+ cp -r CAMD/Doc $outdoc/camd
+ cp -r CCOLAMD/Doc $outdoc/ccolamd
+ cp -r CHOLMOD/Doc $outdoc/cholmod
+ cp -r COLAMD/Doc $outdoc/colamd
+ cp -r CXSparse/Doc $outdoc/cxsparse
+ cp -r KLU/Doc $outdoc/klu
+ cp -r LDL/Doc $outdoc/ldl
+ cp -r RBio/Doc $outdoc/rbio
+ cp -r SPQR/Doc $outdoc/spqr
+ cp -r UMFPACK/Doc $outdoc/umfpack
+ '';
+
+ nativeBuildInputs = [ gfortran ];
+ buildInputs = [ openblas ];
+
+ meta = with stdenv.lib; {
+ homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
+ description = "A suite of sparse matrix algorithms";
+ license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
+ maintainers = with maintainers; [ ttuegel ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 1ce56d1e49f..644b3545916 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,31 +1,32 @@
-{ stdenv, fetchurl, gfortran, openblas
+{ stdenv, fetchurl, gfortran, openblas, cmake
, enableCuda ? false, cudatoolkit
}:
let
- version = "4.4.4";
+ version = "5.3.0";
name = "suitesparse-${version}";
- int_t = if openblas.blas64 then "int64_t" else "int32_t";
SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
inherit name;
src = fetchurl {
url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
- sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj";
+ sha256 = "0gcn1xj3z87wpp26gxn11k8073bxv6jswfd8jmddlm64v09rgrlh";
};
+ dontUseCmakeConfigure = true;
+
preConfigure = ''
mkdir -p $out/lib
mkdir -p $out/include
+ mkdir -p $out/share/doc/${name}
sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
-e 's/METIS .*$/METIS =/' \
-e 's/METIS_PATH .*$/METIS_PATH =/' \
- -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
- -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
+ -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION/'
''
+ stdenv.lib.optionalString stdenv.isDarwin ''
sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
@@ -47,48 +48,56 @@ stdenv.mkDerivation {
-e 's|^[[:space:]]*\(NVCCFLAGS =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
'';
- makeFlags = [
- "PREFIX=\"$(out)\""
- "INSTALL_LIB=$(out)/lib"
- "INSTALL_INCLUDE=$(out)/include"
- "BLAS=-lopenblas"
- "LAPACK="
- ];
-
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
- postInstall = ''
- # Build and install shared library
+ buildPhase = ''
+ runHook preBuild
+
+ # Build individual shared libraries
+ make library \
+ BLAS=-lopenblas \
+ LAPACK="" \
+ ${stdenv.lib.optionalString openblas.blas64 "CFLAGS=-DBLAS64"}
+
+ # Build libsuitesparse.so which bundles all the individual libraries.
+ # Bundling is done by building the static libraries, extracting objects from
+ # them and combining the objects into one shared library.
+ mkdir -p static
+ make static AR_TARGET=$(pwd)/static/'$(LIBRARY).a'
(
- cd "$(mktemp -d)"
- for i in "$out"/lib/lib*.a; do
+ cd static
+ for i in lib*.a; do
ar -x $i
done
- ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"}
)
- for i in umfpack cholmod amd camd colamd spqr; do
- ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT}
- done
-
- # Install documentation
- outdoc=$out/share/doc/${name}
- mkdir -p $outdoc
- cp -r AMD/Doc $outdoc/amd
- cp -r BTF/Doc $outdoc/bft
- cp -r CAMD/Doc $outdoc/camd
- cp -r CCOLAMD/Doc $outdoc/ccolamd
- cp -r CHOLMOD/Doc $outdoc/cholmod
- cp -r COLAMD/Doc $outdoc/colamd
- cp -r CXSparse/Doc $outdoc/cxsparse
- cp -r KLU/Doc $outdoc/klu
- cp -r LDL/Doc $outdoc/ldl
- cp -r RBio/Doc $outdoc/rbio
- cp -r SPQR/Doc $outdoc/spqr
- cp -r UMFPACK/Doc $outdoc/umfpack
+ ${if enableCuda then "${cudatoolkit}/bin/nvcc" else "${stdenv.cc.outPath}/bin/cc"} \
+ static/*.o \
+ ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} \
+ -o "lib/libsuitesparse${SHLIB_EXT}" \
+ -lopenblas \
+ ${stdenv.lib.optionalString enableCuda "-lcublas"}
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out
+ cp -r lib $out/
+ cp -r include $out/
+ cp -r share $out/
+
+ # Fix rpaths
+ cd $out
+ find -name \*.so\* -type f -exec \
+ patchelf --set-rpath "$out/lib:${stdenv.lib.makeLibraryPath buildInputs}" {} \;
+
+ runHook postInstall
'';
- nativeBuildInputs = [ gfortran ];
- buildInputs = [ openblas ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ openblas gfortran.cc.lib ] ++ stdenv.lib.optionals enableCuda [cudatoolkit];
meta = with stdenv.lib; {
homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix
index 19d63d89834..ad4d4c01737 100644
--- a/pkgs/development/libraries/science/math/zn_poly/default.nix
+++ b/pkgs/development/libraries/science/math/zn_poly/default.nix
@@ -1,17 +1,25 @@
{ stdenv
-, fetchurl
+, lib
+, fetchFromGitLab
+, fetchpatch
, gmp
, python2
+, tune ? false # tune to hardware, impure
}:
stdenv.mkDerivation rec {
- version = "0.9";
+ version = "0.9.1";
pname = "zn_poly";
name = "${pname}-${version}";
- src = fetchurl {
- url = "http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/releases/zn_poly-${version}.tar.gz";
- sha256 = "1kxl25av7i3v68k32hw5bayrfcvmahmqvs97mlh9g238gj4qb851";
+ # sage has picked up the maintenance (bug fixes and building, not development)
+ # from the original, now unmaintained project which can be found at
+ # http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/
+ src = fetchFromGitLab {
+ owner = "sagemath";
+ repo = "zn_poly";
+ rev = version;
+ sha256 = "0ra5vy585bqq7g3317iw6fp44iqgqvds3j0l1va6mswimypq4vxb";
};
buildInputs = [
@@ -22,27 +30,42 @@ stdenv.mkDerivation rec {
python2 # needed by ./configure to create the makefile
];
- libname = "libzn_poly${stdenv.targetPlatform.extensions.sharedLibrary}";
+ # name of library file ("libzn_poly.so")
+ libbasename = "libzn_poly";
+ libext = "${stdenv.targetPlatform.extensions.sharedLibrary}";
makeFlags = [ "CC=cc" ];
# Tuning (either autotuning or with hand-written paramters) is possible
# but not implemented here.
# It seems buggy anyways (see homepage).
- buildFlags = [ "all" libname ];
+ buildFlags = [ "all" "${libbasename}${libext}" ];
+ configureFlags = lib.optionals (!tune) [
+ "--disable-tuning"
+ ];
+
+ patches = [
+ # fix format-security by not passing variables directly to printf
+ # https://gitlab.com/sagemath/zn_poly/merge_requests/1
+ (fetchpatch {
+ name = "format-security.patch";
+ url = "https://gitlab.com/timokau/zn_poly/commit/1950900a80ec898d342b8bcafa148c8027649766.patch";
+ sha256 = "1gks9chvsfpc6sg5h3nqqfia4cgvph7jmj9dw67k7dk7kv9y0rk1";
+ })
+ ];
# `make install` fails to install some header files and the lib file.
installPhase = ''
mkdir -p "$out/include/zn_poly"
mkdir -p "$out/lib"
- cp "${libname}" "$out/lib"
+ cp "${libbasename}"*"${libext}" "$out/lib"
cp include/*.h "$out/include/zn_poly"
'';
doCheck = true;
- meta = with stdenv.lib; {
+ meta = with lib; {
homepage = http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/;
description = "Polynomial arithmetic over Z/nZ";
license = with licenses; [ gpl3 ];
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index b305fecc393..c9c26ca0d66 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
})
else throw "Architecture not supported";
- buildInputs = [ patchelf ];
+ nativeBuildInputs = [ patchelf ];
installPhase = ''
RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 03a801a3240..37ef0ce7527 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
+{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
, glew, libXrandr, libXrender, udev, xcbutilimage
, IOKit, Foundation, AppKit, OpenAL
}:
let
- version = "2.5.0";
+ version = "2.5.1";
in
stdenv.mkDerivation rec {
name = "sfml-${version}";
- src = fetchurl {
+
+ src = fetchzip {
url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
- sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab";
+ sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay";
};
- buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
libXrandr libXrender xcbutilimage
] ++ stdenv.lib.optional stdenv.isLinux udev
++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
+
cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
"-DSFML_MISC_INSTALL_PREFIX=share/SFML"
"-DSFML_BUILD_FRAMEWORKS=no"
"-DSFML_USE_SYSTEM_DEPS=yes" ];
+
meta = with stdenv.lib; {
homepage = http://www.sfml-dev.org/;
description = "Simple and fast multimedia library";
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index dc3f4a118f6..f795dfef9e4 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
checkInputs = [ python ];
doCheck = false; # fails, probably missing something
- meta = {
+ meta = with stdenv.lib; {
description = "An advanced font engine";
- maintainers = [ stdenv.lib.maintainers.raskin ];
- platforms = stdenv.lib.platforms.unix;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.unix;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 9d5bd170e20..0667e1265b3 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -1,51 +1,30 @@
-{ stdenv, fetchgit }:
+{ stdenv, skawarePackages }:
-let
+with skawarePackages;
- version = "2.6.4.0";
+buildPackage {
+ pname = "skalibs";
+ version = "2.7.0.0";
+ sha256 = "0mnprdf4w4ami0db22rwd111m037cdmn2p8xa4i8cbwxcrv4sjcn";
-in stdenv.mkDerivation rec {
-
- name = "skalibs-${version}";
-
- src = fetchgit {
- url = "git://git.skarnet.org/skalibs";
- rev = "refs/tags/v${version}";
- sha256 = "13icrwxxb7k3cj37dl07h0apk6lwyrg1qrwjwh4l82i8f32bnjz2";
- };
+ description = "A set of general-purpose C programming libraries";
outputs = [ "lib" "dev" "doc" "out" ];
- dontDisableStatic = true;
-
- enableParallelBuilding = true;
-
configureFlags = [
- "--enable-force-devr" # assume /dev/random works
+ # assume /dev/random works
+ "--enable-force-devr"
"--libdir=\${lib}/lib"
"--dynlibdir=\${lib}/lib"
"--includedir=\${dev}/include"
"--sysdepdir=\${lib}/lib/skalibs/sysdeps"
- ]
- ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
- # On darwin, the target triplet from -dumpmachine includes version number, but
- # skarnet.org software uses the triplet to test binary compatibility.
- # Explicitly setting target ensures code can be compiled against a skalibs
- # binary built on a different version of darwin.
- # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
- ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.hostPlatform.system}");
+ ];
postInstall = ''
- mkdir -p $doc/share/doc/skalibs
+ rm -rf sysdeps.cfg
+ rm libskarnet.*
+
mv doc $doc/share/doc/skalibs/html
'';
- meta = {
- homepage = http://skarnet.org/software/skalibs/;
- description = "A set of general-purpose C programming libraries";
- platforms = stdenv.lib.platforms.all;
- license = stdenv.lib.licenses.isc;
- maintainers = with stdenv.lib.maintainers; [ pmahoney Profpatsch ];
- };
-
}
diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix
index 2fce5b3368f..66bfd601a62 100644
--- a/pkgs/development/libraries/smarty3/default.nix
+++ b/pkgs/development/libraries/smarty3/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec {
name = "smarty3-${version}";
- version = "3.1.32";
+ version = "3.1.33";
src = fetchFromGitHub {
owner = "smarty-php";
repo = "smarty";
rev = "v${version}";
- sha256 = "1rfa5pzr23db1bivpivljgmgpn99m6ksgli64kmii5cmpvxi00y2";
+ sha256 = "12kll8nv4b90nlx3y0213lsncqw2ydshjx4g6dv7jah6j1pv29ix";
};
installPhase = ''
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index 9fe88b771be..ca2ff666b7a 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ glib openssl ];
nativeBuildInputs = [ pkgconfig ];
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
+ homepage = http://sofia-sip.sourceforge.net/;
+ platforms = platforms.linux;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix
index fdad4e21b0b..9769596621b 100644
--- a/pkgs/development/libraries/soqt/default.nix
+++ b/pkgs/development/libraries/soqt/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
meta = {
- homepage = http://www.coin3d.org/;
+ homepage = https://bitbucket.org/Coin3D/coin/wiki/Home;
license = stdenv.lib.licenses.gpl2Plus;
description = "Glue between Coin high-level 3D visualization library and Qt";
diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix
index 13f037960b0..c219d5bfb36 100644
--- a/pkgs/development/libraries/soxt/default.nix
+++ b/pkgs/development/libraries/soxt/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ coin3d motif xlibsWrapper libGLU_combined ];
meta = with stdenv.lib; {
- homepage = http://www.coin3d.org/;
+ homepage = https://bitbucket.org/Coin3D/coin/wiki/Home;
license = licenses.bsd3;
description = "A GUI binding for using Open Inventor with Xt/Motif";
maintainers = with maintainers; [ tmplt ];
diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix
index 1c9e67f8767..a96cd455f55 100644
--- a/pkgs/development/libraries/spdlog/default.nix
+++ b/pkgs/development/libraries/spdlog/default.nix
@@ -1,32 +1,46 @@
{ stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
- name = "spdlog-${version}";
- version = "0.14.0";
-
- src = fetchFromGitHub {
- owner = "gabime";
- repo = "spdlog";
- rev = "v${version}";
- sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
- };
+let
+ generic = { version, sha256 }:
+ stdenv.mkDerivation {
+ name = "spdlog-${version}";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "gabime";
+ repo = "spdlog";
+ rev = "v${version}";
+ inherit sha256;
+ };
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ];
- # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
+ # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
- outputs = [ "out" "doc" ];
+ outputs = [ "out" "doc" ];
- postInstall = ''
- mkdir -p $out/share/doc/spdlog
- cp -rv ../example $out/share/doc/spdlog
- '';
+ postInstall = ''
+ mkdir -p $out/share/doc/spdlog
+ cp -rv ../example $out/share/doc/spdlog
+ '';
- meta = with stdenv.lib; {
- description = "Very fast, header only, C++ logging library.";
- homepage = https://github.com/gabime/spdlog;
- license = licenses.mit;
- maintainers = with maintainers; [ obadz ];
- platforms = platforms.all;
+ meta = with stdenv.lib; {
+ description = "Very fast, header only, C++ logging library.";
+ homepage = https://github.com/gabime/spdlog;
+ license = licenses.mit;
+ maintainers = with maintainers; [ obadz ];
+ platforms = platforms.all;
+ };
+ };
+in
+{
+ spdlog_1 = generic {
+ version = "1.1.0";
+ sha256 = "0yckz5w02v8193jhxihk9v4i8f6jafyg2a33amql0iclhk17da8f";
+ };
+
+ spdlog_0 = generic {
+ version = "0.14.0";
+ sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
};
}
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index ba3791a8a8b..e9b12d16984 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib
, openssl, libXrandr, libXfixes, libXext, libXrender, libXinerama
, libjpeg, zlib, spice-protocol, python, pyparsing, glib, cyrus_sasl
-, lz4 }:
+, libcacard, lz4 }:
with stdenv.lib;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
libXrandr libXfixes libXrender libXext libXinerama
- python pyparsing glib cyrus_sasl lz4 ];
+ python pyparsing glib cyrus_sasl libcacard lz4 ];
nativeBuildInputs = [ pkgconfig spice-protocol ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-sasl"
- "--disable-smartcard"
+ "--enable-smartcard"
"--enable-client"
"--enable-lz4"
];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 166ea39493b..92574091558 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -79,6 +79,6 @@ stdenv.mkDerivation rec {
homepage = http://www.sqlite.org/;
license = licenses.publicDomain;
maintainers = with maintainers; [ eelco np ];
- platforms = platforms.unix;
+ platforms = platforms.unix ++ platforms.windows;
};
}
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index fc9abdc24c7..f3cfc1e56e8 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
pname = "sundials";
- version = "3.1.2";
+ version = "3.2.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
- sha256 = "05p19y3vv0vi3nggrvy6ymqkvhab2dxncl044qj0xnaix2qmp658";
+ sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7";
};
preConfigure = ''
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index b74c58a2e38..6577ebeae28 100644
--- a/pkgs/development/libraries/szip/default.nix
+++ b/pkgs/development/libraries/szip/default.nix
@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
name = "szip-${version}";
version = "2.1.1";
src = fetchurl {
- url = "ftp://ftp.hdfgroup.org/lib-external/szip/${version}/src/szip-${version}.tar.gz";
- sha256 = "1a8415a7xifagb22aq9dmy7b2s5l0y6diany3b4qigylw6adlzc9";
+ url = "https://support.hdfgroup.org/ftp/lib-external/szip/${version}/src/szip-${version}.tar.gz";
+ sha256 = "04nlhkzzf1gihvrfbzc6rq4kc13p92ly39dzrb4y4jrd9y5rbvi1";
};
meta = {
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 8a76e886b4f..b8e7518cd33 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation {
postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "A type 1 font rasterizer library for UNIX/X11";
+ homepage = http://www.t1lib.org/;
+ license = with licenses; [ gpl2 lgpl2 ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
index 0059243890d..b667e604740 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/pkgs/development/libraries/taglib-extras/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
'';
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Additional taglib plugins";
+ platforms = platforms.unix;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix
index 6da524c2339..86006806baa 100644
--- a/pkgs/development/libraries/taglib-sharp/default.nix
+++ b/pkgs/development/libraries/taglib-sharp/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "mono";
repo = "taglib-sharp";
-
rev = "taglib-sharp-${version}";
sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp";
};
@@ -21,6 +20,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library for reading and writing metadata in media files";
+ homepage = https://github.com/mono/taglib-sharp;
platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix
index 1caa8a376fb..99892a41fa4 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/pkgs/development/libraries/taglib/1.9.nix
@@ -15,9 +15,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://developer.kde.org/~wheeler/taglib.html;
repositories.git = git://github.com/taglib/taglib.git;
-
description = "A library for reading and editing the meta-data of several popular audio formats";
inherit (cmake.meta) platforms;
- maintainers = [ ];
+ license = with stdenv.lib.licenses; [ lgpl21 mpl11 ];
};
}
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index 67db6e5097d..a2cb103a182 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -15,6 +15,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch";
sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90";
})
+
+ (fetchpatch {
+ # https://github.com/taglib/taglib/pull/869
+ name = "CVE-2018-11439.patch";
+ url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch";
+ sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72";
+ })
];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix
index a92c7b74ebf..293baa492c5 100644
--- a/pkgs/development/libraries/tclap/default.nix
+++ b/pkgs/development/libraries/tclap/default.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://tclap.sourceforge.net/;
description = "Templatized C++ Command Line Parser Library";
- platforms = stdenv.lib.platforms.all;
+ platforms = platforms.all;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix
index 6ffbe5dc60c..24b1d477b8a 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/libraries/tcllib/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ tcl ];
meta = {
- homepage = http://tcl.activestate.com/software/tcllib/;
+ homepage = https://sourceforge.net/projects/tcllib/;
description = "Tcl-only library of standard routines for Tcl";
license = stdenv.lib.licenses.tcltk;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
index fae51aea477..1247d9ffa84 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/pkgs/development/libraries/telepathy/farstream/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];
nativeBuildInputs = [ pkgconfig ];
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call";
+ homepage = https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/;
+ platforms = platforms.linux;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 9ca2481c3b0..ca6a4997abf 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
passthru.python = python2;
- meta = {
+ meta = with stdenv.lib; {
homepage = https://telepathy.freedesktop.org;
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = with licenses; [ bsd2 bsd3 lgpl21Plus ];
};
}
diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix
new file mode 100644
index 00000000000..0898289978a
--- /dev/null
+++ b/pkgs/development/libraries/termbox/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, python3 }:
+
+stdenv.mkDerivation rec {
+ name = "termbox-${version}";
+ version = "1.1.2";
+ src = fetchFromGitHub {
+ owner = "nsf";
+ repo = "termbox";
+ rev = "v${version}";
+ sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs";
+ };
+ nativeBuildInputs = [ python3 ];
+ configurePhase = "python3 ./waf configure --prefix=$out";
+ buildPhase = "python3 ./waf build";
+ installPhase = "python3 ./waf install --destdir=$out";
+ meta = with stdenv.lib; {
+ description = "Library for writing text-based user interfaces";
+ license = licenses.mit;
+ homepage = "https://github.com/nsf/termbox#readme";
+ downloadPage = "https://github.com/nsf/termbox/releases";
+ maintainers = with maintainers; [ fgaz ];
+ };
+}
+
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 77c0b4a1a46..c139b5be102 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "07anqypf7c719x9y683qz65cxllmzlgmlab2hlahrqcj4bq2k99c";
};
+ outputs = [ "out" "dev" ];
+
postPatch = ''
sed '1i#include ' -i src/xdr_sizeof.c
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix
index ba95da77b72..51dabbd2beb 100644
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/pkgs/development/libraries/tidyp/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
homepage = http://tidyp.com/;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 23ef997e5ce..229e4cfaa6c 100644
--- a/pkgs/development/libraries/tnt/default.nix
+++ b/pkgs/development/libraries/tnt/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = https://math.nist.gov/tnt/;
description = "Template Numerical Toolkit: C++ headers for array and matrices";
+ license = stdenv.lib.licenses.publicDomain;
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index c716ae7f8db..03f8e20b38d 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
+{ stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }:
stdenv.mkDerivation rec {
name = "uriparser-${version}";
- version = "0.8.6";
+ version = "0.9.0";
# Release tarball differs from source tarball
src = fetchurl {
url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2";
- sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287";
+ sha256 = "0b2yagxzhq9ghpszci6a9xlqg0yl7vq9j5r8dwbar3nszqsfnrzc";
};
- nativeBuildInputs = [ pkgconfig cpptest doxygen graphviz ];
+ nativeBuildInputs = [ pkgconfig gtest doxygen graphviz ];
doCheck = true;
diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix
new file mode 100644
index 00000000000..859d152072f
--- /dev/null
+++ b/pkgs/development/libraries/utmps/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, skawarePackages }:
+
+with skawarePackages;
+
+buildPackage {
+ pname = "utmps";
+ version = "0.0.1.3";
+ sha256 = "0dwskdclac4afmh7f7zn6jdiydgaf59a65q43r6b813mghczjvvd";
+
+ description = "A secure utmpx and wtmp implementation";
+
+ configureFlags = [
+ "--libdir=\${lib}/lib"
+ "--dynlibdir=\${lib}/lib"
+ "--bindir=\${bin}/bin"
+ "--includedir=\${dev}/include"
+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
+ "--with-include=${skalibs.dev}/include"
+ "--with-lib=${skalibs.lib}/lib"
+ "--with-dynlib=${skalibs.lib}/lib"
+ ];
+
+ postInstall = ''
+ # remove all execline executables from build directory
+ rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
+ rm libutmps.*
+
+ mv doc $doc/share/doc/utmps/html
+ mv examples $doc/share/doc/utmps/examples
+ '';
+}
+
diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix
index adebedbf2ac..85d0c0d91bb 100644
--- a/pkgs/development/libraries/v8/6_x.nix
+++ b/pkgs/development/libraries/v8/6_x.nix
@@ -13,82 +13,102 @@ let
else "ia32";
git_url = "https://chromium.googlesource.com";
+ # This data is from the DEPS file in the root of a V8 checkout
deps = {
"base/trace_event/common" = fetchgit {
- url = "${git_url}/chromium/src/base/trace_event/common.git";
- rev = "65d1d42a5df6c0a563a6fdfa58a135679185e5d9";
- sha256 = "0ikk0dj12adzr0138jrmwzhx8n9sl5qzs86a3mc3gva08a8wc84p";
+ url = "${git_url}/chromium/src/base/trace_event/common.git";
+ rev = "211b3ed9d0481b4caddbee1322321b86a483ca1f";
+ sha256 = "080sya1dg32hi5gj7zr3r5l18r6w8g0imajyf3xfvnz67a2i8dd7";
};
"build" = fetchgit {
- url = "${git_url}/chromium/src/build.git";
- rev = "48a2b7b39debc7c77c868c9ddb0a360af1ebc367";
- sha256 = "0aj554dfdbwnikwaapznfq55wkwbvg4114h7qamixy8ryjkaiy0k";
+ url = "${git_url}/chromium/src/build.git";
+ rev = "7315579e388589b62236ad933f09afd1e838d234";
+ sha256 = "14gsigyjfm03kfzmz0v6429b6qnycvzx0yj3vwaks8may26aiv71";
};
"buildtools" = fetchgit {
- url = "${git_url}/chromium/buildtools.git";
- rev = "5af0a3a8b89827a8634132080a39ab4b63dee489";
- sha256 = "1841803m40w1hmnmm7qzdpk4b6q1m8cb7q4hsflqfpddpf4lp3v1";
+ url = "${git_url}/chromium/buildtools.git";
+ rev = "0dd5c6f980d22be96b728155249df2da355989d9";
+ sha256 = "0m1fh0qjcx9c69khnqcsqvrnqs7ji6wfxns9vv9mknj20sph5ydr";
};
"test/benchmarks/data" = fetchgit {
- url = "${git_url}/v8/deps/third_party/benchmarks.git";
- rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";
+ url = "${git_url}/v8/deps/third_party/benchmarks.git";
+ rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";
sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl";
};
"test/mozilla/data" = fetchgit {
- url = "${git_url}/v8/deps/third_party/mozilla-tests.git";
- rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
+ url = "${git_url}/v8/deps/third_party/mozilla-tests.git";
+ rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";
sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";
};
"test/test262/data" = fetchgit {
- url = "${git_url}/external/github.com/tc39/test262.git";
- rev = "1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91";
- sha256 = "1hbp7vv41k7jka8azc78hhw4qng7gckr6dz1van7cyd067znwvr4";
+ url = "${git_url}/external/github.com/tc39/test262.git";
+ rev = "a6c1d05ac4fed084fa047e4c52ab2a8c9c2a8aef";
+ sha256 = "1cy3val2ih6r4sbaxd1v9fir87mrlw1kr54s64g68gnch53ck9s3";
};
"test/test262/harness" = fetchgit {
- url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
- rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
+ url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";
+ rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd";
sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp";
};
"test/wasm-js" = fetchgit {
- url = "${git_url}/external/github.com/WebAssembly/spec.git";
- rev = "17b4a4d98c80b1ec736649d5a73496a0e6d12d4c";
- sha256 = "03nyrrqffzj6xrmqi1v7f9m9395bdk53x301fy5mcq4hhpq6rsjr";
+ url = "${git_url}/external/github.com/WebAssembly/spec.git";
+ rev = "2113ea7e106f8a964e0445ba38f289d2aa845edd";
+ sha256 = "07aw7x2xzmzk905mqf8gbbb1bi1a5kv99g8iv6x2p07d3zns7xzx";
};
- "testing/gmock" = fetchgit {
- url = "${git_url}/external/googlemock.git";
- rev = "0421b6f358139f02e102c9c332ce19a33faf75be";
- sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp";
+ "third_party/depot_tools" = fetchgit {
+ url = "${git_url}/chromium/tools/depot_tools.git";
+ rev = "fb734036f4b5ae6d5afc63cbfc41d3a5d1c29a82";
+ sha256 = "1738y7xgfnn0hfdr8g5jw7555841ycxbn580mdffwv4jnbn7120s";
};
- "testing/gtest" = fetchgit {
- url = "${git_url}/external/github.com/google/googletest.git";
- rev = "6f8a66431cb592dad629028a50b3dd418a408c87";
- sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";
+ "third_party/googletest/src" = fetchgit {
+ url = "${git_url}/external/github.com/google/googletest.git";
+ rev = "ce468a17c434e4e79724396ee1b51d86bfc8a88b";
+ sha256 = "0nik8wb1b0zk2sslawgp5h211r5bc4x7m962dgnmbk11ccvsmr23";
};
"third_party/icu" = fetchgit {
- url = "${git_url}/chromium/deps/icu.git";
- rev = "08cb956852a5ccdba7f9c941728bb833529ba3c6";
- sha256 = "0vn2iv068kmcjqqx5cgyha80x9iraz11hpx3q4n3rkvrlvbb3d7b";
+ url = "${git_url}/chromium/deps/icu.git";
+ rev = "a9a2bd3ee4f1d313651c5272252aaf2a3e7ed529";
+ sha256 = "1bfyxakgv9z0rxbqsy5csi85kg8dqy7i6zybmng5wyzag9cns4f9";
};
"third_party/instrumented_libraries" = fetchgit {
- url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
- rev = "644afd349826cb68204226a16c38bde13abe9c3c";
- sha256 = "0d1vkwilgv1a4ghazn623gwmm7h51padpfi94qrmig1y748xfwfa";
+ url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
+ rev = "323cf32193caecbf074d1a0cb5b02b905f163e0f";
+ sha256 = "0q3n3ivqva28qpn67ds635521pwzpc9apcyagz65i9j17bb1k231";
};
- # templates of code generator require jinja2 2.8 (while nixpkgs has 2.9.5, which breaks the template)
"third_party/jinja2" = fetchgit {
- url = "${git_url}/chromium/src/third_party/jinja2.git";
- rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0";
- sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd";
+ url = "${git_url}/chromium/src/third_party/jinja2.git";
+ rev = "b41863e42637544c2941b574c7877d3e1f663e25";
+ sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r";
};
"third_party/markupsafe" = fetchgit {
- url = "${git_url}/chromium/src/third_party/markupsafe.git";
- rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
+ url = "${git_url}/chromium/src/third_party/markupsafe.git";
+ rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
};
+ "third_party/proguard" = fetchgit {
+ url = "${git_url}/chromium/src/third_party/proguard.git";
+ rev = "eba7a98d98735b2cc65c54d36baa5c9b46fe4f8e";
+ sha256 = "1yx86z2p243b0ykixgqz6nlqfp8swa6n0yl5fgb29fa4jvsjz3d1";
+ };
"tools/clang" = fetchgit {
- url = "${git_url}/chromium/src/tools/clang.git";
- rev = "40f69660bf3cd407e72b8ae240fdd6c513dddbfe";
- sha256 = "1plkb9dcn34yd6lad7w59s9vqwmcc592dasgdk232spkafpg8qcf";
+ url = "${git_url}/chromium/src/tools/clang.git";
+ rev = "c0b1d892b2bc1291eb287d716ca239c1b03fb215";
+ sha256 = "1mz1pqzr2b37mymbkqkmpmj48j7a8ig0ibaw3dfilbx5nbl4wd2z";
+ };
+ "tools/gyp" = fetchgit {
+ url = "${git_url}/external/gyp.git";
+ rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb";
+ sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0";
+ };
+ "tools/luci-go" = fetchgit {
+ url = "${git_url}/chromium/src/tools/luci-go.git";
+ rev = "abcd908f74fdb155cc8870f5cae48dff1ece7c3c";
+ sha256 = "07c8vanc31wal6aw8v0s499l7ifrgvdvi2sx4ln3nyha5ngxinld";
+ };
+ "tools/swarming_client" = fetchgit {
+ url = "${git_url}/infra/luci/client-py.git";
+ rev = "9a518d097dca20b7b00ce3bdfc5d418ccc79893a";
+ sha256 = "1d8nly7rp24gx7q0m01jvsc15nw5fahayfczwd40gzzzkmvhjazi";
};
};
@@ -96,7 +116,7 @@ in
stdenv.mkDerivation rec {
name = "v8-${version}";
- version = "6.2.414.27";
+ version = "6.9.427.14";
inherit doCheck;
@@ -104,7 +124,7 @@ stdenv.mkDerivation rec {
owner = "v8";
repo = "v8";
rev = version;
- sha256 = "15zrb9bcpnhljhrilqnjaak3a4xnhj8li6ra12g3gkrw3fzir9a2";
+ sha256 = "13d50iz87qh7v8l8kjky8wqs9rvz02pgw74q8crqi5ywnvvill1x";
};
postUnpack = ''
@@ -133,11 +153,13 @@ stdenv.mkDerivation rec {
configurePhase = ''
tools/dev/v8gen.py -vv ${arch}.release -- \
- is_component_build=true \
- ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false" } \
- is_clang=false \
- linux_use_bundled_binutils=false \
- treat_warnings_as_errors=false
+ is_component_build=true \
+ ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \
+ is_clang=false \
+ linux_use_bundled_binutils=false \
+ treat_warnings_as_errors=false \
+ use_custom_libcxx=false \
+ use_custom_libcxx_for_host=false
'';
nativeBuildInputs = [ gn ninja pkgconfig ];
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index c2ab61c6bd1..ecc6b7c30fc 100644
--- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix
+++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
- vapoursynth, yasm, fftwFloat
+ vapoursynth, nasm, fftwFloat
}:
stdenv.mkDerivation rec {
name = "vapoursynth-mvtools-${version}";
- version = "19";
+ version = "20";
src = fetchFromGitHub {
- owner = "dubhater";
- repo = "vapoursynth-mvtools";
+ owner = "dubhater";
+ repo = "vapoursynth-mvtools";
rev = "v${version}";
- sha256 = "1wjwf1lgfkqz87s0j251g625mw9xmx79zzgrjyhq3wlii73m6qwp";
+ sha256 = "0nbq04wbmz7xqfcfpdvgg0p8xhh2xdcwhhx5gwr4j8bm611v0npz";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
autoreconfHook
- yasm vapoursynth fftwFloat
+ nasm vapoursynth fftwFloat
];
configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ];
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 7344f3a7e2b..2d3af9b70c5 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "vapoursynth-${version}";
- version = "R43";
+ version = "R44";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
- sha256 = "01yzxggjxr6fz3wj81z6vgp9m4jqddyk73i22kz2x620cpdgb9j9";
+ sha256 = "1270cggvk9nvy5g2z289nwhyvl4364yzirfn5jsa9i9ljfp00qml";
};
nativeBuildInputs = [ pkgconfig autoreconfHook nasm ];
diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index e2a2af615b8..7f46702c2e8 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "Vc-${version}";
- version = "1.3.3";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "VcDevel";
repo = "Vc";
rev = version;
- sha256 = "0y4riz2kiw6a9w2zydj6x0vhy2qc9v17wspq3n2q88nbas72yd2m";
+ sha256 = "1jwwp3g8pqngdakqy3dxy3vgzh0gla5wvwqqlfvqdgsw6455xhm7";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 12c166beacb..fb69d4bf63e 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -15,6 +15,12 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
+ # Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414
+ patches =
+ let clangPatch = fetchurl { url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";
+ sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; };
+ in [ clangPatch ];
+
buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
libtiff numpy openexr python ];
@@ -34,6 +40,6 @@ in stdenv.mkDerivation rec {
homepage = https://hci.iwr.uni-heidelberg.de/vigra;
license = licenses.mit;
maintainers = [ maintainers.viric ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 2cd3b5a20c0..4473100a9f2 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "virglrenderer-${version}";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchurl {
url = "https://www.freedesktop.org/software/virgl/${name}.tar.bz2";
- sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a";
+ sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m";
};
buildInputs = [ libGLU epoxy libX11 libdrm mesa_noglu ];
diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix
index ddeecce21c6..0ae5ba147cb 100644
--- a/pkgs/development/libraries/vrpn/default.nix
+++ b/pkgs/development/libraries/vrpn/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
set of physical devices (tracker, etc.) used in a virtual-reality
(VR) system.
'';
- homepage = http://www.vrpn.org/;
+ homepage = https://github.com/vrpn/vrpn;
license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License
platforms = platforms.linux;
maintainers = with maintainers; [ ludo ];
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 2a07eba261b..c93ba1b1290 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
name = "vulkan-headers-${version}";
- version = "1.1.82.0";
+ version = "1.1.85";
buildInputs = [ cmake ];
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Headers";
- rev = "sdk-${version}";
- sha256 = "1pp0kmgd89g8rz6qqfqmdmv209s0d6hbsshrzrlwrdm6dc25f20p";
+ rev = "2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0";
+ sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 5ffdc437537..6f720857f7c 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,6 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig,
- xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
-let version = "1.1.82.0"; in
+{ stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig
+, xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }:
+
+let
+ version = "1.1.85";
+in
+
assert version == vulkan-headers.version;
stdenv.mkDerivation rec {
name = "vulkan-loader-${version}";
@@ -9,8 +13,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Loader";
- rev = "sdk-${version}";
- sha256 = "16i4s1adfh822ahj3ywp279lv6szwd2sn2q5pmvpg2kk6mbh410d";
+ rev = "b02f64293680c484e1d7ff6ecb88f89277c0dc8c";
+ sha256 = "1n4vjyxlmi2ygx34srwbvalc5gz95gcsrmdw0k10353xja755gmj";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index fce0dae6c73..866b1232aef 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -8,11 +8,11 @@ assert expat != null;
stdenv.mkDerivation rec {
name = "wayland-${version}";
- version = "1.15.0";
+ version = "1.16.0";
src = fetchurl {
url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
- sha256 = "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb";
+ sha256 = "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf";
};
configureFlags = [ "--with-scanner" "--disable-documentation" ];
diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 7c4d275e05f..636021f1368 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,14 +1,14 @@
{ fetchurl, stdenv, flex }:
stdenv.mkDerivation rec {
- version = "5.19.1";
+ version = "5.20";
name = "wcslib-${version}";
buildInputs = [ flex ];
src = fetchurl {
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
- sha256 ="160gvz9xk4hvliwb75ry770qdf899kc89ij6r0y7fh60lbjz1far";
+ sha256 ="1c8g9kv4dxrnawnqi4spi2p10s2xs7x75pdfxhbqxgcc97dkgh0b";
};
prePatch = ''
diff --git a/pkgs/development/libraries/webkitgtk/2.22.nix b/pkgs/development/libraries/webkitgtk/2.22.nix
new file mode 100644
index 00000000000..7eae5819daf
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/2.22.nix
@@ -0,0 +1,83 @@
+{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja
+, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt
+, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core
+, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
+, libidn, libedit, readline, libGLU_combined, libintl
+, enableGeoLocation ? true, geoclue2, sqlite
+, enableGtk2Plugins ? false, gtk2 ? null
+, gst-plugins-base, gst-plugins-bad, woff2
+}:
+
+assert enableGeoLocation -> geoclue2 != null;
+assert enableGtk2Plugins -> gtk2 != null;
+assert stdenv.isDarwin -> !enableGtk2Plugins;
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+ name = "webkitgtk-${version}";
+ version = "2.22.2";
+
+ meta = {
+ description = "Web content rendering engine, GTK+ port";
+ homepage = https://webkitgtk.org/;
+ license = licenses.bsd2;
+ platforms = platforms.linux;
+ hydraPlatforms = [];
+ maintainers = with maintainers; [ ];
+ };
+
+ src = fetchurl {
+ url = "https://webkitgtk.org/releases/${name}.tar.xz";
+ sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l";
+ };
+
+ patches = optionals stdenv.isDarwin [
+ ## TODO add necessary patches for Darwin
+ ];
+
+ postPatch = ''
+ patchShebangs .
+ '';
+
+ cmakeFlags = [
+ "-DPORT=GTK"
+ "-DUSE_LIBHYPHEN=0"
+ "-DENABLE_INTROSPECTION=ON"
+ ]
+ ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
+ ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
+ ++ optionals stdenv.isDarwin [
+ "-DUSE_SYSTEM_MALLOC=ON"
+ "-DUSE_ACCELERATE=0"
+ "-DENABLE_MINIBROWSER=OFF"
+ "-DENABLE_VIDEO=ON"
+ "-DENABLE_QUARTZ_TARGET=ON"
+ "-DENABLE_X11_TARGET=OFF"
+ "-DENABLE_OPENGL=OFF"
+ "-DENABLE_WEB_AUDIO=OFF"
+ "-DENABLE_WEBGL=OFF"
+ "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
+ "-DENABLE_GTKDOC=OFF"
+ ];
+
+ nativeBuildInputs = [
+ cmake ninja perl python2 ruby bison gperf
+ pkgconfig gettext gobjectIntrospection
+ ];
+
+ buildInputs = [
+ libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2
+ libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit
+ sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
+ ] ++ optional enableGeoLocation geoclue2
+ ++ optional enableGtk2Plugins gtk2
+ ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ])
+ ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ]
+ ++ optional stdenv.isLinux wayland;
+
+ propagatedBuildInputs = [
+ libsoup gtk3
+ ];
+
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 1a17ae53313..7b62de69123 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex
-, pkgconfig, which, gettext, gobjectIntrospection
+, pkgconfig, which, gettext, gobjectIntrospection, pruneLibtoolFiles
, gtk2, gtk3, wayland, libwebp, enchant, sqlite
, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
, gst-plugins-base, libobjc
@@ -77,13 +77,16 @@ stdenv.mkDerivation rec {
"--disable-credential-storage"
];
- NIX_CFLAGS_COMPILE = "-DU_NOEXCEPT=";
+ NIX_CFLAGS_COMPILE = [
+ "-DU_NOEXCEPT="
+ "-Wno-expansion-to-defined"
+ ];
dontAddDisableDepTrack = true;
nativeBuildInputs = [
perl python ruby bison gperf flex
- pkgconfig which gettext gobjectIntrospection
+ pkgconfig which gettext gobjectIntrospection pruneLibtoolFiles
];
buildInputs = [
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index c4d94af850d..56068c435d8 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -14,7 +14,7 @@ let
mkEnable = mkFlag "enable-" "disable-";
mkWith = mkFlag "with-" "without-";
- shouldUsePkg = pkg: if pkg != null && pkg.meta.available then pkg else null;
+ shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
optLz4 = shouldUsePkg lz4;
optSnappy = shouldUsePkg snappy;
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index a4c2b329714..4aff6063183 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,39 +1,83 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
+{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig
, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
+, libpng, ffmpeg_4
+, python3Packages # TODO: Temporary
}:
-let pname = "wlroots";
- version = "unstable-2018-03-16";
+let
+ pname = "wlroots";
+ version = "0.1";
+ meson480 = meson.overrideAttrs (oldAttrs: rec {
+ name = pname + "-" + version;
+ pname = "meson";
+ version = "0.48.0";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
+ };
+ patches = builtins.filter # Remove gir-fallback-path.patch
+ (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str))
+ oldAttrs.patches;
+ });
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "swaywm";
repo = "wlroots";
- rev = "9cc875429b40e2567b219f8e9ffd23316d136204";
- sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq";
+ rev = version;
+ sha256 = "0xfipgg2qh2xcf3a1pzx8pyh1aqpb9rijdyi0as4s6fhgy4w269c";
};
- # $out for the library and $bin for rootston
- outputs = [ "out" "bin" ];
+ patches = [ (fetchpatch { # TODO: Only required for version 0.1
+ url = https://github.com/swaywm/wlroots/commit/be6210cf8216c08a91e085dac0ec11d0e34fb217.patch;
+ sha256 = "0njv7mr4ark603w79cxcsln29galh87vpzsx2dzkrl1x5x4i6cj5";
+ }) ];
+
+ # $out for the library, $bin for rootston, and $examples for the example
+ # programs (in examples) AND rootston
+ outputs = [ "out" "bin" "examples" ];
- nativeBuildInputs = [ meson ninja pkgconfig ];
+ nativeBuildInputs = [ meson480 ninja pkgconfig ];
buildInputs = [
wayland libGL wayland-protocols libinput libxkbcommon pixman
xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu
+ libpng ffmpeg_4
+ ];
+
+ mesonFlags = [
+ "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
+ "-Dxcb-icccm=enabled" "-Dxcb-xkb=enabled" "-Dxcb-errors=enabled"
];
- # Install rootston (the reference compositor) to $bin
postInstall = ''
- mkdir -p $bin/bin
- cp rootston/rootston $bin/bin/
- mkdir $bin/lib
- cp libwlroots* $bin/lib/
- patchelf --set-rpath "$bin/lib:${stdenv.lib.makeLibraryPath buildInputs}" $bin/bin/rootston
- mkdir $bin/etc
- cp ../rootston/rootston.ini.example $bin/etc/rootston.ini
+ # Install rootston (the reference compositor) to $bin and $examples
+ for output in "$bin" "$examples"; do
+ mkdir -p $output/bin
+ cp rootston/rootston $output/bin/
+ mkdir $output/lib
+ cp libwlroots* $output/lib/
+ patchelf \
+ --set-rpath "$output/lib:${stdenv.lib.makeLibraryPath buildInputs}" \
+ $output/bin/rootston
+ mkdir $output/etc
+ cp ../rootston/rootston.ini.example $output/etc/rootston.ini
+ done
+ # Install ALL example programs to $examples:
+ # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle
+ # screenshot output-layout multi-pointer rotation tablet touch pointer
+ # simple
+ mkdir -p $examples/bin
+ cd ./examples
+ for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do
+ patchelf \
+ --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \
+ "$binary"
+ cp "$binary" "$examples/bin/wlroots-$binary"
+ done
'';
meta = with stdenv.lib; {
@@ -42,8 +86,5 @@ in stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ];
- # Marked as broken until the first official/stable release (upstream
- # request). See #38344 for the public discussion.
- broken = true;
};
}
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 2b69f6283d6..8f57a0bf1b7 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "00mpq1z8j37a873dbk9knb835m3qlwqnd1rslirqkc44hpz1i64j";
};
+ configureFlags = [ "--enable-all" ];
+
outputs = [ "out" "dev" "doc" "lib" ];
nativeBuildInputs = [ autoreconfHook ];
@@ -27,6 +29,7 @@ stdenv.mkDerivation rec {
description = "A small, fast, portable implementation of TLS/SSL for embedded devices";
homepage = "https://www.wolfssl.com/";
platforms = platforms.all;
+ license = stdenv.lib.licenses.gpl2;
maintainers = with maintainers; [ mcmtroffaes ];
};
}
diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
index 59f6af7eddb..27b95208432 100644
--- a/pkgs/development/libraries/wxSVG/default.nix
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
name = "wxSVG-${version}";
srcName = "wxsvg-${version}";
- version = "1.5.14";
+ version = "1.5.15";
src = fetchurl {
url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
- sha256 = "0xl5ghd8yj1ciwf87f12ii7vg38ir0snrds2rhi47pv5gypfkiq5";
+ sha256 = "1f6fhkdmcfs8w7x08vhiqygss4qzcsimhd91h0j58zw25ky6rzqn";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
index 9c307b2d15a..040273e28b9 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix
@@ -1,60 +1,26 @@
-{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
+{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib
# darwin only attributes
-, derez, rez, setfile
+, cf-private, derez, rez, setfile
, AGL, Cocoa, Kernel
}:
-with stdenv.lib;
-
stdenv.mkDerivation rec {
- version = "3.0.2";
+ version = "3.0.4";
name = "wxmac-${version}";
- src = fetchurl {
- url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2";
- sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d";
+ src = fetchzip {
+ url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz";
+ sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
};
- patches =
- [ # Use std::abs() from instead of abs() from to avoid problems
- # with abiguous overloads for clang-3.8 and gcc6.
- (fetchpatch {
- name = "patch-stc-abs.diff";
- url = https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02.patch;
- sha256 = "0w5whmfzm8waw62jmippming0zffa9064m5b3aw5nixph21rlcvq";
- })
-
- # Various fixes related to Yosemite. Revisit in next stable release.
- # Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well
- # Theoretically the above linked patch should still be needed, but it isn't.
- # Try to find out why.
- (fetchpatch {
- name = "patch-yosemite.diff";
- url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-yosemite.diff;
- sha256 = "0ss66z2a79v976mvlrskyj1zmkyaz8hbwm98p29bscfvcx5845jb";
- })
-
- # Remove uncenessary includes
- # http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets
- (fetchpatch {
- name = "patch-quicktime-removal.diff";
- url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-quicktime-removal.diff;
- sha256 = "0mzvdk8r70p9s1wj7qzdsqmdrlxlf2dalh9gqs8xjkqq2666yp0y";
- })
-
- # Patch for wxOSXPrintData, custom paper not applied
- # http://trac.wxwidgets.org/ticket/16959
- (fetchpatch {
- name = "wxPaperCustomPatch.patch";
- url = http://trac.wxwidgets.org/raw-attachment/ticket/16959/wxPaperCustomPatch.patch;
- sha256 = "0xgscv86f8dhggn9n8bhlq9wlj3ydsicgy9v35sraxyma18cbjvl";
- })
- ];
-
buildInputs = [
expat libiconv libjpeg libpng libtiff zlib
derez rez setfile
Cocoa Kernel
+
+ # Needed for CFURLGetFSRef, etc. which have deen deprecated
+ # since 10.9 and are not part of swift-corelibs CoreFoundation.
+ cf-private
];
propagatedBuildInputs = [ AGL ];
@@ -98,7 +64,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
platforms = platforms.darwin;
license = licenses.wxWindows;
maintainers = [ maintainers.lnl7 ];
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index f93f7ed8746..7b92c1c66cd 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -11,13 +11,6 @@ let
inherit sha256;
};
- patches = stdenv.lib.optional (version == "1.4.7") [
- # fix notmuch build, see https://notmuchmail.org/faq/#index12h2
- # cannot fetchpatch this because base directory differs
- # TODO: remove on next xapian update
- ./fix-notmuch-tagging.patch
- ];
-
outputs = [ "out" "man" "doc" ];
buildInputs = [ libuuid zlib ];
@@ -43,5 +36,5 @@ let
in {
# xapian-ruby needs 1.2.22 as of 2017-05-06
xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
- xapian_1_4 = generic "1.4.7" "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k";
+ xapian_1_4 = generic "1.4.8" "0528841hn5lddaa317ax3i3d01zf1izpzh4njiz6s84mxpn06q6s";
}
diff --git a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch b/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
deleted file mode 100644
index 6deae76d2aa..00000000000
--- a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f9e6f45b1c8f66bca8a3387f371b20d434b23a7d Mon Sep 17 00:00:00 2001
-From: Olly Betts
-Date: Thu, 26 Jul 2018 17:26:52 +1200
-Subject: [PATCH 1/1] Revert "Enable open_nearby_postlist for writable
- databases"
-
-The amended check isn't conservative enough as there may be postlist
-changes in the inverter while the table is unmodified. This breaks
-testcase T150-tagging.sh in notmuch's testsuite, reported by David
-Bremner.
-
-This reverts commit 5489fb2f838c0f0b0a593b4c17df282a93a1fe5a.
----
- xapian-core/backends/glass/glass_postlist.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xapian-core/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc
-index 80e578b85..a47f14a68 100644
---- a/backends/glass/glass_postlist.cc
-+++ b/backends/glass/glass_postlist.cc
-@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_,
- (void)need_pos;
- if (term_.empty())
- RETURN(NULL);
-- if (!this_db.get() || this_db->postlist_table.is_modified())
-+ if (!this_db.get() || this_db->postlist_table.is_writable())
- RETURN(NULL);
- RETURN(new GlassPostList(this_db, term_, cursor->clone()));
- }
---
-2.11.0
diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix
index 79f75abfd91..3dd2cb5b874 100644
--- a/pkgs/development/libraries/xbase/default.nix
+++ b/pkgs/development/libraries/xbase/default.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation {
})
];
- meta = {
+ meta = with stdenv.lib; {
homepage = http://linux.techass.com/projects/xdb/;
description = "C++ class library formerly known as XDB";
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ ];
+ platforms = platforms.linux;
+ license = licenses.lgpl2;
};
}
diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
new file mode 100644
index 00000000000..247b8ee45d0
--- /dev/null
+++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+let
+ version = "0.1.0";
+in stdenv.mkDerivation rec {
+ name = "xdg-dbus-proxy-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${name}.tar.xz";
+ sha256 = "055wli36lvdannp6qqwbvd78353n61wn9kp8y3dchh39wq7x7vwy";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ glib ];
+
+ meta = with stdenv.lib; {
+ description = "DBus proxy for Flatpak and others";
+ homepage = https://flatpak.org/;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index e6f23a8a270..f81461b2ac8 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }:
let
- version = "0.99";
+ version = "1.0.2";
in stdenv.mkDerivation rec {
name = "xdg-desktop-portal-gtk-${version}";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
owner = "flatpak";
repo = "xdg-desktop-portal-gtk";
rev = version;
- sha256 = "0jnmrl55gpvz06hy0832kcby4y84f0a1hiali6qy1lcmyqhm3v59";
+ sha256 = "06dzh3vzq5nw3r89kb1qi3r2z8wjh9zmzc0hfnva4vnx7mwgm7ax";
};
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ];
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 9651f642a01..9cdada9bf3b 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
let
- version = "0.99";
+ version = "1.0.3";
in stdenv.mkDerivation rec {
name = "xdg-desktop-portal-${version}";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
owner = "flatpak";
repo = "xdg-desktop-portal";
rev = version;
- sha256 = "05garhdxylphrizyaqnz4sfpp28fd00v877q7cf1gyhpk1sr8i83";
+ sha256 = "113k5sr4l58rm8sgp4qbjrhyjg37c5ad54i58njsm98knb5r2ppv";
};
patches = [
diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index 9fa1768f4dc..7ed20ed7432 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "xerces-c-${version}";
- version = "3.2.1";
+ version = "3.2.2";
src = fetchurl {
url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz";
- sha256 = "18045nyjkr2hygkjc43pi2fmz6qcbn9p00kf42my3aa4i0mn1m3d";
+ sha256 = "04q4c460wqzyzmprjm22igcm1d52xr20ajxnhr33nv95mbw92qfx";
};
meta = {
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 69b5b95e761..d86dac05073 100644
--- a/pkgs/development/libraries/xine-lib/default.nix
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.xine-project.org/;
description = "A high-performance, portable and reusable multimedia playback engine";
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix
new file mode 100644
index 00000000000..9a3416a368b
--- /dev/null
+++ b/pkgs/development/libraries/yojimbo/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
+
+stdenv.mkDerivation rec {
+ name = "yojimbo";
+ version = "1.1";
+
+ src = fetchFromGitHub {
+ owner = "networkprotocol";
+ repo = "yojimbo";
+ rev = "e02219c102d9b440290539036992d77608eab3b0";
+ sha256 = "0jn25ddv73hwjals883a910m66kwj6glxxhnmn96bpzsvsaimnkr";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ premake5 doxygen ];
+ propagatedBuildInputs = [ libsodium mbedtls ];
+
+ buildPhase = ''
+ premake5 gmake
+ make all
+ premake5 docs
+ '';
+
+ installPhase = ''
+ install -Dm555 -t $out/lib bin/libyojimbo.a
+ install -Dm444 -t $out/include yojimbo.h
+ mkdir -p $out/share/doc/yojimbo
+ cp -r docs/html $out/share/doc/yojimbo
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A network library for client/server games with dedicated servers";
+ longDescription = ''
+ yojimbo is a network library for client/server games with dedicated servers.
+ It's designed around the networking requirements of competitive multiplayer games like first person shooters.
+ As such it provides a time critical networking layer on top of UDP, with a client/server architecture supporting up to 64 players per-dedicated server instance.
+ '';
+ homepage = https://github.com/networkprotocol/yojimbo;
+ license = licenses.bsd3;
+ platforms = platforms.x86_64;
+ maintainers = with maintainers; [ paddygord ];
+ };
+}
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 9d006527717..12fb076d946 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec{
name = "zimg-${version}";
- version = "2.7.5";
+ version = "2.8";
src = fetchFromGitHub {
owner = "sekrit-twc";
repo = "zimg";
rev = "release-${version}";
- sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww";
+ sha256 = "0s4n1swg1hgv81l8hvf0ny0fn305vf6l6dakbj452304p6ihxd83";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index d348f877f72..fe1c275aeda 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -82,4 +82,6 @@ stdenv.mkDerivation (rec {
preConfigure = ''
export CHOST=${stdenv.hostPlatform.config}
'';
+} // stdenv.lib.optionalAttrs (stdenv.hostPlatform.libc == "msvcrt") {
+ configurePhase = ":";
})
diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix
index 1ba07394348..65509d766b9 100644
--- a/pkgs/development/libraries/zxcvbn-c/default.nix
+++ b/pkgs/development/libraries/zxcvbn-c/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "zxcvbn-c-${version}";
- version = "2.3";
+ version = "2.4";
src = fetchFromGitHub {
owner = "tsyrogit";
repo = "zxcvbn-c";
rev = "v${version}";
- sha256 = "1m097b4qq1r3kk4b236pc3mpaj22il9fh43ifagad5wy54x8zf7b";
+ sha256 = "12ksdnpxlqlmg9zhyyk3bspcf0sfj5zk735vr4ry635qi7gzcaas";
};
installPhase = ''
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index f208b47234c..5769ee94a1b 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
quicklispdist = pkgs.fetchurl {
# Will usually be replaced with a fresh version anyway, but needs to be
# a valid distinfo.txt
- url = "http://beta.quicklisp.org/dist/quicklisp/2018-04-30/distinfo.txt";
- sha256 = "0zpabwgvsmy90yca25sfixi6waixqdchllayyvcsdl3jaibbz4rq";
+ url = "http://beta.quicklisp.org/dist/quicklisp/2018-08-31/distinfo.txt";
+ sha256 = "1im4p6vcxkp5hrim28cdf5isyw8a1v9aqsz2xfsfp3z3qd49dixd";
};
buildPhase = '' true; '';
postInstall = ''
diff --git a/pkgs/development/lisp-modules/openssl-lib-marked.nix b/pkgs/development/lisp-modules/openssl-lib-marked.nix
new file mode 100644
index 00000000000..e2c632b8eba
--- /dev/null
+++ b/pkgs/development/lisp-modules/openssl-lib-marked.nix
@@ -0,0 +1,18 @@
+with import ../../../default.nix {};
+runCommand "openssl-lib-marked" {} ''
+ mkdir -p "$out/lib"
+ for lib in ssl crypto; do
+ version="${(builtins.parseDrvName openssl.name).version}"
+ ln -s "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version"
+ version="$(echo "$version" | sed -re 's/[a-z]+$//')"
+ while test -n "$version"; do
+ ln -sfT "${lib.getLib openssl}/lib/lib$lib.so" "$out/lib/lib$lib.so.$version"
+ nextversion="''${version%.*}"
+ if test "$version" = "$nextversion"; then
+ version=
+ else
+ version="$nextversion"
+ fi
+ done
+ done
+''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 22aa818f875..9b9486e9758 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''alexandria'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index c90a9e09192..9daab46784d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''array-utils'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A few utilities for working with arrays.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz'';
- sha256 = ''01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0'';
+ url = ''http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz'';
+ sha256 = ''1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7'';
};
packageName = "array-utils";
@@ -18,8 +18,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
- SHA256 01vjb146lb1dp77xcpinq4r1jv2fvl3gzj50x9i04b5mhfaqpkd0 URL
- http://beta.quicklisp.org/archive/array-utils/2018-01-31/array-utils-20180131-git.tgz
- MD5 339670a03dd7d865cd045a6556d705c6 NAME array-utils FILENAME array-utils
- DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS (array-utils-test)
+ SHA256 1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7 URL
+ http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz
+ MD5 fa07e8fac5263d4fed7acb3d53e5855a NAME array-utils FILENAME array-utils
+ DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS (array-utils-test)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
index 4612e6175b9..65df45d95a5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''asdf-system-connections'';
version = ''20170124-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index f0fc5d4d0c0..c5305587a02 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''bordeaux-threads'';
- version = ''v0.8.5'';
+ version = ''v0.8.6'';
parasites = [ "bordeaux-threads/test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."fiveam" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
- sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
+ url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz'';
+ sha256 = ''1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y'';
};
packageName = "bordeaux-threads";
@@ -21,10 +21,10 @@ rec {
}
/* (SYSTEM bordeaux-threads DESCRIPTION
Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
- 09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL
- http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz
- MD5 67e363a363e164b6f61a047957b8554e NAME bordeaux-threads FILENAME
+ 1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y URL
+ http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz
+ MD5 f959d3902694b1fe6de450a854040f86 NAME bordeaux-threads FILENAME
bordeaux-threads DEPS
((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
- DEPENDENCIES (alexandria fiveam) VERSION v0.8.5 SIBLINGS NIL PARASITES
+ DEPENDENCIES (alexandria fiveam) VERSION v0.8.6 SIBLINGS NIL PARASITES
(bordeaux-threads/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
index 6dbff1d6e56..ec4e31013f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode-xhtml.nix
@@ -5,7 +5,7 @@ rec {
description = ''Tool for building up an xml dom of an excel spreadsheet nicely.'';
- deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
+ deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
@@ -34,16 +34,17 @@ rec {
(NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME iterate FILENAME iterate) (NAME puri FILENAME puri)
- (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
- (NAME symbol-munger FILENAME symbol-munger)
+ (NAME iterate FILENAME iterate)
+ (NAME named-readtables FILENAME named-readtables)
+ (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
+ (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
DEPENDENCIES
(alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
closure-common closure-html collectors cxml cxml-dom cxml-klacks cxml-test
- cxml-xml flexi-streams iterate puri split-sequence swank symbol-munger
- trivial-features trivial-gray-streams)
+ cxml-xml flexi-streams iterate named-readtables puri split-sequence swank
+ symbol-munger trivial-features trivial-gray-streams)
VERSION buildnode-20170403-git SIBLINGS
(buildnode-excel buildnode-html5 buildnode-kml buildnode-xul buildnode)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
index ecc1634bfce..86bdb36c8d2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/buildnode.nix
@@ -7,7 +7,7 @@ rec {
description = ''Tool for building up an xml dom nicely.'';
- deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
+ deps = [ args."alexandria" args."babel" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/buildnode/2017-04-03/buildnode-20170403-git.tgz'';
@@ -35,6 +35,7 @@ rec {
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
(NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+ (NAME named-readtables FILENAME named-readtables)
(NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
(NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
@@ -42,8 +43,9 @@ rec {
DEPENDENCIES
(alexandria babel buildnode-xhtml cl-interpol cl-ppcre cl-unicode
closer-mop closure-common closure-html collectors cxml cxml-dom
- cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri
- split-sequence swank symbol-munger trivial-features trivial-gray-streams)
+ cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2
+ named-readtables puri split-sequence swank symbol-munger trivial-features
+ trivial-gray-streams)
VERSION 20170403-git SIBLINGS
(buildnode-excel buildnode-html5 buildnode-kml buildnode-xhtml
buildnode-xul)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index 02e6e2bf604..f3e64cb965e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''caveman'';
- version = ''20171019-git'';
+ version = ''20180831-git'';
description = ''Web Application Framework for Common Lisp'';
- deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
+ deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz'';
- sha256 = ''0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra'';
+ url = ''http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz'';
+ sha256 = ''0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s'';
};
packageName = "caveman";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256
- 0yjhjhjnq7l6z4fj9l470hgsa609adm216fss5xsf43pljv2h5ra URL
- http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz
- MD5 41318d26a0825e504042fa693959feaf NAME caveman FILENAME caveman DEPS
+ 0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s URL
+ http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz
+ MD5 b417563f04b2619172127a6abeed786a NAME caveman FILENAME caveman DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -38,22 +38,26 @@ rec {
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
+ (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
+ (NAME clack-socket FILENAME clack-socket)
(NAME clack-test FILENAME clack-test)
(NAME clack-v1-compat FILENAME clack-v1-compat)
(NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode)
(NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+ (NAME http-body FILENAME http-body)
+ (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
(NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
(NAME lack-component FILENAME lack-component)
(NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
(NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
(NAME local-time FILENAME local-time) (NAME map-set FILENAME map-set)
- (NAME marshal FILENAME marshal) (NAME myway FILENAME myway)
+ (NAME marshal FILENAME marshal) (NAME md5 FILENAME md5)
+ (NAME myway FILENAME myway)
(NAME named-readtables FILENAME named-readtables)
(NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
(NAME prove FILENAME prove) (NAME quri FILENAME quri)
- (NAME smart-buffer FILENAME smart-buffer)
+ (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
(NAME split-sequence FILENAME split-sequence)
(NAME static-vectors FILENAME static-vectors)
(NAME trivial-backtrace FILENAME trivial-backtrace)
@@ -67,14 +71,15 @@ rec {
(alexandria anaphora babel babel-streams bordeaux-threads cffi cffi-grovel
cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text
cl-base64 cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project
- cl-reexport cl-syntax cl-syntax-annot cl-utilities clack clack-test
- clack-v1-compat dexador do-urlencode fast-http fast-io flexi-streams
- http-body ironclad jonathan lack lack-component lack-middleware-backtrace
- lack-util let-plus local-time map-set marshal myway named-readtables
- nibbles proc-parse prove quri smart-buffer split-sequence static-vectors
+ cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
+ clack-handler-hunchentoot clack-socket clack-test clack-v1-compat dexador
+ do-urlencode fast-http fast-io flexi-streams http-body hunchentoot
+ ironclad jonathan lack lack-component lack-middleware-backtrace lack-util
+ let-plus local-time map-set marshal md5 myway named-readtables nibbles
+ proc-parse prove quri rfc2388 smart-buffer split-sequence static-vectors
trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
trivial-mimes trivial-types usocket xsubseq)
- VERSION 20171019-git SIBLINGS
+ VERSION 20180831-git SIBLINGS
(caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
caveman2)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index c8f34e0fa17..a9808173b62 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''chipz'';
version = ''20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index a420c22054f..531d429df24 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-aa'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index 42a7bd59585..a413743eb8d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-anonfun'';
version = ''20111203-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index d72a9c69ac0..377c8c2209b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async-repl'';
- version = ''cl-async-20171130-git'';
+ version = ''cl-async-20180711-git'';
description = ''REPL integration for CL-ASYNC.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
- sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
+ url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
+ sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
};
packageName = "cl-async-repl";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
- 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
- http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
- MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-repl FILENAME
+ 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
+ http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
+ MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-repl FILENAME
cl-async-repl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -39,5 +39,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
- VERSION cl-async-20171130-git SIBLINGS
+ VERSION cl-async-20180711-git SIBLINGS
(cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index f7392b880d1..2129c7f83f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async-ssl'';
- version = ''cl-async-20171130-git'';
+ version = ''cl-async-20180711-git'';
description = ''SSL Wrapper around cl-async socket implementation.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
- sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
+ url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
+ sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
};
packageName = "cl-async-ssl";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM cl-async-ssl DESCRIPTION
SSL Wrapper around cl-async socket implementation. SHA256
- 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
- http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
- MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async-ssl FILENAME
+ 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
+ http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
+ MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-ssl FILENAME
cl-async-ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,5 +40,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
trivial-features trivial-gray-streams vom)
- VERSION cl-async-20171130-git SIBLINGS
+ VERSION cl-async-20180711-git SIBLINGS
(cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 90638ed56f1..e5a2a0bc7fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-async'';
- version = ''20171130-git'';
+ version = ''20180711-git'';
parasites = [ "cl-async-base" "cl-async-util" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
- sha256 = ''0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm'';
+ url = ''http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz'';
+ sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz'';
};
packageName = "cl-async";
@@ -20,9 +20,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
- 0z3bxnzknb9dbisn9d0z1nw6qpswf8cn97v3mfrfq48q9hz11nvm URL
- http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz
- MD5 4e54a593f8c7f02a2c7f7e0e07247c05 NAME cl-async FILENAME cl-async DEPS
+ 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL
+ http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz
+ MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async FILENAME cl-async DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -37,5 +37,5 @@ rec {
(alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
vom)
- VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+ VERSION 20180711-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
PARASITES (cl-async-base cl-async-util)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index b0fe8888dcf..56ccab7b5cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-csv'';
- version = ''20180228-git'';
+ version = ''20180831-git'';
parasites = [ "cl-csv/speed-test" "cl-csv/test" ];
description = ''Facilities for reading and writing CSV format files'';
- deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ];
+ deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz'';
- sha256 = ''1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r'';
+ url = ''http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz'';
+ sha256 = ''0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd'';
};
packageName = "cl-csv";
@@ -21,16 +21,17 @@ rec {
}
/* (SYSTEM cl-csv DESCRIPTION
Facilities for reading and writing CSV format files SHA256
- 1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r URL
- http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz
- MD5 be174a4d7cc2ea24418df63757daed94 NAME cl-csv FILENAME cl-csv DEPS
+ 0cy2pnzm3c6hmimp0kl5nz03rw6nzgy37i1ifpg9grmd3wipm9fd URL
+ http://beta.quicklisp.org/archive/cl-csv/2018-08-31/cl-csv-20180831-git.tgz
+ MD5 4bd0ef366dea9d48c4581ed73a208cf3 NAME cl-csv FILENAME cl-csv DEPS
((NAME alexandria FILENAME alexandria)
(NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
(NAME cl-unicode FILENAME cl-unicode)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2))
+ (NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+ (NAME named-readtables FILENAME named-readtables))
DEPENDENCIES
(alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
- lisp-unit2)
- VERSION 20180228-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
+ lisp-unit2 named-readtables)
+ VERSION 20180831-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
(cl-csv/speed-test cl-csv/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 995ef9bc745..40c1ac7d6a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-dbi'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
description = '''';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "cl-dbi";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
- 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME cl-dbi FILENAME cl-dbi DEPS
+ 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME cl-dbi FILENAME cl-dbi DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
dbi named-readtables split-sequence trivial-types)
- VERSION 20180430-git SIBLINGS
+ VERSION 20180831-git SIBLINGS
(dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
index 0321572e72a..61a35f2b58c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-html-parse.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-html-parse'';
version = ''20161031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
index d4ce8531291..1f58be6c09e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-interpol'';
- version = ''20171227-git'';
+ version = ''20180711-git'';
parasites = [ "cl-interpol-test" ];
description = '''';
- deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" ];
+ deps = [ args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."named-readtables" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz'';
- sha256 = ''1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy'';
+ url = ''http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz'';
+ sha256 = ''1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r'';
};
packageName = "cl-interpol";
@@ -20,11 +20,12 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256
- 1m4vxw8hskgqi0mnkm7qknwbnri2m69ab7qyd4kbpm2igsi02kzy URL
- http://beta.quicklisp.org/archive/cl-interpol/2017-12-27/cl-interpol-20171227-git.tgz
- MD5 e9d2f0238bb8f7a0c5b1ef1e6ef390ae NAME cl-interpol FILENAME cl-interpol
+ 1s88m5kci9y9h3ycvqm0xjzbkbd8zhm9rxp2a674hmgrjfqras0r URL
+ http://beta.quicklisp.org/archive/cl-interpol/2018-07-11/cl-interpol-20180711-git.tgz
+ MD5 b2d6893ef703c5b6e5736fa33ba0794e NAME cl-interpol FILENAME cl-interpol
DEPS
((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unicode FILENAME cl-unicode)
- (NAME flexi-streams FILENAME flexi-streams))
- DEPENDENCIES (cl-ppcre cl-unicode flexi-streams) VERSION 20171227-git
- SIBLINGS NIL PARASITES (cl-interpol-test)) */
+ (NAME flexi-streams FILENAME flexi-streams)
+ (NAME named-readtables FILENAME named-readtables))
+ DEPENDENCIES (cl-ppcre cl-unicode flexi-streams named-readtables) VERSION
+ 20180711-git SIBLINGS NIL PARASITES (cl-interpol-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index 825fea4eb90..dfabda0428f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-l10n-cldr'';
version = ''20120909-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index 1aced09d34f..c950fa292a8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-libuv'';
- version = ''20180328-git'';
+ version = ''20180831-git'';
description = ''Low-level libuv bindings for Common Lisp.'';
deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz'';
- sha256 = ''1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p'';
+ url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz'';
+ sha256 = ''1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f'';
};
packageName = "cl-libuv";
@@ -18,13 +18,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp.
- SHA256 1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p URL
- http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz
- MD5 c50f2cca0bd8d25db35b4ec176242858 NAME cl-libuv FILENAME cl-libuv DEPS
+ SHA256 1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f URL
+ http://beta.quicklisp.org/archive/cl-libuv/2018-08-31/cl-libuv-20180831-git.tgz
+ MD5 d755a060faac0d50a4500ae1628401ce NAME cl-libuv FILENAME cl-libuv DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
(NAME cffi-toolchain FILENAME cffi-toolchain)
(NAME trivial-features FILENAME trivial-features))
DEPENDENCIES
(alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION
- 20180328-git SIBLINGS NIL PARASITES NIL) */
+ 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 67468edbb6c..8967b0970c5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-markup'';
version = ''20131003-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index f546e4711ac..e8034b11c23 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-paths'';
version = ''cl-vectors-20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 60e38a7de72..a0443cb5af0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-postgres'';
- version = ''postmodern-20180430-git'';
+ version = ''postmodern-20180831-git'';
- parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
+ parasites = [ "cl-postgres/tests" ];
description = ''Low-level client library for PostgreSQL'';
- deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];
+ deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
- sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
+ url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz'';
+ sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx'';
};
packageName = "cl-postgres";
@@ -20,14 +20,13 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
- SHA256 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
- http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
- MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME cl-postgres FILENAME cl-postgres
+ SHA256 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL
+ http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz
+ MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME cl-postgres FILENAME cl-postgres
DEPS
((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)
- (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
(NAME split-sequence FILENAME split-sequence)
(NAME usocket FILENAME usocket))
- DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket)
- VERSION postmodern-20180430-git SIBLINGS (postmodern s-sql simple-date)
- PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
+ DEPENDENCIES (fiveam md5 split-sequence usocket) VERSION
+ postmodern-20180831-git SIBLINGS (postmodern s-sql simple-date) PARASITES
+ (cl-postgres/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 7853d5a279a..e65c0a03ddc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-ppcre-unicode'';
- version = ''cl-ppcre-20171227-git'';
+ version = ''cl-ppcre-20180831-git'';
parasites = [ "cl-ppcre-unicode-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."cl-ppcre" args."cl-ppcre-test" args."cl-unicode" args."flexi-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz'';
- sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4'';
+ url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
+ sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
};
packageName = "cl-ppcre-unicode";
@@ -21,13 +21,13 @@ rec {
}
/* (SYSTEM cl-ppcre-unicode DESCRIPTION
Perl-compatible regular expression library (Unicode) SHA256
- 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL
- http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz
- MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre-unicode FILENAME
+ 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
+ http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
+ MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre-unicode FILENAME
cl-ppcre-unicode DEPS
((NAME cl-ppcre FILENAME cl-ppcre)
(NAME cl-ppcre-test FILENAME cl-ppcre-test)
(NAME cl-unicode FILENAME cl-unicode)
(NAME flexi-streams FILENAME flexi-streams))
DEPENDENCIES (cl-ppcre cl-ppcre-test cl-unicode flexi-streams) VERSION
- cl-ppcre-20171227-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
+ cl-ppcre-20180831-git SIBLINGS (cl-ppcre) PARASITES (cl-ppcre-unicode-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index cbdf3a47146..3f56cf3dfae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-ppcre'';
- version = ''20171227-git'';
+ version = ''20180831-git'';
parasites = [ "cl-ppcre-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."flexi-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz'';
- sha256 = ''0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4'';
+ url = ''http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz'';
+ sha256 = ''03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb'';
};
packageName = "cl-ppcre";
@@ -20,8 +20,8 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library
- SHA256 0vdic9kxjslplafh6d00m7mab38hw09ps2sxxbg3adciwvspvmw4 URL
- http://beta.quicklisp.org/archive/cl-ppcre/2017-12-27/cl-ppcre-20171227-git.tgz
- MD5 9d8ce62ef1a71a5e1e144a31be698d8c NAME cl-ppcre FILENAME cl-ppcre DEPS
+ SHA256 03x6hg2wzjwx9znqpzs9mmbrz81380ac6jkyblnsafbzr3d0rgyb URL
+ http://beta.quicklisp.org/archive/cl-ppcre/2018-08-31/cl-ppcre-20180831-git.tgz
+ MD5 021ef17563de8e5d5f5942629972785d NAME cl-ppcre FILENAME cl-ppcre DEPS
((NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES (flexi-streams)
- VERSION 20171227-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
+ VERSION 20180831-git SIBLINGS (cl-ppcre-unicode) PARASITES (cl-ppcre-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 658ffdb51b8..15fd56107c8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-project'';
- version = ''20171019-git'';
+ version = ''20180831-git'';
description = ''Generate a skeleton for modern project'';
deps = [ args."alexandria" args."anaphora" args."bordeaux-threads" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."let-plus" args."local-time" args."prove" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz'';
- sha256 = ''1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q'';
+ url = ''http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz'';
+ sha256 = ''0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s'';
};
packageName = "cl-project";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256
- 1phgpik46dvqxnd49kccy4fh653659qd86hv7km50m07nzm8fn7q URL
- http://beta.quicklisp.org/archive/cl-project/2017-10-19/cl-project-20171019-git.tgz
- MD5 9dbfd7f9b0a83ca608031ebf32185a0f NAME cl-project FILENAME cl-project
+ 0iifc03sj982bjakvy0k3m6zsidc3k1ds6xaq36wzgzgw7x6lm0s URL
+ http://beta.quicklisp.org/archive/cl-project/2018-08-31/cl-project-20180831-git.tgz
+ MD5 11fbcc0f4f5c6d7b921eb83ab5f3ee1b NAME cl-project FILENAME cl-project
DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -32,4 +32,4 @@ rec {
DEPENDENCIES
(alexandria anaphora bordeaux-threads cl-ansi-text cl-colors cl-emb cl-fad
cl-ppcre let-plus local-time prove uiop)
- VERSION 20171019-git SIBLINGS (cl-project-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (cl-project-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 4434e711d9d..6d284b7b012 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-unification'';
version = ''20171227-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 1b78d0d2898..750da99d5d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''cl-utilities'';
version = ''1.2.4'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index a757b3d4a8a..af0e917425a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl_plus_ssl'';
- version = ''cl+ssl-20180328-git'';
+ version = ''cl+ssl-20180831-git'';
parasites = [ "openssl-1.1.0" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz'';
- sha256 = ''095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62'';
+ url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz'';
+ sha256 = ''1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r'';
};
packageName = "cl+ssl";
@@ -20,9 +20,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
- 095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62 URL
- http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz
- MD5 ec6f921505ba7bb8e35878b3ae9eea29 NAME cl+ssl FILENAME cl_plus_ssl DEPS
+ 1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r URL
+ http://beta.quicklisp.org/archive/cl+ssl/2018-08-31/cl+ssl-20180831-git.tgz
+ MD5 56cd0b42cd9f7b8645db330ebc98600c NAME cl+ssl FILENAME cl_plus_ssl DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@@ -33,5 +33,5 @@ rec {
DEPENDENCIES
(alexandria babel bordeaux-threads cffi flexi-streams trivial-features
trivial-garbage trivial-gray-streams uiop)
- VERSION cl+ssl-20180328-git SIBLINGS (cl+ssl.test) PARASITES
+ VERSION cl+ssl-20180831-git SIBLINGS (cl+ssl.test) PARASITES
(openssl-1.1.0)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
new file mode 100644
index 00000000000..252f9794e76
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -0,0 +1,54 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''clack-handler-hunchentoot'';
+ version = ''clack-20180831-git'';
+
+ description = ''Clack handler for Hunchentoot.'';
+
+ deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
+ };
+
+ packageName = "clack-handler-hunchentoot";
+
+ asdFilesToKeep = ["clack-handler-hunchentoot.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot.
+ SHA256 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-handler-hunchentoot
+ FILENAME clack-handler-hunchentoot DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME cffi FILENAME cffi) (NAME chunga FILENAME chunga)
+ (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64)
+ (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+ (NAME clack-socket FILENAME clack-socket)
+ (NAME flexi-streams FILENAME flexi-streams)
+ (NAME hunchentoot FILENAME hunchentoot) (NAME md5 FILENAME md5)
+ (NAME rfc2388 FILENAME rfc2388)
+ (NAME split-sequence FILENAME split-sequence)
+ (NAME trivial-backtrace FILENAME trivial-backtrace)
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-garbage FILENAME trivial-garbage)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+ (NAME usocket FILENAME usocket))
+ DEPENDENCIES
+ (alexandria babel bordeaux-threads cffi chunga cl+ssl cl-base64 cl-fad
+ cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence
+ trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
+ usocket)
+ VERSION clack-20180831-git SIBLINGS
+ (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket
+ clack-test clack-v1-compat clack t-clack-handler-fcgi
+ t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
+ t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
+ clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth
+ clack-middleware-postmodern clack-middleware-rucksack
+ clack-session-store-dbi t-clack-middleware-auth-basic
+ t-clack-middleware-csrf)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index a4a66ecfa64..d5163cabe04 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''clack-socket'';
- version = ''clack-20180328-git'';
+ version = ''clack-20180831-git'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
- sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
};
packageName = "clack-socket";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-socket DESCRIPTION NIL SHA256
- 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
- http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
- MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-socket FILENAME
- clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180328-git SIBLINGS
+ 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-socket FILENAME
+ clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180831-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index be88069fd5d..1d081fbef58 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack-test'';
- version = ''clack-20180328-git'';
+ version = ''clack-20180831-git'';
description = ''Testing Clack Applications.'';
- deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
+ deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
- sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
};
packageName = "clack-test";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
- 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
- http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
- MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-test FILENAME clack-test
+ 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-test FILENAME clack-test
DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel)
@@ -36,21 +36,24 @@ rec {
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
- (NAME dexador FILENAME dexador) (NAME fast-http FILENAME fast-http)
- (NAME fast-io FILENAME fast-io)
+ (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
+ (NAME clack-socket FILENAME clack-socket) (NAME dexador FILENAME dexador)
+ (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+ (NAME http-body FILENAME http-body)
+ (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
(NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
(NAME lack-component FILENAME lack-component)
(NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
(NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
- (NAME local-time FILENAME local-time)
+ (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5)
(NAME named-readtables FILENAME named-readtables)
(NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
(NAME prove FILENAME prove) (NAME quri FILENAME quri)
- (NAME smart-buffer FILENAME smart-buffer)
+ (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
(NAME split-sequence FILENAME split-sequence)
(NAME static-vectors FILENAME static-vectors)
+ (NAME trivial-backtrace FILENAME trivial-backtrace)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-garbage FILENAME trivial-garbage)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
@@ -61,12 +64,14 @@ rec {
(alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
chipz chunga cl+ssl cl-annot cl-ansi-text cl-base64 cl-colors cl-cookie
cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
- dexador fast-http fast-io flexi-streams http-body ironclad jonathan lack
- lack-component lack-middleware-backtrace lack-util let-plus local-time
- named-readtables nibbles proc-parse prove quri smart-buffer split-sequence
- static-vectors trivial-features trivial-garbage trivial-gray-streams
- trivial-mimes trivial-types usocket xsubseq)
- VERSION clack-20180328-git SIBLINGS
+ clack-handler-hunchentoot clack-socket dexador fast-http fast-io
+ flexi-streams http-body hunchentoot ironclad jonathan lack lack-component
+ lack-middleware-backtrace lack-util let-plus local-time md5
+ named-readtables nibbles proc-parse prove quri rfc2388 smart-buffer
+ split-sequence static-vectors trivial-backtrace trivial-features
+ trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket
+ xsubseq)
+ VERSION clack-20180831-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-socket clack-v1-compat clack
t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index b810de3fd1c..8b2e2c70453 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack-v1-compat'';
- version = ''clack-20180328-git'';
+ version = ''clack-20180831-git'';
description = '''';
- deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
+ deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
- sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
};
packageName = "clack-v1-compat";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
- 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
- http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
- MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-v1-compat FILENAME
+ 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-v1-compat FILENAME
clack-v1-compat DEPS
((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
(NAME babel FILENAME babel)
@@ -37,19 +37,22 @@ rec {
(NAME cl-syntax FILENAME cl-syntax)
(NAME cl-syntax-annot FILENAME cl-syntax-annot)
(NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
+ (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
+ (NAME clack-socket FILENAME clack-socket)
(NAME clack-test FILENAME clack-test) (NAME dexador FILENAME dexador)
(NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+ (NAME http-body FILENAME http-body)
+ (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
(NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
(NAME lack-component FILENAME lack-component)
(NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
(NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
(NAME local-time FILENAME local-time) (NAME marshal FILENAME marshal)
- (NAME named-readtables FILENAME named-readtables)
+ (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables)
(NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
(NAME prove FILENAME prove) (NAME quri FILENAME quri)
- (NAME smart-buffer FILENAME smart-buffer)
+ (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
(NAME split-sequence FILENAME split-sequence)
(NAME static-vectors FILENAME static-vectors)
(NAME trivial-backtrace FILENAME trivial-backtrace)
@@ -63,13 +66,14 @@ rec {
(alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64
cl-colors cl-cookie cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot
- cl-utilities clack clack-test dexador fast-http fast-io flexi-streams
- http-body ironclad jonathan lack lack-component lack-middleware-backtrace
- lack-util let-plus local-time marshal named-readtables nibbles proc-parse
- prove quri smart-buffer split-sequence static-vectors trivial-backtrace
+ cl-utilities clack clack-handler-hunchentoot clack-socket clack-test
+ dexador fast-http fast-io flexi-streams http-body hunchentoot ironclad
+ jonathan lack lack-component lack-middleware-backtrace lack-util let-plus
+ local-time marshal md5 named-readtables nibbles proc-parse prove quri
+ rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace
trivial-features trivial-garbage trivial-gray-streams trivial-mimes
trivial-types uiop usocket xsubseq)
- VERSION clack-20180328-git SIBLINGS
+ VERSION clack-20180831-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 08e5ff71cc5..0b2828d06df 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clack'';
- version = ''20180328-git'';
+ version = ''20180831-git'';
description = ''Web application environment for Common Lisp'';
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
- sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
+ url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz'';
+ sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647'';
};
packageName = "clack";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256
- 1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
- http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
- MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack FILENAME clack DEPS
+ 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL
+ http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz
+ MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack FILENAME clack DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack)
@@ -31,7 +31,7 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads ironclad lack lack-component
lack-middleware-backtrace lack-util nibbles uiop)
- VERSION 20180328-git SIBLINGS
+ VERSION 20180831-git SIBLINGS
(clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
clack-handler-wookie clack-socket clack-test clack-v1-compat
t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index ec7599f2bd3..a13537d7e90 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''closer-mop'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz'';
- sha256 = ''1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v'';
+ url = ''http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz'';
+ sha256 = ''01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg'';
};
packageName = "closer-mop";
@@ -19,7 +19,7 @@ rec {
}
/* (SYSTEM closer-mop DESCRIPTION
Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
- SHA256 1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v URL
- http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz
- MD5 7578c66d4d468a21de9c5cf065b8615f NAME closer-mop FILENAME closer-mop
- DEPS NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS NIL PARASITES NIL) */
+ SHA256 01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg URL
+ http://beta.quicklisp.org/archive/closer-mop/2018-08-31/closer-mop-20180831-git.tgz
+ MD5 968426b07f9792f95fe3c9b83d68d756 NAME closer-mop FILENAME closer-mop
+ DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index 29c90369244..f55ccecadc6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''closure-html'';
- version = ''20140826-git'';
+ version = ''20180711-git'';
description = '''';
deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz'';
- sha256 = ''1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb'';
+ url = ''http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz'';
+ sha256 = ''0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq'';
};
packageName = "closure-html";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM closure-html DESCRIPTION NIL SHA256
- 1m07iv9r5ykj52fszwhwai5wv39mczk3m4zzh24gjhsprv35x8qb URL
- http://beta.quicklisp.org/archive/closure-html/2014-08-26/closure-html-20140826-git.tgz
- MD5 3f8d8a4fd54f915ca6cc5fdf29239d98 NAME closure-html FILENAME
+ 0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL
+ http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz
+ MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME
closure-html DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME closure-common FILENAME closure-common)
@@ -30,4 +30,4 @@ rec {
DEPENDENCIES
(alexandria babel closure-common flexi-streams trivial-features
trivial-gray-streams)
- VERSION 20140826-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 76f50463a6a..3f6d6ae32ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clss'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A DOM tree searching engine based on CSS selectors.'';
deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz'';
- sha256 = ''0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r'';
+ url = ''http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz'';
+ sha256 = ''18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd'';
};
packageName = "clss";
@@ -18,11 +18,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors.
- SHA256 0d4sblafhm5syjkv89h45i98dykpznb0ga3q9a2cxlvl98yklg8r URL
- http://beta.quicklisp.org/archive/clss/2018-01-31/clss-20180131-git.tgz MD5
- 138244b7871d8ea832832aa9cc5867e6 NAME clss FILENAME clss DEPS
+ SHA256 18jm89i9353khrp9q92bnqllkypcsmyd43jvdr6gl0n50fmzs5jd URL
+ http://beta.quicklisp.org/archive/clss/2018-08-31/clss-20180831-git.tgz MD5
+ 39b69790115d6c4fe4709f5a45b5d4a4 NAME clss FILENAME clss DEPS
((NAME array-utils FILENAME array-utils)
(NAME documentation-utils FILENAME documentation-utils)
(NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION
- 20180131-git SIBLINGS NIL PARASITES NIL) */
+ 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index bd2b0ff19bd..685e8128368 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clx'';
- version = ''20180430-git'';
+ version = ''20180711-git'';
parasites = [ "clx/test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."fiasco" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz'';
- sha256 = ''18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3'';
+ url = ''http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz'';
+ sha256 = ''0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h'';
};
packageName = "clx";
@@ -21,8 +21,8 @@ rec {
}
/* (SYSTEM clx DESCRIPTION
An implementation of the X Window System protocol in Lisp. SHA256
- 18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3 URL
- http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz MD5
- bf9c1d6b1b2856ddbd4bf2fa75bbc309 NAME clx FILENAME clx DEPS
- ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180430-git
+ 0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h URL
+ http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz MD5
+ 27d5e904d2b7e4cdf4e8492839d15bad NAME clx FILENAME clx DEPS
+ ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180711-git
SIBLINGS NIL PARASITES (clx/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 1ae6fa0f4ec..e1fb5965852 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''command-line-arguments'';
version = ''20151218-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index bb5ab940638..f4941aa80cd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''css-lite'';
version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
index ba523ae837d..c83b2993968 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -5,7 +5,7 @@ rec {
description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree'';
- deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+ deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -36,8 +36,9 @@ rec {
(NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME iterate FILENAME iterate) (NAME puri FILENAME puri)
- (NAME split-sequence FILENAME split-sequence)
+ (NAME iterate FILENAME iterate)
+ (NAME named-readtables FILENAME named-readtables)
+ (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
(NAME string-case FILENAME string-case) (NAME swank FILENAME swank)
(NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
@@ -46,8 +47,8 @@ rec {
DEPENDENCIES
(alexandria babel buildnode cl-html5-parser cl-interpol cl-ppcre cl-unicode
closer-mop closure-common closure-html collectors css-selectors cxml
- cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate puri
- split-sequence string-case swank symbol-munger trivial-features
- trivial-gray-streams yacc)
+ cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate
+ named-readtables puri split-sequence string-case swank symbol-munger
+ trivial-features trivial-gray-streams yacc)
VERSION css-selectors-20160628-git SIBLINGS
(css-selectors-stp css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
index fbe06a179fd..69ada2ce80a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -5,7 +5,7 @@ rec {
description = ''An implementation of css selectors that interacts with cxml-stp'';
- deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
+ deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."named-readtables" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -36,17 +36,19 @@ rec {
(NAME cxml-stp FILENAME cxml-stp) (NAME cxml-test FILENAME cxml-test)
(NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
- (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number)
- (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
- (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
+ (NAME iterate FILENAME iterate)
+ (NAME named-readtables FILENAME named-readtables)
+ (NAME parse-number FILENAME parse-number) (NAME puri FILENAME puri)
+ (NAME split-sequence FILENAME split-sequence) (NAME swank FILENAME swank)
+ (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-gray-streams FILENAME trivial-gray-streams)
(NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc))
DEPENDENCIES
(alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
closure-common closure-html collectors css-selectors cxml cxml-dom
- cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate parse-number
- puri split-sequence swank symbol-munger trivial-features
- trivial-gray-streams xpath yacc)
+ cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate
+ named-readtables parse-number puri split-sequence swank symbol-munger
+ trivial-features trivial-gray-streams xpath yacc)
VERSION css-selectors-20160628-git SIBLINGS
(css-selectors-simple-tree css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
index 2ad018e5549..3316f59447d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors.nix
@@ -7,7 +7,7 @@ rec {
description = ''An implementation of css selectors'';
- deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+ deps = [ args."alexandria" args."babel" args."buildnode" args."buildnode-xhtml" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."lisp-unit2" args."named-readtables" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
@@ -37,6 +37,7 @@ rec {
(NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
(NAME flexi-streams FILENAME flexi-streams)
(NAME iterate FILENAME iterate) (NAME lisp-unit2 FILENAME lisp-unit2)
+ (NAME named-readtables FILENAME named-readtables)
(NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
(NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
(NAME trivial-features FILENAME trivial-features)
@@ -45,8 +46,8 @@ rec {
DEPENDENCIES
(alexandria babel buildnode buildnode-xhtml cl-interpol cl-ppcre cl-unicode
closer-mop closure-common closure-html collectors cxml cxml-dom
- cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2 puri
- split-sequence swank symbol-munger trivial-features trivial-gray-streams
- yacc)
+ cxml-klacks cxml-test cxml-xml flexi-streams iterate lisp-unit2
+ named-readtables puri split-sequence swank symbol-munger trivial-features
+ trivial-gray-streams yacc)
VERSION 20160628-git SIBLINGS (css-selectors-simple-tree css-selectors-stp)
PARASITES (css-selectors-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 6dfa61634f2..218107e95d6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbd-mysql'';
- version = ''cl-dbi-20180430-git'';
+ version = ''cl-dbi-20180831-git'';
description = ''Database driver for MySQL.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "dbd-mysql";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
- 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-mysql FILENAME dbd-mysql DEPS
+ 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-mysql FILENAME dbd-mysql DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
@@ -35,5 +35,5 @@ rec {
(alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
cl-syntax-annot closer-mop dbi named-readtables split-sequence
trivial-features trivial-types)
- VERSION cl-dbi-20180430-git SIBLINGS
+ VERSION cl-dbi-20180831-git SIBLINGS
(cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index bb9558fda51..9387806255a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbd-postgres'';
- version = ''cl-dbi-20180430-git'';
+ version = ''cl-dbi-20180831-git'';
description = ''Database driver for PostgreSQL.'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "dbd-postgres";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
- 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-postgres FILENAME
+ 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-postgres FILENAME
dbd-postgres DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,5 +37,5 @@ rec {
(alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot
closer-mop dbi md5 named-readtables split-sequence trivial-garbage
trivial-types usocket)
- VERSION cl-dbi-20180430-git SIBLINGS
+ VERSION cl-dbi-20180831-git SIBLINGS
(cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 6e8e85e72ab..808914068a3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbd-sqlite3'';
- version = ''cl-dbi-20180430-git'';
+ version = ''cl-dbi-20180831-git'';
description = ''Database driver for SQLite3.'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "dbd-sqlite3";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
- 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-sqlite3 FILENAME dbd-sqlite3
+ 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-sqlite3 FILENAME dbd-sqlite3
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -38,5 +38,5 @@ rec {
(alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot
closer-mop dbi iterate named-readtables split-sequence sqlite
trivial-features trivial-types uiop)
- VERSION cl-dbi-20180430-git SIBLINGS
+ VERSION cl-dbi-20180831-git SIBLINGS
(cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index e75961dd9ac..2de381f44b8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbi'';
- version = ''cl-20180430-git'';
+ version = ''cl-20180831-git'';
description = ''Database independent interface for Common Lisp'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
- sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
+ url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz'';
+ sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9'';
};
packageName = "dbi";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
- SHA256 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
- http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
- MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbi FILENAME dbi DEPS
+ SHA256 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL
+ http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz
+ MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbi FILENAME dbi DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
DEPENDENCIES
(alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
named-readtables split-sequence trivial-types)
- VERSION cl-20180430-git SIBLINGS
+ VERSION cl-20180831-git SIBLINGS
(cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index d3111b18b22..2e392928f49 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dexador'';
- version = ''20180328-git'';
+ version = ''20180831-git'';
description = ''Yet another HTTP client for Common Lisp'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz'';
- sha256 = ''13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb'';
+ url = ''http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz'';
+ sha256 = ''1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs'';
};
packageName = "dexador";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
- 13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb URL
- http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz
- MD5 27eaa0c3c15e6e12e5d6046d62e4394f NAME dexador FILENAME dexador DEPS
+ 1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs URL
+ http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz
+ MD5 f2859026d90e63e79e8e4728168fab13 NAME dexador FILENAME dexador DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -48,4 +48,4 @@ rec {
fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer
split-sequence static-vectors trivial-features trivial-garbage
trivial-gray-streams trivial-mimes usocket xsubseq)
- VERSION 20180328-git SIBLINGS (dexador-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (dexador-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 7ee5f91a158..541f1c6a169 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''documentation-utils'';
- version = ''20180228-git'';
+ version = ''20180831-git'';
description = ''A few simple tools to help you with documenting your library.'';
deps = [ args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz'';
- sha256 = ''0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w'';
+ url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz'';
+ sha256 = ''0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5'';
};
packageName = "documentation-utils";
@@ -19,9 +19,9 @@ rec {
}
/* (SYSTEM documentation-utils DESCRIPTION
A few simple tools to help you with documenting your library. SHA256
- 0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w URL
- http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz
- MD5 b0c823120a376e0474433d151df52548 NAME documentation-utils FILENAME
+ 0g26hgppynrfdkpaplb77xzrsmsdzmlnqgl8336l08zmg80x90n5 URL
+ http://beta.quicklisp.org/archive/documentation-utils/2018-08-31/documentation-utils-20180831-git.tgz
+ MD5 e0f58ffe20602cada3413b4eeec909ef NAME documentation-utils FILENAME
documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent))
- DEPENDENCIES (trivial-indent) VERSION 20180228-git SIBLINGS NIL PARASITES
- NIL) */
+ DEPENDENCIES (trivial-indent) VERSION 20180831-git SIBLINGS
+ (multilang-documentation-utils) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 99792023bdd..82c8603d4a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''fast-http'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A fast HTTP protocol parser in Common Lisp'';
deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz'';
- sha256 = ''057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg'';
+ url = ''http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz'';
+ sha256 = ''1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm'';
};
packageName = "fast-http";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp
- SHA256 057wg23a1pfdr3522nzjpclxdrmx3azbnw57nkvdjmfp6fyb3rpg URL
- http://beta.quicklisp.org/archive/fast-http/2018-01-31/fast-http-20180131-git.tgz
- MD5 0722e935fb644d57d44e8604e41e689e NAME fast-http FILENAME fast-http DEPS
+ SHA256 1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm URL
+ http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz
+ MD5 d5e839f204b2dd78a390336572d1ee65 NAME fast-http FILENAME fast-http DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cl-utilities FILENAME cl-utilities)
(NAME flexi-streams FILENAME flexi-streams)
@@ -32,4 +32,4 @@ rec {
DEPENDENCIES
(alexandria babel cl-utilities flexi-streams proc-parse smart-buffer
trivial-features trivial-gray-streams xsubseq)
- VERSION 20180131-git SIBLINGS (fast-http-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (fast-http-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 7b37e5709e8..08b6d35a1fb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''flexi-streams'';
- version = ''20180328-git'';
+ version = ''20180711-git'';
parasites = [ "flexi-streams-test" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."trivial-gray-streams" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz'';
- sha256 = ''0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11'';
+ url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz'';
+ sha256 = ''1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2'';
};
packageName = "flexi-streams";
@@ -20,10 +20,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp
- SHA256 0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11 URL
- http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz
- MD5 af40ae10a0aab65eccfe161a32e1033b NAME flexi-streams FILENAME
+ SHA256 1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2 URL
+ http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz
+ MD5 1e5bc255540dcbd71f9cba56573cfb4c NAME flexi-streams FILENAME
flexi-streams DEPS
((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
- (trivial-gray-streams) VERSION 20180328-git SIBLINGS NIL PARASITES
+ (trivial-gray-streams) VERSION 20180711-git SIBLINGS NIL PARASITES
(flexi-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index 2aa5c074925..4a23cbf51ee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''form-fiddle'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A collection of utilities to destructure lambda forms.'';
deps = [ args."documentation-utils" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz'';
- sha256 = ''1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff'';
+ url = ''http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz'';
+ sha256 = ''013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj'';
};
packageName = "form-fiddle";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM form-fiddle DESCRIPTION
A collection of utilities to destructure lambda forms. SHA256
- 1i7rzn4ilr46wpkd2i10q875bxy8b54v7rvqzcq752hilx15hiff URL
- http://beta.quicklisp.org/archive/form-fiddle/2018-01-31/form-fiddle-20180131-git.tgz
- MD5 a0cc2ea1af29889e4991f7fefac366dd NAME form-fiddle FILENAME form-fiddle
+ 013n10rzqbfvdlz37pdmj4y7qv3fzv7q2hxv8aw7kcirg5gl7mkj URL
+ http://beta.quicklisp.org/archive/form-fiddle/2018-08-31/form-fiddle-20180831-git.tgz
+ MD5 1e9ae81423ed3c5f2e07c26f93b45956 NAME form-fiddle FILENAME form-fiddle
DEPS
((NAME documentation-utils FILENAME documentation-utils)
(NAME trivial-indent FILENAME trivial-indent))
- DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180131-git
+ DEPENDENCIES (documentation-utils trivial-indent) VERSION 20180831-git
SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 8061f3844e0..3d259fc5b6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''ironclad'';
- version = ''v0.39'';
+ version = ''v0.42'';
parasites = [ "ironclad/tests" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."nibbles" args."rt" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz'';
- sha256 = ''0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8'';
+ url = ''http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz'';
+ sha256 = ''1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr'';
};
packageName = "ironclad";
@@ -21,9 +21,9 @@ rec {
}
/* (SYSTEM ironclad DESCRIPTION
A cryptographic toolkit written in pure Common Lisp SHA256
- 0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8 URL
- http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz
- MD5 f4abb18cbbe173c569d8ed99800d9f9e NAME ironclad FILENAME ironclad DEPS
+ 1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr URL
+ http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz
+ MD5 18f2dbc9dbff97de9ea44af5344485b5 NAME ironclad FILENAME ironclad DEPS
((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES
- (nibbles rt) VERSION v0.39 SIBLINGS (ironclad-text) PARASITES
+ (nibbles rt) VERSION v0.42 SIBLINGS (ironclad-text) PARASITES
(ironclad/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index f85b128652d..f276ec72736 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''iterate'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
index 62a3ae2bb7d..e5cbad3e9e8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/kmrcl.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''kmrcl'';
version = ''20150923-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 79f2d38ef10..94edb06e6ae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''lack-component'';
- version = ''lack-20180430-git'';
+ version = ''lack-20180831-git'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
- sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+ url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+ sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
};
packageName = "lack-component";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-component DESCRIPTION NIL SHA256
- 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
- http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
- b9a0c08d54538679a8dd141022e8abb1 NAME lack-component FILENAME
- lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180430-git SIBLINGS
+ 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+ http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+ fd57a7185997a1a5f37bbd9d6899118d NAME lack-component FILENAME
+ lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180831-git SIBLINGS
(lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index c0acbc2f01f..a98028e0c06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack-middleware-backtrace'';
- version = ''lack-20180430-git'';
+ version = ''lack-20180831-git'';
description = '''';
deps = [ args."uiop" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
- sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+ url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+ sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
};
packageName = "lack-middleware-backtrace";
@@ -18,11 +18,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
- 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
- http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
- b9a0c08d54538679a8dd141022e8abb1 NAME lack-middleware-backtrace FILENAME
+ 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+ http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+ fd57a7185997a1a5f37bbd9d6899118d NAME lack-middleware-backtrace FILENAME
lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
- (uiop) VERSION lack-20180430-git SIBLINGS
+ (uiop) VERSION lack-20180831-git SIBLINGS
(lack-component lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-csrf lack-middleware-mount lack-middleware-session
lack-middleware-static lack-request lack-response lack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index 29fcd359f6b..3478ac8488b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack-util'';
- version = ''lack-20180430-git'';
+ version = ''lack-20180831-git'';
description = '''';
deps = [ args."ironclad" args."nibbles" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
- sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+ url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+ sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
};
packageName = "lack-util";
@@ -18,11 +18,11 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack-util DESCRIPTION NIL SHA256
- 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
- http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
- b9a0c08d54538679a8dd141022e8abb1 NAME lack-util FILENAME lack-util DEPS
+ 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+ http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+ fd57a7185997a1a5f37bbd9d6899118d NAME lack-util FILENAME lack-util DEPS
((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
- DEPENDENCIES (ironclad nibbles) VERSION lack-20180430-git SIBLINGS
+ DEPENDENCIES (ironclad nibbles) VERSION lack-20180831-git SIBLINGS
(lack-component lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 9260b06dd83..fdcda10a275 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lack'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
description = ''A minimal Clack'';
deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
- sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
+ url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz'';
+ sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n'';
};
packageName = "lack";
@@ -18,14 +18,14 @@ rec {
overrides = x: x;
}
/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
- 07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
- http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
- b9a0c08d54538679a8dd141022e8abb1 NAME lack FILENAME lack DEPS
+ 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL
+ http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5
+ fd57a7185997a1a5f37bbd9d6899118d NAME lack FILENAME lack DEPS
((NAME ironclad FILENAME ironclad)
(NAME lack-component FILENAME lack-component)
(NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles))
DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION
- 20180430-git SIBLINGS
+ 20180831-git SIBLINGS
(lack-component lack-middleware-accesslog lack-middleware-auth-basic
lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
index b44c0c8a987..a3ddc2fd953 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lift.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''lift'';
version = ''20151031-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
index 62197234305..8d21f88cbf8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-unit2.nix
@@ -7,7 +7,7 @@ rec {
description = ''Common Lisp library that supports unit testing.'';
- deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."symbol-munger" ];
+ deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."named-readtables" args."symbol-munger" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/lisp-unit2/2018-01-31/lisp-unit2-20180131-git.tgz'';
@@ -30,8 +30,9 @@ rec {
(NAME cl-unicode FILENAME cl-unicode)
(NAME flexi-streams FILENAME flexi-streams)
(NAME iterate FILENAME iterate)
+ (NAME named-readtables FILENAME named-readtables)
(NAME symbol-munger FILENAME symbol-munger))
DEPENDENCIES
(alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
- symbol-munger)
+ named-readtables symbol-munger)
VERSION 20180131-git SIBLINGS NIL PARASITES (lisp-unit2-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 1ca094d139d..ad335774cbb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''lquery'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
deps = [ args."array-utils" args."clss" args."documentation-utils" args."form-fiddle" args."plump" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz'';
- sha256 = ''1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9'';
+ url = ''http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz'';
+ sha256 = ''1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v'';
};
packageName = "lquery";
@@ -19,13 +19,13 @@ rec {
}
/* (SYSTEM lquery DESCRIPTION
A library to allow jQuery-like HTML/DOM manipulation. SHA256
- 1v5mmdx7a1ngydkcs3c5anmqrl0jxc52b8jisc2f0b5k0j1kgmm9 URL
- http://beta.quicklisp.org/archive/lquery/2018-01-31/lquery-20180131-git.tgz
- MD5 07e92aad32c4d12c4699956b57dbc9b8 NAME lquery FILENAME lquery DEPS
+ 1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v URL
+ http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz
+ MD5 d0d3efa47f151afeb754c4bc0c059acf NAME lquery FILENAME lquery DEPS
((NAME array-utils FILENAME array-utils) (NAME clss FILENAME clss)
(NAME documentation-utils FILENAME documentation-utils)
(NAME form-fiddle FILENAME form-fiddle) (NAME plump FILENAME plump)
(NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES
(array-utils clss documentation-utils form-fiddle plump trivial-indent)
- VERSION 20180131-git SIBLINGS (lquery-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (lquery-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index 006361ed80c..db25e6ae534 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''map-set'';
version = ''20160628-hg'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index c34d79f3d13..4f6842606b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''marshal'';
version = ''cl-20180328-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index c65d95d9ef7..953dd0a58a4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''md5'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index 5647b9a9270..d72e0839d1e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''metabang-bind'';
version = ''20171130-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index 3c289fefa9a..6334804c4f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''misc-extensions'';
version = ''20150608-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
index 29460307e69..a8cfc070bf9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mt19937.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''mt19937'';
version = ''1.1.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index e1d6a1477a7..82d06b1c93b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''named-readtables'';
version = ''20180131-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
index 67636d3f6cf..4e7c84566a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/net_dot_didierverna_dot_asdf-flv.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''net_dot_didierverna_dot_asdf-flv'';
version = ''asdf-flv-version-2.1'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index d706bc5bad1..ea6adac9e9f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -1,7 +1,7 @@
args @ { fetchurl, ... }:
rec {
baseName = ''nibbles'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
parasites = [ "nibbles/tests" ];
@@ -10,8 +10,8 @@ rec {
deps = [ args."rt" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz'';
- sha256 = ''1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g'';
+ url = ''http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz'';
+ sha256 = ''0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la'';
};
packageName = "nibbles";
@@ -21,8 +21,8 @@ rec {
}
/* (SYSTEM nibbles DESCRIPTION
A library for accessing octet-addressed blocks of data in big- and little-endian orders
- SHA256 1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g URL
- http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz
- MD5 8d8d1cc72ce11253d01854219ea20a06 NAME nibbles FILENAME nibbles DEPS
- ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180430-git SIBLINGS NIL
+ SHA256 0z25f2z54pnz1s35prqvnl42bv0xqh50y94bds1jwfv0wvfq27la URL
+ http://beta.quicklisp.org/archive/nibbles/2018-08-31/nibbles-20180831-git.tgz
+ MD5 4badf1f066a59c3c270d40be1116ecd5 NAME nibbles FILENAME nibbles DEPS
+ ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180831-git SIBLINGS NIL
PARASITES (nibbles/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index 5c1f90220eb..e636df0805e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''parse-number'';
version = ''v1.7'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 2bde901ad43..0a1591d7c42 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''plump'';
- version = ''20180228-git'';
+ version = ''20180831-git'';
description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz'';
- sha256 = ''0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01'';
+ url = ''http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz'';
+ sha256 = ''0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf'';
};
packageName = "plump";
@@ -19,11 +19,11 @@ rec {
}
/* (SYSTEM plump DESCRIPTION
An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256
- 0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01 URL
- http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz
- MD5 f210bc3fae00bac3140d939cbb2fd1de NAME plump FILENAME plump DEPS
+ 0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf URL
+ http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz
+ MD5 5a899a19906fd22fb0cb1c65eb584891 NAME plump FILENAME plump DEPS
((NAME array-utils FILENAME array-utils)
(NAME documentation-utils FILENAME documentation-utils)
(NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION
- 20180228-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
+ 20180831-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
index c90b252313b..ffa2e595c26 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ptester.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''ptester'';
version = ''20160929-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 41ead034791..25d535176a6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''rfc2388'';
- version = ''20130720-git'';
+ version = ''20180831-git'';
description = ''Implementation of RFC 2388'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
- sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
+ url = ''http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz'';
+ sha256 = ''1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33'';
};
packageName = "rfc2388";
@@ -18,7 +18,7 @@ rec {
overrides = x: x;
}
/* (SYSTEM rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256
- 1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6 URL
- http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz
- MD5 10a8bfea588196b1147d5dc7bf759bb1 NAME rfc2388 FILENAME rfc2388 DEPS NIL
- DEPENDENCIES NIL VERSION 20130720-git SIBLINGS NIL PARASITES NIL) */
+ 1r7vvrlq2wl213bm2aknkf34ynpl8y4nbkfir79srrdsl1337z33 URL
+ http://beta.quicklisp.org/archive/rfc2388/2018-08-31/rfc2388-20180831-git.tgz
+ MD5 f57e3c588e5e08210516260e67d69226 NAME rfc2388 FILENAME rfc2388 DEPS NIL
+ DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
index 8ed7c1a4499..d5be4be7daf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rt.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''rt'';
version = ''20101006-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index d55f7700092..9056cfbdcca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''salza2'';
version = ''2.0.9'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 07b1498f2e3..b1e89b3eef8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,17 +1,17 @@
args @ { fetchurl, ... }:
rec {
baseName = ''simple-date'';
- version = ''postmodern-20180430-git'';
+ version = ''postmodern-20180831-git'';
- parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
+ parasites = [ "simple-date/postgres-glue" ];
description = '''';
- deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
+ deps = [ args."cl-postgres" args."md5" args."usocket" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
- sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
+ url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz'';
+ sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx'';
};
packageName = "simple-date";
@@ -20,12 +20,12 @@ rec {
overrides = x: x;
}
/* (SYSTEM simple-date DESCRIPTION NIL SHA256
- 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
- http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
- MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME simple-date FILENAME simple-date
+ 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL
+ http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz
+ MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME simple-date FILENAME simple-date
DEPS
- ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam)
- (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket))
- DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION
- postmodern-20180430-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
- (simple-date/postgres-glue simple-date/tests)) */
+ ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5)
+ (NAME usocket FILENAME usocket))
+ DEPENDENCIES (cl-postgres md5 usocket) VERSION postmodern-20180831-git
+ SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+ (simple-date/postgres-glue)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
index 9cc6338c8b8..17a56c09b7e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/string-case.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''string-case'';
- version = ''20151218-git'';
+ version = ''20180711-git'';
description = ''string-case is a macro that generates specialised decision trees to dispatch on string equality'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz'';
- sha256 = ''0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw'';
+ url = ''http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz'';
+ sha256 = ''1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z'';
};
packageName = "string-case";
@@ -19,7 +19,7 @@ rec {
}
/* (SYSTEM string-case DESCRIPTION
string-case is a macro that generates specialised decision trees to dispatch on string equality
- SHA256 0l7bcysm1hwxaxxbld9fs0hj30739wf2ys3n6fhfdy9m5rz1cfbw URL
- http://beta.quicklisp.org/archive/string-case/2015-12-18/string-case-20151218-git.tgz
- MD5 fb747ba1276f0173f875876425b1acc3 NAME string-case FILENAME string-case
- DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL PARASITES NIL) */
+ SHA256 1n36ign4bv0idw14zyayn6i0n3iaff9yw92kpjh3qmdcq3asv90z URL
+ http://beta.quicklisp.org/archive/string-case/2018-07-11/string-case-20180711-git.tgz
+ MD5 145c4e13f1e90a070b0a95ca979a9680 NAME string-case FILENAME string-case
+ DEPS NIL DEPENDENCIES NIL VERSION 20180711-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 883e648a2f6..bb39c74c962 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''stumpwm'';
- version = ''20180430-git'';
+ version = ''20180831-git'';
description = ''A tiling, keyboard driven window manager'';
deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz'';
- sha256 = ''0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m'';
+ url = ''http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz'';
+ sha256 = ''1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w'';
};
packageName = "stumpwm";
@@ -18,10 +18,10 @@ rec {
overrides = x: x;
}
/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
- 0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m URL
- http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz
- MD5 40e1be3872e6a87a6f9e03f8ede5e48e NAME stumpwm FILENAME stumpwm DEPS
+ 1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w URL
+ http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz
+ MD5 a523654c5f7ffdfe6c6c4f37e9499851 NAME stumpwm FILENAME stumpwm DEPS
((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
(NAME clx FILENAME clx))
- DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180430-git SIBLINGS NIL
- PARASITES NIL) */
+ DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180831-git SIBLINGS
+ (stumpwm-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
index 6819e4b2571..9734118526c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swank.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''swank'';
- version = ''slime-v2.20'';
+ version = ''slime-v2.22'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz'';
- sha256 = ''0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26'';
+ url = ''http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz'';
+ sha256 = ''0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk'';
};
packageName = "swank";
@@ -18,7 +18,7 @@ rec {
overrides = x: x;
}
/* (SYSTEM swank DESCRIPTION NIL SHA256
- 0rl2ymqxcfkbvwkd8zfhyaaz8v2a927gmv9c43ganxnq6y473c26 URL
- http://beta.quicklisp.org/archive/slime/2017-08-30/slime-v2.20.tgz MD5
- 115188047b753ce1864586e114ecb46c NAME swank FILENAME swank DEPS NIL
- DEPENDENCIES NIL VERSION slime-v2.20 SIBLINGS NIL PARASITES NIL) */
+ 0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk URL
+ http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz MD5
+ edf090905d4f3a54ef62f8c13972bba5 NAME swank FILENAME swank DEPS NIL
+ DEPENDENCIES NIL VERSION slime-v2.22 SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index a772694b983..9a4afce3280 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-backtrace'';
version = ''20160531-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 5efc5766955..1a562c2288b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-features'';
version = ''20161204-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 9a285fea2f1..edb01bd2fc5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-gray-streams'';
- version = ''20180328-git'';
+ version = ''20180831-git'';
description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz'';
- sha256 = ''01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f'';
+ url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz'';
+ sha256 = ''0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170'';
};
packageName = "trivial-gray-streams";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-gray-streams DESCRIPTION
Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).
- SHA256 01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f URL
- http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz
- MD5 9f831cbb7a4efe93eaa8fa2acee4b01b NAME trivial-gray-streams FILENAME
- trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180328-git
+ SHA256 0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170 URL
+ http://beta.quicklisp.org/archive/trivial-gray-streams/2018-08-31/trivial-gray-streams-20180831-git.tgz
+ MD5 070733919aa016a508b2ecb443e37c80 NAME trivial-gray-streams FILENAME
+ trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180831-git
SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index e044f097701..4214779af32 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-indent'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''A very simple library to allow indentation hints for SWANK.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz'';
- sha256 = ''1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w'';
+ url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz'';
+ sha256 = ''017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m'';
};
packageName = "trivial-indent";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-indent DESCRIPTION
A very simple library to allow indentation hints for SWANK. SHA256
- 1y6m9nrhj923zj95824w7vsciqhv9cq7sq5x519x2ik0jfcaqp8w URL
- http://beta.quicklisp.org/archive/trivial-indent/2018-01-31/trivial-indent-20180131-git.tgz
- MD5 a915258466d07465da1f71476bf59d12 NAME trivial-indent FILENAME
- trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL
+ 017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m URL
+ http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz
+ MD5 0cc411500f5aa677cd771d45f4cd21b8 NAME trivial-indent FILENAME
+ trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index 6946141f112..f06c0d7ebf5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-mimes'';
- version = ''20180131-git'';
+ version = ''20180831-git'';
description = ''Tiny library to detect mime types in files.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz'';
- sha256 = ''0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b'';
+ url = ''http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz'';
+ sha256 = ''0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr'';
};
packageName = "trivial-mimes";
@@ -19,8 +19,8 @@ rec {
}
/* (SYSTEM trivial-mimes DESCRIPTION
Tiny library to detect mime types in files. SHA256
- 0wmnfiphrzr5br4mzds7lny36rqrdxv707r4frzygx7j0llrvs1b URL
- http://beta.quicklisp.org/archive/trivial-mimes/2018-01-31/trivial-mimes-20180131-git.tgz
- MD5 9c91e72a8ee2455f9c5cbba1f7d2fcef NAME trivial-mimes FILENAME
- trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL
+ 0nkf6ifjvh4fvmf7spmqmz64yh2l1f25gxq1r8s0z0vnrmpsggqr URL
+ http://beta.quicklisp.org/archive/trivial-mimes/2018-08-31/trivial-mimes-20180831-git.tgz
+ MD5 503680e90278947d888bcbe3338c74e3 NAME trivial-mimes FILENAME
+ trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20180831-git SIBLINGS NIL
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 1af66736f30..8cc04c2c64a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-types'';
version = ''20120407-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 753f21dbcb9..c925382d81d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''trivial-utf-8'';
version = ''20111001-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 0ac190993d8..1986f7c88f7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''uffi'';
version = ''20180228-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index afb8b388568..fdaa07109b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,15 +1,15 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''uiop'';
- version = ''3.3.1'';
+ version = ''3.3.2'';
description = '''';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz'';
- sha256 = ''0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc'';
+ url = ''http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz'';
+ sha256 = ''1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5'';
};
packageName = "uiop";
@@ -18,7 +18,7 @@ rec {
overrides = x: x;
}
/* (SYSTEM uiop DESCRIPTION NIL SHA256
- 0w9va40dr6l7fss9f7qlv7mp9f86sdjv5g2lz621a6wzi4911ghc URL
- http://beta.quicklisp.org/archive/uiop/2017-12-27/uiop-3.3.1.tgz MD5
- 7a90377c4fc96676d5fa5197d9e9ec11 NAME uiop FILENAME uiop DEPS NIL
- DEPENDENCIES NIL VERSION 3.3.1 SIBLINGS (asdf-driver) PARASITES NIL) */
+ 1q13a7dzc9vpd0w7c4xw03ijmlnyhjw2p76h0v8m7dyb23s7p9y5 URL
+ http://beta.quicklisp.org/archive/uiop/2018-07-11/uiop-3.3.2.tgz MD5
+ 8d7b7b4065873107147678c6ef72e5ee NAME uiop FILENAME uiop DEPS NIL
+ DEPENDENCIES NIL VERSION 3.3.2 SIBLINGS (asdf-driver) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
index 3a4b05e0526..6c456496732 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unit-test.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''unit-test'';
version = ''20120520-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index b4b4f4543a1..6d02b976470 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''usocket'';
- version = ''0.7.0.1'';
+ version = ''0.7.1'';
description = ''Universal socket library for Common Lisp'';
deps = [ args."split-sequence" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
- sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
+ url = ''http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz'';
+ sha256 = ''18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw'';
};
packageName = "usocket";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256
- 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL
- http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz
- MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket FILENAME usocket DEPS
+ 18w2f835lgiznv6rm1v7yq94dg5qjcmbj91kpvfjw81pk4i7i7lw URL
+ http://beta.quicklisp.org/archive/usocket/2018-08-31/usocket-0.7.1.tgz MD5
+ fb48ff59f0d71bfc9c2939aacdb123a0 NAME usocket FILENAME usocket DEPS
((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES
- (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)
+ (split-sequence) VERSION 0.7.1 SIBLINGS (usocket-server usocket-test)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index 11b9351c03a..6a4751f799e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''vom'';
version = ''20160825-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index cc5c23faf86..4a36b656353 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''woo'';
- version = ''20170830-git'';
+ version = ''20180831-git'';
description = ''An asynchronous HTTP server written in Common Lisp'';
deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz'';
- sha256 = ''130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv'';
+ url = ''http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz'';
+ sha256 = ''142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8'';
};
packageName = "woo";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp
- SHA256 130hgfp08gchn0fkfablpf18hsdi1k4hrc3iny5c8m1phjlknchv URL
- http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz MD5
- 3f506a771b3d8f2c7fc97b049dcfdedf NAME woo FILENAME woo DEPS
+ SHA256 142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8 URL
+ http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz MD5
+ 93dfbc504ebd4fa7ed5f444fcc5444e7 NAME woo FILENAME woo DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -43,4 +43,4 @@ rec {
cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse
quri smart-buffer split-sequence static-vectors swap-bytes
trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq)
- VERSION 20170830-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 8c4afa9697d..6db21bf9005 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
rec {
baseName = ''wookie'';
- version = ''20180228-git'';
+ version = ''20180831-git'';
description = ''An evented webserver for Common Lisp.'';
deps = [ args."alexandria" args."babel" args."babel-streams" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz'';
- sha256 = ''1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq'';
+ url = ''http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz'';
+ sha256 = ''1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx'';
};
packageName = "wookie";
@@ -18,9 +18,9 @@ rec {
overrides = x: x;
}
/* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256
- 1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq URL
- http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz
- MD5 7cd3d634686e532f2c6e2f5f2d4e1dae NAME wookie FILENAME wookie DEPS
+ 1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx URL
+ http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz
+ MD5 c825760241580a95c68b1ac6f428e07e NAME wookie FILENAME wookie DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME babel-streams FILENAME babel-streams)
(NAME blackbird FILENAME blackbird)
@@ -49,4 +49,4 @@ rec {
cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io
flexi-streams proc-parse quri smart-buffer split-sequence static-vectors
trivial-features trivial-gray-streams vom xsubseq)
- VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */
+ VERSION 20180831-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index c70c3f2e1e1..b9ab71744c3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''xsubseq'';
version = ''20170830-git'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
index 733185e2b26..c7031f4aa3f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yacc.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''yacc'';
version = ''cl-20101006-darcs'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 090aa670ad9..74e5d7e97e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -1,4 +1,4 @@
-{ fetchurl, ... }:
+args @ { fetchurl, ... }:
rec {
baseName = ''zpb-ttf'';
version = ''1.0.3'';
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 91493d7431e..face797fe2a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -48,7 +48,7 @@ in
cl_plus_ssl = addNativeLibs [pkgs.openssl];
cl-colors = skipBuildPhase;
cl-libuv = addNativeLibs [pkgs.libuv];
- cl-async-ssl = addNativeLibs [pkgs.openssl];
+ cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
cl-async-test = addNativeLibs [pkgs.openssl];
clsql = x: {
propagatedBuildInputs = with pkgs; [mysql.connector-c postgresql sqlite zlib];
@@ -143,7 +143,8 @@ $out/lib/common-lisp/query-fs"
fiveam md5 usocket
];
parasites = [
- "simple-date/tests"
+ # Needs pomo? Wants to do queries unconditionally?
+ # "simple-date/tests"
];
};
cl-postgres = x: {
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 71d974d9711..8a126d4fd98 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,9 +6,6 @@ let quicklisp-to-nix-packages = rec {
buildLispPackage = callPackage ./define-package.nix;
qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
- "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date";
-
-
"unit-test" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."unit-test" or (x: {}))
@@ -17,14 +14,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "clack-socket" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clack-socket" or (x: {}))
- (import ./quicklisp-to-nix-output/clack-socket.nix {
- inherit fetchurl;
- }));
-
-
"stefil" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."stefil" or (x: {}))
@@ -106,14 +95,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "rfc2388" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."rfc2388" or (x: {}))
- (import ./quicklisp-to-nix-output/rfc2388.nix {
- inherit fetchurl;
- }));
-
-
"net_dot_didierverna_dot_asdf-flv" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {}))
@@ -142,7 +123,6 @@ let quicklisp-to-nix-packages = rec {
inherit fetchurl;
"fiveam" = quicklisp-to-nix-packages."fiveam";
"md5" = quicklisp-to-nix-packages."md5";
- "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"usocket" = quicklisp-to-nix-packages."usocket";
}));
@@ -255,6 +235,7 @@ let quicklisp-to-nix-packages = rec {
"cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"swank" = quicklisp-to-nix-packages."swank";
@@ -287,6 +268,7 @@ let quicklisp-to-nix-packages = rec {
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
"lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"swank" = quicklisp-to-nix-packages."swank";
@@ -364,14 +346,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "md5" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."md5" or (x: {}))
- (import ./quicklisp-to-nix-output/md5.nix {
- inherit fetchurl;
- }));
-
-
"clsql-uffi" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clsql-uffi" or (x: {}))
@@ -498,6 +472,7 @@ let quicklisp-to-nix-packages = rec {
"cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
}));
@@ -510,6 +485,7 @@ let quicklisp-to-nix-packages = rec {
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
}));
@@ -565,6 +541,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "rfc2388" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."rfc2388" or (x: {}))
+ (import ./quicklisp-to-nix-output/rfc2388.nix {
+ inherit fetchurl;
+ }));
+
+
"named-readtables" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."named-readtables" or (x: {}))
@@ -589,6 +573,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "md5" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."md5" or (x: {}))
+ (import ./quicklisp-to-nix-output/md5.nix {
+ inherit fetchurl;
+ }));
+
+
"map-set" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."map-set" or (x: {}))
@@ -688,11 +680,14 @@ let quicklisp-to-nix-packages = rec {
"cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
"cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
"clack" = quicklisp-to-nix-packages."clack";
+ "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
"dexador" = quicklisp-to-nix-packages."dexador";
"fast-http" = quicklisp-to-nix-packages."fast-http";
"fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"http-body" = quicklisp-to-nix-packages."http-body";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"jonathan" = quicklisp-to-nix-packages."jonathan";
"lack" = quicklisp-to-nix-packages."lack";
@@ -701,14 +696,17 @@ let quicklisp-to-nix-packages = rec {
"lack-util" = quicklisp-to-nix-packages."lack-util";
"let-plus" = quicklisp-to-nix-packages."let-plus";
"local-time" = quicklisp-to-nix-packages."local-time";
+ "md5" = quicklisp-to-nix-packages."md5";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"nibbles" = quicklisp-to-nix-packages."nibbles";
"proc-parse" = quicklisp-to-nix-packages."proc-parse";
"prove" = quicklisp-to-nix-packages."prove";
"quri" = quicklisp-to-nix-packages."quri";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
"smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"static-vectors" = quicklisp-to-nix-packages."static-vectors";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
@@ -719,6 +717,42 @@ let quicklisp-to-nix-packages = rec {
}));
+ "clack-socket" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clack-socket" or (x: {}))
+ (import ./quicklisp-to-nix-output/clack-socket.nix {
+ inherit fetchurl;
+ }));
+
+
+ "clack-handler-hunchentoot" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clack-handler-hunchentoot" or (x: {}))
+ (import ./quicklisp-to-nix-output/clack-handler-hunchentoot.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "chunga" = quicklisp-to-nix-packages."chunga";
+ "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
"cl-syntax" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-syntax" or (x: {}))
@@ -1056,7 +1090,6 @@ let quicklisp-to-nix-packages = rec {
(import ./quicklisp-to-nix-output/simple-date.nix {
inherit fetchurl;
"cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
- "fiveam" = quicklisp-to-nix-packages."fiveam";
"md5" = quicklisp-to-nix-packages."md5";
"usocket" = quicklisp-to-nix-packages."usocket";
}));
@@ -1692,6 +1725,7 @@ let quicklisp-to-nix-packages = rec {
"cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"parse-number" = quicklisp-to-nix-packages."parse-number";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
@@ -1728,6 +1762,7 @@ let quicklisp-to-nix-packages = rec {
"cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"string-case" = quicklisp-to-nix-packages."string-case";
@@ -1763,6 +1798,7 @@ let quicklisp-to-nix-packages = rec {
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
"lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
"puri" = quicklisp-to-nix-packages."puri";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"swank" = quicklisp-to-nix-packages."swank";
@@ -2254,6 +2290,7 @@ let quicklisp-to-nix-packages = rec {
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"iterate" = quicklisp-to-nix-packages."iterate";
"lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
}));
@@ -2420,12 +2457,15 @@ let quicklisp-to-nix-packages = rec {
"cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
"cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
"clack" = quicklisp-to-nix-packages."clack";
+ "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
"clack-test" = quicklisp-to-nix-packages."clack-test";
"dexador" = quicklisp-to-nix-packages."dexador";
"fast-http" = quicklisp-to-nix-packages."fast-http";
"fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"http-body" = quicklisp-to-nix-packages."http-body";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"jonathan" = quicklisp-to-nix-packages."jonathan";
"lack" = quicklisp-to-nix-packages."lack";
@@ -2435,11 +2475,13 @@ let quicklisp-to-nix-packages = rec {
"let-plus" = quicklisp-to-nix-packages."let-plus";
"local-time" = quicklisp-to-nix-packages."local-time";
"marshal" = quicklisp-to-nix-packages."marshal";
+ "md5" = quicklisp-to-nix-packages."md5";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"nibbles" = quicklisp-to-nix-packages."nibbles";
"proc-parse" = quicklisp-to-nix-packages."proc-parse";
"prove" = quicklisp-to-nix-packages."prove";
"quri" = quicklisp-to-nix-packages."quri";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
"smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"static-vectors" = quicklisp-to-nix-packages."static-vectors";
@@ -2555,6 +2597,8 @@ let quicklisp-to-nix-packages = rec {
"cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
"cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
"clack" = quicklisp-to-nix-packages."clack";
+ "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
"clack-test" = quicklisp-to-nix-packages."clack-test";
"clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
"dexador" = quicklisp-to-nix-packages."dexador";
@@ -2563,6 +2607,7 @@ let quicklisp-to-nix-packages = rec {
"fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"http-body" = quicklisp-to-nix-packages."http-body";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
"ironclad" = quicklisp-to-nix-packages."ironclad";
"jonathan" = quicklisp-to-nix-packages."jonathan";
"lack" = quicklisp-to-nix-packages."lack";
@@ -2573,12 +2618,14 @@ let quicklisp-to-nix-packages = rec {
"local-time" = quicklisp-to-nix-packages."local-time";
"map-set" = quicklisp-to-nix-packages."map-set";
"marshal" = quicklisp-to-nix-packages."marshal";
+ "md5" = quicklisp-to-nix-packages."md5";
"myway" = quicklisp-to-nix-packages."myway";
"named-readtables" = quicklisp-to-nix-packages."named-readtables";
"nibbles" = quicklisp-to-nix-packages."nibbles";
"proc-parse" = quicklisp-to-nix-packages."proc-parse";
"prove" = quicklisp-to-nix-packages."prove";
"quri" = quicklisp-to-nix-packages."quri";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
"smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"static-vectors" = quicklisp-to-nix-packages."static-vectors";
diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index 9eba1e15b79..b3d50b2fb07 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -1,5 +1,6 @@
with import ../../../default.nix {};
let
+openssl_lib_marked = import ./openssl-lib-marked.nix;
self = rec {
name = "ql-to-nix";
env = buildEnv { name = name; paths = buildInputs; };
@@ -10,6 +11,6 @@ self = rec {
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
];
CPATH = "${libfixposix}/include";
- LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib";
+ LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${mysql.connector-c}/lib:${mysql.connector-c}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib";
};
in stdenv.mkDerivation self
diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix
deleted file mode 100644
index 83ba93e63b7..00000000000
--- a/pkgs/development/misc/avr/binutils/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
- version = "2.31.1";
-in
-stdenv.mkDerivation {
- name = "avr-binutils-${version}";
-
- src = fetchurl {
- url = "mirror://gnu/binutils/binutils-${version}.tar.bz2";
- sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z";
- };
- configureFlags = [ "--target=avr" "--enable-languages=c,c++" ];
-
- meta = with stdenv.lib; {
- description = "the GNU Binutils for AVR microcontrollers";
- homepage = http://www.gnu.org/software/binutils/;
- license = licenses.gpl3Plus;
- platforms = platforms.unix;
- maintainers = with maintainers; [ mguentner ];
- };
-}
diff --git a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch b/pkgs/development/misc/avr/gcc/avrbinutils-path.patch
deleted file mode 100644
index f0ec21b7589..00000000000
--- a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c
-index 838ebc2..3ac4ee7 100644
---- a/gcc/gcc-ar.c
-+++ b/gcc/gcc-ar.c
-@@ -118,8 +118,8 @@ setup_prefixes (const char *exec_path)
- dir_separator, NULL);
- prefix_from_string (self_libexec_prefix, &target_path);
-
-- /* Add path as a last resort. */
-- prefix_from_env ("PATH", &path);
-+ /* Add path to avrbinutils. */
-+ prefix_from_string ("@avrbinutils@/bin", &path);
- }
-
- int
diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix
deleted file mode 100644
index 5c9b56c9918..00000000000
--- a/pkgs/development/misc/avr/gcc/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }:
-
-let
- version = "8.2.0";
-in
-stdenv.mkDerivation {
-
- name = "avr-gcc-${version}";
- src = fetchurl {
- url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
- sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r";
- };
-
- patches = [
- ./avrbinutils-path.patch
- ];
-
- # avrbinutils-path.patch introduces a reference to @avrbinutils@, substitute
- # it now.
- postPatch = ''
- substituteInPlace gcc/gcc-ar.c --subst-var-by avrbinutils ${avrbinutils}
- '';
-
- buildInputs = [ gmp mpfr libmpc zlib avrbinutils ];
-
- nativeBuildInputs = [ texinfo ];
-
- hardeningDisable = [ "format" ];
-
- stripDebugList= [ "bin" "libexec" ];
-
- enableParallelBuilding = true;
-
- configurePhase = ''
- mkdir gcc-build
- cd gcc-build
- ../configure \
- --prefix=$out \
- --host=$CHOST \
- --build=$CHOST \
- --target=avr \
- --with-as=${avrbinutils}/bin/avr-as \
- --with-gnu-as \
- --with-gnu-ld \
- --with-ld=${avrbinutils}/bin/avr-ld \
- --with-system-zlib \
- --disable-install-libiberty \
- --disable-nls \
- --disable-libssp \
- --with-dwarf2 \
- --enable-languages=c,c++'';
-
- meta = with stdenv.lib; {
- description = "GNU Compiler Collection, version ${version} for AVR microcontrollers";
- homepage = http://gcc.gnu.org;
- license = licenses.gpl3Plus;
- platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ mguentner ];
- };
-}
diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix
index 039846d5fcf..afe30e4b5ee 100644
--- a/pkgs/development/misc/avr/libc/default.nix
+++ b/pkgs/development/misc/avr/libc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, avrgcc, avrbinutils, automake, autoconf }:
+{ stdenv, fetchurl, automake, autoconf }:
let
version = "2.0.0";
@@ -11,28 +11,21 @@ stdenv.mkDerivation {
sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj";
};
- buildInputs = [ avrgcc avrbinutils automake autoconf ];
- configurePhase = ''
- unset LD
- unset AS
- unset AR
- unset CC
- unset CXX
- unset RANLIB
- unset STRIP
-
- ./configure --prefix=$out --build=$(./config.guess) --host=avr
- '';
+ nativeBuildInputs = [ automake autoconf ];
# Make sure we don't strip the libraries in lib/gcc/avr.
- stripDebugList= "bin";
+ stripDebugList = "bin";
dontPatchELF = true;
+ passthru = {
+ incdir = "/avr/include";
+ };
+
meta = with stdenv.lib; {
description = "a C runtime library for AVR microcontrollers";
homepage = http://savannah.nongnu.org/projects/avr-libc/;
license = licenses.bsd3;
- platforms = platforms.unix;
+ platforms = platforms.all;
maintainers = with maintainers; [ mguentner ];
};
}
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index b43deeceb86..4cb612523dc 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -15,12 +15,12 @@ buildRustPackage rec {
cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk";
- meta = {
+ meta = with stdenv.lib; {
homepage = https://github.com/cgag/loc;
description = "Count lines of code quickly";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ ];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
new file mode 100644
index 00000000000..693cfa093b0
--- /dev/null
+++ b/pkgs/development/misc/newlib/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, buildPackages }:
+
+let version = "3.0.0";
+in stdenv.mkDerivation {
+ name = "newlib-${version}";
+ src = fetchurl {
+ url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
+ sha256 = "0chka3szh50krcz2dcxcsr1v1i000jylwnsrp2pgrrblxqsn6mn8";
+ };
+
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+ # newlib expects CC to build for build platform, not host platform
+ preConfigure = ''
+ export CC=cc
+ '';
+
+ configurePlatforms = [ "build" "target" ];
+ configureFlags = [
+ "--host=${stdenv.buildPlatform.config}"
+
+ "--disable-newlib-supplied-syscalls"
+ "--disable-nls"
+ "--enable-newlib-io-long-long"
+ "--enable-newlib-register-fini"
+ "--enable-newlib-retargetable-locking"
+ ];
+
+ dontDisableStatic = true;
+
+ passthru = {
+ incdir = "/${stdenv.targetPlatform.config}/include";
+ libdir = "/${stdenv.targetPlatform.config}/lib";
+ };
+}
diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix
new file mode 100644
index 00000000000..0a7b4fd9d9a
--- /dev/null
+++ b/pkgs/development/misc/qmk_firmware/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub
+, avrgcc, avrbinutils
+, gcc-arm-embedded, binutils-arm-embedded
+, teensy-loader-cli, dfu-programmer, dfu-util }:
+
+let version = "0.6.144";
+
+in stdenv.mkDerivation {
+ name = "qmk_firmware-${version}";
+ src = fetchFromGitHub {
+ owner = "qmk";
+ repo = "qmk_firmware";
+ rev = version;
+ sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn";
+ fetchSubmodules = true;
+ };
+ buildFlags = "all:default";
+ NIX_CFLAGS_COMPILE = "-Wno-error";
+ nativeBuildInputs = [
+ avrgcc
+ avrbinutils
+ gcc-arm-embedded
+ teensy-loader-cli
+ dfu-programmer
+ dfu-util
+ ];
+}
diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix
index 0c601c7773c..21230464e74 100644
--- a/pkgs/development/misc/stm32/betaflight/default.nix
+++ b/pkgs/development/misc/stm32/betaflight/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, gcc-arm-embedded, python2
+, gcc-arm-embedded, binutils-arm-embedded, python2
, skipTargets ? [
# These targets do not build, for the reasons listed, along with the last version checked.
# Probably all of the issues with these targets need to be addressed upstream.
@@ -24,8 +24,8 @@ in stdenv.mkDerivation rec {
sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5";
};
- buildInputs = [
- gcc-arm-embedded
+ nativeBuildInputs = [
+ gcc-arm-embedded binutils-arm-embedded
python2
];
@@ -58,7 +58,6 @@ in stdenv.mkDerivation rec {
homepage = https://github.com/betaflight/betaflight;
license = licenses.gpl3;
maintainers = with maintainers; [ elitak ];
- platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix
index cb9cc80d325..9c35ac2ffce 100644
--- a/pkgs/development/misc/stm32/inav/default.nix
+++ b/pkgs/development/misc/stm32/inav/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
-, gcc-arm-embedded, ruby
+, gcc-arm-embedded, binutils-arm-embedded, ruby
}:
let
@@ -17,8 +17,8 @@ in stdenv.mkDerivation rec {
sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y";
};
- buildInputs = [
- gcc-arm-embedded
+ nativeBuildInputs = [
+ gcc-arm-embedded binutils-arm-embedded
ruby
];
@@ -50,7 +50,6 @@ in stdenv.mkDerivation rec {
homepage = https://inavflight.github.io;
license = licenses.gpl3;
maintainers = with maintainers; [ elitak ];
- platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index 1bc1d110db1..68792038d00 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
@@ -35,7 +35,7 @@ This is the Android Software Development Kit License Agreement
3.3 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you.
-3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK; or (b) load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK.
+3.4 You may not use the SDK for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK.
3.5 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement.
@@ -587,7 +587,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
3
-
+
34908058
1f92abf3a76be66ae8032257fc7620acbd2b2e3a
google_apis-3-r03.zip
@@ -614,7 +614,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
42435735
9b6e86d8568558de4d606a7debc4f6049608dbd0
google_apis-4_r02.zip
@@ -641,7 +641,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
49123776
46eaeb56b645ee7ffa24ede8fa17f3df70db0503
google_apis-5_r01.zip
@@ -668,7 +668,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
53382941
5ff545d96e031e09580a6cf55713015c7d4936b2
google_apis-6_r01.zip
@@ -695,7 +695,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
53691339
2e7f91e0fe34fef7f58aeced973c6ae52361b5ac
google_apis-7_r01.zip
@@ -722,7 +722,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
59505020
3079958e7ec87222cac1e6b27bc471b27bf2c352
google_apis-8_r02.zip
@@ -749,7 +749,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
63401546
78664645a1e9accea4430814f8694291a7f1ea5d
google_apis-9_r02.zip
@@ -776,7 +776,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
65781578
cc0711857c881fa7534f90cf8cc09b8fe985484d
google_apis-10_r02.zip
@@ -807,7 +807,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
83477179
5eab5e81addee9f3576d456d205208314b5146a5
google_apis-11_r01.zip
@@ -834,7 +834,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
86099835
e9999f4fa978812174dfeceec0721c793a636e5d
google_apis-12_r01.zip
@@ -865,7 +865,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
88615525
3b153edd211c27dc736c893c658418a4f9041417
google_apis-13_r01.zip
@@ -896,7 +896,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
2
-
+
106533714
f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39
google_apis-14_r02.zip
@@ -925,7 +925,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
3
-
+
106624396
d0d2bf26805eb271693570a1aaec33e7dc3f45e9
google_apis-15_r03.zip
@@ -958,7 +958,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
4
-
+
127341982
ee6acf1b01020bfa8a8e24725dbc4478bee5e792
google_apis-16_r04.zip
@@ -991,7 +991,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
4
-
+
137231243
a076be0677f38df8ca5536b44dfb411a0c808c4f
google_apis-17_r04.zip
@@ -1024,7 +1024,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
4
-
+
143195183
6109603409debdd40854d4d4a92eaf8481462c8b
google_apis-18_r04.zip
@@ -1057,7 +1057,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
20
-
+
147081
5b933abe830b2f25b4c0f171d45e9e0651e56311
google_apis-19_r20.zip
@@ -1090,7 +1090,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1
-
+
154865
31361c2868f27343ee917fbd259c1463821b6145
google_apis-24_r1.zip
@@ -1123,7 +1123,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS&
1