diff --git a/.dir-locals.el b/.dir-locals.el
deleted file mode 100644
index a53c8aa6db54..000000000000
--- 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/CODEOWNERS b/.github/CODEOWNERS
index 76fb19529b03..80485eb1352a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,7 +12,7 @@
# Libraries
/lib @edolstra @nbp
-/lib/systems @nbp @ericson2314
+/lib/systems @nbp @ericson2314 @matthewbauer
/lib/generators.nix @edolstra @nbp @Profpatsch
/lib/debug.nix @edolstra @nbp @Profpatsch
@@ -20,9 +20,11 @@
/default.nix @nbp
/pkgs/top-level/default.nix @nbp @Ericson2314
/pkgs/top-level/impure.nix @nbp @Ericson2314
-/pkgs/top-level/stage.nix @nbp @Ericson2314
-/pkgs/stdenv/generic @Ericson2314
-/pkgs/stdenv/cross @Ericson2314
+/pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer
+/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
+/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
+/pkgs/stdenv/generic @Ericson2314 @matthewbauer
+/pkgs/stdenv/cross @Ericson2314 @matthewbauer
/pkgs/build-support/cc-wrapper @Ericson2314 @orivej
/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej
/pkgs/build-support/setup-hooks @Ericson2314
@@ -45,6 +47,9 @@
/nixos/doc/manual/man-nixos-option.xml @nbp
/nixos/modules/installer/tools/nixos-option.sh @nbp
+# NixOS modules
+/nixos/modules @Infinisil
+
# Python-related code and docs
/maintainers/scripts/update-python-libraries @FRidh
/pkgs/top-level/python-packages.nix @FRidh
@@ -74,6 +79,14 @@
/pkgs/stdenv/darwin @NixOS/darwin-maintainers
/pkgs/os-specific/darwin @NixOS/darwin-maintainers
+# C compilers
+/pkgs/development/compilers/gcc @matthewbauer
+/pkgs/development/compilers/llvm @matthewbauer
+
+# Compatibility stuff
+/pkgs/top-level/unix-tools.nix @matthewbauer
+/pkgs/development/tools/xcbuild @matthewbauer
+
# Beam-related (Erlang, Elixir, LFE, etc)
/pkgs/development/beam-modules @gleber
/pkgs/development/interpreters/erlang @gleber
@@ -97,3 +110,19 @@
/pkgs/desktops/plasma-5 @ttuegel
/pkgs/development/libraries/kde-frameworks @ttuegel
/pkgs/development/libraries/qt-5 @ttuegel
+
+# PostgreSQL and related stuff
+/pkgs/servers/sql/postgresql @thoughtpolice
+/nixos/modules/services/databases/postgresql.xml @thoughtpolice
+/nixos/modules/services/databases/postgresql.nix @thoughtpolice
+/nixos/tests/postgresql.nix @thoughtpolice
+
+# Dhall
+/pkgs/development/dhall-modules @Gabriel439 @Profpatsch
+/pkgs/development/interpreters/dhall @Gabriel439 @Profpatsch
+
+# Idris
+/pkgs/development/idris-modules @Infinisil
+
+# Bazel
+/pkgs/development/tools/build-managers/bazel @mboes @Profpatsch
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 576beb18de6a..07eddc80c253 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/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ab1a50865f09..22940f5ea989 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,6 +14,7 @@
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
+- [ ] Assured whether relevant documentation is up to date
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
---
diff --git a/.version b/.version
index 770bde1f44b3..360de6347ae2 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-18.09
+19.03
\ No newline at end of file
diff --git a/COPYING b/COPYING
index 198597a1b410..7c52fb768978 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 004bba34530d..29c023e4dcdf 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,15 @@ 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`.
+For pull requests, please rebase onto nixpkgs `master`.
[NixOS](https://nixos.org/nixos/) Linux distribution source code is located inside
`nixos/` folder.
@@ -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 f4b2640ac5a0..a74a01719c73 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 d0ba103fa9f1..cb07135e6858 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 ba77be6678c4..c6aed62a9396 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 b3f7f093835c..a8a4557b461c 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -56,25 +56,30 @@ foo { arg = ...; }
or list elements should be aligned:
# A long list.
-list =
- [ elem1
- elem2
- elem3
- ];
+list = [
+ elem1
+ elem2
+ elem3
+];
# A long attribute set.
-attrs =
- { attr1 = short_expr;
- attr2 =
- if true then big_expr else big_expr;
- };
-
-# Alternatively:
attrs = {
attr1 = short_expr;
attr2 =
if true then big_expr else big_expr;
};
+
+# Combined
+listOfAttrs = [
+ {
+ attr1 = 3;
+ attr2 = "fff";
+ }
+ {
+ attr1 = 5;
+ attr2 = "ggg";
+ }
+];
@@ -191,6 +196,23 @@ args.stdenv.mkDerivation (args // {
Package naming
+
+ The key words
+ must ,
+ must not ,
+ required ,
+ shall ,
+ shall not ,
+ should ,
+ should not ,
+ recommended ,
+ may ,
+ and optional in this section
+ are to be interpreted as described in
+ RFC 2119.
+ Only emphasized words are to be interpreted in this way.
+
+
In Nixpkgs, there are generally three different names associated with a
package:
@@ -231,14 +253,15 @@ args.stdenv.mkDerivation (args // {
- Generally, try to stick to the upstream package name.
+ The name attribute should
+ be identical to the upstream package name.
- Don’t use uppercase letters in the name attribute
- — e.g., "mplayer-1.0rc2" instead of
- "MPlayer-1.0rc2" .
+ The name attribute must not
+ contain uppercase letters — e.g., "mplayer-1.0rc2"
+ instead of "MPlayer-1.0rc2" .
@@ -252,14 +275,14 @@ args.stdenv.mkDerivation (args // {
If a package is not a release but a commit from a repository, then the
version part of the name must be the date of that
- (fetched) commit. The date must be in "YYYY-MM-DD"
+ (fetched) commit. The date must be in "YYYY-MM-DD"
format. Also append "unstable" to the name - e.g.,
"pkgname-unstable-2014-09-23" .
- Dashes in the package name should be preserved in new variable names,
+ Dashes in the package name should be preserved in new variable names,
rather than converted to underscores or camel cased — e.g.,
http-parser instead of http_parser
or httpParser . The hyphenated style is preferred in
@@ -268,7 +291,7 @@ args.stdenv.mkDerivation (args // {
- If there are multiple versions of a package, this should be reflected in
+ If there are multiple versions of a package, this should be reflected in
the variable names in all-packages.nix , e.g.
json-c-0-9 and json-c-0-11 . If
there is an obvious “default” version, make an attribute like
@@ -842,9 +865,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 c91f38f30930..624a5bb270ab 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -132,7 +132,7 @@
- The difference between an a package being unsupported on some system and
+ The difference between a package being unsupported on some system and
being broken is admittedly a bit fuzzy. If a program
ought to work on a certain platform, but doesn't, the
platform should be included in meta.platforms , but marked
@@ -175,11 +175,12 @@
- A more useful example, the following configuration allows only allows
- flash player and visual studio code:
+ For a more useful example, try the following. This configuration
+ only allows unfree packages named flash player and visual studio
+ code:
{
- allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
+ allowUnfreePredicate = (pkg: builtins.elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
}
@@ -286,8 +287,8 @@
You can define a function called packageOverrides in your
- local ~/.config/nixpkgs/config.nix to override nix
- packages. It must be a function that takes pkgs as an argument and return
+ local ~/.config/nixpkgs/config.nix to override Nix
+ packages. It must be a function that takes pkgs as an argument and returns a
modified set of packages.
{
@@ -325,7 +326,7 @@
};
};
}
-
+
To install it into our environment, you can just run nix-env -iA
@@ -347,7 +348,7 @@
};
};
}
-
+
pathsToLink tells Nixpkgs to only link the paths listed
@@ -383,7 +384,7 @@
};
};
}
-
+
This provides us with some useful documentation for using our packages.
@@ -395,15 +396,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 +422,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 +439,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 +460,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 +486,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 c7187d86d1b3..40cf11304eae 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -6,17 +6,17 @@
Introduction
- "Cross-compilation" means compiling a program on one machine for another
- type of machine. For example, a typical use of cross compilation is to
- compile programs for embedded devices. These devices often don't have the
- computing power and memory to compile their own programs. One might think
- that cross-compilation is a fairly niche concern, but there are advantages
- to being rigorous about distinguishing build-time vs run-time environments
- even when one is developing and deploying on the same machine. Nixpkgs is
- increasingly adopting the opinion that packages should be written with
- cross-compilation in mind, and nixpkgs should evaluate in a similar way (by
- minimizing cross-compilation-specific special cases) whether or not one is
- cross-compiling.
+ "Cross-compilation" means compiling a program on one machine for another type
+ of machine. For example, a typical use of cross-compilation is to compile
+ programs for embedded devices. These devices often don't have the computing
+ power and memory to compile their own programs. One might think that
+ cross-compilation is a fairly niche concern. However, there are significant
+ advantages to rigorously distinguishing between build-time and run-time
+ environments! This applies even when one is developing and deploying on the
+ same machine. Nixpkgs is increasingly adopting the opinion that packages
+ should be written with cross-compilation in mind, and nixpkgs should evaluate
+ in a similar way (by minimizing cross-compilation-specific special cases)
+ whether or not one is cross-compiling.
@@ -34,22 +34,23 @@
Platform parameters
- Nixpkgs follows the
- common
- historical convention of GNU autoconf of distinguishing between 3
- types of platform: build ,
- host , and target . In
- summary, build is the platform on which a package
- is being built, host is the platform on which it
- is to run. The third attribute, target , is
- relevant only for certain specific compilers and build tools.
+ Nixpkgs follows the conventions
+ of GNU autoconf. We distinguish between 3 types of platforms when
+ building a derivation: build ,
+ host , and target . In
+ summary, build is the platform on which a package
+ is being built, host is the platform on which it
+ will run. The third attribute, target , is relevant
+ only for certain specific compilers and build tools.
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...
.
@@ -63,7 +64,7 @@
The "build platform" is the platform on which a package is built. Once
someone has a built package, or pre-built binary package, the build
- platform should not matter and be safe to ignore.
+ platform should not matter and can be ignored.
@@ -93,11 +94,11 @@
The build process of certain compilers is written in such a way that the
compiler resulting from a single build can itself only produce binaries
- for a single platform. The task specifying this single "target platform"
- is thus pushed to build time of the compiler. The root cause of this
- mistake is often that the compiler (which will be run on the host) and
- the the standard library/runtime (which will be run on the target) are
- built by a single build process.
+ for a single platform. The task of specifying this single "target
+ platform" is thus pushed to build time of the compiler. The root cause of
+ this that the compiler (which will be run on the host) and the standard
+ library/runtime (which will be run on the target) are built by a single
+ build process.
There is no fundamental need to think about a single target ahead of
@@ -134,8 +135,10 @@
This is a two-component shorthand for the platform. Examples of this
would be "x86_64-darwin" and "i686-linux"; see
- lib.systems.doubles for more. This format isn't very
- standard, but has built-in support in Nix, such as the
+ lib.systems.doubles for more. The first component
+ corresponds to the CPU architecture of the platform and the second to the
+ operating system of the platform ([cpu]-[os] ). This
+ format has built-in support in Nix, such as the
builtins.currentSystem impure string.
@@ -146,12 +149,13 @@
- This is a 3- or 4- component shorthand for the platform. Examples of
- this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14".
- This is a standard format called the "LLVM target triple", as they are
- pioneered by LLVM and traditionally just used for the
- targetPlatform . This format is strictly more
- informative than the "Nix host double", as the previous format could
+ This is a 3- or 4- component shorthand for the platform. Examples of this
+ would be x86_64-unknown-linux-gnu and
+ aarch64-apple-darwin14 . This is a standard format
+ called the "LLVM target triple", as they are pioneered by LLVM. In the
+ 4-part form, this corresponds to
+ [cpu]-[vendor]-[os]-[abi] . This format is strictly
+ more informative than the "Nix host double", as the previous format could
analogously be termed. This needs a better name than
config !
@@ -163,12 +167,11 @@
- This is a nix representation of a parsed LLVM target triple with
- white-listed components. This can be specified directly, or actually
- parsed from the config . [Technically, only one need
- be specified and the others can be inferred, though the precision of
- inference may not be very good.] See
- lib.systems.parse for the exact representation.
+ This is a Nix representation of a parsed LLVM target triple
+ with white-listed components. This can be specified directly,
+ or actually parsed from the config . See
+ lib.systems.parse for the exact
+ representation.
@@ -192,7 +195,7 @@
These predicates are defined in lib.systems.inspect ,
- and slapped on every platform. They are superior to the ones in
+ and slapped onto every platform. They are superior to the ones in
stdenv as they force the user to be explicit about
which platform they are inspecting. Please use these instead of those.
@@ -220,7 +223,7 @@
In this section we explore the relationship between both runtime and
- buildtime dependencies and the 3 Autoconf platforms.
+ build-time dependencies and the 3 Autoconf platforms.
@@ -248,17 +251,17 @@
- Some examples will probably make this clearer. If a package is being built
- with a (build, host, target) platform triple of
- (foo, bar, bar) , then its build-time dependencies would
- have a triple of (foo, foo, bar) , and those
- packages' build-time dependencies would have triple of
- (foo, foo, foo) . In other words, it should take two
- "rounds" of following build-time dependency edges before one reaches a
- fixed point where, by the sliding window principle, the platform triple no
- longer changes. Indeed, this happens with cross compilation, where only
- rounds of native dependencies starting with the second necessarily coincide
- with native packages.
+ Some examples will make this clearer. If a package is being built with a
+ (build, host, target) platform triple of (foo,
+ bar, bar) , then its build-time dependencies would have a triple of
+ (foo, foo, bar) , and those packages'
+ build-time dependencies would have a triple of (foo, foo,
+ foo) . In other words, it should take two "rounds" of following
+ build-time dependency edges before one reaches a fixed point where, by the
+ sliding window principle, the platform triple no longer changes. Indeed,
+ this happens with cross-compilation, where only rounds of native
+ dependencies starting with the second necessarily coincide with native
+ packages.
@@ -270,23 +273,23 @@
- How does this work in practice? Nixpkgs is now structured so that
- build-time dependencies are taken from buildPackages ,
- whereas run-time dependencies are taken from the top level attribute set.
- For example, buildPackages.gcc should be used at build
- time, while gcc should be used at run time. Now, for
- most of Nixpkgs's history, there was no buildPackages ,
- and most packages have not been refactored to use it explicitly. Instead,
- one can use the six (gasp ) attributes used for
- specifying dependencies as documented in
- . We "splice" together the
- run-time and build-time package sets with callPackage ,
- and then mkDerivation for each of four attributes pulls
- the right derivation out. This splicing can be skipped when not cross
- compiling as the package sets are the same, but is a bit slow for cross
- compiling. Because of this, a best-of-both-worlds solution is in the works
- with no splicing or explicit access of buildPackages
- needed. For now, feel free to use either method.
+ How does this work in practice? Nixpkgs is now structured so that build-time
+ dependencies are taken from buildPackages , whereas
+ run-time dependencies are taken from the top level attribute set. For
+ example, buildPackages.gcc should be used at build-time,
+ while gcc should be used at run-time. Now, for most of
+ Nixpkgs's history, there was no buildPackages , and most
+ packages have not been refactored to use it explicitly. Instead, one can use
+ the six (gasp ) attributes used for specifying
+ dependencies as documented in . We
+ "splice" together the run-time and build-time package sets with
+ callPackage , and then mkDerivation for
+ each of four attributes pulls the right derivation out. This splicing can be
+ skipped when not cross-compiling as the package sets are the same, but is a
+ bit slow for cross-compiling. Because of this, a best-of-both-worlds
+ solution is in the works with no splicing or explicit access of
+ buildPackages needed. For now, feel free to use either
+ method.
@@ -304,11 +307,11 @@
Cross packaging cookbook
- Some frequently problems when packaging for cross compilation are good to
- just spell and answer. Ideally the information above is exhaustive, so this
- section cannot provide any new information, but its ludicrous and cruel to
- expect everyone to spend effort working through the interaction of many
- features just to figure out the same answer to the same common problem.
+ Some frequently encountered problems when packaging for cross-compilation
+ should be answered here. Ideally, the information above is exhaustive, so
+ this section cannot provide any new information, but it is ludicrous and
+ cruel to expect everyone to spend effort working through the interaction of
+ many features just to figure out the same answer to the same common problem.
Feel free to add to this list!
@@ -363,17 +366,9 @@
Cross-building packages
-
-
- More information needs to moved from the old wiki, especially
- , for this
- section.
-
-
-
Nixpkgs can be instantiated with localSystem alone, in
- which case there is no cross compiling and everything is built by and for
+ which case there is no cross-compiling and everything is built by and for
that system, or also with crossSystem , in which case
packages run on the latter, but all building happens on the former. Both
parameters take the same schema as the 3 (build, host, and target) platforms
@@ -390,7 +385,7 @@ nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).system
Eventually we would like to make these platform examples an unnecessary
convenience so that
-nix-build <nixpkgs> --arg crossSystem.config '<arch>-<os>-<vendor>-<abi>' -A whatever
+nix-build <nixpkgs> --arg crossSystem '{ config = "<arch>-<os>-<vendor>-<abi>"; }' -A whatever
works in the vast majority of cases. The problem today is dependencies on
other sorts of configuration which aren't given proper defaults. We rely on
the examples to crudely to set those configuration parameters in some
@@ -439,15 +434,14 @@ nix-build <nixpkgs> --arg crossSystem.config '<arch>-<os>-<
build plan or package set. A simple "build vs deploy" dichotomy is adequate:
the sliding window principle described in the previous section shows how to
interpolate between the these two "end points" to get the 3 platform triple
- for each bootstrapping stage. That means for any package a given package
- set, even those not bound on the top level but only reachable via
- dependencies or buildPackages , the three platforms will
- be defined as one of localSystem or
- crossSystem , with the former replacing the latter as one
- traverses build-time dependencies. A last simple difference then is
- crossSystem should be null when one doesn't want to
- cross-compile, while the *Platform s are always non-null.
- localSystem is always non-null.
+ for each bootstrapping stage. That means for any package a given package set,
+ even those not bound on the top level but only reachable via dependencies or
+ buildPackages , the three platforms will be defined as one
+ of localSystem or crossSystem , with the
+ former replacing the latter as one traverses build-time dependencies. A last
+ simple difference is that crossSystem should be null when
+ one doesn't want to cross-compile, while the *Platform s
+ are always non-null. localSystem is always non-null.
@@ -460,14 +454,14 @@ nix-build <nixpkgs> --arg crossSystem.config '<arch>-<os>-<
- If one explores nixpkgs, they will see derivations with names like
- gccCross . Such *Cross derivations is
- a holdover from before we properly distinguished between the host and
- target platforms —the derivation with "Cross" in the name covered the
- build = host != target case, while the other covered the
- host = target , with build platform the same or not based
- on whether one was using its .nativeDrv or
- .crossDrv . This ugliness will disappear soon.
+ If one explores Nixpkgs, they will see derivations with names like
+ gccCross . Such *Cross derivations is a
+ holdover from before we properly distinguished between the host and target
+ platforms—the derivation with "Cross" in the name covered the build
+ = host != target case, while the other covered the host =
+ target , with build platform the same or not based on whether one
+ was using its .nativeDrv or .crossDrv .
+ This ugliness will disappear soon.
diff --git a/doc/default.nix b/doc/default.nix
index 4c04128052bc..98b4b92be524 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 ec188e234543..4193bb49f77a 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 000000000000..c6b3611eea53
--- /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 000000000000..501f46a967c3
--- /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 contents 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 config 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 maxLayers
+
+
+ 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 000000000000..79682080be31
--- /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 000000000000..e860b10e8979
--- /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 000000000000..901423c52a18
--- /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 000000000000..437850e408bc
--- /dev/null
+++ b/doc/functions/library/asserts.xml
@@ -0,0 +1,117 @@
+
+ Assert functions
+
+
+ lib.asserts.assertMsg
+
+ 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
+]]>
+
+
+
+
+ lib.asserts.assertOneOf
+
+ 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 000000000000..65d0b40e2e82
--- /dev/null
+++ b/doc/functions/library/attrsets.xml
@@ -0,0 +1,1731 @@
+
+ Attribute-Set Functions
+
+
+ lib.attrset.attrByPath
+
+ 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
+]]>
+
+
+
+
+ lib.attrsets.hasAttrByPath
+
+ 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
+]]>
+
+
+
+
+ lib.attrsets.setAttrByPath
+
+ 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; }; }
+]]>
+
+
+
+
+ lib.attrsets.getAttrFromPath
+
+ 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'
+]]>
+
+
+
+
+ lib.attrsets.attrVals
+
+ 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
+
+
+
+
+
+ lib.attrsets.attrValues
+
+ 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 ]
+]]>
+
+
+
+
+ lib.attrsets.catAttrs
+
+ 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 ]
+ ]]>
+
+
+
+
+ lib.attrsets.filterAttrs
+
+ 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; }
+]]>
+
+
+
+
+ lib.attrsets.filterAttrsRecursive
+
+ 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 = { };
+ };
+ };
+ }
+ ]]>
+
+
+
+
+ lib.attrsets.foldAttrs
+
+ 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 ]; }
+]]>
+
+
+
+
+ lib.attrsets.collect
+
+ 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 outPath attribute name.
+ [{ outPath = "a/"; } { outPath = "b/"; }]
+]]>
+
+
+
+
+ lib.attrsets.nameValuePair
+
+ 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; }
+]]>
+
+
+
+
+ lib.attrsets.mapAttrs
+
+
+
+
+
+
+
+ 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"; }
+]]>
+
+
+
+
+ lib.attrsets.mapAttrs'
+
+ 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"; }
+
+ ]]>
+
+
+
+
+ lib.attrsets.mapAttrsToList
+
+ 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" ]
+]]>
+
+
+
+
+ lib.attrsets.mapAttrsRecursive
+
+ 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 lib.attrsets.mapAttrsRecursive
+ {
+ n = {
+ a = "n-a-A";
+ m = {
+ b = "n-m-b-B";
+ c = "n-m-c-C";
+ };
+ };
+ d = "d-D";
+ }
+ ]]>
+
+
+
+
+ lib.attrsets.mapAttrsRecursiveCond
+
+ 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\"}";
+ }
+ ]]>
+
+
+
+
+ lib.attrsets.genAttrs
+
+ 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"; }
+ ]]>
+
+
+
+
+ lib.attrsets.isDerivation
+
+ 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
+ ]]>
+
+
+
+
+ lib.attrsets.toDerivation
+
+ toDerivation :: Path -> Derivation
+
+
+
+
+
+ Converts a store path to a fake derivation.
+
+
+
+
+
+ path
+
+
+
+ A store path to convert to a derivation.
+
+
+
+
+
+
+
+ lib.attrsets.optionalAttrs
+
+ 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 cond is true
+ { my = "set"; }
+ ]]>
+
+
+
+ Return an empty attribute set when cond is false
+ { }
+ ]]>
+
+
+
+
+ lib.attrsets.zipAttrsWithNames
+
+ 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"; }
+ ]]>
+
+
+
+
+ lib.attrsets.zipAttrsWith
+
+ 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"; }
+ ]]>
+
+
+
+
+ lib.attrsets.zipAttrs
+
+ 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 ]; }
+ ]]>
+
+
+
+
+ lib.attrsets.recursiveUpdateUntil
+
+ 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
+}
+ ]]>
+
+
+
+
+ lib.attrsets.recursiveUpdate
+
+ 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 000000000000..1bd90d2a0c76
--- /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 000000000000..e5031c9463c0
--- /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 d5f2574039f2..4314df5c9df2 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/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 7677c366191f..74b7a9f961ee 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -935,7 +935,7 @@ The implementation can be found in the
[integer-gmp](http://hackage.haskell.org/package/integer-gmp) package.
A potential problem with this is that GMP is licensed under the
-[GNU Lesser General Public License (LGPL)](http://www.gnu.org/copyleft/lesser.html),
+[GNU Lesser General Public License (LGPL)](https://www.gnu.org/copyleft/lesser.html),
a kind of "copyleft" license. According to the terms of the LGPL, paragraph 5,
you may distribute a program that is designed to be compiled and dynamically
linked with the library under the terms of your choice (i.e., commercially) but
diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md
index 005ed3602851..50979d76d98b 100644
--- a/doc/languages-frameworks/idris.section.md
+++ b/doc/languages-frameworks/idris.section.md
@@ -1,39 +1,115 @@
-Idris packages
-==============
+# Idris packages
-This directory contains build rules for idris packages. In addition,
-it contains several functions to build and compose those packages.
-Everything is exposed to the user via the `idrisPackages` attribute.
+## Installing Idris
-callPackage
-------------
+The easiest way to get a working idris version is to install the `idris` attribute:
-This is like the normal nixpkgs callPackage function, specialized to
-idris packages.
+```
+$ # On NixOS
+$ nix-env -i nixos.idris
+$ # On non-NixOS
+$ nix-env -i nixpkgs.idris
+```
-builtins
----------
+This however only provides the `prelude` and `base` libraries. To install additional libraries:
-This is a list of all of the libraries that come packaged with Idris
-itself.
+```
+$ nix-env -iE 'pkgs: pkgs.idrisPackages.with-packages (with pkgs.idrisPackages; [ contrib pruviloj ])'
+```
-build-idris-package
---------------------
+To see all available Idris packages:
+```
+$ # On NixOS
+$ nix-env -qaPA nixos.idrisPackages
+$ # On non-NixOS
+$ nix-env -qaPA nixpkgs.idrisPackages
+```
-A function to build an idris package. Its sole argument is a set like
-you might pass to `stdenv.mkDerivation`, except `build-idris-package`
-sets several attributes for you. See `build-idris-package.nix` for
-details.
+Similarly, entering a `nix-shell`:
+```
+$ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])'
+```
-build-builtin-package
-----------------------
+## Starting Idris with library support
-A version of `build-idris-package` specialized to builtin libraries.
-Mostly for internal use.
+To have access to these libraries in idris, call it with an argument `-p ` for each library:
-with-packages
--------------
+```
+$ nix-shell -p 'idrisPackages.with-packages (with idrisPackages; [ contrib pruviloj ])'
+[nix-shell:~]$ idris -p contrib -p pruviloj
+```
-Bundle idris together with a list of packages. Because idris currently
-only supports a single directory in its library path, you must include
-all desired libraries here, including `prelude` and `base`.
\ No newline at end of file
+A listing of all available packages the Idris binary has access to is available via `--listlibs`:
+
+```
+$ idris --listlibs
+00prelude-idx.ibc
+pruviloj
+base
+contrib
+prelude
+00pruviloj-idx.ibc
+00base-idx.ibc
+00contrib-idx.ibc
+```
+
+## Building an Idris project with Nix
+
+As an example of how a Nix expression for an Idris package can be created, here is the one for `idrisPackages.yaml`:
+
+```nix
+{ build-idris-package
+, fetchFromGitHub
+, contrib
+, lightyear
+, lib
+}:
+build-idris-package {
+ name = "yaml";
+ version = "2018-01-25";
+
+ # This is the .ipkg file that should be built, defaults to the package name
+ # In this case it should build `Yaml.ipkg` instead of `yaml.ipkg`
+ # This is only necessary because the yaml packages ipkg file is
+ # different from its package name here.
+ ipkgName = "Yaml";
+ # Idris dependencies to provide for the build
+ idrisDeps = [ contrib lightyear ];
+
+ src = fetchFromGitHub {
+ owner = "Heather";
+ repo = "Idris.Yaml";
+ rev = "5afa51ffc839844862b8316faba3bafa15656db4";
+ sha256 = "1g4pi0swmg214kndj85hj50ccmckni7piprsxfdzdfhg87s0avw7";
+ };
+
+ meta = {
+ description = "Idris YAML lib";
+ homepage = https://github.com/Heather/Idris.Yaml;
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.brainrape ];
+ };
+}
+```
+
+Assuming this file is saved as `yaml.nix`, it's buildable using
+
+```
+$ nix-build -E '(import {}).idrisPackages.callPackage ./yaml.nix {}'
+```
+
+Or it's possible to use
+
+```nix
+with import {};
+
+{
+ yaml = idrisPackages.callPackage ./yaml.nix {};
+}
+```
+
+in another file (say `default.nix`) to be able to build it with
+
+```
+$ nix-build -A yaml
+```
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index f22984cb56b0..ac0ad7125324 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -19,6 +19,7 @@
+
diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md
index f6701c1ab9c4..c6dce04c7b8b 100644
--- a/doc/languages-frameworks/node.section.md
+++ b/doc/languages-frameworks/node.section.md
@@ -14,7 +14,7 @@ project.
The package set also provides support for multiple Node.js versions. The policy
is that a new package should be added to the collection for the latest stable LTS
-release (which is currently 8.x), unless there is an explicit reason to support
+release (which is currently 10.x), unless there is an explicit reason to support
a different release.
If your package uses native addons, you need to examine what kind of native
@@ -26,7 +26,7 @@ build system it uses. Here are some examples:
After you have identified the correct system, you need to override your package
expression while adding in build system as a build input. For example, `dat`
-requires `node-gyp-build`, so we override its expression in `default-v8.nix`:
+requires `node-gyp-build`, so we override its expression in `default-v10.nix`:
```nix
dat = nodePackages.dat.override (oldAttrs: {
@@ -36,9 +36,9 @@ dat = nodePackages.dat.override (oldAttrs: {
To add a package from NPM to nixpkgs:
- 1. Modify `pkgs/development/node-packages/node-packages-v8.json` to add, update
- or remove package entries. (Or `pkgs/development/node-packages/node-packages-v10.json`
- for packages depending on Node.js 10.x)
+ 1. Modify `pkgs/development/node-packages/node-packages-v10.json` to add, update
+ or remove package entries. (Or `pkgs/development/node-packages/node-packages-v8.json`
+ for packages depending on Node.js 8.x)
2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
3. Build your new package to test your changes:
`cd /path/to/nixpkgs && nix-build -A nodePackages.`.
diff --git a/doc/languages-frameworks/ocaml.xml b/doc/languages-frameworks/ocaml.xml
new file mode 100644
index 000000000000..ea0770616802
--- /dev/null
+++ b/doc/languages-frameworks/ocaml.xml
@@ -0,0 +1,99 @@
+
+ OCaml
+
+
+ OCaml libraries should be installed in
+ $(out)/lib/ocaml/${ocaml.version}/site-lib/ . Such
+ directories are automatically added to the $OCAMLPATH
+ environment variable when building another package that depends on them
+ or when opening a nix-shell .
+
+
+
+ Given that most of the OCaml ecosystem is now built with dune,
+ nixpkgs includes a convenience build support function called
+ buildDunePackage that will build an OCaml package
+ using dune, OCaml and findlib and any additional dependencies provided
+ as buildInputs or propagatedBuildInputs .
+
+
+
+ Here is a simple package example. It defines an (optional) attribute
+ minimumOCamlVersion that will be used to throw a
+ descriptive evaluation error if building with an older OCaml is attempted.
+ It uses the fetchFromGitHub fetcher to get its source.
+ It sets the doCheck (optional) attribute to
+ true which means that tests will be run with
+ dune runtest -p angstrom after the build
+ (dune build -p angstrom ) is complete.
+ It uses alcotest as a build input (because it is needed
+ to run the tests) and bigstringaf and
+ result as propagated build inputs (thus they will also
+ be available to libraries depending on this library).
+ The library will be installed using the angstrom.install
+ file that dune generates.
+
+
+
+{ stdenv, fetchFromGitHub, buildDunePackage, alcotest, result, bigstringaf }:
+
+buildDunePackage rec {
+ pname = "angstrom";
+ version = "0.10.0";
+
+ minimumOCamlVersion = "4.03";
+
+ src = fetchFromGitHub {
+ owner = "inhabitedtype";
+ repo = pname;
+ rev = version;
+ sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
+ };
+
+ buildInputs = [ alcotest ];
+ propagatedBuildInputs = [ bigstringaf result ];
+ doCheck = true;
+
+ meta = {
+ homepage = https://github.com/inhabitedtype/angstrom;
+ description = "OCaml parser combinators built for speed and memory efficiency";
+ license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+ };
+}
+
+
+
+ Here is a second example, this time using a source archive generated with
+ dune-release . It is a good idea to use this archive when
+ it is available as it will usually contain substituted variables such as a
+ %%VERSION%% field. This library does not depend
+ on any other OCaml library and no tests are run after building it.
+
+
+
+{ stdenv, fetchurl, buildDunePackage }:
+
+buildDunePackage rec {
+ pname = "wtf8";
+ version = "1.0.1";
+
+ minimumOCamlVersion = "4.01";
+
+ src = fetchurl {
+ url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+ sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/flowtype/ocaml-wtf8;
+ description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
+ license = licenses.mit;
+ maintainers = [ maintainers.eqyiel ];
+ };
+}
+
+
+
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 5eabb866654e..eefe46b15de1 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,18 +479,16 @@ 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
-Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
-respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
-is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
-`python35`. The default interpreter, `python`, maps to `python2`.
-The Nix expressions for the interpreters can be found in
-`pkgs/development/interpreters/python`.
+Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
+respectively `python27`, `python35`, `python36`, and `python37`. The PyPy
+interpreter is available as `pypy`. The aliases `python2` and `python3`
+correspond to respectively `python27` and `python37`. The default interpreter,
+`python`, maps to `python2`. The Nix expressions for the interpreters can be
+found in `pkgs/development/interpreters/python`.
All packages depending on any Python interpreter get appended
`out/{python.sitePackages}` to `$PYTHONPATH` if such directory
@@ -508,7 +507,7 @@ Each interpreter has the following attributes:
- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation.
- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
-- `executable`. Name of the interpreter executable, e.g. `python3.4`.
+- `executable`. Name of the interpreter executable, e.g. `python3.7`.
- `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`.
### Building packages and applications
@@ -530,7 +529,6 @@ attribute set is created for each available Python interpreter. The available
sets are
* `pkgs.python27Packages`
-* `pkgs.python34Packages`
* `pkgs.python35Packages`
* `pkgs.python36Packages`
* `pkgs.python37Packages`
@@ -539,7 +537,7 @@ sets are
and the aliases
* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
-* `pkgs.python3Packages` pointing to `pkgs.python36Packages`
+* `pkgs.python3Packages` pointing to `pkgs.python37Packages`
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
#### `buildPythonPackage` function
@@ -549,31 +547,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 +653,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
@@ -805,7 +836,7 @@ community to help save time. No tool is preferred at the moment.
### Deterministic builds
-Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
+The Python interpreters are now built deterministically.
Minor modifications had to be made to the interpreters in order to generate
deterministic bytecode. This has security implications and is relevant for
those using Python in a `nix-shell`.
@@ -1047,8 +1078,7 @@ To modify only a Python package set instead of a whole Python derivation, use th
Use the following overlay template:
```nix
-self: super:
-{
+self: super: {
python = super.python.override {
packageOverrides = python-self: python-super: {
zerobin = python-super.zerobin.overrideAttrs (oldAttrs: {
@@ -1063,6 +1093,25 @@ self: super:
}
```
+### How to use Intel's MKL with numpy and scipy?
+
+A `site.cfg` is created that configures BLAS based on the `blas` parameter
+of the `numpy` derivation. By passing in `mkl`, `numpy` and packages depending
+on `numpy` will be built with `mkl`.
+
+The following is an overlay that configures `numpy` to use `mkl`:
+```nix
+self: super: {
+ python36 = super.python36.override {
+ packageOverrides = python-self: python-super: {
+ numpy = python-super.numpy.override {
+ blas = super.pkgs.mkl;
+ };
+ };
+ };
+}
+```
+
## Contributing
### Contributing guidelines
diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index c52a72a3df4a..df4e5acb22cb 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -50,6 +50,17 @@ bundlerEnv rec {
future updates can be run easily.
+
+ Updating Ruby packages can then be done like this:
+
+
+
+
+
+
For tools written in Ruby - i.e. where the desire is to install a package and
then execute e.g. rake at the command line, there is an
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 6588281878a0..4549bbd1686b 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/texlive.xml b/doc/languages-frameworks/texlive.xml
index e42d0a811111..5792a16963a9 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -49,12 +49,12 @@ texlive.combine {
- You can list packages e.g. by nix-repl .
-
-$ nix-repl
-nix-repl> :l <nixpkgs>
-nix-repl> texlive.collection-<TAB>
-
+ You can list packages e.g. by nix repl .
+ :l
+nix-repl> texlive.collection-
+]]>
diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 1d6a4fe8da8d..2cec1543a249 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
- }
-};
+ };
+}
```
-## VAM
+For Neovim the syntax is:
-### dependencies by Vim plugins
+```
+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
+ ];
+ };
+}
+```
+
+## Managing plugins with VAM
+
+### 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 000000000000..ae7036e46264
--- /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/meta.xml b/doc/meta.xml
index 496b32916552..774ed2db7500 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -14,7 +14,7 @@ meta = with stdenv.lib; {
GNU Hello is a program that prints "Hello, world!" when you run it.
It is fully customizable.
'';
- homepage = http://www.gnu.org/software/hello/manual/;
+ homepage = https://www.gnu.org/software/hello/manual/;
license = licenses.gpl3Plus;
maintainers = [ maintainers.eelco ];
platforms = platforms.all;
@@ -35,7 +35,7 @@ $ nix-env -qa hello --json
"hello": {
"meta": {
"description": "A program that produces a familiar, friendly greeting",
- "homepage": "http://www.gnu.org/software/hello/manual/",
+ "homepage": "https://www.gnu.org/software/hello/manual/",
"license": {
"fullName": "GNU General Public License version 3 or later",
"shortName": "GPLv3+",
@@ -135,7 +135,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
The package’s homepage. Example:
- http://www.gnu.org/software/hello/manual/
+ https://www.gnu.org/software/hello/manual/
@@ -146,7 +146,7 @@ hello-2.3 A program that produces a familiar, friendly greeting
The page where a link to the current version can be found. Example:
- http://ftp.gnu.org/gnu/hello/
+ https://ftp.gnu.org/gnu/hello/
@@ -250,6 +250,60 @@ meta.platforms = stdenv.lib.platforms.linux;
+
+
+ tests
+
+
+
+
+ This attribute is special in that it is not actually under the
+ meta attribute set but rather under the
+ passthru attribute set. This is due to a current
+ limitation of Nix, and will change as soon as Nixpkgs will be able to
+ depend on a new enough version of Nix. See
+ the relevant
+ issue for more details.
+
+
+
+ An attribute set with as values tests. A test is a derivation, which
+ builds successfully when the test passes, and fails to build otherwise. A
+ derivation that is a test needs to have meta.timeout
+ defined.
+
+
+ The NixOS tests are available as nixosTests in
+ parameters of derivations. For instance, the OpenSMTPD derivation
+ includes lines similar to:
+
+{ /* ... */, nixosTests }:
+{
+ # ...
+ passthru.tests = {
+ basic-functionality-and-dovecot-integration = nixosTests.opensmtpd;
+ };
+}
+
+
+
+
+
+
+ timeout
+
+
+
+ A timeout (in seconds) for building the derivation. If the derivation
+ takes longer than this time to build, it can fail due to breaking the
+ timeout. However, all computers do not have the same computing power,
+ hence some builders may decide to apply a multiplicative factor to this
+ value. When filling this value in, try to keep it approximately
+ consistent with other values already present in
+ nixpkgs .
+
+
+
hydraPlatforms
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index e96e84bfe72f..d18e282c5bd3 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -12,7 +12,7 @@
The Nix language allows a derivation to produce multiple outputs, which is
similar to what is utilized by other Linux distribution packaging systems.
- The outputs reside in separate nix store paths, so they can be mostly
+ The outputs reside in separate Nix store paths, so they can be mostly
handled independently of each other, including passing to build inputs,
garbage collection or binary substitution. The exception is that building
from source always produces all the outputs.
diff --git a/doc/overlays.xml b/doc/overlays.xml
index 2decf9febe80..bff2339ca933 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -3,9 +3,9 @@
xml:id="chap-overlays">
Overlays
- This chapter describes how to extend and change Nixpkgs packages using
- overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to
- compose the set of all packages.
+ This chapter describes how to extend and change Nixpkgs using overlays.
+ Overlays are used to add layers in the fixed-point used by Nixpkgs to compose
+ the set of all packages.
Nixpkgs can be configured with a list of overlays, which are applied in
@@ -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 7b8657fb4a13..803d343aa096 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -205,7 +205,7 @@ $ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \
Nixpkgs provides a number of packages that will install Eclipse in its
- various forms, these range from the bare-bones Eclipse Platform to the more
+ various forms. These range from the bare-bones Eclipse Platform to the more
fully featured Eclipse SDK or Scala-IDE packages and multiple version are
often available. It is possible to list available Eclipse packages by
issuing the command:
@@ -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/platform-notes.xml b/doc/platform-notes.xml
index cde27b8a5edf..6050271dbf6f 100644
--- a/doc/platform-notes.xml
+++ b/doc/platform-notes.xml
@@ -6,13 +6,13 @@
Darwin (macOS)
- Some common issues when packaging software for darwin:
+ Some common issues when packaging software for Darwin:
- The darwin stdenv uses clang instead of gcc. When
+ The Darwin stdenv uses clang instead of gcc. When
referring to the compiler $CC or cc
will work in both cases. Some builds hardcode gcc/g++ in their build
scripts, that can usually be fixed with using something like
@@ -31,7 +31,7 @@
- On darwin libraries are linked using absolute paths, libraries are
+ On Darwin, libraries are linked using absolute paths, libraries are
resolved by their install_name at link time. Sometimes
packages won't set this correctly causing the library lookups to fail at
runtime. This can be fixed by adding extra linker flags or by running
@@ -96,8 +96,8 @@
The package xcbuild can be used to build projects that
- really depend on Xcode, however projects that build some kind of graphical
- interface won't work without using Xcode in an impure way.
+ really depend on Xcode. However, this replacement is not 100%
+ compatible with Xcode and can occasionally cause issues.
diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index b9e6d789404a..8dd673ed2733 100644
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -147,8 +147,8 @@ $ git add pkgs/development/libraries/libfoo/default.nix
- You can use nix-prefetch-url (or similar
- nix-prefetch-git, etc) url to get the
+ You can use nix-prefetch-url
+ url to get the
SHA-256 hash of source distributions. There are similar commands as
nix-prefetch-git and
nix-prefetch-hg available in
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index 849bb9316c60..5618567e3852 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -17,22 +17,20 @@
- The nixpkgs project receives a fairly high number of contributions via GitHub
- pull-requests. Reviewing and approving these is an important task and a way
+ The Nixpkgs project receives a fairly high number of contributions via GitHub
+ pull requests. Reviewing and approving these is an important task and a way
to contribute to the project.
- The high change rate of nixpkgs makes any pull request that remains open for
+ The high change rate of Nixpkgs makes any pull request that remains open for
too long subject to conflicts that will require extra work from the submitter
- or the merger. Reviewing pull requests in a timely manner and being
- responsive to the comments is the key to avoid these. GitHub provides sort
- filters that can be used to see the
- most
- recently and the
- least
- recently updated pull-requests. We highly encourage looking at
+ or the merger. Reviewing pull requests in a timely manner and being responsive
+ to the comments is the key to avoid this issue. GitHub provides sort filters
+ that can be used to see the most
+ recently and the least
+ recently updated pull requests. We highly encourage looking at
this list of ready to merge, unreviewed pull requests.
@@ -43,12 +41,12 @@
GitHub provides reactions as a simple and quick way to provide feedback to
- pull-requests or any comments. The thumb-down reaction should be used with
+ pull requests or any comments. The thumb-down reaction should be used with
care and if possible accompanied with some explanation so the submitter has
directions to improve their contribution.
- Pull-request reviews should include a list of what has been reviewed in a
+ pull request reviews should include a list of what has been reviewed in a
comment, so other reviewers and mergers can know the state of the review.
@@ -60,8 +58,8 @@
Package updates
- A package update is the most trivial and common type of pull-request. These
- pull-requests mainly consist of updating the version part of the package
+ A package update is the most trivial and common type of pull request. These
+ pull requests mainly consist of updating the version part of the package
name and the source hash.
@@ -77,7 +75,7 @@
- Add labels to the pull-request. (Requires commit rights)
+ Add labels to the pull request. (Requires commit rights)
@@ -144,8 +142,8 @@
- Pull-requests are often targeted to the master or staging branch, and
- building the pull-request locally when it is submitted can trigger many
+ pull requests are often targeted to the master or staging branch, and
+ building the pull request locally when it is submitted can trigger many
source builds.
@@ -174,14 +172,14 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD
- Fetching the pull-request changes, PRNUMBER is the
- number at the end of the pull-request title and
- BASEBRANCH the base branch of the pull-request.
+ Fetching the pull request changes, PRNUMBER is the
+ number at the end of the pull request title and
+ BASEBRANCH the base branch of the pull request.
- Rebasing the pull-request changes to the nixos-unstable branch.
+ Rebasing the pull request changes to the nixos-unstable branch.
@@ -190,10 +188,10 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD
The nox tool can
- be used to review a pull-request content in a single command. It doesn't
+ be used to review a pull request content in a single command. It doesn't
rebase on a channel branch so it might trigger multiple source builds.
PRNUMBER should be replaced by the number at the end
- of the pull-request title.
+ of the pull request title.
$ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
@@ -230,7 +228,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
New packages
- New packages are a common type of pull-requests. These pull requests
+ New packages are a common type of pull requests. These pull requests
consists in adding a new nix-expression for a package.
@@ -241,7 +239,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
- Add labels to the pull-request. (Requires commit rights)
+ Add labels to the pull request. (Requires commit rights)
@@ -279,7 +277,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
- A maintainer must be set, this can be the package submitter or a
+ A maintainer must be set. This can be the package submitter or a
community member that accepts to take maintainership of the package.
@@ -361,7 +359,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
- Add labels to the pull-request. (Requires commit rights)
+ Add labels to the pull request. (Requires commit rights)
@@ -474,7 +472,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
- Add labels to the pull-request. (Requires commit rights)
+ Add labels to the pull request. (Requires commit rights)
@@ -576,7 +574,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
like to be a long-term reviewer for related submissions, please contact the
current reviewers for that topic. They will give you information about the
reviewing process. The main reviewers for a topic can be hard to find as
- there is no list, but checking past pull-requests to see who reviewed or
+ there is no list, but checking past pull requests to see who reviewed or
git-blaming the code to see who committed to that topic can give some hints.
@@ -586,7 +584,7 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
- Merging pull-requests
+ Merging pull requests
It is possible for community members that have enough knowledge and
diff --git a/doc/shell.nix b/doc/shell.nix
index 24fe20e81050..8ac2019f9d66 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 cb8832a814fc..000000000000
--- 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 7a0f8f270bad..cab76ef1104c 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -228,18 +228,19 @@ genericBuild
- The extension of PATH with dependencies, alluded to above,
- proceeds according to the relative platforms alone. The process is carried
- out only for dependencies whose host platform matches the new derivation's
- build platform–i.e. which run on the platform where the new derivation
- will be built.
+ The extension of PATH with dependencies, alluded to
+ above, proceeds according to the relative platforms alone. The
+ process is carried out only for dependencies whose host platform
+ matches the new derivation's build platform i.e. dependencies which
+ run on the platform where the new derivation will be built.
- Currently, that means for native builds all dependencies are put on the
- PATH . But in the future that may not be the case for sake
- of matching cross: the platforms would be assumed to be unique for native
- and cross builds alike, so only the depsBuild* and
- nativeBuildDependencies dependencies would affect the
+ Currently, this means for native builds all dependencies are put
+ on the PATH . But in the future that may not be the
+ case for sake of matching cross: the platforms would be assumed
+ to be unique for native and cross builds alike, so only the
+ depsBuild* and
+ nativeBuildInputs would be added to the
PATH .
@@ -251,28 +252,27 @@ genericBuild
The dependency is propagated when it forces some of its other-transitive
(non-immediate) downstream dependencies to also take it on as an immediate
- dependency. Nix itself already takes a package's transitive dependencies
- into account, but this propagation ensures nixpkgs-specific infrastructure
- like setup hooks (mentioned above) also are run as if the propagated
- dependency.
+ dependency. Nix itself already takes a package's transitive dependencies into
+ account, but this propagation ensures nixpkgs-specific infrastructure like
+ setup hooks (mentioned above) also are run as if the propagated dependency.
- It is important to note dependencies are not necessary propagated as the
- same sort of dependency that they were before, but rather as the
+ It is important to note that dependencies are not necessarily propagated as
+ the same sort of dependency that they were before, but rather as the
corresponding sort so that the platform rules still line up. The exact rules
- for dependency propagation can be given by assigning each sort of dependency
- two integers based one how it's host and target platforms are offset from
- the depending derivation's platforms. Those offsets are given are given
- below in the descriptions of each dependency list attribute.
- Algorithmically, we traverse propagated inputs, accumulating every
- propagated dep's propagated deps and adjusting them to account for the
- "shift in perspective" described by the current dep's platform offsets. This
- results in sort a transitive closure of the dependency relation, with the
- offsets being approximately summed when two dependency links are combined.
- We also prune transitive deps whose combined offsets go out-of-bounds, which
- can be viewed as a filter over that transitive closure removing dependencies
- that are blatantly absurd.
+ for dependency propagation can be given by assigning to each dependency two
+ integers based one how its host and target platforms are offset from the
+ depending derivation's platforms. Those offsets are given below in the
+ descriptions of each dependency list attribute. Algorithmically, we traverse
+ propagated inputs, accumulating every propagated dependency's propagated
+ dependencies and adjusting them to account for the "shift in perspective"
+ described by the current dependency's platform offsets. This results in sort
+ a transitive closure of the dependency relation, with the offsets being
+ approximately summed when two dependency links are combined. We also prune
+ transitive dependencies whose combined offsets go out-of-bounds, which can be
+ viewed as a filter over that transitive closure removing dependencies that
+ are blatantly absurd.
@@ -287,8 +287,8 @@ genericBuild
propagation logic.
- They're confusing in very different ways so...hopefully if something doesn't
- make sense in one presentation, it does in the other!
+ They're confusing in very different ways so... hopefully if something doesn't
+ make sense in one presentation, it will in the other!
let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
@@ -307,13 +307,13 @@ dep(h0, _, A, B)
propagated-dep(h1, t1, B, C)
h0 + h1 in {-1, 0, 1}
h0 + t1 in {-1, 0, -1}
--------------------------------------- Take immediate deps' propagated deps
+----------------------------- Take immediate dependencies' propagated dependencies
propagated-dep(mapOffset(h0, t0, h1),
mapOffset(h0, t0, t1),
A, C)
propagated-dep(h, t, A, B)
--------------------------------------- Propagated deps count as deps
+----------------------------- Propagated dependencies count as dependencies
dep(h, t, A, B)
Some explanation of this monstrosity is in order. In the common case, the
target offset of a dependency is the successor to the target offset:
@@ -324,31 +324,31 @@ let f(h, h + 1, i) = i + (if i <= 0 then h else (h + 1) - 1)
let f(h, h + 1, i) = i + (if i <= 0 then h else h)
let f(h, h + 1, i) = i + h
- This is where the "sum-like" comes from above: We can just sum all the host
- offset to get the host offset of the transitive dependency. The target
- offset is the transitive dep is simply the host offset + 1, just as it was
- with the dependencies composed to make this transitive one; it can be
+ This is where "sum-like" comes in from above: We can just sum all of the host
+ offsets to get the host offset of the transitive dependency. The target
+ offset is the transitive dependency is simply the host offset + 1, just as it
+ was with the dependencies composed to make this transitive one; it can be
ignored as it doesn't add any new information.
- Because of the bounds checks, the uncommon cases are h =
- t and h + 2 = t . In the former case, the
- motivation for mapOffset is that since its host and
- target platforms are the same, no transitive dep of it should be able to
- "discover" an offset greater than its reduced target offsets.
+ Because of the bounds checks, the uncommon cases are h = t
+ and h + 2 = t . In the former case, the motivation for
+ mapOffset is that since its host and target platforms
+ are the same, no transitive dependency of it should be able to "discover" an
+ offset greater than its reduced target offsets.
mapOffset effectively "squashes" all its transitive
dependencies' offsets so that none will ever be greater than the target
offset of the original h = t package. In the other case,
- h + 1 is skipped over between the host and target
- offsets. Instead of squashing the offsets, we need to "rip" them apart so no
+ h + 1 is skipped over between the host and target offsets.
+ Instead of squashing the offsets, we need to "rip" them apart so no
transitive dependencies' offset is that one.
- Overall, the unifying theme here is that propagation shouldn't be
- introducing transitive dependencies involving platforms the needing package
- is unaware of. The offset bounds checking and definition of
+ Overall, the unifying theme here is that propagation shouldn't be introducing
+ transitive dependencies involving platforms the depending package is unaware
+ of. The offset bounds checking and definition of
mapOffset together ensure that this is the case.
Discovering a new offset is discovering a new platform, and since those
platforms weren't in the derivation "spec" of the needing package, they
@@ -369,20 +369,20 @@ let f(h, h + 1, i) = i + h
A list of dependencies whose host and target platforms are the new
derivation's build platform. This means a -1 host and
-1 target offset from the new derivation's platforms.
- 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 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.
+ These are programs and libraries used at build time that produce programs
+ and 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 nativeBuildInputs instead. The most common use of
+ 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.
- Since these packages are able to be run at build time, that are always
+ Since these packages are able to be run at build-time, they are always
added to the PATH , as described above. But since these
packages are only guaranteed to be able to run then, they shouldn't
- persist as run-time dependencies. This isn't currently enforced, but
- could be in the future.
+ persist as run-time dependencies. This isn't currently enforced, but could
+ be in the future.
@@ -395,21 +395,20 @@ let f(h, h + 1, i) = i + h
A list of dependencies whose host platform is the new derivation's build
platform, and target platform is the new derivation's host platform. This
means a -1 host offset and 0 target
- offset from the new derivation's platforms. They are programs/libraries
- used at build time that, if they are a compiler or similar tool, produce
- code to run at run time—i.e. tools used to build the new derivation. If
- the dependency doesn't care about the target platform (i.e. isn't a
- compiler or similar tool), put it here, rather than in
+ offset from the new derivation's platforms. These are programs and
+ libraries used at build-time that, if they are a compiler or similar tool,
+ produce code to run at run-time—i.e. tools used to build the new
+ derivation. If the dependency doesn't care about the target platform (i.e.
+ isn't a compiler or similar tool), put it here, rather than in
depsBuildBuild or depsBuildTarget .
- This would be called depsBuildHost but for historical
- continuity.
+ This could be called depsBuildHost but
+ nativeBuildInputs is used for historical continuity.
- Since these packages are able to be run at build time, that are added to
- the PATH , as described above. But since these packages
- only are guaranteed to be able to run then, they shouldn't persist as
- run-time dependencies. This isn't currently enforced, but could be in the
- future.
+ Since these packages are able to be run at build-time, they are added to
+ the PATH , as described above. But since these packages are
+ only guaranteed to be able to run then, they shouldn't persist as run-time
+ dependencies. This isn't currently enforced, but could be in the future.
@@ -422,34 +421,33 @@ let f(h, h + 1, i) = i + h
A list of dependencies whose host platform is the new derivation's build
platform, and target platform is the new derivation's target platform.
This means a -1 host offset and 1
- target offset from the new derivation's platforms. They are programs used
- at build time that produce code to run at run with code produced by the
- depending package. Most commonly, these would tools used to build the
- runtime or standard library the currently-being-built compiler will
- inject into any code it compiles. In many cases, the currently-being
- built compiler is itself employed for that task, but when that compiler
- won't run (i.e. its build and host platform differ) this is not possible.
- Other times, the compiler relies on some other tool, like binutils, that
- is always built separately so the dependency is unconditional.
+ target offset from the new derivation's platforms. These are programs used
+ at build time that produce code to run with code produced by the depending
+ package. Most commonly, these are tools used to build the runtime or
+ standard library that the currently-being-built compiler will inject into
+ any code it compiles. In many cases, the currently-being-built-compiler is
+ itself employed for that task, but when that compiler won't run (i.e. its
+ build and host platform differ) this is not possible. Other times, the
+ compiler relies on some other tool, like binutils, that is always built
+ separately so that the dependency is unconditional.
- This is a somewhat confusing dependency to wrap ones head around, and for
- good reason. As the only one where the platform offsets are not adjacent
- integers, it requires thinking of a bootstrapping stage
- two away from the current one. It and it's use-case
- go hand in hand and are both considered poor form: try not to need this
- sort dependency, and try not avoid building standard libraries / runtimes
+ This is a somewhat confusing concept to wrap one’s head around, and for
+ good reason. As the only dependency type where the platform offsets are
+ not adjacent integers, it requires thinking of a bootstrapping stage
+ two away from the current one. It and its use-case go
+ hand in hand and are both considered poor form: try to not need this sort
+ of dependency, and try to avoid building standard libraries and runtimes
in the same derivation as the compiler produces code using them. Instead
strive to build those like a normal library, using the newly-built
compiler just as a normal library would. In short, do not use this
attribute unless you are packaging a compiler and are sure it is needed.
- Since these packages are able to be run at build time, that are added to
- the PATH , as described above. But since these packages
- only are guaranteed to be able to run then, they shouldn't persist as
- run-time dependencies. This isn't currently enforced, but could be in the
- future.
+ Since these packages are able to run at build time, they are added to the
+ PATH , as described above. But since these packages are only
+ guaranteed to be able to run then, they shouldn't persist as run-time
+ dependencies. This isn't currently enforced, but could be in the future.
@@ -460,15 +458,15 @@ let f(h, h + 1, i) = i + h
A list of dependencies whose host and target platforms match the new
- derivation's host platform. This means a both 0 host
- offset and 0 target offset from the new derivation's
- host platform. These are packages used at run-time to generate code also
- used at run-time. In practice, that would usually be tools used by
- compilers for metaprogramming/macro systems, or libraries used by the
- macros/metaprogramming code itself. It's always preferable to use a
- depsBuildBuild dependency in the derivation being
- built than a depsHostHost on the tool doing the
- building for this purpose.
+ derivation's host platform. This means a 0 host offset
+ and 0 target offset from the new derivation's host
+ platform. These are packages used at run-time to generate code also used
+ at run-time. In practice, this would usually be tools used by compilers
+ for macros or a metaprogramming system, or libraries used by the macros or
+ metaprogramming code itself. It's always preferable to use a
+ depsBuildBuild dependency in the derivation being built
+ over a depsHostHost on the tool doing the building for
+ this purpose.
@@ -479,20 +477,20 @@ let f(h, h + 1, i) = i + h
A list of dependencies whose host platform and target platform match the
- new derivation's. This means a 0 host offset and
+ new derivation's. This means a 0 host offset and a
1 target offset from the new derivation's host
platform. This would be called depsHostTarget but for
historical continuity. If the dependency doesn't care about the target
- platform (i.e. isn't a compiler or similar tool), put it here, rather
- than in depsBuildBuild .
+ platform (i.e. isn't a compiler or similar tool), put it here, rather than
+ in depsBuildBuild .
- These often are programs/libraries used by the new derivation at
+ These are often programs and libraries used by the new derivation at
run -time, but that isn't always the case. For
- example, the machine code in a statically linked library is only used at
- run time, but the derivation containing the library is only needed at
- build time. Even in the dynamic case, the library may also be needed at
- build time to appease the linker.
+ example, the machine code in a statically-linked library is only used at
+ run-time, but the derivation containing the library is only needed at
+ build-time. Even in the dynamic case, the library may also be needed at
+ build-time to appease the linker.
@@ -581,7 +579,7 @@ let f(h, h + 1, i) = i + h
- depsTargetTarget
+ depsTargetTargetPropagated
@@ -604,10 +602,10 @@ let f(h, h + 1, i) = i + h
A natural number indicating how much information to log. If set to 1 or
- higher, stdenv will print moderate debug information
- during the build. In particular, the gcc and
- ld wrapper scripts will print out the complete command
- line passed to the wrapped tools. If set to 6 or higher, the
+ higher, stdenv will print moderate debugging
+ information during the build. In particular, the gcc
+ and ld wrapper scripts will print out the complete
+ command line passed to the wrapped tools. If set to 6 or higher, the
stdenv setup script will be run with set
-x tracing. If set to 7 or higher, the gcc
and ld wrapper scripts will also be run with
@@ -618,7 +616,7 @@ let f(h, h + 1, i) = i + h
- Variables affecting build properties
+ Attributes affecting build properties
enableParallelBuilding
@@ -637,21 +635,6 @@ let f(h, h + 1, i) = i + h
-
-
- preferLocalBuild
-
-
-
- If set, specifies that the package is so lightweight in terms of build
- operations (e.g. write a text file from a Nix string to the store) that
- there's no need to look for it in binary caches -- it's faster to just
- build it locally. It also tells Hydra and other facilities that this
- package doesn't need to be exported in binary caches (noone would use it,
- after all).
-
-
-
@@ -681,11 +664,47 @@ passthru = {
hello.baz.value1 . We don't specify any usage or schema
of passthru - it is meant for values that would be
useful outside the derivation in other parts of a Nix expression (e.g. in
- other derivations). An example would be to convey some specific
- dependency of your derivation which contains a program with plugins
- support. Later, others who make derivations with plugins can use
- passed-through dependency to ensure that their plugin would be
- binary-compatible with built program.
+ other derivations). An example would be to convey some specific dependency
+ of your derivation which contains a program with plugins support. Later,
+ others who make derivations with plugins can use passed-through dependency
+ to ensure that their plugin would be binary-compatible with built program.
+
+
+
+
+
+ passthru.updateScript
+
+
+
+ A script to be run by maintainers/scripts/update.nix when
+ the package is matched. It needs to be an executable file, either on the file
+ system:
+
+passthru.updateScript = ./update.sh;
+
+ or inside the expression itself:
+
+passthru.updateScript = writeScript "update-zoom-us" ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl pcre common-updater-scripts
+
+ set -eu -o pipefail
+
+ version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')"
+ update-source-version zoom-us "$version"
+'';
+
+ The attribute can also contain a list, a script followed by arguments to be passed to it:
+
+passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ];
+
+ Note that the update scripts will be run in parallel by default; you should avoid running git commit or any other commands that cannot handle that.
+
+
+
+ For information about how to run the updates, execute
+ nix-shell maintainers/scripts/update.nix .
@@ -851,7 +870,7 @@ passthru = {
Zip files are unpacked using unzip . However,
unzip is not in the standard environment, so you
- should add it to buildInputs yourself.
+ should add it to nativeBuildInputs yourself.
@@ -1091,6 +1110,17 @@ passthru = {
+
+
+ prefixKey
+
+
+
+ The key to use when specifying the prefix. By default, this is set to
+ --prefix= as that is used by the majority of packages.
+
+
+
dontAddDisableDepTrack
@@ -1148,12 +1178,11 @@ passthru = {
By default, when cross compiling, the configure script has
--build=... and --host=... passed.
Packages can instead pass [ "build" "host" "target" ]
- or a subset to control exactly which platform flags are passed.
- Compilers and other tools should use this to also pass the target
- platform, for example.
+ or a subset to control exactly which platform flags are passed. Compilers
+ and other tools can use this to also pass the target platform.
- Eventually these will be passed when in native builds too, to improve
+ Eventually these will be passed building natively as well, to improve
determinism: build-time guessing, as is done today, is a risk of
impurity.
@@ -1218,17 +1247,6 @@ passthru = {
-
-
- checkInputs
-
-
-
- A list of dependencies used by the phase. This gets included in
- buildInputs when doCheck is set.
-
-
-
makeFlags
@@ -1378,6 +1396,18 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
+
+
+ checkInputs
+
+
+
+ A list of dependencies used by the phase. This gets included in
+ nativeBuildInputs when doCheck is
+ set.
+
+
+
preCheck
@@ -1650,13 +1680,11 @@ installTargets = "install-bin install-doc";
- A package can export a setup
- hook by setting this variable. The setup hook, if defined, is
- copied to $out/nix-support/setup-hook . Environment
- variables are then substituted in it using
- substituteAll .
+ A package can export a setup hook
+ by setting this variable. The setup hook, if defined, is copied to
+ $out/nix-support/setup-hook . Environment variables
+ are then substituted in it using substituteAll .
@@ -2089,47 +2117,46 @@ someVar=$(stripHash $name)
Package setup hooks
- Nix itself considers a build-time dependency merely something that should
+ Nix itself considers a build-time dependency as merely something that should
previously be built and accessible at build time—packages themselves are
on their own to perform any additional setup. In most cases, that is fine,
- and the downstream derivation can deal with it's own dependencies. But for a
+ and the downstream derivation can deal with its own dependencies. But for a
few common tasks, that would result in almost every package doing the same
- sort of setup work---depending not on the package itself, but entirely on
+ sort of setup work—depending not on the package itself, but entirely on
which dependencies were used.
- 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.
- The Setup hook mechanism is a bit of a sledgehammer though: a powerful
+ The setup hook mechanism is a bit of a sledgehammer though: a powerful
feature with a broad and indiscriminate area of effect. The combination of
its power and implicit use may be expedient, but isn't without costs. Nix
- itself is unchanged, but the spirit of adding dependencies being effect-free
+ itself is unchanged, but the spirit of added dependencies being effect-free
is violated even if the letter isn't. For example, if a derivation path is
mentioned more than once, Nix itself doesn't care and simply makes sure the
dependency derivation is already built just the same—depending is just
needing something to exist, and needing is idempotent. However, a dependency
specified twice will have its setup hook run twice, and that could easily
- change the build environment (though a well-written setup hook will
- therefore strive to be idempotent so this is in fact not observable). More
- broadly, setup hooks are anti-modular in that multiple dependencies, whether
- the same or different, should not interfere and yet their setup hooks may
- well do so.
+ change the build environment (though a well-written setup hook will therefore
+ strive to be idempotent so this is in fact not observable). More broadly,
+ setup hooks are anti-modular in that multiple dependencies, whether the same
+ or different, should not interfere and yet their setup hooks may well do so.
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 `,
@@ -2141,15 +2168,14 @@ someVar=$(stripHash $name)
Packages adding a hook should not hard code a specific hook, but rather
choose a variable relative to how they are included.
- Returning to the C compiler wrapper example, if it itself is an
+ Returning to the C compiler wrapper example, if the wrapper itself is an
n dependency, then it only wants to accumulate flags from
n + 1 dependencies, as only those ones match the
- compiler's target platform. The hostOffset variable is
- defined with the current dependency's host offset
- targetOffset with its target offset, before it's setup hook
- is sourced. Additionally, since most environment hooks don't care about the
- target platform, That means the setup hook can append to the right bash
- array by doing something like
+ compiler's target platform. The hostOffset variable is defined
+ with the current dependency's host offset targetOffset with
+ its target offset, before its setup hook is sourced. Additionally, since most
+ environment hooks don't care about the target platform, that means the setup
+ hook can append to the right bash array by doing something like
addEnvHooks "$hostOffset" myBashFunction
@@ -2157,7 +2183,7 @@ addEnvHooks "$hostOffset" myBashFunction
The existence of setups hooks has long been documented
- and packages inside Nixpkgs are free to use these mechanism. Other packages,
+ and packages inside Nixpkgs are free to use this mechanism. Other packages,
however, should not rely on these mechanisms not changing between Nixpkgs
versions. Because of the existing issues with this system, there's little
benefit from mandating it be stable for any period of time.
@@ -2174,19 +2200,19 @@ addEnvHooks "$hostOffset" myBashFunction
- Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous
- purposes. These are GNU Binutils when targetting Linux, and a mix of
- cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to
- be a compromise between "Binutils" and "cctools" not denoting any
- specific implementation.] Specifically, the underlying bintools package,
- and a C standard library (glibc or Darwin's libSystem, just for the
- dynamic loader) are all fed in, and dependency finding, hardening (see
- below), and purity checks for each are handled by Bintools Wrapper.
- Packages typically depend on CC Wrapper, which in turn (at run time)
- depends on Bintools Wrapper.
+ The Bintools Wrapper wraps the binary utilities for a bunch of
+ miscellaneous purposes. These are GNU Binutils when targetting Linux, and
+ a mix of cctools and GNU binutils for Darwin. [The "Bintools" name is
+ supposed to be a compromise between "Binutils" and "cctools" not denoting
+ any specific implementation.] Specifically, the underlying bintools
+ package, and a C standard library (glibc or Darwin's libSystem, just for
+ the dynamic loader) are all fed in, and dependency finding, hardening
+ (see below), and purity checks for each are handled by the Bintools
+ Wrapper. Packages typically depend on CC Wrapper, which in turn (at run
+ time) depends on the Bintools Wrapper.
- Bintools Wrapper was only just recently split off from CC Wrapper, so
+ The Bintools Wrapper was only just recently split off from CC Wrapper, so
the division of labor is still being worked out. For example, it
shouldn't care about about the C standard library, but just take a
derivation with the dynamic loader (which happens to be the glibc on
@@ -2194,24 +2220,24 @@ addEnvHooks "$hostOffset" myBashFunction
to need to share, and probably the most important to understand. It is
currently accomplished by collecting directories of host-platform
dependencies (i.e. buildInputs and
- nativeBuildInputs ) in environment variables. Bintools
- Wrapper's setup hook causes any lib and
+ nativeBuildInputs ) in environment variables. The
+ Bintools Wrapper's setup hook causes any lib and
lib64 subdirectories to be added to
- NIX_LDFLAGS . Since CC Wrapper and Bintools Wrapper use
- the same strategy, most of the Bintools Wrapper code is sparsely
- commented and refers to CC Wrapper. But CC Wrapper's code, by contrast,
- has quite lengthy comments. Bintools Wrapper merely cites those, rather
- than repeating them, to avoid falling out of sync.
+ NIX_LDFLAGS . Since the CC Wrapper and the Bintools Wrapper
+ use the same strategy, most of the Bintools Wrapper code is sparsely
+ commented and refers to the CC Wrapper. But the CC Wrapper's code, by
+ contrast, has quite lengthy comments. The Bintools Wrapper merely cites
+ those, rather than repeating them, to avoid falling out of sync.
A final task of the setup hook is defining a number of standard
- environment variables to tell build systems which executables full-fill
+ environment variables to tell build systems which executables fulfill
which purpose. They are defined to just be the base name of the tools,
- under the assumption that Bintools Wrapper's binaries will be on the
+ under the assumption that the Bintools Wrapper's binaries will be on the
path. Firstly, this helps poorly-written packages, e.g. ones that look
for just gcc when CC isn't defined yet
- clang is to be used. Secondly, this helps packages
- not get confused when cross-compiling, in which case multiple Bintools
+ clang is to be used. Secondly, this helps packages not
+ get confused when cross-compiling, in which case multiple Bintools
Wrappers may simultaneously be in use.
@@ -2223,20 +2249,20 @@ addEnvHooks "$hostOffset" myBashFunction
BUILD_ - and TARGET_ -prefixed versions of
- the normal environment variable are defined for the additional Bintools
+ the normal environment variable are defined for additional Bintools
Wrappers, properly disambiguating them.
- A problem with this final task is that Bintools Wrapper is honest and
+ A problem with this final task is that the Bintools Wrapper is honest and
defines LD as ld . Most packages,
however, firstly use the C compiler for linking, secondly use
LD anyways, defining it as the C compiler, and thirdly,
- only so define LD when it is undefined as a fallback.
- This triple-threat means Bintools Wrapper will break those packages, as
- LD is already defined as the actual linker which the package won't
- override yet doesn't want to use. The workaround is to define, just for
- the problematic package, LD as the C compiler. A good way
- to do this would be preConfigure = "LD=$CC" .
+ only so define LD when it is undefined as a fallback. This
+ triple-threat means Bintools Wrapper will break those packages, as LD is
+ already defined as the actual linker which the package won't override yet
+ doesn't want to use. The workaround is to define, just for the
+ problematic package, LD as the C compiler. A good way to
+ do this would be preConfigure = "LD=$CC" .
@@ -2246,30 +2272,31 @@ addEnvHooks "$hostOffset" myBashFunction
- CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
+ The CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C
standard library (glibc or Darwin's libSystem, just for the dynamic
loader) are all fed in, and dependency finding, hardening (see below),
- and purity checks for each are handled by CC Wrapper. Packages typically
- depend on CC Wrapper, which in turn (at run time) depends on Bintools
- Wrapper.
+ and purity checks for each are handled by the CC Wrapper. Packages
+ typically depend on the CC Wrapper, which in turn (at run-time) depends
+ on the Bintools Wrapper.
- Dependency finding is undoubtedly the main task of CC Wrapper. This
- works just like Bintools Wrapper, except that any
+ Dependency finding is undoubtedly the main task of the CC Wrapper. This
+ works just like the Bintools Wrapper, except that any
include subdirectory of any relevant dependency is
added to NIX_CFLAGS_COMPILE . The setup hook itself
contains some lengthy comments describing the exact convoluted mechanism
by which this is accomplished.
- CC Wrapper also like Bintools Wrapper defines standard environment
- variables with the names of the tools it wraps, for the same reasons
- described above. Importantly, while it includes a cc
- symlink to the c compiler for portability, the CC will be
- defined using the compiler's "real name" (i.e. gcc or
- clang ). This helps lousy build systems that inspect
- on the name of the compiler rather than run it.
+ Similarly, the CC Wrapper follows the Bintools Wrapper in defining
+ standard environment variables with the names of the tools it wraps, for
+ the same reasons described above. Importantly, while it includes a
+ cc symlink to the c compiler for portability, the
+ CC will be defined using the compiler's "real name" (i.e.
+ gcc or clang ). This helps lousy
+ build systems that inspect on the name of the compiler rather than run
+ it.
@@ -2329,9 +2356,11 @@ addEnvHooks "$hostOffset" myBashFunction
The autoreconfHook derivation adds
- autoreconfPhase , which runs autoreconf, libtoolize
- and automake, essentially preparing the configure script in
- autotools-based builds.
+ autoreconfPhase , which runs autoreconf, libtoolize and
+ automake, essentially preparing the configure script in autotools-based
+ builds. Most autotools-based packages come with the configure script
+ pre-generated, but this hook is necessary for a few packages and when you
+ need to patch the package’s configure scripts.
@@ -2375,9 +2404,9 @@ addEnvHooks "$hostOffset" myBashFunction
- Exports GDK_PIXBUF_MODULE_FILE environment variable the
- the builder. Add librsvg package to buildInputs to
- get svg support.
+ Exports GDK_PIXBUF_MODULE_FILE environment variable to the
+ builder. Add librsvg package to buildInputs to get svg
+ support.
@@ -2414,7 +2443,7 @@ addEnvHooks "$hostOffset" myBashFunction
PaX flags on Linux (where it is available by default; on all other
platforms, paxmark is a no-op). For example, to
disable secure memory protections on the executable
- foo :
+ foo
postFixup = ''
paxmark m $out/bin/foo
@@ -2436,16 +2465,164 @@ addEnvHooks "$hostOffset" myBashFunction
This is a special setup hook which helps in packaging proprietary
software in that it automatically tries to find missing shared library
- dependencies of ELF files. All packages within the
- runtimeDependencies environment variable are
- unconditionally added to executables, which is useful for programs that
- use
- dlopen
- 3 to load libraries at runtime.
+ dependencies of ELF files based on the given
+ buildInputs and nativeBuildInputs .
+
+
+ You can also specify a runtimeDependencies environment
+ variable which lists dependencies that are unconditionally added to all
+ executables.
+
+
+ This is useful for programs that use
+ dlopen
+ 3
+ to load libraries at runtime.
+
+
+ In certain situations you may want to run the main command
+ (autoPatchelf ) of the setup hook on a file or a set
+ of directories instead of unconditionally patching all outputs. This
+ can be done by setting the dontAutoPatchelf environment
+ variable to a non-empty value.
+
+
+ The autoPatchelf command also recognizes a
+ --no-recurse command line flag,
+ which prevents it from recursing into subdirectories.
-
+
+
+ breakpointHook
+
+
+
+ This hook will make a build pause instead of stopping when a failure
+ happens. It prevents nix from cleaning up the build environment immediately and
+ allows the user to attach to a build environment using the
+ cntr command. Upon build error it will print
+ instructions on how to use cntr . Installing
+ cntr and running the command will provide shell access to the build
+ sandbox of failed build. At /var/lib/cntr the
+ sandboxed 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
+ not be the case when remote builders are enabled.
+ cntr is only supported on Linux-based platforms. To
+ use it first add cntr to your
+ environment.systemPackages on NixOS or alternatively to
+ the root user on non-NixOS systems. Then in the package that is supposed
+ to be inspected, add breakpointHook to
+ nativeBuildInputs .
+
+ nativeBuildInputs = [ breakpointHook ];
+
+ When a build failure happens there will be an instruction printed that
+ shows how to attach with cntr to the build sandbox.
+
+
+
+
+
+ cmake
+
+
+
+ Overrides the default configure phase to run the CMake command. By
+ default, we use the Make generator of CMake. In
+ addition, dependencies are added automatically to CMAKE_PREFIX_PATH so
+ that packages are correctly detected by CMake. Some additional flags
+ are passed in to give similar behavior to configure-based packages. You
+ can disable this hook’s behavior by setting configurePhase to a custom
+ value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags
+ passed only to CMake. By default, parallel building is enabled as CMake
+ supports parallel building almost everywhere. When Ninja is also in
+ use, CMake will detect that and use the ninja generator.
+
+
+
+
+
+ xcbuildHook
+
+
+
+ Overrides the build and install phases to run the “xcbuild” command.
+ This hook is needed when a project only comes with build files for the
+ XCode build system. You can disable this behavior by setting buildPhase
+ and configurePhase to a custom value. xcbuildFlags controls flags
+ passed only to xcbuild.
+
+
+
+
+
+ meson
+
+
+
+ Overrides the configure phase to run meson to generate Ninja files. You
+ can disable this behavior by setting configurePhase to a custom value,
+ or by setting dontUseMesonConfigure. To run these files, you should
+ accompany meson with ninja. mesonFlags controls only the flags passed
+ to meson. By default, parallel building is enabled as Meson supports
+ parallel building almost everywhere.
+
+
+
+
+
+ ninja
+
+
+
+ Overrides the build, install, and check phase to run ninja instead of
+ make. You can disable this behavior with the dontUseNinjaBuild,
+ dontUseNinjaInstall, and dontUseNinjaCheck, respectively. Parallel
+ building is enabled by default in Ninja.
+
+
+
+
+
+ unzip
+
+
+
+ This setup hook will allow you to unzip .zip files specified in $src.
+ There are many similar packages like unrar, undmg, etc.
+
+
+
+
+
+ wafHook
+
+
+
+ Overrides the configure, build, and install phases. This will run the
+ "waf" script used by many projects. If waf doesn’t exist, it will copy
+ the version of waf available in Nixpkgs wafFlags can be used to pass
+ flags to the waf script.
+
+
+
+
+
+ scons
+
+
+
+ Overrides the build, install, and check phases. This uses the scons
+ build system as a replacement for make. scons does not provide a
+ configure phase, so everything is managed at build and install time.
+
+
+
+
diff --git a/lib/asserts.nix b/lib/asserts.nix
new file mode 100644
index 000000000000..8a5f1fb3feb7
--- /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 1e4142562fa6..d374d229f597 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -94,6 +94,15 @@ rec {
attrValues = builtins.attrValues or (attrs: attrVals (attrNames attrs) attrs);
+ /* Given a set of attribute names, return the set of the corresponding
+ attributes from the given set.
+
+ Example:
+ getAttrs [ "a" "b" ] { a = 1; b = 2; c = 3; }
+ => { a = 1; b = 2; }
+ */
+ getAttrs = names: attrs: genAttrs names (name: attrs.${name});
+
/* Collect each attribute named `attr' from a list of attribute
sets. Sets that don't contain the named attribute are ignored.
@@ -435,12 +444,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 df9d977e9ec7..68062dd0daf0 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 383eb32d75d0..2879f72ed2ba 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 value and also return it.
+ /* Trace the supplied value after applying a function to it, and
+ return the original value.
+
+ 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 dd6fcec75e21..e4e3e7d325a4 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,11 +61,10 @@ 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
+ inherit (fixedPoints) fix fix' converge extends composeExtensions
makeExtensible makeExtensibleWithCustomName;
inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
- getAttrFromPath attrVals attrValues catAttrs filterAttrs
+ getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs
filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond
genAttrs isDerivation toDerivation optionalAttrs
@@ -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/fixed-points.nix b/lib/fixed-points.nix
index 13e053b5aa7d..2f818c88de5d 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -24,6 +24,16 @@ rec {
# for a concrete example.
fix' = f: let x = f x // { __unfix__ = f; }; in x;
+ # Return the fixpoint that `f` converges to when called recursively, starting
+ # with the input `x`.
+ #
+ # nix-repl> converge (x: x / 2) 16
+ # 0
+ converge = f: x:
+ if (f x) == x
+ then x
+ else converge f (f x);
+
# Modify the contents of an explicitly recursive attribute set in a way that
# honors `self`-references. This is accomplished with a function
#
@@ -41,6 +51,18 @@ rec {
# think of it as an infix operator `g extends f` that mimics the syntax from
# Java. It may seem counter-intuitive to have the "base class" as the second
# argument, but it's nice this way if several uses of `extends` are cascaded.
+ #
+ # To get a better understanding how `extends` turns a function with a fix
+ # point (the package set we start with) into a new function with a different fix
+ # point (the desired packages set) lets just see, how `extends g f`
+ # unfolds with `g` and `f` defined above:
+ #
+ # extends g f = self: let super = f self; in super // g self super;
+ # = self: let super = { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }; in super // g self super
+ # = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // g self { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
+ # = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // { foo = "foo" + " + "; }
+ # = self: { foo = "foo + "; bar = "bar"; foobar = self.foo + self.bar; }
+ #
extends = f: rattrs: self: let super = rattrs self; in super // f self super;
# Compose two extending functions of the type expected by 'extends'
diff --git a/lib/generators.nix b/lib/generators.nix
index f5faf7007860..863ba847423e 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 c442d74c857c..5ef60b510634 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -13,6 +13,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
* add it to this list. The URL mentioned above is a good source for inspiration.
*/
+ abstyles = spdx {
+ spdxId = "Abstyles";
+ fullName = "Abstyles License";
+ };
+
afl21 = spdx {
spdxId = "AFL-2.1";
fullName = "Academic Free License v2.1";
@@ -42,6 +47,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
amd = {
fullName = "AMD License Agreement";
url = http://developer.amd.com/amd-license-agreement/;
+ free = false;
};
apsl20 = spdx {
@@ -99,14 +105,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = ''BSD 4-clause "Original" or "Old" License'';
};
- bsl10 = {
- fullName = "Business Source License 1.0";
- url = https://mariadb.com/bsl10;
- };
-
bsl11 = {
fullName = "Business Source License 1.1";
url = https://mariadb.com/bsl11;
+ free = false;
};
clArtistic = spdx {
@@ -309,6 +311,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 +363,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 +395,18 @@ 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;
+ };
+
+ jasper = spdx {
+ spdxId = "JasPer-2.0";
+ fullName = "JasPer License";
+ };
+
lgpl2 = spdx {
spdxId = "LGPL-2.0";
fullName = "GNU Library General Public License v2 only";
@@ -480,6 +505,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
free = false;
};
+ nasa13 = spdx {
+ spdxId = "NASA-1.3";
+ fullName = "NASA Open Source Agreement 1.3";
+ free = false;
+ };
+
ncsa = spdx {
spdxId = "NCSA";
fullName = "University of Illinois/NCSA Open Source License";
@@ -495,6 +526,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 +583,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 +603,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 288882924fff..be541427c247 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 01160b48ec01..791930eafbd0 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 704711b20cd9..1a9f3f7d1f34 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,
@@ -69,7 +73,7 @@ rec {
# Get the commit id of a git repo
# Example: commitIdFromGitRepo
commitIdFromGitRepo =
- let readCommitFromFile = path: file:
+ let readCommitFromFile = file: path:
with builtins;
let fileName = toString path + "/" + file;
packedRefsName = toString path + "/packed-refs";
@@ -81,7 +85,7 @@ rec {
matchRef = match "^ref: (.*)$" fileContent;
in if isNull matchRef
then fileContent
- else readCommitFromFile path (lib.head matchRef)
+ else readCommitFromFile (lib.head matchRef) path
# Sometimes, the file isn't there at all and has been packed away in the
# packed-refs file, so we have to grep through it:
else if lib.pathExists packedRefsName
@@ -92,7 +96,7 @@ rec {
then throw ("Could not find " + file + " in " + packedRefsName)
else lib.head matchRef
else throw ("Not a .git directory: " + path);
- in lib.flip readCommitFromFile "HEAD";
+ in readCommitFromFile "HEAD";
pathHasContext = builtins.hasContext or (lib.hasPrefix builtins.storeDir);
diff --git a/lib/strings.nix b/lib/strings.nix
index af932ce6ecff..48420a367815 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.
+
+ 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, using given package output.
- If no output is found, fallback to `.out` and then to the default.
+ /* 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.
+
+ 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,40 +185,77 @@ 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;
in lenContent >= lenSuffix &&
substring (lenContent - lenSuffix) lenContent content == suffix;
+ /* Determine whether a string contains the given infix
+
+ Type: hasInfix :: string -> string -> bool
+
+ Example:
+ hasInfix "bc" "abcd"
+ => true
+ hasInfix "ab" "abcd"
+ => true
+ hasInfix "cd" "abcd"
+ => true
+ hasInfix "foo" "abcd"
+ => false
+ */
+ hasInfix = infix: content:
+ let
+ drop = x: substring 1 (stringLength x) x;
+ in hasPrefix infix content
+ || content != "" && hasInfix infix (drop content);
+
/* Convert a string to a list of characters (i.e. singleton strings).
This allows you to, e.g., map a function over each character. However,
note that this will likely be horribly inefficient; Nix is not a
@@ -180,6 +264,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 +280,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 +307,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 +317,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 +327,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 +355,8 @@ rec {
/* Converts an ASCII string to lower-case.
+ Type: toLower :: string -> string
+
Example:
toLower "HOME"
=> "home"
@@ -264,6 +365,8 @@ rec {
/* Converts an ASCII string to upper-case.
+ Type: toUpper :: string -> string
+
Example:
toUpper "home"
=> "HOME"
@@ -273,7 +376,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 +422,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 +432,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 the prefix of the second argument if the first argument matches
- its suffix.
+ /* Return a string without the specified suffix, if the suffix matches.
+
+ Type: string -> string -> string
Example:
removeSuffix "front" "homefront"
@@ -347,17 +456,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 +480,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 +523,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 +572,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 +586,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 +620,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;
- /* Convert string to int
- Obviously, it is a bit hacky to use fromJSON that way.
+ /* Parse a string string as an int.
+
+ Type: string -> int
Example:
toInt "1337"
@@ -514,17 +639,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 +663,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 5eacc9eb23e1..25df5e174069 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,65 @@ 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;
+ };
+
+ qemuArch =
+ if final.isArm then "arm"
+ else if final.isx86_64 then "x86_64"
+ else if final.isx86 then "i386"
+ else {
+ "powerpc" = "ppc";
+ "powerpc64" = "ppc64";
+ "powerpc64le" = "ppc64";
+ "mips64" = "mips";
+ "mipsel64" = "mipsel";
+ }.${final.parsed.cpu.name} or final.parsed.cpu.name;
+
+ emulator = pkgs: let
+ qemu-user = pkgs.qemu.override {
+ smartcardSupport = false;
+ spiceSupport = false;
+ openGLSupport = false;
+ virglSupport = false;
+ vncSupport = false;
+ gtkSupport = false;
+ sdlSupport = false;
+ pulseSupport = false;
+ smbdSupport = false;
+ seccompSupport = false;
+ hostCpuTargets = ["${final.qemuArch}-linux-user"];
+ };
+ wine-name = "wine${toString final.parsed.cpu.bits}";
+ wine = (pkgs.winePackagesFor wine-name).minimal;
+ in
+ if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
+ (final.parsed.cpu.name == pkgs.stdenv.hostPlatform.parsed.cpu.name ||
+ (final.platform.isi686 && pkgs.stdenv.hostPlatform.isx86_64))
+ then pkgs.runtimeShell
+ else if final.isWindows
+ then "${wine}/bin/${wine-name}"
+ else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux
+ then "${qemu-user}/bin/qemu-${final.qemuArch}"
+ else throw "Don't know how to run ${final.config} executables.";
+
} // 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 a00165db1716..58677c0bdd90 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 c2ee829529dc..608db00a9683 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -2,7 +2,14 @@
# `crossSystem`. They are put here for user convenience, but also used by cross
# tests and linux cross stdenv building, so handle with care!
{ lib }:
-let platforms = import ./platforms.nix { inherit lib; }; in
+let
+ platforms = import ./platforms.nix { inherit lib; };
+
+ riscv = bits: {
+ config = "riscv${bits}-unknown-linux-gnu";
+ platform = platforms.riscv-multiplatform bits;
+ };
+in
rec {
#
@@ -28,7 +35,7 @@ rec {
};
armv7l-hf-multiplatform = rec {
- config = "armv7a-unknown-linux-gnueabihf";
+ config = "armv7l-unknown-linux-gnueabihf";
platform = platforms.armv7l-hf-multiplatform;
};
@@ -92,13 +99,56 @@ rec {
musl64 = { config = "x86_64-unknown-linux-musl"; };
musl32 = { config = "i686-unknown-linux-musl"; };
- riscv = bits: {
- config = "riscv${bits}-unknown-linux-gnu";
- platform = platforms.riscv-multiplatform bits;
- };
riscv64 = riscv "64";
riscv32 = riscv "32";
+ avr = {
+ config = "avr";
+ };
+
+ arm-embedded = {
+ config = "arm-none-eabi";
+ libc = "newlib";
+ };
+ armhf-embedded = {
+ config = "arm-none-eabihf";
+ libc = "newlib";
+ };
+
+ aarch64-embedded = {
+ config = "aarch64-none-elf";
+ libc = "newlib";
+ };
+
+ aarch64be-embedded = {
+ config = "aarch64_be-none-elf";
+ libc = "newlib";
+ };
+
+ ppc-embedded = {
+ config = "powerpc-none-eabi";
+ libc = "newlib";
+ };
+
+ ppcle-embedded = {
+ config = "powerpcle-none-eabi";
+ libc = "newlib";
+ };
+
+ alpha-embedded = {
+ config = "alpha-elf";
+ 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 65f560328af5..2fcf1afe4628 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 bb26c93f3d7a..7db09fc550e2 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -80,7 +80,11 @@ rec {
armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; };
+ aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; };
+ i386 = { bits = 32; significantByte = littleEndian; family = "x86"; };
+ i486 = { bits = 32; significantByte = littleEndian; family = "x86"; };
+ i586 = { bits = 32; significantByte = littleEndian; family = "x86"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; };
@@ -92,6 +96,7 @@ rec {
powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };
powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; };
powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; };
+ powerpcle = { bits = 32; significantByte = littleEndian; family = "power"; };
riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; };
riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
@@ -101,6 +106,10 @@ rec {
wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
+
+ alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; };
+
+ avr = { bits = 8; family = "avr"; };
};
################################################################################
@@ -117,6 +126,7 @@ rec {
apple = {};
pc = {};
+ none = {};
unknown = {};
};
@@ -199,7 +209,15 @@ rec {
abis = setTypes types.openAbi {
cygnus = {};
msvc = {};
- eabi = {};
+
+ # Note: eabi is specific to ARM and PowerPC.
+ # On PowerPC, this corresponds to PPCEABI.
+ # On ARM, this corresponds to ARMEABI.
+ eabi = { float = "soft"; };
+ eabihf = { float = "hard"; };
+
+ # Other architectures should use ELF in embedded situations.
+ elf = {};
androideabi = {};
android = {
@@ -255,9 +273,14 @@ 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) == "elf"
+ then { cpu = elemAt l 0; vendor = "unknown"; 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 +291,8 @@ 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 (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
+ then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; 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 000000000000..8bd7b605a39b
--- /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 cf99aca58c09..1604fbb39cbb 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 91604280e4e7..5e1293658215 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 b75e81eb7352..17489311236d 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,58 @@ 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 release code name.
+
+ On each release the first letter is bumped and a new animal is chosen
+ starting with that new letter.
+ */
+ codeName = "Koi";
+
+ /* 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 +208,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 +221,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 4d6ac51c8988..d1ece2402ad7 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}";
@@ -167,6 +169,9 @@ rec {
# s32 = sign 32 4294967296;
};
+ # Alias of u16 for a port number
+ port = ints.u16;
+
float = mkOptionType rec {
name = "float";
description = "floating point number";
@@ -192,7 +197,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 +447,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 6356c0c7cefe..9b07e439e2e1 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";
@@ -68,6 +73,11 @@
github = "acowley";
name = "Anthony Cowley";
};
+ adamt = {
+ email = "mail@adamtulinius.dk";
+ github = "adamtulinius";
+ name = "Adam Tulinius";
+ };
adelbertc = {
email = "adelbertc@gmail.com";
github = "adelbertc";
@@ -138,6 +148,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 +168,11 @@
github = "alexanderkjeldaas";
name = "Alexander Kjeldaas";
};
+ akavel = {
+ email = "czapkofan@gmail.com";
+ github = "akavel";
+ name = "Mateusz Czapliński";
+ };
akaWolf = {
email = "akawolf0@gmail.com";
github = "akaWolf";
@@ -201,6 +221,11 @@
github = "alunduil";
name = "Alex Brandt";
};
+ amar1729 = {
+ email = "amar.paul16@gmail.com";
+ github = "amar1729";
+ name = "Amar Paul";
+ };
ambrop72 = {
email = "ambrop7@gmail.com";
github = "ambrop72";
@@ -216,6 +241,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 +257,7 @@
name = "Andrew Morsillo";
};
AndersonTorres = {
- email = "torres.anderson.85@gmail.com";
+ email = "torres.anderson.85@protonmail.com";
github = "AndersonTorres";
name = "Anderson Torres";
};
@@ -371,11 +401,31 @@
github = "aszlig";
name = "aszlig";
};
+ atnnn = {
+ email = "etienne@atnnn.com";
+ github = "atnnn";
+ name = "Etienne Laurin";
+ };
auntie = {
email = "auntieNeo@gmail.com";
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";
+ };
+ averelld = {
+ email = "averell+nixos@rxd4.com";
+ github = "averelld";
+ name = "averelld";
+ };
avnik = {
email = "avn@avnik.info";
github = "avnik";
@@ -470,6 +520,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 +555,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";
@@ -579,6 +639,11 @@
github = "bramd";
name = "Bram Duvigneau";
};
+ braydenjw = {
+ email = "nixpkgs@willenborg.ca";
+ github = "braydenjw";
+ name = "Brayden Willenborg";
+ };
brian-dawn = {
email = "brian.t.dawn@gmail.com";
github = "brian-dawn";
@@ -633,6 +698,11 @@
github = "campadrenalin";
name = "Philip Horger";
};
+ candeira = {
+ email = "javier@candeira.com";
+ github = "candeira";
+ name = "Javier Candeira";
+ };
canndrew = {
email = "shum@canndrew.org";
github = "canndrew";
@@ -678,6 +748,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";
@@ -702,6 +777,11 @@
github = "ChengCat";
name = "Yucheng Zhang";
};
+ chessai = {
+ email = "chessai1996@gmail.com";
+ github = "chessai";
+ name = "Daniel Cartwright";
+ };
chiiruno = {
email = "okinan@protonmail.com";
github = "chiiruno";
@@ -912,6 +992,11 @@
github = "danielfullmer";
name = "Daniel Fullmer";
};
+ das-g = {
+ email = "nixpkgs@raphael.dasgupta.ch";
+ github = "das-g";
+ name = "Raphael Das Gupta";
+ };
das_j = {
email = "janne@hess.ooo";
github = "dasJ";
@@ -956,6 +1041,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 +1200,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 +1260,11 @@
github = "eduarrrd";
name = "Eduard Bachmakov";
};
+ edude03 = {
+ email = "michael@melenion.com";
+ github = "edude03";
+ name = "Michael Francis";
+ };
edwtjo = {
email = "ed@cflags.cc";
github = "edwtjo";
@@ -1224,6 +1324,11 @@
github = "ellis";
name = "Ellis Whitehead";
};
+ elseym = {
+ email = "elseym@me.com";
+ github = "elseym";
+ name = "Simon Waibl";
+ };
elvishjerricco = {
email = "elvishjerricco@gmail.com";
github = "ElvishJerricco";
@@ -1307,6 +1412,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 +1437,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";
@@ -1442,6 +1557,11 @@
github = "ftrvxmtrx";
name = "Siarhei Zirukin";
};
+ fuerbringer = {
+ email = "severin@fuerbringer.info";
+ github = "fuerbringer";
+ name = "Severin Fürbringer";
+ };
funfunctor = {
email = "eocallaghan@alterapraxis.com";
name = "Edward O'Callaghan";
@@ -1451,6 +1571,11 @@
github = "fuuzetsu";
name = "Mateusz Kowalczyk";
};
+ fuwa = {
+ email = "echowss@gmail.com";
+ github = "fuwa0529";
+ name = "Haruka Akiyama";
+ };
fuzzy-id = {
email = "hacking+nixos@babibo.de";
name = "Thomas Bach";
@@ -1610,6 +1735,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";
@@ -1664,6 +1794,11 @@
email = "t@larkery.com";
name = "Tom Hinton";
};
+ hlolli = {
+ email = "hlolli@gmail.com";
+ github = "hlolli";
+ name = "Hlodver Sigurdsson";
+ };
hodapp = {
email = "hodapp87@gmail.com";
github = "Hodapp87";
@@ -1759,6 +1894,11 @@
github = "ironpinguin";
name = "Michele Catalano";
};
+ ivan = {
+ email = "ivan@ludios.org";
+ github = "ivan";
+ name = "Ivan Kozik";
+ };
ivan-tkatchev = {
email = "tkatchev@gmail.com";
name = "Ivan Tkatchev";
@@ -1788,6 +1928,11 @@
github = "jagajaga";
name = "Arseniy Seroka";
};
+ jakelogemann = {
+ email = "jake.logemann@gmail.com";
+ github = "jakelogemann";
+ name = "Jake Logemann";
+ };
jammerful = {
email = "jammerful@gmail.com";
github = "jammerful";
@@ -1832,6 +1977,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 +1997,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";
@@ -1887,6 +2047,11 @@
github = "jhhuh";
name = "Ji-Haeng Huh";
};
+ jhillyerd = {
+ email = "james+nixos@hillyerd.com";
+ github = "jhillyerd";
+ name = "James Hillyerd";
+ };
jirkamarsik = {
email = "jiri.marsik89@gmail.com";
github = "jirkamarsik";
@@ -1902,6 +2067,11 @@
github = "jluttine";
name = "Jaakko Luttinen";
};
+ jmagnusj = {
+ email = "jmagnusj@gmail.com";
+ github = "magnusjonsson";
+ name = "Johan Magnus Jonsson";
+ };
jmettes = {
email = "jonathan@jmettes.com";
github = "jmettes";
@@ -2098,6 +2268,11 @@
github = "kiloreux";
name = "Kiloreux Emperex";
};
+ kimburgess = {
+ email = "kim@acaprojects.com";
+ github = "kimburgess";
+ name = "Kim Burgess";
+ };
kini = {
email = "keshav.kini@gmail.com";
github = "kini";
@@ -2124,6 +2299,11 @@
github = "knedlsepp";
name = "Josef Kemetmüller";
};
+ knl = {
+ email = "nikola@knezevic.co";
+ github = "knl";
+ name = "Nikola Knežević";
+ };
konimex = {
email = "herdiansyah@netc.eu";
github = "konimex";
@@ -2154,6 +2334,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";
@@ -2294,6 +2479,11 @@
github = "listx";
name = "Linus Arver";
};
+ lionello = {
+ email = "lio@lunesu.com";
+ github = "lionello";
+ name = "Lionello Lunesu";
+ };
lluchs = {
email = "lukas.werling@gmail.com";
github = "lluchs";
@@ -2397,6 +2587,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 +2726,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";
@@ -2556,6 +2756,11 @@
github = "melsigl";
name = "Melanie B. Sigl";
};
+ melkor333 = {
+ email = "samuel@ton-kunst.ch";
+ github = "melkor333";
+ name = "Samuel Ruprecht";
+ };
metabar = {
email = "softs@metabarcoding.org";
name = "Celine Mercier";
@@ -2565,6 +2770,11 @@
github = "mgdelacroix";
name = "Miguel de la Cruz";
};
+ mgregoire = {
+ email = "gregoire@martinache.net";
+ github = "M-Gregoire";
+ name = "Gregoire Martinache";
+ };
mgttlinger = {
email = "megoettlinger@gmail.com";
github = "mgttlinger";
@@ -2808,6 +3018,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 +3077,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 +3207,7 @@
name = "Oliver Dunkl";
};
offline = {
- email = "jakahudoklin@gmail.com";
+ email = "jaka@x-truder.net";
github = "offlinehacker";
name = "Jaka Hudoklin";
};
@@ -3015,6 +3235,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 +3275,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 +3459,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 +3499,11 @@
github = "proglodyte";
name = "Proglodyte";
};
+ prusnak = {
+ email = "stick@gk2.sk";
+ github = "prusnak";
+ name = "Pavol Rusnak";
+ };
pshendry = {
email = "paul@pshendry.com";
github = "pshendry";
@@ -3396,6 +3641,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 +3756,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";
@@ -3621,6 +3876,16 @@
github = "sauyon";
name = "Sauyon Lee";
};
+ sboosali = {
+ email = "SamBoosalis@gmail.com";
+ github = "sboosali";
+ name = "Sam Boosalis";
+ };
+ scalavision = {
+ email = "scalavision@gmail.com";
+ github = "scalavision";
+ name = "Tom Sorlie";
+ };
schmitthenner = {
email = "development@schmitthenner.eu";
github = "fkz";
@@ -3645,6 +3910,11 @@
github = "scolobb";
name = "Sergiu Ivanov";
};
+ screendriver = {
+ email = "nix@echooff.de";
+ github = "screendriver";
+ name = "Christian Rackerseder";
+ };
Scriptkiddi = {
email = "nixos@scriptkiddi.de";
github = "scriptkiddi";
@@ -3685,6 +3955,11 @@
github = "seppeljordan";
name = "Sebastian Jordan";
};
+ seqizz = {
+ email = "seqizz@gmail.com";
+ github = "seqizz";
+ name = "Gurkan Gur";
+ };
sfrijters = {
email = "sfrijters@gmail.com";
github = "sfrijters";
@@ -3755,6 +4030,11 @@
github = "sjagoe";
name = "Simon Jagoe";
};
+ sjau = {
+ email = "nixos@sjau.ch";
+ github = "sjau";
+ name = "Stephan Jau";
+ };
sjmackenzie = {
email = "setori88@gmail.com";
github = "sjmackenzie";
@@ -3823,6 +4103,11 @@
github = "spacefrogg";
name = "Michael Raitza";
};
+ spacekookie = {
+ email = "kookie@spacekookie.de";
+ github = "spacekookie";
+ name = "Katharina Fey";
+ };
spencerjanssen = {
email = "spencerjanssen@gmail.com";
github = "spencerjanssen";
@@ -3888,6 +4173,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 +4243,11 @@
github = "sztupi";
name = "Attila Sztupak";
};
+ t184256 = {
+ email = "monk@unboiled.info";
+ github = "t184256";
+ name = "Alexander Sosedkin";
+ };
tadfisher = {
email = "tadfisher@gmail.com";
github = "tadfisher";
@@ -3993,6 +4288,16 @@
github = "taku0";
name = "Takuo Yonezawa";
};
+ talyz = {
+ email = "kim.lindberger@gmail.com";
+ github = "talyz";
+ name = "Kim Lindberger";
+ };
+ taneb = {
+ email = "nvd1234@gmail.com";
+ github = "Taneb";
+ name = "Nathan van Doorn";
+ };
tari = {
email = "peter@taricorp.net";
github = "tari";
@@ -4008,11 +4313,6 @@
github = "tazjin";
name = "Vincent Ambo";
};
- TealG = {
- email = "~@Teal.Gr";
- github = "TealG";
- name = "Teal Gaure";
- };
teh = {
email = "tehunger@gmail.com";
github = "teh";
@@ -4038,6 +4338,11 @@
github = "tex";
name = "Milan Svoboda";
};
+ tg-x = {
+ email = "*@tg-x.net";
+ github = "tg-x";
+ name = "TG ⊗ Θ";
+ };
thall = {
email = "niclas.thall@gmail.com";
github = "thall";
@@ -4153,6 +4458,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 +4547,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 +4696,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 +4778,11 @@
github = "wucke13";
name = "Wucke";
};
+ wykurz = {
+ email = "wykurz@gmail.com";
+ github = "wykurz";
+ name = "Mateusz Wykurz";
+ };
wyvie = {
email = "elijahrum@gmail.com";
github = "wyvie";
@@ -4508,13 +4833,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 +4893,11 @@
github = "maggesi";
name = "Marco Maggesi";
};
+ zachcoyle = {
+ email = "zach.coyle@gmail.com";
+ github = "zachcoyle";
+ name = "Zach Coyle";
+ };
zagy = {
email = "cz@flyingcircus.io";
github = "zagy";
@@ -4573,6 +4908,11 @@
github = "umazalakain";
name = "Unai Zalakain";
};
+ zaninime = {
+ email = "francesco@zanini.me";
+ github = "zaninime";
+ name = "Francesco Zanini";
+ };
zarelit = {
email = "david@zarel.net";
github = "zarelit";
@@ -4627,4 +4967,9 @@
github = "zzamboni";
name = "Diego Zamboni";
};
+ mredaelli = {
+ email = "massimo@typish.io";
+ github = "mredaelli";
+ name = "Massimo Redaelli";
+ };
}
diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index d95ff4f347e8..d56c9e6338cc 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -1,361 +1,3 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git
+#!/bin/sh
+exec nix-shell -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git --run pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
-"""
-Update a Python package expression by passing in the `.nix` file, or the directory containing it.
-You can pass in multiple files or paths.
-
-You'll likely want to use
-``
- $ ./update-python-libraries ../../pkgs/development/python-modules/*
-``
-to update all libraries in that folder.
-"""
-
-import argparse
-import logging
-import os
-import re
-import requests
-import toolz
-from concurrent.futures import ThreadPoolExecutor as Pool
-from packaging.version import Version as _Version
-from packaging.version import InvalidVersion
-from packaging.specifiers import SpecifierSet
-import collections
-import subprocess
-
-INDEX = "https://pypi.io/pypi"
-"""url of PyPI"""
-
-EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
-"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
-
-PRERELEASES = False
-
-import logging
-logging.basicConfig(level=logging.INFO)
-
-
-class Version(_Version, collections.abc.Sequence):
-
- def __init__(self, version):
- super().__init__(version)
- # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21`
- # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882
- self.raw_version = version
-
- def __getitem__(self, i):
- return self._version.release[i]
-
- def __len__(self):
- return len(self._version.release)
-
- def __iter__(self):
- yield from self._version.release
-
-
-def _get_values(attribute, text):
- """Match attribute in text and return all matches.
-
- :returns: List of matches.
- """
- regex = '{}\s+=\s+"(.*)";'.format(attribute)
- regex = re.compile(regex)
- values = regex.findall(text)
- return values
-
-def _get_unique_value(attribute, text):
- """Match attribute in text and return unique match.
-
- :returns: Single match.
- """
- values = _get_values(attribute, text)
- n = len(values)
- if n > 1:
- raise ValueError("found too many values for {}".format(attribute))
- elif n == 1:
- return values[0]
- else:
- raise ValueError("no value found for {}".format(attribute))
-
-def _get_line_and_value(attribute, text):
- """Match attribute in text. Return the line and the value of the attribute."""
- regex = '({}\s+=\s+"(.*)";)'.format(attribute)
- regex = re.compile(regex)
- value = regex.findall(text)
- n = len(value)
- if n > 1:
- raise ValueError("found too many values for {}".format(attribute))
- elif n == 1:
- return value[0]
- else:
- raise ValueError("no value found for {}".format(attribute))
-
-
-def _replace_value(attribute, value, text):
- """Search and replace value of attribute in text."""
- old_line, old_value = _get_line_and_value(attribute, text)
- new_line = old_line.replace(old_value, value)
- new_text = text.replace(old_line, new_line)
- return new_text
-
-def _fetch_page(url):
- r = requests.get(url)
- if r.status_code == requests.codes.ok:
- return r.json()
- else:
- raise ValueError("request for {} failed".format(url))
-
-
-SEMVER = {
- 'major' : 0,
- 'minor' : 1,
- 'patch' : 2,
-}
-
-
-def _determine_latest_version(current_version, target, versions):
- """Determine latest version, given `target`.
- """
- current_version = Version(current_version)
-
- def _parse_versions(versions):
- for v in versions:
- try:
- yield Version(v)
- except InvalidVersion:
- pass
-
- versions = _parse_versions(versions)
-
- index = SEMVER[target]
-
- ceiling = list(current_version[0:index])
- if len(ceiling) == 0:
- ceiling = None
- else:
- ceiling[-1]+=1
- ceiling = Version(".".join(map(str, ceiling)))
-
- # We do not want prereleases
- versions = SpecifierSet(prereleases=PRERELEASES).filter(versions)
-
- if ceiling is not None:
- versions = SpecifierSet(f"<{ceiling}").filter(versions)
-
- return (max(sorted(versions))).raw_version
-
-
-def _get_latest_version_pypi(package, extension, current_version, target):
- """Get latest version and hash from PyPI."""
- url = "{}/{}/json".format(INDEX, package)
- json = _fetch_page(url)
-
- versions = json['releases'].keys()
- version = _determine_latest_version(current_version, target, versions)
-
- try:
- releases = json['releases'][version]
- except KeyError as e:
- raise KeyError('Could not find version {} for {}'.format(version, package)) from e
- for release in releases:
- if release['filename'].endswith(extension):
- # TODO: In case of wheel we need to do further checks!
- sha256 = release['digests']['sha256']
- break
- else:
- sha256 = None
- return version, sha256
-
-
-def _get_latest_version_github(package, extension, current_version, target):
- raise ValueError("updating from GitHub is not yet supported.")
-
-
-FETCHERS = {
- 'fetchFromGitHub' : _get_latest_version_github,
- 'fetchPypi' : _get_latest_version_pypi,
- 'fetchurl' : _get_latest_version_pypi,
-}
-
-
-DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz'
-
-
-FORMATS = {
- 'setuptools' : DEFAULT_SETUPTOOLS_EXTENSION,
- 'wheel' : 'whl'
-}
-
-def _determine_fetcher(text):
- # Count occurences of fetchers.
- nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys())
- if nfetchers == 0:
- raise ValueError("no fetcher.")
- elif nfetchers > 1:
- raise ValueError("multiple fetchers.")
- else:
- # Then we check which fetcher to use.
- for fetcher in FETCHERS.keys():
- if 'src = {}'.format(fetcher) in text:
- return fetcher
-
-
-def _determine_extension(text, fetcher):
- """Determine what extension is used in the expression.
-
- If we use:
- - fetchPypi, we check if format is specified.
- - fetchurl, we determine the extension from the url.
- - fetchFromGitHub we simply use `.tar.gz`.
- """
- if fetcher == 'fetchPypi':
- try:
- src_format = _get_unique_value('format', text)
- except ValueError as e:
- src_format = None # format was not given
-
- try:
- extension = _get_unique_value('extension', text)
- except ValueError as e:
- extension = None # extension was not given
-
- if extension is None:
- if src_format is None:
- src_format = 'setuptools'
- elif src_format == 'flit':
- raise ValueError("Don't know how to update a Flit package.")
- extension = FORMATS[src_format]
-
- elif fetcher == 'fetchurl':
- url = _get_unique_value('url', text)
- extension = os.path.splitext(url)[1]
- if 'pypi' not in url:
- raise ValueError('url does not point to PyPI.')
-
- elif fetcher == 'fetchFromGitHub':
- raise ValueError('updating from GitHub is not yet implemented.')
-
- return extension
-
-
-def _update_package(path, target):
-
- # Read the expression
- with open(path, 'r') as f:
- text = f.read()
-
- # Determine pname.
- pname = _get_unique_value('pname', text)
-
- # Determine version.
- version = _get_unique_value('version', text)
-
- # First we check how many fetchers are mentioned.
- fetcher = _determine_fetcher(text)
-
- extension = _determine_extension(text, fetcher)
-
- new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target)
-
- if new_version == version:
- logging.info("Path {}: no update available for {}.".format(path, pname))
- return False
- elif Version(new_version) <= Version(version):
- raise ValueError("downgrade for {}.".format(pname))
- if not new_sha256:
- raise ValueError("no file available for {}.".format(pname))
-
- text = _replace_value('version', new_version, text)
- text = _replace_value('sha256', new_sha256, text)
-
- with open(path, 'w') as f:
- f.write(text)
-
- logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version))
-
- result = {
- 'path' : path,
- 'target': target,
- 'pname': pname,
- 'old_version' : version,
- 'new_version' : new_version,
- #'fetcher' : fetcher,
- }
-
- return result
-
-
-def _update(path, target):
-
- # We need to read and modify a Nix expression.
- if os.path.isdir(path):
- path = os.path.join(path, 'default.nix')
-
- # If a default.nix does not exist, we quit.
- if not os.path.isfile(path):
- logging.info("Path {}: does not exist.".format(path))
- return False
-
- # If file is not a Nix expression, we quit.
- if not path.endswith(".nix"):
- logging.info("Path {}: does not end with `.nix`.".format(path))
- return False
-
- try:
- return _update_package(path, target)
- except ValueError as e:
- logging.warning("Path {}: {}".format(path, e))
- return False
-
-
-def _commit(path, pname, old_version, new_version, **kwargs):
- """Commit result.
- """
-
- msg = f'python: {pname}: {old_version} -> {new_version}'
-
- try:
- subprocess.check_call(['git', 'add', path])
- subprocess.check_call(['git', 'commit', '-m', msg])
- except subprocess.CalledProcessError as e:
- subprocess.check_call(['git', 'checkout', path])
- raise subprocess.CalledProcessError(f'Could not commit {path}') from e
-
- return True
-
-
-def main():
-
- parser = argparse.ArgumentParser()
- parser.add_argument('package', type=str, nargs='+')
- parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major')
- parser.add_argument('--commit', action='store_true', help='Create a commit for each package update')
-
- args = parser.parse_args()
- target = args.target
-
- packages = list(map(os.path.abspath, args.package))
-
- logging.info("Updating packages...")
-
- # Use threads to update packages concurrently
- with Pool() as p:
- results = list(p.map(lambda pkg: _update(pkg, target), packages))
-
- logging.info("Finished updating packages.")
-
- # Commits are created sequentially.
- if args.commit:
- logging.info("Committing updates...")
- list(map(lambda x: _commit(**x), filter(bool, results)))
- logging.info("Finished committing updates")
-
- count = sum(map(bool, results))
- logging.info("{} package(s) updated".format(count))
-
-
-
-if __name__ == '__main__':
- main()
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index 8d1e47c6bc95..120cd5552f48 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -1,6 +1,8 @@
{ package ? null
, maintainer ? null
, path ? null
+, max-workers ? null
+, keep-going ? null
}:
# TODO: add assert statements
@@ -105,26 +107,23 @@ let
% nix-shell maintainers/scripts/update.nix --argstr path gnome3
to run update script for all package under an attribute path.
+
+ You can also add
+
+ --argstr max-workers 8
+
+ to increase the number of jobs in parallel, or
+
+ --argstr keep-going true
+
+ to continue running when a single update fails.
'';
- runUpdateScript = package: ''
- echo -ne " - ${package.name}: UPDATING ..."\\r
- ${package.updateScript} &> ${(builtins.parseDrvName package.name).name}.log
- CODE=$?
- if [ "$CODE" != "0" ]; then
- echo " - ${package.name}: ERROR "
- echo ""
- echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
- echo ""
- cat ${(builtins.parseDrvName package.name).name}.log
- echo ""
- echo "--- SHOWING ERROR LOG FOR ${package.name} ----------------------"
- exit $CODE
- else
- rm ${(builtins.parseDrvName package.name).name}.log
- fi
- echo " - ${package.name}: DONE. "
- '';
+ packageData = package: {
+ name = package.name;
+ pname = (builtins.parseDrvName package.name).name;
+ updateScript = pkgs.lib.toList package.updateScript;
+ };
in pkgs.stdenv.mkDerivation {
name = "nixpkgs-update-script";
@@ -139,21 +138,7 @@ in pkgs.stdenv.mkDerivation {
exit 1
'';
shellHook = ''
- echo ""
- echo "Going to be running update for following packages:"
- echo "${builtins.concatStringsSep "\n" (map (x: " - ${x.name}") packages)}"
- echo ""
- read -n1 -r -p "Press space to continue..." confirm
- if [ "$confirm" = "" ]; then
- echo ""
- echo "Running update for:"
- ${builtins.concatStringsSep "\n" (map runUpdateScript packages)}
- echo ""
- echo "Packages updated!"
- exit 0
- else
- echo "Aborting!"
- exit 1
- fi
+ unset shellHook # do not contaminate nested shells
+ exec ${pkgs.python3.interpreter} ${./update.py} ${pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages))}${pkgs.lib.optionalString (max-workers != null) " --max-workers=${max-workers}"}${pkgs.lib.optionalString (keep-going == "true") " --keep-going"}
'';
}
diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py
new file mode 100644
index 000000000000..eb7d0ef2647b
--- /dev/null
+++ b/maintainers/scripts/update.py
@@ -0,0 +1,79 @@
+import argparse
+import concurrent.futures
+import json
+import os
+import subprocess
+import sys
+
+updates = {}
+
+def eprint(*args, **kwargs):
+ print(*args, file=sys.stderr, **kwargs)
+
+def run_update_script(package):
+ eprint(f" - {package['name']}: UPDATING ...")
+
+ subprocess.run(package['updateScript'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True)
+
+
+def main(max_workers, keep_going, packages):
+ with open(sys.argv[1]) as f:
+ packages = json.load(f)
+
+ eprint()
+ eprint('Going to be running update for following packages:')
+ for package in packages:
+ eprint(f" - {package['name']}")
+ eprint()
+
+ confirm = input('Press Enter key to continue...')
+ if confirm == '':
+ eprint()
+ eprint('Running update for:')
+
+ with concurrent.futures.ProcessPoolExecutor(max_workers=max_workers) as executor:
+ for package in packages:
+ updates[executor.submit(run_update_script, package)] = package
+
+ for future in concurrent.futures.as_completed(updates):
+ package = updates[future]
+
+ try:
+ future.result()
+ eprint(f" - {package['name']}: DONE.")
+ except subprocess.CalledProcessError as e:
+ eprint(f" - {package['name']}: ERROR")
+ eprint()
+ eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------")
+ eprint()
+ eprint(e.stdout.decode('utf-8'))
+ with open(f"{package['pname']}.log", 'wb') as f:
+ f.write(e.stdout)
+ eprint()
+ eprint(f"--- SHOWING ERROR LOG FOR {package['name']} ----------------------")
+
+ if not keep_going:
+ sys.exit(1)
+
+ eprint()
+ eprint('Packages updated!')
+ sys.exit()
+ else:
+ eprint('Aborting!')
+ sys.exit(130)
+
+parser = argparse.ArgumentParser(description='Update packages')
+parser.add_argument('--max-workers', '-j', dest='max_workers', type=int, help='Number of updates to run concurrently', nargs='?', default=4)
+parser.add_argument('--keep-going', '-k', dest='keep_going', action='store_true', help='Do not stop after first failure')
+parser.add_argument('packages', help='JSON file containing the list of package names and their update scripts')
+
+if __name__ == '__main__':
+ args = parser.parse_args()
+
+ try:
+ main(args.max_workers, args.keep_going, args.packages)
+ except (KeyboardInterrupt, SystemExit) as e:
+ for update in updates:
+ update.cancel()
+
+ sys.exit(e.code if isinstance(e, SystemExit) else 130)
diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
index 2e9adf70c396..b251a1f5e2c3 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 4b977d1d82eb..2ee8bfdd50f1 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 2a98fb126231..d03dbc4d7055 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/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml
index 028a94275345..cdcfa10b8200 100644
--- a/nixos/doc/manual/configuration/adding-custom-packages.xml
+++ b/nixos/doc/manual/configuration/adding-custom-packages.xml
@@ -31,7 +31,7 @@ $ cd nixpkgs
The second possibility is to add the package outside of the Nixpkgs tree. For
instance, here is how you specify a build of the
- GNU Hello
+ GNU Hello
package directly in configuration.nix :
=
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 8a1a39c98c10..c77cfe137baa 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/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 8d05dcd34b4d..cebc4122c6c6 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -22,5 +22,6 @@
+
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index b66adcedce6e..47a19ac82c0f 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 2f766f2b32f7..644d3a33ffd2 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 ).
[ "tun" "ipv6" "loop" ... ]
Interactive exploration of the configuration is possible using
- nix-repl ,
- a read-eval-print loop for Nix expressions. It’s not installed by default;
- run nix-env -i nix-repl to get it. A typical use:
+ nix repl , a read-eval-print loop for Nix expressions.
+ A typical use:
-$ nix-repl '<nixpkgs/nixos>'
+$ nix repl '<nixpkgs/nixos>'
nix-repl> config.
"mandark"
@@ -127,4 +125,23 @@ nix-repl> map (x: x.hostName) config.
+
+
+ While abstracting your configuration, you may find it useful to generate
+ modules using code, instead of writing files. The example
+ below would have the same effect as importing a file which sets those
+ options.
+
+ { config, pkgs, ... }:
+
+ let netConfig = { hostName }: {
+ networking.hostName = hostName;
+ networking.useDHCP = false;
+ };
+
+ in
+
+ { imports = [ (netConfig "nixos.localdomain") ]; }
+
+
diff --git a/nixos/doc/manual/configuration/profiles.xml b/nixos/doc/manual/configuration/profiles.xml
new file mode 100644
index 000000000000..92c0f6202f28
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles.xml
@@ -0,0 +1,39 @@
+
+ Profiles
+
+ In some cases, it may be desirable to take advantage of commonly-used,
+ predefined configurations provided by nixpkgs, but different from those that
+ come as default. This is a role fulfilled by NixOS's Profiles, which come as
+ files living in <nixpkgs/nixos/modules/profiles> .
+ That is to say, expected usage is to add them to the imports list of your
+ /etc/configuration.nix as such:
+
+
+ imports = [
+ <nixpkgs/nixos/modules/profiles/profile-name.nix>
+ ];
+
+
+ Even if some of these profiles seem only useful in the context of
+ install media, many are actually intended to be used in real installs.
+
+
+ What follows is a brief explanation on the purpose and use-case for each
+ profile. Detailing each option configured by each one is out of scope.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/configuration/profiles/all-hardware.xml b/nixos/doc/manual/configuration/profiles/all-hardware.xml
new file mode 100644
index 000000000000..172975199474
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/all-hardware.xml
@@ -0,0 +1,20 @@
+
+
+ All Hardware
+
+ Enables all hardware supported by NixOS: i.e., all firmware is
+ included, and all devices from which one may boot are enabled in the initrd.
+ Its primary use is in the NixOS installation CDs.
+
+
+ The enabled kernel modules include support for SATA and PATA, SCSI
+ (partially), USB, Firewire (untested), Virtio (QEMU, KVM, etc.), VMware, and
+ Hyper-V. Additionally, is
+ enabled, and the firmware for the ZyDAS ZD1211 chipset is specifically
+ installed.
+
+
diff --git a/nixos/doc/manual/configuration/profiles/base.xml b/nixos/doc/manual/configuration/profiles/base.xml
new file mode 100644
index 000000000000..f58a35d626ed
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/base.xml
@@ -0,0 +1,15 @@
+
+
+ Base
+
+ Defines the software packages included in the "minimal"
+ installation CD. It installs several utilities useful in a simple recovery or
+ install media, such as a text-mode web browser, and tools for manipulating
+ block devices, networking, hardware diagnostics, and filesystems (with their
+ respective kernel modules).
+
+
diff --git a/nixos/doc/manual/configuration/profiles/clone-config.xml b/nixos/doc/manual/configuration/profiles/clone-config.xml
new file mode 100644
index 000000000000..87c8b9ee31b6
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/clone-config.xml
@@ -0,0 +1,14 @@
+
+
+ Clone Config
+
+ This profile is used in installer images.
+ It provides an editable configuration.nix that imports all the modules that
+ were also used when creating the image in the first place.
+ As a result it allows users to edit and rebuild the live-system.
+
+
diff --git a/nixos/doc/manual/configuration/profiles/demo.xml b/nixos/doc/manual/configuration/profiles/demo.xml
new file mode 100644
index 000000000000..98829e4696df
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/demo.xml
@@ -0,0 +1,13 @@
+
+
+ Demo
+
+ This profile just enables a demo user, with password demo , uid 1000 , wheel
+ group and
+ autologin in the SDDM display manager.
+
+
diff --git a/nixos/doc/manual/configuration/profiles/docker-container.xml b/nixos/doc/manual/configuration/profiles/docker-container.xml
new file mode 100644
index 000000000000..bf962442ccef
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/docker-container.xml
@@ -0,0 +1,15 @@
+
+
+ Docker Container
+
+ This is the profile from which the Docker images are generated. It prepares a
+ working system by importing the Minimal and
+ Clone Config profiles, and setting appropriate
+ configuration options that are useful inside a container context, like
+ .
+
+
diff --git a/nixos/doc/manual/configuration/profiles/graphical.xml b/nixos/doc/manual/configuration/profiles/graphical.xml
new file mode 100644
index 000000000000..5ded61d9763b
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/graphical.xml
@@ -0,0 +1,21 @@
+
+
+ Graphical
+
+ Defines a NixOS configuration with the Plasma 5 desktop. It's used by the
+ graphical installation CD.
+
+
+ It sets ,
+ ,
+ (
+
+ without Qt4 Support), and
+ to true. It also
+ includes glxinfo and firefox in the system packages list.
+
+
diff --git a/nixos/doc/manual/configuration/profiles/hardened.xml b/nixos/doc/manual/configuration/profiles/hardened.xml
new file mode 100644
index 000000000000..b3b433792f53
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/hardened.xml
@@ -0,0 +1,22 @@
+
+
+ Hardened
+
+ A profile with most (vanilla) hardening options enabled by default,
+ potentially at the cost of features and performance.
+
+
+ This includes a hardened kernel, and limiting the system information
+ available to processes through the /sys and
+ /proc filesystems. It also disables the User Namespaces
+ feature of the kernel, which stops Nix from being able to build anything
+ (this particular setting can be overriden via
+ ). See the
+ profile source for further detail on which settings are altered.
+
+
diff --git a/nixos/doc/manual/configuration/profiles/headless.xml b/nixos/doc/manual/configuration/profiles/headless.xml
new file mode 100644
index 000000000000..54dc61f236e0
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/headless.xml
@@ -0,0 +1,18 @@
+
+
+ Headless
+
+ Common configuration for headless machines (e.g., Amazon EC2 instances).
+
+
+ Disables sound,
+ vesa, serial consoles,
+ emergency mode,
+ grub splash images and
+ configures the kernel to reboot automatically on panic.
+
+
diff --git a/nixos/doc/manual/configuration/profiles/installation-device.xml b/nixos/doc/manual/configuration/profiles/installation-device.xml
new file mode 100644
index 000000000000..44ccfc538ad1
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/installation-device.xml
@@ -0,0 +1,35 @@
+
+
+ Installation Device
+
+ Provides a basic configuration for installation devices like CDs. This means
+ enabling hardware scans, using the
+ Clone Config profile to guarantee
+ /etc/nixos/configuration.nix exists (for
+ nixos-rebuild to work), a copy of the Nixpkgs channel
+ snapshot used to create the install media.
+
+
+ Additionally, documentation for
+ Nixpkgs and NixOS
+ are forcefully enabled (to override the
+ Minimal profile preference); the
+ NixOS manual is shown automatically on TTY 8, sudo and udisks are disabled.
+ Autologin is enabled as root.
+
+
+ A message is shown to the user to start a display manager if needed,
+ ssh with are enabled (but
+ doesn't autostart). WPA Supplicant is also enabled without autostart.
+
+
+ Finally, vim is installed, root is set to not have a password, the kernel is
+ made more silent for remote public IP installs, and several settings are
+ tweaked so that the installer has a better chance of succeeding under
+ low-memory environments.
+
+
diff --git a/nixos/doc/manual/configuration/profiles/minimal.xml b/nixos/doc/manual/configuration/profiles/minimal.xml
new file mode 100644
index 000000000000..a24af21bd7f7
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/minimal.xml
@@ -0,0 +1,17 @@
+
+
+ Minimal
+
+ This profile defines a small NixOS configuration. It does not contain any
+ graphical stuff. It's a very short file that enables
+ noXlibs, sets
+ i18n.supportedLocales
+ to only support the user-selected locale,
+ disables packages' documentation
+ , and disables sound.
+
+
diff --git a/nixos/doc/manual/configuration/profiles/qemu-guest.xml b/nixos/doc/manual/configuration/profiles/qemu-guest.xml
new file mode 100644
index 000000000000..d08068650fbe
--- /dev/null
+++ b/nixos/doc/manual/configuration/profiles/qemu-guest.xml
@@ -0,0 +1,16 @@
+
+ QEMU Guest
+
+ This profile contains common configuration for virtual machines running under
+ QEMU (using virtio).
+
+
+ It makes virtio modules available on the initrd, sets the system time from
+ the hardware clock to work around a bug in qemu-kvm, and
+ enables rngd.
+
+
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index be28c2c17afd..faae4f205443 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -90,7 +90,9 @@ let
fi
${buildPackages.libxslt.bin}/bin/xsltproc \
--stringparam revision '${revision}' \
- -o $out ${./options-to-docbook.xsl} $optionsXML
+ -o intermediate.xml ${./options-to-docbook.xsl} $optionsXML
+ ${buildPackages.libxslt.bin}/bin/xsltproc \
+ -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml
'';
sources = lib.sourceFilesBySuffices ./. [".xml"];
@@ -250,7 +252,7 @@ in rec {
''; # */
# Generate the NixOS manual.
- manual = runCommand "nixos-manual"
+ manualHTML = runCommand "nixos-manual-html"
{ inherit sources;
nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
meta.description = "The NixOS manual in HTML format";
@@ -279,6 +281,11 @@ in rec {
echo "doc manual $dst" >> $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 eaffc0ef47c2..b4791b72970f 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 000000000000..30e58e1e3554
--- /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 2695082e3867..d068887200a9 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/option-types.xml b/nixos/doc/manual/development/option-types.xml
index e6c9eae11a72..d993e47bc914 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -106,7 +106,7 @@
-
+
types.ints.{u8, u16, u32}
@@ -131,6 +131,17 @@
+
+
+ types.port
+
+
+
+ A port number. This type is an alias to
+ types.ints.u16 .
+
+
+
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index 862b364a6d79..c15ad448317f 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")) # 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 5935fbc049bd..4a2615c9407b 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/;
+$machine->succeed("uname") =~ /Linux/ or die;
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 c59d073c61c7..8f9baff44b51 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 c5934111749c..0b311189430c 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 916384559e24..8e94f946c5ee 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
- boot.loader.efi
- and
- boot.loader.systemd
- 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 fileSystems , 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 boot.initrd.kernelModules 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 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 .
-
-
-
-
- Do the installation:
+
+
+
+ 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
+ boot.loader.efi
+ and
+ boot.loader.systemd
+ 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 fileSystems , 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 boot.initrd.kernelModules 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 /dev/sda
-
-# 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 /dev/sda (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 /dev/sda (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 /dev/sda
+
+ 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 85e5082575d3..69668b1d4bd6 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/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml
index 1227873f5780..43d6c2696a28 100644
--- a/nixos/doc/manual/man-nixos-generate-config.xml
+++ b/nixos/doc/manual/man-nixos-generate-config.xml
@@ -13,18 +13,18 @@
- nixos-generate-config
+ nixos-generate-config
--force
-
+
--root
root
-
+
--dir
@@ -167,7 +167,7 @@ $ nixos-generate-config --root /mnt
{
imports =
- [ <nixos/modules/installer/scan/not-detected.nix>
+ [ <nixos/modules/installer/scan/not-detected.nix>
];
boot.initrd.availableKernelModules = [ "ehci_hcd" "ahci" ];
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index a5efde32885c..12f52e1997c8 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 2038b0dff63e..72ac89d4ff62 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 000000000000..1201c7612c2e
--- /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 94f176186b6e..a222bfa29d5a 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 4eb2f9aa0a95..e500c9d63422 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 system.stateVersion 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 system.stateVersion 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 92a7223e0412..8715a05f508b 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 services.networking.hostapd now uses WPA2 by default.
+ The module services.networking.hostapd 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 nix.useSandbox is now defaulted to true .
+ The module option nix.useSandbox 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 000000000000..9405bf063d51
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -0,0 +1,369 @@
+
+ Release 19.03 (“Koi”, 2019/03/??)
+
+
+ Highlights
+
+
+ In addition to numerous new and upgraded packages, this release has the
+ following highlights:
+
+
+
+
+
+ The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
+
+
+
+
+
+
+ New Services
+
+
+ The following new services were added since the last release:
+
+
+
+
+
+ ./programs/nm-applet.nix
+
+
+
+
+
+
+ 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 .
+
+
+
+
+
+
+ The Syncthing state and configuration data has been moved from
+ services.syncthing.dataDir to the newly defined
+ services.syncthing.configDir , which default to
+ /var/lib/syncthing/.config/syncthing .
+ This change makes possible to share synced directories using ACLs
+ without Syncthing resetting the permission on every start.
+
+
+
+
+ The ntp module now has sane default restrictions.
+ If you're relying on the previous defaults, which permitted all queries
+ and commands from all firewall-permitted sources, you can set
+ services.ntp.restrictDefault and
+ services.ntp.restrictSource to
+ [] .
+
+
+
+
+ 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
+ services.buildbot-master.package and
+ services.buildbot-worker.package 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
+
+
+
+
+ When the nixpkgs.pkgs option is set, NixOS will no
+ longer ignore the nixpkgs.overlays option. The old
+ behavior can be recovered by setting nixpkgs.overlays =
+ lib.mkForce []; .
+
+
+
+
+ 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 .
+
+
+
+
+ Package consul-ui and passthrough consul.ui have been removed.
+ The package consul now uses upstream releases that vendor the UI into the binary.
+ See #48714
+ for details.
+
+
+
+
+ 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.
+
+
+
+
+ The solr package has been upgraded from 4.10.3 to 7.5.0 and has undergone
+ some major changes. The services.solr module has been updated to reflect
+ these changes. Please review http://lucene.apache.org/solr/ carefully before upgrading.
+
+
+
+
+ Package ckb is renamed to ckb-next ,
+ and options hardware.ckb.* are renamed to
+ hardware.ckb-next.* .
+
+
+
+
+ The option services.xserver.displayManager.job.logToFile which was
+ previously set to true when using the display managers
+ lightdm , sddm or xpra has been
+ reset to the default value (false ).
+
+
+
+
+ Network interface indiscriminate NixOS firewall options
+ (networking.firewall.allow* ) are now preserved when also
+ setting interface specific rules such as networking.firewall.interfaces.en0.allow* .
+ These rules continue to use the pseudo device "default"
+ (networking.firewall.interfaces.default.* ), and assigning
+ to this pseudo device will override the (networking.firewall.allow* )
+ options.
+
+
+
+
+ The nscd service now disables all caching of
+ passwd and group databases by
+ default. This was interferring with the correct functioning of the
+ libnss_systemd.so module which is used by
+ systemd to manage uids and usernames in the presence of
+ DynamicUser= in systemd services. This was already the
+ default behaviour in presence of services.sssd.enable =
+ true because nscd caching would interfere with
+ sssd in unpredictable ways as well. Because we're
+ using nscd not for caching, but for convincing glibc to find NSS modules
+ in the nix store instead of an absolute path, we have decided to disable
+ caching globally now, as it's usually not the behaviour the user wants and
+ can lead to surprising behaviour. Furthermore, negative caching of host
+ lookups is also disabled now by default. This should fix the issue of dns
+ lookups failing in the presence of an unreliable network.
+
+
+ If the old behaviour is desired, this can be restored by setting
+ the services.nscd.config option
+ with the desired caching parameters.
+
+ services.nscd.config =
+ ''
+ server-user nscd
+ threads 1
+ paranoia no
+ debug-level 0
+
+ enable-cache passwd yes
+ positive-time-to-live passwd 600
+ negative-time-to-live passwd 20
+ suggested-size passwd 211
+ check-files passwd yes
+ persistent passwd no
+ shared passwd yes
+
+ enable-cache group yes
+ positive-time-to-live group 3600
+ negative-time-to-live group 60
+ suggested-size group 211
+ check-files group yes
+ persistent group no
+ shared group yes
+
+ enable-cache hosts yes
+ positive-time-to-live hosts 600
+ negative-time-to-live hosts 5
+ suggested-size hosts 211
+ check-files hosts yes
+ persistent hosts no
+ shared hosts yes
+ '';
+
+ See #50316
+ for details.
+
+
+
+
+ GitLab Shell previously used the nix store paths for the
+ gitlab-shell command in its
+ authorized_keys file, which might stop working after
+ garbage collection. To circumvent that, we regenerated that file on each
+ startup. As gitlab-shell has now been changed to use
+ /var/run/current-system/sw/bin/gitlab-shell , this is
+ not necessary anymore, but there might be leftover lines with a nix store
+ path. Regenerate the authorized_keys file via
+ sudo -u git -H gitlab-rake gitlab:shell:setup in that
+ case.
+
+
+
+
+
+
+ Other Notable Changes
+
+
+
+
+ The services.matomo module gained the option
+ services.matomo.package 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.
+
+
+
+
+ The Kubernetes DNS addons, kube-dns, has been replaced with CoreDNS.
+ This change is made in accordance with Kubernetes making CoreDNS the official default
+ starting from
+ Kubernetes v1.11.
+ Please beware that upgrading DNS-addon on existing clusters might induce
+ minor downtime while the DNS-addon terminates and re-initializes.
+ Also note that the DNS-service now runs with 2 pod replicas by default.
+ The desired number of replicas can be configured using:
+ services.kubernetes.addons.dns.replicas .
+
+
+
+
+ The quassel-webserver package and module was removed from nixpkgs due to the lack
+ of maintainers.
+
+
+
+
+
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 48288cf5962c..024f4414ebeb 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -1,6 +1,13 @@
-{ system, minimal ? false, config ? {} }:
-
-let pkgs = import ../.. { inherit system config; }; in
+{ system
+, # Use a minimal kernel?
+ minimal ? false
+, # Ignored
+ config ? null
+ # Nixpkgs, for qemu, lib and more
+, pkgs
+, # NixOS configuration to add to the VMs
+ extraConfigurations ? []
+}:
with pkgs.lib;
with import ../lib/qemu-flags.nix { inherit pkgs; };
@@ -28,9 +35,10 @@ 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;
+ ] ++ optional minimal ../modules/testing/minimal-kernel.nix
+ ++ extraConfigurations;
extraArgs = { inherit nodes; };
};
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index ef685949ae1f..5f05b037bdde 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/make-channel.nix b/nixos/lib/make-channel.nix
index fd805f7f943f..9b920b989fcf 100644
--- a/nixos/lib/make-channel.nix
+++ b/nixos/lib/make-channel.nix
@@ -1,3 +1,7 @@
+/* Build a channel tarball. These contain, in addition to the nixpkgs
+ * expressions themselves, files that indicate the version of nixpkgs
+ * that they represent.
+ */
{ pkgs, nixpkgs, version, versionSuffix }:
pkgs.releaseTools.makeSourceTarball {
diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 88be8b73ab37..694142a5123a 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -94,5 +94,24 @@ pkgs.stdenv.mkDerivation {
cat errorlog
return 1
fi
+
+ (
+ # Resizes **snugly** to its actual limits (or closer to)
+ free=$(dumpe2fs $out | grep '^Free blocks:')
+ blocksize=$(dumpe2fs $out | grep '^Block size:')
+ blocks=$(dumpe2fs $out | grep '^Block count:')
+ blocks=$((''${blocks##*:})) # format the number.
+ blocksize=$((''${blocksize##*:})) # format the number.
+ # System can't boot with 0 blocks free.
+ # Add 16MiB of free space
+ fudge=$(( 16 * 1024 * 1024 / blocksize ))
+ size=$(( blocks - ''${free##*:} + fudge ))
+
+ echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)"
+ EXT2FS_NO_MTAB_OK=yes resize2fs $out -f $size
+ )
+
+ # And a final fsck, because of the previous truncating.
+ fsck.ext4 -n -f $out
'';
}
diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix
index 846013b02d14..dee91a6ce3f4 100644
--- a/nixos/lib/make-system-tarball.nix
+++ b/nixos/lib/make-system-tarball.nix
@@ -1,4 +1,4 @@
-{ stdenv, perl, pixz, pathsFromGraph
+{ stdenv, closureInfo, pixz
, # The file name of the resulting tarball
fileName ? "nixos-system-${stdenv.hostPlatform.system}"
@@ -29,24 +29,28 @@
, extraInputs ? [ pixz ]
}:
+let
+ symlinks = map (x: x.symlink) storeContents;
+ objects = map (x: x.object) storeContents;
+in
+
stdenv.mkDerivation {
name = "tarball";
builder = ./make-system-tarball.sh;
- buildInputs = [ perl ] ++ extraInputs;
+ buildInputs = extraInputs;
- inherit fileName pathsFromGraph extraArgs extraCommands compressCommand;
+ inherit fileName extraArgs extraCommands compressCommand;
# !!! should use XML.
sources = map (x: x.source) contents;
targets = map (x: x.target) contents;
# !!! should use XML.
- objects = map (x: x.object) storeContents;
- symlinks = map (x: x.symlink) storeContents;
+ inherit symlinks objects;
- # For obtaining the closure of `storeContents'.
- exportReferencesGraph =
- map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
+ closureInfo = closureInfo {
+ rootPaths = objects;
+ };
extension = compressionExtension;
}
diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh
index 1a52a284a257..1a0017a1799a 100644
--- a/nixos/lib/make-system-tarball.sh
+++ b/nixos/lib/make-system-tarball.sh
@@ -3,7 +3,6 @@ source $stdenv/setup
sources_=($sources)
targets_=($targets)
-echo $objects
objects=($objects)
symlinks=($symlinks)
@@ -14,8 +13,6 @@ stripSlash() {
if test "${res:0:1}" = /; then res=${res:1}; fi
}
-touch pathlist
-
# Add the individual files.
for ((i = 0; i < ${#targets_[@]}; i++)); do
stripSlash "${targets_[$i]}"
@@ -25,9 +22,9 @@ done
# Add the closures of the top-level store objects.
+chmod +w .
mkdir -p nix/store
-storePaths=$(perl $pathsFromGraph closure-*)
-for i in $storePaths; do
+for i in $(< $closureInfo/store-paths); do
cp -a "$i" "${i:1}"
done
@@ -35,7 +32,7 @@ done
# TODO tar ruxo
# Also include a manifest of the closures in a format suitable for
# nix-store --load-db.
-printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration
+cp $closureInfo/registration nix-path-registration
# Add symlinks to the top-level store objects.
for ((n = 0; n < ${#objects[*]}; n++)); do
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index b18f48464cee..a00fe25c2b8e 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;
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 42a0c60c7e19..0bb3fd53e853 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -1,6 +1,13 @@
-{ system, minimal ? false, config ? {} }:
+{ system
+, pkgs ? import ../.. { inherit system config; }
+ # Use a minimal kernel?
+, minimal ? false
+ # Ignored
+, config ? null
+ # Modules to add to each VM
+, extraConfigurations ? [] }:
-with import ./build-vms.nix { inherit system minimal config; };
+with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; };
with pkgs;
let
@@ -69,7 +76,7 @@ in rec {
mkdir -p $out/coverage-data
mv $i $out/coverage-data/$(dirname $(dirname $i))
done
- ''; # */
+ '';
};
diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh
index 0fd26d34d07f..48748a59d298 100755
--- a/nixos/maintainers/scripts/gce/create-gce.sh
+++ b/nixos/maintainers/scripts/gce/create-gce.sh
@@ -7,9 +7,9 @@ BUCKET_NAME="${BUCKET_NAME:-nixos-cloud-images}"
TIMESTAMP="$(date +%Y%m%d%H%M)"
export TIMESTAMP
-nix-build '' \
+nix-build '' \
-A config.system.build.googleComputeImage \
- --arg configuration "{ imports = [ ]; }" \
+ --arg modules "[ ]" \
--argstr system x86_64-linux \
-o gce \
-j 10
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
index fc01c15acb9b..7e05e77d967a 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -269,7 +269,7 @@ in
};
- config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
+ config = mkIf (config.fonts.fontconfig.enable && config.fonts.fontconfig.penultimate.enable) {
fonts.fontconfig.confPackages = [ penultimateConf ];
diff --git a/nixos/modules/config/gtk/gtk-icon-cache.nix b/nixos/modules/config/gtk/gtk-icon-cache.nix
new file mode 100644
index 000000000000..9c5d993b9c59
--- /dev/null
+++ b/nixos/modules/config/gtk/gtk-icon-cache.nix
@@ -0,0 +1,86 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+ options = {
+ gtk.iconCache.enable = mkOption {
+ type = types.bool;
+ default = config.services.xserver.enable;
+ description = ''
+ Whether to build icon theme caches for GTK+ applications.
+ '';
+ };
+ };
+
+ config = mkIf config.gtk.iconCache.enable {
+
+ # (Re)build icon theme caches
+ # ---------------------------
+ # Each icon theme has its own cache. The difficult is that many
+ # packages may contribute with icons to the same theme by installing
+ # some icons.
+ #
+ # For instance, on my current NixOS system, the following packages
+ # (among many others) have icons installed into the hicolor icon
+ # theme: hicolor-icon-theme, psensor, wpa_gui, caja, etc.
+ #
+ # As another example, the mate icon theme has icons installed by the
+ # packages mate-icon-theme, mate-settings-daemon, and libmateweather.
+ #
+ # The HighContrast icon theme also has icons from different packages,
+ # like gnome-theme-extras and meld.
+
+ # When the cache is built all of its icons has to be known. How to
+ # implement this?
+ #
+ # I think that most themes have all icons installed by only one
+ # package. On my system there are 71 themes installed. Only 3 of them
+ # have icons installed from more than one package.
+ #
+ # If the main package of the theme provides a cache, presumably most
+ # of its icons will be available to applications without running this
+ # module. But additional icons offered by other packages will not be
+ # available. Therefore I think that it is good that the main theme
+ # package installs a cache (although it does not completely fixes the
+ # situation for packages installed with nix-env).
+ #
+ # The module solution presented here keeps the cache when there is
+ # only one package contributing with icons to the theme. Otherwise it
+ # rebuilds the cache taking into account the icons provided all
+ # packages.
+
+ environment.extraSetup = ''
+ # For each icon theme directory ...
+
+ find $out/share/icons -mindepth 1 -maxdepth 1 -print0 | while read -d $'\0' themedir
+ do
+
+ # In order to build the cache, the theme dir should be
+ # writable. When the theme dir is a symbolic link to somewhere
+ # in the nix store it is not writable and it means that only
+ # one package is contributing to the theme. If it already has
+ # a cache, no rebuild is needed. Otherwise a cache has to be
+ # built, and to be able to do that we first remove the
+ # symbolic link and make a directory, and then make symbolic
+ # links from the original directory into the new one.
+
+ if [ ! -w "$themedir" -a -L "$themedir" -a ! -r "$themedir"/icon-theme.cache ]; then
+ name=$(basename "$themedir")
+ path=$(readlink -f "$themedir")
+ rm "$themedir"
+ mkdir -p "$themedir"
+ ln -s "$path"/* "$themedir"/
+ fi
+
+ # (Re)build the cache if the theme dir is writable, replacing any
+ # existing cache for the theme
+
+ if [ -w "$themedir" ]; then
+ rm -f "$themedir"/icon-theme.cache
+ ${pkgs.gtk3.out}/bin/gtk-update-icon-cache --ignore-theme-index "$themedir"
+ fi
+ done
+ '';
+ };
+
+}
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 6bf8c653e113..dc7305b1ba24 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -34,6 +34,17 @@ with lib;
'';
};
+ extraLocaleSettings = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = { LC_MESSAGES = "en_US.UTF-8"; LC_TIME = "de_DE.UTF-8"; };
+ description = ''
+ A set of additional system-wide locale settings other than
+ LANG which can be configured with
+ i18n.defaultLocale .
+ '';
+ };
+
supportedLocales = mkOption {
type = types.listOf types.str;
default = ["all"];
@@ -129,7 +140,7 @@ with lib;
environment.sessionVariables =
{ LANG = config.i18n.defaultLocale;
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
- };
+ } // config.i18n.extraLocaleSettings;
systemd.globalEnvironment = mkIf (config.i18n.supportedLocales != []) {
LOCALE_ARCHIVE = "${config.i18n.glibcLocales}/lib/locale/locale-archive";
@@ -141,6 +152,7 @@ with lib;
source = pkgs.writeText "locale.conf"
''
LANG=${config.i18n.defaultLocale}
+ ${concatStringsSep "\n" (mapAttrsToList (n: v: ''${n}=${v}'') config.i18n.extraLocaleSettings)}
'';
};
diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix
index 881ad671a627..a1d9ebcec66b 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 c22e99a0a2f1..87021a27d34f 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 1ef5313d3fdd..25253cf02e1d 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;
@@ -233,6 +247,10 @@ in
# a collision with an apparently unrelated environment
# variable with the same name exported by dhcpcd.
interface_order='lo lo[0-9]*'
+ '' + optionalString config.services.nscd.enable ''
+ # Invalidate the nscd cache whenever resolv.conf is
+ # regenerated.
+ libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
'' + optionalString (length resolvconfOptions > 0) ''
# Options as described in resolv.conf(5)
resolv_conf_options='${concatStringsSep " " resolvconfOptions}'
@@ -246,11 +264,14 @@ in
'';
} // optionalAttrs config.services.resolved.enable {
- # symlink the static version of resolv.conf as recommended by upstream:
+ # symlink the dynamic stub resolver of resolv.conf as recommended by upstream:
# https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf
- "resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf";
+ "resolv.conf".source = "/run/systemd/resolve/stub-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 +317,4 @@ in
};
- }
+}
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index d9ecaa4818ba..37e66c645429 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -35,7 +35,7 @@ with lib;
networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };
networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };
pinentry = super.pinentry_ncurses;
- gobjectIntrospection = super.gobjectIntrospection.override { x11Support = false; };
+ gobject-introspection = super.gobject-introspection.override { x11Support = false; };
}));
};
}
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index e16a021ec20b..67f7105fe2fe 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
with pkgs;
with lib;
@@ -19,7 +19,7 @@ let
# Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps
# using 32bit alsa on 64bit linux.
- enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null);
+ enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsaLib != null && pkgs.pkgsi686Linux.libpulseaudio != null);
myConfigFile =
@@ -63,7 +63,7 @@ let
pcm_type.pulse {
libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;
${lib.optionalString enable32BitAlsaPlugins
- "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
+ "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_pcm_pulse.so ;"}
}
pcm.!default {
type pulse
@@ -72,7 +72,7 @@ let
ctl_type.pulse {
libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;
${lib.optionalString enable32BitAlsaPlugins
- "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
+ "libs.32Bit = ${pkgs.pkgsi686Linux.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"}
}
ctl.!default {
type pulse
@@ -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 31adc9b82620..6379b52870ea 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.
- ${cfg.extraInit}
+ # Prevent this file from being sourced by child shells.
+ export __NIXOS_SET_ENVIRONMENT_DONE=1
- # ~/bin if it exists overrides other bin directories.
- export PATH="$HOME/bin:$PATH"
- '';
+ ${exportedEnvVars}
+
+ ${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 ffb437491f6c..aece7aa67ac3 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
@@ -133,14 +135,10 @@ in
# outputs TODO: note that the tools will often not be linked by default
postBuild =
''
- if [ -x $out/bin/gtk-update-icon-cache -a -f $out/share/icons/hicolor/index.theme ]; then
- $out/bin/gtk-update-icon-cache $out/share/icons/hicolor
- fi
-
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 426e1666a814..137ee243813d 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 f1b672234a34..cd1064630fbc 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/ckb-next.nix b/nixos/modules/hardware/ckb-next.nix
new file mode 100644
index 000000000000..20b2756d8b26
--- /dev/null
+++ b/nixos/modules/hardware/ckb-next.nix
@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.hardware.ckb-next;
+
+in
+ {
+ options.hardware.ckb-next = {
+ enable = mkEnableOption "the Corsair keyboard/mouse driver";
+
+ gid = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ example = 100;
+ description = ''
+ Limit access to the ckb daemon to a particular group.
+ '';
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.ckb-next;
+ defaultText = "pkgs.ckb-next";
+ description = ''
+ The package implementing the Corsair keyboard/mouse driver.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ cfg.package ];
+
+ systemd.services.ckb-next = {
+ description = "Corsair Keyboards and Mice Daemon";
+ wantedBy = ["multi-user.target"];
+ serviceConfig = {
+ ExecStart = "${cfg.package}/bin/ckb-next-daemon ${optionalString (cfg.gid != null) "--gid=${builtins.toString cfg.gid}"}";
+ Restart = "on-failure";
+ StandardOutput = "syslog";
+ };
+ };
+ };
+
+ meta = {
+ maintainers = with lib.maintainers; [ kierdavis ];
+ };
+ }
diff --git a/nixos/modules/hardware/ckb.nix b/nixos/modules/hardware/ckb.nix
deleted file mode 100644
index 8429572a8822..000000000000
--- a/nixos/modules/hardware/ckb.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.hardware.ckb;
-
-in
- {
- options.hardware.ckb = {
- enable = mkEnableOption "the Corsair keyboard/mouse driver";
-
- package = mkOption {
- type = types.package;
- default = pkgs.ckb;
- defaultText = "pkgs.ckb";
- description = ''
- The package implementing the Corsair keyboard/mouse driver.
- '';
- };
- };
-
- config = mkIf cfg.enable {
- environment.systemPackages = [ cfg.package ];
-
- systemd.services.ckb = {
- description = "Corsair Keyboard Daemon";
- wantedBy = ["multi-user.target"];
- script = "${cfg.package}/bin/ckb-daemon";
- serviceConfig = {
- Restart = "always";
- StandardOutput = "syslog";
- };
- };
- };
-
- meta = {
- maintainers = with lib.maintainers; [ kierdavis ];
- };
- }
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index b371af353cf9..48e0072e0892 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
with lib;
@@ -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";
@@ -148,7 +148,7 @@ in
[ "/run/opengl-driver/share" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/share";
hardware.opengl.package = mkDefault (makePackage pkgs);
- hardware.opengl.package32 = mkDefault (makePackage pkgs_i686);
+ hardware.opengl.package32 = mkDefault (makePackage pkgs.pkgsi686Linux);
boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
};
diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix
index 1b4b1fa1954f..3a65cb800a98 100644
--- a/nixos/modules/hardware/raid/hpsa.nix
+++ b/nixos/modules/hardware/raid/hpsa.nix
@@ -8,7 +8,7 @@ let
version = "2.40-13.0";
src = pkgs.fetchurl {
- url = "http://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
+ url = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
};
@@ -34,7 +34,7 @@ let
meta = with lib; {
description = "HP Smart Array CLI";
- homepage = http://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/;
+ homepage = https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/;
license = licenses.unfreeRedistributable;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ volth ];
diff --git a/nixos/modules/hardware/steam-hardware.nix b/nixos/modules/hardware/steam-hardware.nix
new file mode 100644
index 000000000000..378aeffe71b5
--- /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/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 50af022b93c8..ab9e0c92020e 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -1,6 +1,6 @@
# This module provides the proprietary AMDGPU-PRO drivers.
-{ config, lib, pkgs, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
with lib;
@@ -11,7 +11,7 @@ let
enabled = elem "amdgpu-pro" drivers;
package = config.boot.kernelPackages.amdgpu-pro;
- package32 = pkgs_i686.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
+ package32 = pkgs.pkgsi686Linux.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; };
opengl = config.hardware.opengl;
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index 2fa37af6ca58..6102919f0155 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -1,6 +1,6 @@
# This module provides the proprietary ATI X11 / OpenGL drivers.
-{ config, lib, pkgs_i686, ... }:
+{ config, lib, pkgs, ... }:
with lib;
@@ -24,7 +24,7 @@ in
{ name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };
hardware.opengl.package = ati_x11;
- hardware.opengl.package32 = pkgs_i686.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
+ hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
environment.systemPackages = [ ati_x11 ];
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index eb1952280331..b680c3c1ccb5 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, ... }:
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.pkgsi686Linux.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
+ hardware.nvidia.optimus_prime.enable . 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 services.xserver.videoDrivers , 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 (hardware.nvidia.optimus_prime.nvidiaBusId and
+ hardware.nvidia.optimus_prime.intelBusId ).
+
+ If you enable this, you may want to also enable kernel modesetting for the
+ NVIDIA driver (hardware.nvidia.modesetting.enable ) in order
+ to prevent tearing.
+
+ Note that this configuration will only be successful when a display manager
+ for which the services.xserver.displayManager.setupCommands
+ 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";
+ assertion = with config.services.xserver.displayManager; gdm.enable -> !gdm.wayland;
+ message = "NVIDIA drivers don't support wayland, set services.xserver.displayManager.gdm.wayland=false";
+ }
+ {
+ 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.screenSection =
+ 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.extraConfig = optionalString optimusCfg.enable
''
- Option "RandRRotation" "on"
+ Section "Device"
+ Identifier "nvidia-optimus-intel"
+ Driver "modesetting"
+ BusID "${optimusCfg.intelBusId}"
+ Option "AccelMethod" "none"
+ EndSection
'';
+ services.xserver.serverLayoutSection = optionalString optimusCfg.enable
+ ''
+ 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 ab918a9fb23e..117482fb0d57 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
-Input Methods
+
+ IBus is an Intelligent Input Bus. It provides full featured and user
+ friendly input method user interface.
+
-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:
+
+ 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.
+
+ i18n.inputMethod.ibus.engines is optional and can be used
+ to add extra IBus engines.
+
-Available extra IBus engines are:
+
+ 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:
+
+
+
+ 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.
+
+ 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.
-
-
+
+ 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
+
+ Fcitx is an input method framework with extension support. It has three
+ built-in Input Method Engine, Pinyin, QuWei and Table-based input methods.
+
-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:
+
+ 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.
+
+ i18n.inputMethod.fcitx.engines is optional and can be
+ used to add extra Fcitx engines.
+
-Available extra Fcitx engines are:
+
+ 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.
-
-
+
+
+
+ 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
+
+ Nabi is an easy to use Korean X input method. It allows you to enter
+ phonetic Korean characters (hangul) and pictographic Korean characters
+ (hanja).
+
-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:
+
+ 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 000000000000..228ef371d252
--- /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 4c4e69d60d9c..42b5ec882272 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
+ services.xserver.desktopManager.gnome3.enable = 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
-
- # 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 63227d573495..1c3c9cb30b41 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 3dc0f606bf60..bcdbffdc20b7 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 98712f0759a9..aa8003fef2c9 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/
@@ -339,7 +339,9 @@ let
echo "Image size: $image_size"
truncate --size=$image_size "$out"
${pkgs.libfaketime}/bin/faketime "2000-01-01 00:00:00" ${pkgs.dosfstools}/sbin/mkfs.vfat -i 12345678 -n EFIBOOT "$out"
- mcopy -bpsvm -i "$out" ./* ::
+ mcopy -psvm -i "$out" ./* ::
+ # Verify the FAT partition.
+ ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out"
''; # */
targetArch = if pkgs.stdenv.isi686 then
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index b6e1d11c2b54..69746a8e9799 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -134,7 +134,9 @@ in
${config.sdImage.populateBootCommands}
# Copy the populated /boot into the SD image
- (cd boot; mcopy -bpsvm -i ../bootpart.img ./* ::)
+ (cd boot; mcopy -psvm -i ../bootpart.img ./* ::)
+ # Verify the FAT partition before copying it.
+ fsck.vfat -vn bootpart.img
dd conv=notrunc if=bootpart.img of=$img seek=$START count=$SECTORS
'';
}) {};
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 7ec09acd5919..90a5128c02a5 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 7c5414257b46..1cfc8ff8612e 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-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
index 4372d196261e..c1028a0ad7e9 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -1,9 +1,13 @@
{ system ? builtins.currentSystem
+, config ? {}
, networkExpr
}:
let nodes = import networkExpr; in
-with import ../../../../lib/testing.nix { inherit system; };
+with import ../../../../lib/testing.nix {
+ inherit system;
+ pkgs = import ../../../../.. { inherit system config; };
+};
(makeTest { inherit nodes; testScript = ""; }).driver
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 359caad89a72..52a129b39bcd 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;"
}
@@ -315,14 +314,16 @@ push @attrs, "services.xserver.videoDrivers = [ \"$videoDriver\" ];" if $videoDr
# Generate the swapDevices option from the currently activated swap
# devices.
-my @swaps = read_file("/proc/swaps");
-shift @swaps;
+my @swaps = read_file("/proc/swaps", err_mode => 'carp');
my @swapDevices;
-foreach my $swap (@swaps) {
- $swap =~ /^(\S+)\s/;
- next unless -e $1;
- my $dev = findStableDevPath $1;
- push @swapDevices, "{ device = \"$dev\"; }";
+if (@swaps) {
+ shift @swaps;
+ foreach my $swap (@swaps) {
+ $swap =~ /^(\S+)\s/;
+ next unless -e $1;
+ my $dev = findStableDevPath $1;
+ push @swapDevices, "{ device = \"$dev\"; }";
+ }
}
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 22c1e0fe9a34..defc46ad2a72 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 3f1e591b97b0..327e3e6989f7 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 man.enable is
+ set.
+ This includes the HTML manual and the nixos-help command if
+ doc.enable 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 8292cdc995e0..d9ba2efa0c8a 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
@@ -101,7 +101,7 @@
iodined = 66;
#libvirtd = 67; # unused
graphite = 68;
- statsd = 69;
+ #statsd = 69; # removed 2018-11-14
transmission = 70;
postgres = 71;
#vboxusers = 72; # unused
@@ -175,7 +175,7 @@
dnsmasq = 141;
uhub = 142;
yandexdisk = 143;
- #collectd = 144; #unused
+ mxisd = 144; # was once collectd
consul = 145;
mailpile = 146;
redmine = 147;
@@ -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,15 @@
# kvm = 302; # unused
# render = 303; # unused
zeronet = 304;
+ lirc = 305;
+ lidarr = 306;
+ slurm = 307;
+ kapacitor = 308;
+ solr = 309;
+ alerta = 310;
+ minetest = 311;
+ rss2email = 312;
+ cockroachdb = 313;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -383,7 +392,7 @@
virtuoso = 44;
#rtkit = 45; # unused
dovecot2 = 46;
- #dovenull = 47; # unused
+ dovenull2 = 47;
prayer = 49;
mpd = 50;
clamav = 51;
@@ -404,7 +413,7 @@
iodined = 66;
libvirtd = 67;
graphite = 68;
- #statsd = 69; # unused
+ #statsd = 69; # removed 2018-11-14
transmission = 70;
postgres = 71;
vboxusers = 72;
@@ -476,7 +485,7 @@
#dnsmasq = 141; # unused
uhub = 142;
#yandexdisk = 143; # unused
- #collectd = 144; # unused
+ mxisd = 144; # was once collectd
#consul = 145; # unused
mailpile = 146;
redmine = 147;
@@ -579,7 +588,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 +627,15 @@
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;
+ kapacitor = 308;
+ solr = 309;
+ alerta = 310;
+ minetest = 311;
+ rss2email = 312;
+ cockroachdb = 313;
# 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/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 7f9833e184ab..93fbf16841e5 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, options, lib, pkgs, ... }:
with lib;
let
cfg = config.nixpkgs;
+ opt = options.nixpkgs;
isConfig = x:
builtins.isAttrs x || lib.isFunction x;
@@ -54,6 +55,12 @@ let
check = builtins.isAttrs;
};
+ defaultPkgs = import ../../../pkgs/top-level/default.nix {
+ inherit (cfg) config overlays localSystem crossSystem;
+ };
+
+ finalPkgs = if opt.pkgs.isDefined then cfg.pkgs.appendOverlays cfg.overlays else defaultPkgs;
+
in
{
@@ -61,21 +68,25 @@ in
pkgs = mkOption {
defaultText = literalExample
- ''import "''${nixos}/.." {
+ ''import "''${nixos}/../pkgs/top-level" {
inherit (cfg) config overlays localSystem crossSystem;
}
'';
- default = import ../../.. {
- inherit (cfg) config overlays localSystem crossSystem;
- };
type = pkgsType;
example = literalExample ''import {}'';
description = ''
- This is the evaluation of Nixpkgs that will be provided to
- all NixOS modules. Defining this option has the effect of
- ignoring the other options that would otherwise be used to
- evaluate Nixpkgs, because those are arguments to the default
- value. The default value imports the Nixpkgs source files
+ If set, the pkgs argument to all NixOS modules is the value of
+ this option, extended with nixpkgs.overlays
, if
+ that is also set. Either nixpkgs.crossSystem
or
+ nixpkgs.localSystem
will be used in an assertion
+ to check that the NixOS and Nixpkgs architectures match. Any
+ other options in nixpkgs.*
, notably config
,
+ will be ignored.
+
+ If unset, the pkgs argument to all NixOS modules is determined
+ as shown in the default value for this option.
+
+ The default value imports the Nixpkgs source files
relative to the location of this NixOS module, because
NixOS and Nixpkgs are distributed together for consistency,
so the nixos
in the default value is in fact a
@@ -128,12 +139,14 @@ in
description = ''
List of overlays to use with the Nix Packages collection.
(For details, see the Nixpkgs documentation.) It allows
- you to override packages globally. This is a function that
+ you to override packages globally. Each function in the list
takes as an argument the original Nixpkgs.
The first argument should be used for finding dependencies, and
the second should be used for overriding recipes.
- Ignored when nixpkgs.pkgs
is set.
+ If nixpkgs.pkgs
is set, overlays specified here
+ will be applied after the overlays that were already present
+ in nixpkgs.pkgs
.
'';
};
@@ -207,8 +220,26 @@ in
config = {
_module.args = {
- pkgs = cfg.pkgs;
- pkgs_i686 = cfg.pkgs.pkgsi686Linux;
+ pkgs = finalPkgs;
};
+
+ assertions = [
+ (
+ let
+ nixosExpectedSystem =
+ if config.nixpkgs.crossSystem != null
+ then config.nixpkgs.crossSystem.system
+ else config.nixpkgs.localSystem.system;
+ nixosOption =
+ if config.nixpkgs.crossSystem != null
+ then "nixpkgs.crossSystem"
+ else "nixpkgs.localSystem";
+ pkgsSystem = finalPkgs.stdenv.targetPlatform.system;
+ in {
+ assertion = nixosExpectedSystem == pkgsSystem;
+ message = "The NixOS nixpkgs.pkgs option was set to a Nixpkgs invocation that compiles to target system ${pkgsSystem} but NixOS was configured for system ${nixosExpectedSystem} via NixOS option ${nixosOption}. The NixOS system settings must match the Nixpkgs target system.";
+ }
+ )
+ ];
};
}
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 63717e0c6a81..fd77f6372720 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,15 +36,14 @@ 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.";
};
nixos.codeName = mkOption {
readOnly = true;
type = types.str;
+ default = lib.trivial.codeName;
description = "The NixOS release code name (e.g. Emu ).";
};
@@ -82,9 +80,6 @@ in
version = mkDefault (cfg.release + cfg.versionSuffix);
revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId);
versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
-
- # Note: the first letter is bumped on every release. It's an animal.
- codeName = "Jellyfish";
};
# Generate /etc/os-release. See
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4795922abcfb..5ffb0c5ab223 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -11,6 +11,7 @@
./config/xdg/icons.nix
./config/xdg/menus.nix
./config/xdg/mime.nix
+ ./config/gtk/gtk-icon-cache.nix
./config/gnu.nix
./config/i18n.nix
./config/iproute2.nix
@@ -34,7 +35,7 @@
./config/zram.nix
./hardware/all-firmware.nix
./hardware/brightnessctl.nix
- ./hardware/ckb.nix
+ ./hardware/ckb-next.nix
./hardware/cpu/amd-microcode.nix
./hardware/cpu/intel-microcode.nix
./hardware/digitalbitbox.nix
@@ -46,6 +47,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
@@ -62,7 +64,6 @@
./i18n/input-method/ibus.nix
./i18n/input-method/nabi.nix
./i18n/input-method/uim.nix
- ./installer/tools/auto-upgrade.nix
./installer/tools/tools.nix
./misc/assertions.nix
./misc/crashdump.nix
@@ -89,6 +90,7 @@
./programs/criu.nix
./programs/dconf.nix
./programs/digitalbitbox/default.nix
+ ./programs/dmrconfig.nix
./programs/environment.nix
./programs/firejail.nix
./programs/fish.nix
@@ -101,13 +103,14 @@
./programs/less.nix
./programs/light.nix
./programs/mosh.nix
+ ./programs/mininet.nix
./programs/mtr.nix
./programs/nano.nix
+ ./programs/nm-applet.nix
./programs/npm.nix
./programs/oblogout.nix
./programs/plotinus.nix
./programs/qt5ct.nix
- ./programs/rootston.nix
./programs/screen.nix
./programs/sedutil.nix
./programs/slock.nix
@@ -120,11 +123,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 +153,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
@@ -207,6 +213,7 @@
./services/databases/aerospike.nix
./services/databases/cassandra.nix
./services/databases/clickhouse.nix
+ ./services/databases/cockroachdb.nix
./services/databases/couchdb.nix
./services/databases/firebird.nix
./services/databases/foundationdb.nix
@@ -232,6 +239,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
@@ -240,11 +248,13 @@
./services/desktops/gnome3/gnome-documents.nix
./services/desktops/gnome3/gnome-keyring.nix
./services/desktops/gnome3/gnome-online-accounts.nix
+ ./services/desktops/gnome3/gnome-remote-desktop.nix
./services/desktops/gnome3/gnome-online-miners.nix
./services/desktops/gnome3/gnome-terminal-server.nix
./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 +281,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
@@ -293,6 +306,7 @@
./services/logging/graylog.nix
./services/logging/heartbeat.nix
./services/logging/journalbeat.nix
+ ./services/logging/journaldriver.nix
./services/logging/journalwatch.nix
./services/logging/klogd.nix
./services/logging/logcheck.nix
@@ -319,12 +333,15 @@
./services/mail/postgrey.nix
./services/mail/spamassassin.nix
./services/mail/rspamd.nix
+ ./services/mail/rss2email.nix
./services/mail/rmilter.nix
+ ./services/mail/roundcube.nix
./services/mail/nullmailer.nix
./services/misc/airsonic.nix
./services/misc/apache-kafka.nix
./services/misc/autofs.nix
./services/misc/autorandr.nix
+ ./services/misc/bees.nix
./services/misc/bepasty.nix
./services/misc/canto-daemon.nix
./services/misc/calibre-server.nix
@@ -362,6 +379,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 +410,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,8 +425,10 @@
./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/alerta.nix
./services/monitoring/apcupsd.nix
./services/monitoring/arbtt.nix
./services/monitoring/bosun.nix
@@ -418,10 +439,12 @@
./services/monitoring/dd-agent/dd-agent.nix
./services/monitoring/fusion-inventory.nix
./services/monitoring/grafana.nix
+ ./services/monitoring/grafana-reporter.nix
./services/monitoring/graphite.nix
./services/monitoring/hdaps.nix
./services/monitoring/heapster.nix
./services/monitoring/incron.nix
+ ./services/monitoring/kapacitor.nix
./services/monitoring/longview.nix
./services/monitoring/monit.nix
./services/monitoring/munin.nix
@@ -436,7 +459,6 @@
./services/monitoring/riemann-tools.nix
./services/monitoring/scollector.nix
./services/monitoring/smartd.nix
- ./services/monitoring/statsd.nix
./services/monitoring/sysstat.nix
./services/monitoring/systemhealth.nix
./services/monitoring/teamviewer.nix
@@ -494,6 +516,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 +539,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
@@ -539,6 +565,7 @@
./services/networking/miredo.nix
./services/networking/mstpd.nix
./services/networking/murmur.nix
+ ./services/networking/mxisd.nix
./services/networking/namecoind.nix
./services/networking/nat.nix
./services/networking/ndppd.nix
@@ -552,6 +579,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
@@ -600,6 +628,7 @@
./services/networking/supplicant.nix
./services/networking/supybot.nix
./services/networking/syncthing.nix
+ ./services/networking/syncthing-relay.nix
./services/networking/tcpcrypt.nix
./services/networking/teamspeak3.nix
./services/networking/tinc.nix
@@ -622,7 +651,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,15 +705,16 @@
./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
./services/web-apps/restya-board.nix
./services/web-apps/tt-rss.nix
./services/web-apps/selfoss.nix
- ./services/web-apps/quassel-webserver.nix
./services/web-apps/virtlyst.nix
./services/web-apps/youtrack.nix
./services/web-servers/apache-httpd/default.nix
@@ -721,12 +751,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
@@ -777,6 +809,7 @@
./system/boot/timesyncd.nix
./system/boot/tmp.nix
./system/etc/etc.nix
+ ./tasks/auto-upgrade.nix
./tasks/bcache.nix
./tasks/cpu-freq.nix
./tasks/encrypted-devices.nix
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 5aaffa4f1f2a..2a2fe119d30c 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
@@ -46,7 +49,7 @@
];
# Include support for various filesystems.
- boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
+ boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];
# Configure host id for ZFS to work
networking.hostId = lib.mkDefault "8425e349";
diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix
index 99d4774584f1..3f669ba7d2e1 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/docker-container.nix b/nixos/modules/profiles/docker-container.nix
index 7031d7d1d593..5d6b11498b52 100644
--- a/nixos/modules/profiles/docker-container.nix
+++ b/nixos/modules/profiles/docker-container.nix
@@ -15,15 +15,19 @@ in {
# Create the tarball
system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix {
- contents = [];
+ contents = [
+ {
+ source = "${config.system.build.toplevel}/.";
+ target = "./";
+ }
+ ];
extraArgs = "--owner=0";
# Add init script to image
- storeContents = [
- { object = config.system.build.toplevel + "/init";
- symlink = "/init";
- }
- ] ++ (pkgs2storeContents [ pkgs.stdenv ]);
+ storeContents = pkgs2storeContents [
+ config.system.build.toplevel
+ pkgs.stdenv
+ ];
# Some container managers like lxc need these
extraCommands = "mkdir -p proc sys dev";
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 332cf58aa538..fba756391b11 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 2af8bf1f8e30..61e871bcaca5 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -6,12 +6,20 @@
with lib;
{
+ meta = {
+ maintainers = [ maintainers.joachifm ];
+ };
+
boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened;
+ nix.allowedUsers = mkDefault [ "@users" ];
+
security.hideProcessInformation = mkDefault true;
security.lockKernelModules = mkDefault true;
+ security.allowUserNamespaces = mkDefault false;
+
security.apparmor.enable = mkDefault true;
boot.kernelParams = [
@@ -55,18 +63,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 ff4a23a18d06..580ea4a58e5b 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 ed04e46c77d1..138eda117c74 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 69a1a482d074..2b01c9d26c41 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -16,7 +16,7 @@ let
# programmable completion. If we do, enable all modules installed in
# the system and user profile in obsolete /etc/bash_completion.d/
# directories. Bash loads completions in all
- # $XDG_DATA_DIRS/share/bash-completion/completions/
+ # $XDG_DATA_DIRS/bash-completion/completions/
# on demand, so they do not need to be sourced here.
if shopt -q progcomp &>/dev/null; then
. "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
@@ -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 environment.shellAliases
- for an option format description.
+ Set of aliases for bash shell, which overrides environment.shellAliases .
+ See environment.shellAliases for an option format description.
'';
- type = types.attrs; # types.attrsOf types.stringOrPath;
+ type = with types; attrsOf (nullOr (either str path));
};
shellInit = mkOption {
@@ -97,7 +98,7 @@ in
if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then
PROMPT_COLOR="1;31m"
let $UID && PROMPT_COLOR="1;32m"
- PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] "
+ PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] "
if test "$TERM" = "xterm"; then
PS1="\[\033]2;\h:\u:\w\007\]$PS1"
fi
@@ -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 b7d8a345e65c..9c9765b06b6f 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 a26653dda535..c63201628dbd 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.
-
+ 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
- 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
-
-
- 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/dmrconfig.nix b/nixos/modules/programs/dmrconfig.nix
new file mode 100644
index 000000000000..e48a4f318370
--- /dev/null
+++ b/nixos/modules/programs/dmrconfig.nix
@@ -0,0 +1,38 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.dmrconfig;
+
+in {
+ meta.maintainers = [ maintainers.etu ];
+
+ ###### interface
+ options = {
+ programs.dmrconfig = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Whether to configure system to enable use of dmrconfig. This
+ enables the required udev rules and installs the program.
+ '';
+ relatedPackages = [ "dmrconfig" ];
+ };
+
+ package = mkOption {
+ default = pkgs.dmrconfig;
+ type = types.package;
+ defaultText = "pkgs.dmrconfig";
+ description = "dmrconfig derivation to use";
+ };
+ };
+ };
+
+ ###### implementation
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ cfg.package ];
+ services.udev.packages = [ cfg.package ];
+ };
+}
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index c8d94a47be28..b38af07b92c3 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 environment.shellAliases
- for an option format description.
+ Set of aliases for fish shell, which overrides environment.shellAliases .
+ See environment.shellAliases 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/gnupg.nix b/nixos/modules/programs/gnupg.nix
index addc9dcca87e..b01de9efaa5e 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -77,7 +77,7 @@ in
systemd.packages = [ pkgs.gnupg ];
- environment.extraInit = ''
+ environment.interactiveShellInit = ''
# Bind gpg-agent to this TTY if gpg commands are used.
export GPG_TTY=$(tty)
diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix
index 6f8c389acc97..9f2a03e7e763 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/mininet.nix b/nixos/modules/programs/mininet.nix
new file mode 100644
index 000000000000..ecc924325e6b
--- /dev/null
+++ b/nixos/modules/programs/mininet.nix
@@ -0,0 +1,39 @@
+# Global configuration for mininet
+# kernel must have NETNS/VETH/SCHED
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.mininet;
+
+ generatedPath = with pkgs; makeSearchPath "bin" [
+ iperf ethtool iproute socat
+ ];
+
+ pyEnv = pkgs.python.withPackages(ps: [ ps.mininet-python ]);
+
+ mnexecWrapped = pkgs.runCommand "mnexec-wrapper"
+ { buildInputs = [ pkgs.makeWrapper pkgs.pythonPackages.wrapPython ]; }
+ ''
+ makeWrapper ${pkgs.mininet}/bin/mnexec \
+ $out/bin/mnexec \
+ --prefix PATH : "${generatedPath}"
+
+ ln -s ${pyEnv}/bin/mn $out/bin/mn
+
+ # mn errors out without a telnet binary
+ # pkgs.telnet brings an undesired ifconfig into PATH see #43105
+ ln -s ${pkgs.telnet}/bin/telnet $out/bin/telnet
+ '';
+in
+{
+ options.programs.mininet.enable = mkEnableOption "Mininet";
+
+ config = mkIf cfg.enable {
+
+ virtualisation.vswitch.enable = true;
+
+ environment.systemPackages = [ mnexecWrapped ];
+ };
+}
diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix
new file mode 100644
index 000000000000..e42219e9638c
--- /dev/null
+++ b/nixos/modules/programs/nm-applet.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+ options.programs.nm-applet.enable = lib.mkEnableOption "nm-applet";
+
+ config = lib.mkIf config.programs.nm-applet.enable {
+ systemd.user.services.nm-applet = {
+ description = "Network manager applet";
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
+ serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet";
+ };
+ };
+}
diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml
index 91740ee16ec2..902cd89e0c49 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 842d9e6cfb48..000000000000
--- 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 944a8bdf16fc..9842e2bef643 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 000000000000..7fc5979a38aa
--- /dev/null
+++ b/nixos/modules/programs/sway-beta.nix
@@ -0,0 +1,90 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.sway-beta;
+ swayPackage = cfg.package;
+
+ swayWrapped = pkgs.writeShellScriptBin "sway" ''
+ set -o errexit
+
+ if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
+ export _SWAY_WRAPPER_ALREADY_EXECUTED=1
+ ${cfg.extraSessionCommands}
+ fi
+
+ if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
+ export DBUS_SESSION_BUS_ADDRESS
+ exec ${swayPackage}/bin/sway "$@"
+ else
+ exec ${pkgs.dbus}/bin/dbus-run-session ${swayPackage}/bin/sway "$@"
+ fi
+ '';
+ swayJoined = pkgs.symlinkJoin {
+ name = "sway-joined";
+ paths = [ swayWrapped swayPackage ];
+ };
+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`.
+ '';
+ };
+
+ extraSessionCommands = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+ export SDL_VIDEODRIVER=wayland
+ # needs qt5.qtwayland in systemPackages
+ export QT_QPA_PLATFORM=wayland
+ export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+ # Fix for some Java AWT applications (e.g. Android Studio),
+ # use this if they aren't displayed properly:
+ export _JAVA_AWT_WM_NONREPARENTING=1
+ '';
+ description = ''
+ Shell commands executed just before Sway is started.
+ '';
+ };
+
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [
+ xwayland rxvt_unicode dmenu
+ ];
+ defaultText = literalExample ''
+ with pkgs; [ xwayland rxvt_unicode 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 = [ swayJoined ] ++ 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 f4ae52934760..21ed6603c1bd 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 000000000000..ac665fe4a023
--- /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 a01083c3ace9..db085211366e 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 6567d4a42fac..5cf690c1a560 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
-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 .
-
+
+ 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.
+
-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 .
-
+
+ The expression generates the needed configuration and writes it into your
+ /etc/zshrc .
+
+
+
+ Custom additions
-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:
+
+ 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
-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:
+
+ 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.
+
-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
-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.
-
+
+ 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:
+
-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.
+
+
+
+ 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-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix
index 416f4c9c6751..ded17f38a618 100644
--- a/nixos/modules/programs/zsh/zsh-autosuggestions.nix
+++ b/nixos/modules/programs/zsh/zsh-autosuggestions.nix
@@ -18,13 +18,13 @@ in
};
strategy = mkOption {
- type = types.enum [ "default" "match_prev_cmd" ];
- default = "default";
+ type = types.enum [ "history" "match_prev_cmd" ];
+ default = "history";
description = ''
Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions.
There are currently two to choose from:
- * default: Chooses the most recent match.
+ * history: Chooses the most recent match.
* match_prev_cmd: Chooses the most recent match whose preceding history item matches
the most recently executed command (more info). Note that this strategy won't work as
expected with ZSH options that don't preserve the history order such as
@@ -51,7 +51,7 @@ in
source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"
- export ZSH_AUTOSUGGEST_STRATEGY="${cfg.strategy}"
+ export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}")
${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
'';
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index d30b3415411f..164d8db5859a 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
- environment.shellAliases .
+ Set of aliases for zsh shell, which overrides environment.shellAliases .
See environment.shellAliases 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 4a6bdfe83dd2..dc0a175d5bb8 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,11 @@ with lib;
(mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])
(mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ])
+ (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])
+
+ # ckb
+ (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
+ (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
"jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 946da92d80e7..092704c6fc3f 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 b4cd83f6632c..ef71fe53d0c7 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
-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:
+
+ 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 .
-
+
+ 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.
+
+ Refer to for all available configuration
+ options for the security.acme
+ module.
+
+
+
+ Using ACME certificates in Nginx
-
-
-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.
-
+
+ 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 dfbf5d859ba9..498c2f25d1c0 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 e2b84c3e3b38..62a499ea624d 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 d69341eb3cde..5a17cb1da412 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 c81521ed9b08..fc9e7939d814 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 000000000000..42f872b7b088
--- /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 bef10b4fe614..926c6d77d3bb 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 04685f2c9ea1..7f1de81d5b70 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 3a1ffc55e5fe..a54ef2e6fcad 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";
};
};
}
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 77e4b2a616d8..dcb9c8d4ed5f 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 165580b97837..c6b1b0cc0bd8 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 9ecefb32cfa8..c8fa9461a209 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 bb6fc0a104df..7373be2a9b0b 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,12 +77,47 @@ 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 = ''
+ Configuration options in RabbitMQ's new config file format,
+ which is a simple key-value format that can not express nested
+ data structures. This is known as the rabbitmq.conf file,
+ although outside NixOS that filename may have Erlang syntax, particularly
+ prior to RabbitMQ 3.7.0.
+
+ If you do need to express nested data structures, you can use
+ config option. Configuration from config
+ will be merged into these options by RabbitMQ at runtime to
+ form the final configuration.
+
+ See http://www.rabbitmq.com/configure.html#config-items
+ For the distinct formats, see http://www.rabbitmq.com/configure.html#config-file-formats
+ '';
+ };
+
config = mkOption {
default = "";
type = types.str;
description = ''
- Verbatim configuration file contents.
- See http://www.rabbitmq.com/configure.html
+ Verbatim advanced configuration file contents using the Erlang syntax.
+ This is also known as the advanced.config file or the old config format.
+
+ configItems is preferred whenever possible. However, nested
+ data structures can only be expressed properly using the config option.
+
+ The contents of this option will be merged into the configItems
+ by RabbitMQ at runtime to form the final configuration.
+
+ See the second table on http://www.rabbitmq.com/configure.html#config-items
+ For the distinct formats, see http://www.rabbitmq.com/configure.html#config-file-formats
'';
};
@@ -74,6 +126,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 +139,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 +154,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/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index a0565ca26204..24cad6128260 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -346,8 +346,12 @@ in {
description = "Bacula File Daemon";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.bacula ];
- serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}";
- serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ serviceConfig = {
+ ExecStart = "${pkgs.bacula}/sbin/bacula-fd -f -u root -g bacula -c ${fd_conf}";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ LogsDirectory = "bacula";
+ StateDirectory = "bacula";
+ };
};
systemd.services.bacula-sd = mkIf sd_cfg.enable {
@@ -355,8 +359,12 @@ in {
description = "Bacula Storage Daemon";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.bacula ];
- serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}";
- serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ serviceConfig = {
+ ExecStart = "${pkgs.bacula}/sbin/bacula-sd -f -u bacula -g bacula -c ${sd_conf}";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ LogsDirectory = "bacula";
+ StateDirectory = "bacula";
+ };
};
services.postgresql.enable = dir_cfg.enable == true;
@@ -366,8 +374,12 @@ in {
description = "Bacula Director Daemon";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.bacula ];
- serviceConfig.ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}";
- serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ serviceConfig = {
+ ExecStart = "${pkgs.bacula}/sbin/bacula-dir -f -u bacula -g bacula -c ${dir_conf}";
+ ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ LogsDirectory = "bacula";
+ StateDirectory = "bacula";
+ };
preStart = ''
if ! test -e "${libDir}/db-created"; then
${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole bacula
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 415a70ea5ad4..bf41aee8fe0e 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -191,7 +191,7 @@ in {
options = {
paths = mkOption {
- type = with types; either path (nonEmptyListOf path);
+ type = with types; either path (listOf str);
description = "Path(s) to back up.";
example = "/home/user";
apply = x: if isList x then x else [ x ];
diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 2ec78ce6f2cf..f9f9568faa5c 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -20,6 +20,8 @@ let
'';
script = ''
+ umask 0077 # ensure backup is only readable by postgres user
+
if [ -e ${cfg.location}/${db}.sql.gz ]; then
${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
fi
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index aeaa6bd66c99..6f3c45b29bf2 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";
@@ -791,7 +784,7 @@ in {
clusterCidr = mkOption {
description = "Kubernetes controller manager and proxy CIDR Range for Pods in cluster.";
default = "10.1.0.0/16";
- type = types.str;
+ type = types.nullOr types.str;
};
flannel.enable = mkOption {
@@ -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 != "")
@@ -1026,9 +1018,9 @@ in {
${if (cfg.controllerManager.rootCaFile!=null)
then "--root-ca-file=${cfg.controllerManager.rootCaFile}"
else "--root-ca-file=/var/run/kubernetes/apiserver.crt"} \
- ${optionalString (cfg.clusterCidr!=null)
- "--cluster-cidr=${cfg.clusterCidr}"} \
- --allocate-node-cidrs=true \
+ ${if (cfg.clusterCidr!=null)
+ then "--cluster-cidr=${cfg.clusterCidr} --allocate-node-cidrs=true"
+ else "--allocate-node-cidrs=false"} \
${optionalString (cfg.controllerManager.featureGates != [])
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.controllerManager.featureGates}"} \
${optionalString cfg.verbose "--v=6"} \
diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix
index 43bbb50a48d4..5a3e281ea694 100644
--- a/nixos/modules/services/cluster/kubernetes/dns.nix
+++ b/nixos/modules/services/cluster/kubernetes/dns.nix
@@ -3,8 +3,13 @@
with lib;
let
- version = "1.14.10";
+ version = "1.2.5";
cfg = config.services.kubernetes.addons.dns;
+ ports = {
+ dns = 10053;
+ health = 10054;
+ metrics = 10055;
+ };
in {
options.services.kubernetes.addons.dns = {
enable = mkEnableOption "kubernetes dns addon";
@@ -27,49 +32,130 @@ in {
type = types.str;
};
- kube-dns = mkOption {
- description = "Docker image to seed for the kube-dns main container.";
- type = types.attrs;
- default = {
- imageName = "k8s.gcr.io/k8s-dns-kube-dns-amd64";
- imageDigest = "sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8";
- finalImageTag = version;
- sha256 = "0x583znk9smqn0fix7ld8sm5jgaxhqhx3fq97b1wkqm7iwhvl3pj";
- };
+ replicas = mkOption {
+ description = "Number of DNS pod replicas to deploy in the cluster.";
+ default = 2;
+ type = types.int;
};
- dnsmasq-nanny = mkOption {
- description = "Docker image to seed for the kube-dns dnsmasq container.";
+ coredns = mkOption {
+ description = "Docker image to seed for the CoreDNS container.";
type = types.attrs;
default = {
- imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64";
- imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8";
+ imageName = "coredns/coredns";
+ imageDigest = "sha256:33c8da20b887ae12433ec5c40bfddefbbfa233d5ce11fb067122e68af30291d6";
finalImageTag = version;
- sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1";
- };
- };
-
- sidecar = mkOption {
- description = "Docker image to seed for the kube-dns sidecar container.";
- type = types.attrs;
- default = {
- imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64";
- imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4";
- finalImageTag = version;
- sha256 = "08l1bv5jgrhvjzpqpbinrkgvv52snc4fzyd8ya9v18ns2klyz7m0";
+ sha256 = "13q19rgwapv27xcs664dw502254yw4zw63insf6g2danidv2mg6i";
};
};
};
config = mkIf cfg.enable {
- services.kubernetes.kubelet.seedDockerImages = with pkgs.dockerTools; [
- (pullImage cfg.kube-dns)
- (pullImage cfg.dnsmasq-nanny)
- (pullImage cfg.sidecar)
- ];
+ services.kubernetes.kubelet.seedDockerImages =
+ singleton (pkgs.dockerTools.pullImage cfg.coredns);
services.kubernetes.addonManager.addons = {
- kubedns-deployment = {
+ coredns-sa = {
+ apiVersion = "v1";
+ kind = "ServiceAccount";
+ metadata = {
+ labels = {
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ "k8s-app" = "kube-dns";
+ "kubernetes.io/cluster-service" = "true";
+ };
+ name = "coredns";
+ namespace = "kube-system";
+ };
+ };
+
+ coredns-cr = {
+ apiVersion = "rbac.authorization.k8s.io/v1beta1";
+ kind = "ClusterRole";
+ metadata = {
+ labels = {
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ "k8s-app" = "kube-dns";
+ "kubernetes.io/cluster-service" = "true";
+ "kubernetes.io/bootstrapping" = "rbac-defaults";
+ };
+ name = "system:coredns";
+ };
+ rules = [
+ {
+ apiGroups = [ "" ];
+ resources = [ "endpoints" "services" "pods" "namespaces" ];
+ verbs = [ "list" "watch" ];
+ }
+ {
+ apiGroups = [ "" ];
+ resources = [ "nodes" ];
+ verbs = [ "get" ];
+ }
+ ];
+ };
+
+ coredns-crb = {
+ apiVersion = "rbac.authorization.k8s.io/v1beta1";
+ kind = "ClusterRoleBinding";
+ metadata = {
+ annotations = {
+ "rbac.authorization.kubernetes.io/autoupdate" = "true";
+ };
+ labels = {
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ "k8s-app" = "kube-dns";
+ "kubernetes.io/cluster-service" = "true";
+ "kubernetes.io/bootstrapping" = "rbac-defaults";
+ };
+ name = "system:coredns";
+ };
+ roleRef = {
+ apiGroup = "rbac.authorization.k8s.io";
+ kind = "ClusterRole";
+ name = "system:coredns";
+ };
+ subjects = [
+ {
+ kind = "ServiceAccount";
+ name = "coredns";
+ namespace = "kube-system";
+ }
+ ];
+ };
+
+ coredns-cm = {
+ apiVersion = "v1";
+ kind = "ConfigMap";
+ metadata = {
+ labels = {
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ "k8s-app" = "kube-dns";
+ "kubernetes.io/cluster-service" = "true";
+ };
+ name = "coredns";
+ namespace = "kube-system";
+ };
+ data = {
+ Corefile = ".:${toString ports.dns} {
+ errors
+ health :${toString ports.health}
+ kubernetes ${cfg.clusterDomain} in-addr.arpa ip6.arpa {
+ pods insecure
+ upstream
+ fallthrough in-addr.arpa ip6.arpa
+ }
+ prometheus :${toString ports.metrics}
+ proxy . /etc/resolv.conf
+ cache 30
+ loop
+ reload
+ loadbalance
+ }";
+ };
+ };
+
+ coredns-deploy = {
apiVersion = "extensions/v1beta1";
kind = "Deployment";
metadata = {
@@ -77,182 +163,96 @@ in {
"addonmanager.kubernetes.io/mode" = "Reconcile";
"k8s-app" = "kube-dns";
"kubernetes.io/cluster-service" = "true";
+ "kubernetes.io/name" = "CoreDNS";
};
- name = "kube-dns";
+ name = "coredns";
namespace = "kube-system";
};
spec = {
- selector.matchLabels."k8s-app" = "kube-dns";
+ replicas = cfg.replicas;
+ selector = {
+ matchLabels = { k8s-app = "kube-dns"; };
+ };
strategy = {
- rollingUpdate = {
- maxSurge = "10%";
- maxUnavailable = 0;
- };
+ rollingUpdate = { maxUnavailable = 1; };
+ type = "RollingUpdate";
};
template = {
metadata = {
- annotations."scheduler.alpha.kubernetes.io/critical-pod" = "";
- labels.k8s-app = "kube-dns";
+ labels = {
+ k8s-app = "kube-dns";
+ };
};
spec = {
- priorityClassName = "system-cluster-critical";
containers = [
{
- name = "kubedns";
- image = with cfg.kube-dns; "${imageName}:${finalImageTag}";
+ args = [ "-conf" "/etc/coredns/Corefile" ];
+ image = with cfg.coredns; "${imageName}:${finalImageTag}";
+ imagePullPolicy = "Never";
+ livenessProbe = {
+ failureThreshold = 5;
+ httpGet = {
+ path = "/health";
+ port = ports.health;
+ scheme = "HTTP";
+ };
+ initialDelaySeconds = 60;
+ successThreshold = 1;
+ timeoutSeconds = 5;
+ };
+ name = "coredns";
+ ports = [
+ {
+ containerPort = ports.dns;
+ name = "dns";
+ protocol = "UDP";
+ }
+ {
+ containerPort = ports.dns;
+ name = "dns-tcp";
+ protocol = "TCP";
+ }
+ {
+ containerPort = ports.metrics;
+ name = "metrics";
+ protocol = "TCP";
+ }
+ ];
resources = {
- limits.memory = "170Mi";
+ limits = {
+ memory = "170Mi";
+ };
requests = {
cpu = "100m";
memory = "70Mi";
};
};
- livenessProbe = {
- failureThreshold = 5;
- httpGet = {
- path = "/healthcheck/kubedns";
- port = 10054;
- scheme = "HTTP";
- };
- initialDelaySeconds = 60;
- successThreshold = 1;
- timeoutSeconds = 5;
- };
- readinessProbe = {
- httpGet = {
- path = "/readiness";
- port = 8081;
- scheme = "HTTP";
- };
- initialDelaySeconds = 3;
- timeoutSeconds = 5;
- };
- args = [
- "--domain=${cfg.clusterDomain}"
- "--dns-port=10053"
- "--config-dir=/kube-dns-config"
- "--v=2"
- ];
- env = [
- {
- name = "PROMETHEUS_PORT";
- value = "10055";
- }
- ];
- ports = [
- {
- containerPort = 10053;
- name = "dns-local";
- protocol = "UDP";
- }
- {
- containerPort = 10053;
- name = "dns-tcp-local";
- protocol = "TCP";
- }
- {
- containerPort = 10055;
- name = "metrics";
- protocol = "TCP";
- }
- ];
- volumeMounts = [
- {
- mountPath = "/kube-dns-config";
- name = "kube-dns-config";
- }
- ];
- }
- {
- name = "dnsmasq";
- image = with cfg.dnsmasq-nanny; "${imageName}:${finalImageTag}";
- livenessProbe = {
- httpGet = {
- path = "/healthcheck/dnsmasq";
- port = 10054;
- scheme = "HTTP";
- };
- initialDelaySeconds = 60;
- timeoutSeconds = 5;
- successThreshold = 1;
- failureThreshold = 5;
- };
- args = [
- "-v=2"
- "-logtostderr"
- "-configDir=/etc/k8s/dns/dnsmasq-nanny"
- "-restartDnsmasq=true"
- "--"
- "-k"
- "--cache-size=1000"
- "--log-facility=-"
- "--server=/${cfg.clusterDomain}/127.0.0.1#10053"
- "--server=/in-addr.arpa/127.0.0.1#10053"
- "--server=/ip6.arpa/127.0.0.1#10053"
- ];
- ports = [
- {
- containerPort = 53;
- name = "dns";
- protocol = "UDP";
- }
- {
- containerPort = 53;
- name = "dns-tcp";
- protocol = "TCP";
- }
- ];
- resources = {
- requests = {
- cpu = "150m";
- memory = "20Mi";
+ securityContext = {
+ allowPrivilegeEscalation = false;
+ capabilities = {
+ drop = [ "all" ];
};
+ readOnlyRootFilesystem = true;
};
volumeMounts = [
{
- mountPath = "/etc/k8s/dns/dnsmasq-nanny";
- name = "kube-dns-config";
+ mountPath = "/etc/coredns";
+ name = "config-volume";
+ readOnly = true;
}
];
}
- {
- name = "sidecar";
- image = with cfg.sidecar; "${imageName}:${finalImageTag}";
- livenessProbe = {
- httpGet = {
- path = "/metrics";
- port = 10054;
- scheme = "HTTP";
- };
- initialDelaySeconds = 60;
- timeoutSeconds = 5;
- successThreshold = 1;
- failureThreshold = 5;
- };
- args = [
- "--v=2"
- "--logtostderr"
- "--probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cfg.clusterDomain},5,A"
- "--probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cfg.clusterDomain},5,A"
- ];
- ports = [
- {
- containerPort = 10054;
- name = "metrics";
- protocol = "TCP";
- }
- ];
- resources = {
- requests = {
- cpu = "10m";
- memory = "20Mi";
- };
- };
- }
];
dnsPolicy = "Default";
- serviceAccountName = "kube-dns";
+ nodeSelector = {
+ "beta.kubernetes.io/os" = "linux";
+ };
+ serviceAccountName = "coredns";
tolerations = [
+ {
+ effect = "NoSchedule";
+ key = "node-role.kubernetes.io/master";
+ }
{
key = "CriticalAddonsOnly";
operator = "Exists";
@@ -261,10 +261,15 @@ in {
volumes = [
{
configMap = {
- name = "kube-dns";
- optional = true;
+ items = [
+ {
+ key = "Corefile";
+ path = "Corefile";
+ }
+ ];
+ name = "coredns";
};
- name = "kube-dns-config";
+ name = "config-volume";
}
];
};
@@ -272,51 +277,40 @@ in {
};
};
- kubedns-svc = {
+ coredns-svc = {
apiVersion = "v1";
kind = "Service";
metadata = {
+ annotations = {
+ "prometheus.io/port" = toString ports.metrics;
+ "prometheus.io/scrape" = "true";
+ };
labels = {
"addonmanager.kubernetes.io/mode" = "Reconcile";
"k8s-app" = "kube-dns";
"kubernetes.io/cluster-service" = "true";
- "kubernetes.io/name" = "KubeDNS";
+ "kubernetes.io/name" = "CoreDNS";
};
name = "kube-dns";
- namespace = "kube-system";
+ namespace = "kube-system";
};
spec = {
clusterIP = cfg.clusterIp;
ports = [
- {name = "dns"; port = 53; protocol = "UDP";}
- {name = "dns-tcp"; port = 53; protocol = "TCP";}
+ {
+ name = "dns";
+ port = 53;
+ targetPort = ports.dns;
+ protocol = "UDP";
+ }
+ {
+ name = "dns-tcp";
+ port = 53;
+ targetPort = ports.dns;
+ protocol = "TCP";
+ }
];
- selector.k8s-app = "kube-dns";
- };
- };
-
- kubedns-sa = {
- apiVersion = "v1";
- kind = "ServiceAccount";
- metadata = {
- name = "kube-dns";
- namespace = "kube-system";
- labels = {
- "kubernetes.io/cluster-service" = "true";
- "addonmanager.kubernetes.io/mode" = "Reconcile";
- };
- };
- };
-
- kubedns-cm = {
- apiVersion = "v1";
- kind = "ConfigMap";
- metadata = {
- name = "kube-dns";
- namespace = "kube-system";
- labels = {
- "addonmanager.kubernetes.io/mode" = "EnsureExists";
- };
+ selector = { k8s-app = "kube-dns"; };
};
};
};
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 1e1c5bc9f035..d1a1383e45b0 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,17 +29,24 @@ 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 {
name = "etc-slurm";
- paths = [ configFile cgroupConfig plugStackConfig ];
+ paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths;
};
in
@@ -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,19 @@ in
used when procTrackType=proctrack/cgroup .
'';
};
+
+ extraConfigPaths = mkOption {
+ type = with types; listOf path;
+ default = [];
+ description = ''
+ Slurm expects config files for plugins in the same path
+ as slurm.conf . Add extra nix store
+ paths that should be merged into same directory as
+ slurm.conf .
+ '';
+ };
+
+
};
};
@@ -210,12 +287,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;
@@ -225,6 +314,7 @@ in
serviceConfig = {
Type = "forking";
+ KillMode = "process";
ExecStart = "${wrappedSlurm}/bin/slurmd";
PIDFile = "/run/slurmd.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
@@ -251,6 +341,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 8d767de37f00..0f07e6133bb5 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 67c541570b97..4130ec918a70 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/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 861b46a2d642..5d1bfe4ec407 100644
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -42,6 +42,18 @@ in {
type = types.str;
description = ''
User token in Jenkins used to reload config.
+ WARNING: This token will be world readable in the Nix store. To keep
+ it secret, use the accessTokenFile option instead.
+ '';
+ };
+
+ accessTokenFile = mkOption {
+ default = "";
+ type = types.str;
+ example = "/run/keys/jenkins-job-builder-access-token";
+ description = ''
+ File containing the API token for the accessUser
+ user.
'';
};
@@ -103,6 +115,21 @@ in {
};
config = mkIf (jenkinsCfg.enable && cfg.enable) {
+ assertions = [
+ { assertion =
+ if cfg.accessUser != ""
+ then (cfg.accessToken != "" && cfg.accessTokenFile == "") ||
+ (cfg.accessToken == "" && cfg.accessTokenFile != "")
+ else true;
+ message = ''
+ One of accessToken and accessTokenFile options must be non-empty
+ strings, but not both. Current values:
+ services.jenkins.jobBuilder.accessToken = "${cfg.accessToken}"
+ services.jenkins.jobBuilder.accessTokenFile = "${cfg.accessTokenFile}"
+ '';
+ }
+ ];
+
systemd.services.jenkins-job-builder = {
description = "Jenkins Job Builder Service";
# JJB can run either before or after jenkins. We chose after, so we can
@@ -128,8 +155,13 @@ in {
ownerStamp = ".config-xml-managed-by-nixos-jenkins-job-builder";
reloadScript = ''
echo "Asking Jenkins to reload config"
- CRUMB=$(curl -s 'http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
- curl --silent -X POST -H "$CRUMB" http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload
+ curl_opts="--silent --fail --show-error"
+ access_token=${if cfg.accessTokenFile != ""
+ then "$(cat '${cfg.accessTokenFile}')"
+ else cfg.accessToken}
+ jenkins_url="http://${cfg.accessUser}:$access_token@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}"
+ crumb=$(curl $curl_opts "$jenkins_url"'/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
+ curl $curl_opts -X POST -H "$crumb" "$jenkins_url"/reload
'';
in
''
diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix
new file mode 100644
index 000000000000..e977751b21ef
--- /dev/null
+++ b/nixos/modules/services/databases/cockroachdb.nix
@@ -0,0 +1,217 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.cockroachdb;
+ crdb = cfg.package;
+
+ escape = builtins.replaceStrings ["%"] ["%%"];
+ ifNotNull = v: s: optionalString (!isNull v) s;
+
+ startupCommand = lib.concatStringsSep " "
+ [ # Basic startup
+ "${crdb}/bin/cockroach start"
+ "--logtostderr"
+ "--store=/var/lib/cockroachdb"
+ (ifNotNull cfg.locality "--locality='${cfg.locality}'")
+
+ # WebUI settings
+ "--http-addr='${cfg.http.address}:${toString cfg.http.port}'"
+
+ # Cluster listen address
+ "--listen-addr='${cfg.listen.address}:${toString cfg.listen.port}'"
+
+ # Cluster configuration
+ (ifNotNull cfg.join "--join=${cfg.join}")
+
+ # Cache and memory settings. Must be escaped.
+ "--cache='${escape cfg.cache}'"
+ "--max-sql-memory='${escape cfg.maxSqlMemory}'"
+
+ # Certificate/security settings.
+ (if cfg.insecure then "--insecure" else "--certs-dir=${cfg.certsDir}")
+ ];
+
+ addressOption = descr: defaultPort: {
+ address = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Address to bind to for ${descr}";
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = defaultPort;
+ description = "Port to bind to for ${descr}";
+ };
+ };
+in
+
+{
+ options = {
+ services.cockroachdb = {
+ enable = mkEnableOption "CockroachDB Server";
+
+ listen = addressOption "intra-cluster communication" 26257;
+
+ http = addressOption "http-based Admin UI" 8080;
+
+ locality = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ An ordered, comma-separated list of key-value pairs that describe the
+ topography of the machine. Topography might include country,
+ datacenter or rack designations. Data is automatically replicated to
+ maximize diversities of each tier. The order of tiers is used to
+ determine the priority of the diversity, so the more inclusive
+ localities like country should come before less inclusive localities
+ like datacenter. The tiers and order must be the same on all nodes.
+ Including more tiers is better than including fewer. For example:
+
+
+ country=us,region=us-west,datacenter=us-west-1b,rack=12
+ country=ca,region=ca-east,datacenter=ca-east-2,rack=4
+
+ planet=earth,province=manitoba,colo=secondary,power=3
+
+ '';
+ };
+
+ join = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "The addresses for connecting the node to a cluster.";
+ };
+
+ insecure = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Run in insecure mode.";
+ };
+
+ certsDir = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "The path to the certificate directory.";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "cockroachdb";
+ description = "User account under which CockroachDB runs";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "cockroachdb";
+ description = "User account under which CockroachDB runs";
+ };
+
+ openPorts = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Open firewall ports for cluster communication by default";
+ };
+
+ cache = mkOption {
+ type = types.str;
+ default = "25%";
+ description = ''
+ The total size for caches.
+
+ This can be a percentage, expressed with a fraction sign or as a
+ decimal-point number, or any bytes-based unit. For example,
+ "25%" , "0.25" both represent
+ 25% of the available system memory. The values
+ "1000000000" and "1GB" both
+ represent 1 gigabyte of memory.
+
+ '';
+ };
+
+ maxSqlMemory = mkOption {
+ type = types.str;
+ default = "25%";
+ description = ''
+ The maximum in-memory storage capacity available to store temporary
+ data for SQL queries.
+
+ This can be a percentage, expressed with a fraction sign or as a
+ decimal-point number, or any bytes-based unit. For example,
+ "25%" , "0.25" both represent
+ 25% of the available system memory. The values
+ "1000000000" and "1GB" both
+ represent 1 gigabyte of memory.
+ '';
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.cockroachdb;
+ defaultText = "pkgs.cockroachdb";
+ description = ''
+ The CockroachDB derivation to use for running the service.
+
+ This would primarily be useful to enable Enterprise Edition features
+ in your own custom CockroachDB build (Nixpkgs CockroachDB binaries
+ only contain open source features and open source code).
+ '';
+ };
+ };
+ };
+
+ config = mkIf config.services.cockroachdb.enable {
+ assertions = [
+ { assertion = !cfg.insecure -> !(isNull cfg.certsDir);
+ message = "CockroachDB must have a set of SSL certificates (.certsDir), or run in Insecure Mode (.insecure = true)";
+ }
+ ];
+
+ environment.systemPackages = [ crdb ];
+
+ users.users = optionalAttrs (cfg.user == "cockroachdb") (singleton
+ { name = "cockroachdb";
+ description = "CockroachDB Server User";
+ uid = config.ids.uids.cockroachdb;
+ group = cfg.group;
+ });
+
+ users.groups = optionalAttrs (cfg.group == "cockroachdb") (singleton
+ { name = "cockroachdb";
+ gid = config.ids.gids.cockroachdb;
+ });
+
+ networking.firewall.allowedTCPPorts = lib.optionals cfg.openPorts
+ [ cfg.http.port cfg.listen.port ];
+
+ systemd.services.cockroachdb =
+ { description = "CockroachDB Server";
+ documentation = [ "man:cockroach(1)" "https://www.cockroachlabs.com" ];
+
+ after = [ "network.target" "time-sync.target" ];
+ requires = [ "time-sync.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ unitConfig.RequiresMountsFor = "/var/lib/cockroachdb";
+
+ serviceConfig =
+ { ExecStart = startupCommand;
+ Type = "notify";
+ User = cfg.user;
+ StateDirectory = "cockroachdb";
+ StateDirectoryMode = "0700";
+
+ Restart = "always";
+
+ # A conservative-ish timeout is alright here, because for Type=notify
+ # cockroach will send systemd pings during startup to keep it alive
+ TimeoutStopSec = 60;
+ RestartSec = 10;
+ };
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
+}
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index 7883680d46cc..bf4b644c9b86 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
-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 :
-
+
+ To enable FoundationDB, add the following to your
+ configuration.nix :
services.foundationdb.enable = true;
services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
-
+
-The services.foundationdb.package 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 environment.systemPackages ):
+
+ The services.foundationdb.package 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 environment.systemPackages ):
$ 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.
+
+ 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 .)
+
+ 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
-services.foundationdb.dataDir , e.g.
+
+ 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
+ services.foundationdb.dataDir , e.g.
services.foundationdb.dataDir = "/data/fdb";
+
-
+
+ Similarly, logs are stored under /var/log/foundationdb
+ by default, and there is a corresponding
+ services.foundationdb.logDir as well.
+
+
+
+ Scaling processes and backup agents
-Similarly, logs are stored under
-/var/log/foundationdb by default, and there is a
-corresponding services.foundationdb.logDir as well.
+
+ Scaling the number of server processes is quite easy; simply specify
+ services.foundationdb.serverProcesses 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.
+
-Scaling processes and backup agents
+
+ A similar option exists in order to scale backup agent processes,
+ services.foundationdb.backupProcesses . Backup agents are
+ not as performance/RAM sensitive, so feel free to experiment with the number
+ of available backup processes.
+
+
+
+ Clustering
-Scaling the number of server processes is quite easy; simply specify
-services.foundationdb.serverProcesses to be the number of
-FoundationDB worker processes that should be started on the machine.
+
+ 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 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.
+
+ 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 .
+
-A similar option exists in order to scale backup agent processes,
-services.foundationdb.backupProcesses . Backup agents are not
-as performance/RAM sensitive, so feel free to experiment with the number of
-available backup processes.
+
+ 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:
+
-Clustering
+
+
+
+ Add a node to the cluster for storage/compute.
+
+
+
+
+ Promote an ordinary worker to a coordinator.
+
+
+
-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.
+
+ 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.
+
-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 .
+
+ To add a machine to a FoundationDB cluster:
+
-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.
+
+
+
+ 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.
+
+
+
-When dealing with a cluster, there are two main things you want to
-do:
+
+ 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.
+
-
- Add a node to the cluster for storage/compute.
- Promote an ordinary worker to a coordinator.
-
+
+ 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
+
-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:
+
+ 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.
+
+ 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.
+
+
+
+
+ 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
-Client connectivity
+
+ 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.
+
-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.
+
+ Configuring TLS with FoundationDB is done using the
+ services.foundationdb.tls 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.
+
-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
-services.foundationdb.tls 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:
+
+ 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.
+
+ 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.
+
-Backups and Disaster Recovery
+
+ 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.
+
-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.
+
+ In order to allow flexible backup locations on local disks, the FoundationDB
+ NixOS module supports a
+ services.foundationdb.extraReadWritePaths 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.
+
-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
-services.foundationdb.extraReadWritePaths 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:
+
+ 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
+
+
+
+ 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.
+
-Known limitations
+
+
+
+ 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
-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: .
-
-
+
+ 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/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 0dde9ee6e2e5..df6f3876585e 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -12,26 +12,22 @@ let
let
pName = _p: (builtins.parseDrvName (_p.name)).name;
in pName mysql == pName pkgs.mariadb;
+ isMysqlAtLeast57 =
+ let
+ pName = _p: (builtins.parseDrvName (_p.name)).name;
+ in (pName mysql == pName pkgs.mysql57)
+ && ((builtins.compareVersions mysql.version "5.7") >= 0);
pidFile = "${cfg.pidDir}/mysqld.pid";
+ mysqldAndInstallOptions =
+ "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql}";
mysqldOptions =
- "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql} " +
- "--pid-file=${pidFile}";
-
- myCnf = pkgs.writeText "my.cnf"
- ''
- [mysqld]
- port = ${toString cfg.port}
- ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
- ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
- ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
- ${optionalString (cfg.ensureUsers != [])
- ''
- plugin-load-add = auth_socket.so
- ''}
- ${cfg.extraOptions}
- '';
+ "${mysqldAndInstallOptions} --pid-file=${pidFile}";
+ # For MySQL 5.7+, --insecure creates the root user without password
+ # (earlier versions and MariaDB do this by default).
+ installOptions =
+ "${mysqldAndInstallOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}";
in
@@ -147,7 +143,7 @@ in
option is changed. This means that users created and permissions assigned once through this option or
otherwise have to be removed manually.
'';
- example = [
+ example = literalExample ''[
{
name = "nextcloud";
ensurePermissions = {
@@ -160,7 +156,7 @@ in
"*.*" = "SELECT, LOCK TABLES";
};
}
- ];
+ ]'';
};
# FIXME: remove this option; it's a really bad idea.
@@ -231,6 +227,21 @@ in
environment.systemPackages = [mysql];
+ environment.etc."my.cnf".text =
+ ''
+ [mysqld]
+ port = ${toString cfg.port}
+ datadir = ${cfg.dataDir}
+ ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
+ ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
+ ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
+ ${optionalString (cfg.ensureUsers != [])
+ ''
+ plugin-load-add = auth_socket.so
+ ''}
+ ${cfg.extraOptions}
+ '';
+
systemd.services.mysql = let
hasNotify = (cfg.package == pkgs.mariadb);
in {
@@ -252,7 +263,7 @@ in
if ! test -e ${cfg.dataDir}/mysql; then
mkdir -m 0700 -p ${cfg.dataDir}
chown -R ${cfg.user} ${cfg.dataDir}
- ${mysql}/bin/mysql_install_db ${mysqldOptions}
+ ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${installOptions}
touch /tmp/mysql_init
fi
@@ -263,7 +274,7 @@ in
serviceConfig = {
Type = if hasNotify then "notify" else "simple";
RuntimeDirectory = "mysqld";
- ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
+ ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions}";
};
postStart = ''
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 9f2bf5ef8a9c..e996211be7da 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -54,6 +54,13 @@ in
description = "The database directory.";
};
+ logLevel = mkOption {
+ type = types.str;
+ default = "0";
+ example = "acl trace";
+ description = "The log level selector of slapd.";
+ };
+
configDir = mkOption {
type = types.nullOr types.path;
default = null;
@@ -139,7 +146,7 @@ in
chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}"
'';
serviceConfig.ExecStart =
- "${openldap.out}/libexec/slapd -d 0 " +
+ "${openldap.out}/libexec/slapd -d ${cfg.logLevel} " +
"-u '${cfg.user}' -g '${cfg.group}' " +
"-h '${concatStringsSep " " cfg.urlList}' " +
"${configOpts}";
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index f59fb1c81772..aeab445a9983 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;
@@ -236,6 +238,9 @@ in
User = "postgres";
Group = "postgres";
PermissionsStartOnly = true;
+ Type = if lib.versionAtLeast cfg.package.version "9.6"
+ then "notify"
+ else "simple";
# Shut down Postgres using SIGINT ("Fast Shutdown mode"). See
# http://www.postgresql.org/docs/current/static/server-shutdown.html
@@ -269,5 +274,5 @@ in
};
meta.doc = ./postgresql.xml;
-
+ meta.maintainers = with lib.maintainers; [ thoughtpolice ];
}
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index 1aaf33963245..14f4d4909bc0 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
-PostgreSQL is an advanced, free relational database.
-
-Configuring
-
-To enable PostgreSQL, add the following to your
-configuration.nix :
-
+
+ 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.
-
-
-
+
+ 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/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix
index 933b9da2c83c..c48036a99e8f 100644
--- a/nixos/modules/services/desktops/accountsservice.nix
+++ b/nixos/modules/services/desktops/accountsservice.nix
@@ -39,14 +39,14 @@ with lib;
systemd.packages = [ pkgs.accountsservice ];
- systemd.services.accounts-daemon = {
+ systemd.services.accounts-daemon = recursiveUpdate {
wantedBy = [ "graphical.target" ];
# Accounts daemon looks for dbus interfaces in $XDG_DATA_DIRS/accountsservice
environment.XDG_DATA_DIRS = "${config.system.path}/share";
- } // (optionalAttrs (!config.users.mutableUsers) {
+ } (optionalAttrs (!config.users.mutableUsers) {
environment.NIXOS_USERS_PURE = "true";
});
};
diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml
index d9c8b711c450..8045d5fa14f8 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/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
new file mode 100644
index 000000000000..021f4f9534b4
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix
@@ -0,0 +1,18 @@
+# Remote desktop daemon using Pipewire.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ ###### interface
+ options = {
+ services.gnome3.gnome-remote-desktop = {
+ enable = mkEnableOption "Remote Desktop support using Pipewire";
+ };
+ };
+
+ ###### implementation
+ config = mkIf config.services.gnome3.gnome-remote-desktop.enable {
+ systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ];
+ };
+}
diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix
new file mode 100644
index 000000000000..55d5e703aa19
--- /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/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
index e9ad738269e4..9631157934f9 100644
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ b/nixos/modules/services/desktops/gnome3/seahorse.nix
@@ -29,7 +29,7 @@ with lib;
config = mkIf config.services.gnome3.seahorse.enable {
- environment.systemPackages = [ pkgs.gnome3.seahorse ];
+ environment.systemPackages = [ pkgs.gnome3.seahorse pkgs.gnome3.dconf ];
services.dbus.packages = [ pkgs.gnome3.seahorse ];
diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix
new file mode 100644
index 000000000000..cf26e05d5c18
--- /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 e3f74df3e573..e4e47cfbd438 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" ];
+ timers.psd-resync = {
+ description = "Timer for profile sync daemon - ${cfg.resyncTimer}";
+ partOf = [ "psd-resync.service" "psd.service" ];
- path = with pkgs; [ glibc rsync gawk ];
-
- 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/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix
index 9fcc00431865..f20860af6e12 100644
--- a/nixos/modules/services/development/jupyter/default.nix
+++ b/nixos/modules/services/development/jupyter/default.nix
@@ -145,6 +145,7 @@ in {
systemd.services.jupyter = {
description = "Jupyter development server";
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
# TODO: Patch notebook so we can explicitly pass in a shell
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 94eb2e6a77bf..1ac53c818a7f 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 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 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 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.
-
+
+ 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.
+
+
+
+
+
-
- Installing Emacs
+
+ If those aren't suitable, then the following imitation Emacs editors are
+ also available in Nixpkgs:
+ Zile,
+ mg,
+ Yi.
+
+
-
- Emacs can be installed in the normal way for Nix (see
- ).
- In addition, a NixOS service
- can be enabled.
-
+
+ Adding Packages to Emacs
-
- The Different Releases of Emacs
+
+ Emacs includes an entire ecosystem of functionality beyond text editing,
+ including a project planner, mail and news reader, debugger interface,
+ calendar, and more.
+
-
- 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
+ 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.
-
+ (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.
-
+
+ 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 ).
-
-
+
+
+ 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 (emacs.nix )
-
+
+ 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 (emacs.nix )
+
/*
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 result of this configuration will be an
- emacs command which launches Emacs with all
- of your chosen packages in the load-path .
+ The first non-comment line in this file ({ pkgs ? ...
+ } ) indicates that the whole file represents a function.
-
+
+
- You can check that it works by executing this in a terminal:
+ 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 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.
+
+
-
-
- 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
-
+ 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 configuration.nix
-
+ 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 configuration.nix
+" -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 ~/.config/nixpkgs/config.nix
-
+ 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 ~/.config/nixpkgs/config.nix
+
-
-
+
+
-
- In this case, the next
- nix-env -f '<nixpkgs>' -iA myemacs
- will take care of adding your emacs to the
- PATH environment variable.
-
-
+
+ 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
+
+ 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:
-
+
+ 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
-
+ 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 .
-
+
+ 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:
+
+ 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 EDITOR variable
-
+ Configuring the EDITOR 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 is
+ true , the EDITOR variable will be set
+ to a wrapper script which launches emacsclient .
+
-
- 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
-
+
+ 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 .emacs
-
+ Package initialization in .emacs
+
-
+
- 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 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.
-
+ 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
- (
+ To install the DocBook 5.0 schemas, either add
+ pkgs.docbook5 to
+
+ ( NixOS), or run
- nix-env -i pkgs.docbook5
- ( Nix).
-
+ 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 (~/.emacs.d/schemas.xml )
-
+ 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 (~/.emacs.d/schemas.xml )
+
-
--
-+
-
--
-+
-
-
-
-@@ -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 ec5e08ffda40..000000000000
--- 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 000000000000..65f0481a8010
--- /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 6ff2028e3c16..349482fbde97 100644
--- a/pkgs/development/compilers/clasp/default.nix
+++ b/pkgs/development/compilers/clasp/default.nix
@@ -1,7 +1,8 @@
-{stdenv, fetchFromGitHub
- , llvmPackages
- , cmake, boehmgc, gmp, zlib, ncurses, boost
- , python, git, sbcl
+{ stdenv, fetchFromGitHub
+, llvmPackages
+, cmake, boehmgc, gmp, zlib, ncurses, boost
+, python, git, sbcl
+, wafHook
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
- nativeBuildInputs = [ cmake python git sbcl ];
+ nativeBuildInputs = [ cmake python git sbcl wafHook ];
buildInputs = with llvmPackages; (
builtins.map (x: stdenv.lib.overrideDerivation x
@@ -32,36 +33,14 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = " -frtti ";
- configurePhase = ''
- runHook preConfigure
-
- export CXX=clang++
- export CC=clang
-
+ postPatch = ''
echo "
INSTALL_PATH_PREFIX = '$out'
" | sed -e 's/^ *//' > wscript.config
-
- python ./waf configure update_submodules
-
- runHook postConfigure
'';
- buildPhase = ''
- runHook preBuild
-
- python ./waf build_cboehm
-
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
-
- python ./waf install_cboehm
-
- runHook postInstall
- '';
+ buildTargets = "build_cboehm";
+ installTargets = "install_cboehm";
meta = {
inherit version;
@@ -70,5 +49,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 63b31c60d986..7f666cac68ef 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 = "20181008";
src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
- sha256 = "1jis9ykbbynq6pa8sl1jy8888l2bk9g4xsiiiab51zn62shqnq26";
+ sha256 = "1zh6q7fgwjk2p4bivvpcwgn1657jc557zrgibwpyvbwm87mb57wv";
};
sourceRoot = ".";
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 631179c483bc..a0058242bad8 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 3861501d3996..05958d523363 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 aa1c85ebcb00..51cea9810bc9 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}
- '';
+ generic = { version, sha256, doCheck ? true }:
+ stdenv.mkDerivation rec {
+ inherit doCheck;
+ name = "crystal-${version}";
- # crystal on Darwin needs libiconv to build
- libs = [
- boehmgc libatomic_ops pcre libevent
- ] ++ stdenv.lib.optionals stdenv.isDarwin [
- libiconv
- ];
+ src = fetchFromGitHub {
+ owner = "crystal-lang";
+ repo = "crystal";
+ rev = version;
+ inherit sha256;
+ };
- nativeBuildInputs = [ which makeWrapper ];
+ # 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 = libs ++ [ llvm ];
+ buildInputs = [
+ boehmgc libatomic_ops pcre libevent
+ llvm zlib openssl
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ libiconv
+ ];
- libPath = stdenv.lib.makeLibraryPath libs;
+ nativeBuildInputs = [ binary makeWrapper which ];
- sourceRoot = "${name}";
- preBuild = ''
- patchShebangs bin/crystal
- patchShebangs ../${prebuiltName}/bin/crystal
- export PATH="$(pwd)/../${prebuiltName}/bin:$PATH"
- '';
+ makeFlags = [
+ "CRYSTAL_CONFIG_BUILD_DATE=${releaseDate}"
+ "CRYSTAL_CONFIG_VERSION=${version}"
+ ];
- makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}"
- "FLAGS=--no-debug"
- "release=1"
- "all" "docs"
- ];
+ buildFlags = [
+ "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/
+ FLAGS = [
+ "--release"
+ "--single-module" # needed for deterministic builds
+ ];
- install -dm755 $out/share/doc/crystal/api
- cp -r docs/* $out/share/doc/crystal/api/
- cp -r samples $out/share/doc/crystal/
+ # 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 -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
- install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
+ 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 -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
+ install -dm755 $out/share/doc/crystal/api
+ cp -r docs/* $out/share/doc/crystal/api/
+ cp -r samples $out/share/doc/crystal/
- install -Dm644 LICENSE $out/share/licenses/crystal/LICENSE
- '';
+ install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
+ install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
- dontStrip = true;
+ install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
- enableParallelBuilding = false;
+ install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
- 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" ];
+ 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" ];
+ };
};
+
+in rec {
+ crystal_0_25 = generic {
+ version = "0.25.1";
+ sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl";
+ doCheck = false;
+ };
+
+ 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 e44c21abe946..6fdbde242f32 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses, expat, python27, zlib
-, gcc48, gcc49, gcc5, gcc6
+, gcc48, gcc49, gcc5, gcc6, gcc7
, xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
}:
@@ -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 = gcc7;
+ };
+ 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 = gcc7;
+ };
+
+ cudatoolkit_10 = cudatoolkit_10_0;
+}
diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix
index 50057f91e804..9970fd9b33d3 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 93deb4a90aff..47a0d459a93d 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:
@@ -49,47 +51,24 @@
# that the default of ~/.elm isn't used.
let
- makeDotElm = ver: deps:
- let versionsDat = ./versions.dat;
- cmds = lib.mapAttrsToList (name: info: let
- pkg = stdenv.mkDerivation {
-
- name = lib.replaceChars ["/"] ["-"] name + "-${info.version}";
-
- src = fetchurl {
- url = "https://github.com/${name}/archive/${info.version}.tar.gz";
- meta.homepage = "https://github.com/${name}/";
- inherit (info) sha256;
- };
-
- phases = [ "unpackPhase" "installPhase" ];
-
- installPhase = ''
- mkdir -p $out
- cp -r * $out
- '';
-
- };
- in ''
- mkdir -p .elm/${ver}/package/${name}
- cp -R ${pkg} .elm/${ver}/package/${name}/${info.version}
- '') deps;
- in (lib.concatStrings cmds) + ''
- mkdir -p .elm/${ver}/package;
- cp ${versionsDat} .elm/${ver}/package/versions.dat;
- chmod -R +w .elm
- '';
-
+ fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
hsPkgs = haskell.packages.ghc822.override {
overrides = self: super: with haskell.lib;
let elmPkgs = {
elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
# sadly with parallelism most of the time breaks compilation
enableParallelBuilding = false;
- preConfigure = ''
- export ELM_HOME=`pwd`/.elm
- '' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
+ preConfigure = fetchElmDeps {
+ elmPackages = (import ./packages/elm-elm.nix);
+ versionsDat = ./versions.dat;
+ };
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 +78,11 @@ 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 4dab2e06f48e..65fb8a9c82dd 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";
+ version = "0.98";
+ rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
- src = fetchFromGitHub {
- owner = "factor";
- repo = "factor";
- rev = rev;
- sha256 = "16zlbxbad3d19jq01nk824i19bypqzn8l3yfxys40z06vjjncapd";
+ src = fetchurl {
+ url = http://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip;
+ sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri";
};
- factorimage = fetchurl {
- url = http://downloads.factorcode.org/releases/0.97/factor-linux-x86-64-0.97.tar.gz;
- sha256 = "06y125c8vbng54my5fxdr3crpxkvhhcng2n35cxddd3wcg6vhxhp";
- name = "factorimage";
- };
+ patches = [
+ ./staging-command-line-0.98-pre.patch
+ ./workdir-0.98-pre.patch
+ ./fuel-dir.patch
+ ];
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ git rlwrap curl perl makeWrapper
+ 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 000000000000..8f45b0372469
--- /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 000000000000..57fc657ddcf3
--- /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 000000000000..f1498743dd67
--- /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/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
new file mode 100644
index 000000000000..5205792561b8
--- /dev/null
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -0,0 +1,24 @@
+{ stdenvNoCC, lib, fetchurl }:
+
+stdenvNoCC.mkDerivation rec {
+ name = "fasm-bin-${version}";
+
+ version = "1.73.04";
+
+ src = fetchurl {
+ url = "https://flatassembler.net/fasm-${version}.tgz";
+ sha256 = "0y0xkf9fzcm5gklhdi61wjpd1p8islpbcnkv5k16aqci3qsd0ia1";
+ };
+
+ installPhase = ''
+ install -D fasm${lib.optionalString stdenvNoCC.isx86_64 ".x64"} $out/bin/fasm
+ '';
+
+ meta = with lib; {
+ description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF";
+ homepage = https://flatassembler.net/download.php;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ orivej ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/development/compilers/fasm/default.nix b/pkgs/development/compilers/fasm/default.nix
new file mode 100644
index 000000000000..47b90469234f
--- /dev/null
+++ b/pkgs/development/compilers/fasm/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, lib, fasm-bin, isx86_64 }:
+
+stdenv.mkDerivation rec {
+ inherit (fasm-bin) version src meta;
+
+ name = "fasm-${version}";
+
+ nativeBuildInputs = [ fasm-bin ];
+
+ buildPhase = ''
+ fasm source/Linux${lib.optionalString isx86_64 "/x64"}/fasm.asm fasm
+ for tool in listing prepsrc symbols; do
+ fasm tools/libc/$tool.asm
+ cc -o tools/libc/fasm-$tool tools/libc/$tool.o
+ done
+ '';
+
+ outputs = [ "out" "doc" ];
+
+ installPhase = ''
+ install -Dt $out/bin fasm tools/libc/fasm-*
+
+ docs=$doc/share/doc/fasm
+ mkdir -p $docs
+ cp -r examples/ *.txt tools/fas.txt $docs
+ cp tools/readme.txt $docs/tools.txt
+ '';
+}
diff --git a/pkgs/development/compilers/fpc/default.upstream b/pkgs/development/compilers/fpc/default.upstream
index 7c11fb4761e1..9f16c1b645cd 100644
--- a/pkgs/development/compilers/fpc/default.upstream
+++ b/pkgs/development/compilers/fpc/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/freepascal/files/Source/
+url https://sourceforge.net/projects/freepascal/files/Source/
SF_version_dir
version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$'
SF_redirect
diff --git a/pkgs/development/compilers/futhark/default.nix b/pkgs/development/compilers/futhark/default.nix
new file mode 100644
index 000000000000..890be3431c3a
--- /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/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index 05e804a1f740..8e9525e33842 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, autoconf, ... }:
+{ stdenv, fetchurl, autoconf, git, ... }:
stdenv.mkDerivation rec {
name = "gambit-bootstrap-${version}";
- version = "4.8.9";
- tarball_version = "v4_8_9";
+ version = "4.9.1";
+ tarball_version = "v4_9_1";
src = fetchurl {
- url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz";
- sha256 = "b7f86c794711792ca556ce41f8bc7043dffc395c01bb6d8d119bc2f454f89fbf";
+ url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-${tarball_version}-devel.tgz";
+ sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7";
};
- buildInputs = [ autoconf ];
+ buildInputs = [ autoconf git ];
configurePhase = ''
./configure --prefix=$out
diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix
index 72530f99cdbc..65d16c48a616 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@@ -1,8 +1,8 @@
-{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, SRC }:
+{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }:
stdenv.mkDerivation rec {
name = "gambit-${version}";
- src = SRC;
+ inherit src;
bootstrap = import ./bootstrap.nix ( pkgs );
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 36aa73f7274b..19297a6e68eb 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -1,11 +1,10 @@
{ stdenv, callPackage, fetchurl }:
callPackage ./build.nix {
- version = "4.8.9";
-
- SRC = fetchurl {
- url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz";
- sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p";
+ version = "4.9.1";
+ src = fetchurl {
+ url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_1-devel.tgz";
+ sha256 = "10kzv568gimp9nzh5xw0h01vw50wi68z3awfp9ibqrpq2l0n7mw7";
};
inherit stdenv;
}
diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix
index 41d0ee930bf0..15db82fc9fb2 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@@ -1,12 +1,13 @@
-{ stdenv, callPackage, fetchgit }:
+{ stdenv, callPackage, fetchFromGitHub }:
callPackage ./build.nix {
- version = "unstable-2018-08-06";
-# git-version = "4.8.9-77-g91a4ad2c";
- SRC = fetchgit {
- url = "https://github.com/feeley/gambit.git";
- rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f";
- sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p";
+ version = "unstable-2018-11-19";
+# git-version = "4.9.1-8-g61c6cb50";
+ src = fetchFromGitHub {
+ owner = "feeley";
+ repo = "gambit";
+ rev = "61c6cb500f4756be1e52095d5ab4501752525a70";
+ sha256 = "1knpb40y1g09c6yqd2fsxm3bk56bl5xrrwfsd7nqa497x6ngm5pn";
};
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 945649b29781..000000000000
--- 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 7908d6d06ef8..000000000000
--- 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 60db368c403a..9cfe03d6655c 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -52,12 +52,9 @@ with builtins;
let version = "4.8.5";
- enableParallelBuilding = true;
-
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
- patches = [ ]
- ++ optional enableParallelBuilding ../parallel-bconfig.patch
+ patches = [ ../parallel-bconfig.patch ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
@@ -130,7 +127,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 +145,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 "";
@@ -175,7 +177,7 @@ stdenv.mkDerivation ({
inherit patches;
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" "pie" ];
outputs = [ "out" "lib" "man" "info" ];
setOutputFlags = false;
@@ -201,9 +203,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 ];
@@ -211,20 +211,27 @@ stdenv.mkDerivation ({
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkgconfig);
- buildInputs = [ gmp mpfr libmpc libelf ]
- ++ (optional (cloog != null) cloog)
+ # For building runtime libs
+ depsBuildTarget =
+ if hostPlatform == buildPlatform then [
+ targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+ ] else assert targetPlatform == hostPlatform; [ # build != host == target
+ stdenv.cc
+ ];
+
+ buildInputs = [
+ gmp mpfr libmpc libelf
+ targetPackages.stdenv.cc.bintools # For linking code at run-time
+ ] ++ (optional (cloog != null) cloog)
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
- ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
-
preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
@@ -272,7 +279,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -328,7 +335,7 @@ stdenv.mkDerivation ({
then "install-strip"
else "install";
- # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -356,26 +363,26 @@ stdenv.mkDerivation ({
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
- ++ optionals javaAwtGtk [ gmp mpfr ])
- );
+ ++ optionals javaAwtGtk [ gmp mpfr ]
+ ));
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 = {
@@ -384,12 +391,13 @@ stdenv.mkDerivation ({
hardeningUnsupportedFlags = [ "stackprotector" ];
};
- inherit enableParallelBuilding enableMultilib;
+ enableParallelBuilding = true;
+ inherit enableMultilib;
inherit (stdenv) is64bit;
meta = {
- homepage = http://gcc.gnu.org/;
+ homepage = https://gcc.gnu.org/;
license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
description = "GNU Compiler Collection, version ${version}"
+ (if stripped then "" else " (with debugging info)");
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 361db92cb767..9b23fe785999 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, noSysDirs, fetchpatch
+{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
, langObjC ? stdenv.targetPlatform.isDarwin
, langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -52,13 +52,10 @@ with builtins;
let version = "4.9.4";
- enableParallelBuilding = true;
-
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
- [ ../use-source-date-epoch.patch ]
- ++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ]
+ [ ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
@@ -135,7 +132,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 +153,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 "";
@@ -183,7 +185,7 @@ stdenv.mkDerivation ({
inherit patches;
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" "pie" ];
outputs = if langJava || langGo then ["out" "man" "info"]
else [ "out" "lib" "man" "info" ];
@@ -210,9 +212,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 ];
@@ -236,8 +236,6 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
- ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
@@ -252,8 +250,7 @@ stdenv.mkDerivation ({
''
+ stdenv.lib.optionalString (langJava || langGo) ''
export lib=$out;
- ''
- ;
+ '';
dontDisableStatic = true;
@@ -265,7 +262,8 @@ stdenv.mkDerivation ({
[
"--with-gmp-include=${gmp.dev}/include"
"--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr=${mpfr.dev}"
+ "--with-mpfr-include=${mpfr.dev}/include"
+ "--with-mpfr-lib=${mpfr.out}/lib"
"--with-mpc=${libmpc}"
] ++
optional (libelf != null) "--with-libelf=${libelf}" ++
@@ -294,7 +292,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -350,7 +348,7 @@ stdenv.mkDerivation ({
then "install-strip"
else "install";
- # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -378,36 +376,40 @@ stdenv.mkDerivation ({
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
- ++ optionals javaAwtGtk [ gmp mpfr ]));
+ ++ optionals javaAwtGtk [ gmp mpfr ]
+ ));
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 =
- { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
+ passthru = {
+ inherit langC langCC langObjC langObjCpp langFortran langGo version;
+ isGNU = true;
+ };
- inherit enableParallelBuilding enableMultilib;
+ enableParallelBuilding = true;
+ inherit enableMultilib;
inherit (stdenv) is64bit;
meta = {
- homepage = http://gcc.gnu.org/;
+ homepage = https://gcc.gnu.org/;
license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
description = "GNU Compiler Collection, version ${version}"
+ (if stripped then "" else " (with debugging info)");
@@ -426,7 +428,8 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
- stdenv.lib.platforms.illumos;
+ stdenv.lib.platforms.illumos ++
+ stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 2e51e9c05066..5db2ac3d4133 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -49,9 +49,6 @@ with stdenv.lib;
with builtins;
let version = "5.5.0";
- sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
-
- enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -60,6 +57,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 +119,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 +140,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 "";
@@ -164,7 +167,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
- inherit sha256;
+ sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
};
inherit patches;
@@ -175,7 +178,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" "pie" ];
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
@@ -215,9 +218,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 ];
@@ -240,12 +241,10 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
- ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
- ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@@ -297,7 +296,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -331,7 +330,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;
@@ -349,7 +353,7 @@ stdenv.mkDerivation ({
then "install-strip"
else "install";
- # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -383,31 +387,34 @@ 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 =
- { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
+ passthru = {
+ inherit langC langCC langObjC langObjCpp langFortran langGo version;
+ isGNU = true;
+ };
- inherit enableParallelBuilding enableMultilib;
+ enableParallelBuilding = true;
+ inherit enableMultilib;
inherit (stdenv) is64bit;
meta = {
- homepage = http://gcc.gnu.org/;
+ homepage = https://gcc.gnu.org/;
license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
description = "GNU Compiler Collection, version ${version}"
+ (if stripped then "" else " (with debugging info)");
@@ -426,6 +433,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
+ stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index e6825afcfa84..99c79a99dce1 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -48,9 +48,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
-let version = "6.4.0";
-
- enableParallelBuilding = true;
+let version = "6.5.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -59,8 +57,7 @@ let version = "6.4.0";
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ 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 +116,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 +139,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 "";
@@ -164,7 +166,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
- sha256 = "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5";
+ sha256 = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby";
};
inherit patches;
@@ -176,7 +178,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" "pie" ];
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
@@ -216,9 +218,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 ];
@@ -241,12 +241,9 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
- ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
- ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@@ -259,8 +256,7 @@ stdenv.mkDerivation ({
''
+ stdenv.lib.optionalString (langJava || langGo) ''
export lib=$out;
- ''
- ;
+ '';
dontDisableStatic = true;
@@ -302,7 +298,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -336,7 +332,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;
@@ -354,7 +355,7 @@ stdenv.mkDerivation ({
then "install-strip"
else "install";
- # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -382,36 +383,40 @@ stdenv.mkDerivation ({
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
- ++ optionals javaAwtGtk [ gmp mpfr ]));
+ ++ optionals javaAwtGtk [ gmp mpfr ]
+ ));
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 =
- { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
+ passthru = {
+ inherit langC langCC langObjC langObjCpp langFortran langGo version;
+ isGNU = true;
+ };
- inherit enableParallelBuilding enableMultilib;
+ enableParallelBuilding = true;
+ inherit enableMultilib;
inherit (stdenv) is64bit;
meta = {
- homepage = http://gcc.gnu.org/;
+ homepage = https://gcc.gnu.org/;
license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
description = "GNU Compiler Collection, version ${version}"
+ (if stripped then "" else " (with debugging info)");
@@ -430,6 +435,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
+ stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 4dfbcf0f5458..d790246717d9 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -39,8 +39,6 @@ with builtins;
let version = "7.3.0";
- enableParallelBuilding = true;
-
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
@@ -56,7 +54,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 +65,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 +90,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 +113,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 "";
@@ -144,7 +149,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" "pie" ];
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
@@ -187,11 +192,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 ];
@@ -211,17 +219,12 @@ stdenv.mkDerivation ({
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
- ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
- ++ (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 +273,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -292,7 +295,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"
;
@@ -311,7 +319,7 @@ stdenv.mkDerivation ({
then "install-strip"
else "install";
- # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -332,31 +340,34 @@ 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 =
- { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
+ passthru = {
+ inherit langC langCC langObjC langObjCpp langFortran langGo version;
+ isGNU = true;
+ };
- inherit enableParallelBuilding enableMultilib;
+ enableParallelBuilding = true;
+ inherit enableMultilib;
inherit (stdenv) is64bit;
meta = {
- homepage = http://gcc.gnu.org/;
+ homepage = https://gcc.gnu.org/;
license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
description = "GNU Compiler Collection, version ${version}"
+ (if stripped then "" else " (with debugging info)");
@@ -375,6 +386,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
+ stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 04054df8bf82..80d57c9d538c 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -39,8 +39,6 @@ with builtins;
let version = "8.2.0";
- enableParallelBuilding = true;
-
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
@@ -51,7 +49,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 +85,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 +108,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 "";
@@ -139,7 +143,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" "pie" ];
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
@@ -184,9 +188,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 ];
@@ -206,12 +208,9 @@ stdenv.mkDerivation ({
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
- ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
- ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@@ -262,7 +261,7 @@ stdenv.mkDerivation ({
}"
] ++
- (if enableMultilib
+ (if (enableMultilib || targetPlatform.isAvr)
then ["--enable-multilib" "--disable-libquadmath"]
else ["--disable-multilib"]) ++
optional (!enableShared) "--disable-shared" ++
@@ -284,7 +283,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;
@@ -300,7 +304,7 @@ stdenv.mkDerivation ({
then "install-strip"
else "install";
- # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -318,34 +322,30 @@ 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 =
- { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
+ passthru = {
+ inherit langC langCC langObjC langObjCpp langFortran langGo version;
+ isGNU = true;
+ };
- inherit enableParallelBuilding enableMultilib;
+ enableParallelBuilding = true;
+ inherit enableMultilib;
inherit (stdenv) is64bit;
meta = {
- homepage = http://gcc.gnu.org/;
+ homepage = https://gcc.gnu.org/;
license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
description = "GNU Compiler Collection, version ${version}"
+ (if stripped then "" else " (with debugging info)");
@@ -364,6 +364,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
+ stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index a3250f4021a5..75e70006d749 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 000000000000..afd1f7456d32
--- /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 230409e97538..a07f6f1feb2f 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -40,8 +40,6 @@ with builtins;
let version = "7-20170409";
- enableParallelBuilding = true;
-
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
@@ -104,10 +102,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 "";
@@ -134,7 +137,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" "pie" ];
postPatch =
if targetPlatform != hostPlatform || stdenv.cc.libc != null then
@@ -154,9 +157,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 ];
@@ -176,12 +177,9 @@ stdenv.mkDerivation ({
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
- ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
-
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
- ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@@ -271,7 +269,7 @@ stdenv.mkDerivation ({
then "install-strip"
else "install";
- # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+ # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
# Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
@@ -292,31 +290,34 @@ 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 =
- { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
+ passthru = {
+ inherit langC langCC langObjC langObjCpp langFortran langGo version;
+ isGNU = true;
+ };
- inherit enableParallelBuilding enableMultilib;
+ enableParallelBuilding = true;
+ inherit enableMultilib;
inherit (stdenv) is64bit;
meta = {
- homepage = http://gcc.gnu.org/;
+ homepage = https://gcc.gnu.org/;
license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+
description = "GNU Compiler Collection, version ${version}"
+ (if stripped then "" else " (with debugging info)");
@@ -335,6 +336,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
+ stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
broken = true;
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index 71a6eaa8db8d..1e8bdbd4e68f 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
src = fetchgit {
sha256 = "0vpxb6z5g9fjavrgx8gz8fsjvskfz64f63qibh5s00fvvndlwi88";
- url = "http://git.savannah.gnu.org/r/gcl.git";
+ url = "https://git.savannah.gnu.org/r/gcl.git";
rev = "refs/tags/Version_2_6_13pre50";
};
diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index 0ce9fbb00e2e..7ebd3f69cbf4 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -1,20 +1,20 @@
{ stdenv, makeStaticLibraries,
coreutils, rsync, bash,
openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql,
- version, git-version, GAMBIT, SRC }:
+ version, git-version, gambit, src }:
# TODO: distinct packages for gerbil-release and gerbil-devel
# TODO: make static compilation work
stdenv.mkDerivation rec {
name = "gerbil-${version}";
- src = SRC;
+ inherit src;
# Use makeStaticLibraries to enable creation of statically linked binaries
buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
- buildInputs = [ GAMBIT coreutils rsync bash ]
+ buildInputs = [ gambit rsync bash ]
++ buildInputs_libraries ++ buildInputs_staticLibraries;
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
@@ -66,9 +66,9 @@ EOF
export GERBIL_HOME=$out
case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
if [[ \$# = 0 ]] ; then
- exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
+ exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
else
- exec ${GAMBIT}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
+ exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
fi
EOF
runHook postInstall
diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index 6fa9fcc3de88..b3d479483644 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, callPackage, fetchurl, gambit }:
+{ stdenv, callPackage, fetchFromGitHub, gambit }:
-callPackage ./build.nix {
- version = "0.12-RELEASE";
- git-version = "0.12";
- GAMBIT = gambit;
- SRC = fetchurl {
- url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz";
- sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq";
+callPackage ./build.nix rec {
+ version = "0.14";
+ git-version = "0.14";
+ inherit gambit;
+ src = fetchFromGitHub {
+ owner = "vyzo";
+ repo = "gerbil";
+ rev = "v${version}";
+ sha256 = "0n078lkf8m391kr99ipb1v2dpi5vkikz9nj0p7kfjg43868my3v7";
};
inherit stdenv;
}
diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix
index 66ead04b5429..96bd86b26166 100644
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/pkgs/development/compilers/gerbil/unstable.nix
@@ -1,13 +1,14 @@
-{ stdenv, callPackage, fetchgit, gambit-unstable }:
+{ stdenv, callPackage, fetchFromGitHub, gambit-unstable }:
callPackage ./build.nix {
- version = "unstable-2018-08-11";
- git-version = "0.13-DEV-542-g274e1a22";
- GAMBIT = gambit-unstable;
- SRC = fetchgit {
- url = "https://github.com/vyzo/gerbil.git";
- rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686";
- sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s";
+ version = "unstable-2018-11-19";
+ git-version = "0.15-DEV-2-g7d09a4ce";
+ gambit = gambit-unstable;
+ src = fetchFromGitHub {
+ owner = "vyzo";
+ repo = "gerbil";
+ rev = "7d09a4cebe03d755a1791e77279e156a74e07685";
+ sha256 = "1mqi9xcjk59sqbh1fx65a4fa4mqm35py4xqxq6086bcyhkm1nzwa";
};
inherit stdenv;
}
diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix
deleted file mode 100644
index 53693ff50521..000000000000
--- a/pkgs/development/compilers/ghc/7.10.3-binary.nix
+++ /dev/null
@@ -1,163 +0,0 @@
-{ stdenv
-, fetchurl, perl
-, ncurses5, gmp, libiconv
-, gcc, llvm_35
-}:
-
-# Prebuilt only does native
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-let
- libPath = stdenv.lib.makeLibraryPath ([
- ncurses5 gmp
- ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
-
- libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY"
- + "LD_LIBRARY_PATH";
-
-in
-
-stdenv.mkDerivation rec {
- version = "7.10.3";
-
- name = "ghc-${version}-binary";
-
- src = fetchurl ({
- "i686-linux" = {
- url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-i386-deb7-linux.tar.bz2";
- sha256 = "20b32912fb7e57910a3c908f99a9519b57a4872e1ea0f4f2265b2f7b30e8a3cd";
- };
- "x86_64-linux" = {
- url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-deb8-linux.tar.bz2";
- sha256 = "5e163c557e9236cce68be41c984eab0fcdbdc1602e39040ca9ae325e6bdec1c3";
- };
- "armv7l-linux" = {
- url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.bz2";
- sha256 = "2913763eef88e4d1843a1e4c34225afb1866310d1a1956c08a4131f4593518f6";
- };
- "x86_64-darwin" = {
- url = "http://haskell.org/ghc/dist/${version}/ghc-${version}b-x86_64-apple-darwin.tar.bz2";
- sha256 = "4b537228d49b5ea0f8e8dbcc440a5b3c3cb19a92579d607291cc0041422fa5c3";
- };
- }.${stdenv.hostPlatform.system}
- or (throw "cannot bootstrap GHC on this platform"));
-
- nativeBuildInputs = [ perl ];
- buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ];
-
- # Cannot patchelf beforehand due to relative RPATHs that anticipate
- # the final install location/
- ${libEnvVar} = libPath;
-
- postUnpack =
- # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
- # during linking
- stdenv.lib.optionalString stdenv.isDarwin ''
- export NIX_LDFLAGS+=" -no_dtrace_dof"
- # not enough room in the object files for the full path to libiconv :(
- for exe in $(find . -type f -executable); do
- isScript $exe && continue
- ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
- install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
- done
- '' +
-
- # Some scripts used during the build need to have their shebangs patched
- ''
- patchShebangs ghc-${version}/utils/
- patchShebangs ghc-${version}/configure
- '' +
-
- # Strip is harmful, see also below. It's important that this happens
- # first. The GHC Cabal build system makes use of strip by default and
- # has hardcoded paths to /usr/bin/strip in many places. We replace
- # those below, making them point to our dummy script.
- ''
- mkdir "$TMP/bin"
- for i in strip; do
- echo '#! ${stdenv.shell}' > "$TMP/bin/$i"
- chmod +x "$TMP/bin/$i"
- done
- PATH="$TMP/bin:$PATH"
- '' +
- # We have to patch the GMP paths for the integer-gmp package.
- ''
- find . -name integer-gmp.buildinfo \
- -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- find . -name base.buildinfo \
- -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
- '' +
- # Rename needed libraries and binaries, fix interpreter
- stdenv.lib.optionalString stdenv.isLinux ''
- find . -type f -perm -0100 -exec patchelf \
- --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \
- --replace-needed libtinfo.so libtinfo.so.5 \
- --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \;
-
- paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
-
- sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
- sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
- '';
-
- configurePlatforms = [ ];
- configureFlags = [
- "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib"
- "--with-gmp-includes=${stdenv.lib.getDev gmp}/include"
- ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}";
-
- # Stripping combined with patchelf breaks the executables (they die
- # with a segfault or the kernel even refuses the execve). (NIXPKGS-85)
- dontStrip = true;
-
- # No building is necessary, but calling make without flags ironically
- # calls install-strip ...
- dontBuild = true;
-
- # On Linux, use patchelf to modify the executables so that they can
- # find editline/gmp.
- preFixup = stdenv.lib.optionalString stdenv.isLinux ''
- for p in $(find "$out" -type f -executable); do
- if isELF "$p"; then
- echo "Patchelfing $p"
- patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
- fi
- done
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- # not enough room in the object files for the full path to libiconv :(
- for exe in $(find "$out" -type f -executable); do
- isScript $exe && continue
- ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
- install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/5/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
- done
-
- for file in $(find "$out" -name setup-config); do
- substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
- done
- '';
-
- doInstallCheck = true;
- installCheckPhase = ''
- unset ${libEnvVar}
- # Sanity check, can ghc create executables?
- cd $TMP
- mkdir test-ghc; cd test-ghc
- cat > main.hs << EOF
- {-# LANGUAGE TemplateHaskell #-}
- module Main where
- main = putStrLn \$([|"yes"|])
- EOF
- $out/bin/ghc --make main.hs || exit 1
- echo compilation ok
- [ $(./main) == "yes" ]
- '';
-
- passthru = {
- targetPrefix = "";
- enableShared = true;
- };
-
- meta.license = stdenv.lib.licenses.bsd3;
- meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux"];
-}
diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix
similarity index 91%
rename from pkgs/development/compilers/ghc/8.2.1-binary.nix
rename to pkgs/development/compilers/ghc/8.2.2-binary.nix
index bfb9c4cd6164..039eea744f36 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix
@@ -24,30 +24,30 @@ let
in
stdenv.mkDerivation rec {
- version = "8.2.1";
+ version = "8.2.2";
name = "ghc-${version}-binary";
src = fetchurl ({
"i686-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
- sha256 = "d86f9c157dd4161a8acb14062c131c8985a4f65fc856603c373502be1d50c95e";
+ sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy";
};
"x86_64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
- sha256 = "543b81bf610240bd0398111d6c6607a9094dc2d159b564057d46c8a3d1aaa130";
+ sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8";
};
"armv7l-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz";
- sha256 = "0f0e5e1d4fad3fa1a87ca1fe0d19242f4a94d158b7b8a08f99efefd98b51b019";
+ sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46";
};
"aarch64-linux" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz";
- sha256 = "61dab9c95ef9f9af8bce7338863fda3e42945eb46194b12d922b6d0dc245d0c2";
+ sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7";
};
"x86_64-darwin" = {
url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
- sha256 = "900c802025fb630060dbd30f9738e5d107a4ca5a50d5c1262cd3e69fe4467188";
+ sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr";
};
}.${stdenv.hostPlatform.system}
or (throw "cannot bootstrap GHC on this platform"));
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
# Some scripts used during the build need to have their shebangs patched
''
patchShebangs ghc-${version}/utils/
+ patchShebangs ghc-${version}/configure
'' +
# Strip is harmful, see also below. It's important that this happens
@@ -169,6 +170,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 124e0e1fe1f9..3ecea2b54edb 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
@@ -217,7 +217,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = libDeps hostPlatform;
+ buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -232,7 +232,7 @@ stdenv.mkDerivation (rec {
checkTarget = "test";
doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop."
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.4.nix
similarity index 90%
rename from pkgs/development/compilers/ghc/8.4.3.nix
rename to pkgs/development/compilers/ghc/8.4.4.nix
index 7028a78eb21d..1ea18149d1ef 100644
--- a/pkgs/development/compilers/ghc/8.4.3.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -2,7 +2,7 @@
# build-tools
, bootPkgs
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, 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
@@ -82,12 +82,12 @@ let
in
stdenv.mkDerivation (rec {
- version = "8.4.3";
+ version = "8.4.4";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
+ sha256 = "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i";
};
enableParallelBuilding = true;
@@ -99,13 +99,21 @@ 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}";
name = "D4388.diff";
sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
})
- ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
+ ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch
+ ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch {
+ url = "https://git.haskell.org/ghc.git/patch/d8495549ba9d194815c2d0eaee6797fc7c00756a";
+ sha256 = "1czx12qcl088vjn7mqxvyja4b2ia2n09c28br8c777fd0xk069pm";
+ });
postPatch = "patchShebangs .";
@@ -179,14 +187,14 @@ stdenv.mkDerivation (rec {
strictDeps = true;
nativeBuildInputs = [
- perl autoconf automake m4 python3
+ perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = libDeps hostPlatform;
+ buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -200,7 +208,7 @@ stdenv.mkDerivation (rec {
checkTarget = "test";
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
@@ -226,7 +234,7 @@ stdenv.mkDerivation (rec {
inherit enableShared;
# Our Cabal compiler name
- haskellCompilerName = "ghc-8.4.3";
+ haskellCompilerName = "ghc-8.4.4";
};
meta = {
diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix
index 3722b16f6573..434570fe9889 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, sphinx
, 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.
@@ -162,14 +168,14 @@ stdenv.mkDerivation (rec {
strictDeps = true;
nativeBuildInputs = [
- perl autoconf automake m4 python3
+ perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = libDeps hostPlatform;
+ buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -183,7 +189,7 @@ stdenv.mkDerivation (rec {
checkTarget = "test";
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
@@ -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/8.0.2.nix b/pkgs/development/compilers/ghc/8.6.2.nix
similarity index 66%
rename from pkgs/development/compilers/ghc/8.0.2.nix
rename to pkgs/development/compilers/ghc/8.6.2.nix
index 0946db713783..85853e158327 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.6.2.nix
@@ -2,11 +2,11 @@
# build-tools
, bootPkgs
-, coreutils, fetchpatch, fetchurl, perl, sphinx
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, libiconv ? null, ncurses
-, useLLVM ? !stdenv.targetPlatform.isx86
+, 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.
@@ -14,14 +14,17 @@
, # 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
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
- enableShared ? true
+ 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.
@@ -48,17 +51,22 @@ let
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 = YES
+ 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: [ ncurses ]
+ libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
toolsForTarget =
if hostPlatform == buildPlatform then
@@ -69,30 +77,24 @@ let
targetCC = builtins.head toolsForTarget;
in
-stdenv.mkDerivation rec {
- version = "8.0.2";
+stdenv.mkDerivation (rec {
+ version = "8.6.2";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi";
+ sha256 = "1mbn3n2ynmpfpb7jfnhpzzli31qqxqyi8ws71blws3i846fq3ana";
};
enableParallelBuilding = true;
- outputs = [ "out" "man" "doc" ];
+ outputs = [ "out" "doc" ];
- patches = [
- ./ghc-gold-linker.patch
- (fetchpatch { # Unreleased 1.24.x commit
- url = "https://github.com/haskell/cabal/commit/6394cb0b6eba91a8692a3d04b2b56935aed7cccd.patch";
- sha256 = "14xxjg0nb1j1pw0riac3v385ka92qhxxblfmwyvbghz7kry6axy0";
- stripLen = 1;
- extraPrefix = "libraries/Cabal/";
- })
- ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
- ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch
- ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
+ patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123
+ url = "http://tarballs.nixos.org/sha256/${sha256}";
+ name = "D5123.diff";
+ sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
+ })];
postPatch = "patchShebangs .";
@@ -105,7 +107,8 @@ stdenv.mkDerivation rec {
# the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld"
+ # 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"
@@ -119,6 +122,24 @@ stdenv.mkDerivation rec {
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.
@@ -128,12 +149,16 @@ stdenv.mkDerivation rec {
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
+ ] ++ 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") [
+ ] ++ 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"
@@ -143,14 +168,14 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [
- perl sphinx
- ghc bootPkgs.hscolour
+ perl autoconf automake m4 python3 sphinx
+ ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = libDeps hostPlatform;
+ buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -162,7 +187,9 @@ stdenv.mkDerivation rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
- hardeningDisable = [ "format" ];
+ checkTarget = "test";
+
+ hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
@@ -188,7 +215,7 @@ stdenv.mkDerivation rec {
inherit enableShared;
# Our Cabal compiler name
- haskellCompilerName = "ghc-8.0.2";
+ haskellCompilerName = "ghc-8.6.2";
};
meta = {
@@ -198,4 +225,8 @@ stdenv.mkDerivation rec {
inherit (ghc.meta) license platforms;
};
-}
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+ dontStrip = true;
+ dontPatchELF = true;
+ noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/8.6.3.nix
similarity index 62%
rename from pkgs/development/compilers/ghc/7.10.3.nix
rename to pkgs/development/compilers/ghc/8.6.3.nix
index a4374a452402..b29b7facd1f4 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/8.6.3.nix
@@ -2,12 +2,11 @@
# build-tools
, bootPkgs
-, coreutils, fetchurl, perl
-, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, libiconv ? null, ncurses
-, useLLVM ? !stdenv.targetPlatform.isx86
+, 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.
@@ -15,20 +14,25 @@
, # 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
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
- enableShared ? true
+ 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"
}:
+assert !enableIntegerSimple -> gmp != null;
+
let
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -39,31 +43,30 @@ let
(targetPlatform != hostPlatform)
"${targetPlatform.config}-";
- docFixes = fetchurl {
- url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch";
- sha256 = "1j45z4kcd3w1rzm4hapap2xc16bbh942qnzzdbdjcwqznsccznf0";
- };
-
buildMK = ''
BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk
endif
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
- '' + stdenv.lib.optionalString enableIntegerSimple ''
- INTEGER_LIBRARY = integer-simple
+ INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
'' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
- Stage1Only = YES
+ 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: [ ncurses ]
+ libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
toolsForTarget =
if hostPlatform == buildPlatform then
@@ -74,23 +77,24 @@ let
targetCC = builtins.head toolsForTarget;
in
-stdenv.mkDerivation rec {
- version = "7.10.3";
+stdenv.mkDerivation (rec {
+ version = "8.6.3";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
- sha256 = "1vsgmic8csczl62ciz51iv8nhrkm72lyhbz7p7id13y2w7fcx46g";
+ sha256 = "08vzq0dpg4a39bs61j6rq4z0n7jby5mc69h4m25xhd8rjyvkg7lz";
};
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
- patches = [
- docFixes
- ./relocation.patch
- ];
+ patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123
+ url = "http://tarballs.nixos.org/sha256/${sha256}";
+ name = "D5123.diff";
+ sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n";
+ })];
postPatch = "patchShebangs .";
@@ -103,7 +107,8 @@ stdenv.mkDerivation rec {
# the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld"
+ # 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"
@@ -117,6 +122,24 @@ stdenv.mkDerivation rec {
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.
@@ -126,12 +149,16 @@ stdenv.mkDerivation rec {
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=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
- ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
+ ] ++ 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"
@@ -141,14 +168,14 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [
- perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
- ghc bootPkgs.hscolour
+ perl autoconf automake m4 python3 sphinx
+ ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = libDeps hostPlatform;
+ buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -160,9 +187,16 @@ stdenv.mkDerivation rec {
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
- hardeningDisable = [ "format" ];
+ checkTarget = "test";
+
+ hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
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
@@ -181,7 +215,7 @@ stdenv.mkDerivation rec {
inherit enableShared;
# Our Cabal compiler name
- haskellCompilerName = "ghc-7.10.3";
+ haskellCompilerName = "ghc-8.6.3";
};
meta = {
@@ -191,4 +225,8 @@ stdenv.mkDerivation rec {
inherit (ghc.meta) license platforms;
};
-}
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+ dontStrip = true;
+ dontPatchELF = true;
+ noAuditTmpdir = true;
+})
diff --git a/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch b/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch
deleted file mode 100644
index 90224df19f61..000000000000
--- a/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- b/includes/rts/storage/ClosureMacros.h 2017-05-21 12:54:09.000000000 +0200
-+++ a/includes/rts/storage/ClosureMacros.h 2017-05-21 12:55:57.000000000 +0200
-@@ -499,8 +499,17 @@
-
- -------------------------------------------------------------------------- */
-
--#define ZERO_SLOP_FOR_LDV_PROF (defined(PROFILING))
--#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS))
-+#if defined(PROFILING)
-+#define ZERO_SLOP_FOR_LDV_PROF 1
-+#else
-+#define ZERO_SLOP_FOR_LDV_PROF 0
-+#endif
-+
-+#if defined(DEBUG) && !defined(THREADED_RTS)
-+#define ZERO_SLOP_FOR_SANITY_CHECK 1
-+#else
-+#define ZERO_SLOP_FOR_SANITY_CHECK 0
-+#endif
-
- #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK
- #define OVERWRITING_CLOSURE(c) overwritingClosure(c)
-
diff --git a/pkgs/development/compilers/ghc/ghc-gold-linker.patch b/pkgs/development/compilers/ghc/ghc-gold-linker.patch
deleted file mode 100644
index edce7ef3a178..000000000000
--- a/pkgs/development/compilers/ghc/ghc-gold-linker.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 46fe80ab7c0013a929d0934e61429820042a70a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?=
-Date: Fri, 21 Jul 2017 20:09:11 +0200
-Subject: [PATCH 1/2] base: Add `extra-libraries: m` because base uses libm
- functions.
-
-Linking with gold needs this because in contrast to ld, gold
-doesn't implicitly link libm.
-
-Found by Michael Bishop .
----
- libraries/base/base.cabal | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
-index f00fb8768e5..fd91f268ffe 100644
---- a/libraries/base/base.cabal
-+++ b/libraries/base/base.cabal
-@@ -342,6 +342,10 @@ Library
- WCsubst.h
- consUtils.h
-
-+ -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
-+ -- Other linkers, like gold, don't, so we have to declare it explicitly.
-+ extra-libraries: m
-+
- -- OS Specific
- if os(windows)
- -- Windows requires some extra libraries for linking because the RTS
-
-From 900a8f4931e9bc6d3219d9263cfecfc6af8fc766 Mon Sep 17 00:00:00 2001
-From: michael bishop
-Date: Sat, 22 Jul 2017 13:12:39 -0300
-Subject: [PATCH 2/2] also add -lm to ghc-prim
-
----
- libraries/ghc-prim/ghc-prim.cabal | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libraries/ghc-prim/ghc-prim.cabal b/libraries/ghc-prim/ghc-prim.cabal
-index 00a029efedf..6db85dd69fc 100644
---- a/libraries/ghc-prim/ghc-prim.cabal
-+++ b/libraries/ghc-prim/ghc-prim.cabal
-@@ -42,6 +42,10 @@ Library
- UnliftedFFITypes
-
- build-depends: rts == 1.0.*
-+
-+ -- Base uses libm functions. ld.bfd links libm implicitly when necessary.
-+ -- Other linkers, like gold, don't, so we have to declare it explicitly.
-+ extra-libraries: m
-
- exposed-modules:
- GHC.CString
diff --git a/pkgs/development/compilers/ghc/ghc-no-madv-free.patch b/pkgs/development/compilers/ghc/ghc-no-madv-free.patch
deleted file mode 100644
index 8fea9f920126..000000000000
--- a/pkgs/development/compilers/ghc/ghc-no-madv-free.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
-index 99620ee..e052a84 100644
---- a/rts/posix/OSMem.c
-+++ b/rts/posix/OSMem.c
-@@ -523,13 +523,7 @@ void osDecommitMemory(void *at, W_ size)
- sysErrorBelch("unable to make released memory unaccessible");
- #endif
-
--#ifdef MADV_FREE
-- // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED
-- // just swaps memory out
-- r = madvise(at, size, MADV_FREE);
--#else
- r = madvise(at, size, MADV_DONTNEED);
--#endif
- if(r < 0)
- sysErrorBelch("unable to decommit memory");
- }
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 1339edf0afd0..29de668767b8 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -2,7 +2,7 @@
# build-tools
, bootPkgs
-, autoconf, automake, coreutils, fetchgit, perl, python3, m4
+, autoconf, automake, coreutils, fetchgit, perl, python3, m4, sphinx
, 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
@@ -157,7 +157,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
- buildInputs = libDeps hostPlatform;
+ buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;
@@ -171,7 +171,7 @@ stdenv.mkDerivation (rec {
checkTarget = "test";
- hardeningDisable = [ "format" ];
+ hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
postInstall = ''
for bin in "$out"/lib/${name}/bin/*; do
diff --git a/pkgs/development/compilers/ghc/relocation.patch b/pkgs/development/compilers/ghc/relocation.patch
deleted file mode 100644
index b9becfc86b54..000000000000
--- a/pkgs/development/compilers/ghc/relocation.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Adding support for the R_X86_64_REX_GOTPCRELX relocation type.
-This relocation is treated by the linker the same as the R_X86_64_GOTPCRELX type
-G + GOT + A - P to generate relative offsets to the GOT.
-The REX prefix has no influence in this stage.
-
-This caused breakage when enabling relro/bindnow hardening e.g. in ghcPaclages.vector
-
-Source: https://phabricator.haskell.org/D2303#67070
-diff --git a/rts/Linker.c b/rts/Linker.c
---- a/rts/Linker.c
-+++ b/rts/Linker.c
-@@ -5681,7 +5681,13 @@
- *(Elf64_Sword *)P = (Elf64_Sword)value;
- #endif
- break;
--
-+/* These two relocations were introduced in glibc 2.23 and binutils 2.26.
-+ But in order to use them the system which compiles the bindist for GHC needs
-+ to have glibc >= 2.23. So only use them if they're defined. */
-+#if defined(R_X86_64_REX_GOTPCRELX) && defined(R_X86_64_GOTPCRELX)
-+ case R_X86_64_REX_GOTPCRELX:
-+ case R_X86_64_GOTPCRELX:
-+#endif
- case R_X86_64_GOTPCREL:
- {
- StgInt64 gotAddress = (StgInt64) &makeSymbolExtra(oc, ELF_R_SYM(info), S)->addr;
-
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
index b27c75bfe713..cfa6cf1d7d26 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
@@ -1,6 +1,6 @@
{
"url": "https://github.com/ghcjs/ghcjs",
- "rev": "d20da90a4819faad1c6309a06363b34edac0374c",
- "sha256": "0jmxgfm1zwg6xscjcaycfam7zss8ik4ql4ii5lpryh4h6cdhvkbr",
+ "rev": "81bf5f31dabaa711aab234cb119eb9c998ccb129",
+ "sha256": "1bgnc71kjqicqv2xq8p70nck600yi2p7g4k9r1jclv21ib7i5hmx",
"fetchSubmodules": true
}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
index 051b0a19b5b5..bf4fd6d68a7e 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
@@ -156,6 +156,7 @@
tree-diff
];
testToolDepends = [ hspec-discover ];
+ doHaddock = false;
homepage = "http://www.haskell.org/haddock/";
description = "Library exposing some functionality of Haddock";
license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/compilers/ghcjs/7.10/boot.patch b/pkgs/development/compilers/ghcjs/7.10/boot.patch
deleted file mode 100644
index 9f4fa3a8b7ae..000000000000
--- a/pkgs/development/compilers/ghcjs/7.10/boot.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
-index db8b12e..7b815c5 100644
---- a/src-bin/Boot.hs
-+++ b/src-bin/Boot.hs
-@@ -540,9 +540,7 @@ initPackageDB :: B ()
- initPackageDB = do
- msg info "creating package databases"
- initDB "--global" <^> beLocations . blGlobalDB
-- traverseOf_ _Just initUser <^> beLocations . blUserDBDir
- where
-- initUser dir = rm_f (dir > "package.conf") >> initDB "--user" (dir > "package.conf.d")
- initDB dbName db = do
- rm_rf db >> mkdir_p db
- ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
-@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do
- msgD info $ "preparing development boot tree"
- checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
- testGit "ghcjs-boot" >>= \case
-- Just False -> failWith "ghcjs-boot already exists and is not a git repository"
-- Just True -> do
-- msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning"
-- rm_rf "ghcjs-boot"
-+ Just _ -> do
-+ msg info "ghcjs-boot repository already exists; initializing ghcjs-boot"
- initGhcjsBoot
- Nothing -> do
- msgD info "cloning ghcjs-boot git repository"
- initGhcjsBoot
- checkpoint' "shims-git" "shims repository already cloned" $ do
- testGit "shims" >>= \case
-- Just False -> failWith "shims already exists and is not a git repository"
-- Just True -> do
-- msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning"
-- rm_rf "shims"
-- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
-+ Just _ -> do
-+ msgD info "shims repository already exists; moving on"
- Nothing -> do
- msgD info "cloning shims git repository"
- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
- where
- initGhcjsBoot = sub $ do
-- cloneGit bootDescr "ghcjs-boot" bsrcBootDevBranch bsrcBootDev
- cd "ghcjs-boot"
-- git_ ["submodule", "update", "--init", "--recursive"]
- mapM_ patchPackage =<< allPackages
- preparePrimops
- buildGenPrim
-@@ -1141,7 +1132,7 @@ cabalStage1 pkgs = sub $ do
- globalFlags <- cabalGlobalFlags
- flags <- cabalInstallFlags (length pkgs == 1)
- let args = globalFlags ++ ("install" : pkgs) ++
-- [ "--solver=topdown" -- the modular solver refuses to install stage1 packages
-+ [ "--allow-boot-library-installs"
- ] ++ map ("--configure-option="<>) configureOpts ++ flags
- checkInstallPlan pkgs args
- cabal_ args
-@@ -1162,7 +1153,7 @@ cabalInstall pkgs = do
- -- uses somewhat fragile parsing of --dry-run output, find a better way
- checkInstallPlan :: [Package] -> [Text] -> B ()
- checkInstallPlan pkgs opts = do
-- plan <- cabal (opts ++ ["-v2", "--dry-run"])
-+ plan <- cabal (opts ++ ["-vverbose+nowrap", "--dry-run"])
- when (hasReinstalls plan || hasUnexpectedInstalls plan || hasNewVersion plan) (err plan)
- where
- hasReinstalls = T.isInfixOf "(reinstall)" -- reject reinstalls
-@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
- , "--avoid-reinstalls"
- , "--builddir", "dist"
- , "--with-compiler", ghcjs ^. pgmLocText
-+ , "--with-gcc", "@CC@"
- , "--with-hc-pkg", ghcjsPkg ^. pgmLocText
-- , "--prefix", toTextI instDir
-+ , "--prefix", "@PREFIX@"
-+ , "--libdir", "$prefix/lib/$compiler"
-+ , "--libsubdir", "$pkgid"
- , bool haddock "--enable-documentation" "--disable-documentation"
- , "--haddock-html"
---- workaround for hoogle support being broken in haddock for GHC 7.10RC1
--#if !(__GLASGOW_HASKELL__ >= 709)
- , "--haddock-hoogle"
--#endif
- , "--haddock-hyperlink-source"
- -- don't slow down Windows builds too much, on other platforms we get this more
- -- or less for free, thanks to dynamic-too
-diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..e2405a7 100644
---- a/src/Compiler/Info.hs
-+++ b/src/Compiler/Info.hs
-@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
-
- -- | the directory to use if started without -B flag
- getDefaultTopDir :: IO FilePath
--getDefaultTopDir = do
-- appdir <- getAppUserDataDirectory "ghcjs"
-- return (appdir > subdir > "ghcjs")
-- where
-- targetARCH = arch
-- targetOS = os
-- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
-+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
-
- getDefaultLibDir :: IO FilePath
- getDefaultLibDir = getDefaultTopDir
diff --git a/pkgs/development/compilers/ghcjs/7.10/default.nix b/pkgs/development/compilers/ghcjs/7.10/default.nix
deleted file mode 100644
index f18a094aa3cf..000000000000
--- a/pkgs/development/compilers/ghcjs/7.10/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:
-
-bootPkgs.callPackage ../base.nix {
- version = "0.2.0";
-
- inherit bootPkgs cabal-install;
-
- ghcjsSrc = fetchFromGitHub {
- owner = "ghcjs";
- repo = "ghcjs";
- rev = "689c7753f50353dd05606ed79c51cd5a94d3922a";
- sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4";
- };
- ghcjsBootSrc = fetchgit {
- url = git://github.com/ghcjs/ghcjs-boot.git;
- rev = "8c549931da27ba9e607f77195208ec156c840c8a";
- sha256 = "0yg9bnabja39qysh9pg1335qbvbc0r2mdw6cky94p7kavacndfdv";
- fetchSubmodules = true;
- };
-
- shims = import ./shims.nix { inherit fetchFromGitHub; };
- stage1Packages = [
- "array"
- "base"
- "binary"
- "bytestring"
- "containers"
- "deepseq"
- "directory"
- "filepath"
- "ghc-boot"
- "ghc-boot-th"
- "ghc-prim"
- "ghci"
- "ghcjs-prim"
- "ghcjs-th"
- "integer-gmp"
- "pretty"
- "primitive"
- "process"
- "rts"
- "template-haskell"
- "time"
- "transformers"
- "unix"
- ];
- stage2 = import ./stage2.nix;
-
- patches = [ ./boot.patch ];
-}
diff --git a/pkgs/development/compilers/ghcjs/7.10/shims.nix b/pkgs/development/compilers/ghcjs/7.10/shims.nix
deleted file mode 100644
index fa706699449a..000000000000
--- a/pkgs/development/compilers/ghcjs/7.10/shims.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ fetchFromGitHub }:
-fetchFromGitHub {
- owner = "ghcjs";
- repo = "shims";
- rev = "b97015229c58eeab7c1d0bb575794b14a9f6efca";
- sha256 = "1p5adkqvmb1gsv9hnn3if0rdpnaq3v9a1zkfdy282yw05jaaaggz";
-}
diff --git a/pkgs/development/compilers/ghcjs/7.10/stage2.nix b/pkgs/development/compilers/ghcjs/7.10/stage2.nix
deleted file mode 100644
index 3483afc99ef0..000000000000
--- a/pkgs/development/compilers/ghcjs/7.10/stage2.nix
+++ /dev/null
@@ -1,344 +0,0 @@
-{ ghcjsBoot }: { callPackage }:
-
-{
- async = callPackage
- ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
- , test-framework-hunit
- }:
- mkDerivation {
- pname = "async";
- version = "2.0.1.6";
- src = "${ghcjsBoot}/boot/async";
- doCheck = false;
- libraryHaskellDepends = [ base stm ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit
- ];
- jailbreak = true;
- homepage = https://github.com/simonmar/async;
- description = "Run IO operations asynchronously and wait for their results";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- aeson = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
- , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
- , stdenv, syb, template-haskell, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, time
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "aeson";
- version = "0.9.0.1";
- src = "${ghcjsBoot}/boot/aeson";
- doCheck = false;
- libraryHaskellDepends = [
- attoparsec base bytestring containers deepseq dlist ghc-prim
- hashable mtl scientific syb template-haskell text time transformers
- unordered-containers vector
- ];
- testHaskellDepends = [
- attoparsec base bytestring containers ghc-prim HUnit QuickCheck
- template-haskell test-framework test-framework-hunit
- test-framework-quickcheck2 text time unordered-containers vector
- ];
- jailbreak = true;
- homepage = https://github.com/bos/aeson;
- description = "Fast JSON parsing and encoding";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- attoparsec = callPackage
- ({ mkDerivation, array, base, bytestring, containers, deepseq
- , QuickCheck, quickcheck-unicode, scientific, stdenv
- , test-framework, test-framework-quickcheck2, text, transformers
- , vector
- }:
- mkDerivation {
- pname = "attoparsec";
- version = "0.13.0.1";
- src = "${ghcjsBoot}/boot/attoparsec";
- doCheck = false;
- libraryHaskellDepends = [
- array base bytestring containers deepseq scientific text
- transformers
- ];
- testHaskellDepends = [
- array base bytestring containers deepseq QuickCheck
- quickcheck-unicode scientific test-framework
- test-framework-quickcheck2 text transformers vector
- ];
- jailbreak = true;
- homepage = https://github.com/bos/attoparsec;
- description = "Fast combinator parsing for bytestrings and text";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- case-insensitive = callPackage
- ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv
- , test-framework, test-framework-hunit, text
- }:
- mkDerivation {
- pname = "case-insensitive";
- version = "1.2.0.4";
- src = "${ghcjsBoot}/boot/case-insensitive";
- doCheck = false;
- libraryHaskellDepends = [ base bytestring deepseq hashable text ];
- testHaskellDepends = [
- base bytestring HUnit test-framework test-framework-hunit text
- ];
- jailbreak = true;
- homepage = https://github.com/basvandijk/case-insensitive;
- description = "Case insensitive string comparison";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- dlist = callPackage
- ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
- mkDerivation {
- pname = "dlist";
- version = "0.7.1.1";
- src = "${ghcjsBoot}/boot/dlist";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq ];
- testHaskellDepends = [ base Cabal QuickCheck ];
- jailbreak = true;
- homepage = https://github.com/spl/dlist;
- description = "Difference lists";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- extensible-exceptions = callPackage
- ({ mkDerivation, base, stdenv }:
- mkDerivation {
- pname = "extensible-exceptions";
- version = "0.1.1.4";
- src = "${ghcjsBoot}/boot/extensible-exceptions";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- jailbreak = true;
- description = "Extensible exceptions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- hashable = callPackage
- ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
- , QuickCheck, random, stdenv, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, unix
- }:
- mkDerivation {
- pname = "hashable";
- version = "1.2.3.2";
- src = "${ghcjsBoot}/boot/hashable";
- doCheck = false;
- libraryHaskellDepends = [
- base bytestring ghc-prim integer-gmp text
- ];
- testHaskellDepends = [
- base bytestring ghc-prim HUnit QuickCheck random test-framework
- test-framework-hunit test-framework-quickcheck2 text unix
- ];
- jailbreak = true;
- homepage = https://github.com/tibbe/hashable;
- description = "A class for types that can be converted to a hash value";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- mtl = callPackage
- ({ mkDerivation, base, stdenv, transformers }:
- mkDerivation {
- pname = "mtl";
- version = "2.2.1";
- src = "${ghcjsBoot}/boot/mtl";
- doCheck = false;
- libraryHaskellDepends = [ base transformers ];
- jailbreak = true;
- homepage = https://github.com/ekmett/mtl;
- description = "Monad classes, using functional dependencies";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- old-time = callPackage
- ({ mkDerivation, base, old-locale, stdenv }:
- mkDerivation {
- pname = "old-time";
- version = "1.1.0.3";
- src = "${ghcjsBoot}/boot/old-time";
- doCheck = false;
- libraryHaskellDepends = [ base old-locale ];
- jailbreak = true;
- description = "Time library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- parallel = callPackage
- ({ mkDerivation, array, base, containers, deepseq, stdenv }:
- mkDerivation {
- pname = "parallel";
- version = "3.2.0.6";
- src = "${ghcjsBoot}/boot/parallel";
- doCheck = false;
- libraryHaskellDepends = [ array base containers deepseq ];
- jailbreak = true;
- description = "Parallel programming library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- scientific = callPackage
- ({ mkDerivation, array, base, bytestring, deepseq, ghc-prim
- , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty
- , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
- , text
- }:
- mkDerivation {
- pname = "scientific";
- version = "0.3.3.8";
- src = "${ghcjsBoot}/boot/scientific";
- doCheck = false;
- libraryHaskellDepends = [
- array base bytestring deepseq ghc-prim hashable integer-gmp text
- ];
- testHaskellDepends = [
- base bytestring QuickCheck smallcheck tasty tasty-ant-xml
- tasty-hunit tasty-quickcheck tasty-smallcheck text
- ];
- jailbreak = true;
- homepage = https://github.com/basvandijk/scientific;
- description = "Numbers represented using scientific notation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- stm = callPackage
- ({ mkDerivation, array, base, stdenv }:
- mkDerivation {
- pname = "stm";
- version = "2.4.4";
- src = "${ghcjsBoot}/boot/stm";
- doCheck = false;
- libraryHaskellDepends = [ array base ];
- jailbreak = true;
- description = "Software Transactional Memory";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- syb = callPackage
- ({ mkDerivation, base, containers, HUnit, mtl, stdenv }:
- mkDerivation {
- pname = "syb";
- version = "0.5.1";
- src = "${ghcjsBoot}/boot/syb";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base containers HUnit mtl ];
- jailbreak = true;
- homepage = http://www.cs.uu.nl/wiki/GenericProgramming/SYB;
- description = "Scrap Your Boilerplate";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- text = callPackage
- ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
- , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
- , random, stdenv, test-framework, test-framework-hunit
- , test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "text";
- version = "1.2.1.1";
- src = "${ghcjsBoot}/boot/text";
- doCheck = false;
- libraryHaskellDepends = [
- array base binary bytestring deepseq ghc-prim integer-gmp
- ];
- testHaskellDepends = [
- array base binary bytestring deepseq directory ghc-prim HUnit
- integer-gmp QuickCheck quickcheck-unicode random test-framework
- test-framework-hunit test-framework-quickcheck2
- ];
- jailbreak = true;
- homepage = https://github.com/bos/text;
- description = "An efficient packed Unicode text type";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- unordered-containers = callPackage
- ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable
- , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit
- , test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "unordered-containers";
- version = "0.2.5.1";
- src = "${ghcjsBoot}/boot/unordered-containers";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq hashable ];
- testHaskellDepends = [
- base ChasingBottoms containers hashable HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
- ];
- jailbreak = true;
- homepage = https://github.com/tibbe/unordered-containers;
- description = "Efficient hashing-based container types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- vector = callPackage
- ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
- , random, stdenv, template-haskell, test-framework
- , test-framework-quickcheck2, transformers
- }:
- mkDerivation {
- pname = "vector";
- version = "0.11.0.0";
- src = "${ghcjsBoot}/boot/vector";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
- testHaskellDepends = [
- base QuickCheck random template-haskell test-framework
- test-framework-quickcheck2 transformers
- ];
- jailbreak = true;
- homepage = https://github.com/haskell/vector;
- description = "Efficient Arrays";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- ghcjs-base = callPackage
- ({ mkDerivation, aeson, array, attoparsec, base, bytestring
- , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
- , hashable, HUnit, integer-gmp, primitive, QuickCheck
- , quickcheck-unicode, random, scientific, stdenv, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, time
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "ghcjs-base";
- version = "0.2.0.0";
- src = "${ghcjsBoot}/ghcjs/ghcjs-base";
- doCheck = false;
- libraryHaskellDepends = [
- aeson attoparsec base bytestring containers deepseq dlist ghc-prim
- ghcjs-prim hashable integer-gmp primitive scientific text time
- transformers unordered-containers vector
- ];
- testHaskellDepends = [
- array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
- primitive QuickCheck quickcheck-unicode random test-framework
- test-framework-hunit test-framework-quickcheck2 text
- ];
- jailbreak = true;
- homepage = https://github.com/ghcjs/ghcjs-base;
- description = "Base library for GHCJS";
- license = stdenv.lib.licenses.mit;
- }) {};
- Cabal = callPackage
- ({ mkDerivation, array, base, binary, bytestring, containers
- , deepseq, directory, extensible-exceptions, filepath, HUnit
- , old-time, pretty, process, QuickCheck, regex-posix, stdenv
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , time, unix
- }:
- mkDerivation {
- pname = "Cabal";
- version = "1.22.8.0";
- src = "${ghcjsBoot}/boot/cabal/Cabal";
- doCheck = false;
- libraryHaskellDepends = [
- array base binary bytestring containers deepseq directory filepath
- pretty process time unix
- ];
- testHaskellDepends = [
- base bytestring containers directory extensible-exceptions filepath
- HUnit old-time process QuickCheck regex-posix test-framework
- test-framework-hunit test-framework-quickcheck2 unix
- ];
- jailbreak = true;
- homepage = http://www.haskell.org/cabal/;
- description = "A framework for packaging Haskell software";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-}
diff --git a/pkgs/development/compilers/ghcjs/8.0/boot.patch b/pkgs/development/compilers/ghcjs/8.0/boot.patch
deleted file mode 100644
index bbb5b30468cb..000000000000
--- a/pkgs/development/compilers/ghcjs/8.0/boot.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
-index db8b12e..7b815c5 100644
---- a/src-bin/Boot.hs
-+++ b/src-bin/Boot.hs
-@@ -540,9 +540,7 @@ initPackageDB :: B ()
- initPackageDB = do
- msg info "creating package databases"
- initDB "--global" <^> beLocations . blGlobalDB
-- traverseOf_ _Just initUser <^> beLocations . blUserDBDir
- where
-- initUser dir = rm_f (dir > "package.conf") >> initDB "--user" (dir > "package.conf.d")
- initDB dbName db = do
- rm_rf db >> mkdir_p db
- ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
-@@ -566,29 +564,22 @@ installDevelopmentTree = subTop $ do
- msgD info $ "preparing development boot tree"
- checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
- testGit "ghcjs-boot" >>= \case
-- Just False -> failWith "ghcjs-boot already exists and is not a git repository"
-- Just True -> do
-- msg info "ghcjs-boot repository already exists but checkpoint not reached, cleaning first, then cloning"
-- rm_rf "ghcjs-boot"
-+ Just _ -> do
-+ msg info "ghcjs-boot repository already exists; initializing ghcjs-boot"
- initGhcjsBoot
- Nothing -> do
- msgD info "cloning ghcjs-boot git repository"
- initGhcjsBoot
- checkpoint' "shims-git" "shims repository already cloned" $ do
- testGit "shims" >>= \case
-- Just False -> failWith "shims already exists and is not a git repository"
-- Just True -> do
-- msgD info "shims repository already exists but checkpoint not reached, cleaning first, then cloning"
-- rm_rf "shims"
-- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
-+ Just _ -> do
-+ msgD info "shims repository already exists; moving on"
- Nothing -> do
- msgD info "cloning shims git repository"
- cloneGit shimsDescr "shims" bsrcShimsDevBranch bsrcShimsDev
- where
- initGhcjsBoot = sub $ do
-- cloneGit bootDescr "ghcjs-boot" bsrcBootDevBranch bsrcBootDev
- cd "ghcjs-boot"
-- git_ ["submodule", "update", "--init", "--recursive"]
- mapM_ patchPackage =<< allPackages
- preparePrimops
- buildGenPrim
-@@ -1201,14 +1192,14 @@ cabalInstallFlags parmakeGhcjs = do
- , "--avoid-reinstalls"
- , "--builddir", "dist"
- , "--with-compiler", ghcjs ^. pgmLocText
-+ , "--with-gcc", "@CC@"
- , "--with-hc-pkg", ghcjsPkg ^. pgmLocText
-- , "--prefix", toTextI instDir
-+ , "--prefix", "@PREFIX@"
-+ , "--libdir", "$prefix/lib/$compiler"
-+ , "--libsubdir", "$pkgid"
- , bool haddock "--enable-documentation" "--disable-documentation"
- , "--haddock-html"
---- workaround for hoogle support being broken in haddock for GHC 7.10RC1
--#if !(__GLASGOW_HASKELL__ >= 709)
- , "--haddock-hoogle"
--#endif
- , "--haddock-hyperlink-source"
- -- don't slow down Windows builds too much, on other platforms we get this more
- -- or less for free, thanks to dynamic-too
-diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..e2405a7 100644
---- a/src/Compiler/Info.hs
-+++ b/src/Compiler/Info.hs
-@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
-
- -- | the directory to use if started without -B flag
- getDefaultTopDir :: IO FilePath
--getDefaultTopDir = do
-- appdir <- getAppUserDataDirectory "ghcjs"
-- return (appdir > subdir > "ghcjs")
-- where
-- targetARCH = arch
-- targetOS = os
-- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
-+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
-
- getDefaultLibDir :: IO FilePath
- getDefaultLibDir = getDefaultTopDir
diff --git a/pkgs/development/compilers/ghcjs/8.0/default.nix b/pkgs/development/compilers/ghcjs/8.0/default.nix
deleted file mode 100644
index a786f536eb9b..000000000000
--- a/pkgs/development/compilers/ghcjs/8.0/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:
-
-bootPkgs.callPackage ../base.nix {
- version = "0.2.020170323";
-
- inherit bootPkgs cabal-install;
-
- ghcjsSrc = fetchFromGitHub {
- owner = "ghcjs";
- repo = "ghcjs";
- rev = "2b3759942fb5b2fc1a58d314d9b098d4622fa6b6";
- sha256 = "15asapg0va8dvcdycsx8dgk4xcpdnhml4h31wka6vvxf5anzz8aw";
- };
- ghcjsBootSrc = fetchgit {
- url = git://github.com/ghcjs/ghcjs-boot.git;
- rev = "106e144cca6529a1b9612c11aea5d6ef65b96745";
- sha256 = "0gxg8iiwvm93x1dwhxypczn9qiz4m1xvj8i7cf4snfdy2jdyhi5l";
- fetchSubmodules = true;
- };
-
- shims = import ./shims.nix { inherit fetchFromGitHub; };
- stage1Packages = [
- "array"
- "base"
- "binary"
- "bytestring"
- "containers"
- "deepseq"
- "directory"
- "filepath"
- "ghc-boot"
- "ghc-boot-th"
- "ghc-prim"
- "ghci"
- "ghcjs-prim"
- "ghcjs-th"
- "integer-gmp"
- "pretty"
- "primitive"
- "process"
- "rts"
- "template-haskell"
- "time"
- "transformers"
- "unix"
- ];
- stage2 = import ./stage2.nix;
-
- patches = [ ./boot.patch ];
-}
diff --git a/pkgs/development/compilers/ghcjs/8.0/shims.nix b/pkgs/development/compilers/ghcjs/8.0/shims.nix
deleted file mode 100644
index a9a7f8d45e27..000000000000
--- a/pkgs/development/compilers/ghcjs/8.0/shims.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ fetchFromGitHub }:
-fetchFromGitHub {
- owner = "ghcjs";
- repo = "shims";
- rev = "85395dce971e23a39e5f93af4ed139ca36d4e448";
- sha256 = "1kqgik75jx681s1kjx1s7dryigr3m940c3zb9vy0r3psxrw6sf2g";
-}
diff --git a/pkgs/development/compilers/ghcjs/8.0/stage2.nix b/pkgs/development/compilers/ghcjs/8.0/stage2.nix
deleted file mode 100644
index 18c7a76dd3af..000000000000
--- a/pkgs/development/compilers/ghcjs/8.0/stage2.nix
+++ /dev/null
@@ -1,545 +0,0 @@
-{ ghcjsBoot }: { callPackage }:
-
-{
- async = callPackage
- ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
- , test-framework-hunit
- }:
- mkDerivation {
- pname = "async";
- version = "2.1.1";
- src = "${ghcjsBoot}/boot/async";
- doCheck = false;
- libraryHaskellDepends = [ base stm ];
- testHaskellDepends = [
- base HUnit test-framework test-framework-hunit
- ];
- jailbreak = true;
- homepage = "https://github.com/simonmar/async";
- description = "Run IO operations asynchronously and wait for their results";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- aeson = callPackage
- ({ mkDerivation, attoparsec, base, base-compat, base-orphans
- , base16-bytestring, bytestring, containers, deepseq, directory
- , dlist, filepath, generic-deriving, ghc-prim, hashable
- , hashable-time, HUnit, integer-logarithms, QuickCheck
- , quickcheck-instances, scientific, stdenv, tagged
- , template-haskell, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text, th-abstraction, time
- , time-locale-compat, unordered-containers, uuid-types, vector
- }:
- mkDerivation {
- pname = "aeson";
- version = "1.2.2.0";
- src = "${ghcjsBoot}/boot/aeson";
- doCheck = false;
- libraryHaskellDepends = [
- attoparsec base base-compat bytestring containers deepseq dlist
- ghc-prim hashable scientific tagged template-haskell text
- th-abstraction time time-locale-compat unordered-containers
- uuid-types vector
- ];
- testHaskellDepends = [
- attoparsec base base-compat base-orphans base16-bytestring
- bytestring containers directory dlist filepath generic-deriving
- ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
- quickcheck-instances scientific tagged template-haskell
- test-framework test-framework-hunit test-framework-quickcheck2 text
- time time-locale-compat unordered-containers uuid-types vector
- ];
- jailbreak = true;
- homepage = "https://github.com/bos/aeson";
- description = "Fast JSON parsing and encoding";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- attoparsec = callPackage
- ({ mkDerivation, array, base, bytestring, case-insensitive
- , containers, criterion, deepseq, directory, filepath, ghc-prim
- , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
- , stdenv, tasty, tasty-quickcheck, text, transformers
- , unordered-containers, vector
- }:
- mkDerivation {
- pname = "attoparsec";
- version = "0.13.1.0";
- src = "${ghcjsBoot}/boot/attoparsec";
- doCheck = false;
- libraryHaskellDepends = [
- array base bytestring containers deepseq scientific text
- transformers
- ];
- testHaskellDepends = [
- array base bytestring deepseq QuickCheck quickcheck-unicode
- scientific tasty tasty-quickcheck text transformers vector
- ];
- benchmarkHaskellDepends = [
- array base bytestring case-insensitive containers criterion deepseq
- directory filepath ghc-prim http-types parsec scientific text
- transformers unordered-containers vector
- ];
- jailbreak = true;
- homepage = "https://github.com/bos/attoparsec";
- description = "Fast combinator parsing for bytestrings and text";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- base-compat = callPackage
- ({ mkDerivation, base, hspec, QuickCheck, stdenv, unix }:
- mkDerivation {
- pname = "base-compat";
- version = "0.9.3";
- src = "${ghcjsBoot}/boot/base-compat";
- doCheck = false;
- libraryHaskellDepends = [ base unix ];
- testHaskellDepends = [ base hspec QuickCheck ];
- jailbreak = true;
- description = "A compatibility layer for base";
- license = stdenv.lib.licenses.mit;
- }) {};
- bytestring-builder = callPackage
- ({ mkDerivation, base, bytestring, deepseq, stdenv }:
- mkDerivation {
- pname = "bytestring-builder";
- version = "0.10.8.1.0";
- src = "${ghcjsBoot}/boot/bytestring-builder";
- doCheck = false;
- libraryHaskellDepends = [ base bytestring deepseq ];
- jailbreak = true;
- description = "The new bytestring builder, packaged outside of GHC";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- case-insensitive = callPackage
- ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
- , HUnit, stdenv, test-framework, test-framework-hunit, text
- }:
- mkDerivation {
- pname = "case-insensitive";
- version = "1.2.0.8";
- src = "${ghcjsBoot}/boot/case-insensitive";
- doCheck = false;
- libraryHaskellDepends = [ base bytestring deepseq hashable text ];
- testHaskellDepends = [
- base bytestring HUnit test-framework test-framework-hunit text
- ];
- benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
- jailbreak = true;
- homepage = "https://github.com/basvandijk/case-insensitive";
- description = "Case insensitive string comparison";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- dlist = callPackage
- ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
- mkDerivation {
- pname = "dlist";
- version = "0.8.0.2";
- src = "${ghcjsBoot}/boot/dlist";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq ];
- testHaskellDepends = [ base Cabal QuickCheck ];
- jailbreak = true;
- homepage = "https://github.com/spl/dlist";
- description = "Difference lists";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- extensible-exceptions = callPackage
- ({ mkDerivation, base, stdenv }:
- mkDerivation {
- pname = "extensible-exceptions";
- version = "0.1.1.4";
- src = "${ghcjsBoot}/boot/extensible-exceptions";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- jailbreak = true;
- description = "Extensible exceptions";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- fail = callPackage
- ({ mkDerivation, stdenv }:
- mkDerivation {
- pname = "fail";
- version = "4.9.0.0";
- src = "${ghcjsBoot}/boot/fail";
- jailbreak = true;
- homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
- description = "Forward-compatible MonadFail class";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- hashable = callPackage
- ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit
- , integer-gmp, QuickCheck, random, siphash, stdenv, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, unix
- }:
- mkDerivation {
- pname = "hashable";
- version = "1.2.4.0";
- src = "${ghcjsBoot}/boot/hashable";
- doCheck = false;
- libraryHaskellDepends = [
- base bytestring ghc-prim integer-gmp text
- ];
- testHaskellDepends = [
- base bytestring ghc-prim HUnit QuickCheck random test-framework
- test-framework-hunit test-framework-quickcheck2 text unix
- ];
- benchmarkHaskellDepends = [
- base bytestring criterion ghc-prim integer-gmp siphash text
- ];
- jailbreak = true;
- homepage = "http://github.com/tibbe/hashable";
- description = "A class for types that can be converted to a hash value";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- integer-logarithms = callPackage
- ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck
- , smallcheck, stdenv, tasty, tasty-hunit, tasty-quickcheck
- , tasty-smallcheck
- }:
- mkDerivation {
- pname = "integer-logarithms";
- version = "1.0.2";
- src = "${ghcjsBoot}/boot/integer-logarithms";
- doCheck = false;
- libraryHaskellDepends = [ array base ghc-prim integer-gmp ];
- testHaskellDepends = [
- base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
- tasty-smallcheck
- ];
- jailbreak = true;
- homepage = "https://github.com/phadej/integer-logarithms";
- description = "Integer logarithms";
- license = stdenv.lib.licenses.mit;
- }) {};
- mtl = callPackage
- ({ mkDerivation, base, stdenv, transformers }:
- mkDerivation {
- pname = "mtl";
- version = "2.2.1";
- src = "${ghcjsBoot}/boot/mtl";
- doCheck = false;
- libraryHaskellDepends = [ base transformers ];
- jailbreak = true;
- homepage = "http://github.com/ekmett/mtl";
- description = "Monad classes, using functional dependencies";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- nats = callPackage
- ({ mkDerivation, stdenv }:
- mkDerivation {
- pname = "nats";
- version = "1.1.1";
- src = "${ghcjsBoot}/boot/nats";
- jailbreak = true;
- homepage = "http://github.com/ekmett/nats/";
- description = "Natural numbers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- old-time = callPackage
- ({ mkDerivation, base, old-locale, stdenv }:
- mkDerivation {
- pname = "old-time";
- version = "1.1.0.3";
- src = "${ghcjsBoot}/boot/old-time";
- doCheck = false;
- libraryHaskellDepends = [ base old-locale ];
- jailbreak = true;
- description = "Time library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- parallel = callPackage
- ({ mkDerivation, array, base, containers, deepseq, stdenv }:
- mkDerivation {
- pname = "parallel";
- version = "3.2.1.0";
- src = "${ghcjsBoot}/boot/parallel";
- doCheck = false;
- libraryHaskellDepends = [ array base containers deepseq ];
- jailbreak = true;
- description = "Parallel programming library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- random = callPackage
- ({ mkDerivation, base, stdenv, time }:
- mkDerivation {
- pname = "random";
- version = "1.1";
- src = "${ghcjsBoot}/boot/random";
- doCheck = false;
- libraryHaskellDepends = [ base time ];
- testHaskellDepends = [ base ];
- jailbreak = true;
- description = "random number library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- scientific = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, criterion
- , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
- , QuickCheck, smallcheck, stdenv, tasty, tasty-ant-xml, tasty-hunit
- , tasty-quickcheck, tasty-smallcheck, text, vector
- }:
- mkDerivation {
- pname = "scientific";
- version = "0.3.4.10";
- src = "${ghcjsBoot}/boot/scientific";
- doCheck = false;
- libraryHaskellDepends = [
- base binary bytestring containers deepseq ghc-prim hashable
- integer-gmp integer-logarithms text vector
- ];
- testHaskellDepends = [
- base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
- tasty-hunit tasty-quickcheck tasty-smallcheck text
- ];
- benchmarkHaskellDepends = [ base criterion ];
- jailbreak = true;
- homepage = "https://github.com/basvandijk/scientific";
- description = "Numbers represented using scientific notation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- semigroups = callPackage
- ({ mkDerivation, base, stdenv }:
- mkDerivation {
- pname = "semigroups";
- version = "0.18.3";
- src = "${ghcjsBoot}/boot/semigroups";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- jailbreak = true;
- homepage = "http://github.com/ekmett/semigroups/";
- description = "Anything that associates";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- stm = callPackage
- ({ mkDerivation, array, base, stdenv }:
- mkDerivation {
- pname = "stm";
- version = "2.4.4.1";
- src = "${ghcjsBoot}/boot/stm";
- doCheck = false;
- libraryHaskellDepends = [ array base ];
- jailbreak = true;
- description = "Software Transactional Memory";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- syb = callPackage
- ({ mkDerivation, base, containers, HUnit, mtl, stdenv }:
- mkDerivation {
- pname = "syb";
- version = "0.6";
- src = "${ghcjsBoot}/boot/syb";
- doCheck = false;
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base containers HUnit mtl ];
- jailbreak = true;
- homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
- description = "Scrap Your Boilerplate";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- tagged = callPackage
- ({ mkDerivation, base, deepseq, stdenv, template-haskell
- , transformers, transformers-compat
- }:
- mkDerivation {
- pname = "tagged";
- version = "0.8.5";
- src = "${ghcjsBoot}/boot/tagged";
- doCheck = false;
- libraryHaskellDepends = [
- base deepseq template-haskell transformers transformers-compat
- ];
- jailbreak = true;
- homepage = "http://github.com/ekmett/tagged";
- description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- text = callPackage
- ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
- , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
- , random, stdenv, test-framework, test-framework-hunit
- , test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "text";
- version = "1.2.2.1";
- src = "${ghcjsBoot}/boot/text";
- doCheck = false;
- libraryHaskellDepends = [
- array base binary bytestring deepseq ghc-prim integer-gmp
- ];
- testHaskellDepends = [
- array base binary bytestring deepseq directory ghc-prim HUnit
- integer-gmp QuickCheck quickcheck-unicode random test-framework
- test-framework-hunit test-framework-quickcheck2
- ];
- jailbreak = true;
- homepage = "https://github.com/bos/text";
- description = "An efficient packed Unicode text type";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- th-abstraction = callPackage
- ({ mkDerivation, base, containers, ghc-prim, stdenv
- , template-haskell
- }:
- mkDerivation {
- pname = "th-abstraction";
- version = "0.2.6.0";
- src = "${ghcjsBoot}/boot/th-abstraction";
- doCheck = false;
- libraryHaskellDepends = [
- base containers ghc-prim template-haskell
- ];
- testHaskellDepends = [ base containers template-haskell ];
- jailbreak = true;
- homepage = "https://github.com/glguy/th-abstraction";
- description = "Nicer interface for reified information about data types";
- license = stdenv.lib.licenses.isc;
- }) {};
- time-locale-compat = callPackage
- ({ mkDerivation, base, old-locale, stdenv, time }:
- mkDerivation {
- pname = "time-locale-compat";
- version = "0.1.1.3";
- src = "${ghcjsBoot}/boot/time-locale-compat";
- doCheck = false;
- libraryHaskellDepends = [ base old-locale time ];
- jailbreak = true;
- homepage = "https://github.com/khibino/haskell-time-locale-compat";
- description = "Compatibility of TimeLocale between old-locale and time-1.5";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- transformers-compat = callPackage
- ({ mkDerivation, base, ghc-prim, stdenv, transformers }:
- mkDerivation {
- pname = "transformers-compat";
- version = "0.5.1.4";
- src = "${ghcjsBoot}/boot/transformers-compat";
- doCheck = false;
- libraryHaskellDepends = [ base ghc-prim transformers ];
- jailbreak = true;
- homepage = "http://github.com/ekmett/transformers-compat/";
- description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- unordered-containers = callPackage
- ({ mkDerivation, base, bytestring, ChasingBottoms, containers
- , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
- , mtl, QuickCheck, random, stdenv, test-framework
- , test-framework-hunit, test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "unordered-containers";
- version = "0.2.7.2";
- src = "${ghcjsBoot}/boot/unordered-containers";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq hashable ];
- testHaskellDepends = [
- base ChasingBottoms containers hashable HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2
- ];
- benchmarkHaskellDepends = [
- base bytestring containers criterion deepseq deepseq-generics
- hashable hashmap mtl random
- ];
- jailbreak = true;
- homepage = "https://github.com/tibbe/unordered-containers";
- description = "Efficient hashing-based container types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- uuid-types = callPackage
- ({ mkDerivation, base, binary, bytestring, containers, criterion
- , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty
- , tasty-hunit, tasty-quickcheck, text, unordered-containers
- }:
- mkDerivation {
- pname = "uuid-types";
- version = "1.0.3";
- src = "${ghcjsBoot}/boot/uuid/uuid-types";
- doCheck = false;
- libraryHaskellDepends = [
- base binary bytestring deepseq hashable random text
- ];
- testHaskellDepends = [
- base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
- ];
- benchmarkHaskellDepends = [
- base bytestring containers criterion deepseq random
- unordered-containers
- ];
- jailbreak = true;
- homepage = "https://github.com/hvr/uuid";
- description = "Type definitions for Universally Unique Identifiers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- vector = callPackage
- ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
- , random, stdenv, template-haskell, test-framework
- , test-framework-quickcheck2, transformers
- }:
- mkDerivation {
- pname = "vector";
- version = "0.11.0.0";
- src = "${ghcjsBoot}/boot/vector";
- doCheck = false;
- libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
- testHaskellDepends = [
- base QuickCheck random template-haskell test-framework
- test-framework-quickcheck2 transformers
- ];
- jailbreak = true;
- homepage = "https://github.com/haskell/vector";
- description = "Efficient Arrays";
- license = stdenv.lib.licenses.bsd3;
- }) {};
- ghcjs-base = callPackage
- ({ mkDerivation, aeson, array, attoparsec, base, bytestring
- , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
- , hashable, HUnit, integer-gmp, primitive, QuickCheck
- , quickcheck-unicode, random, scientific, stdenv, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text, time
- , transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "ghcjs-base";
- version = "0.2.0.0";
- src = "${ghcjsBoot}/ghcjs/ghcjs-base";
- doCheck = false;
- libraryHaskellDepends = [
- aeson attoparsec base bytestring containers deepseq dlist ghc-prim
- ghcjs-prim hashable integer-gmp primitive scientific text time
- transformers unordered-containers vector
- ];
- testHaskellDepends = [
- array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
- primitive QuickCheck quickcheck-unicode random test-framework
- test-framework-hunit test-framework-quickcheck2 text
- ];
- jailbreak = true;
- homepage = "http://github.com/ghcjs/ghcjs-base";
- description = "base library for GHCJS";
- license = stdenv.lib.licenses.mit;
- }) {};
- Cabal = callPackage
- ({ mkDerivation, array, base, binary, bytestring, containers
- , deepseq, directory, exceptions, filepath, old-time, pretty
- , process, QuickCheck, regex-posix, stdenv, tagged, tasty
- , tasty-hunit, tasty-quickcheck, time, transformers, unix
- }:
- mkDerivation {
- pname = "Cabal";
- version = "1.24.0.0";
- src = "${ghcjsBoot}/boot/cabal/Cabal";
- doCheck = false;
- libraryHaskellDepends = [
- array base binary bytestring containers deepseq directory filepath
- pretty process time unix
- ];
- testHaskellDepends = [
- base bytestring containers directory exceptions filepath old-time
- pretty process QuickCheck regex-posix tagged tasty tasty-hunit
- tasty-quickcheck transformers unix
- ];
- jailbreak = true;
- homepage = "http://www.haskell.org/cabal/";
- description = "A framework for packaging Haskell software";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-}
diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix
index 21c0a5ede91b..39d1652fc700 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 fa4b4abafdee..832c020c40de 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 = ''
@@ -180,7 +174,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ go_bootstrap ];
meta = with stdenv.lib; {
- branch = "1.9";
+ branch = "1.10";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix
index 55cc654b0aa9..5d4a8e84265f 100644
--- a/pkgs/development/compilers/go/1.11.nix
+++ b/pkgs/development/compilers/go/1.11.nix
@@ -1,46 +1,49 @@
{ 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
+, buildPackages, targetPackages }:
let
inherit (stdenv.lib) optionals optionalString;
- clangHack = writeScriptBin "clang" ''
- #!${stdenv.shell}
- exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
- '';
-
goBootstrap = runCommand "go-bootstrap" {} ''
mkdir $out
- cp -rf ${go_bootstrap}/* $out/
+ cp -rf ${buildPackages.go_bootstrap}/* $out/
chmod -R u+w $out
find $out -name "*.c" -delete
cp -rf $out/bin/* $out/share/go/bin/
'';
+ goarch = platform: {
+ "i686" = "386";
+ "x86_64" = "amd64";
+ "aarch64" = "arm64";
+ "arm" = "arm";
+ "armv5tel" = "arm";
+ "armv6l" = "arm";
+ "armv7l" = "arm";
+ }.${platform.parsed.cpu.name} or (throw "Unsupported system");
+
in
stdenv.mkDerivation rec {
name = "go-${version}";
- version = "1.11";
+ version = "1.11.2";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
- sha256 = "1k18d6rkijlgzn1zw4wphzcv6a6w9hb1msgrsh1102jb18644f2q";
+ sha256 = "0pk7pxfm3ij2ksdrg49jz501fr1d103zr4mjjwv821if9g279jc9";
};
- 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 ];
+
+
propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
hardeningDisable = [ "all" ];
@@ -125,6 +128,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 ''
@@ -132,59 +137,97 @@ stdenv.mkDerivation rec {
substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
'';
- GOOS = if stdenv.isDarwin then "darwin" else "linux";
- GOARCH = if stdenv.isDarwin then "amd64"
- else if stdenv.targetPlatform.isi686 then "386"
- else if stdenv.targetPlatform.isx86_64 then "amd64"
- 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 "";
+ GOOS = stdenv.targetPlatform.parsed.kernel.name;
+ GOARCH = goarch stdenv.targetPlatform;
+ # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
+ # Go will nevertheless build a for host system that we will copy over in
+ # the install phase.
+ GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
+ GOHOSTARCH = goarch stdenv.buildPlatform;
+
+ # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
+ # to be different from CC/CXX
+ CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
+ "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc"
+ else if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ "${stdenv.cc.targetPrefix}cc"
+ else
+ null;
+ CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then
+ "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++"
+ else if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ "${stdenv.cc.targetPrefix}c++"
+ else
+ null;
+
+ GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.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";
# Hopefully avoids test timeouts on Hydra
GO_TEST_TIMEOUT_SCALE = 3;
- # The go build actually checks for CC=*/clang and does something different, so we don't
- # just want the generic `cc` here.
- CC = if stdenv.isDarwin then "clang" else "cc";
+ # Indicate that we are running on build infrastructure
+ # Some tests assume things like home directories and users exists
+ GO_BUILDER_NAME = "nix";
- configurePhase = ''
- # Indicate that we are running on build infrastructure
- # Some tests assume things like home directories and users exists
- export GO_BUILDER_NAME=nix
+ GOROOT_BOOTSTRAP="${goBootstrap}/share/go";
- mkdir -p $out/share/go/bin
- export GOROOT=$out/share/go
- export GOBIN=$GOROOT/bin
- export PATH=$GOBIN:$PATH
+ postConfigure = ''
+ export GOCACHE=$TMPDIR/go-cache
+ # this is compiled into the binary
+ export GOROOT_FINAL=$out/share/go
+
+ export PATH=$(pwd)/bin:$PATH
+
+ # Independent from host/target, CC should produce code for the building system.
+ export CC=${buildPackages.stdenv.cc}/bin/cc
ulimit -a
'';
- postConfigure = optionalString stdenv.isDarwin ''
- export PATH=${clangHack}/bin:$PATH
+ postBuild = ''
+ (cd src && ./make.bash)
'';
+ doCheck = stdenv.hostPlatform == stdenv.targetPlatform;
+
+ checkPhase = ''
+ runHook preCheck
+ (cd src && ./run.bash --no-rebuild)
+ runHook postCheck
+ '';
+
+ preInstall = ''
+ rm -r pkg/{bootstrap,obj}
+ # Contains the wrong perl shebang when cross compiling,
+ # since it is not used for anything we can deleted as well.
+ rm src/regexp/syntax/make_perl_groups.pl
+ '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
+ mv bin/*_*/* bin
+ rmdir bin/*_*
+ ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
+ rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
+ ''}
+ '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
+ rm -rf bin/*_*
+ ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
+ rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
+ ''}
+ '' else "");
+
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
- ln -s $out/share/go/bin $out/bin
+ runHook preInstall
+ mkdir -p $GOROOT_FINAL
+ cp -a bin pkg src lib misc api doc $GOROOT_FINAL
+ ln -s $GOROOT_FINAL/bin $out/bin
+ runHook postInstall
'';
setupHook = ./setup-hook.sh;
- disallowedReferences = [ go_bootstrap ];
+ disallowedReferences = [ goBootstrap ];
meta = with stdenv.lib; {
- branch = "1.9";
+ branch = "1.11";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 48f16c3ffa5a..d6ae163813f3 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 000000000000..afe5aea3d916
--- /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/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index b12b055342ca..a0cc27b37e20 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
- homepage = http://www.gnu.org/software/gprolog/;
+ homepage = https://www.gnu.org/software/gprolog/;
description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains";
license = stdenv.lib.licenses.lgpl3Plus;
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 7721ce06a561..f051b24065a5 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -50,6 +50,9 @@ let
rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_${sha1}/libffi.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; }
rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; }
rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar; }
+ rec { sha1 = "a828a4f32caf9ac0b74f2548f87310959558c526"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612.tar.gz; }
+ rec { sha1 = "7ac829f0c9a37f5cc39afd2265588a365480720d"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm-612-linux-amd64.tar.gz; }
+ rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar; }
];
findbugs = fetchzip {
@@ -61,13 +64,13 @@ let
in rec {
mx = stdenv.mkDerivation rec {
- version = "5.176.4";
- name = "mx";
+ version = "5.192.0";
+ pname = "mx";
src = fetchFromGitHub {
owner = "graalvm";
repo = "mx";
rev = version;
- sha256 = "0xmx4hpnd6m9hk49lgwnvwd0q11s2m4d8axwq7zzc8wm10d692xw";
+ sha256 = "04gdf1gzlc8a6li8lcnrs2j9zicj11fs1vqqf7cmhb4pm2h72hml";
};
nativeBuildInputs = [ makeWrapper ];
buildPhase = ''
@@ -79,6 +82,11 @@ in rec {
'def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):
print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly))
return True'
+
+ # avoid crash with 'ValueError: ZIP does not support timestamps before 1980'
+ substituteInPlace mx.py --replace \
+ 'zipfile.ZipInfo(arcname, time.localtime(os.path.getmtime(join(root, f)))[:6])' \
+ 'zipfile.ZipInfo(arcname, time.strptime ("1 Jan 1980", "%d %b %Y" )[:6])'
'';
installPhase = ''
mkdir -p $out/bin
@@ -97,9 +105,9 @@ in rec {
# copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too)
jvmci8 = stdenv.mkDerivation rec {
- version = "0.45";
+ version = "0.49";
name = let
- n = "jvmci8u171-${version}";
+ n = "jvmci${/*"8u191"*/ lib.removePrefix "oraclejdk-" oraclejdk8.name}-${version}";
in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then
n
else
@@ -108,7 +116,7 @@ in rec {
owner = "graalvm";
repo = "graal-jvmci-8";
rev = "jvmci-${version}";
- sha256 = "1nppk9dpamisiadss1iy82i3rf6igndbf1vax85w9lz310kh0d12";
+ sha256 = "1zgin0w1qa7wmfhcisx470fhnmddfxxp5nyyix31yaa7dznql82k";
};
buildInputs = [ mx mercurial ];
postUnpack = ''
@@ -146,7 +154,7 @@ in rec {
};
graalvm8 = stdenv.mkDerivation rec {
- version = "1.0.0-rc3";
+ version = "1.0.0-rc8";
name = let
n = "graal-${version}";
in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then
@@ -157,7 +165,7 @@ in rec {
owner = "oracle";
repo = "graal";
rev = "vm-${version}";
- sha256 = "1hcs4m6ailapgi3bikav1i517vqn5pn595cyqqjfvlnkjwihbnc3";
+ sha256 = "1fada4awrr8bhw294xdiq4bagvgrlcr44mw6338gaal0ky3vkm0p";
};
buildInputs = [ mx zlib mercurial jvmci8 ];
postUnpack = ''
@@ -170,6 +178,17 @@ in rec {
hg checkout ${lib.escapeShellArg src.rev}
)
'';
+ postPatch = ''
+ substituteInPlace substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/PosixDirectives.java \
+ --replace '' '<${zlib.dev}/include/zlib.h>'
+ substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
+ --replace 'cmd.add("-v");' 'cmd.add("-v"); cmd.add("-L${zlib}/lib");'
+ substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
+ --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
+ 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");'
+ substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
+ --replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";'
+ '';
buildPhase = ''
# make a copy of jvmci8
cp -dpR ${jvmci8} $out
@@ -178,13 +197,14 @@ in rec {
export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
export MX_CACHE_DIR=${makeMxCache graal-mxcache}
+
( cd substratevm
mkdir -p clibraries
mx --java-home $out build
# bootstrap native-image (that was removed from mx build in https://github.com/oracle/graal/commit/140d7a7edf54ec5872a8ff45869cd1ae499efde4)
- mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/svm-driver.jar com.oracle.svm.driver.NativeImage
+ mx --java-home $out native-image -cp $MX_ALT_OUTPUT_ROOT/substratevm/dists/jdk1.8/svm-driver.jar com.oracle.svm.driver.NativeImage
)
( cd tools
mx --java-home $out build
@@ -195,17 +215,17 @@ in rec {
mkdir -p $out/jre/tools/{profiler,chromeinspector,truffle/builder} $out/jre/lib/{graal,include,truffle/include}
cp -vpLR substratevm/svmbuild/native-image-root/lib/* $out/jre/lib/ || true # ignore "same file" error when dereferencing symlinks
cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/bin/* $out/jre/lib/amd64/
- cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-*processor*.jar $out/jre/lib/graal/
+ cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-*processor*.jar $out/jre/lib/graal/
cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/include/
- cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/graal-management.jar $out/jre/lib/jvmci/
+ cp -vp $MX_ALT_OUTPUT_ROOT/compiler/dists/jdk1.8/graal-management.jar $out/jre/lib/jvmci/
cp -vdpR $out/jre/lib/svm/clibraries $out/jre/lib/svm/builder/
- cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/dists/* $out/jre/lib/truffle/
+ cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/* $out/jre/lib/truffle/
cp -vp $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/include/* $out/jre/lib/truffle/include/
cp -vpLR substratevm/svmbuild/native-image-root/tools/* $out/jre/tools/
cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector* $out/jre/tools/chromeinspector/
cp -vpR $MX_ALT_OUTPUT_ROOT/tools/dists/truffle-profiler* $out/jre/tools/profiler/
cp -vpR $MX_ALT_OUTPUT_ROOT/truffle/linux-amd64/truffle-nfi-native/* $out/jre/tools/truffle/
- cp -vp $MX_ALT_OUTPUT_ROOT/truffle/dists/truffle-nfi.jar $out/jre/tools/truffle/builder/
+ cp -vp $MX_ALT_OUTPUT_ROOT/truffle/dists/jdk1.8/truffle-nfi.jar $out/jre/tools/truffle/builder/
echo "name=GraalVM ${version}" > $out/jre/lib/amd64/server/vm.properties
echo -n "graal" > $out/jre/lib/jvmci/compiler-name
@@ -242,6 +262,9 @@ in rec {
./helloworld
./helloworld | fgrep 'Hello World'
'';
+
+ passthru.home = graalvm8;
+
meta = with stdenv.lib; {
homepage = https://github.com/oracle/graal;
description = "High-Performance Polyglot VM";
diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index 44af8f4bf236..1d3b13937fc0 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -1,5 +1,5 @@
{ llvmPackages, lib, fetchFromGitHub, cmake
-, libpng, libjpeg, mesa_noglu, eigen3_3, openblas
+, libpng, libjpeg, mesa_noglu, eigen, openblas
}:
let
@@ -37,7 +37,7 @@ in llvmPackages.stdenv.mkDerivation {
# Note: only openblas and not atlas part of this Nix expression
# see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
# to get a hint howto setup atlas instead of openblas
- buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen3_3 openblas ];
+ buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen openblas ];
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 4a520471f867..15eec4134acf 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 2301d0c1f437..528a0d26d056 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 41c9c57bd034..70ff40cd7ec5 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 757773eed52d..4d8b3f398141 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.3.10";
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 = "0zf6p0pzdi6dz2d4dca364wf30zyq326xdfg97zk8kp1a4qwjyfa";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/llvm/3.5/default.nix b/pkgs/development/compilers/llvm/3.5/default.nix
index f588eb4407b5..b87fa747f145 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 f176894dedb9..3c557711449f 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 99869e6e80a7..a848c8b9252b 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 01c08f4bd209..752790cdd853 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 38d2b0d461d4..68ee80fa7a62 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 c7b4615e374a..b182f1250e72 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 3abba0ed340f..ae4b27441593 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -36,9 +36,7 @@ in stdenv.mkDerivation (rec {
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
- buildInputs = [ libxml2 libffi ]
- # TODO(@Ericson2314): Remove next mass rebuild
- ++ stdenv.lib.optionals (stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ libcxxabi ];
+ buildInputs = [ libxml2 libffi ];
propagatedBuildInputs = [ ncurses zlib ];
@@ -119,12 +117,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 831e4b65344c..5ee551f6b6b1 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 1f87cb83ab01..3a165e9da7b1 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 000000000000..e1f4eb303603
--- /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 000000000000..b30d0d0b5d5b
--- /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 000000000000..3cc12b94b200
--- /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 000000000000..ec739d22dd7a
--- /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 000000000000..5446f1b362a9
--- /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 000000000000..76bfb34975e6
--- /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 000000000000..6611259165ae
--- /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 000000000000..7dbda6c365e0
--- /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 000000000000..f6ce768d6484
--- /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 000000000000..6c3f0699978f
--- /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 000000000000..40096fa3497f
--- /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 000000000000..67bde813feed
--- /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 000000000000..31059b7c4c04
--- /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 000000000000..1f2ac97818eb
--- /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/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 2c8fe1866120..efbf8561b7ff 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
let
- rev= "f8e08c89dd98b7b8dba318d245dcd4abd3328ae2";
+ rev= "47273c463fc3c5d0a0ae655cf75a4700bdb020b4";
in stdenv.mkDerivation rec {
name = "manticore-${version}";
- version = "2017.08.22";
+ version = "2018.09.29";
src = fetchFromGitHub {
owner = "ManticoreProject";
repo = "manticore";
- sha256 = "06icq0qdzwyzbsyms53blxpb9i26n2vn7ci8p9xvvnq687hxhr73";
+ sha256 = "1prrgp7ldkdnrdbj224qqkirw8bj72460ix97c96fy264j9c97cn";
inherit rev;
};
diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix
deleted file mode 100644
index 7cd3c1793661..000000000000
--- 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 cfee1b0d8639..f15a76243277 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 2896c0c09139..de7e3bd6a07e 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 069df52ba12d..fbf85ef80426 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/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix
index f254e91e5c65..ef7ad9b32669 100644
--- a/pkgs/development/compilers/mit-scheme/default.nix
+++ b/pkgs/development/compilers/mit-scheme/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation {
development cycle.
'';
- homepage = http://www.gnu.org/software/mit-scheme/;
+ homepage = https://www.gnu.org/software/mit-scheme/;
license = licenses.gpl2Plus;
diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix
new file mode 100644
index 000000000000..f495be8a93e4
--- /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 +167,7 @@ let
passthru = {
inherit architecture;
- home = "${openjdk10}/lib/openjdk";
+ home = "${openjdk}/lib/openjdk";
};
};
-in openjdk10
+in openjdk
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 948948ebc44e..d26627ff5b9c 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -21,42 +21,42 @@ let
else
throw "openjdk requires i686-linux or x86_64 linux";
- update = "181";
- build = "13";
+ update = "192";
+ build = "26";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
repover = "jdk8u${update}-b${build}";
paxflags = if stdenv.isi686 then "msp" else "m";
jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz";
- sha256 = "0rlbf3v55d45fl9gigawghd0vs0cr3k48zj48qlv3k9yxg1knq9a";
+ sha256 = "1hx5sfsglc101aqs9n7cz7rh447d6rxfxkbw03crvzbvy9n6ag2d";
};
langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
- sha256 = "1sk5f45ndxj8ch9pqfwmis5hnb09an7nvz3n1wyd5la42jprmwaf";
+ sha256 = "0vq6nlzs85agjkilpr53v7kjrd99kq770zipqghjmlfzyiy9xk4q";
};
hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
- sha256 = "0pvx5hwmx61sbyi02pngfbky219raqqjw2xjms01nz18mzr77c84";
+ sha256 = "0q5z2glfiip0lsisp1zy1zcw91hi1kznphm7w3iagq8s7550wbvh";
};
corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz";
- sha256 = "1b0r3fjv9q85j74lgzr2vv4z5gl13bb46zvh36mfks6j74z7ki1z";
+ sha256 = "1mgg82066c9wjsj9ciqv4lrn1av5cb86hq00lkpsffdqbwx3vrm3";
};
jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
- sha256 = "1a5gm4w4f79wj0ciwcv8l8m4ha8hjs2r62bvj0vls2kwr5c8znn4";
+ sha256 = "1s87a49hl4h21kf2yh1w67wgb179j0f5v62cxbrvvd5lk2h5jyvf";
};
jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
- sha256 = "1f92s3mpbqxzgh5pazqm8pn5swqkmdrkm7mnmga2kgshzlknh6pm";
+ sha256 = "05alcixcxcdms373byh21d2brsky6kj14b3h80cs9bi1gfnbqilq";
};
jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
- sha256 = "0fwdqr031yyyjrpsk9fwp4y1vlfmdr1rdzgk44gyypwjdap7a11d";
+ sha256 = "1r3fqnl5jqmxzsjqjrka35f8hwqqap9jg8zwqk2vv9qikrm7frhl";
};
nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
- sha256 = "0j5f98pa6746m1xq4842qq5d1ql5x8wvcrjmjk433slgma9hf8pj";
+ sha256 = "0lzwi35lp4a477jkmfa53kxy3g9lzcmh56wprg805gbv4sjnkjk1";
};
openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}";
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 612f0db05821..1b20ca6cc606 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 4969c12bff26..61c2d57423e4 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 000000000000..71bda3e03d96
--- /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
deleted file mode 100644
index de063500b709..000000000000
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ /dev/null
@@ -1,155 +0,0 @@
-{ swingSupport ? true
-, stdenv
-, requireFile
-, makeWrapper
-, file
-, xorg ? null
-, packageType ? "JDK" # JDK, JRE, or ServerJRE
-, glib
-, libxml2
-, ffmpeg_2
-, libxslt
-, libGL
-, freetype
-, fontconfig
-, gtk2
-, pango
-, cairo
-, alsaLib
-, atk
-, gdk_pixbuf
-, zlib
-, elfutils
-, setJavaClassPath
-}:
-
-assert swingSupport -> xorg != null;
-
-let
- version = "10.0.2";
-
- downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads;
-
- rSubPaths = [
- "lib/jli"
- "lib/server"
- "lib"
- ];
-
-in
-
-let result = stdenv.mkDerivation rec {
- name = if packageType == "JDK" then "oraclejdk-${version}"
- else if packageType == "JRE" then "oraclejre-${version}"
- else if packageType == "ServerJRE" then "oracleserverjre-${version}"
- else abort "unknown package Type ${packageType}";
-
- src =
- if packageType == "JDK" then
- requireFile {
- name = "jdk-${version}_linux-x64_bin.tar.gz";
- url = "${downloadUrlBase}/jdk10-downloads-4416644.html";
- sha256 = "0arpzac64apji1s8d0gzizkvrjz0fbhz7l34af1j0365ac6w4cv6";
- }
- else if packageType == "JRE" then
- requireFile {
- name = "jre-${version}_linux-x64_bin.tar.gz";
- url = "${downloadUrlBase}/jre10-downloads-4417026.html";
- sha256 = "0pc4a0a3fl6874vfaflf6jvpm9da647vp41pj0hihkspjyjhjabx";
- }
- else if packageType == "ServerJRE" then
- requireFile {
- name = "serverjre-${version}_linux-x64_bin.tar.gz";
- url = "${downloadUrlBase}/sjre10-downloads-4417025.html";
- sha256 = "0hbcb4c6ncy0sbz02gyygyqcwkz0xpv4fwrx4sripia6vph9592c";
- }
- else abort "unknown package Type ${packageType}";
-
- nativeBuildInputs = [ file ];
-
- buildInputs = [ makeWrapper ];
-
- # See: https://github.com/NixOS/patchelf/issues/10
- dontStrip = 1;
-
- installPhase = ''
- cd ..
-
- # Set PaX markings
- exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
- for file in $exes; do
- paxmark m "$file"
- # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
- ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''}
- done
-
- mv $sourceRoot $out
-
- shopt -s extglob
- for file in $out/*
- do
- if test -f $file ; then
- rm $file
- fi
- done
-
- if test -z "$pluginSupport"; then
- rm -f $out/bin/javaws
- fi
-
- mkdir $out/lib/plugins
- ln -s $out/lib/libnpjp2.so $out/lib/plugins
-
- # for backward compatibility
- ln -s $out $out/jre
-
- mkdir -p $out/nix-support
- printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
- # Set JAVA_HOME automatically.
- cat <> $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
- EOF
- '';
-
- postFixup = ''
- rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}"
-
- # set all the dynamic linkers
- find $out -type f -perm -0100 \
- -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "$rpath" {} \;
-
- find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-
- # Oracle Java Mission Control needs to know where libgtk-x11 and related is
- if test -x $out/bin/jmc; then
- wrapProgram "$out/bin/jmc" \
- --suffix-each LD_LIBRARY_PATH ':' "$rpath"
- fi
- '';
-
- /**
- * libXt is only needed on amd64
- */
- libraries =
- [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++
- (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
-
- rpath = stdenv.lib.strings.makeLibraryPath libraries;
-
- passthru.mozillaPlugin = "/lib/plugins";
-
- passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package
-
- passthru.home = result;
-
- # for backward compatibility
- passthru.architecture = "";
-
- meta = with stdenv.lib; {
- license = licenses.unfree;
- platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms
- };
-
-}; in result
diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix
index 55faf277b159..48304b6af264 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 55faf277b159..48304b6af264 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/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index 65d8110646f8..7a4928d2662c 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}";
- version = "1.9.9";
+ version = "1.9.10";
src = fetchFromGitHub {
owner = "imageworks";
repo = "OpenShadingLanguage";
- rev = "Release-1.9.9";
- sha256 = "1w6wbz013nirzsiw11c9dpdkcwlfncs5va8q583pdw0q2pfkj5dn";
+ rev = "Release-1.9.10";
+ sha256 = "1iaw3pgh0h53gxk3bl148n1lfr54cx2yv0gnx2rjp2m5599acbz4";
};
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 412864cd1600..ef53280b679c 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -6,9 +6,11 @@
let
name = "pakcs-2.0.2";
+ # Don't switch to development release without a reason, because its
+ # source updates without version bump. Prefer current release instead.
src = fetchurl {
url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz";
- sha256 = "086nbsfv363cwrfxzhs54ggdwwkh1ms0pn0v1a4lvqlksjm7jdhv";
+ sha256 = "1hm80gvpsifbsfi13i0iiv7f2b72ymw98bbrm6a8hjsbnfw55jvg";
};
curry-frontend = (haskellPackages.override {
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 09677a47ab2a..d90ddcaacfb0 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/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index dac8b0279ad9..24043ce47740 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -4,13 +4,13 @@ with lib;
mkDerivation rec {
pname = "psc-package";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "purescript";
repo = pname;
rev = "v${version}";
- sha256 = "1pbgijglyqrm998a6z5ahp4phd72crzr3s8vq17a9dz3i0a9hcj5";
+ sha256 = "0xvnmpfj4c6h4gmc2c3d4gcs44527jrgfl11l2fs4ai1mc69w5zg";
};
isLibrary = false;
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index f4cc1cf2b650..1b84b9348520 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,30 +1,29 @@
-{ 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
- done
+ inherit (dune) installPhase;
+ postInstall = ''
wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \
--set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 901675ff31b4..4f16912a86b5 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.30.0";
- # fetch hashes by running `print-hashes.sh 1.24.1`
+ # fetch hashes by running `print-hashes.sh 1.30.0`
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 = "4ceb0e3011d96504587abb7edfdea9c1b4b7cb2c4488cc4a25adc2f3b6a88b21";
+ x86_64-unknown-linux-gnu = "f620e3125cc505c842150bd873c0603432b6cee984cdae8b226cf92c8aa1a80f";
+ armv7-unknown-linux-gnueabihf = "63991f6769ca8db693562c34ac25473e9d4f9f214d6ee98917891be469d69cfd";
+ aarch64-unknown-linux-gnu = "9690c7c50eba5a8461184ee4138b4c284bad31ccc4aa1f2ddeec58b253e6363e";
+ i686-apple-darwin = "b8e5ac31f0a192a58b0e98ff88c47035a2882598946352fa5a86c28ede079230";
+ x86_64-apple-darwin = "07008d90932712282bc599f1e9a226e97879c758dc1f935e6e2675e45694cc1b";
};
platform =
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 34932c911ebc..02ea7ebbbfbf 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 d368c977f8f8..583b48e6dc60 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.1";
+ cargoVersion = "1.30.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
- sha256 = "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c";
+ sha256 = "0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn";
};
in rec {
rustc = callPackage ./rustc.nix {
@@ -28,7 +29,7 @@ in rec {
./patches/disable-test-inherit-env.patch
];
- forceBundledLLVM = true;
+ withBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ];
@@ -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 9c9788ff4834..3ec08a82d017 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,9 +1,9 @@
-{ stdenv, targetPackages
+{ stdenv, targetPackages, removeReferencesTo
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
, which, libffi, gdb
, version
-, forceBundledLLVM ? false
+, withBundledLLVM ? false
, src
, configureFlags ? []
, patches
@@ -20,6 +20,8 @@ let
llvmShared = llvm.override { enableSharedLibraries = true; };
+ prefixedJemalloc = jemalloc.override { stripPrefix = false; };
+
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
in
@@ -40,7 +42,11 @@ stdenv.mkDerivation {
# See https://github.com/NixOS/nixpkgs/pull/34227
stripDebugList = if stdenv.isDarwin then [ "bin" ] else null;
- NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
+ NIX_LDFLAGS =
+ # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
+ optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
+ ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++"
+ ++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib";
# Enable nightly features in stable compiles (used for
# bootstrapping, see https://github.com/rust-lang/rust/pull/37265).
@@ -54,13 +60,12 @@ stdenv.mkDerivation {
# We need rust to build rust. If we don't provide it, configure will try to download it.
# Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py
configureFlags = configureFlags
- ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
- ++ [ "--enable-vendor" ]
- # ++ [ "--jemalloc-root=${jemalloc}/lib"
- ++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
- ++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ]
- ++ optional (targets != []) "--target=${target}"
- ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
+ ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath"
+ "--enable-vendor"
+ "--jemalloc-root=${prefixedJemalloc}/lib"
+ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
+ ++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ]
+ ++ optional (targets != []) "--target=${target}";
# The bootstrap.py will generated a Makefile that then executes the build.
# The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass
@@ -79,50 +84,39 @@ stdenv.mkDerivation {
postPatch = ''
patchShebangs src/etc
- # Fix dynamic linking against llvm
- #${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
+ ${optionalString (!withBundledLLVM) ''rm -rf src/llvm''}
+ rm -rf src/jemalloc
# Fix the configure script to not require curl as we won't use it
sed -i configure \
-e '/probe_need CFG_CURL curl/d'
- # Fix the use of jemalloc prefixes which our jemalloc doesn't have
- # TODO: reenable if we can figure out how to get our jemalloc to work
- #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
- #[ -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
-
- # 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
-
- # Disable test getting stuck on hydra - possible fix:
- # https://reviews.llvm.org/rL281650
- rm -vr src/test/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
@@ -132,14 +126,14 @@ stdenv.mkDerivation {
# ps is needed for one of the test cases
nativeBuildInputs =
[ file python2 ps rustPlatform.rust.rustc git cmake
- which libffi
+ which libffi removeReferencesTo
]
# Only needed for the debuginfo tests
++ optional (!stdenv.isDarwin) gdb;
- buildInputs = [ ncurses ] ++ targetToolchains
+ buildInputs = targetToolchains
++ optional stdenv.isDarwin Security
- ++ optional (!forceBundledLLVM) llvmShared;
+ ++ optional (!withBundledLLVM) llvmShared;
outputs = [ "out" "man" "doc" ];
setOutputFlags = false;
@@ -160,6 +154,12 @@ stdenv.mkDerivation {
inherit doCheck;
+ # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
+ # and thus a transitive dependency on ncurses
+ postInstall = ''
+ find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+'
+ '';
+
configurePlatforms = [];
# https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index a860aa7dc734..1ef6dd065705 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 <commit_hash.txt "${rev}"
substituteInPlace cmake/jsoncpp.cmake \
--replace "${jsoncppURL}" ${jsoncpp}
-
- # To allow non-standard CMAKE_INSTALL_LIBDIR (fixed in upstream, not yet released)
- substituteInPlace cmake/jsoncpp.cmake \
- --replace "\''${CMAKE_INSTALL_LIBDIR}" "lib" \
- --replace "# Build static lib but suitable to be included in a shared lib." "-DCMAKE_INSTALL_LIBDIR=lib"
'';
cmakeFlags = [
@@ -42,7 +37,7 @@ stdenv.mkDerivation {
];
doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
- checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:$LD_LIBRARY_PATH " +
+ checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " +
"./test/soltest -p -- --no-ipc --no-smt --testpath ../test";
nativeBuildInputs = [ cmake ];
@@ -56,7 +51,7 @@ stdenv.mkDerivation {
homepage = https://github.com/ethereum/solidity;
license = licenses.gpl3;
platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ dbrock akru ];
+ maintainers = with maintainers; [ dbrock akru lionello ];
inherit version;
};
}
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index 70162bfbcb6a..fa30655e04e8 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -2,11 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c05208f..8893648e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -48,6 +48,20 @@ add_subdirectory(libevmasm)
+@@ -48,6 +48,25 @@ add_subdirectory(libevmasm)
add_subdirectory(libsolidity)
add_subdirectory(libsolc)
-+
+install(DIRECTORY libdevcore/
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore
+ FILES_MATCHING PATTERN "*.h")
@@ -16,6 +15,12 @@ index 0c05208f..8893648e 100644
+install(DIRECTORY libsolidity/
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity
+ FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY libyul/
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyul
++ FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY liblangutil/
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil
++ FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY liblll/
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll
+ FILES_MATCHING PATTERN "*.h")
@@ -57,8 +62,23 @@ index 0bdec4b4..e876177e 100644
@@ -29,6 +29,7 @@ endif()
add_library(solidity ${sources} ${headers})
- target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+ target_link_libraries(solidity PUBLIC yul evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
if (${Z3_FOUND})
target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
+--- a/libyul/CMakeLists.txt
++++ b/libyul/CMakeLists.txt
+@@ -42,3 +42,4 @@ endif()
+ optimiser/VarDeclPropagator.cpp
+ )
+-target_link_libraries(yul PUBLIC devcore)
++target_link_libraries(yul PUBLIC evmasm devcore langutil)
++install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+--- a/liblangutil/CMakeLists.txt
++++ b/liblangutil/CMakeLists.txt
+@@ -11,3 +11,4 @@ endif()
+
+ add_library(langutil ${sources})
+ target_link_libraries(langutil PUBLIC devcore)
++install(TARGETS langutil LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 9c1a36585907..bbfa1be8f921 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -32,13 +32,12 @@
, makeWrapper
, gnumake
, file
-#, systemtap
}:
let
- v_major = "4.1";
- version = "${v_major}-RELEASE";
- version_friendly = "${v_major}";
+ v_base = "4.2.1";
+ version = "${v_base}-RELEASE";
+ version_friendly = "${v_base}";
tag = "refs/tags/swift-${version}";
fetch = { repo, sha256, fetchSubmodules ? false }:
@@ -54,15 +53,15 @@ let
# For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759
clang = fetch {
repo = "swift-clang";
- sha256 = "0j8bi6jv4m4hqiib02q5cvnxd9j6bwiri853x6px86vai3mdff0h";
+ sha256 = "0l6w4xzpl3w2nax9a0b885nfzhfj38p2g99158nb5bzfd4s0man7";
};
llvm = fetch {
repo = "swift-llvm";
- sha256 = "03558f5zbchqvdabi3x9ahyz4xkmj7w69gazivz372832lgr9zfh";
+ sha256 = "1664zwxbq0a1cmxr9n5a0vw6vdk6ygr7rpglpdsfc7ki857vpsyv";
};
compilerrt = fetch {
repo = "swift-compiler-rt";
- sha256 = "1wkymmxi2v759xkwlzfrq9rivndjfvp6ikrzz10mvvrvyvrgwqnl";
+ sha256 = "19s6qxn4i0kxpf39xjp2i7zg427iinbmaxqkbb1p91g616y367sf";
};
cmark = fetch {
repo = "swift-cmark";
@@ -70,32 +69,32 @@ let
};
lldb = fetch {
repo = "swift-lldb";
- sha256 = "09x3d3bc6rn9g6jpi3fb120c4r2carsmqla4bq4scjrs0867jz9m";
+ sha256 = "00kz0xhj1p6ckyandj2gs1yfl29kxv84x9pfph00r8crbkd2jz7b";
};
llbuild = fetch {
repo = "swift-llbuild";
- sha256 = "04y0ihfyam2n671vmpk9gy0gb9lb3ivh6mr19862p5kg5bmrcic1";
+ sha256 = "1mkkhydshhxr28igbldzr0hhqvb6ql43cpf3ba5vglfkbcz6wh6q";
};
pm = fetch {
repo = "swift-package-manager";
- sha256 = "08d87fc29qq7m92jaxkiczsa7b567pwbibiwwkzdrj6a0gr11qn3";
+ sha256 = "1aqvmgq9g5zs4k2qnkvw3h3mar66d690hqq6g2dmrapsyb321j9l";
};
xctest = fetch {
repo = "swift-corelibs-xctest";
- sha256 = "1alkgxx8jsr2jjv2kchnjaaddb1byjwim015m1z3qxh6lknqm0k5";
+ sha256 = "1n4w7bfgy73vjzbvbphlwayy0dw73bbrayrpkqq8lbidg0x9lam8";
};
foundation = fetch {
repo = "swift-corelibs-foundation";
- sha256 = "06pbhb7wg4q5qgprhiyzbqy6hssga7xxjclhlh81gd6rvfd6bxvw";
+ sha256 = "1bfnkj8s3v327cy0czkngz0ryzmz7amjzkkxbsg2zyrhf9a9f0f7";
};
libdispatch = fetch {
repo = "swift-corelibs-libdispatch";
- sha256 = "198vskbajch8s168a649qz5an92i2mxmmmzcjlgxlzh38fgxri0n";
+ sha256 = "0fibrx54nbaawhsgd7cbr356ji9qvf8y8ahd5bdx28fpj6q0cnwc";
fetchSubmodules = true;
};
swift = fetch {
repo = "swift";
- sha256 = "1flvr12bg8m4k44yq0xy9qrllv5rpxgxisjgbpakk5p3myfsx7ky";
+ sha256 = "0y277wi0m6zp1yph9s14mmc65m21q5fm6lgzkn2rkrbaz25fdzak";
};
};
@@ -111,7 +110,6 @@ let
ncurses
sqlite
swig
- # systemtap?
];
cmakeFlags = [
@@ -215,8 +213,11 @@ stdenv.mkDerivation rec {
substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \
--replace '/usr/include' "${stdenv.cc.libc.dev}/include"
+ substituteInPlace swift-corelibs-libdispatch/src/CMakeLists.txt \
+ --replace '/usr/include' "${stdenv.cc.libc.dev}/include"
substituteInPlace swift/utils/build-script-impl \
--replace '/usr/include/c++' "${clang.cc.gcc}/include/c++"
+ patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch}
'' + stdenv.lib.optionalString stdenv.needsPax ''
patch -p1 -d swift -i ${./patches/build-script-pax.patch}
'' + ''
@@ -228,24 +229,24 @@ stdenv.mkDerivation rec {
-e 's/^test-installable-package$/# \0/' \
-e 's/^test$/# \0/' \
-e 's/^validation-test$/# \0/' \
- -e 's/^long-test$/# \0/'
+ -e 's/^long-test$/# \0/' \
+ -e 's/^stress-test$/# \0/' \
+ -e 's/^test-optimized$/# \0/'
# https://bugs.swift.org/browse/SR-5779
sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake
substituteInPlace clang/lib/Driver/ToolChains/Linux.cpp \
- --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \
- ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);'
+ --replace 'SysRoot + "/usr/lib' '"${glibc}/lib" "'
+ patch -p1 -d clang -i ${./patches/llvm-include-dirs.patch}
patch -p1 -d clang -i ${./purity.patch}
# Workaround hardcoded dep on "libcurses" (vs "libncurses"):
sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt
- # This test fails on one of my machines, not sure why.
- # Disabling for now.
- rm llbuild/tests/Examples/buildsystem-capi.llbuild
-
PREFIX=''${out/#\/}
+ substituteInPlace swift-corelibs-foundation/build.py \
+ --replace usr/lib "$PREFIX/lib"
substituteInPlace swift-corelibs-xctest/build_script.py \
--replace usr "$PREFIX"
substituteInPlace swiftpm/Utilities/bootstrap \
@@ -263,6 +264,7 @@ stdenv.mkDerivation rec {
# Extract the generated tarball into the store
PREFIX=''${out/#\/}
tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX
+ find $out -type d -empty -delete
paxmark pmr $out/bin/swift
paxmark pmr $out/bin/*
@@ -287,6 +289,6 @@ stdenv.mkDerivation rec {
# Swift doesn't support 32bit Linux, unknown on other platforms.
platforms = platforms.linux;
badPlatforms = platforms.i686;
+ broken = stdenv.isAarch64; # 2018-09-04, never built on Hydra
};
}
-
diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
index 6ef83754a674..f2b30e5dcdb6 100644
--- a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
+++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 7ee57ad2df..e6b0af3581 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
-@@ -686,7 +686,7 @@ swiftpm
+@@ -717,7 +717,7 @@ swiftpm
xctest
dash-dash
diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
index 66723f1cdf39..612b33cdb483 100644
--- a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
+++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index e6b0af3581..1095cbaab7 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
-@@ -708,7 +708,7 @@ install-lldb
+@@ -723,7 +723,7 @@ install-lldb
install-llbuild
install-swiftpm
install-xctest
diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
index 5493196303cd..e84c7eb2a08a 100644
--- a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
+++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch
@@ -11,7 +11,7 @@ diff --git a/utils/build-presets.ini b/utils/build-presets.ini
index 1739e91dc2..0608fed9c1 100644
--- a/utils/build-presets.ini
+++ b/utils/build-presets.ini
-@@ -708,6 +708,8 @@ install-destdir=%(install_destdir)s
+@@ -740,6 +740,8 @@ install-destdir=%(install_destdir)s
# Path to the .tar.gz package we would create.
installable-package=%(installable_package)s
diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch
index fa2ccdf9d5c6..1f47bf8ee045 100644
--- a/pkgs/development/compilers/swift/patches/build-script-pax.patch
+++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch
@@ -1,6 +1,6 @@
--- swift/utils/build-script-impl 2017-01-23 12:47:20.401326309 -0600
+++ swift-pax/utils/build-script-impl 2017-01-23 13:24:10.339366996 -0600
-@@ -1823,6 +1823,17 @@ function set_lldb_xcodebuild_options() {
+@@ -1837,6 +1837,17 @@ function set_lldb_xcodebuild_options() {
fi
}
@@ -18,7 +18,7 @@
#
# Configure and build each product
#
-@@ -2624,6 +2634,12 @@ for host in "${ALL_HOSTS[@]}"; do
+@@ -2735,6 +2746,12 @@ for host in "${ALL_HOSTS[@]}"; do
fi
call "${CMAKE_BUILD[@]}" "${build_dir}" $(cmake_config_opt ${product}) -- "${BUILD_ARGS[@]}" ${build_targets[@]}
diff --git a/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
new file mode 100644
index 000000000000..650e1a2429d4
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch
@@ -0,0 +1,13 @@
+The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories.
+
+--- swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 17:51:51.581766303 +0200
++++ swift/stdlib/public/Platform/CMakeLists.txt 2018-09-30 18:40:04.118956708 +0200
+@@ -65,7 +65,7 @@
+ endif()
+
+ set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
+- set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}")
++ set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
+
+ if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/")
+ set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}")
diff --git a/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
new file mode 100644
index 000000000000..9523943c4801
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/llvm-include-dirs.patch
@@ -0,0 +1,13 @@
+Only use the Nix include dirs when no sysroot is configured.
+
+--- clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:01:15.731109551 +0200
++++ clang/lib/Driver/ToolChains/Linux.cpp 2018-10-05 18:00:27.959509924 +0200
+@@ -565,7 +565,7 @@
+
+ // Check for configure-time C include directories.
+ StringRef CIncludeDirs(C_INCLUDE_DIRS);
+- if (CIncludeDirs != "") {
++ if (CIncludeDirs != "" && (SysRoot.empty() || SysRoot == "/")) {
+ SmallVector dirs;
+ CIncludeDirs.split(dirs, ":");
+ for (StringRef dir : dirs) {
diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch
index b30d0d0b5d5b..d10e407260a5 100644
--- a/pkgs/development/compilers/swift/purity.patch
+++ b/pkgs/development/compilers/swift/purity.patch
@@ -11,7 +11,7 @@ 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,
+@@ -398,13 +398,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");
diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 68fa3d3613fd..d81ddd9b58f7 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "urweb-${version}";
- version = "20170720";
+ version = "20180616";
src = fetchurl {
- url = "http://www.impredicative.com/ur/${name}.tgz";
- sha256 = "17qh9mcmlhbv6r52yij8l9ik7j7x6x7c09lf6pznnbdh4sf8p5wb";
+ url = "https://github.com/urweb/urweb/releases/download/${version}/${name}.tar.gz";
+ sha256 = "04iy2ky78q6w0d2xyfz2a1k26g2yrwsh1hw1bgs5ia9v3ih965r1";
};
buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite ];
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index a4a8aa980b62..a721625b1f46 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -31,6 +31,8 @@ let
] ++ lib.optional (atLeast "0.38") graphviz
++ extraBuildInputs;
+ enableParallelBuilding = true;
+
doCheck = false; # fails, requires dbus daemon
meta = with stdenv.lib; {
@@ -45,28 +47,34 @@ let
in rec {
vala_0_34 = generic {
major = "0.34";
- minor = "17";
- sha256 = "0wd2zxww4z1ys4iqz218lvzjqjjqwsaad4x2by8pcyy43sbr7qp2";
+ minor = "18";
+ sha256 = "1lhw3ghns059y5d6pdldy5p4yjwlhcls84k892i6qmbhxg34945q";
};
vala_0_36 = generic {
major = "0.36";
- minor = "13";
- sha256 = "0gxz7yisd9vh5d2889p60knaifz5zndgj98zkdfkkaykdfdq4m9k";
+ minor = "15";
+ sha256 = "11lnwjbhiz2l7g6y1f0jb0s81ymgssinlil3alibzcwmzpk175ix";
};
vala_0_38 = generic {
major = "0.38";
- minor = "9";
- sha256 = "1dh1qacfsc1nr6hxwhn9lqmhnq39rv8gxbapdmj1v65zs96j3fn3";
+ minor = "10";
+ sha256 = "1rdwwqs973qv225v8b5izcgwvqn56jxgr4pa3wxxbliar3aww5sw";
extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool;
};
vala_0_40 = generic {
major = "0.40";
- minor = "6";
- sha256 = "1qjbwhifwwqbdg5zilvnwm4n76g8p7jwqs3fa0biw3rylzqm193d";
+ minor = "11";
+ sha256 = "0xhm61kjdws167pafcji43s7icfvpq58lkbq3irb1jv3icjr3i8z";
};
- vala = vala_0_38;
+ vala_0_42 = generic {
+ major = "0.42";
+ minor = "3";
+ sha256 = "0zaq9009wqk5aah131m426a2ia0scwpjpl4npf8p7p43wv8kvisz";
+ };
+
+ vala = vala_0_42;
}
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
new file mode 100644
index 000000000000..a26bc41c5945
--- /dev/null
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, fetchFromGitHub
+, automake, autoconf, readline
+, libX11, bluez, SDL2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "X11basic";
+ version = "1.26";
+ name = pname + "-" + version;
+
+ src = fetchFromGitHub {
+ owner = "kollokollo";
+ repo = pname;
+ rev = version;
+ sha256 = "0rwj9cf496xailply0rgw695bzdladh2dhy7vdqac1pwbkl53nvd";
+ };
+
+ buildInputs = [
+ autoconf automake readline libX11 SDL2 bluez
+ ];
+
+ preConfigure = "cd src;autoconf";
+
+ configureFlags = [
+ "--with-bluetooth"
+ "--with-usb"
+ "--with-readline"
+ "--with-sdl"
+ "--with-x"
+ "--enable-cryptography"
+ ];
+
+ preInstall = ''
+ touch x11basic.{eps,svg}
+ mkdir -p $out/{bin,lib}
+ mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+ cp -r ../examples $out/share/.
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://x11-basic.sourceforge.net/;
+ description = "A Basic interpreter and compiler with graphics capabilities.";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ edwtjo ];
+ platforms = platforms.unix;
+ };
+
+}
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 532fc04a447f..275a25c84959 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -8,14 +8,14 @@ with builtins;
stdenv.mkDerivation rec {
name = "yosys-${version}";
- version = "2018.08.08";
+ version = "2018.10.17";
srcs = [
(fetchFromGitHub {
owner = "yosyshq";
repo = "yosys";
- rev = "93efbd5d158e374a0abe2afb06484ccc14aa2c88";
- sha256 = "13y7rzpykihal789hyibg629gwj5bh1s0782y5xxj6jlg0bc9ly8";
+ rev = "yosys-0.8";
+ sha256 = "1qwbp8gynlklawzvpa4gdn2x0hs8zln0s3kxjqkhfcjfxffdcpvv";
name = "yosys";
})
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 44d1f7bfe4a2..fd95635616fc 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -1,30 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2 }:
+{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }:
stdenv.mkDerivation rec {
- version = "0.2.0";
+ version = "0.3.0";
name = "zig-${version}";
src = fetchFromGitHub {
- owner = "zig-lang";
+ owner = "ziglang";
repo = "zig";
rev = "${version}";
- sha256 = "0lym28z9mj6hfiq78x1fsd8y89h8xyfc1jgqyazi1g9r72427n07";
+ sha256 = "089ywagxjjh7gxv8h8yg7jpmryzjf7n4m5irhdkhp2966d03kyxm";
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 ];
+ buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ];
cmakeFlags = [
- "-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include"
- "-DZIG_LIBC_LIB_DIR=${stdenv.cc.libc}/lib"
"-DCMAKE_BUILD_TYPE=Release"
- "-DZIG_EACH_LIB_RPATH=On"
];
- preConfigure = ''
- cmakeFlags="$cmakeFlags -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) -DZIG_DYNAMIC_LINKER=$(cc -print-file-name=ld-linux-x86-64.so.2)"
- '';
-
meta = with stdenv.lib; {
description = "Programming languaged designed for robustness, optimality, and clarity";
homepage = https://ziglang.org/;
diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix
new file mode 100644
index 000000000000..217c2ad53445
--- /dev/null
+++ b/pkgs/development/coq-modules/Cheerios/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchFromGitHub, coq, StructTact }:
+
+let params =
+ {
+ "8.6" = {
+ version = "20181102";
+ rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
+ sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
+ };
+
+ "8.7" = {
+ version = "20181102";
+ rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
+ sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
+ };
+
+ "8.8" = {
+ version = "20181102";
+ rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
+ sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
+ };
+
+ "8.9" = {
+ version = "20181102";
+ rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
+ sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
+ };
+ };
+ param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-Cheerios-${param.version}";
+
+ src = fetchFromGitHub {
+ owner = "uwplse";
+ repo = "cheerios";
+ inherit (param) rev sha256;
+ };
+
+ buildInputs = [
+ coq coq.ocaml coq.camlp5 coq.findlib StructTact
+ ];
+ enableParallelBuilding = true;
+
+ buildPhase = "make -j$NIX_BUILD_CORES";
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
+ };
+}
diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix
new file mode 100644
index 000000000000..355b9e439277
--- /dev/null
+++ b/pkgs/development/coq-modules/InfSeqExt/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchFromGitHub, coq, mathcomp }:
+
+let params =
+ {
+ "8.5" = {
+ version = "20180918";
+ rev = "243d6be45666da73a9da6c37d451327165275798";
+ sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
+ };
+
+ "8.6" = {
+ version = "20180918";
+ rev = "243d6be45666da73a9da6c37d451327165275798";
+ sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
+ };
+
+ "8.7" = {
+ version = "20180918";
+ rev = "243d6be45666da73a9da6c37d451327165275798";
+ sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
+ };
+
+ "8.8" = {
+ version = "20180918";
+ rev = "243d6be45666da73a9da6c37d451327165275798";
+ sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
+ };
+
+ "8.9" = {
+ version = "20180918";
+ rev = "243d6be45666da73a9da6c37d451327165275798";
+ sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
+ };
+ };
+ param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-InfSeqExt-${param.version}";
+
+ src = fetchFromGitHub {
+ owner = "DistributedComponents";
+ repo = "InfSeqExt";
+ inherit (param) rev sha256;
+ };
+
+ buildInputs = [
+ coq coq.ocaml coq.camlp5 coq.findlib mathcomp
+ ];
+ enableParallelBuilding = true;
+
+ buildPhase = "make -j$NIX_BUILD_CORES";
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
+ };
+}
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 35cf63af8627..d532020d663c 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
- buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
propagatedBuildInputs = [ coq ssreflect ];
enableParallelBuilding = false;
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = git://github.com/QuickChick/QuickChick.git;
+ homepage = https://github.com/QuickChick/QuickChick;
description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck";
maintainers = with maintainers; [ jwiegley ];
platforms = coq.meta.platforms;
diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix
new file mode 100644
index 000000000000..1fd6187e049d
--- /dev/null
+++ b/pkgs/development/coq-modules/StructTact/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchFromGitHub, coq, mathcomp }:
+
+let params =
+ {
+ "8.5" = {
+ version = "20181102";
+ rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
+ sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
+ };
+
+ "8.6" = {
+ version = "20181102";
+ rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
+ sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
+ };
+
+ "8.7" = {
+ version = "20181102";
+ rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
+ sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
+ };
+
+ "8.8" = {
+ version = "20181102";
+ rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
+ sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
+ };
+
+ "8.9" = {
+ version = "20181102";
+ rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
+ sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
+ };
+ };
+ param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-StructTact-${param.version}";
+
+ src = fetchFromGitHub {
+ owner = "uwplse";
+ repo = "StructTact";
+ inherit (param) rev sha256;
+ };
+
+ buildInputs = [
+ coq coq.ocaml coq.camlp5 coq.findlib
+ ];
+ enableParallelBuilding = true;
+
+ buildPhase = "make -j$NIX_BUILD_CORES";
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
+ };
+}
diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix
new file mode 100644
index 000000000000..cd7ddfefb84a
--- /dev/null
+++ b/pkgs/development/coq-modules/Velisarios/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, coq }:
+
+let params =
+ {
+ "8.6" = {
+ version = "20180221";
+ rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+ sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+ };
+
+ "8.7" = {
+ version = "20180221";
+ rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+ sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+ };
+
+ "8.8" = {
+ version = "20180221";
+ rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b";
+ sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2";
+ };
+ };
+ param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-Velisarios-${param.version}";
+
+ src = fetchFromGitHub {
+ owner = "vrahli";
+ repo = "Velisarios";
+ inherit (param) rev sha256;
+ };
+
+ buildInputs = [
+ coq coq.ocaml coq.camlp5 coq.findlib
+ ];
+ enableParallelBuilding = true;
+
+ buildPhase = "make -j$NIX_BUILD_CORES";
+ preBuild = "./create-makefile.sh";
+ installPhase = ''
+ mkdir -p $out/lib/coq/${coq.coq-version}/Velisarios
+ cp -pR model/*.vo $out/lib/coq/${coq.coq-version}/Velisarios
+ '';
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ];
+ };
+}
diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix
new file mode 100644
index 000000000000..9f54eb67c72a
--- /dev/null
+++ b/pkgs/development/coq-modules/Verdi/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchFromGitHub, coq, mathcomp, StructTact, InfSeqExt, Cheerios }:
+
+let params =
+ {
+ "8.6" = {
+ version = "20181102";
+ rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
+ sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
+ };
+
+ "8.7" = {
+ version = "20181102";
+ rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
+ sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
+ };
+
+ "8.8" = {
+ version = "20181102";
+ rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
+ sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
+ };
+
+ "8.9" = {
+ version = "20181102";
+ rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
+ sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
+ };
+ };
+ param = params."${coq.coq-version}";
+in
+
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-verdi-${param.version}";
+
+ src = fetchFromGitHub {
+ owner = "uwplse";
+ repo = "verdi";
+ inherit (param) rev sha256;
+ };
+
+ buildInputs = [
+ coq coq.ocaml coq.camlp5 coq.findlib mathcomp StructTact InfSeqExt Cheerios
+ ];
+ enableParallelBuilding = true;
+
+ buildPhase = "make -j$NIX_BUILD_CORES";
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
+ };
+}
diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
index 9c24e77e0f78..bffa5172b0e4 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341";
};
+ buildInputs = [ coq ];
propagatedBuildInputs = [ mathcomp ];
patches = [./0001-changes-to-work-with-Coq-8.6.patch];
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index 474ce05c1d47..0d5a892e2e96 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -1,6 +1,11 @@
{ stdenv, fetchFromGitHub, coq }:
let params =
+ let v_8_8_0 = {
+ rev = "V8.8.0";
+ sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
+ };
+ in
{
"8.6" = {
rev = "v8.6.0";
@@ -10,10 +15,8 @@ let params =
rev = "V8.7.0";
sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl";
};
- "8.8" = {
- rev = "V8.8+beta1";
- sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg";
- };
+ "8.8" = v_8_8_0;
+ "8.9" = v_8_8_0;
};
param = params."${coq.coq-version}"
; in
@@ -28,7 +31,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
- buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix
index 795c177bc80d..94ed29456923 100644
--- a/pkgs/development/coq-modules/category-theory/default.nix
+++ b/pkgs/development/coq-modules/category-theory/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, fetchgit, coq, ssreflect }:
+{ stdenv, fetchgit, coq, ssreflect, equations }:
-let param =
- {
- "8.6" = {
+let
+ params =
+ let
+ v20180709 = {
version = "20180709";
rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
};
-
- "8.7" = {
- version = "20180709";
- rev = "3b9ba7b26a64d49a55e8b6ccea570a7f32c11ead";
- sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs";
+ v20181016 = {
+ version = "20181016";
+ rev = "8049479c5aee00ed0b92e5edc7c8996aebf48208";
+ sha256 = "14f9rlwh8vgmcl6njykvsiwxx0jn623375afixk26mzpy12zdcph";
};
-
- }."${coq.coq-version}"
-; in
+ in {
+ "8.6" = v20180709;
+ "8.7" = v20180709;
+ "8.8" = v20181016;
+ };
+ param = params."${coq.coq-version}";
+in
stdenv.mkDerivation rec {
@@ -26,8 +30,8 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
- buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
- propagatedBuildInputs = [ coq ssreflect ];
+ buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]);
+ propagatedBuildInputs = [ ssreflect equations ];
enableParallelBuilding = false;
@@ -36,14 +40,14 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = git://github.com/jwiegley/category-theory.git;
+ homepage = https://github.com/jwiegley/category-theory;
description = "A formalization of category theory in Coq for personal study and practical work";
maintainers = with maintainers; [ jwiegley ];
platforms = coq.meta.platforms;
};
passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
+ compatibleCoqVersions = v: builtins.hasAttr v params;
};
}
diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index 1b310d74b82a..a1ecdd610a3e 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -12,7 +12,7 @@ let mkContrib = repo: revs: param:
sha256 = "${param.sha256}";
};
- buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
@@ -1018,7 +1018,7 @@ let mkContrib = repo: revs: param:
sha256 = "0fp3vdl79c8d759qjhk42rjfpkd0ba4pcw572f5gxn28kfwz3rrj";
};
- zfc = mkContrib "zfc" [ "8.5" "8.6" "8.7" ] {
+ zfc = mkContrib "zfc" [ "8.5" "8.6" "8.7" "8.8" ] {
version = "v8.5.0-5-gbba3259";
rev = "bba325933370fea64780b1afa2fad54c1b567819";
sha256 = "0iwkpmc22nwasrk4g7ki4s5y05zjs7kmqk3j98giwp2wiavhgapn";
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 5e6ee7fac6f1..28a7c1ec1f6f 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -6,6 +6,7 @@ let params =
"8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
"8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; };
"8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; };
+ "8.9" = { version = "0.10.0"; sha256 = "1kxi5bmjwi5zqlqgkyzhhxwgcih7wf60cyw9398k2qjkmi186r4a"; };
};
param = params."${coq.coq-version}";
in
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
inherit (param) sha256;
};
- buildInputs = [ coq.ocaml coq.camlp5 ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 ];
propagatedBuildInputs = [ coq ];
enableParallelBuilding = true;
diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix
index a66e941a8c9c..57f31e1847c1 100644
--- a/pkgs/development/coq-modules/coq-haskell/default.nix
+++ b/pkgs/development/coq-modules/coq-haskell/default.nix
@@ -19,6 +19,12 @@ let params =
rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
};
+
+ "8.8" = {
+ version = "20171215";
+ rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968";
+ sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv";
+ };
};
param = params."${coq.coq-version}";
in
@@ -32,7 +38,7 @@ stdenv.mkDerivation rec {
inherit (param) rev sha256;
};
- buildInputs = [ coq.ocaml coq.camlp5 coq.findlib ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib ];
propagatedBuildInputs = [ coq ssreflect ];
enableParallelBuilding = false;
@@ -42,7 +48,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = git://github.com/jwiegley/coq-haskell.git;
+ homepage = https://github.com/jwiegley/coq-haskell;
description = "A library for formalizing Haskell types and functions in Coq";
maintainers = with maintainers; [ jwiegley ];
platforms = coq.meta.platforms;
diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix
new file mode 100644
index 000000000000..54cb7c50e407
--- /dev/null
+++ b/pkgs/development/coq-modules/coqprime/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, coq, bignums }:
+
+let params =
+ {
+ "8.7" = {
+ version = "8.7.2";
+ sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k";
+ };
+ "8.8" = {
+ version = "8.8";
+ sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5";
+ };
+ };
+ param = params."${coq.coq-version}"
+; in
+
+stdenv.mkDerivation rec {
+
+ inherit (param) version;
+ name = "coq${coq.coq-version}-coqprime-${version}";
+
+ src = fetchFromGitHub {
+ owner = "thery";
+ repo = "coqprime";
+ rev = "v${version}";
+ inherit (param) sha256;
+ };
+
+ buildInputs = [ coq ];
+
+ propagatedBuildInputs = [ bignums ];
+
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ meta = with stdenv.lib; {
+ description = "Library to certify primality using Pocklington certificate and Elliptic Curve Certificate";
+ license = licenses.lgpl21;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (coq.meta) platforms;
+ inherit (src.meta) homepage;
+ };
+
+ passthru = {
+ compatibleCoqVersions = v: builtins.hasAttr v params;
+ };
+}
diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix
new file mode 100644
index 000000000000..dc0f0873d07e
--- /dev/null
+++ b/pkgs/development/coq-modules/corn/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, coq, bignums, math-classes }:
+
+stdenv.mkDerivation rec {
+ pname = "corn";
+ version = "8.8.1";
+ name = "coq${coq.coq-version}-${pname}-${version}";
+ src = fetchFromGitHub {
+ owner = "coq-community";
+ repo = pname;
+ rev = version;
+ sha256 = "0gh32j0f18vv5lmf6nb87nr5450w6ai06rhrnvlx2wwi79gv10wp";
+ };
+
+ buildInputs = [ coq ];
+
+ preConfigure = "patchShebangs ./configure.sh";
+ configureScript = "./configure.sh";
+ dontAddPrefix = true;
+
+ propagatedBuildInputs = [ bignums math-classes ];
+
+ enableParallelBuilding = true;
+
+ installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+ meta = {
+ homepage = http://c-corn.github.io/;
+ license = stdenv.lib.licenses.gpl2;
+ description = "A Coq library for constructive analysis";
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ inherit (coq.meta) platforms;
+ };
+
+ passthru = {
+ compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+ };
+
+}
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 5b9437e7c279..e403f7d4fb5c 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
+{ stdenv, fetchFromGitHub, autoreconfHook, coq }:
let params = {
"8.8" = {
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ coq coq.camlp5 ]
- ++ (with ocamlPackages; [ ocaml findlib ocamlgraph ]);
+ buildInputs = [ coq ]
+ ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ocamlgraph ]);
preInstall = ''
mkdir -p $out/bin
diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index fa17d37b4bd3..3f049eed34be 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
sha256 = "${param.sha256}";
};
- buildInputs = [ coq.ocaml coq.camlp5 coq.findlib coq ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ];
preBuild = "coq_makefile -f _CoqProject -o Makefile";
diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix
index bc5c0fdd6bb7..4abaec6528a9 100644
--- a/pkgs/development/coq-modules/fiat/HEAD.nix
+++ b/pkgs/development/coq-modules/fiat/HEAD.nix
@@ -1,23 +1,23 @@
-{stdenv, fetchgit, coq, ocamlPackages, python27}:
+{stdenv, fetchgit, coq, python27}:
stdenv.mkDerivation rec {
name = "coq-fiat-${coq.coq-version}-unstable-${version}";
- version = "2018-02-27";
+ version = "2016-10-24";
src = fetchgit {
url = "https://github.com/mit-plv/fiat.git";
- rev = "253fc133397f73d6daed0b9518ca7ab5507a1cb0";
- sha256 = "0b5z7nz0cr1s7vy04s996dj0pd7ljqx6g5a8syh4hy2z87ijkjzd";
+ rev = "7feb6c64be9ebcc05924ec58fe1463e73ec8206a";
+ sha256 = "0griqc675yylf9rvadlfsabz41qy5f5idya30p5rv6ysiakxya64";
};
- buildInputs = [ ocamlPackages.ocaml ocamlPackages.camlp5_transitional
- ocamlPackages.findlib python27 ];
- propagatedBuildInputs = [ coq ];
+ buildInputs = [ coq python27 ] ++ (with coq.ocamlPackages; [ ocaml camlp5 ]);
+
+ prePatch = "patchShebangs etc/coq-scripts";
doCheck = false;
- enableParallelBuilding = true;
+ enableParallelBuilding = false;
buildPhase = "make -j$NIX_BUILD_CORES";
installPhase = ''
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
};
passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+ compatibleCoqVersions = v: v == "8.5";
};
}
diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix
index 092337125a4d..ff7385a9222e 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/pkgs/development/coq-modules/flocq/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3";
};
- buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 bash which autoconf automake ];
propagatedBuildInputs = [ coq ];
buildPhase = ''
diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix
index bf441562b14e..03149bab58b1 100644
--- a/pkgs/development/coq-modules/heq/default.nix
+++ b/pkgs/development/coq-modules/heq/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "03y71c4qs6cmy3s2hjs05g7pcgk9sqma6flj15394yyxbvr9is1p";
};
- buildInputs = [ coq.ocaml coq.camlp5 unzip ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
propagatedBuildInputs = [ coq ];
preBuild = "cd src";
diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix
index 1831cd0c5714..364366ced497 100644
--- a/pkgs/development/coq-modules/math-classes/default.nix
+++ b/pkgs/development/coq-modules/math-classes/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-math-classes-${version}";
- version = "1.0.7";
+ version = "8.8.1";
src = fetchFromGitHub {
- owner = "math-classes";
+ owner = "coq-community";
repo = "math-classes";
rev = version;
- sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi";
+ sha256 = "05vlrrwnlfhd7l3xwn4zwpnkwvziw84zpd9775c6ffb83z48ri1r";
};
buildInputs = [ coq bignums ];
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 92c3c87774ab..1e5b6b7bf666 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,29 +1,65 @@
-{ callPackage, fetchurl, coq }:
+{ stdenv, fetchFromGitHub, coq, ncurses, which
+, graphviz, withDoc ? false
+}:
let param =
- let param_1_7 = {
- version = "1.7.0";
- sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39";
- }; in
-
+ if stdenv.lib.versionAtLeast coq.coq-version "8.6" then
{
- "8.5" = {
- version = "1.6.1";
- sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
- };
+ version = "1.7.0";
+ sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
+ }
+ else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then
+ {
+ version = "1.6.1";
+ sha256 = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i";
+ }
+ else throw "No version of math-comp is available for Coq ${coq.coq-version}";
- "8.6" = param_1_7;
- "8.7" = param_1_7;
- "8.8" = param_1_7;
+in
- }."${coq.coq-version}"
-; in
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-mathcomp-${version}";
-callPackage ./generic.nix {
- name = "coq${coq.coq-version}-mathcomp-${param.version}";
- src = fetchurl {
- url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
+ # used in ssreflect
+ inherit (param) version;
+
+ src = fetchFromGitHub {
+ owner = "math-comp";
+ repo = "math-comp";
+ rev = "mathcomp-${param.version}";
inherit (param) sha256;
};
+
+ nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
+ buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
+
+ enableParallelBuilding = true;
+
+ buildFlags = stdenv.lib.optionalString withDoc "doc";
+
+ COQBIN = "${coq}/bin/";
+
+ preBuild = ''
+ patchShebangs etc/utils/ssrcoqdep || true
+ cd mathcomp
+ '';
+
+ installPhase = ''
+ make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+ '' + stdenv.lib.optionalString withDoc ''
+ make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://ssr.msr-inria.inria.fr/;
+ license = licenses.cecill-b;
+ maintainers = [ maintainers.vbgl maintainers.jwiegley ];
+ platforms = coq.meta.platforms;
+ };
+
+ passthru = {
+ compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5";
+ };
+
}
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
deleted file mode 100644
index 22721ca98bc2..000000000000
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, coq, ncurses, which
-, graphviz, withDoc ? false
-, src, name
-}:
-
-stdenv.mkDerivation {
-
- inherit name;
- inherit src;
-
- nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
- buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
- propagatedBuildInputs = [ coq ];
-
- enableParallelBuilding = true;
-
- buildFlags = stdenv.lib.optionalString withDoc "doc";
-
- preBuild = ''
- patchShebangs etc/utils/ssrcoqdep || true
- cd mathcomp
- export COQBIN=${coq}/bin/
- '';
-
- installPhase = ''
- make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
- '' + stdenv.lib.optionalString withDoc ''
- make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
- '';
-
- meta = with stdenv.lib; {
- homepage = http://ssr.msr-inria.inria.fr/;
- license = licenses.cecill-b;
- maintainers = [ maintainers.vbgl maintainers.jwiegley ];
- platforms = coq.meta.platforms;
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
- };
-
-}
diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix
index f6316f77a1fa..46a6cafb6ab8 100644
--- a/pkgs/development/coq-modules/metalib/default.nix
+++ b/pkgs/development/coq-modules/metalib/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit;
};
- buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott coq.findlib ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 which coq lngen ott findlib ];
propagatedBuildInputs = [ coq ];
enableParallelBuilding = true;
diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix
index 94a24eb70858..86a1301d3c76 100644
--- a/pkgs/development/coq-modules/paco/default.nix
+++ b/pkgs/development/coq-modules/paco/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1lcmdr0y2d7gzyvr8dal3pi7fibbd60bpi1l32fw89xiyrgqhsqy";
};
- buildInputs = [ coq.ocaml coq.camlp5 unzip ];
+ buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
propagatedBuildInputs = [ coq ];
preBuild = "cd src";
diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
new file mode 100644
index 000000000000..b945e7c9a866
--- /dev/null
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, coq }:
+
+stdenv.mkDerivation rec {
+ version = "0.2";
+ name = "coq${coq.coq-version}-simple-io-${version}";
+ src = fetchFromGitHub {
+ owner = "Lysxia";
+ repo = "coq-simple-io";
+ rev = version;
+ sha256 = "1sbcf57gn134risiicpbxsf4kbzdq7klfn4vn8525kahlr82l65f";
+ };
+
+ buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]);
+
+ doCheck = !stdenv.lib.versionAtLeast coq.coq-version "8.9";
+ checkTarget = "test";
+
+ installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+
+ meta = {
+ description = "Purely functional IO for Coq";
+ inherit (src.meta) homepage;
+ inherit (coq.meta) platforms;
+ license = stdenv.lib.licenses.mit;
+ maintainers = [ stdenv.lib.maintainers.vbgl ];
+ };
+
+ passthru = {
+ compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+ };
+
+}
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 9e9c3c7957aa..1fcb7e2da8ae 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,29 +1,32 @@
-{ callPackage, fetchurl, coq }:
+{ stdenv, fetchFromGitHub, coq, ncurses, which
+, graphviz, mathcomp, withDoc ? false
+}:
-let param =
+stdenv.mkDerivation rec {
+ name = "coq${coq.coq-version}-ssreflect-${version}";
- let param_1_7 = {
- version = "1.7.0";
- sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39";
- }; in
+ inherit (mathcomp) src version meta;
- {
- "8.5" = {
- version = "1.6.1";
- sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
- };
+ nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
+ buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]);
- "8.6" = param_1_7;
- "8.7" = param_1_7;
- "8.8" = param_1_7;
+ enableParallelBuilding = true;
- }."${coq.coq-version}"
-; in
+ COQBIN = "${coq}/bin/";
-callPackage ./generic.nix {
- name = "coq${coq.coq-version}-ssreflect-${param.version}";
- src = fetchurl {
- url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
- inherit (param) sha256;
- };
+ preBuild = ''
+ patchShebangs etc/utils/ssrcoqdep || true
+ cd mathcomp/ssreflect
+ '';
+
+ installPhase = ''
+ make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
+ '';
+
+ postInstall = stdenv.lib.optionalString withDoc ''
+ mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
+ cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
+ '';
+
+ passthru.compatibleCoqVersions = mathcomp.compatibleCoqVersions;
}
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
deleted file mode 100644
index d09e47a7f845..000000000000
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, coq, ncurses, which
-, graphviz, withDoc ? false
-, src, name, patches ? []
-}:
-
-stdenv.mkDerivation {
-
- inherit name;
- inherit src;
-
- nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
- buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
- propagatedBuildInputs = [ coq ];
-
- enableParallelBuilding = true;
-
- inherit patches;
-
- preBuild = ''
- patchShebangs etc/utils/ssrcoqdep || true
- cd mathcomp/ssreflect
- export COQBIN=${coq}/bin/
- '';
-
- installPhase = ''
- make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
- '';
-
- postInstall = ''
- # mkdir -p $out/bin
- # cp -p bin/ssrcoq $out/bin
- # cp -p bin/ssrcoq.byte $out/bin
- '' + stdenv.lib.optionalString withDoc ''
- mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
- cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/
- '';
-
- meta = with stdenv.lib; {
- homepage = http://ssr.msr-inria.inria.fr/;
- license = licenses.cecill-b;
- maintainers = with maintainers; [ vbgl jwiegley ];
- platforms = coq.meta.platforms;
- };
-
- passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
- };
-
-}
diff --git a/pkgs/development/dhall-modules/default.nix b/pkgs/development/dhall-modules/default.nix
new file mode 100644
index 000000000000..b6632a86f31f
--- /dev/null
+++ b/pkgs/development/dhall-modules/default.nix
@@ -0,0 +1,9 @@
+{ pkgs }:
+
+# TODO: add into the toplevel fixpoint instead of using rec
+rec {
+
+ prelude = prelude_3_0_0;
+ prelude_3_0_0 = pkgs.callPackage ./prelude/v3.nix {};
+
+}
diff --git a/pkgs/development/dhall-modules/prelude/v3.nix b/pkgs/development/dhall-modules/prelude/v3.nix
new file mode 100644
index 000000000000..ef673310ceb0
--- /dev/null
+++ b/pkgs/development/dhall-modules/prelude/v3.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+ name = "dhall-prelude";
+
+ src = fetchFromGitHub {
+ owner = "dhall-lang";
+ repo = "dhall-lang";
+ # Commit where the v3.0.0 prelude folder was merged into dhall-lang
+ # and a LICENSE file has been added.
+ rev = "f6aa9399f1ac831d66c34104abe6856023c5b2df";
+ sha256 = "0kqjgh3y1l3cb3rj381j7c09547g1vh2dsfzpm08y1qajhhf9vgf";
+ };
+
+ phases = [ "unpackPhase" "installPhase" ];
+
+ installPhase = ''
+ cp -r Prelude $out
+ '';
+
+ meta = {
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ Profpatsch ];
+ };
+}
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 9b6f80e0f837..6af5f72f2b73 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,5 +1,5 @@
-{ go, govers, parallel, lib, fetchgit, fetchhg, fetchbzr, rsync
-, removeReferencesTo, fetchFromGitHub }:
+{ go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync
+, removeReferencesTo, fetchFromGitHub, stdenv }:
{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
, shellHook ? ""
@@ -78,9 +78,11 @@ go.stdenv.mkDerivation (
(builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
inherit name;
- nativeBuildInputs = [ removeReferencesTo go parallel ]
+ nativeBuildInputs = [ removeReferencesTo go ]
++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
- buildInputs = [ go ] ++ buildInputs;
+ buildInputs = buildInputs;
+
+ inherit (go) GOOS GOARCH;
configurePhase = args.configurePhase or ''
runHook preConfigure
@@ -103,6 +105,7 @@ go.stdenv.mkDerivation (
'') + ''
export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
+ export GOCACHE=$TMPDIR/go-cache
runHook postConfigure
'';
@@ -161,19 +164,31 @@ go.stdenv.mkDerivation (
else
touch $TMPDIR/buildFlagsArray
fi
- export -f buildGoDir # parallel needs to see the function
+ export -f buildGoDir # xargs needs to see the function
if [ -z "$enableParallelBuilding" ]; then
export NIX_BUILD_CORES=1
fi
- getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install
-
+ getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' --
+ '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ # normalize cross-compiled builds w.r.t. native builds
+ (
+ dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH}
+ if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
+ mv $dir/* $dir/..
+ fi
+ if [[ -d $dir ]]; then
+ rmdir $dir
+ fi
+ )
+ '' + ''
runHook postBuild
'';
+ doCheck = args.doCheck or false;
checkPhase = args.checkPhase or ''
runHook preCheck
- getGoDirs test | parallel -j $NIX_BUILD_CORES buildGoDir test
+ getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' --
runHook postCheck
'';
@@ -192,9 +207,6 @@ go.stdenv.mkDerivation (
find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
'';
- # Disable go cache, which is not reused in nix anyway
- GOCACHE = "off";
-
shellHook = ''
d=$(mktemp -d "--suffix=-$name")
'' + toString (map (dep: ''
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix
index 32a22566bdb1..4bd49b06796d 100644
--- a/pkgs/development/guile-modules/guile-cairo/default.nix
+++ b/pkgs/development/guile-modules/guile-cairo/default.nix
@@ -2,19 +2,20 @@
stdenv.mkDerivation rec {
name = "guile-cairo-${version}";
- version = "1.4.1";
+ version = "1.10.0";
src = fetchurl {
- url = "http://download.gna.org/guile-cairo/${name}.tar.gz";
- sha256 = "1f5nd9n46n6cwfl1byjml02q3y2hgn7nkx98km1czgwarxl7ws3x";
+ url = "mirror://savannah/guile-cairo/${name}.tar.gz";
+ sha256 = "0p6xrhf2k6n5dybn88050za7h90gnd7534n62l53vsca187pwgdf";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ guile cairo expat ];
- checkInputs = [ guile-lib ];
+ enableParallelBuilding = true;
doCheck = true;
+ checkInputs = [ guile-lib ];
meta = with stdenv.lib; {
description = "Cairo bindings for GNU Guile";
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
maintained graphics library with all of the benefits of Scheme: memory
management, exceptions, macros, and a dynamic programming environment.
'';
- homepage = "http://home.gna.org/guile-cairo/";
+ homepage = https://www.nongnu.org/guile-cairo/;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ vyp ];
platforms = platforms.linux;
diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix
index 12648cab7dc3..26fffac0a131 100644
--- a/pkgs/development/guile-modules/guile-gnome/default.nix
+++ b/pkgs/development/guile-modules/guile-gnome/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
guile-gnome a comprehensive environment for developing modern
applications.
'';
- homepage = "http://www.gnu.org/software/guile-gnome/";
+ homepage = "https://www.gnu.org/software/guile-gnome/";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ vyp ];
platforms = platforms.linux;
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index 35eb4667bd6b..c3aa84007917 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
modules into a coherent library. Think "a down-scaled, limited-scope CPAN
for Guile".
'';
- homepage = "http://www.nongnu.org/guile-lib/";
+ homepage = "https://www.nongnu.org/guile-lib/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ vyp ];
platforms = platforms.gnu ++ platforms.linux;
diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix
index f854c71c240f..e1e04ecfe699 100644
--- a/pkgs/development/guile-modules/guile-opengl/default.nix
+++ b/pkgs/development/guile-modules/guile-opengl/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Guile bindings for the OpenGL graphics API";
- homepage = "http://gnu.org/s/guile-opengl";
+ homepage = "https://www.gnu.org/software/guile-opengl/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ vyp ];
platforms = platforms.linux;
diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix
index 010c523507fd..35bcd7bfc2f3 100644
--- a/pkgs/development/guile-modules/guile-reader/default.nix
+++ b/pkgs/development/guile-modules/guile-reader/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
"token readers" of a standard Scheme readers. For example, it
is used to implement Skribilo's R5RS-derived document syntax.
'';
- homepage = https://www.gnu.org/software/guile-reader;
+ homepage = https://www.nongnu.org/guile-reader/;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.gnu;
diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix
index 5f887c3a7be6..a606b3ecf288 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Guile bindings for SDL";
- homepage = "http://gnu.org/s/guile-sdl";
+ homepage = "https://www.gnu.org/software/guile-sdl/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ vyp ];
platforms = platforms.linux;
diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix
index b20fc162ef3b..e4a548ae376b 100644
--- a/pkgs/development/guile-modules/guile-sdl2/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl2/default.nix
@@ -5,18 +5,18 @@
let
name = "${pname}-${version}";
pname = "guile-sdl2";
- version = "0.2.0";
+ version = "0.3.1";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "https://files.dthompson.us/${pname}/${name}.tar.gz";
- sha256 = "0yq9lsl17cdvj77padvpk3jcw2g6g0pck9jrchc7n2767rrc012b";
+ sha256 = "0bw7x2lx90k4banc5k7yfkn3as93y25gr1xdr225ll7lmij21k64";
};
+ nativeBuildInputs = [ libtool pkgconfig ];
buildInputs = [
- guile libtool pkgconfig
- SDL2 SDL2_image SDL2_ttf SDL2_mixer
+ guile SDL2 SDL2_image SDL2_ttf SDL2_mixer
];
configureFlags = [
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d2b9d566786f..28d5e50e96ff 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -33,7 +33,7 @@ self: super: {
unbuildable = throw "package depends on meta package 'unbuildable'";
# Use the latest version of the Cabal library.
- cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
+ cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_1_0; });
# The test suite depends on old versions of tasty and QuickCheck.
hackage-security = dontCheck super.hackage-security;
@@ -86,35 +86,24 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "0a7h21cwfvprj5xfyivjzg2hbs71xp85l9v6kyp58mlqvwy3zffl";
+ sha256 = "0wczijw80pw31k6h3a65m76aq9i02aarr2zxl7k5m7p0l6rn82vd";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
};
- esqueleto = overrideSrc (addBuildDepend (dontCheck (dontHaddock super.esqueleto)) self.unliftio) {
- src = pkgs.fetchFromGitHub {
- owner = "bitemyapp";
- repo = "esqueleto";
- rev = "b81e0d951e510ebffca03c5a58658ad884cc6fbd";
- sha256 = "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa";
- };
- };
+
+ # https://github.com/bitemyapp/esqueleto/issues/105
+ esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
# Fix test trying to access /home directory
- shell-conduit = (overrideCabal super.shell-conduit (drv: {
+ shell-conduit = overrideCabal super.shell-conduit (drv: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs";
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
# see: https://github.com/psibi/shell-conduit/issues/12
doCheck = !pkgs.stdenv.isDarwin;
- })).overrideScope (self: super: {
- # shell-conduit doesn't build with conduit 1.3
- # see https://github.com/psibi/shell-conduit/issues/15
- conduit = self.conduit_1_2_13_1;
- conduit-extra = self.conduit-extra_1_2_3_2;
- resourcet = self.resourcet_1_1_11;
});
# https://github.com/froozen/kademlia/issues/2
@@ -257,6 +246,10 @@ self: super: {
# Fails for non-obvious reasons while attempting to use doctest.
search = dontCheck super.search;
+ # see https://github.com/LumiGuide/haskell-opencv/commit/cd613e200aa20887ded83256cf67d6903c207a60
+ opencv = dontCheck (appendPatch super.opencv ./patches/opencv-fix-116.patch);
+ opencv-extra = dontCheck (appendPatch super.opencv-extra ./patches/opencv-fix-116.patch);
+
# https://github.com/ekmett/structures/issues/3
structures = dontCheck super.structures;
@@ -340,7 +333,7 @@ self: super: {
itanium-abi = dontCheck super.itanium-abi;
katt = dontCheck super.katt;
language-slice = dontCheck super.language-slice;
- language-nix = if pkgs.stdenv.isi686 then dontCheck super.language-nix else super.language-nix;
+ language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275
ldap-client = dontCheck super.ldap-client;
lensref = dontCheck super.lensref;
lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
@@ -349,6 +342,7 @@ self: super: {
MemoTrie = dontHaddock (dontCheck super.MemoTrie);
metrics = dontCheck super.metrics;
milena = dontCheck super.milena;
+ modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*)
nats-queue = dontCheck super.nats-queue;
netpbm = dontCheck super.netpbm;
network = dontCheck super.network;
@@ -362,6 +356,7 @@ self: super: {
optional = dontCheck super.optional;
orgmode-parse = dontCheck super.orgmode-parse;
os-release = dontCheck super.os-release;
+ pandoc-crossref = dontCheck super.pandoc-crossref; # (most likely change when no longer 0.3.2.1) https://github.com/lierdakil/pandoc-crossref/issues/199
persistent-redis = dontCheck super.persistent-redis;
pipes-extra = dontCheck super.pipes-extra;
pipes-websockets = dontCheck super.pipes-websockets;
@@ -377,6 +372,7 @@ self: super: {
safecopy = dontCheck super.safecopy;
sai-shape-syb = dontCheck super.sai-shape-syb;
scp-streams = dontCheck super.scp-streams;
+ sdl2 = dontCheck super.sdl2; # the test suite needs an x server
sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
separated = dontCheck super.separated;
shadowsocks = dontCheck super.shadowsocks;
@@ -490,6 +486,7 @@ self: super: {
# Test suite won't compile against tasty-hunit 0.10.x.
binary-parser = dontCheck super.binary-parser;
+ binary-parsers = dontCheck super.binary-parsers;
bytestring-strict-builder = dontCheck super.bytestring-strict-builder;
bytestring-tree-builder = dontCheck super.bytestring-tree-builder;
@@ -683,17 +680,18 @@ self: super: {
# https://github.com/goldfirere/singletons/issues/122
singletons = dontCheck super.singletons;
- # https://github.com/fpco/stackage/issues/838
- cryptonite = dontCheck super.cryptonite;
+ # Fix an aarch64 issue with cryptonite-0.25:
+ # https://github.com/haskell-crypto/cryptonite/issues/234
+ # This has been committed upstream, but there is, as of yet, no new release.
+ # Also, disable the test suite to avoid https://github.com/haskell-crypto/cryptonite/issues/260.
+ cryptonite = appendPatch (dontCheck super.cryptonite) (pkgs.fetchpatch {
+ url = https://github.com/haskell-crypto/cryptonite/commit/4622e5fc8ece82f4cf31358e31cd02cf020e558e.patch;
+ sha256 = "1m2d47ni4jbrpvxry50imj91qahr3r7zkqm157clrzlmw6gzpgnq";
+ });
# We cannot build this package w/o the C library from .
phash = markBroken super.phash;
- # https://github.com/deech/fltkhs/issues/16
- # linking fails because the build doesn't pull in the libGLU_combined libraries
- fltkhs = markBroken super.fltkhs;
- fltkhs-fluid-examples = dontDistribute super.fltkhs-fluid-examples;
-
# We get lots of strange compiler errors during the test suite run.
jsaddle = dontCheck super.jsaddle;
@@ -705,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: {
@@ -895,6 +890,7 @@ self: super: {
cryptohash-md5 = doJailbreak super.cryptohash-md5;
text-short = doJailbreak super.text-short;
gitHUD = dontCheck super.gitHUD;
+ githud = dontCheck super.githud;
# https://github.com/aisamanra/config-ini/issues/12
config-ini = dontCheck super.config-ini;
@@ -930,16 +926,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
@@ -952,17 +946,11 @@ 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;
+ # hledger needs a newer megaparsec version than we have in LTS 12.x.
+ hledger-lib = super.hledger-lib.overrideScope (self: super: {
+ cassava-megaparsec = self.cassava-megaparsec_2_0_0;
+ hspec-megaparsec = self.hspec-megaparsec_2_0_0;
+ megaparsec = self.megaparsec_7_0_4;
});
# Copy hledger man pages from data directory into the proper place. This code
@@ -990,7 +978,12 @@ self: super: {
mkdir -p $out/share/info
cp -v *.info* $out/share/info/
'';
- }));
+ })).overrideScope (self: super: {
+ cassava-megaparsec = self.cassava-megaparsec_2_0_0;
+ config-ini = self.config-ini_0_2_4_0;
+ hspec-megaparsec = self.hspec-megaparsec_2_0_0;
+ megaparsec = self.megaparsec_7_0_4;
+ });
hledger-web = overrideCabal super.hledger-web (drv: {
postInstall = ''
for i in $(seq 1 9); do
@@ -1004,6 +997,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;
@@ -1089,22 +1085,19 @@ 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.
+ # The tool needs a newer hpack version than the one mandated by LTS-12.x.
# Also generate shell completions.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix"
- (overrideCabal super.cabal2nix (drv: {
- preCheck = ''
- export PATH="$PWD/dist/build/cabal2nix:$PATH"
- export HOME="$TMPDIR/home"
- '';
+ (super.cabal2nix.overrideScope (self: super: {
+ hpack = self.hpack_0_31_1;
+ yaml = self.yaml_0_11_0_0;
}));
-
+ stack2nix = super.stack2nix.overrideScope (self: super: {
+ hpack = self.hpack_0_31_1;
+ yaml = self.yaml_0_11_0_0;
+ });
# Break out of "aeson <1.3, temporary <1.3".
stack = generateOptparseApplicativeCompletion "stack" (doJailbreak super.stack);
@@ -1139,10 +1132,7 @@ 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;
@@ -1153,4 +1143,69 @@ self: super: {
# Generate shell completions
purescript = generateOptparseApplicativeCompletion "purs" super.purescript;
+ # 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;
+
+ # https://github.com/DanielG/cabal-helper/issues/59
+ cabal-helper = doJailbreak super.cabal-helper;
+
+ # TODO(Profpatsch): factor out local nix store setup from
+ # lib/tests/release.nix and use that for the tests of libnix
+ # libnix = overrideCabal super.libnix (old: {
+ # testToolDepends = old.testToolDepends or [] ++ [ pkgs.nix ];
+ # });
+ libnix = dontCheck super.libnix;
+
+ # https://github.com/jmillikin/chell/issues/1
+ chell = super.chell.override { patience = self.patience_0_1_1; };
+
+ # The test suite tries to mess with ALSA, which doesn't work in the build sandbox.
+ xmobar = dontCheck super.xmobar;
+
+ # https://github.com/mgajda/json-autotype/issues/25
+ json-autotype = dontCheck super.json-autotype;
+
+ # https://github.com/kazu-yamamoto/iproute/issues/43
+ appar = self.appar_0_1_7;
+
+ # The LTS-12.x version doesn't suffice to build hlint, hoogle, etc.
+ hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
+ hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
+
} // 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
deleted file mode 100644
index 9bd45c9887f1..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ /dev/null
@@ -1,239 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
- # Suitable LLVM version.
- llvmPackages = pkgs.llvmPackages_35;
-
- # Disable GHC 7.10.x core libraries.
- array = null;
- base = null;
- binary = null;
- bin-package-db = null;
- bytestring = null;
- Cabal = null;
- containers = null;
- deepseq = null;
- directory = null;
- filepath = null;
- ghc-boot = null;
- ghc-boot-th = null;
- ghc-prim = null;
- ghci = null;
- haskeline = null;
- hoopl = null;
- hpc = null;
- integer-gmp = null;
- pretty = null;
- process = null;
- rts = null;
- template-haskell = null;
- terminfo = null;
- time = null;
- transformers = null;
- unix = null;
- xhtml = null;
-
- # These are now core libraries in GHC 8.4.x.
- 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;
-
- # Build jailbreak-cabal with the latest version of Cabal.
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
-
- gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.buildHaskellPackages.Cabal_1_24_2_0; };
-
- # https://github.com/mrkkrp/megaparsec/issues/282
- megaparsec = addBuildDepend (dontCheck super.megaparsec) self.fail;
-
- Extra = appendPatch super.Extra (pkgs.fetchpatch {
- url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
- sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
- });
-
- # Requires ghc 8.2
- ghc-proofs = dontDistribute super.ghc-proofs;
-
- # haddock: No input file(s).
- nats = dontHaddock super.nats;
- bytestring-builder = dontHaddock super.bytestring-builder;
-
- # Setup: At least the following dependencies are missing: base <4.8
- hspec-expectations = overrideCabal super.hspec-expectations (drv: {
- postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";
- });
- utf8-string = overrideCabal super.utf8-string (drv: {
- postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal";
- });
-
- # acid-state/safecopy#25 acid-state/safecopy#26
- safecopy = dontCheck (super.safecopy);
-
- # test suite broken, some instance is declared twice.
- # https://bitbucket.org/FlorianHartwig/attobencode/issue/1
- AttoBencode = dontCheck super.AttoBencode;
-
- # Test suite fails with some (seemingly harmless) error.
- # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=24
- syb = dontCheck super.syb;
-
- # Test suite has stricter version bounds
- retry = dontCheck super.retry;
-
- # test/System/Posix/Types/OrphansSpec.hs:19:13:
- # Not in scope: type constructor or class ‘Int32’
- base-orphans = dontCheck super.base-orphans;
-
- # Test suite fails with time >= 1.5
- http-date = dontCheck super.http-date;
-
- # Version 1.19.5 fails its test suite.
- happy = dontCheck super.happy;
-
- # Upstream was notified about the over-specified constraint on 'base'
- # but refused to do anything about it because he "doesn't want to
- # support a moving target". Go figure.
- barecheck = doJailbreak super.barecheck;
-
- # https://github.com/kazu-yamamoto/unix-time/issues/30
- unix-time = dontCheck super.unix-time;
-
- # diagrams/monoid-extras#19
- monoid-extras = overrideCabal super.monoid-extras (drv: {
- prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
- });
-
- # diagrams/statestack#5
- statestack = overrideCabal super.statestack (drv: {
- prePatch = "sed -i 's|4\.8|4.9|' statestack.cabal";
- });
-
- # diagrams/diagrams-core#83
- diagrams-core = overrideCabal super.diagrams-core (drv: {
- prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal";
- });
-
- timezone-olson = doJailbreak super.timezone-olson;
- xmonad-extras = overrideCabal super.xmonad-extras (drv: {
- postPatch = ''
- sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs
- '';
- });
-
- # Workaround for a workaround, see comment for "ghcjs" flag.
- jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
- in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
- self.webkitgtk3-javascriptcore ];
-
- # https://github.com/lymar/hastache/issues/47
- hastache = dontCheck super.hastache;
-
- # The compat library is empty in the presence of mtl 2.2.x.
- mtl-compat = dontHaddock super.mtl-compat;
-
- # https://github.com/bos/bloomfilter/issues/11
- bloomfilter = dontHaddock (appendConfigureFlag super.bloomfilter "--ghc-option=-XFlexibleContexts");
-
- # https://github.com/ocharles/tasty-rerun/issues/5
- tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
-
- # http://hub.darcs.net/ivanm/graphviz/issue/5
- graphviz = dontCheck (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch);
-
- # https://github.com/HugoDaniel/RFC3339/issues/14
- timerep = dontCheck super.timerep;
-
- # Required to fix version 0.91.0.0.
- wx = dontHaddock (appendConfigureFlag super.wx "--ghc-option=-XFlexibleContexts");
-
- # Inexplicable haddock failure
- # https://github.com/gregwebs/aeson-applicative/issues/2
- aeson-applicative = dontHaddock super.aeson-applicative;
-
- # GHC 7.10.1 is affected by https://github.com/srijs/hwsl2/issues/1.
- hwsl2 = dontCheck super.hwsl2;
-
- # https://github.com/haskell/haddock/issues/427
- haddock = dontCheck self.haddock_2_16_1;
-
- # haddock-api >= 2.17 is GHC 8.0 only
- haddock-api = self.haddock-api_2_16_1;
- haddock-library = self.haddock-library_1_2_1;
-
- # The tests in vty-ui do not build, but vty-ui itself builds.
- vty-ui = enableCabalFlag super.vty-ui "no-tests";
-
- # https://github.com/fpco/stackage/issues/1112
- vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ];
-
- # vector with ghc < 8.0 needs semigroups
- vector = addBuildDepend super.vector self.semigroups;
-
- # too strict dependency on directory
- tasty-ant-xml = doJailbreak super.tasty-ant-xml;
-
- # https://github.com/thoughtpolice/hs-ed25519/issues/13
- ed25519 = dontCheck super.ed25519;
-
- # Breaks a dependency cycle between QuickCheck and semigroups
- hashable = dontCheck super.hashable;
- unordered-containers = dontCheck super.unordered-containers;
-
- # GHC versions prior to 8.x require additional build inputs.
- aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
- ansi-wl-pprint = addBuildDepend super.ansi-wl-pprint self.semigroups;
- attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
- bytes = addBuildDepend super.bytes self.doctest;
- case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
- cmdargs = addBuildDepend super.cmdargs self.semigroups;
- contravariant = addBuildDepend super.contravariant self.semigroups;
- dependent-map = addBuildDepend super.dependent-map self.semigroups;
- distributive = addBuildDepend (dontCheck super.distributive) self.semigroups;
- Glob = addBuildDepends super.Glob (with self; [semigroups]);
- hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
- hslogger = addBuildDepend super.hslogger self.HUnit;
- intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
- lens = addBuildDepend super.lens self.generic-deriving;
- mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
- natural-transformation = addBuildDepend super.natural-transformation self.semigroups;
- optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail];
- parser-combinators = addBuildDepend super.parser-combinators self.semigroups;
- QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
- reflection = addBuildDepend super.reflection self.semigroups;
- semigroups = addBuildDepends (dontCheck super.semigroups) (with self; [hashable tagged text unordered-containers]);
- tar = addBuildDepend super.tar self.semigroups;
- texmath = addBuildDepend super.texmath self.network-uri;
- yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
-
- # cereal must have `fail` in pre-ghc-8.0.x versions and tests require
- # bytestring>=0.10.8.1.
- cereal = dontCheck (addBuildDepend super.cereal self.fail);
-
- # The test suite requires Cabal 1.24.x or later to compile.
- comonad = dontCheck super.comonad;
- semigroupoids = dontCheck super.semigroupoids;
-
- # Newer versions require base >=4.9 && <5.
- colour = self.colour_2_3_3;
-
- # https://github.com/atzedijkstra/chr/issues/1
- chr-pretty = doJailbreak super.chr-pretty;
- chr-parse = doJailbreak super.chr-parse;
-
- # The autogenerated Nix expressions don't take into
- # account `if impl(ghc >= x.y)`, which is a common method to depend
- # on `semigroups` or `fail` when building with GHC < 8.0.
- system-filepath = addBuildDepend super.system-filepath self.semigroups;
- haskell-src-exts = addBuildDepend super.haskell-src-exts self.semigroups;
- free = addBuildDepend super.free self.fail;
-
- # Newer versions don't build without base-4.9
- resourcet = self.resourcet_1_1_11;
- conduit = self.conduit_1_2_13_1;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
deleted file mode 100644
index f475512a8dab..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
- # Suitable LLVM version.
- llvmPackages = pkgs.llvmPackages_37;
-
- # Disable GHC 8.0.x core libraries.
- array = null;
- base = null;
- binary = null;
- bytestring = null;
- Cabal = null;
- containers = null;
- deepseq = null;
- directory = null;
- filepath = null;
- ghc-boot = null;
- ghc-boot-th = null;
- ghc-compact = null;
- ghc-prim = null;
- ghci = null;
- haskeline = null;
- hoopl = null;
- hpc = null;
- integer-gmp = null;
- pretty = null;
- process = null;
- rts = null;
- template-haskell = null;
- terminfo = null;
- time = null;
- transformers = null;
- unix = null;
- xhtml = null;
-
- # 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;
-
- # https://github.com/bmillwood/applicative-quoters/issues/6
- applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
- sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
- });
-
- # Requires ghc 8.2
- ghc-proofs = dontDistribute super.ghc-proofs;
-
- # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
- yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
-
- # https://github.com/nominolo/ghc-syb/issues/20
- ghc-syb-utils = dontCheck super.ghc-syb-utils;
-
- # Newer versions require ghc>=8.2
- apply-refact = super.apply-refact_0_3_0_1;
-
- # This builds needs the latest Cabal version.
- cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_1_1; });
-
- # Add appropriate Cabal library to build this code.
- stack = addSetupDepend super.stack self.Cabal_2_0_1_1;
-
- # inline-c > 0.5.6.0 requires template-haskell >= 2.12
- inline-c = super.inline-c_0_5_6_1;
- inline-c-cpp = super.inline-c-cpp_0_1_0_0;
-
- # test dep hedgehog pulls in concurrent-output, which does not build
- # due to processing version mismatch
- either = dontCheck super.either;
-
- # test dep tasty has a version mismatch
- indents = dontCheck super.indents;
-
- # Newer versions require GHC 8.2.
- haddock-library = self.haddock-library_1_4_3;
- haddock-api = self.haddock-api_2_17_4;
- haddock = self.haddock_2_17_5;
-}
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 f73172e02d38..7a5b78ba74c6 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 49c3623d5d6b..83cb831345c1 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_1_0;
+ hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_1_0; };
+ yaml = self.yaml_0_11_0_0;
+ hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_1_0; };
+ };
+ hpack_0_31_1 = super.hpack_0_31_1.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 42712df3295b..2b3165981ead 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,60 @@ 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 = self.brick_0_45;
+ 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;
+ fgl = self.fgl_5_7_0_1;
+ free = self.free_5_1;
+ haddock-library = dontCheck super.haddock-library_1_7_0;
+ HaTeX = doJailbreak super.HaTeX;
+ hpack = self.hpack_0_31_1;
+ hslua = self.hslua_1_0_1;
+ hslua-module-text = self.hslua-module-text_0_2_0;
+ hspec = self.hspec_2_6_0;
+ hspec-contrib = self.hspec-contrib_0_5_1;
+ hspec-core = self.hspec-core_2_6_0;
+ hspec-discover = self.hspec-discover_2_6_0;
+ hspec-megaparsec = doJailbreak super.hspec-megaparsec; # newer versions need megaparsec 7.x
+ hspec-meta = self.hspec-meta_2_6_0;
+ JuicyPixels = self.JuicyPixels_3_3_2;
+ lens = self.lens_4_17;
+ megaparsec = dontCheck (doJailbreak super.megaparsec);
+ pandoc = self.pandoc_2_5;
+ pandoc-citeproc = self.pandoc-citeproc_0_15;
+ pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
+ patience = markBrokenVersion "0.1.1" super.patience;
+ polyparse = self.polyparse_1_12_1;
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_1;
+ 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;
+
+ # 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/jgm/skylighting/issues/55
+ skylighting-core = dontCheck super.skylighting-core;
+
+ # Break out of "yaml >=0.10.4.0 && <0.11".
+ stack = doJailbreak super.stack;
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 99f4cd87ce56..b71f75033f08 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -40,7 +40,7 @@ self: super: {
xhtml = null;
# jailbreak-cabal can use the native Cabal library.
- jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
# haddock: No input file(s).
nats = dontHaddock super.nats;
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index c79406a94727..489f363db6a0 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 3aee4857f993..18a6c1ea12b1 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,6 +1,6 @@
# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
-compiler: ghc-8.4.3
+compiler: ghc-8.4.4
core-packages:
- array-0.5.2.0
@@ -12,12 +12,12 @@ core-packages:
- deepseq-1.4.3.0
- directory-1.3.1.5
- filepath-1.4.2
- - ghc-8.4.3
- - ghc-boot-8.4.3
- - ghc-boot-th-8.4.3
+ - ghc-8.4.4
+ - ghc-boot-8.4.4
+ - ghc-boot-th-8.4.4
- ghc-compact-0.1.0.0
- ghc-prim-0.5.2.0
- - ghci-8.4.3
+ - ghci-8.4.4
- haskeline-0.7.4.2
- hpc-0.6.0.3
- integer-gmp-1.0.2.0
@@ -26,10 +26,10 @@ core-packages:
- pretty-1.1.3.6
- process-1.6.3.0
- rts-1.0
- - stm-2.4.5.0
+ - stm-2.4.5.1
- template-haskell-2.13.0.0
- terminfo-0.4.1.1
- - text-1.2.3.0
+ - text-1.2.3.1
- time-1.8.0.2
- transformers-0.5.5.0
- unix-2.7.2.2
@@ -41,9 +41,9 @@ core-packages:
- ghcjs-base-0
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.22
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -54,16 +54,16 @@ default-package-overrides:
- ad ==4.3.5
- adjunctions ==4.4
- adler32 ==0.1.2.0
- - aern2-mp ==0.1.2.0
+ - aern2-mp ==0.1.3.1
- aern2-real ==0.1.1.0
- aeson ==1.3.1.1
- 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
@@ -71,17 +71,18 @@ default-package-overrides:
- aeson-typescript ==0.1.1.0
- aeson-utils ==0.3.0.2
- aeson-yak ==0.1.1.3
- - Agda ==2.5.4.1
+ - Agda ==2.5.4.2
- al ==0.1.4.2
- 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 +178,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
+ - appar ==0.1.5
- 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
@@ -204,33 +205,33 @@ default-package-overrides:
- atom-basic ==0.2.5
- atom-conduit ==0.5.0.1
- atomic-primops ==0.8.2
- - atomic-write ==0.2.0.5
+ - atomic-write ==0.2.0.6
- attoparsec ==0.13.2.2
- attoparsec-base64 ==0.0.0
- 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
- base58string ==0.10.0
- - base64-bytestring ==1.0.0.1
+ - base64-bytestring ==1.0.0.2
- 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 +242,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 +251,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 +260,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 +287,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 +307,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.3
+ - cachix-api ==0.1.0.3
- 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,22 +351,23 @@ 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
- cereal-time ==0.1.0.0
- cereal-vector ==0.2.0.1
- cfenv ==0.1.0.0
- - chan ==0.0.3
+ - chan ==0.0.4.1
- ChannelT ==0.0.0.7
- charset ==0.3.7.1
- 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 ==0.1.1.1
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
- check-email ==1.0.2
@@ -375,7 +377,7 @@ default-package-overrides:
- chronologique ==0.3.1.1
- chunked-data ==0.3.1
- cipher-aes ==0.2.11
- - cipher-aes128 ==0.7.0.3
+ - cipher-aes128 ==0.7.0.4
- cipher-blowfish ==0.0.3
- cipher-camellia ==0.0.2
- cipher-des ==0.0.6
@@ -386,7 +388,7 @@ default-package-overrides:
- clash-ghc ==0.99.3
- clash-lib ==0.99.3
- clash-prelude ==0.99.3
- - classyplate ==0.3.1.0
+ - classyplate ==0.3.2.0
- classy-prelude ==1.4.0
- classy-prelude-conduit ==1.4.0
- classy-prelude-yesod ==1.4.0
@@ -396,11 +398,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,9 +415,9 @@ 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
- - commutative ==0.0.1.4
+ - combinatorial ==0.1.0.1
+ - comfort-graph ==0.0.3.1
+ - commutative ==0.0.2
- comonad ==5.0.4
- compactmap ==0.1.4.2.1
- compensated ==0.7.2
@@ -426,17 +428,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.2.0
- concurrent-extra ==0.7.0.12
- - concurrent-output ==1.10.6
- - concurrent-split ==0.0.1
+ - concurrent-output ==1.10.9
+ - 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 +459,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 +473,8 @@ 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
+ - crackNum ==2.3
- credential-store ==0.1.2
- criterion ==1.4.1.0
- criterion-measurement ==0.1.1.0
@@ -481,7 +485,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.3.1
- cryptohash ==0.11.9
- cryptohash-cryptoapi ==0.1.4
- cryptohash-md5 ==0.11.100.1
@@ -497,9 +501,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 +516,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
@@ -529,7 +533,7 @@ default-package-overrides:
- data-default-instances-old-locale ==0.0.1
- data-diverse ==4.6.0.0
- data-diverse-lens ==4.3.0.0
- - datadog ==0.2.2.0
+ - datadog ==0.2.3.0
- data-dword ==0.3.1.2
- data-endian ==0.1.1
- data-fix ==0.2.0
@@ -542,36 +546,36 @@ 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
+ - DAV ==1.3.3
- 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
- declarative ==0.5.2
- deepseq-generics ==0.2.0.0
- - dejafu ==1.11.0.3
+ - dejafu ==1.11.0.4
- dependent-map ==0.2.4.0
- 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.14
- di ==1.0.1
- diagrams ==1.4
- diagrams-builder ==0.8.0.3
@@ -583,7 +587,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 +604,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 +615,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 +628,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 +637,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
@@ -645,7 +649,7 @@ default-package-overrides:
- either ==5.0.1
- either-unwrap ==1.1
- ekg ==0.4.0.15
- - ekg-core ==0.1.1.4
+ - ekg-core ==0.1.1.6
- ekg-json ==0.1.0.6
- ekg-statsd ==0.2.4.0
- ekg-wai ==0.1.0.3
@@ -654,24 +658,24 @@ 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.9
- enclosed-exceptions ==1.0.3
- - entropy ==0.4.1.1
+ - entropy ==0.4.1.4
- enummapset ==0.5.2.2
- enumset ==0.0.4.1
- enum-subset-generate ==0.1.0.0
- envelope ==0.2.2.0
- - envy ==1.5.0.0
+ - envy ==1.5.1.0
- 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 +683,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 +701,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
@@ -713,11 +717,11 @@ default-package-overrides:
- fclabels ==2.0.3.3
- feature-flags ==0.1.0.1
- fedora-haskell-tools ==0.5.1
- - feed ==1.0.0.0
+ - feed ==1.0.1.0
- FenwickTree ==0.1.2.1
- fft ==0.1.8.6
- fgl ==5.6.0.0
- - filecache ==0.4.0
+ - filecache ==0.4.1
- file-embed ==0.0.10.1
- file-embed-lzma ==0
- filelock ==0.1.1.2
@@ -727,10 +731,10 @@ default-package-overrides:
- filter-logger ==0.6.0.0
- filtrable ==0.1.1.0
- fin ==0.0.1
- - Fin ==0.2.3.0
+ - Fin ==0.2.6.0
- FindBin ==0.0.5
- find-clumpiness ==0.2.3.1
- - fingertree ==0.1.4.1
+ - fingertree ==0.1.4.2
- finite-typelits ==0.1.4.2
- first-class-patterns ==0.3.2.4
- fixed ==0.2.1.1
@@ -742,16 +746,19 @@ default-package-overrides:
- flat-mcmc ==1.5.0
- flay ==0.4
- flexible-defaults ==0.0.2
+ - FloatingHex ==0.4
- 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
+ - focuslist ==0.1.0.1
+ - 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 +785,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,31 +805,31 @@ 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
+ - genvalidity-vector ==0.2.0.3
- geodetics ==0.0.6
- - getopt-generics ==0.13.0.2
+ - getopt-generics ==0.13.0.3
- 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-syntax-highlighter ==0.0.2.0
+ - ghc-prof ==1.4.1.4
+ - ghc-syntax-highlighter ==0.0.3.0
- ghc-tcplugins-extra ==0.3
- ghc-typelits-extra ==0.2.6
- ghc-typelits-knownnat ==0.5.1
@@ -835,32 +842,33 @@ 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.26
+ - gi-gtk-hs ==0.3.6.3
- gi-gtksource ==3.0.16
- - gi-javascriptcore ==4.0.15
+ - gi-javascriptcore ==4.0.16
- gio ==0.13.5.0
- gi-pango ==1.0.16
- giphy-api ==0.6.0.1
- github ==0.19
- - github-release ==1.2.2
+ - github-release ==1.2.3
- github-types ==0.2.1
- github-webhooks ==0.10.0
- gitrev ==1.3.1
- git-vogue ==0.3.0.2
+ - gi-vte ==2.91.19
- gl ==0.8.0
- glabrous ==0.3.6
- glaze ==0.3.0.1
- 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 +878,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.2.0
+ - 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,35 +898,35 @@ 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
+ - hasbolt ==0.1.3.1
- hashable ==1.2.7.0
- hashids ==1.0.2.4
- hashing ==0.1.0.1
- 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-exts-util ==0.2.4
- haskell-src-meta ==0.8.0.3
- haskell-tools-ast ==1.1.0.2
- haskell-tools-backend-ghc ==1.1.0.2
@@ -932,7 +946,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,75 +956,77 @@ 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.10
- 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
- hfsevents ==0.1.6
+ - hgmp ==0.1.1
- hidapi ==0.1.5
- 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
+ - hlibsass ==0.1.8.0
- hmatrix ==0.19.0.0
- hmatrix-backprop ==0.1.2.3
- hmatrix-gsl ==0.19.0.1
- hmatrix-gsl-stats ==0.4.1.7
- hmatrix-morpheus ==0.1.1.2
- hmatrix-special ==0.19.0.0
- - hmatrix-vector-sized ==0.1.1.0
+ - hmatrix-vector-sized ==0.1.1.2
- 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
- HPDF ==1.4.10
- hpqtypes ==1.5.3.0
- hprotoc ==2.4.11
- - hquantlib ==0.0.4.0
+ - hquantlib ==0.0.5.0
+ - hquantlib-time ==0.0.4.1
- 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
@@ -1034,19 +1050,19 @@ default-package-overrides:
- HSvm ==0.1.0.3.22
- hsx-jmacro ==7.3.8.1
- hsyslog ==5.0.1
- - hsyslog-udp ==0.2.3
+ - hsyslog-udp ==0.2.4
- htaglib ==1.2.0
- - HTF ==0.13.2.4
+ - HTF ==0.13.2.5
- 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
- htoml ==1.0.0.3
- HTTP ==4000.3.12
- - http2 ==1.6.3
+ - http2 ==1.6.4
- http-api-data ==0.3.8.1
- - http-client ==0.5.13.1
+ - http-client ==0.5.14
- http-client-openssl ==0.2.2.0
- http-client-tls ==0.3.5.3
- http-common ==0.8.2.0
@@ -1054,10 +1070,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
@@ -1065,8 +1081,8 @@ default-package-overrides:
- hvect ==0.4.0.0
- hvega ==0.1.0.3
- hw-balancedparens ==0.2.0.2
- - hw-bits ==0.7.0.3
- - hw-conduit ==0.2.0.3
+ - hw-bits ==0.7.0.5
+ - hw-conduit ==0.2.0.5
- hw-diagnostics ==0.0.0.5
- hweblib ==0.6.3
- hw-excess ==0.2.0.2
@@ -1079,7 +1095,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.22
- hw-rankselect ==0.10.0.3
- hw-rankselect-base ==0.3.2.1
- hw-string-parse ==0.0.0.4
@@ -1112,13 +1128,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.1
+ - 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.1
- ini ==0.3.6
- inline-c ==0.6.1.0
- inline-java ==0.8.4
@@ -1126,13 +1142,13 @@ 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
- - IntervalMap ==0.6.0.0
+ - interpolatedstring-perl6 ==1.0.1
+ - interpolation ==0.1.0.3
+ - IntervalMap ==0.6.1.0
- intervals ==0.8.1
- intro ==0.3.2.0
- invariant ==0.5.1
@@ -1148,11 +1164,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 +1178,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
@@ -1173,13 +1190,13 @@ default-package-overrides:
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json ==0.9.2
- - json-feed ==1.0.3
+ - json-feed ==1.0.5
- 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
- - JuicyPixels-blp ==0.1.0.1
+ - JuicyPixels-blp ==0.1.1.0
- JuicyPixels-extra ==0.3.0
- JuicyPixels-scale-dct ==0.1.2
- justified-containers ==0.3.0.0
@@ -1200,38 +1217,38 @@ default-package-overrides:
- kraken ==0.1.0
- l10n ==0.1.0.1
- labels ==0.3.3
- - lackey ==1.0.5
+ - lackey ==1.0.7
- 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 +1258,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 +1277,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,15 +1285,16 @@ 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
- log-postgres ==0.7.0.2
+ - long-double ==0.1
- loop ==0.3.0
- - lrucache ==1.2.0.0
+ - lrucache ==1.2.0.1
- 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 +1310,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.5.0
- massiv-io ==0.1.4.0
- mathexpr ==0.3.0.0
- math-functions ==0.2.1.0
@@ -1313,7 +1331,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 +1342,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,15 +1360,15 @@ 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
- - mixed-types-num ==0.3.1.4
+ - MissingH ==1.4.1.0
+ - mixed-types-num ==0.3.1.5
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.5.6
- mmark-cli ==0.0.3.0
- - mmark-ext ==0.2.1.0
+ - mmark-ext ==0.2.1.1
- mmorph ==1.1.2
- mnist-idx ==0.1.2.8
- mockery ==0.3.5
@@ -1363,7 +1381,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 +1405,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,15 +1418,15 @@ 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
- mwc-probability-transition ==0.4
- mwc-random ==0.13.6.0
- - mysql ==0.1.5
+ - mysql ==0.1.6
- mysql-haskell ==0.8.3.0
- mysql-haskell-nem ==0.1.0.0
- mysql-haskell-openssl ==0.8.3.0
@@ -1435,14 +1453,15 @@ default-package-overrides:
- network-anonymous-i2p ==0.10.0
- network-anonymous-tor ==0.11.0
- network-attoparsec ==0.12.2
+ - network-byte-order ==0.0.0.0
- network-conduit-tls ==1.3.2
- network-house ==0.1.0.2
- network-info ==0.2.0.10
- 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 +1479,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 +1511,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 +1523,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 +1534,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.1
+ - pandoc-types ==1.17.5.4
- pango ==0.13.5.0
- papillon ==0.1.0.6
- parallel ==3.2.2.0
@@ -1552,24 +1572,24 @@ 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
- phantom-state ==0.2.1.2
- - picosat ==0.1.4
+ - picosat ==0.1.5
- pid1 ==0.1.2.0
- - pinboard ==0.9.12.10
+ - pinboard ==0.9.12.11
- pipes ==4.3.9
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
- 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
@@ -1586,7 +1606,7 @@ default-package-overrides:
- pkcs10 ==0.2.0.0
- placeholders ==0.1
- plot-light ==0.4.3
- - plotlyhs ==0.2
+ - plotlyhs ==0.2.1
- pointed ==5.0.1
- pointedlist ==0.6.1
- pointless-fun ==1.1.0.6
@@ -1594,20 +1614,20 @@ 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-binary ==0.12.1.2
+ - postgresql-libpq ==0.9.4.2
- postgresql-schema ==0.1.14
- postgresql-simple ==0.5.4.0
- - postgresql-simple-migration ==0.1.12.0
+ - postgresql-simple-migration ==0.1.13.0
- postgresql-simple-queue ==1.0.1
- postgresql-simple-url ==0.2.1.0
- postgresql-transactional ==1.1.1
- 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 +1648,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 +1660,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
@@ -1661,13 +1681,13 @@ default-package-overrides:
- pure-zlib ==0.6.4
- pushbullet-types ==0.4.1.0
- qm-interpolated-string ==0.3.0.0
- - qnap-decrypt ==0.3.2
+ - qnap-decrypt ==0.3.3
- QuasiText ==0.1.2.6
- quickbench ==1.0
- 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,9 +1708,9 @@ default-package-overrides:
- rank1dynamic ==0.4.0
- rank2classes ==1.1.0.1
- Rasterific ==0.7.4
- - rasterific-svg ==0.3.3.1
- - ratel ==1.0.5
- - ratel-wai ==1.0.3
+ - rasterific-svg ==0.3.3.2
+ - ratel ==1.0.7
+ - ratel-wai ==1.0.4
- ratio-int ==0.1.2
- rattletrap ==4.1.2
- rawfilepath ==0.2.4
@@ -1704,7 +1724,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,51 +1751,55 @@ 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
- - rio ==0.1.5.0
+ - rio ==0.1.6.0
- rio-orphans ==0.1.1.0
- rng-utils ==0.3.0
- roles ==0.2.0.0
+ - rosezipper ==0.2
- rot13 ==0.2.0.1
+ - rounded ==0.1.0.1
- RSA ==2.3.0
- rss-conduit ==0.4.2.2
- runmemo ==1.0.0.1
- rvar ==0.2.0.3
- s3-signer ==0.5.0.0
- safe ==0.3.17
- - safecopy ==0.9.4.1
+ - safecopy ==0.9.4.2
- safe-exceptions ==0.1.7.0
- safe-exceptions-checked ==0.1.0
- safe-foldable ==0.1.0.0
- 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
- - sandi ==0.4.2
+ - sandi ==0.4.3
- sandman ==0.2.0.1
- say ==0.1.0.1
- sbp ==2.3.17
+ - sbv ==7.12
- scalendar ==1.2.0
- SCalendar ==1.1.0
- scalpel ==0.5.1
@@ -1807,7 +1831,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 +1850,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 +1869,11 @@ 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.20
- shell-conduit ==4.7.0
- shell-escape ==0.2.0
- shelltestrunner ==1.9
@@ -1862,20 +1885,21 @@ default-package-overrides:
- siggy-chardust ==1.0.0
- signal ==0.1.0.4
- silently ==1.2.5
+ - simple-cmd ==0.1.2
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.27
- simplest-sqlite ==0.1.0.0
- - simple-vec3 ==0.4.0.8
+ - simple-vec3 ==0.4.0.9
- 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.5
+ - skylighting-core ==0.7.5
+ - slack-web ==0.2.0.9
- slave-thread ==1.0.2
- smallcheck ==1.1.5
- smoothie ==0.4.2.9
@@ -1893,12 +1917,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 +1931,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,30 +1947,30 @@ 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
+ - storable-complex ==0.2.3.0
- storable-endian ==0.2.6
- 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 +1980,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
@@ -1962,16 +1989,15 @@ default-package-overrides:
- string-qq ==0.0.2
- stringsearch ==0.3.6.6
- string-transform ==1.1.0
- - strive ==5.0.6
+ - strive ==5.0.7
- 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,35 +2006,35 @@ 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-dejafu ==1.2.0.8
- tasty-discover ==4.2.1
- tasty-expected-failure ==0.11.1.1
- tasty-golden ==2.3.2
- tasty-hedgehog ==0.2.0.0
- - tasty-hspec ==1.1.5
+ - tasty-hspec ==1.1.5.1
- tasty-hunit ==0.10.0.1
- 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 +2051,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 +2076,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 +2090,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 +2104,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
@@ -2102,7 +2128,7 @@ default-package-overrides:
- transformers-fix ==1.0
- transformers-lift ==0.2.0.1
- traverse-with-class ==1.0.0.0
- - tree-diff ==0.0.1
+ - tree-diff ==0.0.2
- tree-fun ==0.8.1.0
- trifecta ==2
- triplesec ==0.1.2.0
@@ -2112,35 +2138,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.14
- 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
- - type-of-html ==1.4.0.1
+ - typelits-witnesses ==0.3.0.3
+ - typenums ==0.1.2.1
+ - type-of-html ==1.4.1.0
- 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
+ - tz ==0.1.3.2
+ - tzdata ==0.1.20181026.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
+ - unicode-transforms ==0.3.5
- 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 +2182,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 +2199,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 +2208,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 ==0.12.0.2
+ - vector-algorithms ==0.7.0.4
+ - vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
- vector-builder ==0.3.6
- vector-bytes-instances ==0.1.1
@@ -2207,7 +2234,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.25
- vinyl ==0.8.1.1
- vivid ==0.3.0.2
- vivid-osc ==0.3.0.0
@@ -2220,7 +2247,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 +2263,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,20 +2278,20 @@ 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
+ - wide-word ==0.1.0.7
- 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
- witherable ==0.2
- with-location ==0.1.0
- witness ==0.4
- - wizards ==1.0.2
+ - wizards ==1.0.3
- wl-pprint-annotated ==0.1.0.1
- wl-pprint-console ==0.1.0.2
- wl-pprint-extras ==3.5.0.5
@@ -2276,7 +2303,7 @@ default-package-overrides:
- word-wrap ==0.4.1
- world-peace ==0.1.0.0
- wrap ==0.0.0
- - wreq ==0.5.2.1
+ - wreq ==0.5.3.0
- wreq-stringless ==0.5.9.1
- writer-cps-full ==0.1.0.0
- writer-cps-lens ==0.1.0.1
@@ -2284,26 +2311,26 @@ default-package-overrides:
- writer-cps-mtl ==0.1.1.5
- writer-cps-transformers ==0.1.1.4
- ws ==0.0.4
- - wuss ==1.1.10
+ - wuss ==1.1.11
- X11 ==1.9
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
- - x509 ==1.7.3
- - x509-store ==1.6.6
+ - x509 ==1.7.5
+ - x509-store ==1.6.7
- x509-system ==1.6.6
- - x509-validation ==1.6.10
+ - x509-validation ==1.6.11
- Xauth ==0.1
- xdg-basedir ==0.2.2
- - xeno ==0.3.4
+ - xeno ==0.3.5.1
- xenstore ==0.1.1
- xhtml ==3000.2.2.1
- 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 +2347,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-hashdb ==1.7
+ - yesod-auth ==1.6.5
+ - yesod-auth-fb ==1.9.1
+ - yesod-auth-hashdb ==1.7.1
- yesod-bin ==1.6.0.3
- - yesod-core ==1.6.6
+ - yesod-core ==1.6.9
- 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
@@ -2374,9 +2401,7 @@ extra-packages:
- binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers
- binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers
- blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.*
- - 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 +2418,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
@@ -2434,6 +2458,7 @@ extra-packages:
- yesod-persistent < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
- yesod-static ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
- yesod-test ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
+ - patience ^>= 0.1 # required by chell-0.4.x
package-maintainers:
peti:
@@ -2567,6 +2592,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 +2826,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 +2871,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 ]
@@ -2864,6 +2892,7 @@ dont-distribute-packages:
arpa: [ i686-linux, x86_64-linux, x86_64-darwin ]
arpack: [ i686-linux, x86_64-linux, x86_64-darwin ]
array-forth: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ arraylist: [ i686-linux, x86_64-linux, x86_64-darwin ]
ArrayRef: [ i686-linux, x86_64-linux, x86_64-darwin ]
arrow-improve: [ i686-linux, x86_64-linux, x86_64-darwin ]
arrowapply-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2872,12 +2901,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 +2921,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 +2947,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 +2963,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,12 +3005,14 @@ 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 ]
azure-servicebus: [ i686-linux, x86_64-linux, x86_64-darwin ]
azurify: [ i686-linux, x86_64-linux, x86_64-darwin ]
b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ b9: [ i686-linux, x86_64-linux, x86_64-darwin ]
babylon: [ i686-linux, x86_64-linux, x86_64-darwin ]
backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ]
backtracking-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3003,9 +3040,11 @@ dont-distribute-packages:
barrie: [ i686-linux, x86_64-linux, x86_64-darwin ]
barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
barrier: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ base-compat-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ]
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 ]
@@ -3025,6 +3064,7 @@ dont-distribute-packages:
beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
beam: [ i686-linux, x86_64-linux, x86_64-darwin ]
beamable: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ bearriver: [ i686-linux, x86_64-linux, x86_64-darwin ]
beautifHOL: [ i686-linux, x86_64-linux, x86_64-darwin ]
bed-and-breakfast: [ i686-linux, x86_64-linux, x86_64-darwin ]
beeminder-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3032,8 +3072,10 @@ 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 ]
+ bencodex: [ i686-linux, x86_64-linux, x86_64-darwin ]
bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ]
berkeleydb: [ i686-linux, x86_64-linux, x86_64-darwin ]
BerkeleyDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3178,6 +3220,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 +3245,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 +3258,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 +3274,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 +3311,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 ]
@@ -3321,6 +3372,7 @@ dont-distribute-packages:
campfire: [ i686-linux, x86_64-linux, x86_64-darwin ]
canon: [ i686-linux, x86_64-linux, x86_64-darwin ]
canonical-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ canonical-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
canteven-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
canteven-listen-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
canteven-log: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3329,6 +3381,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 ]
@@ -3444,6 +3498,7 @@ dont-distribute-packages:
chuchu: [ i686-linux, x86_64-linux, x86_64-darwin ]
chunks: [ i686-linux, x86_64-linux, x86_64-darwin ]
chunky: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ church: [ i686-linux, x86_64-linux, x86_64-darwin ]
cielo: [ i686-linux, x86_64-linux, x86_64-darwin ]
cil: [ i686-linux, x86_64-linux, x86_64-darwin ]
cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3472,6 +3527,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 +3589,8 @@ 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-sys: [ 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 ]
@@ -3570,6 +3628,7 @@ dont-distribute-packages:
combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ]
Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ]
combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ comfort-array: [ i686-linux, x86_64-linux, x86_64-darwin ]
comic: [ i686-linux, x86_64-linux, x86_64-darwin ]
Command: [ i686-linux, x86_64-linux, x86_64-darwin ]
commander: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3613,6 +3672,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 ]
@@ -3635,6 +3695,7 @@ dont-distribute-packages:
conduit-tokenize-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
conduit-zstd: [ i686-linux, x86_64-linux, x86_64-darwin ]
conf: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ confcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ]
conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ]
confide: [ i686-linux, x86_64-linux, x86_64-darwin ]
config-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3674,6 +3735,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 ]
@@ -3730,6 +3792,7 @@ dont-distribute-packages:
cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cpython: [ i686-linux, x86_64-linux, x86_64-darwin ]
cql-io: [ i686-linux, x86_64-linux, x86_64-darwin ]
cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3792,6 +3855,7 @@ dont-distribute-packages:
ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ]
cube: [ i686-linux, x86_64-linux, x86_64-darwin ]
cubical: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cuboid: [ i686-linux, x86_64-linux, x86_64-darwin ]
cudd: [ i686-linux, x86_64-linux, x86_64-darwin ]
currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ]
curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3799,6 +3863,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 +3952,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 +4023,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 +4050,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 +4103,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,9 +4151,13 @@ 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 ]
+ docusign-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ docusign-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ docusign-example: [ i686-linux, x86_64-linux, x86_64-darwin ]
docvim: [ i686-linux, x86_64-linux, x86_64-darwin ]
doi: [ i686-linux, x86_64-linux, x86_64-darwin ]
DOM: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4191,9 +4265,11 @@ dont-distribute-packages:
effects: [ i686-linux, x86_64-linux, x86_64-darwin ]
effin: [ i686-linux, x86_64-linux, x86_64-darwin ]
egison-quote: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ egison-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ]
ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
ehs: [ i686-linux, x86_64-linux, x86_64-darwin ]
eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ eigen: [ i686-linux, x86_64-linux, x86_64-darwin ]
Eight-Ball-Pool-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ]
either-list-functions: [ i686-linux, x86_64-linux, x86_64-darwin ]
EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4213,6 +4289,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 +4308,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 ]
@@ -4242,6 +4320,7 @@ dont-distribute-packages:
enummapmap: [ i686-linux, x86_64-linux, x86_64-darwin ]
enummapset-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
env-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ envstatus: [ i686-linux, x86_64-linux, x86_64-darwin ]
epanet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
epass: [ i686-linux, x86_64-linux, x86_64-darwin ]
epic: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4313,12 +4392,15 @@ dont-distribute-packages:
execs: [ i686-linux, x86_64-linux, x86_64-darwin ]
executor: [ i686-linux, x86_64-linux, x86_64-darwin ]
exference: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ exhaustive: [ i686-linux, x86_64-linux, x86_64-darwin ]
exherbo-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
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,14 +4415,18 @@ 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 ]
extensible-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ extensible-effects-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ]
Extra: [ i686-linux, x86_64-linux, x86_64-darwin ]
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 ]
@@ -4489,6 +4575,7 @@ dont-distribute-packages:
flower: [ i686-linux, x86_64-linux, x86_64-darwin ]
flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ]
flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ fltkhs-fluid-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
fluent-logger-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
fluent-logger: [ i686-linux, x86_64-linux, x86_64-darwin ]
fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4503,6 +4590,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 +4630,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 +4646,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 ]
@@ -4602,6 +4694,7 @@ dont-distribute-packages:
functor-infix: [ i686-linux, x86_64-linux, x86_64-darwin ]
functor: [ i686-linux, x86_64-linux, x86_64-darwin ]
functorm: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ funflow-nix: [ i686-linux, x86_64-linux, x86_64-darwin ]
funflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
Fungi: [ i686-linux, x86_64-linux, x86_64-darwin ]
funion: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4658,6 +4751,8 @@ 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-surgery: [ 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 ]
@@ -4682,6 +4777,7 @@ dont-distribute-packages:
GenSmsPdu: [ i686-linux, x86_64-linux, x86_64-darwin ]
gentlemark: [ i686-linux, x86_64-linux, x86_64-darwin ]
GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ genvalidity-hspec-optics: [ i686-linux, x86_64-linux, x86_64-darwin ]
geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ]
GeocoderOpenCage: [ i686-linux, x86_64-linux, x86_64-darwin ]
geodetic: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4800,8 +4896,13 @@ 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-export: [ 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 ]
@@ -4827,6 +4928,7 @@ dont-distribute-packages:
goatee-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ]
goatee: [ i686-linux, x86_64-linux, x86_64-darwin ]
gochan: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ godot-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-adexchange-buyer: [ i686-linux, x86_64-linux, x86_64-darwin ]
gogol-adexchange-seller: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5012,6 +5114,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,8 +5149,11 @@ 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 ]
+ gscholar-rss: [ i686-linux, x86_64-linux, x86_64-darwin ]
gsl-random-fu: [ i686-linux, x86_64-linux, x86_64-darwin ]
gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ]
gstorable: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5152,6 +5258,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 +5271,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 +5375,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 ]
@@ -5275,6 +5385,7 @@ dont-distribute-packages:
haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-dap: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5290,11 +5401,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 ]
@@ -5307,6 +5420,8 @@ dont-distribute-packages:
haskell-tools-ast-fromghc: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskell-tools-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5349,11 +5464,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 ]
@@ -5366,8 +5483,17 @@ dont-distribute-packages:
haskore: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaskRel: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasktags: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-ffi-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-ffi-thc: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-indef: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-signatures-partial: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-signatures-support: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-signatures: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch-zoo: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hasktorch: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskus-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskus-system-build: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ haskus-utils-variant: [ i686-linux, x86_64-linux, x86_64-darwin ]
haskus-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
haslo: [ i686-linux, x86_64-linux, x86_64-darwin ]
hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5399,6 +5525,7 @@ dont-distribute-packages:
HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ]
hats: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hatt: [ i686-linux, x86_64-linux, x86_64-darwin ]
haverer: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaVSA: [ i686-linux, x86_64-linux, x86_64-darwin ]
hawitter: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5463,6 +5590,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 ]
@@ -5508,6 +5637,7 @@ dont-distribute-packages:
Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ]
hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ]
hermit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ herms: [ i686-linux, x86_64-linux, x86_64-darwin ]
herringbone-embed: [ i686-linux, x86_64-linux, x86_64-darwin ]
herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ]
herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5517,6 +5647,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 ]
@@ -5530,6 +5661,7 @@ dont-distribute-packages:
hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ]
hext: [ i686-linux, x86_64-linux, x86_64-darwin ]
heyefi: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ heyting-algebras: [ i686-linux, x86_64-linux, x86_64-darwin ]
hF2: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfann: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfd: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5641,6 +5773,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 +5799,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 +5925,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 ]
@@ -5834,6 +5971,7 @@ dont-distribute-packages:
hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hsc2hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-auditor: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5903,6 +6041,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 +6110,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 +6167,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 ]
@@ -6140,6 +6281,7 @@ dont-distribute-packages:
imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ]
imperative-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ]
ImperativeHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ impl: [ i686-linux, x86_64-linux, x86_64-darwin ]
implicit-logging: [ i686-linux, x86_64-linux, x86_64-darwin ]
implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ]
importify: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6203,6 +6345,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 +6355,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 +6382,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 ]
@@ -6258,6 +6404,7 @@ dont-distribute-packages:
JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ]
jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ]
jacobi-roots: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ jaeger-flamegraph: [ i686-linux, x86_64-linux, x86_64-darwin ]
jail: [ i686-linux, x86_64-linux, x86_64-darwin ]
jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ]
jalla: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6282,6 +6429,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 +6519,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 ]
@@ -6403,6 +6552,8 @@ dont-distribute-packages:
KiCS-prophecy: [ i686-linux, x86_64-linux, x86_64-darwin ]
KiCS: [ i686-linux, x86_64-linux, x86_64-darwin ]
kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kind-apply: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ kind-generics: [ i686-linux, x86_64-linux, x86_64-darwin ]
kit: [ i686-linux, x86_64-linux, x86_64-darwin ]
kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ]
kmeans-vector: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6419,6 +6570,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 ]
@@ -6439,6 +6591,7 @@ dont-distribute-packages:
lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lambdabot-zulip: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ]
lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6494,6 +6647,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 ]
@@ -6552,6 +6706,7 @@ dont-distribute-packages:
lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-toml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ]
lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ lens-typelevel: [ i686-linux, x86_64-linux, x86_64-darwin ]
lensref: [ i686-linux, x86_64-linux, x86_64-darwin ]
level-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
Level0: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6578,6 +6733,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,7 +6746,10 @@ 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 ]
+ lifted-stm: [ 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 ]
lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6733,6 +6892,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 +6972,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 ]
@@ -6890,6 +7051,8 @@ dont-distribute-packages:
MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ]
MetaObject: [ i686-linux, x86_64-linux, x86_64-darwin ]
metaplug: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ metar-http: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ metar: [ i686-linux, x86_64-linux, x86_64-darwin ]
metric: [ i686-linux, x86_64-linux, x86_64-darwin ]
Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ]
metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6902,6 +7065,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 +7096,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 +7163,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 ]
@@ -7022,6 +7192,7 @@ dont-distribute-packages:
monoid-subclasses: [ i686-linux, x86_64-linux, x86_64-darwin ]
monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ]
monoids: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ monopati: [ i686-linux, x86_64-linux, x86_64-darwin ]
monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ]
monzo: [ i686-linux, x86_64-linux, x86_64-darwin ]
moo: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7031,6 +7202,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 ]
@@ -7039,6 +7212,7 @@ dont-distribute-packages:
mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ]
mp: [ i686-linux, x86_64-linux, x86_64-darwin ]
mpdmate: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mpi-hs: [ i686-linux, x86_64-linux, x86_64-darwin ]
mpppc: [ i686-linux, x86_64-linux, x86_64-darwin ]
mpretty: [ i686-linux, x86_64-linux, x86_64-darwin ]
mpris: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7080,6 +7254,7 @@ dont-distribute-packages:
multipass: [ i686-linux, x86_64-linux, x86_64-darwin ]
multipath: [ i686-linux, x86_64-linux, x86_64-darwin ]
multiplate-simplified: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ multipool-persistent-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
multirec-alt-deriver: [ i686-linux, x86_64-linux, x86_64-darwin ]
multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
multirec: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7148,6 +7323,7 @@ dont-distribute-packages:
nanomsg: [ i686-linux, x86_64-linux, x86_64-darwin ]
nanoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
NanoProlog: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ nanovg-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
nanovg: [ i686-linux, x86_64-linux, x86_64-darwin ]
nanq: [ i686-linux, x86_64-linux, x86_64-darwin ]
Naperian: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7203,6 +7379,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 ]
@@ -7305,6 +7482,7 @@ dont-distribute-packages:
nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ]
o-clock: [ i686-linux, x86_64-linux, x86_64-darwin ]
oanda-rest-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ oauth2-jwt-bearer: [ i686-linux, x86_64-linux, x86_64-darwin ]
oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ]
obd: [ i686-linux, x86_64-linux, x86_64-darwin ]
obdd: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7345,12 +7523,14 @@ 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 ]
open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ openapi-petstore: [ i686-linux, x86_64-linux, x86_64-darwin ]
opench-meteo: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ]
OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7372,6 +7552,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 +7560,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 +7587,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 +7720,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,8 +7733,10 @@ 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-template-classy: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-vector: [ i686-linux, x86_64-linux, x86_64-darwin ]
persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ]
persona-idp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7587,6 +7774,7 @@ dont-distribute-packages:
picoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
picosat: [ i686-linux, x86_64-linux, x86_64-darwin ]
pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ pier-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
pier: [ i686-linux, x86_64-linux, x86_64-darwin ]
piet: [ i686-linux, x86_64-linux, x86_64-darwin ]
pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7624,6 +7812,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 +7821,13 @@ 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-test: [ 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 ]
@@ -7657,6 +7849,7 @@ dont-distribute-packages:
pointless-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ]
pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ]
pokemon-go-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ poker-eval: [ i686-linux, x86_64-linux, x86_64-darwin ]
pokitdok: [ i686-linux, x86_64-linux, x86_64-darwin ]
polar-configfile: [ i686-linux, x86_64-linux, x86_64-darwin ]
polar-shader: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7702,6 +7895,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 +7939,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 +7958,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 +8000,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 +8033,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 +8097,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 +8122,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 +8314,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 +8359,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 ]
@@ -8206,6 +8409,7 @@ dont-distribute-packages:
rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ]
rosmsg: [ i686-linux, x86_64-linux, x86_64-darwin ]
rosso: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ rounded: [ i686-linux, x86_64-linux, x86_64-darwin ]
rounding: [ i686-linux, x86_64-linux, x86_64-darwin ]
roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
roundtrip-string: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8326,9 +8530,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 ]
@@ -8397,6 +8603,7 @@ dont-distribute-packages:
servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-checked-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-db: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8405,11 +8612,16 @@ 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-http2-client: [ 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 ]
+ servant-machines: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-multipart: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-nix: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8424,6 +8636,8 @@ dont-distribute-packages:
servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-streaming-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-swagger-ui-jensoleg: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-swagger-ui-redoc: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-xml: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-zeppelin-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-zeppelin-server: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8468,10 +8682,12 @@ dont-distribute-packages:
shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ]
shake-pack: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ shake-path: [ i686-linux, x86_64-linux, x86_64-darwin ]
shake-persist: [ i686-linux, x86_64-linux, x86_64-darwin ]
shaker: [ i686-linux, x86_64-linux, x86_64-darwin ]
shakespeare-babel: [ i686-linux, x86_64-linux, x86_64-darwin ]
shakespeare-sass: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ shannon-fano: [ i686-linux, x86_64-linux, x86_64-darwin ]
shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ]
shapes-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8490,6 +8706,7 @@ dont-distribute-packages:
shellish: [ i686-linux, x86_64-linux, x86_64-darwin ]
shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
shellmate: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ shh: [ i686-linux, x86_64-linux, x86_64-darwin ]
shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ]
shivers-cfg: [ i686-linux, x86_64-linux, x86_64-darwin ]
shoap: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8510,6 +8727,7 @@ dont-distribute-packages:
simd: [ i686-linux, x86_64-linux, x86_64-darwin ]
simgi: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-actors: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ simple-affine-space: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-atom: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-bluetooth: [ i686-linux, x86_64-linux, x86_64-darwin ]
simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8566,6 +8784,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 +8905,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 ]
@@ -8744,6 +8964,7 @@ dont-distribute-packages:
spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ]
spoty: [ i686-linux, x86_64-linux, x86_64-darwin ]
Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ sprinkles: [ i686-linux, x86_64-linux, x86_64-darwin ]
spritz: [ i686-linux, x86_64-linux, x86_64-darwin ]
spsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
spy: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8768,6 +8989,7 @@ dont-distribute-packages:
sssp: [ i686-linux, x86_64-linux, x86_64-darwin ]
sstable: [ i686-linux, x86_64-linux, x86_64-darwin ]
SSTG: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ st2: [ i686-linux, x86_64-linux, x86_64-darwin ]
stable-heap: [ i686-linux, x86_64-linux, x86_64-darwin ]
stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ]
stable-marriage: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8779,6 +9001,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 ]
@@ -8812,6 +9035,7 @@ dont-distribute-packages:
stats: [ i686-linux, x86_64-linux, x86_64-darwin ]
statsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ]
statsd: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ statsdi: [ i686-linux, x86_64-linux, x86_64-darwin ]
stb-image-redux: [ i686-linux, x86_64-linux, x86_64-darwin ]
stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ]
stdata: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8854,6 +9078,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 +9120,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 ]
@@ -8910,6 +9136,7 @@ dont-distribute-packages:
supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ]
supero: [ i686-linux, x86_64-linux, x86_64-darwin ]
supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ supervisors: [ i686-linux, x86_64-linux, x86_64-darwin ]
supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ]
surjective: [ i686-linux, x86_64-linux, x86_64-darwin ]
sv-cassava: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9054,18 +9281,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 ]
@@ -9094,11 +9314,13 @@ dont-distribute-packages:
texbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-all: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ text-ansi: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
text-containers: [ i686-linux, x86_64-linux, x86_64-darwin ]
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 +9372,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 +9431,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 +9458,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 +9477,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 +9527,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 +9592,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 +9613,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 +9666,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 +9674,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 +9689,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 +9726,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 +9742,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 ]
@@ -9545,6 +9782,7 @@ dont-distribute-packages:
visualize-cbn: [ i686-linux, x86_64-linux, x86_64-darwin ]
vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ]
VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ voicebase: [ i686-linux, x86_64-linux, x86_64-darwin ]
vorbiscomment: [ i686-linux, x86_64-linux, x86_64-darwin ]
vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ]
voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9556,6 +9794,7 @@ dont-distribute-packages:
vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ]
vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
vty-ui: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ waargonaut: [ i686-linux, x86_64-linux, x86_64-darwin ]
wacom-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ]
waddle: [ i686-linux, x86_64-linux, x86_64-darwin ]
wahsp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9586,12 +9825,14 @@ 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 ]
wai-request-spec: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ wai-routing: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-secure-cookies: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-session-alt: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-session-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9612,10 +9853,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 +9913,8 @@ 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 ]
+ witty: [ 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 +9943,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 ]
@@ -9726,6 +9973,7 @@ dont-distribute-packages:
X11-rm: [ i686-linux, x86_64-linux, x86_64-darwin ]
X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ]
X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ]
x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ]
xcb-types: [ i686-linux, x86_64-linux, x86_64-darwin ]
xcffib: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9807,6 +10055,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 ]
@@ -9816,10 +10065,15 @@ dont-distribute-packages:
yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ]
yaml2owl: [ i686-linux, x86_64-linux, x86_64-darwin ]
yamlkeysdiff: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ]
yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yampa-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ]
yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ]
yampa-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yampa-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ Yampa: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ YampaSynth: [ i686-linux, x86_64-linux, x86_64-darwin ]
yandex-translate: [ i686-linux, x86_64-linux, x86_64-darwin ]
yaop: [ i686-linux, x86_64-linux, x86_64-darwin ]
yap: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9920,6 +10174,7 @@ dont-distribute-packages:
yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ]
yjsvg: [ i686-linux, x86_64-linux, x86_64-darwin ]
yoctoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yoda: [ i686-linux, x86_64-linux, x86_64-darwin ]
yoga: [ i686-linux, x86_64-linux, x86_64-darwin ]
Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ]
Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9948,6 +10203,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-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
deleted file mode 100644
index be90794f58d9..000000000000
--- a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ pkgs, haskellLib }:
-
-with haskellLib;
-
-self: super: {
-
- # Suitable LLVM version.
- llvmPackages = pkgs.llvmPackages_35;
-
- # Disable GHC 8.0.x core libraries.
- array = null;
- base = null;
- binary = null;
- bytestring = null;
- Cabal = null;
- containers = null;
- deepseq = null;
- directory = null;
- filepath = null;
- ghc-boot = null;
- ghc-boot-th = null;
- ghc-prim = null;
- ghci = null;
- haskeline = null;
- hoopl = null;
- hpc = null;
- integer-gmp = null;
- pretty = null;
- process = null;
- rts = null;
- template-haskell = null;
- terminfo = null;
- time = null;
- transformers = null;
- unix = null;
- xhtml = null;
-
- # cabal-install can use the native Cabal library.
- cabal-install = super.cabal-install.override { Cabal = null; };
-
- # jailbreak-cabal can use the native Cabal library.
- jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
-
- # https://github.com/bmillwood/applicative-quoters/issues/6
- applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
- url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
- sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
- });
-
- # https://github.com/christian-marie/xxhash/issues/3
- xxhash = doJailbreak super.xxhash;
-
- # https://github.com/Deewiant/glob/issues/8
- Glob = doJailbreak super.Glob;
-
- # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
- vector-algorithms = dontCheck super.vector-algorithms;
-
-}
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index cf53f9e2b510..f0d629ad5e44 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 ];
@@ -469,7 +474,7 @@ self: super: builtins.intersectAttrs super {
hapistrano = addBuildTool super.hapistrano pkgs.buildPackages.git;
# This propagates this to everything depending on haskell-gi-base
- haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
+ haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobject-introspection;
# requires valid, writeable $HOME
hatex-guide = overrideCabal super.hatex-guide (drv: {
@@ -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 dfc93686405c..43a3b82923ba 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 b8943a55394a..a4f0399cf3c6 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 be104a82fd77..a0bf655a67b7 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,11 @@ 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 ];
+ inherit shellHook;
};
+
};
meta = { inherit homepage license platforms; }
@@ -488,3 +479,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 c1fb70ee2e6e..db518444cb21 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;
@@ -717,7 +725,7 @@ self: {
"Agda" = callPackage
({ mkDerivation, alex, array, async, base, binary, blaze-html
- , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq
+ , 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
@@ -726,8 +734,8 @@ self: {
}:
mkDerivation {
pname = "Agda";
- version = "2.5.4.1";
- sha256 = "0bxpibsk98n9xp42d92ma5vj2fam8rsnl61fbhr3askfjdvalnbp";
+ version = "2.5.4.2";
+ sha256 = "07wvawpfjhx3gw2w53v27ncv1bl0kkx08wkm6wzxldbslkcasign";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -740,7 +748,7 @@ self: {
template-haskell text time transformers unordered-containers
uri-encode zlib
];
- libraryToolDepends = [ alex cpphs happy ];
+ libraryToolDepends = [ alex happy ];
executableHaskellDepends = [ base directory filepath process ];
executableToolDepends = [ emacs ];
postInstall = ''
@@ -755,6 +763,7 @@ self: {
'';
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;};
@@ -1177,8 +1186,8 @@ self: {
}:
mkDerivation {
pname = "BNFC";
- version = "2.8.1";
- sha256 = "082r1arj76563q1grc9ivpzfip8ghdffm87fj4q830s40dffl6rc";
+ version = "2.8.2";
+ sha256 = "1n4zgm6gls6lpasn8y5hy0m75qkkbk6mj18g2yhjrw8514a5860h";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base ];
@@ -1457,6 +1466,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "BiobaseEnsembl" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+ , cereal, containers, deepseq, directory, either-unwrap, text
+ , vector, word8
+ }:
+ mkDerivation {
+ pname = "BiobaseEnsembl";
+ version = "0.1.0.0";
+ sha256 = "1knbi8azq5n8kdgmbx4f2d14x6z94vj540ickq4dcspmbvslr0kf";
+ libraryHaskellDepends = [
+ aeson attoparsec base binary bytestring cereal containers deepseq
+ directory either-unwrap text vector word8
+ ];
+ description = "Ensembl related datastructures and functions";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"BiobaseFR3D" = callPackage
({ mkDerivation, base, BiobaseXNA, bytestring, containers
, filemanip, iteratee, tuple
@@ -1474,24 +1500,64 @@ self: {
}) {};
"BiobaseFasta" = callPackage
- ({ mkDerivation, base, biocore, bytestring, cmdargs, conduit
- , containers, transformers
+ ({ mkDerivation, base, BiobaseTypes, bytestring, deepseq, filepath
+ , lens, QuickCheck, resourcet, streaming, streaming-bytestring
+ , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, tasty-silver
+ , tasty-th, text
}:
mkDerivation {
pname = "BiobaseFasta";
- version = "0.0.1.0";
- sha256 = "035pr31mrmfhmpja8llw81jyxy11aba62bfph34gf3rsi96iylnw";
- isLibrary = true;
- isExecutable = true;
+ version = "0.2.0.0";
+ sha256 = "1ilsq8wjvmz1pw00rfk78f1si7s4ld3gbbp6w8nfq051hgg5ydsh";
libraryHaskellDepends = [
- base biocore bytestring conduit containers transformers
+ base BiobaseTypes bytestring deepseq lens resourcet streaming
+ streaming-bytestring
];
- executableHaskellDepends = [ cmdargs ];
- description = "conduit-based FASTA parser";
+ testHaskellDepends = [
+ base bytestring filepath QuickCheck resourcet streaming
+ streaming-bytestring tasty tasty-golden tasty-hunit
+ tasty-quickcheck tasty-silver tasty-th text
+ ];
+ description = "streaming FASTA parser";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "BiobaseHTTP" = callPackage
+ ({ mkDerivation, aeson, base, BiobaseEnsembl, bytestring, conduit
+ , either-unwrap, HTTP, http-conduit, hxt, mtl, network, Taxonomy
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "BiobaseHTTP";
+ version = "1.1.0";
+ sha256 = "0y26d4aqxqpdr142y26p70v6cnrr48dhxm5nnnhqxg0lsirbxad0";
+ libraryHaskellDepends = [
+ aeson base BiobaseEnsembl bytestring conduit either-unwrap HTTP
+ http-conduit hxt mtl network Taxonomy text transformers
+ ];
+ description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
+ "BiobaseHTTPTools" = callPackage
+ ({ mkDerivation, base, BiobaseFasta, BiobaseHTTP, bytestring
+ , cmdargs, containers, either-unwrap, hxt, text
+ }:
+ mkDerivation {
+ pname = "BiobaseHTTPTools";
+ version = "1.0.0";
+ sha256 = "1sbwhil0d0118nwx7wsryk6j8a7rysdxqksphvyrlxfdm7pd3l1z";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base BiobaseFasta BiobaseHTTP bytestring cmdargs containers
+ either-unwrap hxt text
+ ];
+ description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"BiobaseInfernal" = callPackage
({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes
, BiobaseXNA, bytestring, cereal, cereal-text, cereal-vector
@@ -1609,26 +1675,27 @@ self: {
}) {};
"BiobaseTypes" = callPackage
- ({ mkDerivation, aeson, base, bimaps, binary, bytestring, cereal
- , cereal-text, cereal-vector, containers, data-default, deepseq
- , hashable, intern, lens, mtl, primitive, PrimitiveArray
- , QuickCheck, string-conversions, tasty, tasty-quickcheck, tasty-th
- , text, text-binary, utf8-string, vector, vector-binary-instances
+ ({ mkDerivation, aeson, attoparsec, base, bimaps, binary
+ , bytestring, cereal, cereal-text, cereal-vector, containers
+ , data-default, deepseq, ForestStructures, hashable, intern, lens
+ , mtl, primitive, PrimitiveArray, QuickCheck, SciBaseTypes
+ , string-conversions, tasty, tasty-quickcheck, tasty-th, text
+ , text-binary, utf8-string, vector, vector-binary-instances
, vector-th-unbox
}:
mkDerivation {
pname = "BiobaseTypes";
- version = "0.1.3.0";
- sha256 = "15yzg4llvz7pq5f0chfwrkaqspwrqxan4xvczrk4mvwa07z3abbp";
+ version = "0.1.4.0";
+ sha256 = "1ih3l72i9ahgxb261y43gncdrha3jpzkpavvhbsyqv6vi7pgcj4r";
libraryHaskellDepends = [
- aeson base bimaps binary bytestring cereal cereal-text
- cereal-vector containers data-default deepseq hashable intern lens
- mtl primitive PrimitiveArray QuickCheck string-conversions text
- text-binary utf8-string vector vector-binary-instances
- vector-th-unbox
+ aeson attoparsec base bimaps binary bytestring cereal cereal-text
+ cereal-vector containers data-default deepseq ForestStructures
+ hashable intern lens mtl primitive PrimitiveArray QuickCheck
+ SciBaseTypes string-conversions text text-binary utf8-string vector
+ vector-binary-instances vector-th-unbox
];
testHaskellDepends = [
- base QuickCheck tasty tasty-quickcheck tasty-th
+ base bytestring lens QuickCheck tasty tasty-quickcheck tasty-th
];
description = "Collection of types for bioinformatics";
license = stdenv.lib.licenses.bsd3;
@@ -2005,6 +2072,7 @@ self: {
libraryHaskellDepends = [ base mtl ];
description = "Delimited continuations and dynamically scoped variables";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"CC-delcont-alt" = callPackage
@@ -2363,83 +2431,6 @@ self: {
opencv_legacy = null; opencv_ml = null; opencv_objdetect = null;
opencv_video = null;};
- "Cabal_1_18_1_7" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, deepseq
- , directory, extensible-exceptions, filepath, HUnit, pretty
- , process, QuickCheck, regex-posix, test-framework
- , test-framework-hunit, test-framework-quickcheck2, time, unix
- }:
- mkDerivation {
- pname = "Cabal";
- version = "1.18.1.7";
- sha256 = "10kjdrzb3lq2srcbwb4q79klcgd3ianpf1zvbzjcw68027ax9hhz";
- libraryHaskellDepends = [
- array base bytestring containers deepseq directory filepath pretty
- process time unix
- ];
- testHaskellDepends = [
- base bytestring directory extensible-exceptions filepath HUnit
- process QuickCheck regex-posix test-framework test-framework-hunit
- test-framework-quickcheck2 unix
- ];
- doCheck = false;
- description = "A framework for packaging Haskell software";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "Cabal_1_20_0_4" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, deepseq
- , directory, extensible-exceptions, filepath, HUnit, pretty
- , process, QuickCheck, regex-posix, test-framework
- , test-framework-hunit, test-framework-quickcheck2, time, unix
- }:
- mkDerivation {
- pname = "Cabal";
- version = "1.20.0.4";
- sha256 = "1q74jjip24mc5647yxz6gw0jhj5j694xbx3ia15pxqklxhsdkxpx";
- libraryHaskellDepends = [
- array base bytestring containers deepseq directory filepath pretty
- process time unix
- ];
- testHaskellDepends = [
- base bytestring directory extensible-exceptions filepath HUnit
- process QuickCheck regex-posix test-framework test-framework-hunit
- test-framework-quickcheck2 unix
- ];
- doCheck = false;
- description = "A framework for packaging Haskell software";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "Cabal_1_24_2_0" = callPackage
- ({ mkDerivation, array, base, binary, bytestring, containers
- , deepseq, directory, exceptions, filepath, old-time, pretty
- , process, QuickCheck, regex-posix, tagged, tasty, tasty-hunit
- , tasty-quickcheck, time, transformers, unix
- }:
- mkDerivation {
- pname = "Cabal";
- version = "1.24.2.0";
- sha256 = "0h33v1716wkqh9wvq2wynvhwzkjjhg4aav0a1i3cmyq36n7fpl5p";
- revision = "2";
- editedCabalFile = "15ncrm7x2lg4hn0m5mhc8hy769bzhmajsm6l9i6536plfs2bbbdj";
- libraryHaskellDepends = [
- array base binary bytestring containers deepseq directory filepath
- pretty process time unix
- ];
- testHaskellDepends = [
- base bytestring containers directory exceptions filepath old-time
- pretty process QuickCheck regex-posix tagged tasty tasty-hunit
- tasty-quickcheck transformers unix
- ];
- doCheck = false;
- description = "A framework for packaging Haskell software";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"Cabal_2_2_0_1" = callPackage
({ mkDerivation, array, base, base-compat, base-orphans, binary
, bytestring, containers, deepseq, Diff, directory, filepath
@@ -2469,6 +2460,37 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "Cabal_2_4_1_0" = 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.1.0";
+ sha256 = "151mrrd9sskghvlwmj32da5gafwqj6sv9xz9fmp84b7vm4nr0skk";
+ revision = "1";
+ editedCabalFile = "1dvs2i0kfk8rji9wbrv7y0iydbif9jzg4c7rmaa6lxg8hp7mij2n";
+ 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 +2751,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
];
@@ -3391,6 +3413,7 @@ self: {
];
description = "Collects together existing Haskell cryptographic functions into a package";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"CurryDB" = callPackage
@@ -3458,8 +3481,8 @@ self: {
}:
mkDerivation {
pname = "DAV";
- version = "1.3.2";
- sha256 = "0sai0b7bxwif5czmmdik5dx318drx18inid87wfrxckrflsi8cv1";
+ version = "1.3.3";
+ sha256 = "149rdrbjx59a2rbx2r6fzhmyl3f35a2gbh4sarbpffv0pmirrx14";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -3478,6 +3501,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 {
@@ -3607,25 +3660,30 @@ self: {
}) {};
"DPutils" = callPackage
- ({ mkDerivation, base, bytestring, containers, criterion
- , kan-extensions, lens, mtl, parallel, pipes, pipes-bytestring
- , pipes-parse, QuickCheck, quickcheck-instances, stringsearch
- , tasty, tasty-quickcheck, tasty-th, transformers, vector
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , criterion, kan-extensions, lens, mtl, parallel, pipes
+ , pipes-bytestring, pipes-parse, QuickCheck, streaming
+ , streaming-bytestring, stringsearch, tasty, tasty-quickcheck
+ , tasty-th, timeit, transformers, vector
}:
mkDerivation {
pname = "DPutils";
- version = "0.0.1.0";
- sha256 = "1a0ivvq16q8k21xjhv1kmm2s73ajc0gmacwdawkk4nr7jklyhh16";
+ version = "0.0.2.0";
+ sha256 = "0axavxxg0n1dsdby8306yrinjhbfrvy5a27kkwiw75xvjprk4w5w";
libraryHaskellDepends = [
- base bytestring containers kan-extensions parallel pipes QuickCheck
- stringsearch transformers vector
+ attoparsec base bytestring containers kan-extensions parallel pipes
+ QuickCheck streaming streaming-bytestring stringsearch transformers
+ vector
];
testHaskellDepends = [
- base bytestring containers kan-extensions lens mtl parallel pipes
- pipes-bytestring pipes-parse QuickCheck quickcheck-instances tasty
+ base bytestring containers lens mtl pipes pipes-bytestring
+ pipes-parse QuickCheck streaming streaming-bytestring tasty
tasty-quickcheck tasty-th vector
];
- benchmarkHaskellDepends = [ base criterion vector ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion streaming streaming-bytestring timeit
+ vector
+ ];
description = "utilities for DP";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -4552,6 +4610,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "Earley_0_13_0_0" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
+ , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "Earley";
+ version = "0.13.0.0";
+ sha256 = "0pyj9c5d6xvz4mdpg0nfrl0100rh34442ix73l6ys4pnsadyql0g";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ListLike ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq ListLike parsec
+ ];
+ description = "Parsing all context-free grammars using Earley's algorithm";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Ebnf2ps" = callPackage
({ mkDerivation, array, base, containers, directory, happy
, old-time, unix
@@ -4969,10 +5049,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,24 +5469,30 @@ self: {
}) {};
"Fin" = callPackage
- ({ mkDerivation, base, natural-induction, peano }:
+ ({ mkDerivation, alg, base, foldable1, natural-induction, peano
+ , universe-base
+ }:
mkDerivation {
pname = "Fin";
- version = "0.2.3.0";
- sha256 = "1cjsp6i1ak2icjmg0xrprn2xminz35mxb4dj1nsvjvs2qqgjvl1g";
- libraryHaskellDepends = [ base natural-induction peano ];
+ version = "0.2.6.0";
+ sha256 = "18qc3ih3l9zd13knxxsh657iq3c742pfaz4i45bq1ir60qwjqmhw";
+ libraryHaskellDepends = [
+ alg base foldable1 natural-induction peano universe-base
+ ];
description = "Finite totally-ordered sets";
license = stdenv.lib.licenses.bsd3;
}) {};
- "Fin_0_2_5_0" = callPackage
- ({ mkDerivation, alg, base, foldable1, natural-induction, peano }:
+ "Fin_0_2_6_1" = callPackage
+ ({ mkDerivation, alg, base, foldable1, natural-induction, peano
+ , universe-base
+ }:
mkDerivation {
pname = "Fin";
- version = "0.2.5.0";
- sha256 = "0jh64an111k7a3limqc03irk914s8asy6h4iik7layw4pagpsiyc";
+ version = "0.2.6.1";
+ sha256 = "15r5cvxwwbp7d6fmkfkzg65kzwf5v4j3rf84a5qsw900i4c05cmx";
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;
@@ -5555,8 +5639,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
@@ -5606,6 +5690,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ForestStructures_0_0_1_0" = callPackage
+ ({ mkDerivation, base, bifunctors, containers, criterion, fgl, lens
+ , QuickCheck, tasty, tasty-quickcheck, tasty-th
+ , unordered-containers, vector, vector-th-unbox
+ }:
+ mkDerivation {
+ pname = "ForestStructures";
+ version = "0.0.1.0";
+ sha256 = "1hhmcc0cpjbixqjgl35gv9dpymamdfb4vhhd5hard0qpg1xllnvw";
+ libraryHaskellDepends = [
+ base bifunctors containers fgl lens QuickCheck unordered-containers
+ vector vector-th-unbox
+ ];
+ testHaskellDepends = [
+ base containers QuickCheck tasty tasty-quickcheck tasty-th vector
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Tree- and forest structures";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Forestry" = callPackage
({ mkDerivation, ADPfusion, ADPfusionForest, base, BiobaseNewick
, BiobaseTypes, containers, criterion, ForestStructures
@@ -5768,27 +5874,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 +5913,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 +5926,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 +6211,8 @@ self: {
}:
mkDerivation {
pname = "GLUtil";
- version = "0.10.1";
- sha256 = "08qsa22xhw4cdhdzc8ixlwjazi9s0n48395g4vf5qwfap9r8rdq3";
+ version = "0.10.3";
+ sha256 = "09zcb0ijm20nmynqsl585nhn1qaldkp3c8v3y28gn2cj606m8cqr";
libraryHaskellDepends = [
array base bytestring containers directory filepath hpp JuicyPixels
linear OpenGL OpenGLRaw transformers vector
@@ -6546,8 +6674,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
@@ -7132,11 +7260,12 @@ self: {
}) {};
"HCL" = callPackage
- ({ mkDerivation, base, containers, mtl, QuickCheck, random }:
+ ({ mkDerivation, base, containers, HUnit, mtl, QuickCheck, random
+ }:
mkDerivation {
pname = "HCL";
- version = "1.4";
- sha256 = "0dzfnvdc1nm4f7q759xnq1lavi90axc7b6jd39sl898jbjg8wrrl";
+ version = "1.7.1";
+ sha256 = "1rwg7sqm16rszv7grw2d7cnhllnrifnd9jjxn0p8n5qznv8m8vkp";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -7144,6 +7273,9 @@ self: {
executableHaskellDepends = [
base containers mtl QuickCheck random
];
+ testHaskellDepends = [
+ base containers HUnit mtl QuickCheck random
+ ];
description = "High-level library for building command line interfaces";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -7235,15 +7367,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
@@ -8520,8 +8655,8 @@ self: {
}:
mkDerivation {
pname = "HTF";
- version = "0.13.2.4";
- sha256 = "1xibrzs465hg9snwvl6gp6hll6g6c7m8s2ckk8vkfg386pywmi9n";
+ version = "0.13.2.5";
+ sha256 = "1kmf95y4vijdiih27xa35acl02dsxqnd9qa56z1waki5qqiz6nin";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -8552,6 +8687,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 +9006,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 = [
@@ -9482,6 +9617,7 @@ self: {
];
description = "A Haskell binding for Chipmunk";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Hipmunk-Utils" = callPackage
@@ -9780,20 +9916,25 @@ self: {
"HsHTSLib" = callPackage
({ mkDerivation, base, bytestring, bytestring-lexing, conduit
- , containers, inline-c, mtl, template-haskell
+ , containers, inline-c, mtl, tasty, tasty-golden, tasty-hunit
+ , template-haskell, vector, zlib
}:
mkDerivation {
pname = "HsHTSLib";
- version = "1.3.2.3";
- sha256 = "1j80lwall9ji5fb2iw1fni2jxplyiss5rx0zfkbx9g5ns1cd98r3";
+ version = "1.3.2.4";
+ sha256 = "07zgbmk7511n0r7z7zdiryqxrxp000pq5wjdlhnr2ljahz53qnsq";
libraryHaskellDepends = [
base bytestring bytestring-lexing conduit containers inline-c mtl
template-haskell
];
+ librarySystemDepends = [ zlib ];
+ testHaskellDepends = [
+ base bytestring conduit mtl tasty tasty-golden tasty-hunit vector
+ ];
description = "High level bindings to htslib";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
+ }) {inherit (pkgs) zlib;};
"HsHaruPDF" = callPackage
({ mkDerivation, base }:
@@ -9842,8 +9983,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 +10270,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 +10285,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 +10298,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 +10318,8 @@ self: {
}:
mkDerivation {
pname = "IPv6DB";
- version = "0.3.0";
- sha256 = "0dz0ar75nd04l1cbca7iz9laqv24mach7ajr4k5ibl2717kczkpa";
+ version = "0.3.1";
+ sha256 = "06240z3nbjkf0rgwhvajjw28lckgpsfz5nbzzdqyfzgyg2r4wdcn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -10300,6 +10443,7 @@ self: {
];
description = "Multiline strings, interpolation and templating";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Interpolation-maxs" = callPackage
@@ -10311,6 +10455,7 @@ self: {
libraryHaskellDepends = [ base syb template-haskell ];
description = "Multiline strings, interpolation and templating";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"IntervalMap" = callPackage
@@ -10319,8 +10464,8 @@ self: {
}:
mkDerivation {
pname = "IntervalMap";
- version = "0.6.0.0";
- sha256 = "06hin9wf1by8aqa7820fsi2339bh82184frkwz3jsb9sqa0hszcg";
+ version = "0.6.1.0";
+ sha256 = "0g47mf4m0vwbibk8hi9k78xwbgdaa4zvypgbpzcvj20hw2wpcdhk";
libraryHaskellDepends = [ base containers deepseq ];
testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
benchmarkHaskellDepends = [
@@ -10598,14 +10743,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
@@ -10622,8 +10767,8 @@ self: {
}:
mkDerivation {
pname = "JuicyPixels-blp";
- version = "0.1.0.1";
- sha256 = "16fcrd8g4pgwhbvp34mqqvmszlkhjs1qryrn1bll3f0zwirhg3ic";
+ version = "0.1.1.0";
+ sha256 = "0vccx98n9bjnz2clpww4gqns7mc2cmzgpzmj2mx6mwhgb12rwbvx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -10704,8 +10849,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 +11122,7 @@ self: {
];
description = "Library for automated composition and musical learning";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"KyotoCabinet" = callPackage
@@ -11049,8 +11195,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "LParse";
- version = "0.2.2.2";
- sha256 = "0cgmbn6c7fgk6dngx7j1l56sizi37shs5mrdkiqy2k4imb7bc4hl";
+ version = "0.2.3.0";
+ sha256 = "060jxkdnw1s01sawnlzrm91ycjgpa3kw8n9xrb1hgcrbjkzdw39s";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "A continuation-based parser library";
@@ -11313,8 +11459,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 +11933,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";
@@ -12189,10 +12335,8 @@ self: {
}:
mkDerivation {
pname = "MiniAgda";
- version = "0.2017.2.18";
- sha256 = "0s3xp18y4kcjd1qq87vbhijbbpi9d1p08dgxw7521xlr3gmxkqxw";
- revision = "1";
- editedCabalFile = "0n4sd1b0c9fmgn7xqbhbms6y3ffkdgpa4fw7xcx31vgql2adxb0n";
+ version = "0.2018.11.6";
+ sha256 = "0zv8n80qmdykj40nqbrxb29grmy4kzjfhjxbyy3d7ylb64rq514n";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -12205,7 +12349,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
@@ -12215,8 +12359,32 @@ self: {
pname = "MissingH";
version = "1.4.0.1";
sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8";
- revision = "1";
- editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989";
+ revision = "2";
+ editedCabalFile = "0dqrzacp2qr5bm9p8jipnadknizn9zr5gyk5fvgf9av36yl4p2rb";
+ 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;
+ 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
@@ -12672,8 +12840,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 +13006,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;
@@ -13008,6 +13178,7 @@ self: {
];
description = "High-level abstraction over 9P protocol";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"NewBinary" = callPackage
@@ -13089,8 +13260,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 +13566,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 +13723,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 +14046,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 +14539,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,31 +14740,31 @@ 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;
}) {};
"PrimitiveArray" = callPackage
({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector
- , containers, deepseq, DPutils, hashable, log-domain, OrderedBits
- , primitive, QuickCheck, smallcheck, tasty, tasty-quickcheck
- , tasty-smallcheck, tasty-th, text, vector, vector-binary-instances
- , vector-th-unbox
+ , containers, deepseq, DPutils, hashable, lens, log-domain, mtl
+ , OrderedBits, primitive, QuickCheck, smallcheck, tasty
+ , tasty-quickcheck, tasty-smallcheck, tasty-th, text, vector
+ , vector-binary-instances, vector-th-unbox
}:
mkDerivation {
pname = "PrimitiveArray";
- version = "0.8.0.1";
- sha256 = "1x9qmm9bq14dv7abxbmbij1mfyj3pmrmn61yy09zs52m247pvrwi";
+ version = "0.9.0.0";
+ sha256 = "0zhv17cjdppli5q66j1yabbgx3ad172w4jj4zhn0va2wsc9fs5vi";
libraryHaskellDepends = [
aeson base binary bits cereal cereal-vector deepseq DPutils
- hashable log-domain OrderedBits primitive QuickCheck smallcheck
- text vector vector-binary-instances vector-th-unbox
+ hashable lens log-domain mtl OrderedBits primitive QuickCheck
+ smallcheck text vector vector-binary-instances vector-th-unbox
];
testHaskellDepends = [
base containers QuickCheck smallcheck tasty tasty-quickcheck
@@ -14936,6 +15127,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 +15157,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 +15189,8 @@ self: {
pname = "QuickPlot";
version = "0.1.0.1";
sha256 = "1d9zllxl8vyjmb9m9kdgrv9v9hwnspyiqhjnb5ds5kmby6r4r1h2";
+ revision = "1";
+ editedCabalFile = "0ykvkbrf5mavrk9jdl5w01dldwi3x2dwg89hiin95vi8ay0r02gq";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -15103,6 +15314,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "RLP" = callPackage
+ ({ mkDerivation, base, binary, bytestring, hspec }:
+ mkDerivation {
+ pname = "RLP";
+ version = "1.1.1";
+ sha256 = "075hv3ljc47zr5xkvmbiqq666cgicvwl90isq2n45x9nsbg441d1";
+ libraryHaskellDepends = [ base binary bytestring ];
+ testHaskellDepends = [ base binary bytestring hspec ];
+ description = "RLP serialization as defined in Ethereum Yellow Paper";
+ license = stdenv.lib.licenses.lgpl3;
+ }) {};
+
"RMP" = callPackage
({ mkDerivation, allocated-processor, base, canlib, cv-combinators
, ftd2xx, HOpenCV, vector-space
@@ -15293,8 +15516,8 @@ self: {
}:
mkDerivation {
pname = "Raincat";
- version = "1.2";
- sha256 = "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk";
+ version = "1.2.1";
+ sha256 = "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -15430,6 +15653,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 +15766,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
];
@@ -15640,8 +15883,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "RtMidi";
- version = "0.1.0.0";
- sha256 = "087p4smmbi56y962lchgs2a6q78jab58bl6c5sxir7973hplyly6";
+ version = "0.1.1.0";
+ sha256 = "09vs2y6zry4xak0gc6pc6xqinr9sv9z53hdiydxpn6ixam9s0g5r";
libraryHaskellDepends = [ base ];
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -15677,6 +15920,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 +15974,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 ];
@@ -16200,6 +16463,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "SciBaseTypes" = callPackage
+ ({ mkDerivation, aeson, base, binary, cereal, deepseq, hashable
+ , lens, log-domain, mtl, QuickCheck, tasty, tasty-quickcheck
+ , tasty-th, vector, vector-th-unbox
+ }:
+ mkDerivation {
+ pname = "SciBaseTypes";
+ version = "0.0.0.1";
+ sha256 = "14xzlyca61jhfak1vjll5k2ac2hq55hfvbmqbpk8ls56amlyal5j";
+ libraryHaskellDepends = [
+ aeson base binary cereal deepseq hashable lens log-domain mtl
+ vector vector-th-unbox
+ ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-quickcheck tasty-th
+ ];
+ benchmarkHaskellDepends = [ base ];
+ description = "Base types and classes for statistics, sciences and humanities";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"SciFlow" = callPackage
({ mkDerivation, aeson, base, bytestring, cereal, cereal-text
, containers, data-default-class, directory, exceptions
@@ -16261,6 +16545,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "SecureHash-SHA3" = callPackage
+ ({ mkDerivation, base, bytestring }:
+ mkDerivation {
+ pname = "SecureHash-SHA3";
+ version = "0.1.0.2";
+ sha256 = "0h0mya8bk7zkq92plihzzqd7svfqdk2dphnivfb0r80iw3678nv9";
+ libraryHaskellDepends = [ base bytestring ];
+ description = "simple static linked SHA3 using private symbols and the ref impl";
+ license = stdenv.lib.licenses.bsd2;
+ }) {};
+
"SegmentTree" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -16364,8 +16659,8 @@ self: {
}:
mkDerivation {
pname = "ShellCheck";
- version = "0.5.0";
- sha256 = "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b";
+ version = "0.6.0";
+ sha256 = "1xkxrn1j5qvh2pxm0cnjpqqqsvwr7xy8pk31cwbh8r879nrrzrzn";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal process ];
@@ -16637,6 +16932,7 @@ self: {
executableToolDepends = [ alex happy ];
description = "Prototypical type checker for Type Theory with Sized Natural Numbers";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"SizeCompare" = callPackage
@@ -16656,8 +16952,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
];
@@ -17069,6 +17365,8 @@ self: {
pname = "Stack";
version = "0.3.2";
sha256 = "1rap4xyldzwj26r8mbvzkyy9021q8h06pz8cyd061vyslrl7p89b";
+ revision = "1";
+ editedCabalFile = "1ngyrylqmc2fc088d49pn41nlps3mqjimh0y8wc6nmpkay5pj0m8";
libraryHaskellDepends = [ base nats stm ];
description = "Stack data structure";
license = stdenv.lib.licenses.bsd3;
@@ -17193,6 +17491,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;
@@ -17223,7 +17523,7 @@ self: {
version = "4.0.0.0";
sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk";
libraryHaskellDepends = [ base mtl ];
- license = stdenv.lib.licenses.unfree;
+ license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -17257,15 +17557,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;
}) {};
@@ -17875,6 +18175,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "TotalMap" = callPackage
+ ({ mkDerivation, adjunctions, base, distributive, generics-sop
+ , lens, markdown-unlit
+ }:
+ mkDerivation {
+ pname = "TotalMap";
+ version = "0.1.0.0";
+ sha256 = "0k495j5akabp93zq3jm6vi1y1pz1dmvysbxxp0x4fj28yj7svs3d";
+ libraryHaskellDepends = [
+ adjunctions base distributive generics-sop lens
+ ];
+ testHaskellDepends = [
+ adjunctions base distributive generics-sop lens markdown-unlit
+ ];
+ testToolDepends = [ markdown-unlit ];
+ description = "A total map datatype";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"Tournament" = callPackage
({ mkDerivation, base, containers, mtl, QuickCheck, test-framework
, test-framework-quickcheck2
@@ -18072,10 +18391,8 @@ self: {
({ mkDerivation, base, base-orphans }:
mkDerivation {
pname = "TypeCompose";
- version = "0.9.12";
- sha256 = "1qikwd8cq7pywz5j86hwc21ak15a3w5jrhyzmsrr30izr4n2q61s";
- revision = "1";
- editedCabalFile = "0j27xdfim7a6a16v834n3jdp1j7bsr3yn19bnfwni3xsvrc732q3";
+ version = "0.9.14";
+ sha256 = "0msss17lrya6y5xfvxl41xsqs6yr09iw6m1px4xlwin72xwly0sn";
libraryHaskellDepends = [ base base-orphans ];
description = "Type composition classes & instances";
license = stdenv.lib.licenses.bsd3;
@@ -18433,6 +18750,7 @@ self: {
testToolDepends = [ c2hs ];
description = "ViennaRNA v2 bindings";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ViennaRNA-extras" = callPackage
@@ -18483,8 +18801,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 +18812,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
@@ -18520,8 +18838,8 @@ self: {
({ mkDerivation, base, bytestring, containers, parseargs }:
mkDerivation {
pname = "WAVE";
- version = "0.1.3";
- sha256 = "1cgla9y1lwcsdad5qdspymd7s6skdw961fgzh02kvi7gjbrrcyi7";
+ version = "0.1.4";
+ sha256 = "1zr2sw3m0pwbn5qfxhgf8195f4pjj3azc2w849l0cdi3znvmlxih";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring ];
@@ -18807,8 +19125,8 @@ self: {
({ mkDerivation }:
mkDerivation {
pname = "Win32";
- version = "2.8.0.0";
- sha256 = "0ppvpf2zx6547bqx7ysbq9ld99hf1v9rfa9s4f57hkn758l9ldm4";
+ version = "2.8.2.0";
+ sha256 = "1yi1mynxdy05hmq5hzqr9vyjgbr2k0dqjpma0mlk2vqli3nhvw5m";
description = "A binding to Windows Win32 API";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.none;
@@ -19438,17 +19756,20 @@ self: {
}) {};
"Yampa" = callPackage
- ({ mkDerivation, base, deepseq, random }:
+ ({ mkDerivation, base, deepseq, random, simple-affine-space }:
mkDerivation {
pname = "Yampa";
- version = "0.11.1";
- sha256 = "0zzhp0h9z9xz7ipiyd6ygnhb6h50dwh268zamx6qdf6zzpywsya1";
+ version = "0.13";
+ sha256 = "1rxy8vky3wmqn4awr6v7r40ghk6nr27y11jnzbkj1bdp1948irc0";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base deepseq random ];
+ libraryHaskellDepends = [
+ base deepseq random simple-affine-space
+ ];
testHaskellDepends = [ base ];
- description = "Library for programming hybrid systems";
+ description = "Elegant Functional Reactive Programming Language for Hybrid Systems";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Yampa-core" = callPackage
@@ -19480,6 +19801,7 @@ self: {
];
description = "Software synthesizer";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"Yocto" = callPackage
@@ -19863,8 +20185,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 +20481,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
];
@@ -20223,6 +20547,8 @@ self: {
pname = "accelerate-llvm-ptx";
version = "1.2.0.0";
sha256 = "1rh0kq10mwn4zd8f5sp19pah2hmmcansaqqssz79183znzfiviz5";
+ revision = "1";
+ editedCabalFile = "1fcgs1wcknqnj7wr907ixwlrzwgfnl1bmyr5j4d58bm2xrspid7m";
libraryHaskellDepends = [
accelerate accelerate-llvm base bytestring containers cuda deepseq
directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure
@@ -20868,6 +21194,7 @@ self: {
libraryHaskellDepends = [ acme-dont base ];
description = "Safe versions of some infamous haskell functions such as fromJust";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"acme-schoenfinkel" = callPackage
@@ -20892,11 +21219,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 +21245,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 +21318,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 +21344,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 +21399,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 {
@@ -21163,8 +21505,8 @@ self: {
}:
mkDerivation {
pname = "adblock2privoxy";
- version = "1.4.2";
- sha256 = "17ikb90zwz3vvs9yg3z83pzs442vy5nx0h44i64akn10aykw8hic";
+ version = "2.0.0";
+ sha256 = "0wd6zavym2afw7ba2h6i5snwp5gyq64q81gwwlw7y0kslv3xkaw9";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -21327,23 +21669,39 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "advent-of-code-api" = callPackage
+ ({ mkDerivation, attoparsec, base, containers, curl, deepseq
+ , directory, filepath, finite-typelits, HUnit, mtl, tagsoup, text
+ , time, uri-encode
+ }:
+ mkDerivation {
+ pname = "advent-of-code-api";
+ version = "0.1.2.3";
+ sha256 = "1ma9x8dxvhrgxg55bcf6l1d5w1mnmplav2yisnyrgs5034jqpm7l";
+ libraryHaskellDepends = [
+ attoparsec base containers curl deepseq directory filepath
+ finite-typelits mtl tagsoup text time uri-encode
+ ];
+ testHaskellDepends = [ base directory filepath HUnit text ];
+ description = "Advent of Code REST API bindings";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"aern2-mp" = callPackage
- ({ mkDerivation, base, convertible, hmpfr, hspec, integer-gmp
- , integer-logarithms, lens, mixed-types-num, QuickCheck, regex-tdfa
+ ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens
+ , mixed-types-num, QuickCheck, regex-tdfa, rounded
, template-haskell
}:
mkDerivation {
pname = "aern2-mp";
- version = "0.1.2.0";
- sha256 = "131wymnajhji593zydnyddyc6cwg0y3nqgvibq8l9h23v4m67rlx";
- revision = "1";
- editedCabalFile = "09b92kf60m4v0xn2nm9h8wkg8wr7dc1na5c9mg2lk3kplf60sfvk";
+ version = "0.1.3.1";
+ sha256 = "1gyicxsdqzdbhs9bss5cfjqx859iksr7z1ilsfm9077jdf2032vm";
libraryHaskellDepends = [
- base convertible hmpfr hspec integer-gmp integer-logarithms lens
- mixed-types-num QuickCheck regex-tdfa template-haskell
+ base convertible hspec integer-logarithms lens mixed-types-num
+ QuickCheck regex-tdfa rounded template-haskell
];
testHaskellDepends = [ base hspec QuickCheck ];
- description = "Multi-precision floats via MPFR";
+ description = "Multi-precision ball (interval) arithmetic";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -21429,24 +21787,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "aeson_1_4_0_0" = callPackage
+ "aeson_1_4_2_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
+ , base16-bytestring, bytestring, containers, contravariant, deepseq
+ , directory, dlist, filepath, generic-deriving, ghc-prim, hashable
+ , 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.2.0";
+ sha256 = "1l4b675nxddim3v30kd7zr3vmrs7i1m81rh8h9bfbm9k9a0p3kkm";
libraryHaskellDepends = [
- attoparsec base base-compat bytestring containers deepseq dlist
- ghc-prim hashable scientific tagged template-haskell text
- th-abstraction time time-locale-compat unordered-containers
- uuid-types vector
+ attoparsec base base-compat bytestring containers contravariant
+ deepseq dlist ghc-prim hashable primitive scientific tagged
+ template-haskell text th-abstraction time time-locale-compat
+ unordered-containers uuid-types vector
];
testHaskellDepends = [
attoparsec base base-compat base-orphans base16-bytestring
@@ -21555,10 +21913,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
@@ -21602,6 +21958,8 @@ self: {
pname = "aeson-diff";
version = "1.1.0.5";
sha256 = "1kzvqzbl6pp5g49dp4qqc7cbisnkpqz0i18b6nmdb7f1nrhdvnb1";
+ revision = "1";
+ editedCabalFile = "0a29nph4a1ny365nhsxlm73mk6zgaam4sfx6knzqjy8dxp1gkj48";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -21651,8 +22009,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 +22096,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 +22104,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 +22114,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 +22197,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 +22333,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 +22341,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 +22531,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 +22751,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 +23139,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 +23258,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,13 +23288,25 @@ 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;
}) {};
+ "alg_0_2_9_0" = callPackage
+ ({ mkDerivation, base, util }:
+ mkDerivation {
+ pname = "alg";
+ version = "0.2.9.0";
+ sha256 = "0w5lxmz52nskh8ms3nliya78v1pb77f7nyn19klqf8yskaalywlq";
+ libraryHaskellDepends = [ base util ];
+ description = "Algebraic structures";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"alga" = callPackage
({ mkDerivation, aeson, base, containers, data-default, exceptions
, file-embed, filepath, formatting, haskeline, hspec, hxt
@@ -23033,8 +23412,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 +23421,37 @@ 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
+ array base base-compat base-orphans containers extra QuickCheck
];
- benchmarkHaskellDepends = [
- base base-compat containers criterion
+ description = "A library for algebraic graph construction and transformation";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "algebraic-graphs_0_3" = callPackage
+ ({ mkDerivation, array, base, base-compat, base-orphans, containers
+ , deepseq, extra, inspection-testing, mtl, QuickCheck
+ }:
+ mkDerivation {
+ pname = "algebraic-graphs";
+ version = "0.3";
+ sha256 = "1q4xlyg3xjm7q2x11s4lbffywp096y3s3b72b8amfdyi27har4hl";
+ libraryHaskellDepends = [
+ array base base-compat containers deepseq mtl
+ ];
+ testHaskellDepends = [
+ array base base-compat base-orphans containers extra
+ inspection-testing QuickCheck
];
description = "A library for algebraic graph construction and transformation";
license = stdenv.lib.licenses.mit;
@@ -23166,6 +23562,17 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "alist" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "alist";
+ version = "0.1.0.3";
+ sha256 = "0asm8kp7xsqs1r5x65j4nhdbzs2sk1w5yh0f9g6sn6k03acg8gcr";
+ libraryHaskellDepends = [ base ];
+ description = "lists with O(1) append";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"allocated-processor" = callPackage
({ mkDerivation, base, vector-space }:
mkDerivation {
@@ -23263,6 +23670,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
@@ -23369,8 +23778,8 @@ self: {
({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
mkDerivation {
pname = "alsa-mixer";
- version = "0.2.0.3";
- sha256 = "13fgd78msqsyzm92cbasm8m3s1rww6r1g83qbrv4mkm2h50fnvgp";
+ version = "0.3.0";
+ sha256 = "00ny2p3276jilidjs44npc8zmbhynz3f2lpmlwwl6swwx5yijsnb";
libraryHaskellDepends = [ alsa-core base unix ];
librarySystemDepends = [ alsaLib ];
libraryToolDepends = [ c2hs ];
@@ -23385,8 +23794,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 +27093,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 +27108,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 +27272,8 @@ self: {
}:
mkDerivation {
pname = "antiope-athena";
- version = "6.0.1";
- sha256 = "0y8a3rs5sy2qv2pwqb6ap6bl64qhp7x0jqqy1q237vfm2w6vrj6v";
+ version = "6.1.5";
+ sha256 = "0p78yxdnfzz6jw7az6xfh6sjcnf9d8sl512cmhdcws78p7f2rhlx";
libraryHaskellDepends = [
amazonka amazonka-athena amazonka-core base lens resourcet text
unliftio-core
@@ -26876,22 +27285,37 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "antiope-contract" = callPackage
+ ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
+ mkDerivation {
+ pname = "antiope-contract";
+ version = "6.1.5";
+ sha256 = "1ikd0sn3z901hyad55ngzs99b0v9bs5vkry5965w22smljdg3rqh";
+ 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
- , transformers, unliftio-core
+ , exceptions, generic-lens, http-client, http-types, lens
+ , monad-logger, mtl, resourcet, text, transformers, unliftio-core
}:
mkDerivation {
pname = "antiope-core";
- version = "6.0.1";
- sha256 = "1h7yd3p5dqkq118xvmp9ifydgak311pfibkpgy3il0qj4gj2g8sa";
+ version = "6.1.5";
+ sha256 = "06c8wd4gjlrz1sdk7qpd1l8n29a3jkipy749j3414x7b5fqxbzi7";
libraryHaskellDepends = [
- amazonka amazonka-core base bytestring generic-lens http-client
- lens monad-logger mtl resourcet transformers unliftio-core
+ amazonka amazonka-core base bytestring exceptions generic-lens
+ http-client http-types lens monad-logger mtl resourcet text
+ transformers unliftio-core
];
testHaskellDepends = [
- amazonka amazonka-core base bytestring generic-lens http-client
- lens monad-logger mtl resourcet transformers unliftio-core
+ amazonka amazonka-core base bytestring exceptions generic-lens
+ http-client http-types lens monad-logger mtl resourcet text
+ transformers unliftio-core
];
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -26904,8 +27328,8 @@ self: {
}:
mkDerivation {
pname = "antiope-dynamodb";
- version = "6.0.1";
- sha256 = "1f8ixkvh7f5dgxl76823f275c3r6f1xmwhx4rfcmd6z90dn8damm";
+ version = "6.1.5";
+ sha256 = "181ygxvf29acianvnryv1kbn5g69axkagqa54429ja8jfxiblrqq";
libraryHaskellDepends = [
amazonka amazonka-core amazonka-dynamodb antiope-core base
generic-lens lens text unliftio-core unordered-containers
@@ -26925,8 +27349,8 @@ self: {
}:
mkDerivation {
pname = "antiope-messages";
- version = "6.0.1";
- sha256 = "1ib2j0jlcfzq89a4vs7r282hpmqnqg2gw8l1ibfiahl4ac91z7zn";
+ version = "6.1.5";
+ sha256 = "09ysy9r38d216vzq0nm1zfl4fqz8mrqa39c2ivy7pqm4xldsqary";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3
base generic-lens lens lens-aeson monad-loops network-uri text
@@ -26942,23 +27366,25 @@ 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
+ , attoparsec, 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.5";
+ sha256 = "0b2mildkgd271c8hwg6b3jf8xgli5bmd4dx9c0ac8ihyn28xr0m8";
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 attoparsec 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
+ amazonka amazonka-core amazonka-s3 antiope-core attoparsec 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;
@@ -26971,8 +27397,8 @@ self: {
}:
mkDerivation {
pname = "antiope-sns";
- version = "6.0.1";
- sha256 = "0hqvh3vzpdr9g6v778qn17nfrqvg8i2lszqgss9fb8290mlm8x01";
+ version = "6.1.5";
+ sha256 = "07kg0b0iyik0axnycph3irp73cv614qcny3z3rib1rpvbknz9iwh";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-sns base generic-lens lens
text unliftio-core
@@ -26992,8 +27418,8 @@ self: {
}:
mkDerivation {
pname = "antiope-sqs";
- version = "6.0.1";
- sha256 = "0pfhhgc7dkp4dn2k0dxy2pkmbml9js351ab2y2hln5jpsni9qfc0";
+ version = "6.1.5";
+ sha256 = "097vxkz54k4ijqqzb8lijr90hvnyyhqm7sqn5qxam3wy355w3z5c";
libraryHaskellDepends = [
aeson amazonka amazonka-core amazonka-s3 amazonka-sqs
antiope-messages antiope-s3 base generic-lens lens lens-aeson
@@ -27048,6 +27474,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "antlr-haskell" = callPackage
+ ({ mkDerivation, base, call-stack, containers, deepseq, hashable
+ , haskell-src-meta, HUnit, mtl, QuickCheck, template-haskell
+ , test-framework, test-framework-hunit, test-framework-quickcheck2
+ , text, th-lift, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "antlr-haskell";
+ version = "0.1.0.0";
+ sha256 = "057mr0vw299hjjxlcpmwpbpwn6snzdvr73gmwxhh1gqgbh9g4bx4";
+ libraryHaskellDepends = [
+ base containers deepseq hashable haskell-src-meta mtl
+ template-haskell text th-lift transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base call-stack containers deepseq hashable haskell-src-meta HUnit
+ mtl QuickCheck template-haskell test-framework test-framework-hunit
+ test-framework-quickcheck2 text th-lift transformers
+ unordered-containers
+ ];
+ description = "A Haskell implementation of the ANTLR top-down parser generator";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"antlrc" = callPackage
({ mkDerivation, antlr3c, base, bytestring, c2hs, enumerator
, haskell98, regex-posix
@@ -27085,6 +27535,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.1";
+ sha256 = "1sm925sr3ifi44wp7ndgjwwk3d3xy75ai6kgll573ngdicy3b2n3";
+ 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 +27574,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 +27619,8 @@ self: {
}:
mkDerivation {
pname = "apart";
- version = "0.1.1";
- sha256 = "1xrmdzaf56gzmrg596kfkp01pvn9m9w2mvz58z3zhx6jda1zvaan";
+ version = "0.1.3";
+ sha256 = "16y5k372kmqsn81bksl9j01nbfhsk0cwriwpfycjsnzgmg8wnkpb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -27168,15 +27638,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.7.0";
+ sha256 = "1yah3yn4z6nxm8gdlkmzlbi8h7nd4zb4905dvzb9b66njhff06l2";
libraryHaskellDepends = [
- async base containers mtl template-haskell vector
+ base containers mtl template-haskell vector
];
testHaskellDepends = [
base containers criterion linear QuickCheck vector
@@ -27186,6 +27656,48 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "apecs-gloss" = callPackage
+ ({ mkDerivation, apecs, apecs-physics, base, containers, gloss
+ , linear
+ }:
+ mkDerivation {
+ pname = "apecs-gloss";
+ version = "0.1.1";
+ sha256 = "0s5vhxgfgj4v51dnrhzfbids0a873113rqb76xr8f5azq6kr9g3p";
+ libraryHaskellDepends = [
+ apecs apecs-physics base containers gloss linear
+ ];
+ description = "Simple gloss renderer for apecs";
+ 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.3.1";
+ sha256 = "0ij8wv9vrard7nfh8hhzrs9j7w5jlw3353w396alwnbb40hvk7gj";
+ 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
@@ -27263,7 +27775,7 @@ self: {
"api-tools" = callPackage
({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base
- , base16-bytestring, base64-bytestring, binary, bytestring, Cabal
+ , base16-bytestring, base64-bytestring, bytestring, Cabal
, case-insensitive, cborg, containers, deepseq, happy, lens
, QuickCheck, regex-compat-tdfa, safe, safecopy, scientific
, serialise, tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -27271,30 +27783,25 @@ self: {
}:
mkDerivation {
pname = "api-tools";
- version = "0.8.0.1";
- sha256 = "19a2g5rym3cydbdb9b6x0rm7xdw2m5ckqdzb02yblx9pv045nfzx";
+ version = "0.8.0.2";
+ sha256 = "0q10vqaf4y3zwa2nrwllxi8ac8ch6jjr4r3s5g6gy51bp04ggzv9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-pretty array attoparsec base base16-bytestring
- base64-bytestring binary bytestring Cabal case-insensitive cborg
+ base64-bytestring bytestring Cabal case-insensitive cborg
containers deepseq lens QuickCheck regex-compat-tdfa safe safecopy
scientific serialise template-haskell text time
unordered-containers vector
];
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [
- aeson aeson-pretty array attoparsec base base64-bytestring
- bytestring case-insensitive cborg containers deepseq lens
- QuickCheck regex-compat-tdfa safe safecopy serialise
- template-haskell text time unordered-containers vector
+ aeson aeson-pretty base bytestring deepseq QuickCheck serialise
];
testHaskellDepends = [
- aeson aeson-pretty array attoparsec base base64-bytestring
- bytestring Cabal case-insensitive cborg containers lens QuickCheck
- regex-compat-tdfa safe safecopy serialise tasty tasty-hunit
+ aeson aeson-pretty base base64-bytestring bytestring Cabal cborg
+ containers QuickCheck safecopy serialise tasty tasty-hunit
tasty-quickcheck template-haskell text time unordered-containers
- vector
];
description = "DSL for generating API boilerplate and docs";
license = stdenv.lib.licenses.bsd3;
@@ -27679,8 +28186,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
];
@@ -27695,13 +28202,27 @@ self: {
({ mkDerivation, base, bytestring }:
mkDerivation {
pname = "appar";
- version = "0.1.4";
- sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq";
+ version = "0.1.5";
+ sha256 = "0qlfwy8nxl1na55p155vq5yn0cqz26mmmh5vs28aqry7kyyxndfi";
+ revision = "1";
+ editedCabalFile = "0adhm7jldcqnikvd8b9wj6p5rnhf4ciwbms0jafwx79w720knj9p";
libraryHaskellDepends = [ base bytestring ];
description = "A simple applicative parser";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "appar_0_1_7" = callPackage
+ ({ mkDerivation, base, bytestring }:
+ mkDerivation {
+ pname = "appar";
+ version = "0.1.7";
+ sha256 = "07zjgx7xpjgkjqvga0wv542cyrjzh1mszlczg82nbmij2cflzppn";
+ libraryHaskellDepends = [ base bytestring ];
+ description = "A simple applicative parser";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"appc" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, hspec
, hspec-smallcheck, optparse-applicative, semver, smallcheck, text
@@ -27729,13 +28250,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;
}) {};
@@ -27891,12 +28412,44 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "apply-refact_0_6_0_0" = callPackage
+ ({ mkDerivation, base, containers, directory, filemanip, filepath
+ , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
+ , silently, syb, tasty, tasty-expected-failure, tasty-golden
+ , temporary, transformers, unix-compat
+ }:
+ mkDerivation {
+ pname = "apply-refact";
+ version = "0.6.0.0";
+ sha256 = "0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory filemanip ghc ghc-exactprint mtl process
+ refact syb temporary transformers unix-compat
+ ];
+ executableHaskellDepends = [
+ base containers directory filemanip filepath ghc ghc-exactprint mtl
+ optparse-applicative process refact syb temporary transformers
+ unix-compat
+ ];
+ testHaskellDepends = [
+ base containers directory filemanip filepath ghc ghc-exactprint mtl
+ optparse-applicative process refact silently syb tasty
+ tasty-expected-failure tasty-golden temporary transformers
+ unix-compat
+ ];
+ description = "Perform refactorings specified by the refact library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"apportionment" = callPackage
({ mkDerivation, base, containers, utility-ht }:
mkDerivation {
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 +28574,126 @@ 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.1";
+ sha256 = "0fkf71ml6qfsxjx1p7gqf41q8x55hn8qsbb7nmyai0k0vz0s2yqq";
+ 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-monad-metric" = callPackage
+ ({ mkDerivation, arbor-datadog, base, bytestring, containers
+ , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens, mtl
+ , network, resourcet, stm, text, transformers
+ }:
+ mkDerivation {
+ pname = "arbor-monad-metric";
+ version = "1.1.0";
+ sha256 = "05924jv5m1jsx0l3px8m1a4hakadqvva5808lvfp6rpzssdjrwmb";
+ libraryHaskellDepends = [
+ base containers generic-lens lens mtl resourcet stm text
+ transformers
+ ];
+ testHaskellDepends = [
+ arbor-datadog base bytestring containers generic-lens hedgehog
+ hspec hw-hspec-hedgehog lens mtl network resourcet stm text
+ transformers
+ ];
+ description = "Core metric library for publishing metrics";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "arbor-monad-metric-datadog" = callPackage
+ ({ mkDerivation, arbor-datadog, arbor-monad-metric, base
+ , bytestring, containers, exceptions, fast-logger, generic-lens
+ , hedgehog, hspec, hw-hspec-hedgehog, lens, monad-logger, mtl
+ , network, resourcet, stm, text, transformers
+ }:
+ mkDerivation {
+ pname = "arbor-monad-metric-datadog";
+ version = "1.0.0";
+ sha256 = "07hqghjrl25ky0rn4mnwia5b90zhf88w6zkqyscs527c0c6dkybc";
+ libraryHaskellDepends = [
+ arbor-datadog arbor-monad-metric base bytestring containers
+ generic-lens lens mtl network resourcet stm text transformers
+ ];
+ testHaskellDepends = [
+ arbor-datadog arbor-monad-metric base bytestring containers
+ exceptions fast-logger generic-lens hedgehog hspec
+ hw-hspec-hedgehog lens monad-logger mtl network resourcet stm text
+ transformers
+ ];
+ description = "Metric library backend for datadog";
+ 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.3";
+ sha256 = "18rqy2zyaf5cawn8dkn3xmjh19zzqgwj6mkk415x5a4p53dya46b";
+ 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 +29108,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 +29126,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 = "2";
+ editedCabalFile = "1jv5ch28pjiq3a83hyvknzfwmsbwgqs6g9618z79ss3385k0cwl9";
+ 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 +29233,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 +29306,24 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"arrow-extras" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -28713,6 +29433,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "artifact" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, text }:
+ mkDerivation {
+ pname = "artifact";
+ version = "0.0.0.0";
+ sha256 = "0pw47pfn745plc8kslcz580lniprwpv8x8l65zgixpnc34i1bx56";
+ revision = "1";
+ editedCabalFile = "09hmx0x4fz80kby7w1n9rc7sibbmpsvl4i3rc3h91hs53ban4yd4";
+ libraryHaskellDepends = [ aeson base bytestring containers text ];
+ description = "Basic types and instances for Valve's Artifact Card-set API";
+ license = stdenv.lib.licenses.agpl3Plus;
+ }) {};
+
"arx" = callPackage
({ mkDerivation, attoparsec, base, blaze-builder, bytestring
, bytestring-nums, containers, file-embed, hashable, parsec
@@ -28762,16 +29495,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 +29579,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 +29591,7 @@ self: {
];
description = "Compact representation of ASCII strings";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ascii-table" = callPackage
@@ -28933,8 +29668,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 +29700,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.2.0";
+ sha256 = "0ryg35rl7i89r28l0hpchgmrgmhxwgzxz7jhnwhqfwk5mql08hq0";
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 +29780,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 +29945,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 +29984,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 +30129,8 @@ self: {
pname = "async";
version = "2.2.1";
sha256 = "09whscli1q5z7lzyq9rfk0bq1ydplh6pjmc6qv0x668k5818c2wg";
+ revision = "1";
+ editedCabalFile = "0lg8c3iixm7vjjq2nydkqswj78i4iyx2k83hgs12z829yj196y31";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base hashable stm ];
@@ -29407,6 +30171,7 @@ self: {
testToolDepends = [ tasty-discover ];
description = "Async combinators";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"async-dejafu" = callPackage
@@ -29808,8 +30573,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;
@@ -29867,13 +30632,13 @@ self: {
}:
mkDerivation {
pname = "atomic-write";
- version = "0.2.0.5";
- sha256 = "1iaq0hprxcv0sl1sgwcgmm87zraf738va1bciwnx2jkk3k1v9iyv";
+ version = "0.2.0.6";
+ sha256 = "1xs3shwnlj8hmnm3q6jc8nv78z0481i5n4hrqqdmbpx8grvlnqyl";
libraryHaskellDepends = [
base bytestring directory filepath temporary text unix-compat
];
testHaskellDepends = [
- base bytestring directory filepath hspec temporary text unix-compat
+ base bytestring filepath hspec temporary text unix-compat
];
description = "Atomically write to a file";
license = stdenv.lib.licenses.mit;
@@ -29935,19 +30700,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;
@@ -29964,8 +30730,8 @@ self: {
}:
mkDerivation {
pname = "ats-pkg";
- version = "3.2.1.8";
- sha256 = "183gdyivl6kab2k3z0jm6dk0wh83qwz3zvai7ayfkq3rjc6lb8ms";
+ version = "3.2.4.4";
+ sha256 = "0qnhxx4xfh40g1gh108rqcxam3zdm6qwz4h3mh8kw9lq9bnman46";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -30062,8 +30828,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 +30878,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 +31006,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_5" = callPackage
({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty
, tasty-quickcheck, text, vector
}:
mkDerivation {
pname = "attoparsec-ip";
- version = "0.0.3";
- sha256 = "02d66mm1rc00dswkl9ink4pxwy8h7lyi2k9zcqda6ywa7cllhgl0";
+ version = "0.0.5";
+ sha256 = "0vy709qw277a6qqc4127z8jy61pmz3yigsmb9jkgmfagd5cli1pm";
libraryHaskellDepends = [ attoparsec base ip vector ];
testHaskellDepends = [
attoparsec base ip QuickCheck tasty tasty-quickcheck text vector
@@ -30259,10 +31030,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,17 +31156,18 @@ self: {
];
description = "URI parser / printer using attoparsec";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "attoparsec-uri_0_0_6" = callPackage
+ "attoparsec-uri_0_0_7" = callPackage
({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip
, QuickCheck, quickcheck-instances, strict, tasty, tasty-quickcheck
, text, vector
}:
mkDerivation {
pname = "attoparsec-uri";
- version = "0.0.6";
- sha256 = "046aq5c56p51nxyrazv3sv7m49c214gc673cwyic75vfykgbk20b";
+ version = "0.0.7";
+ sha256 = "0p3j4m5ps4j8phm2c00rk6m06vidckf14fy50xgcq2zr8b1lk79n";
libraryHaskellDepends = [
attoparsec attoparsec-ip base bytedump ip QuickCheck
quickcheck-instances strict text vector
@@ -30540,15 +31310,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 +31345,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 +31517,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 +31641,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 +31693,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 +31755,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 +31838,8 @@ 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
@@ -31037,6 +31855,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "avro_0_4_1_0" = callPackage
+ ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+ , 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.4.1.0";
+ sha256 = "0dndnk8wk1ir59m19qsb3jrza8xy2w3w3fqv52hyqz1w5ca906n6";
+ libraryHaskellDepends = [
+ aeson array base base16-bytestring bifunctors 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 bifunctors 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"avwx" = callPackage
({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
, parsers, pretty-show, text
@@ -31126,6 +31973,8 @@ self: {
pname = "aws";
version = "0.18";
sha256 = "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj";
+ revision = "1";
+ editedCabalFile = "0y3xkhnaksj926khsy1d8gks2jzphkaibi97h98l47nbh962ickj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -31286,17 +32135,18 @@ self: {
"aws-easy" = callPackage
({ mkDerivation, amazonka, amazonka-dynamodb, amazonka-s3, base
- , bytestring, lens, resourcet, split, template-haskell, text
- , unordered-containers
+ , bytestring, lens, monad-control, resourcet, split
+ , template-haskell, text, unordered-containers
}:
mkDerivation {
pname = "aws-easy";
- version = "0.1.0.1";
- sha256 = "0sl3whg7x02c3cph5p72rlkycsr2m3ni0kad5rs0q644wgvhqvm5";
+ version = "0.1.0.2";
+ sha256 = "16a0dfgd6ggm5b4g75913b5pc0s5hdh7n1h3j22d4j50knd8j5r4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- amazonka base bytestring lens resourcet template-haskell
+ amazonka base bytestring lens monad-control resourcet
+ template-haskell
];
executableHaskellDepends = [
amazonka amazonka-dynamodb amazonka-s3 base lens split text
@@ -31519,6 +32369,59 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "aws-lambda-haskell-runtime" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
+ , directory, filepath, hspec, microlens-platform, mtl
+ , optparse-generic, process, QuickCheck, relude, template-haskell
+ , text, wreq
+ }:
+ mkDerivation {
+ pname = "aws-lambda-haskell-runtime";
+ version = "1.0.4";
+ sha256 = "0cfmdgy0vn62gdi01r02k4yb87s4xv0xhyd06j5ws6ky6cpmmdwx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring case-insensitive conduit directory filepath
+ microlens-platform mtl optparse-generic process relude
+ template-haskell text wreq
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring case-insensitive conduit directory filepath
+ microlens-platform mtl optparse-generic process relude
+ template-haskell text wreq
+ ];
+ testHaskellDepends = [
+ aeson base bytestring case-insensitive conduit directory filepath
+ hspec microlens-platform mtl optparse-generic process QuickCheck
+ relude template-haskell text wreq
+ ];
+ description = "Haskell runtime for AWS Lambda";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
+ "aws-lambda-runtime" = callPackage
+ ({ mkDerivation, aeson, async, base, base-compat, bytestring
+ , containers, deepseq, filepath, http-client, http-media
+ , http-types, lens, lens-aeson, parsec, process, text, time
+ , zip-archive
+ }:
+ mkDerivation {
+ pname = "aws-lambda-runtime";
+ version = "0";
+ sha256 = "1wnpck1cy7bc3g7g3z210n9sgiplsxqbli0xgpxi2wxmhcf5dpjq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson async base base-compat bytestring containers deepseq filepath
+ http-client http-media http-types parsec process text time
+ zip-archive
+ ];
+ executableHaskellDepends = [ aeson base lens lens-aeson text ];
+ description = "Haskell on AWS Lambda Runtime API";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"aws-mfa-credentials" = callPackage
({ mkDerivation, amazonka, amazonka-core, amazonka-sts, base
, exceptions, filelock, filepath, freer-effects, ini, lens
@@ -31743,26 +32646,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
@@ -31839,6 +32752,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "azure-email" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , cryptonite, exceptions, http-client, http-client-tls, lens-aeson
+ , microlens, RSA, text, time, uuid, wreq
+ }:
+ mkDerivation {
+ pname = "azure-email";
+ version = "0.1.0.0";
+ sha256 = "108xfmq9mb8fxy06six0id7sf8rpazknqx4plk93fl34xyrwald5";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring cryptonite exceptions
+ http-client http-client-tls lens-aeson microlens RSA text time uuid
+ wreq
+ ];
+ description = "send email with microsoft azure";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"azure-service-api" = callPackage
({ mkDerivation, base, binary, bytestring, case-insensitive
, certificate, crypto-pubkey-types, http-conduit, hxt, hxt-xpath
@@ -31910,17 +32841,16 @@ self: {
({ mkDerivation, base, binary, bytestring, containers, criterion
, directory, errors, exceptions, filepath, lens, mmap, mtl, pipes
, pipes-interleave, QuickCheck, tasty, tasty-quickcheck
- , transformers, vector
+ , transformers, vector, vector-binary-instances
}:
mkDerivation {
pname = "b-tree";
- version = "0.1.3";
- sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb";
- revision = "2";
- editedCabalFile = "04is4fc308f1achbdxvqq9rg4v8c02f1w88wysp318dbhhmwgggh";
+ version = "0.1.4";
+ sha256 = "17hcv85020dm5h3449bfa763bcbl723h17chah4418dby2ql5lxg";
libraryHaskellDepends = [
base binary bytestring containers directory errors exceptions
filepath lens mmap mtl pipes pipes-interleave transformers vector
+ vector-binary-instances
];
testHaskellDepends = [
base binary containers pipes QuickCheck tasty tasty-quickcheck
@@ -31941,8 +32871,8 @@ self: {
}:
mkDerivation {
pname = "b9";
- version = "0.5.49";
- sha256 = "0n9vci1wc2ws4nyzmmqi2npwkd3zz28znyqj4905y1hc126x0yi3";
+ version = "0.5.51";
+ sha256 = "1mjylfxw7ivmxma7kskjs7plcd9wxknfd9slxb7zjgawzksdv3bq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -31961,6 +32891,7 @@ self: {
];
description = "A tool and library for building virtual machine images";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"babl" = callPackage
@@ -32094,6 +33025,7 @@ self: {
executableHaskellDepends = [ base gd X11 ];
description = "braindead utility to compose Xinerama backgrounds";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bag" = callPackage
@@ -32336,8 +33268,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 +33297,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 +33421,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 +33440,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 +33462,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 ];
@@ -32556,6 +33490,7 @@ self: {
doHaddock = false;
description = "Helps migrating projects to base-compat(-batteries)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"base-encoding" = callPackage
@@ -32566,6 +33501,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 +33551,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
@@ -32673,6 +33611,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "base-unicode-symbols_0_2_3" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "base-unicode-symbols";
+ version = "0.2.3";
+ sha256 = "1ia6li7qjg1zkak4gf6mnbshw45mq9bfjr0jch58ds0lscmvwyzf";
+ libraryHaskellDepends = [ base ];
+ description = "Unicode alternatives for common functions and operators";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"base16-bytestring" = callPackage
({ mkDerivation, base, bytestring, ghc-prim }:
mkDerivation {
@@ -32747,6 +33697,7 @@ self: {
];
description = "Parsing and serialization for Base58 addresses (Bitcoin and Ripple)";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"base58string" = callPackage
@@ -32763,18 +33714,22 @@ self: {
}) {};
"base64-bytestring" = callPackage
- ({ mkDerivation, base, bytestring, containers, HUnit, QuickCheck
- , test-framework, test-framework-hunit, test-framework-quickcheck2
+ ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+ , HUnit, QuickCheck, split, test-framework, test-framework-hunit
+ , test-framework-quickcheck2
}:
mkDerivation {
pname = "base64-bytestring";
- version = "1.0.0.1";
- sha256 = "0l1v4ddjdsgi9nqzyzcxxj76rwar3lzx8gmwf2r54bqan3san9db";
+ version = "1.0.0.2";
+ sha256 = "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
- base bytestring containers HUnit QuickCheck test-framework
+ base bytestring containers HUnit QuickCheck split test-framework
test-framework-hunit test-framework-quickcheck2
];
+ benchmarkHaskellDepends = [
+ base bytestring containers criterion deepseq
+ ];
description = "Fast base64 encoding and decoding for ByteStrings";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -32788,8 +33743,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
@@ -32830,6 +33785,7 @@ self: {
libraryHaskellDepends = [ base ];
description = "Base64 implementation for String's";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"base91" = callPackage
@@ -32991,6 +33947,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 +34103,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 = [
@@ -33214,6 +34172,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "bazel-runfiles" = callPackage
+ ({ mkDerivation, base, directory, filepath }:
+ mkDerivation {
+ pname = "bazel-runfiles";
+ version = "0.7.0.1";
+ sha256 = "000awjykargiirnmb3nfqp8dk1p87f5aqx2d07nxrrgflxs7y8ad";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [ base filepath ];
+ description = "Locate Bazel runfiles location";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"bbdb" = callPackage
({ mkDerivation, base, hspec, parsec }:
mkDerivation {
@@ -33472,8 +34444,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
@@ -33533,13 +34505,14 @@ self: {
({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }:
mkDerivation {
pname = "bearriver";
- version = "0.10.4.3";
- sha256 = "0d8yhccsg66163cjkdccdjf26rkzv4i7fv454fj9vhylxcggzjin";
+ version = "0.10.4.4";
+ sha256 = "14aqp6jqca5b4z0bf5q18pq5l9q43bzz18zjwn3j0ns1fakrq5bb";
libraryHaskellDepends = [
base dunai MonadRandom mtl transformers
];
description = "A replacement of Yampa based on Monadic Stream Functions";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"beautifHOL" = callPackage
@@ -33557,20 +34530,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 +34624,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 +34638,6 @@ self: {
];
description = "Command-line benchmark tool";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bench-graph" = callPackage
@@ -33693,8 +34646,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 +34657,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 +34691,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 ];
@@ -33743,6 +34715,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bencodex" = callPackage
+ ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
+ , containers, file-embed, filepath, hashable, hlint, hspec
+ , hspec-attoparsec, hspec-discover, HsYAML, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "bencodex";
+ version = "1.0.0";
+ sha256 = "1ny60qg63kyi12rlk8spc6db40zq3laqfw0k89s0jvnkjlksdyj8";
+ libraryHaskellDepends = [
+ attoparsec base bytestring hashable text unordered-containers
+ ];
+ testHaskellDepends = [
+ base base64-bytestring bytestring containers file-embed filepath
+ hlint hspec hspec-attoparsec hspec-discover HsYAML text
+ unordered-containers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Bencodex reader/writer for Haskell";
+ license = stdenv.lib.licenses.gpl3Plus;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bencoding" = callPackage
({ mkDerivation, AttoBencode, attoparsec, base, bencode, bytestring
, containers, criterion, deepseq, ghc-prim, hspec, integer-gmp, mtl
@@ -33897,22 +34893,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;
}) {};
@@ -34003,6 +35001,8 @@ self: {
pname = "bhoogle";
version = "0.1.3.5";
sha256 = "1gig9w1k1w2kw6y3wx6ckmc7kamwwzzq7mbaxil0rmb5ms0p1rf9";
+ revision = "2";
+ editedCabalFile = "0jwfw2xa55ysfxyzp5n2pf2vq753iagpmvg9xnj69nv6ly9whfp7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -34010,7 +35010,7 @@ self: {
process protolude text time typed-process vector vty
];
description = "Simple terminal GUI for local hoogle";
- license = stdenv.lib.licenses.bsd3;
+ license = "(BSD-3-Clause OR Apache-2.0)";
}) {};
"bibdb" = callPackage
@@ -34386,10 +35386,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 +35540,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 +35657,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 +35749,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 +36401,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 +36698,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 +36817,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 +37640,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 +37673,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;
@@ -36945,6 +37947,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) blas;};
+ "blas-ffi_0_0_2" = callPackage
+ ({ mkDerivation, base, blas, netlib-ffi }:
+ mkDerivation {
+ pname = "blas-ffi";
+ version = "0.0.2";
+ sha256 = "047qal272s1hc3pp7xy8vyq4dm80nvqin34zvl7wz09c0qrnnvyc";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base netlib-ffi ];
+ libraryPkgconfigDepends = [ blas ];
+ description = "Auto-generated interface to Fortran BLAS";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) blas;};
+
"blas-hs" = callPackage
({ mkDerivation, base, blas, storable-complex, vector }:
mkDerivation {
@@ -37186,8 +38203,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 +38687,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 +38752,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 +39092,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 +39109,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
];
@@ -38127,8 +39165,8 @@ self: {
}:
mkDerivation {
pname = "boomange";
- version = "0.1.3.6";
- sha256 = "0gdhvxjcbyzhxvrgzk70jaihgkxa03ycg4bls03rgnqy773p07f1";
+ version = "0.1.3.7";
+ sha256 = "1is7j497w2vgdyxyv7advgwmcc9yacjy41wkz3q1rva9lnzdhca9";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -38264,6 +39302,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 +39412,8 @@ self: {
pname = "bound-extras";
version = "0";
sha256 = "0j010sbdm0bc9dq4lsyw1vb2x0j6gcjxp7ywjn8izdh6yqr2r3qq";
+ revision = "1";
+ editedCabalFile = "0qcxcpn8hdmkg3mqz80i0j9jrym2pk11k5hyjhqbmrqlhf3fr7qw";
libraryHaskellDepends = [
base bound deepseq hashable transformers
];
@@ -38394,6 +39436,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 +39509,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 +39621,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 +39632,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 +39708,8 @@ self: {
pname = "brick";
version = "0.37.2";
sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w";
+ revision = "1";
+ editedCabalFile = "0cj98cjlr400yf47lg50syj5zpvh6q9mm1hp4blns6ndz2xys5rz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -38666,29 +39722,50 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "brick_0_40" = callPackage
+ "brick_0_45" = callPackage
({ mkDerivation, base, config-ini, containers, contravariant
- , data-clist, deepseq, dlist, microlens, microlens-mtl
- , microlens-th, QuickCheck, stm, template-haskell, text
- , text-zipper, transformers, vector, vty, word-wrap
+ , data-clist, deepseq, directory, dlist, filepath, microlens
+ , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
+ , text, text-zipper, transformers, unix, vector, vty, word-wrap
}:
mkDerivation {
pname = "brick";
- version = "0.40";
- sha256 = "12bd0acbczcrr7mlpfrpjm9qq2ll2rbmgskpdw6lfaxz1iz75cad";
+ version = "0.45";
+ sha256 = "126h6cidq2rlh0plrgap5rlw9mxm03v3iray7pa95ydzp82imm7i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base config-ini containers contravariant data-clist deepseq dlist
- microlens microlens-mtl microlens-th stm template-haskell text
- text-zipper transformers vector vty word-wrap
+ base config-ini containers contravariant data-clist deepseq
+ directory dlist filepath microlens microlens-mtl microlens-th stm
+ template-haskell text text-zipper transformers unix vector vty
+ word-wrap
+ ];
+ testHaskellDepends = [
+ base containers microlens QuickCheck vector
];
- testHaskellDepends = [ base containers QuickCheck ];
description = "A declarative terminal user interface library";
license = stdenv.lib.licenses.bsd3;
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 +39781,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 +39966,7 @@ self: {
];
description = "Haskell source code formatter";
license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"broadcast-chan" = callPackage
@@ -38896,11 +39975,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 +40136,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;
}) {};
@@ -39009,6 +40176,8 @@ self: {
pname = "bson";
version = "0.3.2.6";
sha256 = "106fdxzwpkp5vrnfsrjjwy8dn9rgmxrp79ji7xaxv8dgb9hw73bk";
+ revision = "1";
+ editedCabalFile = "0d9s7v330fckrxzdgmbdj7bapb1pgla8yf0mq5zhw27shxy5m3dx";
libraryHaskellDepends = [
base binary bytestring cryptohash data-binary-ieee754 mtl network
text time
@@ -39068,6 +40237,7 @@ self: {
];
description = "Mapping between BSON and algebraic data types";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bspack" = callPackage
@@ -39102,14 +40272,14 @@ self: {
"btree" = callPackage
({ mkDerivation, base, clock, containers, ghc-prim, hashable
- , MonadRandom, primitive, smallcheck, tasty, tasty-hunit
- , tasty-smallcheck, transformers
+ , initialize, MonadRandom, primitive, smallcheck, tasty
+ , tasty-hunit, tasty-smallcheck, transformers
}:
mkDerivation {
pname = "btree";
- version = "0.3";
- sha256 = "058pry7g9sbmd0crd1gdpsj9ynvyfcyyvlna1wb49my9m5qmxp79";
- libraryHaskellDepends = [ base ghc-prim primitive ];
+ version = "0.4.0";
+ sha256 = "04jbvd247i8bfplyljp5937fw9x85w4v613kpzyb15z7nw2xr8l9";
+ libraryHaskellDepends = [ base ghc-prim initialize primitive ];
testHaskellDepends = [
base containers hashable MonadRandom primitive smallcheck tasty
tasty-hunit tasty-smallcheck transformers
@@ -39149,6 +40319,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 +40328,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 +40408,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 +40497,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.3.0";
+ sha256 = "1g1wqs3vlgdyk8f0xwvrzb1hc77xmjm8ygaw1skrh64darj8y9cq";
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 +40578,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
@@ -39467,24 +40655,29 @@ self: {
}) {inherit (pkgs) bullet;};
"bulletproofs" = callPackage
- ({ mkDerivation, arithmoi, base, containers, cryptonite, memory
- , protolude, QuickCheck, tasty, tasty-discover, tasty-hunit
- , tasty-quickcheck, text
+ ({ mkDerivation, arithmoi, base, containers, criterion, cryptonite
+ , memory, 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.4.0";
+ sha256 = "0aw485g11mpx74wx3pb831z64jq085pvrp150fy0fbnjyi0ahvkc";
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 ];
+ benchmarkHaskellDepends = [
+ arithmoi base containers criterion cryptonite memory MonadRandom
+ protolude QuickCheck random-shuffle tasty tasty-hunit
+ tasty-quickcheck text
+ ];
license = stdenv.lib.licenses.asl20;
}) {};
@@ -39632,8 +40825,8 @@ self: {
}:
mkDerivation {
pname = "bustle";
- version = "0.7.2";
- sha256 = "098klf1rqr39alrxw0s28p5wdfrisrkf5grdsjr78yxp2jxq3987";
+ version = "0.7.4";
+ sha256 = "1ivisgd7w7hi0yvfnm689grq0mfn03k2rmj5sn570qcpa4xfm2kw";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -39661,10 +40854,10 @@ 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
@@ -39677,6 +40870,28 @@ self: {
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
+ ];
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"butter" = callPackage
({ mkDerivation, aeson, base, bytestring, containers
, forkable-monad, free, HUnit, network-simple, stm
@@ -39700,19 +40915,18 @@ self: {
"butterflies" = callPackage
({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw
- , OpenGLRaw21, repa, repa-devil
+ , repa, repa-devil
}:
mkDerivation {
pname = "butterflies";
- version = "0.3.0.1";
- sha256 = "0dgjjfd4lna6kvqbckx378ssxc5mm9xyvdkwd3r197199rmxq733";
+ version = "0.3.0.2";
+ sha256 = "0syykvrgq6i0zxy1pn934j1r9glv4yypva1mfkn0vc0nikh9fm31";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base ];
executableHaskellDepends = [
- base bytestring gl-capture GLUT OpenGLRaw OpenGLRaw21 repa
- repa-devil
+ base bytestring gl-capture GLUT OpenGLRaw repa repa-devil
];
description = "butterfly tilings";
license = stdenv.lib.licenses.gpl3;
@@ -39739,8 +40953,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 +40994,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 +41139,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 +41225,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 ];
@@ -40042,6 +41273,7 @@ self: {
];
description = "A type-class to convert values from ByteString";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bytestring-handle" = callPackage
@@ -40052,6 +41284,8 @@ self: {
pname = "bytestring-handle";
version = "0.1.0.6";
sha256 = "18f17aja1ivhr3zyg2cccn2m03hdn5jf5410dndkhf12gvgiqs7y";
+ revision = "1";
+ editedCabalFile = "0x11aj6w1lijh84jcdq1qgyvdnc7i9ivbyq4wf9rxicg57viisz9";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base bytestring HUnit QuickCheck test-framework
@@ -40202,6 +41436,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 +41740,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 +41894,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 +41907,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 +41954,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 +42032,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 +42162,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.1.0";
+ sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39";
revision = "1";
- editedCabalFile = "0f1svlhh4cpj3p5fs9bcjpv15qp291lnvlaxxcw7aib8a1gn3wim";
- isLibrary = true;
+ editedCabalFile = "0bm11hd3s07s1vsxdbkn5bgm5fz5bh1xdg91yz1fzr9d3b3ypa8p";
+ 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 +42260,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 +42365,8 @@ self: {
pname = "cabal-plan";
version = "0.4.0.0";
sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1";
+ revision = "1";
+ editedCabalFile = "161vgfbwm8psqa6ncs12j7sn5lqjag1xi62vllvp8xbz9lcvbchb";
configureFlags = [ "-fexe" ];
isLibrary = true;
isExecutable = true;
@@ -41174,17 +42417,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 +42568,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 +42697,8 @@ self: {
}:
mkDerivation {
pname = "cabal2nix";
- version = "2.11";
- sha256 = "1wsxris61139j0bvrmzjmjqn186nmr5gvpddv098154d2w8hqn41";
+ version = "2.12";
+ sha256 = "0zm85ax4wcdkcyljm2nq40j2yi514x44wr4k75r5qjpsrpsg473v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -41474,6 +42716,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 +42745,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,51 +42961,35 @@ 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
+ , cookie, cryptonite, data-default, 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, retry, 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.3";
+ sha256 = "0vhgkdrrj8wmnzqsjwyrhflwprnizjibgjwcwn5771mjv38amyx0";
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
- ];
- 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
+ bytestring cachix-api conduit conduit-extra cookie cryptonite
+ data-default dhall directory ed25519 filepath fsnotify here
+ http-client http-client-tls http-conduit http-types lzma-conduit
+ megaparsec memory mmorph optparse-applicative process protolude
+ resourcet retry safe-exceptions servant servant-auth
+ servant-auth-client servant-client servant-client-core
servant-streaming-client streaming text unix uri-bytestring
versions
];
+ executableHaskellDepends = [ base cachix-api ];
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
- ];
+ testHaskellDepends = [ base cachix-api here hspec protolude ];
description = "Command line client for Nix binary cache hosting https://cachix.org";
license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -41767,40 +42997,32 @@ 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.3";
+ sha256 = "00j5m3pqnlwwvbj4669lpng6awsn5xzz67c6qq5dmc5q7ii2vzdf";
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
- ];
- 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
];
+ executableHaskellDepends = [ aeson base ];
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 +43037,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 +43332,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 +43494,27 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"canteven-config" = callPackage
({ mkDerivation, base, unix, yaml }:
mkDerivation {
@@ -42427,6 +43668,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 +43724,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 +43749,7 @@ self: {
];
description = "Cap'n Proto for Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"capped-list" = callPackage
@@ -42683,8 +43951,8 @@ self: {
}:
mkDerivation {
pname = "casa-abbreviations-and-acronyms";
- version = "0.0.6";
- sha256 = "0dsw097629a1jkl36s4bip7pl60i3mw7v9d70p5jmajxv9wn3zjy";
+ version = "0.0.7";
+ sha256 = "16xdkbgym1jjqnmx10h3yfq2zw3mzpf7jskssf4nzm6dsvj1msp5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -43167,6 +44435,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
@@ -43201,6 +44471,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cassava-conduit_0_5_1" = callPackage
+ ({ mkDerivation, array, base, bifunctors, bytestring, cassava
+ , conduit, containers, criterion, mtl, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "cassava-conduit";
+ version = "0.5.1";
+ sha256 = "1y3pjvc273vxb8lr3wckliw23n8vninl034wc0zlfh1asplp4nxm";
+ libraryHaskellDepends = [
+ array base bifunctors bytestring cassava conduit containers mtl
+ text
+ ];
+ testHaskellDepends = [
+ base bytestring cassava conduit QuickCheck text
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Conduit interface for cassava package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cassava-embed" = callPackage
({ mkDerivation, base, bytestring, cassava, template-haskell
, vector
@@ -43240,6 +44531,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 +44578,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 +44878,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 +44933,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 +44946,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 +44974,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 +45053,8 @@ self: {
}:
mkDerivation {
pname = "cdeps";
- version = "0.1.1.7";
- sha256 = "15acmkp512bzpq9d0yz4dclpvb71fr2wv292ygv371nhyzs8vilp";
+ version = "0.1.2.3";
+ sha256 = "16w16sysk0g9capl45v8pzyfg38mw2xnkj8dh5fghlc9vzfdgc53";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -44273,19 +45584,19 @@ self: {
}) {};
"cgi" = callPackage
- ({ mkDerivation, base, bytestring, containers, doctest, exceptions
- , mtl, multipart, network, network-uri, parsec, QuickCheck, time
- , xhtml
+ ({ mkDerivation, base, bytestring, containers, exceptions, mtl
+ , multipart, network, network-uri, parsec, time, xhtml
}:
mkDerivation {
pname = "cgi";
- version = "3001.3.0.2";
- sha256 = "1hbpplss1m4rdpm4ibip6fpimlhssqa14fl338kl2jbc463i64cj";
+ version = "3001.3.0.3";
+ sha256 = "1rml686pvjhpd51vj6g79c6132m8kx6kxikk7g246imps3bl90gb";
+ revision = "2";
+ editedCabalFile = "082i8x8j8ry2nf7m99injh18sr9llbw66ck5ylqlyvh6bhwspa6b";
libraryHaskellDepends = [
base bytestring containers exceptions mtl multipart network
network-uri parsec time xhtml
];
- testHaskellDepends = [ base doctest QuickCheck ];
description = "A library for writing CGI programs";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -44413,8 +45724,8 @@ self: {
({ mkDerivation, async, base, stm }:
mkDerivation {
pname = "chan";
- version = "0.0.3";
- sha256 = "0ci20y0wd232qnh1mql3vjqml13mkrpm9dgv005wcgym7w18isgr";
+ version = "0.0.4.1";
+ sha256 = "1ks74njh8fj9dh8qhydwjyqdx8lrdj5fif455cxfshvdbwhcnvwj";
libraryHaskellDepends = [ async base stm ];
testHaskellDepends = [ async base stm ];
description = "Some extra kit for Chans";
@@ -44507,6 +45818,8 @@ self: {
pname = "charset";
version = "0.3.7.1";
sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x";
+ revision = "1";
+ editedCabalFile = "1z6nxw2g9vgsjq0g159sk8mwj68lwzxzi5iv5ynha0h85jcqxszy";
libraryHaskellDepends = [
array base bytestring containers semigroups unordered-containers
];
@@ -44704,10 +46017,8 @@ self: {
}:
mkDerivation {
pname = "cheapskate";
- version = "0.1.1";
- sha256 = "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432";
- revision = "1";
- editedCabalFile = "1zrbp211ciia8j1br6krbxbqsj69kmx0rgkbvbpxdklmbgpfam3b";
+ version = "0.1.1.1";
+ sha256 = "0qnyd8bni2rby6b02ff4bvfdhm1hwc8vzpmnms84jgrlg1lly3fm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -44839,26 +46150,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;
@@ -44947,6 +46258,44 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "chimera" = callPackage
+ ({ mkDerivation, base, gauge, ghc-prim, QuickCheck, tasty
+ , tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector
+ }:
+ mkDerivation {
+ pname = "chimera";
+ version = "0.2.0.0";
+ sha256 = "1hrnvyp8d7qc1c3xl4mzfsycb554yn3b49yy8jjyvaqazmvrb4zi";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ghc-prim vector ];
+ testHaskellDepends = [
+ base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+ vector
+ ];
+ benchmarkHaskellDepends = [ base gauge ];
+ description = "Lazy, infinite streams with O(1) indexing";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "chiphunk" = callPackage
+ ({ mkDerivation, base, c2hs, safe-exceptions, StateVar
+ , vector-space
+ }:
+ mkDerivation {
+ pname = "chiphunk";
+ version = "0.1.0.3";
+ sha256 = "0a39x0v5pswaz4b9nbq1cmi172qglcfk54f5w7sb0ldx88qqi9d3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base safe-exceptions StateVar vector-space
+ ];
+ libraryToolDepends = [ c2hs ];
+ description = "Haskell bindings for Chipmunk2D physics engine";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"chitauri" = callPackage
({ mkDerivation, base, digits, either-unwrap, generic-trie
, haskeline, parsec
@@ -45334,6 +46683,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "church" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "church";
+ version = "0.1.0.0";
+ sha256 = "018k9a014q4zprsla5k5hrdq1zwpp7hmckc0ldaj7nf6vg1hxas2";
+ libraryHaskellDepends = [ base ];
+ description = "Automatically convert Generic instances to and from church representations";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"church-list" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -45461,10 +46822,8 @@ self: {
}:
mkDerivation {
pname = "cipher-aes128";
- version = "0.7.0.3";
- sha256 = "0fif8626z1p2q6734sjb69s1ascwmqiv9dkmzir7166ipjlbw9vg";
- revision = "1";
- editedCabalFile = "1c3lr80vcdrajlvks9ny9s8m2n2kc9jw14nh65668dfikp0pqc61";
+ version = "0.7.0.4";
+ sha256 = "1182s7984zjxz53nnjyki5afhfq8h5wjfmg6cqy9z0x1q63qk3fd";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal process ];
@@ -45620,8 +46979,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 +47169,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 +47572,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 +47668,8 @@ 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
@@ -46292,6 +47684,33 @@ self: {
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
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"classy-prelude-conduit" = callPackage
({ mkDerivation, base, bytestring, classy-prelude, conduit, hspec
, monad-control, QuickCheck, resourcet, transformers, void
@@ -46311,6 +47730,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,14 +47769,33 @@ 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
}:
mkDerivation {
pname = "classyplate";
- version = "0.3.1.0";
- sha256 = "0ayiyxslvnhzngf8afqb82jz20i83par8piqf81s0yldk4lg4j4m";
+ version = "0.3.2.0";
+ sha256 = "0yjja83y7ccnhvy0jarwm297jnz44wmdi0krbrp2vnbgdfzfybki";
libraryHaskellDepends = [ base template-haskell ];
benchmarkHaskellDepends = [ base criterion parallel uniplate ];
description = "Fuseable type-class based generics";
@@ -46371,8 +47829,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 +48001,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
@@ -46966,8 +48424,8 @@ self: {
}:
mkDerivation {
pname = "cloben";
- version = "0.1.0.3";
- sha256 = "1nzks0p5p0a76jys5dza6iqp48kd1lgxla3k3dfd8znlg9nd7dy2";
+ version = "0.1.1.0";
+ sha256 = "14vkga43sm995rg4s4npjca7xslgs33kl1ivknbflfidvgpdlxmb";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -47164,8 +48622,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 +48674,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
];
@@ -47430,6 +48888,7 @@ self: {
];
description = "CMA-ES wrapper in Haskell";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cmark" = callPackage
@@ -47455,8 +48914,8 @@ self: {
}:
mkDerivation {
pname = "cmark-gfm";
- version = "0.1.4";
- sha256 = "0jjcl7pfack8aksx34m1f80ll0y62ba1fyzdn77xbs2rvlvjzw0m";
+ version = "0.1.6";
+ sha256 = "0s39djd1j0rq63g4sy0cnras14m263anr56nvijcbcy9zg41dyf8";
libraryHaskellDepends = [ base bytestring text ];
testHaskellDepends = [ base HUnit text ];
benchmarkHaskellDepends = [
@@ -47466,24 +48925,6 @@ self: {
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";
- 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;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"cmark-highlight" = callPackage
({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text
}:
@@ -47782,6 +49223,61 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "co-log" = callPackage
+ ({ mkDerivation, ansi-terminal, base, bytestring, co-log-core
+ , containers, contravariant, directory, filepath, markdown-unlit
+ , mtl, stm, text, time, transformers, typerep-map
+ }:
+ mkDerivation {
+ pname = "co-log";
+ version = "0.2.0";
+ sha256 = "1xd83srrm659nf2s2xrm3zjg6zhrmhvj6s6mwx4axrgvnxf2lbjr";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base bytestring co-log-core containers contravariant
+ directory filepath mtl stm text time transformers typerep-map
+ ];
+ executableHaskellDepends = [ base text typerep-map ];
+ executableToolDepends = [ markdown-unlit ];
+ description = "Composable Contravariant Comonadic Logging Library";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "co-log-core" = callPackage
+ ({ mkDerivation, base, doctest }:
+ mkDerivation {
+ pname = "co-log-core";
+ version = "0.1.1";
+ sha256 = "00qkkycxm4dmqpacbhi50kk9dyhd96b0d6csxs75pm4xy337205w";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base doctest ];
+ description = "Composable Contravariant Comonadic Logging Library";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
+ "co-log-sys" = callPackage
+ ({ mkDerivation, aeson, base, co-log-core, fmt, microlens
+ , monad-control, mtl, network, universum, unix
+ }:
+ mkDerivation {
+ pname = "co-log-sys";
+ version = "0.1.1.0";
+ sha256 = "12qpbil3zzh7hy28fms4hc1pfmkf9bxqncimwz3mqys7gc3qzi3x";
+ libraryHaskellDepends = [
+ aeson base co-log-core fmt microlens monad-control mtl network
+ universum unix
+ ];
+ testHaskellDepends = [
+ aeson base co-log-core fmt microlens monad-control mtl network
+ universum unix
+ ];
+ description = "Syslog implementation on top of 'co-log-core'";
+ license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"coalpit" = callPackage
({ mkDerivation, base, generic-random, megaparsec, network-uri
, scientific, tasty, tasty-quickcheck, tasty-travis, time
@@ -47824,6 +49320,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "code-page_0_2" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "code-page";
+ version = "0.2";
+ sha256 = "0i0qbrbhvrwkbikqb7hh7yxaipaavwzvyrw211d0vkz99f62mqxz";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ description = "Windows code page library for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"codec" = callPackage
({ mkDerivation, aeson, base, binary, binary-bits, bytestring
, generic-arbitrary, mtl, profunctors, tasty, tasty-quickcheck
@@ -48271,6 +49780,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 +50064,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 +50220,23 @@ 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";
+ revision = "1";
+ editedCabalFile = "0yjvvxfmyzjhh0q050cc2wkhaahzixsw7hf27n8dky3n4cxd5bix";
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 +50307,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,14 +50363,21 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"comfort-graph" = callPackage
@@ -48844,8 +50386,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
];
@@ -48878,6 +50420,7 @@ self: {
testHaskellDepends = [ base QuickCheck text ];
description = "CSV Parser & Producer";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"command" = callPackage
@@ -48982,19 +50525,19 @@ self: {
"commutative" = callPackage
({ mkDerivation, base, QuickCheck, quickcheck-instances, random
- , semigroups, tasty, tasty-hunit, tasty-quickcheck
+ , semigroups, tasty, tasty-hunit, tasty-quickcheck, vector
}:
mkDerivation {
pname = "commutative";
- version = "0.0.1.4";
- sha256 = "1ky9axa5vs12w4m8wzlnw1cf3m9ndq239534rxfknm3k5h0ldrqd";
- libraryHaskellDepends = [ base random semigroups ];
+ version = "0.0.2";
+ sha256 = "0scrc0bwa3ggvhmhmj0pvi7q7sbm495nc8m30jjjcp5wbd26mg6c";
+ libraryHaskellDepends = [ base random semigroups vector ];
testHaskellDepends = [
base QuickCheck quickcheck-instances random semigroups tasty
- tasty-hunit tasty-quickcheck
+ tasty-hunit tasty-quickcheck vector
];
description = "Commutative binary operations";
- license = stdenv.lib.licenses.mit;
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -49025,6 +50568,8 @@ self: {
pname = "comonad-extras";
version = "4.0";
sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62";
+ revision = "1";
+ editedCabalFile = "1bmhdmncfbv80qgmykn67f4jkwbgags4ypaqibnzz849hpmibfj1";
libraryHaskellDepends = [
array base comonad containers distributive semigroupoids
transformers
@@ -49077,14 +50622,26 @@ self: {
pname = "compact";
version = "0.1.0.1";
sha256 = "0lynnbvsyr07driy7lm9llrhvmk9wprjdbfc34svzfwldghk71gf";
- revision = "1";
- editedCabalFile = "0bdp226gx3gr1hg68xydxhkfr0h469ay60h0s1ywar19y3m8dn1p";
+ revision = "2";
+ editedCabalFile = "1sy8szbmbhn13s54bq04ni234kk05najm3xm0sh6r9qnvg7pcjd7";
libraryHaskellDepends = [ base binary bytestring ghc-compact ];
testHaskellDepends = [ base directory ];
description = "Non-GC'd, contiguous storage for immutable data structures";
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 +50757,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 +50789,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 +50807,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 +50822,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.3";
+ sha256 = "1b9xmp2lps9k9fvvpqlha0vkncs4pivixyyqs71zl4dxcrsa8ryx";
+ 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 +50844,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 +50926,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;
@@ -49486,8 +51058,8 @@ self: {
}:
mkDerivation {
pname = "composite-aeson";
- version = "0.5.4.0";
- sha256 = "08rmv82v5ipkcb46pcadx1s8c1v532l8ma2qlgiflq6jnxf7y0zn";
+ version = "0.5.5.0";
+ sha256 = "1hmhnkfmdjm5q8lkvlyr7rzs1lfycnblz3q2y8aziy27j7pvnz6h";
libraryHaskellDepends = [
aeson aeson-better-errors base composite-base containers
contravariant generic-deriving hashable lens mmorph mtl profunctors
@@ -49511,8 +51083,8 @@ self: {
}:
mkDerivation {
pname = "composite-aeson-refined";
- version = "0.5.4.0";
- sha256 = "1x5vkxzj0afar4w2djx9s7h3vy9aa5my9wfks8n4ajlv92fch1zm";
+ version = "0.5.5.0";
+ sha256 = "0mm0dbsxqw5m78jgdn6vnbck2icqkzgwqyc3c3ghyz46cymd7pjz";
libraryHaskellDepends = [
aeson-better-errors base composite-aeson mtl refined
];
@@ -49524,19 +51096,20 @@ self: {
"composite-base" = callPackage
({ mkDerivation, base, exceptions, hspec, lens, monad-control, mtl
, profunctors, QuickCheck, template-haskell, text, transformers
- , transformers-base, vinyl
+ , transformers-base, unliftio-core, vinyl
}:
mkDerivation {
pname = "composite-base";
- version = "0.5.4.0";
- sha256 = "0brycxdwf4051qvad4b4ak47dl27qn3izv1bcqlpva01jvb6h21j";
+ version = "0.5.5.0";
+ sha256 = "0qlg979cwkdlfpcwh7r0qr9fjs525b3xly0invr358h2g1lgi0fm";
libraryHaskellDepends = [
base exceptions lens monad-control mtl profunctors template-haskell
- text transformers transformers-base vinyl
+ text transformers transformers-base unliftio-core vinyl
];
testHaskellDepends = [
base exceptions hspec lens monad-control mtl profunctors QuickCheck
- template-haskell text transformers transformers-base vinyl
+ template-haskell text transformers transformers-base unliftio-core
+ vinyl
];
description = "Shared utilities for composite-* packages";
license = stdenv.lib.licenses.bsd3;
@@ -49548,8 +51121,8 @@ self: {
}:
mkDerivation {
pname = "composite-ekg";
- version = "0.5.4.0";
- sha256 = "051dw8ncpsk2k05ipvlnkwv2gy6719w69v1hhwrryy3dad0f4wc3";
+ version = "0.5.5.0";
+ sha256 = "0bawdcx21dd0szxnnxs2iinzz6h4w2phk7mfs26fxiqx3f375lm4";
libraryHaskellDepends = [
base composite-base ekg-core lens text vinyl
];
@@ -49565,8 +51138,8 @@ self: {
}:
mkDerivation {
pname = "composite-opaleye";
- version = "0.5.4.0";
- sha256 = "1k71v4dz4vl70ignjp6hgw6j4c9hdgafd9x973dk7w332m2vjdpn";
+ version = "0.5.5.0";
+ sha256 = "0s54g9c1lm3jrdj44cvzxgbfaf7l2fdq2yy25vhqdmww50h8q1cx";
libraryHaskellDepends = [
base bytestring composite-base lens opaleye postgresql-simple
product-profunctors profunctors template-haskell text vinyl
@@ -49588,8 +51161,8 @@ self: {
}:
mkDerivation {
pname = "composite-swagger";
- version = "0.5.4.0";
- sha256 = "0i2jfchl88mrk9kmf8yv7cbv006ghilqsnbic7ddsbkzrjy1vdw0";
+ version = "0.5.5.0";
+ sha256 = "1qisvrs93jnrrjyhzdn0xwq54jc1mc8avpzq41a39ak5xdslzf6a";
libraryHaskellDepends = [
base composite-base insert-ordered-containers lens swagger2
template-haskell text vinyl
@@ -49628,19 +51201,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_2_1" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "composition-prelude";
- version = "1.5.3.1";
- sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d";
+ version = "2.0.2.1";
+ sha256 = "0vxgy13k0ca3bi7rh9wc1pdrlpdjbm6va95djmmysdw8a9yyp9wi";
libraryHaskellDepends = [ base ];
description = "Higher-order function combinators";
license = stdenv.lib.licenses.bsd3;
@@ -49871,21 +51444,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 +51490,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 +51638,8 @@ self: {
}:
mkDerivation {
pname = "concurrency";
- version = "1.6.0.0";
- sha256 = "14zbwbp5mgnp3nv40qirnw1b8pv2kp1nqlhg36dnhw7l0mq5dwlk";
+ version = "1.6.2.0";
+ sha256 = "004h1wxdgqpxpk9vcvds759pn5qdp873b4bidakffxgh35nkxr68";
libraryHaskellDepends = [
array atomic-primops base exceptions monad-control mtl stm
transformers
@@ -50067,6 +51648,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 +51720,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 +51782,8 @@ self: {
}:
mkDerivation {
pname = "concurrent-output";
- version = "1.10.6";
- sha256 = "1qlp1vij4qgcrkw8ym5xdc0pgfwklbhsfh56sgayy3cvpvcac093";
+ version = "1.10.9";
+ sha256 = "0mwf155w89nbbkjln7hhbn8k3f8p0ylcvgrg31cm7ijpx4499i4c";
libraryHaskellDepends = [
ansi-terminal async base directory exceptions process stm
terminal-size text transformers unix
@@ -50214,8 +51818,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 +52017,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 +52046,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
@@ -50473,8 +52077,8 @@ self: {
pname = "conduit-audio";
version = "0.2.0.3";
sha256 = "089k7l197xbxva0h281hr3p4v8pww1im7r111q7jrq7aqfgifrb1";
- revision = "1";
- editedCabalFile = "0ab8qxh5b60m4dyrdbaak8xj7kxlp3kzbs5fpg3fjxkpcqhnm1mx";
+ revision = "2";
+ editedCabalFile = "0zldqx1r2wmvqwg8r6x7v65h2nqr7fjcxab74f0f5i1nqsd5b51a";
libraryHaskellDepends = [ base conduit vector ];
description = "Combinators to efficiently slice and dice audio streams";
license = stdenv.lib.licenses.bsd3;
@@ -50488,8 +52092,8 @@ self: {
pname = "conduit-audio-lame";
version = "0.1.2.1";
sha256 = "1zyq0m5lblphp892ljvg6ix75rxa1ds5ksfk3cvj7kf074jw66za";
- revision = "1";
- editedCabalFile = "0b4d8n0lbsivpc0j17xl0vm6gp0sm7jjiysyxwh0m2xncx9l57nr";
+ revision = "2";
+ editedCabalFile = "09cly6yly3vdlp8qbv6iyrk84aca7v6d160hwg9ai0dmjxk0jkl4";
libraryHaskellDepends = [
base bytestring conduit conduit-audio resourcet transformers vector
];
@@ -50508,8 +52112,8 @@ self: {
pname = "conduit-audio-samplerate";
version = "0.1.0.3";
sha256 = "07hbqf7is7010ibp2k5fh4lx3s22vp6c4ihsid05ismk0sdpdypi";
- revision = "1";
- editedCabalFile = "03546czh1jn04kc7df3lrbpjf5pnssh555chjij8b6h25qrx8jrw";
+ revision = "2";
+ editedCabalFile = "1xp5mqd8svgdz9lwz2vw5mwkm98n834i2k83axwfwvpqr2jlkqa9";
libraryHaskellDepends = [
base conduit conduit-audio resourcet transformers vector
];
@@ -50528,8 +52132,8 @@ self: {
pname = "conduit-audio-sndfile";
version = "0.1.2.1";
sha256 = "0b326pdvqpiawqnjkmwfgf5ghvg9jn1afini0ihw8cpc7znx846z";
- revision = "1";
- editedCabalFile = "1v0zcagmgr80wfqs328pd7m7z54q834yw0vn218jl6ld5fv581mg";
+ revision = "2";
+ editedCabalFile = "00c628bx1j8p342pc03p884illajqsgi47yplfxvdywxcijnwbn3";
libraryHaskellDepends = [
base conduit conduit-audio hsndfile hsndfile-vector resourcet
transformers
@@ -50550,6 +52154,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 +52424,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 +52469,63 @@ 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.4";
+ sha256 = "1c25xjpnw802pqfjksx5fxjq9ynwfjkkmyad169bvfasry98cdbb";
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "confetti" = callPackage
+ ({ mkDerivation, base, cmdargs, directory, filepath, MissingH
+ , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml
+ }:
+ mkDerivation {
+ pname = "confetti";
+ version = "1.0.0";
+ sha256 = "1ryvfaizai0m98lb687laqmix17k0f4a8cpbvpn15scng604gf0k";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base directory filepath MissingH text time unix yaml
+ ];
+ executableHaskellDepends = [ base cmdargs 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 +52577,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "config-ini_0_2_4_0" = callPackage
+ ({ mkDerivation, base, containers, directory, hedgehog, ini
+ , megaparsec, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "config-ini";
+ version = "0.2.4.0";
+ sha256 = "0dfm4xb1sd713rcqzplzdgw68fyhj24i6lj8j3q8kldpmkl98lbf";
+ 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 +52638,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 +52671,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 +52685,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 +53093,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 +53241,8 @@ self: {
({ mkDerivation, base, constraints, template-haskell }:
mkDerivation {
pname = "constraints-extras";
- version = "0.1.0.1";
- sha256 = "12m6z1va1idbqnl7syljgk8hy82vm0lymf262331jmhjb744awpz";
+ version = "0.2.1.0";
+ sha256 = "17rz4j5xgh4qn8ngd4b2814zdp1c59mcksg9jxbln6nvzvw7q0ng";
libraryHaskellDepends = [ base constraints template-haskell ];
description = "Utility package for constraints";
license = stdenv.lib.licenses.bsd3;
@@ -51639,8 +53339,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 +53523,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 +53538,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 +53668,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 +53714,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 +53868,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 +54415,8 @@ self: {
pname = "corecursive-main";
version = "0.1.0.0";
sha256 = "14ckdqmy3r06kqhlp7mpapmx01369vcfmaj78gjywlqznchpw6dk";
+ revision = "1";
+ editedCabalFile = "0ffdav9hqn3vn3a2fpxcjlflir0f2lay800rsdi1qg67jycdfk73";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base process ];
@@ -52918,6 +54650,8 @@ self: {
pname = "country";
version = "0.1.6";
sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9";
+ revision = "1";
+ editedCabalFile = "04a2s0zlm4garihnm3xl9avf88vjnbvpsyb2ckk3z7ydjq0y3938";
libraryHaskellDepends = [
aeson attoparsec base bytestring deepseq ghc-prim hashable
primitive scientific text unordered-containers
@@ -53145,8 +54879,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;
@@ -53218,7 +54952,8 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Bindings for libpython";
license = stdenv.lib.licenses.gpl3;
- }) {inherit (pkgs) python34;};
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {python34 = null;};
"cql" = callPackage
({ mkDerivation, base, bytestring, cereal, containers, Decimal
@@ -53239,37 +54974,10 @@ self: {
];
description = "Cassandra CQL binary protocol";
license = "unknown";
- }) {};
-
- "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
+ "cql-io" = callPackage
({ mkDerivation, async, auto-update, base, bytestring, containers
, cql, cryptohash, data-default-class, Decimal, exceptions
, hashable, HsOpenSSL, iproute, lens, monad-control, mtl
@@ -53490,19 +55198,15 @@ self: {
}) {crack = null;};
"crackNum" = callPackage
- ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
+ ({ mkDerivation, array, base, FloatingHex }:
mkDerivation {
pname = "crackNum";
- version = "2.1";
- sha256 = "10z192nd9ik4ry0bjmkdpyvys75h3xz106588z8m1ix7caf1208a";
+ version = "2.3";
+ sha256 = "1wrqq2g6hvqa8w0c4nad35d1favcjqi93ywnxqkc3i7pl37jb3s2";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [
- base data-binary-ieee754 FloatingHex ieee754
- ];
- executableHaskellDepends = [
- base data-binary-ieee754 FloatingHex ieee754
- ];
+ libraryHaskellDepends = [ array base FloatingHex ];
+ executableHaskellDepends = [ array base FloatingHex ];
description = "Crack various integer, floating-point data formats";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -53703,8 +55407,8 @@ self: {
}:
mkDerivation {
pname = "creatur";
- version = "5.9.25";
- sha256 = "00bhszbjz7in5z1bilb1m3ld5sdd6xk5s95h6cw882qz0i1dmlp5";
+ version = "5.9.27";
+ sha256 = "016f5rzn2dvd85mdjcdrc7jmy4v75sa4qf98rqyp8qc8cpcqcx4c";
libraryHaskellDepends = [
array base binary bytestring cereal cond directory exceptions
filepath gray-extended hdaemonize hsyslog MonadRandom mtl random
@@ -53808,16 +55512,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 +55550,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 +55609,8 @@ self: {
pname = "criterion";
version = "1.4.1.0";
sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4";
+ revision = "1";
+ editedCabalFile = "0jg7mk9y9br5aqi29vrrrq28mnyknyg96zmr8rrlxw0rf68l892a";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -53924,32 +55633,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "criterion_1_5_1_0" = callPackage
+ "criterion_1_5_3_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.3.0";
+ sha256 = "17q4dj9sl9dp2gyknycc9kdp5y6ak4vlmbfqp1w0fwfy76aaj0mn";
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 +55893,8 @@ self: {
pname = "crypt-sha512";
version = "0";
sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2";
- revision = "1";
- editedCabalFile = "0wi8d12i2v76irrv0f16y4sfcn2a9sg92l11499djidmdq50vji9";
+ revision = "2";
+ editedCabalFile = "071lxiwsf23ga1fkbjd47ykz7f5irhsh7q7zz2qczzjgnvzadadh";
libraryHaskellDepends = [
attoparsec base bytestring cryptohash-sha512
];
@@ -54327,19 +56035,44 @@ self: {
}) {};
"crypto-enigma" = callPackage
- ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
- , split
+ ({ mkDerivation, ansi-terminal, base, containers, HUnit, mtl
+ , optparse-applicative, QuickCheck, split, text
}:
mkDerivation {
pname = "crypto-enigma";
- version = "0.0.2.12";
- sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b";
- libraryHaskellDepends = [ base containers MissingH mtl split ];
+ version = "0.0.3.1";
+ sha256 = "0iadzyp44ylzwq65jqvln1cmlnsvpwvy0cvpn8xfdqd1x0qil8i2";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers mtl split text ];
+ executableHaskellDepends = [
+ ansi-terminal base containers mtl optparse-applicative split text
+ ];
testHaskellDepends = [ base HUnit QuickCheck ];
description = "An Enigma machine simulator with display";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "crypto-enigma_0_1_1_4" = callPackage
+ ({ mkDerivation, ansi-terminal, base, containers, HUnit
+ , optparse-applicative, QuickCheck, split, text
+ }:
+ mkDerivation {
+ pname = "crypto-enigma";
+ version = "0.1.1.4";
+ sha256 = "17bggc1wz1qp0midriwwackm86w148r6y8ph3x0nsxblqzw8021z";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers split text ];
+ executableHaskellDepends = [
+ ansi-terminal base containers optparse-applicative split text
+ ];
+ testHaskellDepends = [ base HUnit QuickCheck ];
+ description = "An Enigma machine simulator with display";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"crypto-multihash" = callPackage
({ mkDerivation, base, base58-bytestring, bytestring, containers
, cryptonite, hspec, memory, QuickCheck, string-conversions
@@ -54650,8 +56383,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 +56403,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 +56423,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 +56445,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
@@ -54762,8 +56495,8 @@ self: {
pname = "cryptoids-types";
version = "0.0.0";
sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b";
- revision = "2";
- editedCabalFile = "0dzfdjqbw197jrd7iygw8a74b9ryvym5xh8k9zy29y40ln20i2hg";
+ revision = "3";
+ editedCabalFile = "1v8fgyh03qggn0fr2kg79m3r1v9i85q0dihgmbq5z4s1y700c8vq";
libraryHaskellDepends = [ base binary http-api-data path-pieces ];
description = "Shared types for encrypting internal object identifiers before exposure";
license = stdenv.lib.licenses.bsd3;
@@ -54868,6 +56601,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 +56683,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 +56871,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 +56883,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 +57156,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
@@ -55454,21 +57179,48 @@ self: {
executableHaskellDepends = [ base GLUT Yampa ];
description = "3D Yampa/GLUT Puzzle Game";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "cuckoo-filter" = callPackage
+ ({ mkDerivation, aeson, array, base, bytestring, cereal, containers
+ , criterion, hashable, QuickCheck, random, tasty, tasty-hunit
+ , tasty-quickcheck, time
+ }:
+ mkDerivation {
+ pname = "cuckoo-filter";
+ version = "0.2.0.2";
+ sha256 = "1yya8r3igwms910xp3cc4y1y34f5yw3yqqy1wy49d4xsi6smyjdc";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson array base bytestring cereal containers hashable time
+ ];
+ executableHaskellDepends = [
+ aeson array base bytestring cereal containers criterion hashable
+ random time
+ ];
+ testHaskellDepends = [
+ aeson array base bytestring cereal containers hashable QuickCheck
+ tasty tasty-hunit tasty-quickcheck time
+ ];
+ 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 +57251,8 @@ 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
@@ -55514,14 +57266,40 @@ self: {
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
+ mtl QuickCheck text
+ ];
+ testHaskellDepends = [
+ 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
({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath
, template-haskell
}:
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 +57358,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 {
@@ -55592,6 +57396,7 @@ self: {
testHaskellDepends = [ base hspec ];
description = "bindings to libcurl, the multiprotocol file transfer library";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"currencies" = callPackage
@@ -55618,6 +57423,7 @@ self: {
];
description = "Types representing standard and non-standard currencies";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"currency-codes" = callPackage
@@ -55768,6 +57574,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 +57652,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 +57674,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 +57785,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 +57824,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 +58414,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 +58477,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 +59196,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 +59684,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 +59973,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 +60002,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;
@@ -58228,25 +60086,26 @@ self: {
"datadog" = callPackage
({ mkDerivation, aeson, auto-update, base, buffer-builder
- , bytestring, Cabal, dlist, exceptions, hspec, http-client
- , http-client-tls, http-types, lens, lifted-base, monad-control
- , network, old-locale, random, text, time, transformers-base
- , unordered-containers, vector
+ , bytestring, Cabal, containers, dlist, exceptions, hspec
+ , http-client, http-client-tls, http-types, lens, lifted-base
+ , monad-control, network, old-locale, random, text, time
+ , transformers-base, unliftio, unordered-containers, vector
}:
mkDerivation {
pname = "datadog";
- version = "0.2.2.0";
- sha256 = "0i399f5p9ch4bjmqchq890i6x5jd137pw5lz4v43k5qxlbxvc3s5";
+ version = "0.2.3.0";
+ sha256 = "0d0rbi269hc0bq4asww69pfw4gf0z3p9ji3iw1h129h4qyhyvdcv";
libraryHaskellDepends = [
- aeson auto-update base buffer-builder bytestring dlist http-client
- http-client-tls http-types lens lifted-base monad-control network
- old-locale text time transformers-base unordered-containers vector
+ aeson auto-update base buffer-builder bytestring containers dlist
+ http-client http-client-tls http-types lens lifted-base
+ monad-control network old-locale text time transformers-base
+ unliftio unordered-containers vector
];
testHaskellDepends = [
- aeson auto-update base buffer-builder bytestring Cabal dlist
- exceptions hspec http-client http-client-tls http-types lens
+ aeson auto-update base buffer-builder bytestring Cabal containers
+ dlist exceptions hspec http-client http-client-tls http-types lens
lifted-base monad-control network old-locale random text time
- transformers-base unordered-containers vector
+ transformers-base unliftio unordered-containers vector
];
description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
license = stdenv.lib.licenses.mit;
@@ -58750,6 +60609,34 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "dbus_1_2_1" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, conduit, containers
+ , criterion, deepseq, directory, exceptions, extra, filepath, lens
+ , network, parsec, process, QuickCheck, random, resourcet, split
+ , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+ , th-lift, transformers, unix, vector, xml-conduit, xml-types
+ }:
+ mkDerivation {
+ pname = "dbus";
+ version = "1.2.1";
+ sha256 = "1mxijj32lvl6dxkpz95mxywq2hrj7krc9r8q41zbyqqx0hvc3n4r";
+ libraryHaskellDepends = [
+ base bytestring cereal conduit containers deepseq exceptions
+ filepath lens network parsec random split template-haskell text
+ th-lift transformers unix vector xml-conduit xml-types
+ ];
+ testHaskellDepends = [
+ base bytestring cereal containers directory extra filepath network
+ parsec process QuickCheck random resourcet tasty tasty-hunit
+ tasty-quickcheck text transformers unix vector
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ doCheck = false;
+ description = "A client library for the D-Bus IPC system";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dbus-client" = callPackage
({ mkDerivation, base, containers, dbus-core, monads-tf, text
, transformers
@@ -59317,27 +61204,10 @@ self: {
libraryHaskellDepends = [ base directory filepath HSH ];
description = "Utilities to work with debian binary packages";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"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 +61223,6 @@ self: {
executableHaskellDepends = [ base filepath transformers ];
description = "Debian package build sequence tools";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"debug" = callPackage
@@ -59397,20 +61266,21 @@ self: {
}) {};
"debug-me" = callPackage
- ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
- , cryptonite, directory, filepath, graphviz, http-client
- , http-client-tls, http-types, memory, mime-mail, network
- , network-uri, optparse-applicative, posix-pty, process, protobuf
- , sandi, stm, stm-chans, terminal-size, text, time
+ ({ mkDerivation, aeson, async, base, bytestring, Cabal, cereal
+ , containers, cryptonite, directory, filepath, graphviz
+ , http-client, http-client-tls, http-types, memory, mime-mail
+ , network, network-uri, optparse-applicative, posix-pty, process
+ , protobuf, sandi, stm, stm-chans, terminal-size, text, time
, unbounded-delays, unix, unordered-containers, utf8-string, uuid
, wai, wai-websockets, warp, websockets
}:
mkDerivation {
pname = "debug-me";
- version = "1.20170810";
- sha256 = "11lbqp7j8wi1r7wkh2fg0rvgkf9icwq306g8h1fz0mkqwcsxmiyq";
+ version = "1.20181208";
+ sha256 = "0gnnhgqzhbhgc49y3md7440plgfv1wry8fk73f81s2f1c1agqh1i";
isLibrary = false;
isExecutable = true;
+ setupHaskellDepends = [ base Cabal filepath ];
executableHaskellDepends = [
aeson async base bytestring cereal containers cryptonite directory
filepath graphviz http-client http-client-tls http-types memory
@@ -59504,6 +61374,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 +61542,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 +61591,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 +61650,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.10";
+ sha256 = "0rvb7cv45xs087jrm4dmv9ajyx5kfs8n01cclc7msfg90fcs60fx";
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;
@@ -59925,8 +61811,8 @@ self: {
}:
mkDerivation {
pname = "dejafu";
- version = "1.11.0.3";
- sha256 = "192a0wv2kdk1js56lm6ikp9mx08fkb0wkxl1yba03p7dfnlj6bnx";
+ version = "1.11.0.4";
+ sha256 = "0zks4mqdndlyg8mqa1gshwahcqn45zawksgp738crls3yafgh9dg";
libraryHaskellDepends = [
base concurrency containers contravariant deepseq exceptions
leancheck profunctors random transformers
@@ -60155,6 +62041,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
@@ -60181,6 +62107,7 @@ self: {
libraryHaskellDepends = [ base containers dependent-sum ];
description = "Dependent finite maps (partial dependent products)";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dependent-monoidal-map" = callPackage
@@ -60295,6 +62222,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 +62274,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "deque_0_2_7" = callPackage
+ ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase
+ , tasty, tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "deque";
+ version = "0.2.7";
+ sha256 = "1wshylwnajw3hhqnnb72rlb05m91br57gf32770xi2h4r0h30lcr";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ 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 +62433,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 +62504,10 @@ self: {
}:
mkDerivation {
pname = "deriving-compat";
- version = "0.5.1";
- sha256 = "18mkmwm147h601zbdn2lna357z2picpnsxrmkw2jc863chban5vy";
+ version = "0.5.2";
+ sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9";
+ revision = "1";
+ editedCabalFile = "1s672vc7w96fmvr1p3fkqi9q80sn860j14545sskpxb8iz9f7sxg";
libraryHaskellDepends = [
base containers ghc-boot-th ghc-prim template-haskell
th-abstraction transformers transformers-compat
@@ -60560,8 +62548,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 ];
@@ -60575,8 +62563,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "descrilo";
- version = "0.1.0.6";
- sha256 = "166x7j8q5wg8iq1bf2qz01ps0b1pbfgizsy1zfhjd98a3zl9fid2";
+ version = "0.1.0.7";
+ sha256 = "00rk7m54igmrsi8j2fmql7c5wgyg7x5ws8397753470x5k2qv2ap";
libraryHaskellDepends = [ base ];
description = "Loads a list of items with fields";
license = stdenv.lib.licenses.gpl3;
@@ -60623,8 +62611,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 +62796,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 +62817,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 +62945,42 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall_1_16_1" = callPackage
+ "dhall_1_19_1" = 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
+ , cborg, containers, contravariant, criterion, cryptonite, deepseq
+ , Diff, directory, doctest, dotgen, exceptions, filepath, haskeline
+ , http-client, http-client-tls, http-types, 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
+ , prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+ , quickcheck-instances, repline, scientific, serialise, tasty
+ , tasty-hunit, tasty-quickcheck, template-haskell, text
+ , transformers, unordered-containers, uri-encode, vector
}:
mkDerivation {
pname = "dhall";
- version = "1.16.1";
- sha256 = "1mf0x42f1gq8y6518hm1p8j8ca9dgh3nwbw2lfilddk1difrm9h2";
+ version = "1.19.1";
+ sha256 = "14fjfwsirf8l7wirv590ix01liyd0xbhqy4h7pjblyy62m22mlzq";
+ revision = "1";
+ editedCabalFile = "193h4dmlz1asfr1ldy0saa9spgp64xh60xh3yywzn9lz0hxzbfpg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- ansi-terminal base bytestring case-insensitive 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
- template-haskell text transformers unordered-containers vector
+ ansi-terminal base bytestring case-insensitive cborg containers
+ contravariant cryptonite Diff directory dotgen exceptions filepath
+ haskeline http-client http-client-tls http-types lens-family-core
+ megaparsec memory mtl optparse-applicative parsers prettyprinter
+ prettyprinter-ansi-terminal repline scientific serialise
+ template-haskell text transformers unordered-containers uri-encode
+ 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 +62994,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 +63009,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dhall-bash_1_0_17" = callPackage
+ ({ mkDerivation, base, bytestring, containers, dhall
+ , neat-interpolation, optparse-generic, shell-escape, text
+ }:
+ mkDerivation {
+ pname = "dhall-bash";
+ version = "1.0.17";
+ sha256 = "0z3wp25rj9czsmycs5h2sy76mnh9d8lxabngn2wbf1r6wbp6bpfv";
+ 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 +63051,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 +63068,39 @@ 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_5" = 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.5";
+ sha256 = "0zdxv43kj8dp2w9hy4px9xf785ybs9jy5pzhzybiagq428k4kcbf";
+ revision = "1";
+ editedCabalFile = "0zgg3wlsvsshgcibn7xchqfw5z2qh3yxkf2lb4bkx220f4m0dvfg";
+ 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 +63118,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 +63128,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 +63147,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.14";
+ sha256 = "1485p4fazh3qcbb9khj1pk4f2gh6p6927sabh6miswczdn78z6sy";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -61177,14 +63223,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 +63307,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 +63491,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 +63516,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 +63635,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
@@ -61652,10 +63704,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-pgf";
- version = "1.4";
- sha256 = "11v63sjpf9029y7cvbhlq0jp8304p1hf15kyshvzmg9yijy1z3q6";
- revision = "1";
- editedCabalFile = "1f3mphrpzlribv2zhy6i8slcbph5ncvqaa3s58ghjn7pq2fa46l3";
+ version = "1.4.1";
+ sha256 = "00nw2zraanwb20wl9iaynw0kffwshgmy94yn50pgj3vlykj399lr";
libraryHaskellDepends = [
base bytestring bytestring-builder colour containers diagrams-core
diagrams-lib directory filepath hashable JuicyPixels mtl
@@ -61708,8 +63758,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 +63812,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 +63832,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
@@ -61960,8 +64010,8 @@ self: {
pname = "dictionary-sharing";
version = "0.1.0.0";
sha256 = "00aspv943qdqhlk39mbk00kb1dsa5r0caj8sslrn81fnsn252fwc";
- revision = "2";
- editedCabalFile = "0pxbqck3fkfqrg51fkkplcmqxn9vllkc5ff83l282gandqv4glvi";
+ revision = "3";
+ editedCabalFile = "1mn7jcc7h3b8f1pn9zigqp6mc2n0qb66lms5qnrx4zswdv5w9439";
libraryHaskellDepends = [ base containers ];
description = "Sharing/memoization of class members";
license = stdenv.lib.licenses.bsd3;
@@ -62024,6 +64074,7 @@ self: {
testHaskellDepends = [ base Diff ];
description = "A diff algorithm based on recursive longest common substrings";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"diff-parse" = callPackage
@@ -62129,6 +64180,8 @@ self: {
pname = "diffmap";
version = "0.1.0.0";
sha256 = "0i6dyvp8ds1wz9jm7nva076pc18mz24fiz50gqgq3xv76aghl0i0";
+ revision = "1";
+ editedCabalFile = "0gkcsdf9jrfs5lwhayl808flwlv446mixdn3n91v5gsxbcqqrsi7";
libraryHaskellDepends = [ base containers ];
description = "diff on maps";
license = stdenv.lib.licenses.bsd3;
@@ -62193,6 +64246,7 @@ self: {
testHaskellDepends = [ array base bytestring digest QuickCheck ];
description = "Pure hash functions for bytestrings";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"digestive-bootstrap" = callPackage
@@ -62377,21 +64431,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 +64891,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 +64945,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 +64956,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.7.0";
+ sha256 = "0zq9aaarh34c24ih49ap5bblswpzc1nwcp8rw8bw1j4agp2ndpy0";
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 +65002,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 +65021,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 +65056,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 {
@@ -63026,6 +65105,8 @@ self: {
pname = "discrimination";
version = "0.3";
sha256 = "18scvjb4vj1y9mwhanr8h73bs80h1d23m2vrixm48riyg22v5m6n";
+ revision = "1";
+ editedCabalFile = "1p39vcdmv9k9wxlkh49w1dr1isvn2hvhjjbs95qwljpxca74i23g";
libraryHaskellDepends = [
array base containers contravariant deepseq ghc-prim hashable
primitive profunctors promises semigroups transformers
@@ -63205,16 +65286,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;
@@ -63533,8 +65617,8 @@ self: {
}:
mkDerivation {
pname = "distributed-process-p2p";
- version = "0.1.4.0";
- sha256 = "0wl5cnh2swymj3h4hrvkkfl7d5hrmxl1ayiyv9yjbr6gm72i11vj";
+ version = "0.1.5.0";
+ sha256 = "0izlk0m0n0s8rdr31lfc05nbsqdwr2zfl2ai3j60r7hzq62i7rby";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -64034,8 +66118,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 +66146,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
];
@@ -64101,8 +66185,8 @@ self: {
}:
mkDerivation {
pname = "dmcc";
- version = "1.0.0.1";
- sha256 = "1qlw3jx9nn2by757kqask1ib2wi32zgdj53kinj2lnjn5f9qs466";
+ version = "1.1.0.0";
+ sha256 = "1lrscg4b13wd4gnkg3nsl2ala851lk03p9jxmlxmf2hbf4cl6cnc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -64271,6 +66355,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 +66481,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;
- executableHaskellDepends = [
- base containers foldl language-docker system-filepath text turtle
+ libraryHaskellDepends = [
+ aeson base containers foldl language-docker system-filepath text
+ turtle
];
- description = "Builds a services with docker and caches all of its intermediate stages";
+ executableHaskellDepends = [
+ aeson base containers foldl language-docker system-filepath text
+ turtle
+ ];
+ 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 +66548,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 +66621,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 +66716,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 +66740,77 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "docusign-base-minimal" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-default, http-media
+ , lens, servant, servant-client, text
+ }:
+ mkDerivation {
+ pname = "docusign-base-minimal";
+ version = "0.0.1";
+ sha256 = "0ifzfjganr9yznm4gxkk204g3ld1mrz4v9yp47w9wh5gmzzarxv5";
+ libraryHaskellDepends = [
+ aeson base bytestring data-default http-media lens servant
+ servant-client text
+ ];
+ description = "Low-level bindings to the DocuSign API (only what is necessary for docusign-client)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "docusign-client" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , data-default, docusign-base-minimal, exceptions, http-client
+ , http-client-tls, http-types, servant-client, text, uuid
+ }:
+ mkDerivation {
+ pname = "docusign-client";
+ version = "0.0.2";
+ sha256 = "14dpb1wdi6372b129hi85ksj2klxdvwnq758742akrrhaaz3lisx";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring data-default
+ docusign-base-minimal exceptions http-client http-client-tls
+ http-types servant-client text uuid
+ ];
+ description = "Client bindings for the DocuSign API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"docvim" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, dlist, filepath, hlint, lens, mtl, optparse-applicative, parsec
@@ -64862,6 +67064,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "dotenv_0_8_0_0" = callPackage
+ ({ mkDerivation, base, base-compat, containers, directory
+ , exceptions, hspec, hspec-megaparsec, megaparsec
+ , optparse-applicative, process, text, transformers, yaml
+ }:
+ mkDerivation {
+ pname = "dotenv";
+ version = "0.8.0.0";
+ sha256 = "0b1pz7wh5kf0sjkig0y4ks6i2z5yzpvlnd6hgzl0sj4j6w2j35ly";
+ 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 +67505,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 +67616,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 {
@@ -65377,14 +67647,15 @@ self: {
}) {};
"drmaa" = callPackage
- ({ mkDerivation, base, directory, drmaa, inline-c }:
+ ({ mkDerivation, base, c2hs, directory, drmaa, exceptions }:
mkDerivation {
pname = "drmaa";
- version = "0.2.0";
- sha256 = "0hmyzlwqdj3cjnhjc4bk35wzxzzknl0fapqz119yahc03jrpcpg6";
- libraryHaskellDepends = [ base directory inline-c ];
+ version = "0.3.0";
+ sha256 = "1x1r3m1gqikm6n5m006zy3c9z106qa4ykl7qa90pa29wg03475z5";
+ libraryHaskellDepends = [ base directory exceptions ];
librarySystemDepends = [ drmaa ];
- description = "A minimal Haskell bindings to DRMAA C library";
+ libraryToolDepends = [ c2hs ];
+ description = "A Haskell bindings to the DRMAA C library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {drmaa = null;};
@@ -65558,8 +67829,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 ];
@@ -65640,8 +67911,8 @@ self: {
({ mkDerivation, base, text, xml-types }:
mkDerivation {
pname = "dtd-types";
- version = "0.3.0.1";
- sha256 = "1w2ni9b8kn242grdqb4wxvgxqpkpp9qy66d57n33l5jghlg8b0s7";
+ version = "0.4.0.0";
+ sha256 = "1h5ypjnpjim2lwlc6jfp8ixqg7zbkj7fg2kpnlwnyj29n9g58rka";
libraryHaskellDepends = [ base text xml-types ];
description = "Basic types for representing XML DTDs";
license = stdenv.lib.licenses.bsd3;
@@ -65718,8 +67989,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 +68128,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dunai_0_5_1" = callPackage
+ ({ mkDerivation, base, MonadRandom, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "dunai";
+ version = "0.5.1";
+ sha256 = "07bkjp7z5lbm6466nc99p4ngiqkh5mgbczwl7rflxzis4w1vm997";
+ libraryHaskellDepends = [
+ base MonadRandom transformers transformers-base
+ ];
+ description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "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
@@ -66044,8 +68344,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "dwergaz";
- version = "0.2.0.2";
- sha256 = "1ja2pxkd5mwp404lcyk3p81y41vbwds31446gkscr2qgzrc1sb7s";
+ version = "0.2.0.3";
+ sha256 = "080wwa3ffd8lb5ri324ijkpj8pd6nw7zscz23gc01m1hyavwpqip";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "A minimal testing library";
@@ -66295,6 +68595,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "dynloader" = callPackage
+ ({ mkDerivation, base, ghc, ghc-paths, hspec }:
+ mkDerivation {
+ pname = "dynloader";
+ version = "0.1.0";
+ sha256 = "1xmys4018zfaahhi9il2fygpw9mjfs7r3fcpkd0k5y77r0g1i88h";
+ libraryHaskellDepends = [ base ghc ghc-paths ];
+ testHaskellDepends = [ base ghc ghc-paths hspec ];
+ description = "Dynamically runtime loading packages";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"dynobud" = callPackage
({ mkDerivation, aeson, base, binary, casadi-bindings
, casadi-bindings-core, cereal, containers, data-default-class
@@ -66372,8 +68684,8 @@ self: {
}:
mkDerivation {
pname = "each";
- version = "1.1.0.0";
- sha256 = "0yh7q86kmz7ryl95hzm3qvi1l1qhsqf34b35mpkph41snda5g4xl";
+ version = "1.1.1.0";
+ sha256 = "078qlgdk256rcjh8k9lv7i14rqky952b2zzbnymswciqiiha5bvb";
libraryHaskellDepends = [ base dlist template-haskell ];
testHaskellDepends = [ base hspec QuickCheck ];
description = "Template Haskell library for writing monadic expressions more easily";
@@ -66509,14 +68821,11 @@ self: {
}) {};
"easyrender" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers, mtl, superdoc
- , zlib
- }:
+ ({ mkDerivation, base, bytestring, containers, mtl, zlib }:
mkDerivation {
pname = "easyrender";
- version = "0.1.1.3";
- sha256 = "105s3d5yz7qz9cv5jq005kzd7jfdn2fccnc4s1xgkszk46y83qbx";
- setupHaskellDepends = [ base Cabal superdoc ];
+ version = "0.1.1.4";
+ sha256 = "0vj9j41706lalxc2sankpnxrn3mg650wfd4rl6yw32pns6bdq86f";
libraryHaskellDepends = [ base bytestring containers mtl zlib ];
description = "User-friendly creation of EPS, PostScript, and PDF files";
license = stdenv.lib.licenses.gpl3;
@@ -66553,8 +68862,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 +68929,8 @@ self: {
}:
mkDerivation {
pname = "ec2-unikernel";
- version = "0.9.2";
- sha256 = "02nydjp2l686wx42a5dndhj3dxi5q73lx9628lhdan1alhim4j31";
+ version = "0.9.8";
+ sha256 = "137rq45d0d7ap77wlgiqp5sd2r0jwxkaw4mvxmj1lyi8yc52mxbg";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -66804,6 +69113,7 @@ self: {
];
description = "Templating language with similar syntax and features to Liquid or Jinja2";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"edenmodules" = callPackage
@@ -66880,8 +69190,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 +69225,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
];
@@ -67170,20 +69480,20 @@ self: {
"egison" = callPackage
({ mkDerivation, array, base, containers, criterion, deepseq
, directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline
- , HUnit, mtl, parallel, parsec, process, random, regex-tdfa, split
- , test-framework, test-framework-hunit, text, transformers
+ , HUnit, lens, mtl, parallel, parsec, process, random, regex-tdfa
+ , split, test-framework, test-framework-hunit, text, transformers
, unordered-containers, vector
}:
mkDerivation {
pname = "egison";
- version = "3.7.12";
- sha256 = "0dmy9hxamjpp553ipkfjwh8j3bxqql99idxcxkdsj1x4ixgm2m2g";
+ version = "3.7.14";
+ sha256 = "0iilizs6nj901fmzfam9s0s2phz91m2292wggqvzj8p6260589iq";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base containers directory ghc ghc-paths hashable haskeline
- mtl parallel parsec process random regex-tdfa split text
+ lens mtl parallel parsec process random regex-tdfa split text
transformers unordered-containers vector
];
executableHaskellDepends = [
@@ -67223,8 +69533,8 @@ self: {
}:
mkDerivation {
pname = "egison-tutorial";
- version = "3.7.9";
- sha256 = "04xy76737zp1vpnn1b76xd5z4d6hfxd4l707v8s1cd8vb18y3dc0";
+ version = "3.7.14";
+ sha256 = "1ar5yg00arqd09wva0q1y4d8lfpd0vjw9sgk47jsyqs7ydm59hnb";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -67234,6 +69544,7 @@ self: {
];
description = "A tutorial program for the Egison programming language";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"egyptian-fractions" = callPackage
@@ -67307,21 +69618,23 @@ self: {
}) {eibclient = null;};
"eigen" = callPackage
- ({ mkDerivation, base, binary, bytestring, mtl, primitive
- , transformers, vector
+ ({ mkDerivation, base, binary, bytestring, constraints, ghc-prim
+ , mtl, primitive, transformers, vector
}:
mkDerivation {
pname = "eigen";
- version = "3.3.4.1";
- sha256 = "0kpbnl5yrsp9923al5g9x48yf88m4vsdryq69g8fmlh0wdqkdapa";
+ version = "3.3.7.0";
+ sha256 = "0smpfli12kzmgpw92azx9lsb1kiq6zn490yr1fmhv1a3lynm53rs";
libraryHaskellDepends = [
- base binary bytestring primitive transformers vector
+ base binary bytestring constraints ghc-prim primitive transformers
+ vector
];
testHaskellDepends = [
- base binary bytestring mtl primitive transformers vector
+ base binary bytestring ghc-prim mtl primitive transformers vector
];
description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"either" = callPackage
@@ -67333,6 +69646,8 @@ self: {
pname = "either";
version = "5.0.1";
sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc";
+ revision = "1";
+ editedCabalFile = "1kf0dy6nki64kkmjw8214jz3n086g1pghfm26f012b6qv0iakzca";
libraryHaskellDepends = [
base bifunctors mtl profunctors semigroupoids semigroups
];
@@ -67358,8 +69673,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 +69713,8 @@ self: {
pname = "ekg";
version = "0.4.0.15";
sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8";
- revision = "3";
- editedCabalFile = "05vyycpr627znm769ilyaah39npwa6p23sncgar2vyvxscchkzpi";
+ revision = "5";
+ editedCabalFile = "0jwzwqr4giinq6wvl46399454nm9vc5g6mc2k2mx4wjdcl07qbgm";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring ekg-core ekg-json filepath network snap-core
@@ -67465,10 +69780,8 @@ self: {
}:
mkDerivation {
pname = "ekg-core";
- version = "0.1.1.4";
- sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36";
- revision = "2";
- editedCabalFile = "1jky0jf6ajan5zmb46d6p4lv7293kc5gw1bcq5av733g10cwrbdk";
+ version = "0.1.1.6";
+ sha256 = "0hjprlx99k7mgs2zn06yckir71dvz90xs24g2r990r97mmwxva36";
libraryHaskellDepends = [
base containers ghc-prim text unordered-containers
];
@@ -67536,8 +69849,8 @@ self: {
pname = "ekg-json";
version = "0.1.0.6";
sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy";
- revision = "3";
- editedCabalFile = "0d029nmwpln8iqqj1l5pz41l4gpbgk6n9gmlwnhnq2cm7ih6gzad";
+ revision = "4";
+ editedCabalFile = "16sn4nbqm0rxkf0swi6r2jn6z9x92qmcg9xlx258d98kqb5fkwjg";
libraryHaskellDepends = [
aeson base ekg-core text unordered-containers
];
@@ -67568,8 +69881,8 @@ self: {
}:
mkDerivation {
pname = "ekg-prometheus-adapter";
- version = "0.1.0.3";
- sha256 = "0jkjbzb5ygd8q4641wdzw3v3cxvdqy2r6qhrrfi09iqn3ii9gjad";
+ version = "0.1.0.4";
+ sha256 = "1i9bqbn8zj7hbkc7iypmjji4sh8s2h9jix2ngp77mkmii6wblfx2";
libraryHaskellDepends = [
base containers ekg-core microlens-th prometheus text transformers
unordered-containers
@@ -67627,6 +69940,8 @@ self: {
pname = "ekg-statsd";
version = "0.2.4.0";
sha256 = "1nvsiblha1fzykvfaq1s0fyvfmhm32wvxdsfkn9pqd6dl5ivyx2y";
+ revision = "2";
+ editedCabalFile = "1l0lh77qy4kbybkys1d4gg563fc593w27wpf4k1cg9j6ix6y604x";
libraryHaskellDepends = [
base bytestring ekg-core network text time unordered-containers
];
@@ -67643,8 +69958,8 @@ self: {
pname = "ekg-wai";
version = "0.1.0.3";
sha256 = "1sd2fz4l4slizm179x9cskqdvrpf6w4d779kah9hrnk3nqbmklxz";
- revision = "1";
- editedCabalFile = "0crcpwrnh1pi5n4dlp9cwminj1gls9ywm4fgvisafh480097b100";
+ revision = "2";
+ editedCabalFile = "17kca2wzlcv8nxyq096fv57jfklhz4ibnvf5nqqdszczb03j3dnn";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring ekg-core ekg-json filepath http-types network
@@ -67714,6 +70029,7 @@ self: {
libraryHaskellDepends = [ base elerea SDL ];
description = "Elerea FRP wrapper for SDL";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"elevator" = callPackage
@@ -67758,6 +70074,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 +70114,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
@@ -67877,6 +70212,7 @@ self: {
];
description = "A library to generate Elm types from Haskell source";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"elm-export-persistent" = callPackage
@@ -68270,8 +70606,8 @@ self: {
}:
mkDerivation {
pname = "email-validate";
- version = "2.3.2.6";
- sha256 = "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5";
+ version = "2.3.2.9";
+ sha256 = "12sf380s0f78npga3x1bz9wkz82h477vvf3bvsxq69hrc7m6xb5f";
libraryHaskellDepends = [
attoparsec base bytestring template-haskell
];
@@ -68333,6 +70669,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 +70948,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 +71005,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 +71068,44 @@ self: {
}:
mkDerivation {
pname = "entropy";
- version = "0.4.1.1";
- sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf";
+ version = "0.4.1.4";
+ sha256 = "1fgf47l9klwn1xssbcbq6by651vikd8hlfxhiwd5bqzxr1jnlgrf";
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, clock, containers, criterion
+ , directory, exceptions, monad-loops, process, QuickCheck
+ , quickcheck-instances, quickcheck-properties, quickcheck-text
+ , random, retry, SafeSemaphore, semigroups, stm, text, time
+ , transformers, transformers-either
+ }:
+ mkDerivation {
+ pname = "entwine";
+ version = "0.0.3";
+ sha256 = "0x4ghpskgpls028fp74mmxqb6hrhcfvdxbfny2bniclh9826fiij";
+ libraryHaskellDepends = [
+ async base clock containers exceptions monad-loops retry
+ SafeSemaphore semigroups 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 +71122,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 +71210,8 @@ self: {
pname = "enumerator";
version = "0.4.20";
sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik";
+ revision = "1";
+ editedCabalFile = "10mn8a6sj7fvcprfmngr5z1h434k6yhdij064lqxjpiqyr1srg9z";
libraryHaskellDepends = [
base bytestring containers text transformers
];
@@ -68996,14 +71376,36 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"envy" = callPackage
({ mkDerivation, base, bytestring, containers, hspec, mtl
, QuickCheck, quickcheck-instances, text, time, transformers
}:
mkDerivation {
pname = "envy";
- version = "1.5.0.0";
- sha256 = "1gqzfjgy58833vi9b5dlfwwzx7fj2548wb340xyh0q8cmsrrkh6d";
+ version = "1.5.1.0";
+ sha256 = "1r2181n5ayww1ycg7vvz5pp5cyxs6asljf4kir7g80qnj2wwpjid";
libraryHaskellDepends = [
base bytestring containers mtl text time transformers
];
@@ -69214,10 +71616,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
];
@@ -69613,6 +72013,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "escaped" = callPackage
+ ({ mkDerivation, base, doctest, hspec, QuickCheck
+ , quickcheck-instances, quickcheck-properties, text, unix
+ }:
+ mkDerivation {
+ pname = "escaped";
+ version = "1.0.0.0";
+ sha256 = "1fpnaj0ycjhb73skv5dxrycwyyvy0rripvcag88hsjyh1ybxx91v";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base QuickCheck quickcheck-instances text unix
+ ];
+ executableHaskellDepends = [ base text ];
+ testHaskellDepends = [
+ base doctest hspec QuickCheck quickcheck-properties
+ ];
+ description = "Produce Text with terminal escape sequences";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"escoger" = callPackage
({ mkDerivation, base, bytestring, criterion, HUnit, mtl
, test-framework, test-framework-hunit, unix, vector
@@ -69667,53 +72088,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 +72155,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 +72231,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 +72583,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
@@ -70501,16 +72925,16 @@ self: {
"eventsource-api" = callPackage
({ mkDerivation, aeson, base, bytestring, containers
, enclosed-exceptions, lifted-async, lifted-base, monad-control
- , monad-loops, mtl, stm, stm-chans, string-conversions, text
- , transformers-base, unordered-containers, uuid
+ , monad-loops, mtl, stm, stm-chans, streaming, string-conversions
+ , text, transformers-base, unordered-containers, uuid
}:
mkDerivation {
pname = "eventsource-api";
- version = "1.3.1";
- sha256 = "0dlrbc3xxijz1hf8w34lvk70ic6gsfb9j5z3ldqdssvv9c8fksy2";
+ version = "1.5.0";
+ sha256 = "0748wrj8amw66cl95cri7g2nw9kwc5h0dsw1419p90xpxgvn4kvr";
libraryHaskellDepends = [
aeson base bytestring containers enclosed-exceptions lifted-async
- lifted-base monad-control monad-loops mtl stm stm-chans
+ lifted-base monad-control monad-loops mtl stm stm-chans streaming
string-conversions text transformers-base unordered-containers uuid
];
description = "Provides an eventsourcing high level API";
@@ -70519,20 +72943,23 @@ self: {
"eventsource-geteventstore-store" = callPackage
({ mkDerivation, aeson, base, eventsource-api
- , eventsource-store-specs, eventstore, mtl, protolude
- , string-conversions, tasty, tasty-hspec, transformers-base
+ , eventsource-store-specs, eventstore, lifted-async, lifted-base
+ , mtl, protolude, streaming, string-conversions, tasty, tasty-hspec
+ , transformers-base
}:
mkDerivation {
pname = "eventsource-geteventstore-store";
- version = "1.1.0";
- sha256 = "00siad63vciymkdql9b3bszb2qfcylb9y32x04ndd19mvpixhdi3";
+ version = "1.2.0";
+ sha256 = "0v0k89xb86h8zxrzzpph0bayy47v3gn56vi3v02cvvnwnif3071l";
libraryHaskellDepends = [
- aeson base eventsource-api eventstore mtl string-conversions
+ aeson base eventsource-api eventsource-store-specs eventstore
+ lifted-async lifted-base mtl streaming string-conversions
transformers-base
];
testHaskellDepends = [
- base eventsource-api eventsource-store-specs eventstore protolude
- tasty tasty-hspec
+ aeson base eventsource-api eventsource-store-specs eventstore
+ lifted-async lifted-base mtl protolude streaming string-conversions
+ tasty tasty-hspec transformers-base
];
description = "GetEventStore store implementation";
license = stdenv.lib.licenses.bsd3;
@@ -70540,16 +72967,16 @@ self: {
}) {};
"eventsource-store-specs" = callPackage
- ({ mkDerivation, aeson, async, base, eventsource-api, mtl, tasty
- , tasty-hspec, text, transformers-base, uuid
+ ({ mkDerivation, aeson, async, base, eventsource-api, mtl
+ , streaming, tasty, tasty-hspec, text, transformers-base, uuid
}:
mkDerivation {
pname = "eventsource-store-specs";
- version = "1.1.1";
- sha256 = "1pa4s9y9cgvaadzyp186snhvrgp4jw1xgzxy2w58hxfa2mcxqn4i";
+ version = "1.2.0";
+ sha256 = "1fvwwbbn8407rcxl7sww1k944gq95hniq9s9ys3hzr8a9y65598i";
libraryHaskellDepends = [
- aeson async base eventsource-api mtl tasty tasty-hspec text
- transformers-base uuid
+ aeson async base eventsource-api mtl streaming tasty tasty-hspec
+ text transformers-base uuid
];
description = "Provides common test specification for Store implementation";
license = stdenv.lib.licenses.bsd3;
@@ -70557,19 +72984,20 @@ self: {
"eventsource-stub-store" = callPackage
({ mkDerivation, aeson, async, base, containers, eventsource-api
- , eventsource-store-specs, mtl, protolude, stm, tasty, tasty-hspec
- , transformers-base
+ , eventsource-store-specs, mtl, protolude, stm, streaming, tasty
+ , tasty-hspec, transformers-base
}:
mkDerivation {
pname = "eventsource-stub-store";
- version = "1.0.3";
- sha256 = "12vsn32m2h3bgssp2s6p1x90lj3h814iwplzhiyhmnaapq451h2w";
+ version = "1.1.0";
+ sha256 = "0rfbn3f6dw6m03f47f68if11xkjd98djhballl50zv7fqifcpz7h";
libraryHaskellDepends = [
- async base containers eventsource-api mtl stm transformers-base
+ async base containers eventsource-api mtl stm streaming
+ transformers-base
];
testHaskellDepends = [
- aeson base eventsource-api eventsource-store-specs protolude tasty
- tasty-hspec
+ aeson base eventsource-api eventsource-store-specs protolude
+ streaming tasty tasty-hspec
];
description = "An in-memory stub store implementation";
license = stdenv.lib.licenses.bsd3;
@@ -70608,8 +73036,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
@@ -70631,6 +73061,42 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "eventstore_1_2_0" = callPackage
+ ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+ , cereal, clock, connection, containers, dns, dotnet-timespan
+ , ekg-core, exceptions, fast-logger, hashable, http-client
+ , interpolate, lifted-async, lifted-base, machines, monad-control
+ , monad-logger, mono-traversable, mtl, protobuf, random, safe
+ , safe-exceptions, semigroups, stm, stm-chans, streaming, tasty
+ , tasty-hspec, tasty-hunit, text, time, transformers-base
+ , unordered-containers, uuid
+ }:
+ mkDerivation {
+ pname = "eventstore";
+ version = "1.2.0";
+ sha256 = "03ckizx7phz6jykj10s1vj7wfc454qzjq04jrmqhxsbrrqilhyk3";
+ libraryHaskellDepends = [
+ aeson array base bifunctors bytestring cereal clock connection
+ containers dns dotnet-timespan ekg-core exceptions fast-logger
+ hashable http-client interpolate lifted-async lifted-base machines
+ monad-control monad-logger mono-traversable mtl protobuf random
+ safe safe-exceptions semigroups stm stm-chans streaming text time
+ transformers-base unordered-containers uuid
+ ];
+ testHaskellDepends = [
+ aeson async base bytestring cereal connection containers
+ dotnet-timespan exceptions fast-logger hashable lifted-async
+ lifted-base monad-control mono-traversable protobuf safe
+ safe-exceptions semigroups stm stm-chans streaming tasty
+ tasty-hspec tasty-hunit text time transformers-base
+ unordered-containers uuid
+ ];
+ description = "EventStore TCP Client";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = [ "x86_64-darwin" "x86_64-linux" ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"every" = callPackage
({ mkDerivation, async, base, stm }:
mkDerivation {
@@ -70725,6 +73191,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "exact-pi_0_5_0_1" = callPackage
+ ({ mkDerivation, base, numtype-dk, QuickCheck, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "exact-pi";
+ version = "0.5.0.1";
+ sha256 = "0q0qrkmpff835m3zz3w60i1y4sqicnzqb6vqmk13cjh4ign5d0ax";
+ libraryHaskellDepends = [ base numtype-dk ];
+ testHaskellDepends = [
+ base numtype-dk QuickCheck tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Exact rational multiples of pi (and integer powers of pi)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"exact-real" = callPackage
({ mkDerivation, base, checkers, criterion, directory, doctest
, filepath, groups, integer-gmp, memoize, QuickCheck, random, tasty
@@ -70844,6 +73327,8 @@ self: {
pname = "exception-transformers";
version = "0.4.0.7";
sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj";
+ revision = "1";
+ editedCabalFile = "0sahi93f75acvmqagkjc1lcwx31crja6z9hyww9abj85x45pqa6f";
libraryHaskellDepends = [
base stm transformers transformers-compat
];
@@ -70875,8 +73360,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,13 +73502,14 @@ self: {
}:
mkDerivation {
pname = "exhaustive";
- version = "1.1.6";
- sha256 = "00gdgr9xqzy14sqx31j4afljvfc4ar2jrzmwpp3z6ybfq1saw7vk";
+ version = "1.1.7";
+ sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z";
libraryHaskellDepends = [
base generics-sop template-haskell transformers
];
description = "Compile time checks that a computation considers producing data through all possible constructors";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"exherbo-cabal" = callPackage
@@ -71086,30 +73572,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 +73680,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 +73737,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 +73753,8 @@ self: {
pname = "exitcode";
version = "0.1.0.1";
sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5";
+ revision = "2";
+ editedCabalFile = "0g30lnsl947bsxcw53swl0vv3qg8c7vqf8axpdnhl28mdrxa0ax9";
libraryHaskellDepends = [
base lens mmorph mtl semigroupoids semigroups transformers
];
@@ -71217,6 +73778,7 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Compression and decompression in the exomizer format";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"exp-cache" = callPackage
@@ -71226,8 +73788,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 +73809,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 +73825,8 @@ self: {
pname = "exp-pairs";
version = "0.1.6.0";
sha256 = "1qsvly4klhk17r2pk60cf03dyz0cjc449fa2plqrlai9rl7xjfp6";
+ revision = "1";
+ editedCabalFile = "1zbsjlj6wavz9ysfzjqb4ng7688crlfvsbyj4li84khc1jp71xj3";
libraryHaskellDepends = [
base containers deepseq ghc-prim prettyprinter
];
@@ -71274,6 +73838,29 @@ self: {
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
+ ];
+ testHaskellDepends = [
+ base matrix QuickCheck random smallcheck tasty tasty-hunit
+ tasty-quickcheck tasty-smallcheck
+ ];
+ description = "Linear programming over exponent pairs";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"expand" = callPackage
({ mkDerivation, AspectAG, base, HList, murder, uu-parsinglib }:
mkDerivation {
@@ -71324,20 +73911,20 @@ self: {
"expiring-containers" = callPackage
({ mkDerivation, base, containers, hashable, int-multimap
- , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, time
- , timestamp, unordered-containers
+ , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit
+ , tasty-quickcheck, time, timestamp, unordered-containers
}:
mkDerivation {
pname = "expiring-containers";
- version = "0.2";
- sha256 = "1bqcxq42x4s8kj7wpa9iqgaxww6m7vqzkd2dakry1ssy9dv8wp28";
+ version = "0.2.2.1";
+ sha256 = "0zicnfwamm6yx91pb92qjzv0n25cwdz4krymnvpn5vyhh96k3kwh";
libraryHaskellDepends = [
base containers hashable int-multimap time timestamp
unordered-containers
];
testHaskellDepends = [
- base containers hashable int-multimap quickcheck-instances tasty
- tasty-hunit tasty-quickcheck time timestamp unordered-containers
+ int-multimap QuickCheck quickcheck-instances rerebase tasty
+ tasty-hunit tasty-quickcheck timestamp
];
description = "Expiring containers";
license = stdenv.lib.licenses.mit;
@@ -71511,8 +74098,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 +74107,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 +74116,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 +74126,7 @@ self: {
];
description = "Encode and Decode expressions from Z3 ASTs";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"extcore" = callPackage
@@ -71601,8 +74190,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
@@ -71634,7 +74223,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "extensible_0_4_10" = callPackage
+ "extensible_0_4_10_1" = callPackage
({ mkDerivation, aeson, base, bytestring, cassava, comonad
, constraints, deepseq, exceptions, ghc-prim, hashable, lens
, monad-skeleton, mtl, prettyprinter, primitive, profunctors
@@ -71644,8 +74233,8 @@ self: {
}:
mkDerivation {
pname = "extensible";
- version = "0.4.10";
- sha256 = "012xryq2jz7k6dmrzjh8j3yn9ggyna63vppi6xwdqjxks9xms2zq";
+ version = "0.4.10.1";
+ sha256 = "009z0grpjnnmnsc887k6vgfz5w55mniax25dl4ispj1nq74djksb";
libraryHaskellDepends = [
aeson base bytestring cassava comonad constraints deepseq
exceptions ghc-prim hashable monad-skeleton mtl prettyprinter
@@ -71682,12 +74271,13 @@ self: {
}:
mkDerivation {
pname = "extensible-effects";
- version = "3.1.0.0";
- sha256 = "0p4vk4k6922ar853zb85jm4si7y1qdr1wkx4pwfd613a5ar23440";
+ version = "4.0.0.0";
+ sha256 = "0h83cn0767sk8di6ja5928v65mkcp90pjqhgijrvynssxxsvfsji";
libraryHaskellDepends = [ base monad-control transformers-base ];
testHaskellDepends = [
- base doctest HUnit monad-control QuickCheck silently test-framework
- test-framework-hunit test-framework-quickcheck2 test-framework-th
+ base doctest HUnit monad-control mtl QuickCheck silently
+ test-framework test-framework-hunit test-framework-quickcheck2
+ test-framework-th
];
benchmarkHaskellDepends = [
base criterion HUnit mtl test-framework test-framework-hunit
@@ -71698,27 +74288,35 @@ self: {
}) {};
"extensible-effects-concurrent" = callPackage
- ({ mkDerivation, base, containers, 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, async, base, containers, data-default, deepseq
+ , directory, exceptions, extensible-effects, filepath, HUnit, lens
+ , monad-control, mtl, parallel, process, QuickCheck
+ , safe-exceptions, stm, tasty, tasty-discover, tasty-hunit, time
+ , transformers-base
}:
mkDerivation {
pname = "extensible-effects-concurrent";
- version = "0.4.0.0";
- sha256 = "0asqibn8hf4i627k9ms8sak90wmyis919ggb41lra4rlv03r61rc";
+ version = "0.15.0";
+ sha256 = "0hy1z2caqwyxqw1s3xxkbrzi3f86w3vzch783ajq41xqd6z8spdp";
+ 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
+ async base containers data-default deepseq exceptions
+ extensible-effects filepath lens monad-control mtl parallel process
+ QuickCheck safe-exceptions stm time transformers-base
+ ];
+ executableHaskellDepends = [
+ base data-default deepseq directory extensible-effects filepath
+ lens
];
testHaskellDepends = [
- base containers deepseq extensible-effects HUnit lens QuickCheck
- stm tasty tasty-discover tasty-hunit
+ async base containers data-default deepseq extensible-effects HUnit
+ lens QuickCheck stm tasty tasty-discover tasty-hunit
];
testToolDepends = [ tasty-discover ];
description = "Message passing concurrency as extensible-effect";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"extensible-exceptions" = callPackage
@@ -71762,8 +74360,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
];
@@ -71772,6 +74370,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "extra_1_6_14" = callPackage
+ ({ mkDerivation, base, clock, directory, filepath, process
+ , QuickCheck, time, unix
+ }:
+ mkDerivation {
+ pname = "extra";
+ version = "1.6.14";
+ sha256 = "170jmwx2wnpa6bs92pcijm4ib4hq0vs4582s6v63wrcn1m9l21m6";
+ libraryHaskellDepends = [
+ base clock directory filepath process time unix
+ ];
+ testHaskellDepends = [ base directory filepath QuickCheck unix ];
+ description = "Extra functions I use";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"extract-dependencies" = callPackage
({ mkDerivation, async, base, Cabal, containers
, package-description-remote
@@ -71842,8 +74457,8 @@ self: {
({ mkDerivation, base, leancheck, speculate, template-haskell }:
mkDerivation {
pname = "extrapolate";
- version = "0.3.1";
- sha256 = "1hz03mdascy4jvqhyrqqmb1py3pb03g4z3if05z2cbdxgbgsbbn4";
+ version = "0.3.3";
+ sha256 = "1mc14d9wcrvrd2fkzjxc5gvy7s33p875qj97bdaacdjv5hmg5zr2";
libraryHaskellDepends = [
base leancheck speculate template-haskell
];
@@ -71852,21 +74467,6 @@ self: {
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";
- 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
({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
, blaze-builder, bytestring, classy-prelude, classy-prelude-conduit
@@ -71904,6 +74504,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 +74564,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;
@@ -72142,6 +74760,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "faktory" = callPackage
+ ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
+ , cryptonite, hspec, markdown-unlit, megaparsec, memory, network
+ , random, safe-exceptions, scanner, text, time, unix
+ }:
+ mkDerivation {
+ pname = "faktory";
+ version = "1.0.0.0";
+ sha256 = "10dvgxipik8pw2cibmw65887ri1zssy2ha72r6x57flgkr0jal0j";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-casing base bytestring connection cryptonite megaparsec
+ memory network random safe-exceptions scanner text time unix
+ ];
+ executableHaskellDepends = [ aeson base safe-exceptions ];
+ testHaskellDepends = [ aeson base hspec markdown-unlit ];
+ testToolDepends = [ markdown-unlit ];
+ description = "Faktory Worker for Haskell";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"falling-turnip" = callPackage
({ mkDerivation, base, gloss, gloss-raster, JuicyPixels-repa
, QuickCheck, random, repa, repa-algorithms, vector
@@ -72223,20 +74863,16 @@ self: {
}) {};
"fast-arithmetic" = callPackage
- ({ mkDerivation, arithmoi, base, combinat-compat
- , composition-prelude, criterion, gmpint, hspec, QuickCheck
+ ({ mkDerivation, arithmoi, base, combinat, criterion, hgmp, hspec
+ , QuickCheck
}:
mkDerivation {
pname = "fast-arithmetic";
- version = "0.6.0.9";
- sha256 = "1kpki7j8kz9xzzg8gl8l5g7wgq0v2s7r2lhr0mb4m67bkq61zmrs";
- libraryHaskellDepends = [ base composition-prelude gmpint ];
- testHaskellDepends = [
- arithmoi base combinat-compat hspec QuickCheck
- ];
- benchmarkHaskellDepends = [
- arithmoi base combinat-compat criterion
- ];
+ version = "0.6.4.2";
+ sha256 = "1jfdwhbw6g435p7waspg19viykqlqqqc7n8m75j34a8vwqyh5zpa";
+ libraryHaskellDepends = [ base hgmp ];
+ testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
+ benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
description = "Fast functions on integers";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -72249,8 +74885,8 @@ self: {
}:
mkDerivation {
pname = "fast-builder";
- version = "0.0.1.0";
- sha256 = "09s0jyiv1ch8cbgwfaxn5mmn9w7ik661h2g6d5znxr0nsi0bp2n1";
+ version = "0.1.0.0";
+ sha256 = "1sc5hgiagjcsblbzlymd9z140ybmq03l6xykksjdx0xkwj4sqrp2";
libraryHaskellDepends = [ base bytestring ghc-prim ];
testHaskellDepends = [ base bytestring process QuickCheck stm ];
benchmarkHaskellDepends = [
@@ -72358,11 +74994,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
@@ -72760,6 +75395,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "fay-websockets" = callPackage
+ ({ mkDerivation, fay-base }:
+ mkDerivation {
+ pname = "fay-websockets";
+ version = "0.0.1.1";
+ sha256 = "1pax12d1rjmh3gdg1ylavk04f8rlldc6jnmm5sgghdq28z1mp6pb";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ fay-base ];
+ description = "Websockets FFI library for Fay";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fb" = callPackage
({ mkDerivation, aeson, attoparsec, base, base16-bytestring
, base64-bytestring, bytestring, cereal, conduit, conduit-extra
@@ -72917,8 +75564,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
@@ -73068,6 +75715,17 @@ self: {
license = "GPL";
}) {};
+ "fedora-dists" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "fedora-dists";
+ version = "1.0.0.1";
+ sha256 = "0x5lccpwcf2cd97vnqlzyi4lgbyhqcs5ks1sr3l33h1zffpb0br8";
+ libraryHaskellDepends = [ base ];
+ description = "Library for Fedora distribution versions";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"fedora-haskell-tools" = callPackage
({ mkDerivation, base, directory, filepath, process, time, unix }:
mkDerivation {
@@ -73140,26 +75798,25 @@ self: {
}) {};
"feed" = callPackage
- ({ mkDerivation, base, base-compat, bytestring, HUnit, old-locale
- , old-time, safe, test-framework, test-framework-hunit, text, time
- , time-locale-compat, utf8-string, xml-conduit, xml-types
+ ({ mkDerivation, base, base-compat, bytestring, HUnit
+ , markdown-unlit, old-locale, old-time, safe, test-framework
+ , test-framework-hunit, text, time, time-locale-compat, utf8-string
+ , xml-conduit, xml-types
}:
mkDerivation {
pname = "feed";
- version = "1.0.0.0";
- sha256 = "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck";
- revision = "4";
- editedCabalFile = "0baavcavm3ywykcr9cm07aqr7sna98jba2n68lyn3kany8ri214d";
+ version = "1.0.1.0";
+ sha256 = "076krkyvbh24s50chdw3nz6w2svwchys65ppjzlm8gy42ddhbgc7";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base base-compat bytestring old-locale old-time safe text time
time-locale-compat utf8-string xml-conduit xml-types
];
testHaskellDepends = [
- base base-compat HUnit old-locale old-time test-framework
- test-framework-hunit text time time-locale-compat utf8-string
- xml-conduit xml-types
+ base base-compat HUnit old-time test-framework test-framework-hunit
+ text time xml-conduit xml-types
];
+ testToolDepends = [ markdown-unlit ];
description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -73525,20 +76182,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 +76207,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 +76275,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 +76292,8 @@ self: {
pname = "fgl";
version = "5.6.0.0";
sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll";
+ revision = "1";
+ editedCabalFile = "17r5p1c6srgyzpdkqkjcl9k3ax9c82lvps1kqjhxpdzypsnzns70";
libraryHaskellDepends = [
array base containers deepseq transformers
];
@@ -73644,6 +76303,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fgl_5_7_0_1" = callPackage
+ ({ mkDerivation, array, base, containers, deepseq, hspec
+ , microbench, QuickCheck, transformers
+ }:
+ mkDerivation {
+ pname = "fgl";
+ version = "5.7.0.1";
+ sha256 = "04793yh778ck3kz1z2svnfdwwls2kisbnky4lzvf4zjfgpv7mkpz";
+ libraryHaskellDepends = [
+ array base containers deepseq transformers
+ ];
+ testHaskellDepends = [ base containers hspec QuickCheck ];
+ benchmarkHaskellDepends = [ base deepseq microbench ];
+ description = "Martin Erwig's Functional Graph Library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fgl-arbitrary" = callPackage
({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
mkDerivation {
@@ -73860,8 +76537,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
@@ -73953,8 +76630,8 @@ self: {
}:
mkDerivation {
pname = "filecache";
- version = "0.4.0";
- sha256 = "0x2ffqx6wfv6n3k3396463f771zs9ps1rcw8ga3qw4vm5sv8s26d";
+ version = "0.4.1";
+ sha256 = "17fbjdy2cicrd956317jj7fir0bd621c4zb5sb4991ph7jsah0n5";
libraryHaskellDepends = [
base containers directory exceptions filepath fsnotify mtl stm
strict-base-types time
@@ -74049,8 +76726,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 +76913,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";
@@ -74347,8 +77026,8 @@ self: {
}:
mkDerivation {
pname = "fingertree";
- version = "0.1.4.1";
- sha256 = "192fyzv0pn1437wdpqg1l80rswkk4rw3w61r4bq7dhv354bdqy4p";
+ version = "0.1.4.2";
+ sha256 = "0zvandj8fysck7ygpn0dw5bhrhmj1s63i326nalxbfkh2ls4iacm";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base HUnit QuickCheck test-framework test-framework-hunit
@@ -74494,8 +77173,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;
@@ -74604,19 +77283,23 @@ self: {
}) {};
"fix-imports" = callPackage
- ({ mkDerivation, base, containers, cpphs, directory, filepath
- , haskell-src-exts, process, split, text, uniplate
+ ({ mkDerivation, base, containers, cpphs, deepseq, directory
+ , filepath, haskell-src-exts, mtl, pretty, process, split
+ , test-karya, text, time, uniplate
}:
mkDerivation {
pname = "fix-imports";
- version = "1.1.0";
- sha256 = "1w2j7l6515khp0zl3cf6pyxsv55c65qqfcxi94vikd8fk88sswd9";
+ version = "2.1.0";
+ sha256 = "1qi877cpfkp7lzdjwq2q6gqqkbvby63z6r22f3ydkx5362ins6kh";
isLibrary = false;
isExecutable = true;
- enableSeparateDataOutput = true;
executableHaskellDepends = [
- base containers cpphs directory filepath haskell-src-exts process
- split text uniplate
+ base containers cpphs deepseq directory filepath haskell-src-exts
+ pretty process split text time uniplate
+ ];
+ testHaskellDepends = [
+ base containers cpphs deepseq directory filepath haskell-src-exts
+ mtl pretty process split test-karya text time uniplate
];
description = "Program to manage the imports of a haskell module";
license = stdenv.lib.licenses.bsd3;
@@ -74755,14 +77438,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 +77473,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 +77489,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
@@ -74830,8 +77526,8 @@ self: {
({ mkDerivation, base, random }:
mkDerivation {
pname = "fixedprec";
- version = "0.2.2.1";
- sha256 = "0s921nhkmdglmcwzyr048r04dswc6hz7kvh9p4lvd8i2mxq0szgi";
+ version = "0.2.2.2";
+ sha256 = "01ss9rzg2r4gii6f7771n4vdyg022skyws6ncc3l62xycgz153a7";
libraryHaskellDepends = [ base random ];
description = "A fixed-precision real number type";
license = stdenv.lib.licenses.bsd3;
@@ -75020,8 +77716,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 +77737,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
@@ -75127,21 +77823,20 @@ self: {
"flat" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
- , dlist, doctest, filemanip, ghc-prim, mono-traversable, pretty
- , primitive, quickcheck-instances, tasty, tasty-hunit
- , tasty-quickcheck, text, vector
+ , dlist, ghc-prim, mono-traversable, pretty, primitive, QuickCheck
+ , tasty, tasty-hunit, tasty-quickcheck, text, vector
}:
mkDerivation {
pname = "flat";
- version = "0.3.2";
- sha256 = "0489w132m6j47m0jf1svwvql3fmw58iz9l2rqnhn4c5gg91wj53q";
+ version = "0.3.4";
+ sha256 = "1v7c5nrvhys4flq5xacws59w25qzbb6mvwhvk4f6jb6impmqnwyw";
libraryHaskellDepends = [
array base bytestring containers deepseq dlist ghc-prim
mono-traversable pretty primitive text vector
];
testHaskellDepends = [
- base bytestring containers deepseq doctest filemanip ghc-prim
- quickcheck-instances tasty tasty-hunit tasty-quickcheck text
+ array base bytestring containers deepseq ghc-prim QuickCheck tasty
+ tasty-hunit tasty-quickcheck text
];
description = "Principled and efficient bit-oriented binary serialization";
license = stdenv.lib.licenses.bsd3;
@@ -75306,44 +78001,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
];
@@ -75465,21 +78149,22 @@ self: {
pname = "flock";
version = "0.3.1.8";
sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n";
- revision = "4";
- editedCabalFile = "02jqldkxg366v0gljiqg7zv5sd3zhswabcvg5xx6h8ns67kn3my6";
+ revision = "5";
+ editedCabalFile = "19jqvzacd1639r8c8vs2fdng188mjg8i76x0fghda71d7a2jgp97";
libraryHaskellDepends = [
base lifted-base monad-control transformers unix
];
description = "Wrapper for flock(2)";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"flow" = callPackage
({ 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 +78339,28 @@ self: {
"fltkhs" = callPackage
({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
- , mtl, parsec, text
+ , fltk14, libGLU_combined, mtl, OpenGLRaw, parsec, pkgconfig, text
+ , vector
}:
mkDerivation {
pname = "fltkhs";
- version = "0.5.4.5";
- sha256 = "17iqpnn0zgwifb937kllkfyz8qf37da90z8iyay348gy3siwjxic";
+ version = "0.6.0.0";
+ sha256 = "1cbyp8rq9yzx6jrw68dbprkdyd8pkdqbxx08wajyg7bfks6j39cb";
+ configureFlags = [ "-fopengl" ];
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
- libraryHaskellDepends = [ base bytestring text ];
- libraryToolDepends = [ c2hs ];
- executableHaskellDepends = [ base directory filepath mtl parsec ];
+ libraryHaskellDepends = [ base bytestring text vector ];
+ librarySystemDepends = [ fltk14 ];
+ libraryPkgconfigDepends = [ libGLU_combined ];
+ libraryToolDepends = [ c2hs pkgconfig ];
+ executableHaskellDepends = [
+ base directory filepath mtl OpenGLRaw parsec text
+ ];
description = "FLTK bindings";
license = stdenv.lib.licenses.mit;
- }) {};
+ }) {inherit (pkgs) fltk14; inherit (pkgs) libGLU_combined;
+ inherit (pkgs) pkgconfig;};
"fltkhs-demos" = callPackage
({ mkDerivation, base, bytestring, directory, fltkhs, process, stm
@@ -75712,6 +78404,7 @@ self: {
executableHaskellDepends = [ base bytestring fltkhs ];
description = "Fltkhs Fluid Examples";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"fltkhs-hello-world" = callPackage
@@ -75728,6 +78421,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,11 +78630,13 @@ self: {
}:
mkDerivation {
pname = "fmt";
- version = "0.6";
- sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy";
+ version = "0.6.1.1";
+ sha256 = "1bfj94ahc06xj6x5v5gmjzgw30cgxsc1vjygajqiqnanimbhn8i6";
+ revision = "1";
+ editedCabalFile = "13ypmyg0axadzhycfl0g1s73bk9a2myshf38y8dslf3hlg76wbmv";
libraryHaskellDepends = [
- base base64-bytestring bytestring containers formatting microlens
- text time time-locale-compat
+ base base64-bytestring bytestring call-stack containers formatting
+ microlens text time time-locale-compat
];
testHaskellDepends = [
base bytestring call-stack containers doctest hspec
@@ -75938,6 +78651,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
@@ -76002,14 +78727,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "focuslist" = callPackage
+ ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
+ , genvalidity-containers, genvalidity-hspec, hedgehog, lens
+ , mono-traversable, QuickCheck, tasty, tasty-hedgehog, tasty-hspec
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "focuslist";
+ version = "0.1.0.1";
+ sha256 = "1qq5ixaxrwy2wn8xz8ckva9m50bkygj2gpw89fdry4wglvkrmvpx";
+ revision = "2";
+ editedCabalFile = "12x38kxhcjdqfwl8y8zdrwcpv6jdm7jaqc48ww3hg6fpv8rvvd49";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base containers lens mono-traversable QuickCheck
+ ];
+ testHaskellDepends = [
+ base doctest genvalidity-containers genvalidity-hspec hedgehog lens
+ QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell
+ ];
+ description = "Lists with a focused element";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fold-debounce" = callPackage
({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
, time
}:
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 +78775,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 +78807,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 +78848,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 +78972,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
@@ -76228,8 +79008,8 @@ self: {
}:
mkDerivation {
pname = "follow-file";
- version = "0.0.2";
- sha256 = "0661fp7gf5gyb4w06qm7lfaclzp0zk96gkhcx3pallckfr3214hk";
+ version = "0.0.3";
+ sha256 = "0nxvw17ndjrg34mc2a0bcyprcng52f6mn3l7mhx2fc11njdf2b93";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -76238,9 +79018,10 @@ self: {
];
executableHaskellDepends = [
attoparsec attoparsec-path base bytestring conduit
- conduit-combinators directory hinotify path text
+ conduit-combinators directory exceptions hinotify monad-control mtl
+ path text unix utf8-string
];
- description = "Be notified when a file gets appended, solely with what was added";
+ description = "Be notified when a file gets appended, solely with what was added. Warning - only works on linux and for files that are strictly appended, like log files.";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -76379,8 +79160,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 +79302,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 +79408,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
@@ -76993,8 +79776,8 @@ self: {
}:
mkDerivation {
pname = "fptest";
- version = "0.2.1.0";
- sha256 = "0gbws8q7k2bv4i4v7km5nfjv8j42kmfjw4vhn1n6dr8xysrmbn3h";
+ version = "0.2.3.0";
+ sha256 = "107n8kisyc9hmbn2rznb4d7pxzn9bb04mxcn6x0wvrzjqsmlzzdg";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -77206,20 +79989,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.7.0";
+ sha256 = "1aiifvfrz668lzxy41i82w19z6jc2xi9awhz6b07xv47f22qphgh";
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";
@@ -77227,6 +80010,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "free-category" = callPackage
+ ({ mkDerivation, base, free-algebras }:
+ mkDerivation {
+ pname = "free-category";
+ version = "0.0.1.0";
+ sha256 = "0cpcn10kbsx1xvvxvvcx5hpa0p9vhkrjf7cmzva2zpmhdj4jp5rg";
+ libraryHaskellDepends = [ base free-algebras ];
+ description = "Free category";
+ license = stdenv.lib.licenses.mpl20;
+ }) {};
+
"free-concurrent" = callPackage
({ mkDerivation, base, type-aligned }:
mkDerivation {
@@ -77255,18 +80049,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 +80211,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
@@ -77428,6 +80251,8 @@ self: {
pname = "free-vector-spaces";
version = "0.1.5.0";
sha256 = "0rf6yhjcd2x4yj2jvyl6yc8x55a2hqhj5mxzg4f24734agh720z1";
+ revision = "1";
+ editedCabalFile = "0b95827ppw0nvhaxg9axkngsij2sj8d6s06amz2vi79jgs7vbfr6";
libraryHaskellDepends = [
base lens linear MemoTrie pragmatic-show vector vector-space
];
@@ -77594,6 +80419,100 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "freer-simple_1_2_1_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.1.0";
+ sha256 = "199cg3y4wx1kh2mrdzf7qswi0jnx9nbgj0a6z75y7ql639lqya5c";
+ 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;
+ }) {};
+
+ "freer-simple-catching" = callPackage
+ ({ mkDerivation, base, freer-simple, hspec }:
+ mkDerivation {
+ pname = "freer-simple-catching";
+ version = "0.1.0.0";
+ sha256 = "140dmmcnpnvn3hhwjic6ja86qhw84k1547zfya7h1gm4sw36mq56";
+ libraryHaskellDepends = [ base freer-simple ];
+ testHaskellDepends = [ base freer-simple hspec ];
+ description = "Checked runtime exceptions with freer-simple";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "freer-simple-http" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, freer-simple
+ , hspec, http-client, http-types
+ }:
+ mkDerivation {
+ pname = "freer-simple-http";
+ version = "0.1.0.0";
+ sha256 = "0wxqlwqgsphmzhpsbkdq9bl5vjmq598x1q20dd235bdxgggnxd57";
+ libraryHaskellDepends = [
+ aeson base bytestring containers freer-simple http-client
+ http-types
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers freer-simple hspec http-client
+ http-types
+ ];
+ description = "Make HTTP requests with freer-simple!";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "freer-simple-profiling" = callPackage
+ ({ mkDerivation, base, containers, freer-simple, hspec, time }:
+ mkDerivation {
+ pname = "freer-simple-profiling";
+ version = "0.1.0.0";
+ sha256 = "1ll8r8z7khxlr2yix9c8m3bjdq3yncvrsg6pj03n68wsf26zgf17";
+ libraryHaskellDepends = [ base containers freer-simple time ];
+ testHaskellDepends = [ base containers freer-simple hspec time ];
+ description = "Automatic profling of freer-simple programs";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "freer-simple-random" = callPackage
+ ({ mkDerivation, base, containers, freer-simple, hspec, random }:
+ mkDerivation {
+ pname = "freer-simple-random";
+ version = "0.1.0.0";
+ sha256 = "0bp0px1d7lsghaq7giaqm3xlhp0fkrf15dxpqzlglh0ysd2xg3x3";
+ libraryHaskellDepends = [ base containers freer-simple random ];
+ testHaskellDepends = [ base containers freer-simple hspec random ];
+ description = "Random number generators using freer-simple";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "freer-simple-time" = callPackage
+ ({ mkDerivation, base, freer-simple, hspec, time }:
+ mkDerivation {
+ pname = "freer-simple-time";
+ version = "0.1.0.0";
+ sha256 = "08ph7nlj3f3iyvqljwn1hz4z8x0nzl19fsmb0rkk9sjbkk043ar8";
+ libraryHaskellDepends = [ base freer-simple time ];
+ testHaskellDepends = [ base freer-simple hspec time ];
+ description = "freer-simple interface to IO based time functions";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"freesect" = callPackage
({ mkDerivation, array, base, cpphs, directory, mtl, parallel
, pretty, random, syb
@@ -77708,6 +80627,7 @@ self: {
];
description = "Fresco binding for Haskell";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"fresh" = callPackage
@@ -78139,8 +81059,8 @@ self: {
}:
mkDerivation {
pname = "fswatch";
- version = "0.1.0.5";
- sha256 = "0f1rvvkfqm3q12dvagmsdpvw0c9r5a9gj6g34rrsyjdbpc818prw";
+ version = "0.1.0.6";
+ sha256 = "1972pw7p9njl6h225v8yam5riyiyzkvzhbkv987wl1l3ayga9mdf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -78159,8 +81079,8 @@ self: {
}:
mkDerivation {
pname = "fswatcher";
- version = "0.2.1";
- sha256 = "12m7975hj98aady01hkkc99v53sqi23dizkrq38pgdkbpdl6qsmz";
+ version = "0.2.2";
+ sha256 = "0rdvh9310qbnp6vh3janr60nla33kyfy23yfzbzsca8ridr7ab7w";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -78196,8 +81116,8 @@ self: {
}:
mkDerivation {
pname = "ftp-client";
- version = "0.5.0.1";
- sha256 = "1mffpifpsp3l0nmpd6wabgxmz459ky47bzfizqbijxac24x69455";
+ version = "0.5.1.1";
+ sha256 = "01f8d32f2nkqrf21p38zgzwmvl2pkpl9rx0c8a8ch6h56flzhck4";
libraryHaskellDepends = [
attoparsec base bytestring connection containers exceptions network
transformers
@@ -78209,21 +81129,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.4";
+ sha256 = "0w4sfa4qyclcfixxlam5djhv9hx0hzhfsvf2cabs6m8mgks8zidi";
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
@@ -78443,6 +81361,27 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
+ "funcons-intgen" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath
+ , funcons-tools, funcons-values, gll, iml-tools, mtl, pretty
+ , regex-applicative, split, text, uu-cco
+ }:
+ mkDerivation {
+ pname = "funcons-intgen";
+ version = "0.2.0.1";
+ sha256 = "12g6lizcxhvk26k3qp1k3v9dz9pz9xx004jpmipqm291r9nyiya9";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base containers directory filepath funcons-tools funcons-values gll
+ iml-tools mtl pretty regex-applicative split text uu-cco
+ ];
+ description = "Generate Funcons interpreters from CBS description files";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {iml-tools = null;};
+
"funcons-lambda-cbv-mp" = callPackage
({ mkDerivation, base, containers, funcons-tools, gll, text }:
mkDerivation {
@@ -78465,8 +81404,10 @@ self: {
({ mkDerivation, base, funcons-tools, funcons-values }:
mkDerivation {
pname = "funcons-simple";
- version = "0.1.0.3";
- sha256 = "0ar5sxcalbfyhyvm6ijbyrrz2pzqyj5bihngnf187wrc5llq2ydr";
+ version = "0.1.0.7";
+ sha256 = "1p6dvrfymap6b2n7ys3llxaa3jvykpykm27yv3mfy19q29djpwv4";
+ revision = "1";
+ editedCabalFile = "1zv6njnp3ymp2hgq68fyhckv8lq4h36wqwx01zbnkwcajwiy66mr";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base funcons-tools funcons-values ];
@@ -78482,8 +81423,8 @@ self: {
}:
mkDerivation {
pname = "funcons-tools";
- version = "0.2.0.5";
- sha256 = "16a4jn2l13da7n4c73raqplisz4xg7g4rpi707vks5x9gi44pag4";
+ version = "0.2.0.7";
+ sha256 = "132l3wzhr60xnp1zd3qh5yrz9y8fk0v6fz9i242vdvj1rbacfdhf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -78500,15 +81441,13 @@ self: {
}) {};
"funcons-values" = callPackage
- ({ mkDerivation, base, bv, containers, multiset, random-strings
- , text, vector
- }:
+ ({ mkDerivation, base, bv, containers, multiset, text, vector }:
mkDerivation {
pname = "funcons-values";
- version = "0.1.0.3";
- sha256 = "0j9sn5b6c6v1vllkvrc02r81bpcmh2a3srq74na8vvzq8pp6midy";
+ version = "0.1.0.5";
+ sha256 = "0wmkag1dlvk6lq2f17pvzwxlafd7hn69vxwrkr8ar02vb1yvnb2q";
libraryHaskellDepends = [
- base bv containers multiset random-strings text vector
+ base bv containers multiset text vector
];
description = "Library providing values and operations on values in a fixed universe";
license = stdenv.lib.licenses.mit;
@@ -78594,8 +81533,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
];
@@ -78700,8 +81639,8 @@ self: {
}:
mkDerivation {
pname = "funflow";
- version = "1.3.2";
- sha256 = "01r1l1r8qg6w7wfcbs7qwxy22b7rd1cdixds425ynp9h0246lrmf";
+ version = "1.4.0";
+ sha256 = "1pd690y41bf6lrk6bzl730hvpaaazya927nslwp8ii5rcn6wjx7f";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -78727,6 +81666,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "funflow-nix" = callPackage
+ ({ mkDerivation, async, base, containers, data-default, directory
+ , filepath, funflow, modern-uri, path, path-io, process, random
+ , safe-exceptions, tasty, tasty-hunit, temporary, text, unix
+ }:
+ mkDerivation {
+ pname = "funflow-nix";
+ version = "0.1.0.0";
+ sha256 = "16lg1afm6sfpaz1syq3f61f51wzqiwi9b5hrc3jbj9lwnlxwcplq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base funflow modern-uri path text ];
+ testHaskellDepends = [
+ async base containers data-default directory filepath funflow
+ modern-uri path path-io process random safe-exceptions tasty
+ tasty-hunit temporary unix
+ ];
+ description = "Utility functions for using funflow with nix";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"funion" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, haskell98
, HFuse, unix
@@ -78794,6 +81755,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "fused-effects" = callPackage
+ ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom
+ , QuickCheck, random
+ }:
+ mkDerivation {
+ pname = "fused-effects";
+ version = "0.1.2.1";
+ sha256 = "00lr52zfi1k52z0iqg8wb2a40x80kpwhbvmasp8c4s8c8jx4s9yn";
+ libraryHaskellDepends = [ base deepseq MonadRandom random ];
+ testHaskellDepends = [ base doctest hspec QuickCheck ];
+ 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 +81784,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 {
@@ -78941,6 +81972,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fuzzyset_0_1_0_8" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
+ , ieee754, lens, text, text-metrics, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "fuzzyset";
+ version = "0.1.0.8";
+ sha256 = "096izffsa3fgdi8qiz7n6l2fl2rbiq6kv5h1xljmq0nkaig5m5wv";
+ libraryHaskellDepends = [
+ base base-unicode-symbols data-default lens text text-metrics
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base base-unicode-symbols hspec ieee754 lens text
+ unordered-containers
+ ];
+ description = "Fuzzy set for approximate string matching";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fuzzytime" = callPackage
({ mkDerivation, base, cmdargs, directory, old-time, process }:
mkDerivation {
@@ -79170,6 +82222,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "garfield" = callPackage
+ ({ mkDerivation }:
+ mkDerivation {
+ pname = "garfield";
+ version = "0.0.0.0";
+ sha256 = "0r8wybcqn7g24q8abrw757h76r75l4jh4hjx91yh44h4c1r6k4yf";
+ doHaddock = false;
+ description = "TBA";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"gargoyle" = callPackage
({ mkDerivation, base, directory, filelock, filepath, network
, process
@@ -79245,8 +82308,8 @@ self: {
({ mkDerivation, base, binary, containers }:
mkDerivation {
pname = "gasp";
- version = "1.0.1.0";
- sha256 = "1y9kn03q6gvcf9zdi656121brvicm20y4a74g5qma54qb6ccr7bz";
+ version = "1.1.0.0";
+ sha256 = "1zv7jq60nw2nd0np7xkz83y7jnvnshccz63j0i9bl0d9x1grhzbq";
libraryHaskellDepends = [ base binary containers ];
description = "A framework of algebraic classes";
license = stdenv.lib.licenses.bsd3;
@@ -79259,8 +82322,8 @@ self: {
}:
mkDerivation {
pname = "gauge";
- version = "0.2.3";
- sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs";
+ version = "0.2.4";
+ sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9";
libraryHaskellDepends = [
base basement deepseq directory process vector
];
@@ -79501,8 +82564,8 @@ self: {
({ mkDerivation, base, GLUT, OpenGLRaw, Vec }:
mkDerivation {
pname = "gearbox";
- version = "1.0.0.5";
- sha256 = "01mzvbmzq7bl665xy5znqcivxp0b6x6wcrzq8r6kzsym5izm9qz4";
+ version = "1.0.0.6";
+ sha256 = "0f8zljk145yq3lq3ngiana5g39ybqijsv7n3b11wdr7mzymdgyw2";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
@@ -79945,17 +83008,35 @@ 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-data-surgery" = callPackage
+ ({ mkDerivation, base, first-class-families, generic-data, tasty
+ , tasty-hunit
+ }:
+ mkDerivation {
+ pname = "generic-data-surgery";
+ version = "0.1.0.0";
+ sha256 = "1ady7wkg6bs8iadahz33gn7pas2176wg2fsphxs4nq7fi2c566a4";
+ libraryHaskellDepends = [ base first-class-families generic-data ];
+ testHaskellDepends = [ base generic-data tasty tasty-hunit ];
+ description = "Surgery for generic data types";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"generic-deepseq" = callPackage
@@ -80037,6 +83118,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "generic-lens_1_1_0_0" = callPackage
+ ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
+ , inspection-testing, lens, profunctors, QuickCheck, tagged
+ }:
+ mkDerivation {
+ pname = "generic-lens";
+ version = "1.1.0.0";
+ sha256 = "1frng5vgk4pkaw8wqqj6ch9p5fk88rbw1mmxzs0cp13wpxnr9wpc";
+ libraryHaskellDepends = [ base profunctors tagged ];
+ testHaskellDepends = [
+ base doctest HUnit inspection-testing lens profunctors
+ ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq lens QuickCheck
+ ];
+ description = "Generically derive traversals, lenses and prisms";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"generic-lens-labels" = callPackage
({ mkDerivation, base, generic-lens }:
mkDerivation {
@@ -80083,6 +83184,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "generic-monoid" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "generic-monoid";
+ version = "0.1.0.0";
+ sha256 = "0jzhmy6vi38p3cnlvi4hw59zga239y67nszzl7zscx263wsk7q0w";
+ libraryHaskellDepends = [ base ];
+ description = "Derive monoid instances for product types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"generic-pretty" = callPackage
({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
, tasty, tasty-hunit, text, vector
@@ -80108,6 +83220,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 +83281,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 +83343,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 +83357,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 +83575,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 +83641,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity_0_7_0_0" = callPackage
+ ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
+ mkDerivation {
+ pname = "genvalidity";
+ version = "0.7.0.0";
+ sha256 = "1bjsqqyr1n306icfdl8sh3amqq95zpr5hawwbv46nbf0rxci88w1";
+ 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
@@ -80547,21 +83694,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "genvalidity-bytestring_0_3_0_0" = callPackage
+ "genvalidity-bytestring_0_3_0_1" = callPackage
({ mkDerivation, base, bytestring, deepseq, genvalidity
, genvalidity-hspec, hspec, QuickCheck, validity
, validity-bytestring
}:
mkDerivation {
pname = "genvalidity-bytestring";
- version = "0.3.0.0";
- sha256 = "1jmy41mqjh3zj512fjikn6vqjvx81cdvi9llc9f0yp2h2rkmw4hf";
+ version = "0.3.0.1";
+ sha256 = "1jc3hd5aad5vblb1mmb1xzgfdcnk37w50vxyznr1m16rdfg1xrz8";
libraryHaskellDepends = [
base bytestring genvalidity QuickCheck validity validity-bytestring
];
testHaskellDepends = [
base bytestring deepseq genvalidity genvalidity-hspec hspec
- QuickCheck
+ QuickCheck validity
];
description = "GenValidity support for ByteString";
license = stdenv.lib.licenses.mit;
@@ -80574,8 +83721,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
];
@@ -80586,14 +83733,33 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-containers_0_5_1_1" = callPackage
+ ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
+ , hspec, QuickCheck, validity, validity-containers
+ }:
+ mkDerivation {
+ pname = "genvalidity-containers";
+ version = "0.5.1.1";
+ sha256 = "1z7bmbwi07nylkgm3dysmnv57z1iww2sjy2zv88jpg6nvq9r9ffg";
+ libraryHaskellDepends = [
+ base containers genvalidity QuickCheck validity validity-containers
+ ];
+ testHaskellDepends = [
+ base containers genvalidity genvalidity-hspec hspec validity
+ ];
+ description = "GenValidity support for containers";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-hspec" = callPackage
({ mkDerivation, base, doctest, genvalidity, genvalidity-property
, hspec, hspec-core, QuickCheck, transformers, validity
}:
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
@@ -80605,6 +83771,27 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-hspec_0_6_2_1" = callPackage
+ ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
+ , hspec, hspec-core, QuickCheck, transformers, validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-hspec";
+ version = "0.6.2.1";
+ sha256 = "100mjmbjfzy431a52yqkq2rja0mb5zw8dbkpfbfy17rdkwwx2yn1";
+ libraryHaskellDepends = [
+ base genvalidity genvalidity-property hspec hspec-core QuickCheck
+ transformers validity
+ ];
+ testHaskellDepends = [
+ base doctest genvalidity genvalidity-property hspec hspec-core
+ QuickCheck validity
+ ];
+ description = "Standard spec's for GenValidity instances";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-hspec-aeson" = callPackage
({ mkDerivation, aeson, base, bytestring, deepseq, doctest
, genvalidity, genvalidity-aeson, genvalidity-hspec
@@ -80626,6 +83813,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-hspec-aeson_0_3_0_1" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
+ , genvalidity, genvalidity-aeson, genvalidity-hspec
+ , genvalidity-property, genvalidity-text, hspec, QuickCheck, text
+ , validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-hspec-aeson";
+ version = "0.3.0.1";
+ sha256 = "0x5ja3d6vab2gmcqif3cvvbvmdpxp4hrc4ygzns5pw91nlrf5lm2";
+ libraryHaskellDepends = [
+ aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
+ QuickCheck
+ ];
+ testHaskellDepends = [
+ aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
+ genvalidity-property genvalidity-text hspec text validity
+ ];
+ description = "Standard spec's for aeson-related instances";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-hspec-binary" = callPackage
({ mkDerivation, base, binary, deepseq, doctest, genvalidity
, genvalidity-hspec, hspec, QuickCheck
@@ -80642,6 +83852,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-hspec-binary_0_2_0_3" = callPackage
+ ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
+ , genvalidity-hspec, genvalidity-property, hspec, QuickCheck
+ , validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-hspec-binary";
+ version = "0.2.0.3";
+ sha256 = "1am9brcf3wh2fdrfwlkcqiamwc2zlcw3lihpcqgz0sm3jhka56xr";
+ libraryHaskellDepends = [
+ base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
+ ];
+ testHaskellDepends = [
+ base doctest genvalidity genvalidity-property hspec validity
+ ];
+ description = "Standard spec's for binary-related Instances";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-hspec-cereal" = callPackage
({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
, genvalidity-hspec, hspec, QuickCheck
@@ -80658,6 +83888,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-hspec-cereal_0_2_0_3" = callPackage
+ ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
+ , genvalidity-hspec, genvalidity-property, hspec, QuickCheck
+ , validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-hspec-cereal";
+ version = "0.2.0.3";
+ sha256 = "11bii2nf52jfarfb5jzgj6pmsz59mcvivb8nxc90z97gdd5w6zll";
+ libraryHaskellDepends = [
+ base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
+ ];
+ testHaskellDepends = [
+ base doctest genvalidity genvalidity-property hspec validity
+ ];
+ description = "Standard spec's for cereal-related instances";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-hspec-hashable" = callPackage
({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
, genvalidity-property, hashable, hspec, hspec-core, QuickCheck
@@ -80679,22 +83929,46 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-hspec-hashable_0_2_0_3" = callPackage
+ ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
+ , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
+ , validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-hspec-hashable";
+ version = "0.2.0.3";
+ sha256 = "0lb1aiv07fbbkyhh8ig2lhqgm9yibrny2bw9qwbdkwwsi6hk4566";
+ libraryHaskellDepends = [
+ base genvalidity genvalidity-hspec genvalidity-property hashable
+ hspec QuickCheck validity
+ ];
+ testHaskellDepends = [
+ base doctest genvalidity genvalidity-hspec genvalidity-property
+ hashable hspec hspec-core QuickCheck validity
+ ];
+ description = "Standard spec's for Hashable instances";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-hspec-optics" = callPackage
({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
- , hspec, microlens, QuickCheck
+ , genvalidity-property, hspec, microlens, QuickCheck, validity
}:
mkDerivation {
pname = "genvalidity-hspec-optics";
- version = "0.1.0.0";
- sha256 = "08p7hv1wr6df8sng906rvys0998nk8j331r2q5v2abw2rg2609m5";
+ version = "0.1.1.1";
+ sha256 = "121pjin5g1mgdqjydvj68639d5f17i3ibxrl8iiigp4q3xywp4ha";
libraryHaskellDepends = [
base genvalidity genvalidity-hspec hspec microlens QuickCheck
];
testHaskellDepends = [
- base doctest genvalidity genvalidity-hspec hspec microlens
+ base doctest genvalidity genvalidity-hspec genvalidity-property
+ hspec microlens validity
];
description = "Standard spec's for optics";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"genvalidity-mergeless" = callPackage
@@ -80746,8 +84020,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
];
@@ -80756,14 +84030,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-property_0_3_0_0" = callPackage
+ ({ mkDerivation, base, directory, doctest, filepath, genvalidity
+ , hspec, QuickCheck, validity
+ }:
+ mkDerivation {
+ pname = "genvalidity-property";
+ version = "0.3.0.0";
+ sha256 = "03cpmkqmfqypj9kydrdzs0pyix0ffwrlx8idzvgyrqiyhg03rsis";
+ libraryHaskellDepends = [
+ base genvalidity hspec QuickCheck validity
+ ];
+ testHaskellDepends = [ base directory doctest filepath ];
+ description = "Standard properties for functions on `Validity` types";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-scientific" = callPackage
({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
, QuickCheck, scientific, validity, validity-scientific
}:
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 +84066,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 +84081,6 @@ self: {
];
description = "GenValidity support for Text";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"genvalidity-time" = callPackage
@@ -80817,8 +84089,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
];
@@ -80847,6 +84119,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-unordered-containers_0_2_0_4" = callPackage
+ ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
+ , hspec, QuickCheck, unordered-containers, validity
+ , validity-unordered-containers
+ }:
+ mkDerivation {
+ pname = "genvalidity-unordered-containers";
+ version = "0.2.0.4";
+ sha256 = "0rkvwm5imbgl8cx5pdk16dc4wzhcndw6g3wwxs0blykiri32wl3q";
+ libraryHaskellDepends = [
+ base genvalidity hashable QuickCheck unordered-containers validity
+ validity-unordered-containers
+ ];
+ testHaskellDepends = [
+ base genvalidity genvalidity-hspec hspec unordered-containers
+ validity
+ ];
+ description = "GenValidity support for unordered-containers";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"genvalidity-uuid" = callPackage
({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
, QuickCheck, uuid, validity, validity-uuid
@@ -80871,8 +84165,8 @@ self: {
}:
mkDerivation {
pname = "genvalidity-vector";
- version = "0.2.0.2";
- sha256 = "0f1ycxpvi6jmwakfs26ydzwd8gw8qzlybr2v1ppyvvjn6a7rilhi";
+ version = "0.2.0.3";
+ sha256 = "161w5shgj1k8691mmi9ddhxrnrqhsp502ywln2h0sk55zqcj1i5k";
libraryHaskellDepends = [
base genvalidity QuickCheck validity validity-vector vector
];
@@ -81012,8 +84306,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 +84317,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 +84388,8 @@ self: {
}:
mkDerivation {
pname = "geos";
- version = "0.1.1.2";
- sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d";
+ version = "0.2.1";
+ sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9";
libraryHaskellDepends = [
base bytestring mtl transformers vector
];
@@ -81143,8 +84438,8 @@ self: {
}:
mkDerivation {
pname = "getopt-generics";
- version = "0.13.0.2";
- sha256 = "0330f63gy5gk461hvyy79jxrz5bcxdh2sgl0r1g1ffl4swjsl176";
+ version = "0.13.0.3";
+ sha256 = "1202xsfvygd06h1d70v73ldwj32qv6sqadk5zl2979dgjx4841db";
libraryHaskellDepends = [
base base-compat base-orphans generics-sop tagged
];
@@ -81170,28 +84465,27 @@ self: {
"gf" = callPackage
({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
, containers, directory, exceptions, filepath, happy, haskeline
- , HTF, httpd-shed, HUnit, json, mtl, network, network-uri
- , old-locale, parallel, pretty, process, random, terminfo, time
- , time-compat, unix, utf8-string
+ , httpd-shed, json, mtl, network, network-uri, parallel, pretty
+ , process, random, terminfo, time, time-compat, unix, utf8-string
}:
mkDerivation {
pname = "gf";
- version = "3.9";
- sha256 = "11g57vhb89s3wi6ny88la9mxwg5vivr9fjxsmm9i644pys7kg84i";
+ version = "3.10";
+ sha256 = "1f0wwrhid0iqk2lmf9aprkzml8xpc3vsvvfpqfywf8qk8i76wwkv";
+ revision = "1";
+ editedCabalFile = "1g7l4j57h78vnjhkf7k21jfirykj4ghrj08xy8ylx8b5a4iilyrg";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [
array base bytestring cgi containers directory exceptions filepath
- haskeline httpd-shed json mtl network network-uri old-locale
- parallel pretty process random terminfo time time-compat unix
- utf8-string
+ haskeline httpd-shed json mtl network network-uri parallel pretty
+ process random terminfo time time-compat unix utf8-string
];
libraryToolDepends = [ alex happy ];
executableHaskellDepends = [ base ];
- testHaskellDepends = [
- base Cabal directory filepath HTF HUnit process
- ];
+ testHaskellDepends = [ base Cabal directory filepath process ];
doCheck = false;
postPatch = ''
sed -i "s|\"-s\"|\"\"|" ./Setup.hs
@@ -81252,35 +84546,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 +84584,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 +84613,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 +84762,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 +84776,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 +84846,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 +84914,18 @@ 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";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-imported-from" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, directory
, exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils
@@ -81681,8 +84989,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 +85155,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 +85196,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 +85214,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 = [
@@ -82065,8 +85373,8 @@ self: {
({ mkDerivation, base, ghc, hspec, hspec-discover, text }:
mkDerivation {
pname = "ghc-syntax-highlighter";
- version = "0.0.2.0";
- sha256 = "1gcdhsbjpj1mwwgc4l2ibdcvicw9xx6bmva8r7ddd7bqbhnmqcyg";
+ version = "0.0.3.0";
+ sha256 = "077cvrx25qdl04qgp3wl7c3jxrakw1k873dwgybfwkhgfj2g8dx1";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base ghc text ];
testHaskellDepends = [ base hspec text ];
@@ -82081,6 +85389,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 +85460,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 +85502,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 +85592,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 +85642,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 +85719,8 @@ self: {
}:
mkDerivation {
pname = "ghcid";
- version = "0.7";
- sha256 = "1dcx12vkjw5w1np4bz8ypaf8bdw1s8yrlhq6i5x2pilvsf1dljqg";
+ version = "0.7.1";
+ sha256 = "06n37dv51i2905v8nwwv1ilm0zlx6zblrkfic1mp491ws2sijdx7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -82529,8 +85895,8 @@ self: {
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "ghcjs-perch";
- version = "0.3.3.2";
- sha256 = "1ng6wpx6kp8rxmxwf0ns0q0jas2gl2s2mv1dlq59xbsikdly3km7";
+ version = "0.3.3.3";
+ sha256 = "0b3hj0gm9gcgwpg8f7vxy87fasgpgn27ciyafhmy6b4fnnmn41kn";
libraryHaskellDepends = [ base transformers ];
description = "GHCJS version of Perch library";
license = stdenv.lib.licenses.mit;
@@ -82777,7 +86143,6 @@ self: {
haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gtk3 ];
- doHaddock = false;
description = "Gdk bindings";
license = stdenv.lib.licenses.lgpl21;
}) {gtk3 = pkgs.gnome3.gtk;};
@@ -82857,14 +86222,13 @@ self: {
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ glib ];
- doHaddock = false;
description = "Gio bindings";
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib;};
"gi-girepository" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
- , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base
+ , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base
, haskell-gi-overloading, text, transformers
}:
mkDerivation {
@@ -82876,11 +86240,11 @@ self: {
base bytestring containers gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers
];
- libraryPkgconfigDepends = [ gobjectIntrospection ];
+ libraryPkgconfigDepends = [ gobject-introspection ];
doHaddock = false;
description = "GIRepository (gobject-introspection) bindings";
license = stdenv.lib.licenses.lgpl21;
- }) {inherit (pkgs.gnome3) gobjectIntrospection;};
+ }) {inherit (pkgs.gnome3) gobject-introspection;};
"gi-glib" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, glib
@@ -82897,7 +86261,6 @@ self: {
haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ glib ];
- doHaddock = false;
description = "GLib bindings";
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib;};
@@ -82929,8 +86292,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 +86417,8 @@ self: {
}:
mkDerivation {
pname = "gi-gtk";
- version = "3.0.24";
- sha256 = "14cyj1acxs39avciyzqqb1qa5dr4my8rv3mfwv1kv92wa9a5i97v";
+ version = "3.0.26";
+ sha256 = "1b0sfjcjxm0kzqyhrvl4wbxqa7zdpwv13xzrpb1k1k9rijjf1anf";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -83063,11 +86426,48 @@ self: {
haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ gtk3 ];
- doHaddock = false;
description = "Gtk bindings";
license = stdenv.lib.licenses.lgpl21;
}) {gtk3 = pkgs.gnome3.gtk;};
+ "gi-gtk-declarative" = callPackage
+ ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject
+ , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, mtl
+ , random, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "gi-gtk-declarative";
+ version = "0.2.0";
+ sha256 = "0spp225x4acrm96gr0i1jqlhmdq52xqin6h0mma2gvjh025dywyh";
+ libraryHaskellDepends = [
+ base gi-gobject gi-gtk haskell-gi haskell-gi-base
+ haskell-gi-overloading mtl text unordered-containers vector
+ ];
+ benchmarkHaskellDepends = [
+ base criterion gi-gdk gi-glib gi-gtk random text
+ ];
+ 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.2.0";
+ sha256 = "19br3alfj0ggsbwp0640pdrjz1dm59g2wv8sb38jznsrni5fb8yx";
+ 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";
+ 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,8 +86475,8 @@ self: {
}:
mkDerivation {
pname = "gi-gtk-hs";
- version = "0.3.6.1";
- sha256 = "0qa1ig3z44p47badin0v3rnwilck05659jnk7xcvh2pjhmjmpclw";
+ 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
@@ -83129,18 +86529,18 @@ self: {
}) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
"gi-javascriptcore" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
- , haskell-gi-base, haskell-gi-overloading, text, transformers
- , webkitgtk
+ ({ 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.15";
- sha256 = "07dz5kisis93x0ywb207w8nv54bfdgsahq325dyvbfvlgkqrxsh3";
+ version = "4.0.16";
+ sha256 = "0kihq9sp42k2k9j8qrwgja62i5pzwhc1z1yy6h19n56aikddfc2z";
setupHaskellDepends = [ base Cabal haskell-gi ];
libraryHaskellDepends = [
- base bytestring containers haskell-gi haskell-gi-base
- haskell-gi-overloading text transformers
+ base bytestring containers gi-glib gi-gobject haskell-gi
+ haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ webkitgtk ];
doHaddock = false;
@@ -83206,7 +86606,6 @@ self: {
haskell-gi-base haskell-gi-overloading text transformers
];
libraryPkgconfigDepends = [ cairo pango ];
- doHaddock = false;
preCompileBuildDriver = ''
PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
@@ -83318,7 +86717,6 @@ self: {
text transformers
];
libraryPkgconfigDepends = [ vte_291 ];
- doHaddock = false;
description = "Vte bindings";
license = stdenv.lib.licenses.lgpl21;
}) {vte_291 = pkgs.gnome3.vte;};
@@ -83468,14 +86866,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.2.0";
+ sha256 = "06k2imp511v4xxlzqgii14hf0ncnc6wci3hm7w48z332c5nk24m1";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -83485,8 +86883,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 +86896,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "gingersnap" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , http-types, microspec, postgresql-simple, resource-pool
+ , snap-core, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "gingersnap";
+ version = "0.3.1.0";
+ sha256 = "10lcs2p14rk1l280h3xkywbagy82cp2yy4zgs8l531hyqfzrsl01";
+ libraryHaskellDepends = [
+ aeson base bytestring deepseq http-types postgresql-simple
+ resource-pool snap-core text transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base bytestring containers microspec postgresql-simple snap-core
+ transformers
+ ];
+ description = "Consistent and safe JSON APIs with snap-core and (by default) postgresql-simple";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ginsu" = callPackage
({ mkDerivation, array, async, base, binary, bytestring, containers
, directory, hashable, hashtables, mtl, network, old-locale
@@ -83651,31 +87070,33 @@ 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
- , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath
- , free, git, gnupg, hinotify, hslogger, http-client
+ ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder
+ , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
+ , clientsession, concurrent-output, conduit, connection, containers
+ , crypto-api, cryptonite, curl, data-default, DAV, dbus, directory
+ , disk-free-space, dlist, edit-distance, exceptions, fdo-notify
+ , feed, filepath, free, git, gnupg, hinotify, hslogger, http-client
, http-client-tls, http-conduit, http-types, IfElse, lsof, magic
- , memory, monad-control, monad-logger, mountpoints, mtl, network
- , network-info, network-multicast, network-uri, old-locale, openssh
- , optparse-applicative, perl, persistent, persistent-sqlite
- , persistent-template, process, QuickCheck, random, regex-tdfa
- , resourcet, rsync, 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, wget, which
+ , memory, microlens, monad-control, monad-logger, mountpoints, mtl
+ , network, network-info, network-multicast, network-uri, old-locale
+ , openssh, optparse-applicative, path-pieces, perl, persistent
+ , persistent-sqlite, persistent-template, process, QuickCheck
+ , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
+ , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup
+ , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
+ , template-haskell, text, time, torrent, transformers, unix
+ , unix-compat, unordered-containers, utf8-string, uuid, vector, wai
+ , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core
+ , yesod-form, yesod-static
}:
mkDerivation {
pname = "git-annex";
- version = "6.20180807";
- sha256 = "1wkqh1y58m0z1mf2j33qhndpxcjwv8mbv384kdk17vn0lp9zas1s";
+ version = "7.20181211";
+ sha256 = "05zvi2z4fs2sprzgm31m6y1rhvwkhmjilvmgvyajzs12vzsaik6x";
configureFlags = [
- "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
- "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3"
- "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-f-webapp"
- "-f-webapp-secure" "-fwebdav" "-fxmpp"
+ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
+ "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" "-fwebapp"
+ "-fwebdav"
];
isLibrary = false;
isExecutable = true;
@@ -83684,19 +87105,21 @@ 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
+ aeson async attoparsec aws base blaze-builder bloomfilter byteable
+ bytestring case-insensitive clientsession concurrent-output conduit
+ connection containers crypto-api cryptonite data-default DAV dbus
+ directory disk-free-space dlist edit-distance exceptions fdo-notify
+ feed filepath free hinotify hslogger http-client http-client-tls
+ http-conduit http-types IfElse magic memory microlens monad-control
+ monad-logger mountpoints mtl network network-info network-multicast
+ network-uri old-locale optparse-applicative path-pieces persistent
+ persistent-sqlite persistent-template process QuickCheck random
+ regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare
+ socks split stm stm-chans tagsoup tasty tasty-hunit
+ tasty-quickcheck tasty-rerun template-haskell text time torrent
transformers unix unix-compat unordered-containers utf8-string uuid
- vector
+ vector wai wai-extra warp warp-tls yesod yesod-core yesod-form
+ yesod-static
];
executableSystemDepends = [
bup curl git gnupg lsof openssh perl rsync wget which
@@ -84071,8 +87494,8 @@ self: {
}:
mkDerivation {
pname = "githash";
- version = "0.1.0.1";
- sha256 = "03zc7vjlnrr7ix7cnpgi70s0znsi07ms60dci8baxbcmjbibdcgy";
+ version = "0.1.3.0";
+ sha256 = "0rnp5ljrb05kd127fy2s5jlxjvjfs50dar92pahb36w2qw2clnp7";
libraryHaskellDepends = [
base bytestring directory filepath process template-haskell
];
@@ -84118,6 +87541,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
@@ -84192,8 +87646,8 @@ self: {
}:
mkDerivation {
pname = "github-release";
- version = "1.2.2";
- sha256 = "0mnkj8p90inaw6cic60hx05yq2lf2aahmv313qi59di5jqkyg106";
+ version = "1.2.3";
+ sha256 = "14jb82gybm2zwri05bqxsibwr29lhghcaj3n0171nbndqs0dyl0y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -84243,6 +87697,7 @@ self: {
];
description = "Type definitions for objects used by the GitHub v3 API";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"github-utils" = callPackage
@@ -84355,32 +87810,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 +87929,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 +87998,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 +88150,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
];
@@ -84740,15 +88194,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "glabrous_0_4_0" = callPackage
+ "glabrous_1_0_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
, cereal, cereal-text, directory, either, hspec, text
, unordered-containers
}:
mkDerivation {
pname = "glabrous";
- version = "0.4.0";
- sha256 = "0qja5mdnbgrsdiwqjfwrzzynbybwg5yksvnwgazak0wv2p86i5yh";
+ version = "1.0.0";
+ sha256 = "00q07675lrsniwrzb85bz2b5n8llbhyp0zxkscm9yr8mlirasr3k";
libraryHaskellDepends = [
aeson aeson-pretty attoparsec base bytestring cereal cereal-text
either text unordered-containers
@@ -85045,14 +88499,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 +88516,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 +88532,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 +88687,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 +88714,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 +88755,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 +88765,27 @@ self: {
];
description = "Examples using the gloss library";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "gloss-export" = callPackage
+ ({ mkDerivation, base, directory, filepath, GLFW-b, gloss
+ , gloss-rendering, GLUT, JuicyPixels, OpenGLRaw, vector
+ }:
+ mkDerivation {
+ pname = "gloss-export";
+ version = "0.1.0.2";
+ sha256 = "0i2x1bbygacrgvi9rvmpq0ddi24vh8dza6hisvif708a8yh6plpr";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base GLFW-b gloss-rendering GLUT JuicyPixels OpenGLRaw vector
+ ];
+ executableHaskellDepends = [ base gloss ];
+ testHaskellDepends = [ base directory filepath gloss JuicyPixels ];
+ description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gloss-game" = callPackage
@@ -85315,6 +88797,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 +88805,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 +88819,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 +88837,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 +88890,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 +89219,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 +89364,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 +89382,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;
@@ -85931,6 +89419,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "godot-haskell" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, c2hs
+ , casing, colour, containers, lens, linear, mtl, parsec, parsers
+ , stm, template-haskell, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "godot-haskell";
+ version = "0.1.0.0";
+ sha256 = "02nvs84bq4nif235iycjwkxmabvs0avwm2xilpwv8kddv95z1f8i";
+ revision = "3";
+ editedCabalFile = "0dpvraw31gpzzlsy7j7mv99jvmwhldycll1hnbw2iscb5zs2g409";
+ libraryHaskellDepends = [
+ aeson ansi-wl-pprint base bytestring casing colour containers lens
+ linear mtl parsec parsers stm template-haskell text
+ unordered-containers vector
+ ];
+ libraryToolDepends = [ c2hs ];
+ doHaddock = false;
+ description = "Haskell bindings for the Godot game engine API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"gofer-prelude" = callPackage
({ mkDerivation, base, ghc-prim }:
mkDerivation {
@@ -87386,6 +90897,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "google-isbn" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
+ , http-conduit, text
+ }:
+ mkDerivation {
+ pname = "google-isbn";
+ version = "1.0.3";
+ sha256 = "0brjq8l4kmlkl5kr69sin3zxbydhafjl9jzkry0x6ijwg0sgfk9s";
+ libraryHaskellDepends = [
+ aeson base bytestring conduit conduit-extra http-conduit text
+ ];
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"google-mail-filters" = callPackage
({ mkDerivation, base, containers, google-search, text, time
, xml-conduit
@@ -87409,8 +90934,8 @@ self: {
}:
mkDerivation {
pname = "google-maps-geocoding";
- version = "0.4.0.1";
- sha256 = "1icya5sh7psr2m12wdx6a5dq9897lp92gq1skxp6s55sksqvglw8";
+ version = "0.4.0.2";
+ sha256 = "0q5zack0lcmn8wsksdlmd0vch1lizia9h4sqax7ydx09is39jzxm";
libraryHaskellDepends = [
aeson base google-static-maps http-client servant servant-client
text
@@ -87493,6 +91018,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "google-oauth2-jwt_0_3_1" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
+ , RSA, text, unix-time
+ }:
+ mkDerivation {
+ pname = "google-oauth2-jwt";
+ version = "0.3.1";
+ sha256 = "121g7fsdcnv65gp81z450dqqw6ii75pwn3cbilwx5yv4mm571mvi";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring HsOpenSSL RSA text unix-time
+ ];
+ description = "Get a signed JWT for Google Service Accounts";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"google-search" = callPackage
({ mkDerivation, base, free, nats, text, time }:
mkDerivation {
@@ -87536,8 +91077,8 @@ self: {
}:
mkDerivation {
pname = "google-static-maps";
- version = "0.5.0.2";
- sha256 = "05gxk4xnxlshcais8ljzp2wbr93kfi97bjbk2rasj5s2mbvw7rvi";
+ version = "0.5.0.3";
+ sha256 = "18c4s9nvpwv34djf7m2jq5mdpyjplp1hcxrfrp5cdyglk6j0j13b";
libraryHaskellDepends = [
aeson base base64-bytestring bytedump bytestring cryptonite
double-conversion http-client JuicyPixels memory network-uri
@@ -88117,6 +91658,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 +91688,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 +91708,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
@@ -88467,6 +92014,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "graph-wrapper_0_2_5_2" = callPackage
+ ({ mkDerivation, array, base, containers, deepseq, hspec
+ , QuickCheck
+ }:
+ mkDerivation {
+ pname = "graph-wrapper";
+ version = "0.2.5.2";
+ sha256 = "1kcdfr1bz2ks71gapz6wrzv7sj6qbmj1zadj1cmh39g9xvqjx94q";
+ libraryHaskellDepends = [ array base containers ];
+ testHaskellDepends = [
+ array base containers deepseq hspec QuickCheck
+ ];
+ description = "A wrapper around the standard Data.Graph with a less awkward interface";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"graphbuilder" = callPackage
({ mkDerivation, base, containers, mtl, QuickCheck, test-framework
, test-framework-quickcheck2
@@ -88605,6 +92169,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 +92226,17 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "graphql-w-persistent" = callPackage
+ ({ mkDerivation, base, containers, json, text }:
+ mkDerivation {
+ pname = "graphql-w-persistent";
+ version = "0.3.1.1";
+ sha256 = "1cfq41s18n73fpn0zzwrvw0b2n7l2h7i71dz9wvifsjxrpla50q1";
+ 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
@@ -88794,8 +92388,8 @@ self: {
}:
mkDerivation {
pname = "gray-extended";
- version = "1.5.2";
- sha256 = "1jn9bx47jdai9yqf9mcfzkv3yfyd4bl0n9hd6njc9m83zycyfsnm";
+ version = "1.5.4";
+ sha256 = "106kwrgpiyzndknnn9vn1hlic227q84qjkh6qa47zkjkl6kxwmsk";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base QuickCheck test-framework test-framework-quickcheck2
@@ -88862,8 +92456,8 @@ self: {
}:
mkDerivation {
pname = "greenclip";
- version = "3.1.1";
- sha256 = "1axh1q7kcvcnhn4rl704i4gcix5yn5v0sb3bdgjk4vgkd7fv8chw";
+ version = "3.2.0";
+ sha256 = "09ygvyrczxqsp2plwmwx021wmbq2vln9i4b5iaj0j26j7prykikq";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -88960,15 +92554,15 @@ self: {
"greskell" = callPackage
({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
- , greskell-core, hint, hspec, semigroups, text, transformers
- , unordered-containers, vector
+ , exceptions, greskell-core, hint, hspec, semigroups, text
+ , transformers, unordered-containers, vector
}:
mkDerivation {
pname = "greskell";
- version = "0.2.1.0";
- sha256 = "03a3rgrzmhc3rh8hwz2pmq3w2q6yf8ypcfzbmqm8cwkix5xx1h8z";
+ version = "0.2.2.0";
+ sha256 = "1ka4iqfyr03dj2kw22h1gik70cfhhvn870w9q9fd42n2k794snbz";
libraryHaskellDepends = [
- aeson base greskell-core semigroups text transformers
+ aeson base exceptions greskell-core semigroups text transformers
unordered-containers vector
];
testHaskellDepends = [
@@ -88986,8 +92580,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 +92601,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 +92617,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.11";
+ sha256 = "0kqd04zv1gpz78kdhpd89yhr7xhkzwp3vl7r5hr4ng65zshkdprg";
+ 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 +92804,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 +92842,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 +92868,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 +92887,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 +92906,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 +92923,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 +93058,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
@@ -89527,6 +93151,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "gscholar-rss" = callPackage
+ ({ mkDerivation, base, feed, http-conduit, scalpel-core, text, uri
+ }:
+ mkDerivation {
+ pname = "gscholar-rss";
+ version = "0.1.0.0";
+ sha256 = "17ki6wvrjvxl77zjpkxjq8yr4ljdrwlszrzwdv3arlq2c0mgl7yy";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base feed http-conduit scalpel-core text uri
+ ];
+ description = "scrapes google scholar, provides RSS feed";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"gsl-random" = callPackage
({ mkDerivation, base, Cabal, vector }:
mkDerivation {
@@ -89590,8 +93231,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
@@ -89670,6 +93311,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "gtfs-realtime" = callPackage
+ ({ mkDerivation, base, protocol-buffers
+ , protocol-buffers-descriptor
+ }:
+ mkDerivation {
+ pname = "gtfs-realtime";
+ version = "0.2.0.0";
+ sha256 = "0ydi358ks9cswwqqdjhxhbasr9l34gmqjxwnvylp5zhgymnyjhl0";
+ libraryHaskellDepends = [
+ base protocol-buffers protocol-buffers-descriptor
+ ];
+ description = "GTFS RealTime protobafs library (autogenerated from .proto file)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"gtk" = callPackage
({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
, gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text
@@ -89688,6 +93344,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
@@ -89808,8 +93483,8 @@ self: {
({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }:
mkDerivation {
pname = "gtk-strut";
- version = "0.1.2.1";
- sha256 = "1m5vvyiyn4v6a8jhizcm8dyi20q2nag9ycm0c2hdxfhsl7fxbx31";
+ version = "0.1.3.0";
+ sha256 = "19p3w1zvnaazfd01yy4cl00sl53xc7kqgqhsw7l3psadmwk6x4w1";
libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
description = "Libary for creating strut windows with gi-gtk";
license = stdenv.lib.licenses.bsd3;
@@ -89858,6 +93533,8 @@ self: {
pname = "gtk2hs-buildtools";
version = "0.13.4.0";
sha256 = "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg";
+ revision = "1";
+ editedCabalFile = "0nbghg11y4nvxjxrvdm4a7fzj8z12fr12hkj4b7p27imlryg3m10";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -89896,6 +93573,7 @@ self: {
libraryHaskellDepends = [ base glib ];
description = "A type class for cast functions of Gtk2hs: glib package";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"gtk2hs-cast-gnomevfs" = callPackage
@@ -90021,6 +93699,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
@@ -90039,8 +93738,8 @@ self: {
}) {gtk-mac-integration-gtk3 = null;};
"gtkglext" = callPackage
- ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
- , gtkglext, pango
+ ({ mkDerivation, base, Cabal, glib, gtk, gtk2, gtk2hs-buildtools
+ , gtkglext, libGLU, libICE, libSM, libXmu, libXt, pango
}:
mkDerivation {
pname = "gtkglext";
@@ -90049,12 +93748,16 @@ self: {
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base glib gtk pango ];
+ librarySystemDepends = [ gtk2 libGLU libICE libSM libXmu libXt ];
libraryPkgconfigDepends = [ gtkglext ];
libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the GTK+ OpenGL Extension";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs.gnome2) gtkglext;};
+ }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext;
+ inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE;
+ inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu;
+ inherit (pkgs.xorg) libXt;};
"gtkimageview" = callPackage
({ mkDerivation, array, base, containers, glib, gtk
@@ -90274,8 +93977,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 +94264,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 +95144,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 +95240,8 @@ self: {
}:
mkDerivation {
pname = "hackage-whatsnew";
- version = "0.1.1";
- sha256 = "140qsl0aqw2zg246inijifvcddmirba613as0hrg11hkd52f6fhr";
+ version = "0.1.3";
+ sha256 = "0hrpwrx4ic8hn7ziimc5a34l6y1lywkmzphb73qpk2xgl91q6gq0";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -91756,15 +95459,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 +95543,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 +95614,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 +95636,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 +95702,17 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "1.11.2";
- sha256 = "0xfhghpy0jmgmlyzc6plcg3nq26afbwp36bjjdc156rcwzsm9qyx";
+ version = "1.15.0";
+ sha256 = "13xpbwnh6xs3lj6vgqanww3ipz8bsfh3q305rkrb7kgl338nqgsm";
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 +96152,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 +96326,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.2";
+ sha256 = "0w2vhma28904mg7bymk0qd3gzwirbjkjkw862jxg2zzcnsg8m04i";
+ 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
];
@@ -92718,8 +96421,8 @@ self: {
}:
mkDerivation {
pname = "hakyll-sass";
- version = "0.2.3";
- sha256 = "08klssx4kmph3wv4hxqy1c6i6g0i6sdknmrm09p7fgvk2zsaphzb";
+ version = "0.2.4";
+ sha256 = "151c1x1ipy3759vwih3a84r6912imsqfgvkxd994dbz8jag6465m";
libraryHaskellDepends = [
aeson-pretty base data-default-class filepath hakyll hsass
];
@@ -92982,13 +96685,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 +96749,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,58 +97100,32 @@ self: {
"hapistrano" = 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.9";
- sha256 = "1jyzjj9m6vj9rlpvadaxnfxxl8ynrn8jp9xzyp3kwkzyv6cdi1ha";
- revision = "2";
- editedCabalFile = "1gfs133dm21jwv48v4wlr1dbr993fz49b9lviaahkymlv1d3j8gd";
+ 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;
}) {};
- "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
- }:
- mkDerivation {
- pname = "hapistrano";
- version = "0.3.5.10";
- sha256 = "1pkgbcpddk5ik0b1b684nnvwil68kla1w7660c1751dyhhh78ikw";
- 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;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"happindicator" = callPackage
({ mkDerivation, array, base, bytestring, containers, glib, gtk
, gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -94167,8 +97843,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 ];
@@ -94512,31 +98188,53 @@ self: {
"hasbolt" = callPackage
({ mkDerivation, base, binary, bytestring, connection, containers
- , data-binary-ieee754, data-default, hex, network, text
- , transformers
+ , data-binary-ieee754, data-default, hex, hspec, network
+ , QuickCheck, text, transformers
}:
mkDerivation {
pname = "hasbolt";
- version = "0.1.3.0";
- sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx";
- revision = "2";
- editedCabalFile = "1isygckkasffk06bd6023imr51c7l9cdvk4vf2vgv9x10v8kpp37";
+ version = "0.1.3.1";
+ sha256 = "0d6prk5fav5l0d4j0ndinn3szimy02dmayx997z5yg6yb5ix3lai";
libraryHaskellDepends = [
base binary bytestring connection containers data-binary-ieee754
- data-default hex network text transformers
+ data-default network text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers hex hspec QuickCheck text
];
description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hasbolt_0_1_3_2" = callPackage
+ ({ mkDerivation, base, binary, bytestring, connection, containers
+ , data-binary-ieee754, data-default, hex, hspec, network
+ , QuickCheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "hasbolt";
+ version = "0.1.3.2";
+ sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i";
+ libraryHaskellDepends = [
+ base binary bytestring connection containers data-binary-ieee754
+ data-default network text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers hex hspec QuickCheck text
+ ];
+ description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hasbolt-extras" = callPackage
({ mkDerivation, base, containers, free, hasbolt, lens, mtl
, neat-interpolation, template-haskell, text, th-lift-instances
}:
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 +98517,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;
@@ -95337,6 +99033,8 @@ self: {
pname = "haskell-awk";
version = "1.1.1";
sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd";
+ revision = "1";
+ editedCabalFile = "1rrplmf2n4vkwisi367gi4a6yyh0ri2sdjqmdix7xyvfdad7m9cb";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -95370,6 +99068,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 +99255,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 ];
@@ -95566,6 +99319,7 @@ self: {
testHaskellDepends = [ base eigen vector ];
description = "Some utility functions for haskell-eigen library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-exp-parser" = callPackage
@@ -95690,37 +99444,32 @@ self: {
"haskell-gi" = callPackage
({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
- , directory, doctest, filepath, glib, gobjectIntrospection
+ , directory, doctest, filepath, glib, gobject-introspection
, haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
, text, transformers, xdg-basedir, xml-conduit
}:
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
- ];
+ libraryPkgconfigDepends = [ glib gobject-introspection ];
testHaskellDepends = [ base doctest process ];
description = "Generate Haskell bindings for GObject Introspection capable libraries";
license = stdenv.lib.licenses.lgpl21;
}) {inherit (pkgs) glib;
- inherit (pkgs.gnome3) gobjectIntrospection;};
+ inherit (pkgs.gnome3) gobject-introspection;};
"haskell-gi-base" = callPackage
({ 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";
@@ -95801,8 +99550,8 @@ self: {
}:
mkDerivation {
pname = "haskell-igraph";
- version = "0.7.0";
- sha256 = "139qicfqg2m6jl3r7lbs2wcp1bvra3rp0vgb7ghafj2k70i0vddv";
+ version = "0.7.1";
+ sha256 = "16sx8sx3dky6zlwhnf3fyrkcqzwrnf94hd1wfj087bgb36hxsavp";
libraryHaskellDepends = [
base bytestring cereal colour conduit containers data-ordlist hxt
primitive singletons split
@@ -95816,7 +99565,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 +99623,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 +99662,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 +99670,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 +99730,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 +99830,8 @@ self: {
}:
mkDerivation {
pname = "haskell-names";
- version = "0.9.2";
- sha256 = "1gfqyh0lgi4n20dmh6pavxixy3flw385fp2iisks99l30nzn0kyv";
+ version = "0.9.5";
+ sha256 = "0j1snakldb29v8786licz4k2b92pbdbxhxgyz22rvjypdxyhaa7h";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers data-lens-light filepath
@@ -96165,6 +99912,7 @@ self: {
];
description = "Manage nix overrides for haskell packages";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-packages" = callPackage
@@ -96287,6 +100035,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 +100183,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
@@ -96455,6 +100202,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "haskell-src-exts_1_21_0" = callPackage
+ ({ 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.21.0";
+ sha256 = "1wwzd6m5mm76fq7ql7k49b7ghg8ibq5qhqr3d8xs5psfha3w3nlm";
+ libraryHaskellDepends = [ array base ghc-prim pretty ];
+ libraryToolDepends = [ happy ];
+ testHaskellDepends = [
+ base containers directory filepath mtl pretty-show smallcheck tasty
+ tasty-golden tasty-smallcheck
+ ];
+ doCheck = false;
+ description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskell-src-exts-observe" = callPackage
({ mkDerivation, base, haskell-src-exts, Hoed }:
mkDerivation {
@@ -96530,8 +100298,8 @@ self: {
}:
mkDerivation {
pname = "haskell-src-exts-util";
- version = "0.2.3";
- sha256 = "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8";
+ version = "0.2.4";
+ sha256 = "1xbf28aisqizy3a0sy42p3rwib2s7jaqi6dcr6lp4b1j54xazf5y";
libraryHaskellDepends = [
base containers data-default haskell-src-exts semigroups
transformers uniplate
@@ -96549,6 +100317,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
];
@@ -96577,6 +100347,20 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskell-stack-trace-plugin" = callPackage
+ ({ mkDerivation, base, ghc }:
+ mkDerivation {
+ pname = "haskell-stack-trace-plugin";
+ version = "0.1.0.0";
+ sha256 = "0rg920cc9l7vn29w10hdy68aw4jaxr64h3nxs8jb738h0n23bf50";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ghc ];
+ executableHaskellDepends = [ base ];
+ description = "haskell-stack-trace-plugin";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"haskell-time-range" = callPackage
({ mkDerivation, base, doctest, lens, semigroups, text, time }:
mkDerivation {
@@ -96761,6 +100545,7 @@ self: {
];
description = "Command-line frontend for Haskell-tools Refact";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-tools-daemon" = callPackage
@@ -96794,6 +100579,7 @@ self: {
];
description = "Background process for Haskell-tools that editors can connect to";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskell-tools-debug" = callPackage
@@ -97748,34 +101534,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.4";
+ sha256 = "0hpabz26wyxvpkvc2xv1xscmbvn0yfj2nnd41ysaf4xgfnh4c9sw";
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 unordered-containers 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 +101588,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.5";
+ sha256 = "1c0nms9q9x0fsg1hkn5kz8jpal79b0143yca156nb563bdlx0pfd";
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 +101658,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.9.1";
+ sha256 = "099fng9wy9qhcxn14m1mlpq004bl51xas3rk6jkspqv32d4rr6zs";
+ 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 +101906,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,16 +101932,284 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hasktorch" = callPackage
+ ({ mkDerivation, backprop, base, dimensions, generic-lens
+ , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-ffi-thc
+ , hasktorch-indef, hasktorch-signatures-partial, hasktorch-types-th
+ , hasktorch-types-thc, hspec, microlens-platform, monad-loops, mtl
+ , QuickCheck, safe-exceptions, singletons, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "hasktorch";
+ version = "0.0.1.0";
+ sha256 = "10lmas8x4nk7z7phxj1a2bhzjz7qhbmy472f9j584mbagvklfkmc";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base dimensions hasktorch-ffi-th hasktorch-ffi-thc hasktorch-indef
+ hasktorch-signatures-partial hasktorch-types-th hasktorch-types-thc
+ safe-exceptions singletons text
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ backprop base dimensions generic-lens ghc-typelits-natnormalise
+ hspec microlens-platform monad-loops mtl QuickCheck singletons time
+ transformers
+ ];
+ doHaddock = false;
+ description = "Torch for tensors and neural networks in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ 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.1";
+ sha256 = "0yygx1w7i9mnyxrqzz94vrni5y7rkn92yycax7rqg2r5cds2xb6g";
+ revision = "1";
+ editedCabalFile = "07y9iwmxyvixbvy3mmyxrk95kh8nycazqzv5449pfx2rvry6m6ph";
+ 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;
+ }) {};
+
+ "hasktorch-ffi-tests" = callPackage
+ ({ mkDerivation, base, hasktorch-types-th, hspec, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "hasktorch-ffi-tests";
+ version = "0.0.1.0";
+ sha256 = "0850v3wqf0x5hkk5py7k1glh591p59fs1y1kn2jf2giqmy05qzlc";
+ revision = "1";
+ editedCabalFile = "0jpymss55rj2kmfnp3gv5idlvsg0ckh7pfsm5rmfq9hvisivbv9q";
+ libraryHaskellDepends = [
+ base hasktorch-types-th hspec QuickCheck text
+ ];
+ description = "Testing library for Hasktorch's FFI bindings";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hasktorch-ffi-th" = callPackage
+ ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests
+ , hasktorch-types-th, hspec, inline-c, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "hasktorch-ffi-th";
+ version = "0.0.1.0";
+ sha256 = "10gdvkwcjjzmrvmlz8vf823ja1jpab1nrph5lq46fcz8nqycsjq0";
+ libraryHaskellDepends = [ base hasktorch-types-th inline-c text ];
+ librarySystemDepends = [ ATen ];
+ libraryToolDepends = [ c2hs ];
+ testHaskellDepends = [
+ base hasktorch-ffi-tests hasktorch-types-th hspec QuickCheck text
+ ];
+ description = "Bindings to Torch";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {ATen = null;};
+
+ "hasktorch-ffi-thc" = callPackage
+ ({ mkDerivation, ATen, base, c2hs, hasktorch-ffi-tests
+ , hasktorch-ffi-th, hasktorch-types-th, hasktorch-types-thc, hspec
+ , inline-c, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "hasktorch-ffi-thc";
+ version = "0.0.1.0";
+ sha256 = "0l3xvhdyn2dzw999fbhihl20s3q01r5vp247d0rh27zvyszg7l3y";
+ libraryHaskellDepends = [
+ base hasktorch-types-th hasktorch-types-thc inline-c text
+ ];
+ librarySystemDepends = [ ATen ];
+ libraryToolDepends = [ c2hs ];
+ testHaskellDepends = [
+ base hasktorch-ffi-tests hasktorch-ffi-th hasktorch-types-th
+ hasktorch-types-thc hspec QuickCheck text
+ ];
+ description = "Bindings to Cutorch";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {ATen = null;};
+
+ "hasktorch-indef" = callPackage
+ ({ mkDerivation, backprop, base, containers, deepseq, dimensions
+ , ghc-typelits-natnormalise, hasktorch-ffi-th, hasktorch-signatures
+ , hasktorch-signatures-partial, hasktorch-signatures-support
+ , hasktorch-types-th, hspec, managed, mtl, QuickCheck
+ , safe-exceptions, singletons, text, transformers, vector
+ }:
+ mkDerivation {
+ pname = "hasktorch-indef";
+ version = "0.0.1.0";
+ sha256 = "0xmz7jid3sg3d2b4q1051fs7g0fljgvqxqwhzhd4g85fx7zr5nk3";
+ libraryHaskellDepends = [
+ backprop base containers deepseq dimensions
+ ghc-typelits-natnormalise hasktorch-ffi-th hasktorch-signatures
+ hasktorch-signatures-partial hasktorch-signatures-support
+ hasktorch-types-th managed mtl safe-exceptions singletons text
+ transformers vector
+ ];
+ testHaskellDepends = [
+ backprop base dimensions ghc-typelits-natnormalise hasktorch-ffi-th
+ hasktorch-types-th hspec mtl QuickCheck singletons text
+ transformers
+ ];
+ doHaddock = false;
+ description = "Core Hasktorch abstractions wrapping FFI bindings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasktorch-signatures" = callPackage
+ ({ mkDerivation, base, hasktorch-ffi-th, hasktorch-ffi-thc
+ , hasktorch-signatures-partial, hasktorch-signatures-support
+ , hasktorch-signatures-types, hasktorch-types-th
+ , hasktorch-types-thc
+ }:
+ mkDerivation {
+ pname = "hasktorch-signatures";
+ version = "0.0.1.0";
+ sha256 = "1p8c3h0naqcbjxb3jbiss9zgfyg0hj0wcb6qlid6kwy925i4cyk1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base hasktorch-signatures-partial hasktorch-signatures-support
+ hasktorch-signatures-types hasktorch-types-th hasktorch-types-thc
+ ];
+ executableHaskellDepends = [
+ base hasktorch-ffi-th hasktorch-ffi-thc hasktorch-types-th
+ hasktorch-types-thc
+ ];
+ doHaddock = false;
+ description = "Backpack signatures for Tensor operations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasktorch-signatures-partial" = callPackage
+ ({ mkDerivation, base, hasktorch-signatures-types
+ , hasktorch-types-th
+ }:
+ mkDerivation {
+ pname = "hasktorch-signatures-partial";
+ version = "0.0.1.0";
+ sha256 = "12dc5i4818j4q09mdshygz16zq1zyp32k6c1imgp9dl6bl4l05ss";
+ libraryHaskellDepends = [
+ base hasktorch-signatures-types hasktorch-types-th
+ ];
+ description = "Functions to partially satisfy tensor signatures";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasktorch-signatures-support" = callPackage
+ ({ mkDerivation, base, hasktorch-signatures-types
+ , hasktorch-types-th
+ }:
+ mkDerivation {
+ pname = "hasktorch-signatures-support";
+ version = "0.0.1.0";
+ sha256 = "1vfmpsmgak4ifhpqh15ycf01p8l3a5qas3m7lkg09y8mqimwq5hh";
+ libraryHaskellDepends = [
+ base hasktorch-signatures-types hasktorch-types-th
+ ];
+ doHaddock = false;
+ description = "Signatures for support tensors in hasktorch";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "hasktorch-signatures-types" = callPackage
+ ({ mkDerivation, base, deepseq }:
+ mkDerivation {
+ pname = "hasktorch-signatures-types";
+ version = "0.0.1.0";
+ sha256 = "0zaa0ihgbsiwqla46dixmxki75miy5dz91agvvd147rmr2khx1j2";
+ revision = "1";
+ editedCabalFile = "0da2sv2cahv05cymh4285s35y4b6snrab62zaibnnqbd0nk55qka";
+ libraryHaskellDepends = [ base deepseq ];
+ doHaddock = false;
+ description = "Core types for Hasktorch backpack signatures";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hasktorch-types-th" = callPackage
+ ({ mkDerivation, base, c2hs, inline-c }:
+ mkDerivation {
+ pname = "hasktorch-types-th";
+ version = "0.0.1.0";
+ sha256 = "0irlf1lvadnr3j3zjakvkvrwdw8gpg5smk69w9l54idwsi6yvhdd";
+ revision = "1";
+ editedCabalFile = "0zgz7l8nawpjrc4p43xxfh9brl0mpszdxgahsn9977q5z08h4wnd";
+ libraryHaskellDepends = [ base inline-c ];
+ libraryToolDepends = [ c2hs ];
+ description = "C-types for Torch";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hasktorch-types-thc" = callPackage
+ ({ mkDerivation, base, c2hs, hasktorch-types-th, inline-c }:
+ mkDerivation {
+ pname = "hasktorch-types-thc";
+ version = "0.0.1.0";
+ sha256 = "06jxjn9s34myy4v8ad42xqmkyad5qraj99a3vpcxfagjxwcn4hbd";
+ libraryHaskellDepends = [ base hasktorch-types-th inline-c ];
+ libraryToolDepends = [ c2hs ];
+ description = "C-types for Cutorch";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "hasktorch-zoo" = callPackage
+ ({ mkDerivation, backprop, base, deepseq, dimensions, directory
+ , filepath, generic-lens, ghc-typelits-natnormalise, hashable
+ , hasktorch, JuicyPixels, microlens, mtl, mwc-random, primitive
+ , safe-exceptions, singletons, transformers, vector
+ }:
+ mkDerivation {
+ pname = "hasktorch-zoo";
+ version = "0.0.1.0";
+ sha256 = "1cpk2q1m68y7wljaki1d4a4y45hqh34ia8r6zfw0b62f9b6zihjm";
+ libraryHaskellDepends = [
+ backprop base deepseq dimensions directory filepath generic-lens
+ ghc-typelits-natnormalise hashable hasktorch JuicyPixels microlens
+ mtl mwc-random primitive safe-exceptions singletons transformers
+ vector
+ ];
+ description = "Neural architectures in hasktorch";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskus-binary" = callPackage
({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils
- , mtl, QuickCheck, tasty, tasty-quickcheck
+ , haskus-utils-data, haskus-utils-types, mtl, QuickCheck, tasty
+ , tasty-quickcheck
}:
mkDerivation {
pname = "haskus-binary";
- version = "1.0";
- sha256 = "1gw08zx7mqhi6n0wx6s6n4fvw5ambbdxnahr3r3p22yfqnqcp4y2";
+ version = "1.1";
+ sha256 = "1kva6wsxybd9hj9ml2ykzcfcsh83fcwqdv3gyp702rnk53q9r8r5";
libraryHaskellDepends = [
- base bytestring cereal haskus-utils mtl
+ base bytestring cereal haskus-utils haskus-utils-data
+ haskus-utils-types mtl
];
testHaskellDepends = [
base bytestring haskus-utils QuickCheck tasty tasty-quickcheck
@@ -98164,8 +102248,8 @@ self: {
}:
mkDerivation {
pname = "haskus-utils";
- version = "1.0";
- sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd";
+ version = "1.3";
+ sha256 = "0gcwnhh3s3cmn7rwd31rs9rqmdpdhwk1la1pf56pcr10dy5iqbs4";
libraryHaskellDepends = [
base containers extra file-embed haskus-utils-data
haskus-utils-types haskus-utils-variant list-t mtl
@@ -98184,8 +102268,10 @@ self: {
}:
mkDerivation {
pname = "haskus-utils-data";
- version = "1.0";
- sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4";
+ version = "1.1";
+ sha256 = "1001apph6i956rkb6dpfhg8cgk870s44jgaaiv8ccxivkv45y7di";
+ revision = "2";
+ editedCabalFile = "0ahwmqlbpvgsd6c5rzq97q00ygsw69k4hvs46f5v20100cdj3496";
libraryHaskellDepends = [
base containers extra haskus-utils-types mtl recursion-schemes
transformers
@@ -98198,24 +102284,29 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "haskus-utils-types";
- version = "1.0";
- sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf";
+ version = "1.3";
+ sha256 = "06zfc5ivj7zx1c6inc3xkw9b3p62b2x7dr24fp1s59c9yfrihg1a";
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, transformers
+ }:
mkDerivation {
pname = "haskus-utils-variant";
- version = "1.0";
- sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn";
+ version = "2.4";
+ sha256 = "13yqyz1jb4qkdzjxwkpc9s2636disxldja49wmah7h71kd2sqn9r";
libraryHaskellDepends = [
- base haskus-utils-data haskus-utils-types
+ base haskus-utils-data haskus-utils-types template-haskell
+ transformers
];
- description = "Haskus utility modules";
+ testHaskellDepends = [ base tasty tasty-quickcheck ];
+ description = "Variant and EADT";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haskyapi" = callPackage
@@ -98292,8 +102383,10 @@ self: {
}:
mkDerivation {
pname = "hasmin";
- version = "1.0.2";
- sha256 = "13cblc4jcn88w00rsb72dqhiy18mfph388407vm3k6kbg5zxg1d9";
+ version = "1.0.2.1";
+ sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb";
+ revision = "1";
+ editedCabalFile = "05naxdaglbz8grzz399dkra9y3f1k75661397flbgrwbxkyadz2z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -98349,6 +102442,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
@@ -98951,6 +103046,7 @@ self: {
];
description = "A truth table generator for classical propositional logic";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haven" = callPackage
@@ -99055,8 +103151,8 @@ self: {
}:
mkDerivation {
pname = "haxl";
- version = "2.0.1.0";
- sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd";
+ version = "2.0.1.1";
+ sha256 = "1wfnwi3impv4cv359a65yh50c6kdfxhvbwycf5h76w3cvqdhvwsr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -99476,6 +103572,7 @@ self: {
];
description = "Third-party extensions to hbro";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hburg" = callPackage
@@ -99616,6 +103713,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hcobs" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, containers
+ , criterion, deepseq, ghc-prim, hedgehog, mmorph, mtl, reflection
+ , weigh
+ }:
+ mkDerivation {
+ pname = "hcobs";
+ version = "0.1.0.1";
+ sha256 = "103x2486yb0p9bxwhd8ywhr59pgnkgyr4z70bsv6xcs54g0zqdy7";
+ libraryHaskellDepends = [
+ base bytestring containers ghc-prim reflection
+ ];
+ testHaskellDepends = [
+ base base64-bytestring bytestring deepseq ghc-prim hedgehog mmorph
+ mtl reflection weigh
+ ];
+ benchmarkHaskellDepends = [
+ base base64-bytestring bytestring criterion ghc-prim reflection
+ ];
+ description = "An implementation of the Consistent Overhead Byte Stuffing algorithm";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hcom" = callPackage
({ mkDerivation }:
mkDerivation {
@@ -99964,6 +104084,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 +104171,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 +104325,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 +104516,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
@@ -100403,6 +104579,8 @@ self: {
pname = "hedgehog-fn";
version = "0.6";
sha256 = "0xi1y2cv2kkyxav261qaw9a4r4q8ng91187bdwi4rqlpp9zvc0pv";
+ revision = "1";
+ editedCabalFile = "19v7amg8l6s1gadnya8nxkcbi0vd3wqc7h6gvqvs099qaqm7zbb1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -100443,8 +104621,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;
@@ -100454,54 +104632,27 @@ 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
+ , resource-pool, scanner, stm, test-framework, test-framework-hunit
+ , text, time, tls, unordered-containers, vector
}:
mkDerivation {
pname = "hedis";
- version = "0.10.3";
- sha256 = "0wapsg0amlmzayphchng67ih3ivp0mk3vgi8x1mzrkd1xrlgav3v";
+ version = "0.10.10";
+ sha256 = "0hbjhccipvg2i1cyinvhlk4jgscam9y5897ib1fh6rc0qwnlblhs";
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
+ async base bytestring doctest HUnit mtl 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
- , test-framework-hunit, text, time, tls, unordered-containers
- , vector
- }:
- mkDerivation {
- pname = "hedis";
- version = "0.10.4";
- sha256 = "1xsa6wgakmjhwz9s9fybbwsx6gxy6630bqyrai0sb4vmd9lnbxfx";
- 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;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"hedis-config" = callPackage
({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
, time
@@ -100609,8 +104760,8 @@ self: {
}:
mkDerivation {
pname = "hedn";
- version = "0.1.9.0";
- sha256 = "077wf446x0rrac3bdzmyhpacb54smx02msdz45cra3yzn3n0rq7l";
+ version = "0.1.9.1";
+ sha256 = "0ynajgg5kl37rv72408hg5jiypy6vmzazqxa58405knb49h0gvvz";
libraryHaskellDepends = [
attoparsec base base-compat bytestring containers deepseq mtl
scientific stringsearch text time time-locale-compat utf8-string
@@ -100646,17 +104797,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 +104825,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;
@@ -101249,6 +105402,7 @@ self: {
];
description = "A command-line manager for delicious kitchen recipes";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hero-club-five-tenets" = callPackage
@@ -101504,6 +105658,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 +105825,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 +106064,28 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hfann" = callPackage
({ mkDerivation, base, doublefann, fann }:
mkDerivation {
@@ -101980,10 +106204,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
];
@@ -102165,33 +106387,31 @@ self: {
"hgeometry" = callPackage
({ mkDerivation, aeson, approximate-equality, array, base
, bifunctors, bytestring, colour, containers, contravariant
- , criterion, data-clist, deepseq, deepseq-generics, dlist, doctest
- , fingertree, fixed-vector, hexpat, hspec, hspec-discover, lens
- , linear, mtl, optparse-applicative, parsec, QuickCheck
- , quickcheck-instances, random, reflection, semigroupoids
- , semigroups, singletons, template-haskell, text, vector, vinyl
- , yaml
+ , criterion, data-clist, deepseq, deepseq-generics, directory
+ , dlist, doctest, filepath, fingertree, fixed-vector, hexpat, hspec
+ , hspec-discover, lens, linear, mtl, optparse-applicative, parsec
+ , profunctors, QuickCheck, quickcheck-instances, random, reflection
+ , semigroupoids, semigroups, singletons, template-haskell, text
+ , vector, vinyl, yaml
}:
mkDerivation {
pname = "hgeometry";
- version = "0.7.0.0";
- sha256 = "0c91n42l6pqkdw46snhplvzm8f05x0x5g3b7mgx13ndskcf9vmyz";
- revision = "1";
- editedCabalFile = "1wjwpfiic3jbhg77qm2nzgvybnpk0h3wwpywkpfxz8sv1yhb8pa2";
+ version = "0.8.0.0";
+ sha256 = "0hypd5936kssw435lcvqj9d7whdzfdfbhvi5hhbi90k5x89xfx6f";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bifunctors bytestring colour containers contravariant
data-clist deepseq dlist fingertree fixed-vector hexpat lens linear
- mtl parsec QuickCheck quickcheck-instances random reflection
- semigroupoids semigroups singletons template-haskell text vector
- vinyl yaml
+ mtl parsec profunctors QuickCheck quickcheck-instances random
+ reflection semigroupoids semigroups singletons template-haskell
+ text vector vinyl yaml
];
testHaskellDepends = [
approximate-equality array base bytestring colour containers
- data-clist doctest hspec lens linear QuickCheck
- quickcheck-instances random semigroups singletons vector vinyl
+ data-clist directory doctest filepath hspec lens linear QuickCheck
+ quickcheck-instances random semigroups singletons vector vinyl yaml
];
testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
@@ -102243,18 +106463,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 +106525,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";
@@ -102514,19 +106734,21 @@ self: {
"hid-examples" = callPackage
({ mkDerivation, base, blaze-html, bytestring, cassava, Chart
- , Chart-diagrams, extra, fmt, hint, mtl, optparse-applicative
- , random, safe, text, time
+ , Chart-diagrams, directory, extra, filepath, fmt, hint, mtl
+ , optparse-applicative, random, safe, text, time, transformers
+ , unix-compat
}:
mkDerivation {
pname = "hid-examples";
- version = "0.2";
- sha256 = "1rp6v40z8i2slnsacw42adkqp98bg8fml573lpz9mz7ipn05gi9x";
+ version = "0.3";
+ sha256 = "11zqnmsd07zpwmw40ynhv64zqc6fl27a281rihd6yc7n68qvpz6n";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
- base blaze-html bytestring cassava Chart Chart-diagrams extra fmt
- hint mtl optparse-applicative random safe text time
+ base blaze-html bytestring cassava Chart Chart-diagrams directory
+ extra filepath fmt hint mtl optparse-applicative random safe text
+ time transformers unix-compat
];
description = "Examples to accompany the book \"Haskell in Depth\"";
license = stdenv.lib.licenses.bsd3;
@@ -102700,8 +106922,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 +107121,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 +107463,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
}:
@@ -103279,24 +107522,24 @@ self: {
"hinterface" = callPackage
({ mkDerivation, array, async, base, binary, bytestring, containers
- , cryptonite, exceptions, hspec, lifted-async, lifted-base, memory
- , monad-control, monad-logger, mtl, network, QuickCheck, random
- , resourcet, safe-exceptions, stm, text, transformers
+ , cryptonite, deepseq, exceptions, hspec, lifted-async, lifted-base
+ , memory, monad-control, monad-logger, mtl, network, QuickCheck
+ , random, resourcet, safe-exceptions, stm, text, transformers
, transformers-base, vector
}:
mkDerivation {
pname = "hinterface";
- version = "0.5.0.2";
- sha256 = "1ib8wnpkd8ng6w0wb8hhn1122rqdq4q961b10rvw4jl6bfzkwasb";
+ version = "0.8.0";
+ sha256 = "1mzq87sdcx50i67kf2lv5wg0k6ahxf1x2qxvi41dnaxkjjl1vcmr";
libraryHaskellDepends = [
- array async base binary bytestring containers cryptonite exceptions
- lifted-async lifted-base memory monad-control monad-logger mtl
- network QuickCheck random resourcet safe-exceptions stm text
- transformers transformers-base vector
+ array async base binary bytestring containers cryptonite deepseq
+ exceptions lifted-async lifted-base memory monad-control
+ monad-logger mtl network QuickCheck random resourcet
+ safe-exceptions stm text transformers transformers-base vector
];
testHaskellDepends = [
async base binary bytestring hspec monad-logger QuickCheck
- transformers
+ transformers vector
];
description = "Haskell / Erlang interoperability library";
license = stdenv.lib.licenses.bsd3;
@@ -103597,8 +107840,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 +108027,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 +108073,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 +108205,55 @@ 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
- , 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
+ , bytestring, cmdargs, containers, criterion, data-default, Decimal
+ , Diff, directory, easytest, file-embed, filepath, hashable
+ , haskeline, here, hledger-lib, html, lucid, math-functions
+ , 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
}:
mkDerivation {
pname = "hledger";
- version = "1.10";
- sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n";
+ version = "1.12.1";
+ sha256 = "1b9zvlrhrzg0rvk90ac1z8n8sfhdx070l8hy3sg25nbcsqxzd51w";
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 math-functions
+ 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
];
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 math-functions 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
];
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 math-functions 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
];
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
- 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
+ containers criterion data-default Decimal directory easytest
+ file-embed filepath haskeline here hledger-lib html math-functions
+ 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
];
description = "Command-line interface for the hledger accounting tool";
license = stdenv.lib.licenses.gpl3;
@@ -104020,8 +108268,8 @@ self: {
}:
mkDerivation {
pname = "hledger-api";
- version = "1.10";
- sha256 = "1axcpipq6m4r9bh2633j7l88pc4ax8ycb2q0wivhfq2dp1pbylbf";
+ version = "1.12";
+ sha256 = "0vl4ag5r58zag8djihmdlj9apqrvczjn51qfizs366wprdppdxax";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -104068,15 +108316,15 @@ self: {
"hledger-iadd" = callPackage
({ mkDerivation, base, brick, containers, directory, free
- , hledger-lib, hspec, megaparsec, microlens, microlens-th
- , optparse-applicative, QuickCheck, semigroups, text, text-zipper
- , time, transformers, unordered-containers, vector, vty
- , xdg-basedir
+ , hledger-lib, hspec, hspec-discover, megaparsec, microlens
+ , microlens-th, optparse-applicative, QuickCheck, semigroups, text
+ , text-zipper, time, transformers, unordered-containers, vector
+ , vty, xdg-basedir
}:
mkDerivation {
pname = "hledger-iadd";
- version = "1.3.6";
- sha256 = "04gy5pvbcgkr3jg1a2dav3kcd7ih46knn0d39l8670bmwhx3y5br";
+ version = "1.3.7";
+ sha256 = "1x80f427mvgak1jz8mc7zmx4fz801dwxvij9zy93jw2h4yf7a16b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -104094,8 +108342,10 @@ self: {
base free hledger-lib hspec megaparsec QuickCheck text text-zipper
time transformers vector
];
+ testToolDepends = [ hspec-discover ];
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 +108353,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 +108380,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.12";
+ sha256 = "1m38r9z6ccdxhl54k8x9drbfmj1l9hy8mnb7cj4bwprpz4xx15bh";
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 +108419,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.12.1";
+ sha256 = "0ifyp2kawi4x0slnv5gkcgn8v6vx6d9q56x6zjpfzslajqfwfk8y";
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 +108462,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.12";
+ sha256 = "14n3qhdr95nfgczw05dki2wy26k86z1h0li8md1bglch4j9fjs36";
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 ];
@@ -104295,8 +108546,8 @@ self: {
({ mkDerivation, base, Cabal, directory, hspec, libsass }:
mkDerivation {
pname = "hlibsass";
- version = "0.1.7.0";
- sha256 = "0vcz3hndksfp9rmz07y67rvqinaz7cxzvrhjcwy30wc79m25r9v2";
+ version = "0.1.8.0";
+ sha256 = "1ssgvr0jvl79k1vckp5nq2zw6mx8l4xasydymzjwmhg0fl99mpi6";
configureFlags = [ "-fexternalLibsass" ];
setupHaskellDepends = [ base Cabal directory ];
libraryHaskellDepends = [ base ];
@@ -104315,8 +108566,8 @@ self: {
}:
mkDerivation {
pname = "hlint";
- version = "2.1.10";
- sha256 = "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w";
+ version = "2.1.12";
+ sha256 = "1d3gbvjs7zg9n4fbj2b3c5wn5xf2idygx9cqjdbmgndk3jic9rbx";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -104409,8 +108660,8 @@ self: {
}:
mkDerivation {
pname = "hlrdb-core";
- version = "0.1.2.0";
- sha256 = "1j3ds4kkr1ns7y46b3s29bhi63n31ggvcq4mlyp2xafw2z4nbyl3";
+ version = "0.1.2.2";
+ sha256 = "0qh4p354xzmcd6d6imv9qyflxj9g80rmbdyhf9bscjrqam0dy24b";
libraryHaskellDepends = [
base bytestring hashable hedis lens mtl profunctors random time
unordered-containers
@@ -104505,6 +108756,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
@@ -104540,7 +108793,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "hmatrix-backprop_0_1_2_4" = callPackage
+ "hmatrix-backprop_0_1_2_5" = callPackage
({ mkDerivation, backprop, base, finite-typelits
, ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
, hmatrix, hmatrix-vector-sized, microlens, microlens-platform
@@ -104548,8 +108801,8 @@ self: {
}:
mkDerivation {
pname = "hmatrix-backprop";
- version = "0.1.2.4";
- sha256 = "0v3xx72928pwfr9ki01apgqyc3dh1qakr9y6swiiwmgm7ms7qn6a";
+ version = "0.1.2.5";
+ sha256 = "1m6imvvcg8cjlqlcj2qhk5k0g88w853mw9r2mky54rmxfd86xfsf";
libraryHaskellDepends = [
backprop base ghc-typelits-knownnat ghc-typelits-natnormalise
hmatrix hmatrix-vector-sized microlens vector vector-sized vinyl
@@ -104681,8 +108934,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";
@@ -104691,17 +108944,17 @@ self: {
}) {};
"hmatrix-quadprogpp" = callPackage
- ({ mkDerivation, base, hmatrix, quadprog, vector }:
+ ({ mkDerivation, base, hmatrix, QuadProgpp, vector }:
mkDerivation {
pname = "hmatrix-quadprogpp";
version = "0.4.0.0";
sha256 = "0bvgph7x5niryn4f1ah6726np2nv8xnrvqn3hbiw8f5m7314iv5l";
libraryHaskellDepends = [ base hmatrix vector ];
- librarySystemDepends = [ quadprog ];
+ librarySystemDepends = [ QuadProgpp ];
description = "Bindings to the QuadProg++ quadratic programming library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {quadprog = null;};
+ }) {inherit (pkgs) QuadProgpp;};
"hmatrix-repa" = callPackage
({ mkDerivation, base, hmatrix, repa, vector }:
@@ -104786,8 +109039,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 +109079,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
@@ -104834,14 +109088,15 @@ self: {
}:
mkDerivation {
pname = "hmatrix-vector-sized";
- version = "0.1.1.0";
- sha256 = "079vq2n3w3f32dnlyxa8kn6dif0dd6nr8n1g9lnfw0d339cxqklb";
+ version = "0.1.1.2";
+ sha256 = "0zj31xm0d2d7bzky9qxxs5jb5snjivdjknghpwmf8s1b85zim646";
libraryHaskellDepends = [ base hmatrix vector vector-sized ];
testHaskellDepends = [
base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized
];
description = "Conversions between hmatrix and vector-sized types";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hmeap" = callPackage
@@ -104977,17 +109232,18 @@ self: {
"hmm-hmatrix" = callPackage
({ mkDerivation, array, base, containers, deepseq
- , explicit-exception, hmatrix, lazy-csv, non-empty, random
- , semigroups, transformers, utility-ht
+ , explicit-exception, hmatrix, lazy-csv, non-empty, QuickCheck
+ , random, semigroups, transformers, utility-ht
}:
mkDerivation {
pname = "hmm-hmatrix";
- version = "0.1";
- sha256 = "1ww2hxy9s9d2mywf5v5ka5fac9105ir3frm9vafgw2ydq64rdivx";
+ version = "0.1.1";
+ sha256 = "0vgsln8nskyqppjmd2c8mypq1922a2mxbihp4kz29naqzckh0hdh";
libraryHaskellDepends = [
array base containers deepseq explicit-exception hmatrix lazy-csv
- non-empty random semigroups transformers utility-ht
+ non-empty QuickCheck random semigroups transformers utility-ht
];
+ testHaskellDepends = [ base QuickCheck ];
description = "Hidden Markov Models using HMatrix primitives";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -105202,7 +109458,7 @@ self: {
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base ];
- license = stdenv.lib.licenses.unfree;
+ license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -105289,8 +109545,8 @@ self: {
}:
mkDerivation {
pname = "hoauth2";
- version = "1.7.2";
- sha256 = "0klkgr11p8m03ksrad59pqs0czp6hrgmzxynng4zirbmz643plvf";
+ version = "1.8.3";
+ sha256 = "1mx0ifkcji8d30f4ar50jraj1sz91n6v803yfb4zaj9wppw2iz57";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -105595,6 +109851,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;
@@ -105756,21 +110014,28 @@ self: {
"homplexity" = callPackage
({ mkDerivation, base, containers, cpphs, deepseq, directory
- , filepath, happy, haskell-src-exts, hflags, template-haskell
- , uniplate
+ , filepath, happy, haskell-src-exts, hflags, pqueue
+ , template-haskell, uniplate
}:
mkDerivation {
pname = "homplexity";
- version = "0.4.3.4";
- sha256 = "1rrv9p5wyh2nr817s8h7figfd56nnai6v018j039vqn18qbhlqj9";
- isLibrary = false;
+ version = "0.4.4.4";
+ sha256 = "14kzfaldbycwz8hwrmb4ig2nba9pxh808qqvl2djmsxqpcjq593k";
+ isLibrary = true;
isExecutable = true;
+ libraryHaskellDepends = [
+ base containers cpphs deepseq directory filepath haskell-src-exts
+ hflags pqueue template-haskell uniplate
+ ];
+ libraryToolDepends = [ happy ];
executableHaskellDepends = [
base containers cpphs deepseq directory filepath haskell-src-exts
hflags template-haskell uniplate
];
- executableToolDepends = [ happy ];
- testHaskellDepends = [ base haskell-src-exts uniplate ];
+ testHaskellDepends = [
+ base containers cpphs deepseq directory filepath haskell-src-exts
+ hflags pqueue template-haskell uniplate
+ ];
description = "Haskell code quality tool";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -106095,24 +110360,24 @@ self: {
"hoogle" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit
, conduit-extra, connection, containers, deepseq, directory, extra
- , filepath, haskell-src-exts, http-conduit, http-types, js-flot
- , js-jquery, mmap, network, network-uri, old-locale, process-extras
- , QuickCheck, resourcet, storable-tuple, tar, template-haskell
- , text, time, transformers, uniplate, utf8-string, vector, wai
- , wai-logger, warp, warp-tls, zlib
+ , filepath, foundation, hashable, haskell-src-exts, http-conduit
+ , http-types, js-flot, js-jquery, mmap, network-uri, old-locale
+ , process-extras, QuickCheck, resourcet, storable-tuple, tar
+ , template-haskell, text, time, transformers, uniplate, utf8-string
+ , vector, wai, wai-logger, warp, warp-tls, zlib
}:
mkDerivation {
pname = "hoogle";
- version = "5.0.17.3";
- sha256 = "174gp41v0krzj37m75pnr3aawyhkbk2wq4q6zk2z3zh0avvvmgk6";
+ version = "5.0.17.4";
+ sha256 = "059dys3vlbxpd4kx1nrjib1ww9rqkk9am3gdsy3d8vl0fxx2p6s9";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base binary bytestring cmdargs conduit conduit-extra
- connection containers deepseq directory extra filepath
- haskell-src-exts http-conduit http-types js-flot js-jquery mmap
- network network-uri old-locale process-extras QuickCheck resourcet
+ connection containers deepseq directory extra filepath foundation
+ hashable haskell-src-exts http-conduit http-types js-flot js-jquery
+ mmap network-uri old-locale process-extras QuickCheck resourcet
storable-tuple tar template-haskell text time transformers uniplate
utf8-string vector wai wai-logger warp warp-tls zlib
];
@@ -106162,8 +110427,8 @@ self: {
pname = "hookup";
version = "0.2.2";
sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf";
- revision = "1";
- editedCabalFile = "1ag338856kxlywgcizqij566iaqicv4jb3kmd017k7qflq8vmwb3";
+ revision = "3";
+ editedCabalFile = "0fmnfnlcc5jg0na2723ibh26sch190s62d52g14gffh9fsl9icgy";
libraryHaskellDepends = [
attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
];
@@ -106287,17 +110552,14 @@ self: {
}) {};
"hopenssl" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest
- , HUnit, openssl
- }:
+ ({ mkDerivation, base, bytestring, HUnit, openssl }:
mkDerivation {
pname = "hopenssl";
- version = "2.2.1";
- sha256 = "1pxbs1k8sizvvz1nn1zv2i5grn0w11s9g09z07w5f80kbz0slcbh";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
+ version = "2.2.3";
+ sha256 = "0nihpm1zlb8y4bx5j429p0sybwnvz61pnd7ixcl90flwzlizr168";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ openssl ];
- testHaskellDepends = [ base doctest HUnit ];
+ testHaskellDepends = [ base bytestring HUnit ];
description = "FFI Bindings to OpenSSL's EVP Digest Interface";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -106392,8 +110654,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 +110927,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 +110943,6 @@ self: {
];
description = "simple performant time related library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hourglass-fuzzy-parsing" = callPackage
@@ -106909,18 +111151,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hpack_0_29_7" = callPackage
+ "hpack_0_31_1" = 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.1";
+ sha256 = "0fipbmmj4x588z7vh635mizhym9krydfxr49bgaf7xir4fsb4fmc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -106942,6 +111184,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 +111223,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, directory, 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.5.1";
+ sha256 = "0rgdk1jiczl4rwa66irbfcif4rvkrcyzk29lmpwr2kkqjz0zi7kk";
+ 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
+ directory 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 +111322,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 +111399,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 +111595,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 ];
@@ -107393,7 +111645,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) postgresql;};
- "hpqtypes_1_6_0_0" = callPackage
+ "hpqtypes_1_6_1_0" = callPackage
({ mkDerivation, aeson, async, base, bytestring, Cabal, containers
, data-default-class, directory, exceptions, filepath, HUnit
, lifted-base, monad-control, mtl, postgresql, QuickCheck, random
@@ -107403,10 +111655,8 @@ self: {
}:
mkDerivation {
pname = "hpqtypes";
- version = "1.6.0.0";
- sha256 = "1aydpbkp5if7416dvswiygn7vfhgg7nza9p011gld18pr9mpsf5i";
- revision = "1";
- editedCabalFile = "0jmvhnmr9d7wcknx7prbc1dc6i08afkqbgnigil6y4mvv1m0cw6p";
+ version = "1.6.1.0";
+ sha256 = "02vh9l86dnayccvfq3cqmk6gbbwyqglnpg3mhr3v72vraxymm7jn";
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [
aeson async base bytestring containers data-default-class
@@ -107433,10 +111683,8 @@ self: {
}:
mkDerivation {
pname = "hpqtypes-extras";
- version = "1.6.2.0";
- sha256 = "095kxfk12bzl7gl44fa7xmwfnx63707s1jz861hqjmi9dv3mm8kp";
- revision = "1";
- editedCabalFile = "0ifzjs8vvnb9viksgakvjz69yppppgx8iqz2pqvb2dnwjwk4hamd";
+ version = "1.6.3.0";
+ sha256 = "13360sw1nmcgvhmj2inh8v4yccrfbs5b83jfsx1q0s6cfx6z7s37";
libraryHaskellDepends = [
base base16-bytestring bytestring containers cryptohash
data-default exceptions fields-json hpqtypes lifted-base log-base
@@ -107478,6 +111726,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hprotoc_2_4_12" = callPackage
+ ({ mkDerivation, alex, array, base, binary, bytestring, containers
+ , directory, filepath, haskell-src-exts, mtl, parsec
+ , protocol-buffers, protocol-buffers-descriptor, utf8-string
+ }:
+ mkDerivation {
+ pname = "hprotoc";
+ version = "2.4.12";
+ sha256 = "0xj000ikh3y8dg5sbrl7ycb471qgra4khmk4kq079biasjvhf58a";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers directory filepath
+ haskell-src-exts mtl parsec protocol-buffers
+ protocol-buffers-descriptor utf8-string
+ ];
+ libraryToolDepends = [ alex ];
+ executableHaskellDepends = [
+ array base binary bytestring containers directory filepath
+ haskell-src-exts mtl parsec protocol-buffers
+ protocol-buffers-descriptor utf8-string
+ ];
+ executableToolDepends = [ alex ];
+ description = "Parse Google Protocol Buffer specifications";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hprotoc-fork" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
, directory, filepath, haskell-src-exts, mtl, parsec
@@ -107558,6 +111834,7 @@ self: {
libraryToolDepends = [ c2hs ];
description = "Haskell bindings for libpuz";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hpygments" = callPackage
@@ -107610,21 +111887,19 @@ self: {
"hquantlib" = callPackage
({ mkDerivation, base, containers, hmatrix, hmatrix-gsl
- , hmatrix-special, HUnit, mersenne-random-pure64, parallel
- , QuickCheck, random, statistics, test-framework
+ , hmatrix-special, hquantlib-time, HUnit, mersenne-random-pure64
+ , parallel, QuickCheck, random, statistics, test-framework
, test-framework-hunit, test-framework-quickcheck2, time, vector
, vector-algorithms
}:
mkDerivation {
pname = "hquantlib";
- version = "0.0.4.0";
- sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp";
- revision = "2";
- editedCabalFile = "1wx32kkv1as3rras5b1y3v77abx0sqsam6ssa5s7vm83pncx38y4";
+ version = "0.0.5.0";
+ sha256 = "1zi31y89kdbid3xjvpsd2iqwvn8a7d2i5518maigkmhp5v1lg0w6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers hmatrix hmatrix-gsl hmatrix-special
+ base containers hmatrix hmatrix-gsl hmatrix-special hquantlib-time
mersenne-random-pure64 parallel random statistics time vector
vector-algorithms
];
@@ -107640,6 +111915,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hquantlib-time" = callPackage
+ ({ mkDerivation, base, time }:
+ mkDerivation {
+ pname = "hquantlib-time";
+ version = "0.0.4.1";
+ sha256 = "0g2j7m14ic40lhcnbvfjya3qh7ngx658qlmrr0dzr5r1ywcyv75c";
+ libraryHaskellDepends = [ base time ];
+ description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
+ license = "LGPL";
+ }) {};
+
"hquery" = callPackage
({ mkDerivation, base, bytestring, containers, filepath, HUnit
, parsec, test-framework, test-framework-hunit, text, xmlhtml
@@ -107680,6 +111966,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 +112010,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 +112029,7 @@ self: {
];
description = "A Riemann Client for Haskell";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hruby" = callPackage
@@ -107750,8 +112039,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
@@ -107788,6 +112077,18 @@ self: {
license = "GPL";
}) {};
+ "hs-bibutils_6_7_0_0" = callPackage
+ ({ mkDerivation, base, syb }:
+ mkDerivation {
+ pname = "hs-bibutils";
+ version = "6.7.0.0";
+ sha256 = "1qfyssl76lm4g09yxr3y10kmf8cnzls46g5h0ijk0wpk9wlhbln5";
+ libraryHaskellDepends = [ base syb ];
+ description = "Haskell bindings to bibutils, the bibliography conversion utilities";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hs-blake2" = callPackage
({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
, cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
@@ -108016,17 +112317,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 +112325,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
@@ -108479,10 +112768,8 @@ self: {
}:
mkDerivation {
pname = "hs2ats";
- version = "0.3.0.3";
- sha256 = "0j8kka9n3in9ya1hndn0dpj8d1ha5ihxfrl995dwsa900z00i5yk";
- revision = "1";
- editedCabalFile = "0lx2z4zfphypmjx9m5v23lywfj2d16l6hs6ipd796g46jczc4piq";
+ version = "0.5.0.0";
+ sha256 = "0ga90mkz11iis5knd51dqpqd4qyj6fwl15nbdbwzlynpk0wsdsga";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -108561,6 +112848,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hsPID" = callPackage
+ ({ mkDerivation, base, HUnit, lens }:
+ mkDerivation {
+ pname = "hsPID";
+ version = "0.1.2";
+ sha256 = "0zyh2xbnpcfi1r93xxrki0qg0cgmc1g6wwx4hy1kn88fr9wqrgkv";
+ 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
@@ -108639,6 +112938,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hsass_0_8_0" = callPackage
+ ({ mkDerivation, base, bytestring, data-default-class, filepath
+ , hlibsass, hspec, hspec-discover, monad-loops, temporary, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "hsass";
+ version = "0.8.0";
+ sha256 = "1bnjvj6dpmcbpkbi4g5m5hvr0w5rmd7y5zkiwbqc8n9y4l2dkd5g";
+ libraryHaskellDepends = [
+ base bytestring data-default-class filepath hlibsass monad-loops
+ transformers
+ ];
+ testHaskellDepends = [
+ base bytestring data-default-class hspec hspec-discover temporary
+ text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Integrating Sass into Haskell applications";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hsay" = callPackage
({ mkDerivation, base, Hclip, HTTP, process, unix }:
mkDerivation {
@@ -108771,19 +113093,25 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hsc3" = callPackage
@@ -109211,6 +113539,87 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hschema" = callPackage
+ ({ mkDerivation, base, comonad, contravariant, free, hashable
+ , invariant, lens, mtl, natural-transformation, profunctors, text
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "hschema";
+ version = "0.0.1.1";
+ sha256 = "1s454yizymjnn7hcl5vxbqifx1g7k7sw4qrzgns5gjnhgiswy61j";
+ libraryHaskellDepends = [
+ base comonad contravariant free hashable invariant lens mtl
+ natural-transformation profunctors text unordered-containers vector
+ ];
+ description = "Describe schemas for your Haskell data types";
+ license = stdenv.lib.licenses.lgpl3;
+ }) {};
+
+ "hschema-aeson" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, comonad, contravariant
+ , convertible, directory, free, hschema, hschema-prettyprinter
+ , hschema-quickcheck, hspec, lens, mtl, natural-transformation
+ , prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+ , quickcheck-instances, scientific, text, time
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "hschema-aeson";
+ version = "0.0.1.1";
+ sha256 = "0z85bsiynmrj46l3l24lcms5icj0a8bsvnvadbqqb8swq8j8npsc";
+ libraryHaskellDepends = [
+ aeson base comonad contravariant free hschema hschema-prettyprinter
+ hschema-quickcheck lens mtl natural-transformation prettyprinter
+ prettyprinter-ansi-terminal QuickCheck quickcheck-instances
+ scientific text time unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring comonad contravariant convertible directory
+ free hschema hschema-prettyprinter hschema-quickcheck hspec lens
+ mtl natural-transformation prettyprinter
+ prettyprinter-ansi-terminal QuickCheck quickcheck-instances
+ scientific text time unordered-containers vector
+ ];
+ description = "Describe schemas for your Haskell data types";
+ license = stdenv.lib.licenses.lgpl3;
+ }) {};
+
+ "hschema-prettyprinter" = callPackage
+ ({ mkDerivation, base, contravariant, free, hschema, lens, mtl
+ , natural-transformation, prettyprinter
+ , prettyprinter-ansi-terminal, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "hschema-prettyprinter";
+ version = "0.0.1.1";
+ sha256 = "1vkzq32k9wg1bnam18llzr7r3aihlwsjyxigb87vhngpfghrzwpg";
+ libraryHaskellDepends = [
+ base contravariant free hschema lens mtl natural-transformation
+ prettyprinter prettyprinter-ansi-terminal text unordered-containers
+ vector
+ ];
+ description = "Describe schemas for your Haskell data types";
+ license = stdenv.lib.licenses.lgpl3;
+ }) {};
+
+ "hschema-quickcheck" = callPackage
+ ({ mkDerivation, base, free, hschema, lens, mtl
+ , natural-transformation, QuickCheck, quickcheck-instances, text
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "hschema-quickcheck";
+ version = "0.0.1.1";
+ sha256 = "1rd9fnn6rybxhwny59rk767ckdi6i1b47v0xxhsxkbfwrnmfsjmr";
+ libraryHaskellDepends = [
+ base free hschema lens mtl natural-transformation QuickCheck
+ quickcheck-instances text unordered-containers vector
+ ];
+ description = "Describe schemas for your Haskell data types";
+ license = stdenv.lib.licenses.lgpl3;
+ }) {};
+
"hsclock" = callPackage
({ mkDerivation, base, cairo, glib, gtk, old-time }:
mkDerivation {
@@ -109264,14 +113673,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 +113737,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.3";
+ sha256 = "03v1lls7dv134675x10rgp4nla5a9dgczf4g78vrx488zf50rf1v";
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 +113771,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 +113942,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 +114157,25 @@ self: {
license = stdenv.lib.licenses.isc;
}) {};
+ "hsinstall_2_2" = callPackage
+ ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process
+ , safe-exceptions
+ }:
+ mkDerivation {
+ pname = "hsinstall";
+ version = "2.2";
+ sha256 = "14c98wysvsq4k581s3f5zw44grm6f0wvbmgdda8sshhg7v2059r3";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base directory filepath ];
+ executableHaskellDepends = [
+ base Cabal directory filepath heredoc process safe-exceptions
+ ];
+ description = "Install Haskell software";
+ license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hskeleton" = callPackage
({ mkDerivation, base, Cabal }:
mkDerivation {
@@ -109811,10 +114241,10 @@ self: {
}:
mkDerivation {
pname = "hslogger";
- version = "1.2.10";
- sha256 = "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp";
+ version = "1.2.12";
+ sha256 = "0ykcsk7wqygvrg60r5kpl6xfinr706al8pfyk5wj67wjs24lqypr";
revision = "1";
- editedCabalFile = "04vhwv9qidwan7fbkgvx8z5hnybjaf6wq2951fx4qw3nqsys9250";
+ editedCabalFile = "1rk2lrg3959nbgbyd1aacvwbv865lsrnczqdmj4ivkfn0c8nkidh";
libraryHaskellDepends = [
base containers directory mtl network old-locale process time unix
];
@@ -109913,6 +114343,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 +114388,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 +114424,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 +114748,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 +114826,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec_2_6_0" = callPackage
+ ({ mkDerivation, base, hspec-core, hspec-discover
+ , hspec-expectations, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec";
+ version = "2.6.0";
+ sha256 = "0qwla0bff2q52v27rxjgcp8g3yw0r2iyggp8ggmmabxkk983db6i";
+ 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
@@ -110378,6 +114884,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-contrib_0_5_1" = callPackage
+ ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
+ mkDerivation {
+ pname = "hspec-contrib";
+ version = "0.5.1";
+ sha256 = "0hhzxaa3fxz5mk5qcsrnfr98a7bn3szx2ydgr0x9mbqmm1jg06rc";
+ revision = "1";
+ editedCabalFile = "0vjmyrsb878914b4khwdy3fcn9n217q8k5xnszlrp7dl1jnbqyi4";
+ libraryHaskellDepends = [ base hspec-core HUnit ];
+ testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
+ description = "Contributed functionality for Hspec";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-core_2_4_8" = callPackage
({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq
, directory, filepath, hspec-expectations, hspec-meta, HUnit
@@ -110388,6 +114909,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 +114938,8 @@ 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
@@ -110431,14 +114956,42 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-core_2_6_0" = 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.6.0";
+ sha256 = "0f3fb6cgfp0yywxi9ii2vzmkrj669nprphcs1piad7bacsk12y6r";
+ 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
+ ];
+ 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
({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
, pipes, pipes-safe, system-filepath, text
}:
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 +115000,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 +115040,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-discover_2_6_0" = callPackage
+ ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+ }:
+ mkDerivation {
+ pname = "hspec-discover";
+ version = "2.6.0";
+ sha256 = "17q5g5z7pylw8ghx1jbwk5qrafcg2cblpckvkwla1y3dzry43nc2";
+ 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 +115236,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-leancheck" = callPackage
+ ({ mkDerivation, base, hspec, hspec-core, HUnit, leancheck }:
+ mkDerivation {
+ pname = "hspec-leancheck";
+ version = "0.0.3";
+ sha256 = "0lnqk4dkzqlzrq2hb72yv8xbbnps4bmjqz1qy9q47r8nrac8xpiq";
+ 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 +115264,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 +115308,33 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hspec-meta_2_6_0" = 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.6.0";
+ sha256 = "1n1a4633wfivylglji8920f67mx7qz8j4q58n8p7dxk6yg4h3mz6";
+ 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 +115373,8 @@ self: {
}:
mkDerivation {
pname = "hspec-need-env";
- version = "0.1.0.0";
- sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d";
+ version = "0.1.0.2";
+ sha256 = "0393l0faajrdfckjgclrhpvm79r0mhba8jrrsvr4rj5ifajmrfns";
libraryHaskellDepends = [ base hspec-core hspec-expectations ];
testHaskellDepends = [ base hspec hspec-core setenv transformers ];
description = "Read environment variables for hspec tests";
@@ -111391,6 +116006,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {seccomp = null;};
+ "hssh" = callPackage
+ ({ mkDerivation, async, base, bytestring, cereal, containers
+ , cryptonite, data-default, memory, stm, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "hssh";
+ version = "0.1.0.0";
+ sha256 = "00g87418fhzcxf1xmrj9s40g6i1cgjx65ki027sqgkss49w1w6ig";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async base bytestring cereal containers cryptonite data-default
+ memory stm
+ ];
+ testHaskellDepends = [
+ async base bytestring cereal containers cryptonite data-default
+ memory stm tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "SSH protocol implementation";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"hsshellscript" = callPackage
({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
mkDerivation {
@@ -111467,6 +116105,8 @@ self: {
pname = "hstatistics";
version = "0.3";
sha256 = "1v7f2844p6bjzcwc2pnjyb8zl42kw1x021gcn688dvdxs6cgdwvs";
+ revision = "1";
+ editedCabalFile = "0qcp1kgpwnqphqq1fd92lfp8d0vcf3l6ighsdiqin51qg499xz9w";
libraryHaskellDepends = [
array base hmatrix hmatrix-gsl-stats random vector
];
@@ -111561,25 +116201,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;
}) {};
@@ -111840,8 +116484,8 @@ self: {
}:
mkDerivation {
pname = "hsyslog-udp";
- version = "0.2.3";
- sha256 = "1gmnyiqd7abh7b4vk9y24s9r0jgfvqd8jqpz9f1p97yidzic8gzh";
+ version = "0.2.4";
+ sha256 = "1xahxchr1il9naf8kdwdbh1sy5vv4afqkcxfy4993nsk5j7zs586";
libraryHaskellDepends = [
base bytestring hsyslog network text time unix
];
@@ -111975,8 +116619,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 +116705,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 +116881,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 +116993,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
@@ -112444,6 +117116,7 @@ self: {
libraryHaskellDepends = [ base bytestring ];
description = "Functions for working with HTTP Accept headers";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"http-api-data" = callPackage
@@ -112457,6 +117130,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 +117147,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http-api-data_0_4" = callPackage
+ ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat
+ , bytestring, Cabal, cabal-doctest, containers, cookie, directory
+ , doctest, filepath, hashable, hspec, hspec-discover, http-types
+ , HUnit, nats, QuickCheck, quickcheck-instances, tagged, text, time
+ , time-locale-compat, unordered-containers, uuid-types
+ }:
+ mkDerivation {
+ pname = "http-api-data";
+ version = "0.4";
+ sha256 = "12ja2rrs6dvajw300agp4fms21859a7n193m7nicmwixy8wkyzl3";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ attoparsec attoparsec-iso8601 base base-compat bytestring
+ containers cookie hashable http-types tagged text time
+ time-locale-compat unordered-containers uuid-types
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring cookie directory doctest filepath hspec
+ HUnit nats 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 {
@@ -112493,8 +117196,8 @@ self: {
}:
mkDerivation {
pname = "http-client";
- version = "0.5.13.1";
- sha256 = "0szwbgvkkdz56lgi91armkagmb7nnfwbpp4j7cm9zhmffv3ba8g1";
+ version = "0.5.14";
+ sha256 = "0irnvrxlsr9f7ybvzbpv24zbq3lhxjzh6bavjnl527020jbl0l4f";
libraryHaskellDepends = [
array base blaze-builder bytestring case-insensitive containers
cookie deepseq exceptions filepath ghc-prim http-types memory
@@ -112606,6 +117309,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
@@ -112773,6 +117496,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http-conduit_2_3_4" = callPackage
+ ({ mkDerivation, aeson, base, blaze-builder, bytestring
+ , case-insensitive, conduit, conduit-extra, connection, cookie
+ , data-default-class, hspec, http-client, http-client-tls
+ , http-types, HUnit, mtl, network, resourcet, streaming-commons
+ , temporary, text, time, transformers, unliftio, unliftio-core
+ , utf8-string, wai, wai-conduit, warp, warp-tls
+ }:
+ mkDerivation {
+ pname = "http-conduit";
+ version = "2.3.4";
+ sha256 = "03si9ymgnv1252q3wyj8cblbzx56shcvmi1hx51p90a2aiqbhj15";
+ libraryHaskellDepends = [
+ aeson base bytestring conduit conduit-extra http-client
+ http-client-tls http-types mtl resourcet transformers unliftio-core
+ ];
+ testHaskellDepends = [
+ aeson base blaze-builder bytestring case-insensitive conduit
+ conduit-extra connection cookie data-default-class hspec
+ http-client http-types HUnit network resourcet streaming-commons
+ temporary text time transformers unliftio utf8-string wai
+ wai-conduit warp warp-tls
+ ];
+ doCheck = false;
+ description = "HTTP client package with conduit interface and HTTPS support";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"http-conduit-browser" = callPackage
({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
, case-insensitive, conduit, containers, cookie, data-default
@@ -113015,10 +117767,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 +117787,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 +118068,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
];
@@ -113344,29 +118094,29 @@ self: {
"http2" = callPackage
({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
- , bytestring-builder, case-insensitive, containers, criterion
- , directory, doctest, filepath, Glob, hashtables, heaps, hex, hspec
- , mwc-random, psqueues, stm, text, unordered-containers, vector
- , word8
+ , 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.3";
- sha256 = "0hww0rfsv6lqx62qzycbcqy5q6rh9k09qkyjkdm5m1sp1z50wqk1";
+ version = "1.6.4";
+ sha256 = "0rhy7z67bmbb15kxq9fmpgvqmc3npsbf1ym04cg07ymq9ihxvjig";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base bytestring bytestring-builder case-insensitive
- containers psqueues stm
+ array base bytestring case-insensitive containers
+ network-byte-order psqueues stm
];
testHaskellDepends = [
- aeson aeson-pretty array base bytestring bytestring-builder
- case-insensitive containers directory doctest filepath Glob hex
- hspec psqueues stm text unordered-containers vector word8
+ 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
- hashtables heaps mwc-random psqueues stm
+ 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;
@@ -113378,8 +118128,8 @@ self: {
}:
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 +118144,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 +118157,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 +118176,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 +118198,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 ];
@@ -113522,6 +118278,33 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "htvm" = callPackage
+ ({ mkDerivation, array, base, bytestring, c2hs, containers
+ , deriving-compat, directory, Earley, filepath, mtl, pretty-show
+ , process, QuickCheck, recursion-schemes, tasty, tasty-hunit
+ , tasty-quickcheck, temporary, text, tvm_runtime
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "htvm";
+ version = "0.1.0.0";
+ sha256 = "0bf3dqyqrdi9mw72kp6hid4p6jk3gs5vw5fd1ycjgid218na7qmm";
+ libraryHaskellDepends = [
+ array base bytestring containers deriving-compat directory Earley
+ filepath mtl pretty-show process recursion-schemes temporary text
+ unordered-containers
+ ];
+ librarySystemDepends = [ tvm_runtime ];
+ libraryToolDepends = [ c2hs ];
+ testHaskellDepends = [
+ base bytestring containers directory QuickCheck recursion-schemes
+ tasty tasty-hunit tasty-quickcheck temporary text
+ ];
+ testSystemDepends = [ tvm_runtime ];
+ description = "TVM bindings";
+ license = stdenv.lib.licenses.gpl3;
+ }) {tvm_runtime = null;};
+
"htzaar" = callPackage
({ mkDerivation, base, OpenGL, random, SDL }:
mkDerivation {
@@ -114146,6 +118929,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hw-aeson" = callPackage
+ ({ mkDerivation, aeson, base, hedgehog, hspec, text }:
+ mkDerivation {
+ pname = "hw-aeson";
+ version = "0.1.0.1";
+ sha256 = "0ymjsadvwmbxc1lk913z31vcr50i88dx29i3g0x8zvm6vj6m96g0";
+ libraryHaskellDepends = [ aeson base text ];
+ testHaskellDepends = [ aeson base hedgehog hspec ];
+ description = "Convenience functions for Aeson";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-balancedparens" = callPackage
({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
, hw-prim, hw-rankselect-base, QuickCheck, vector
@@ -114168,18 +118963,20 @@ self: {
}) {};
"hw-bits" = callPackage
- ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
- , hw-prim, hw-string-parse, QuickCheck, safe, vector
+ ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
+ , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, QuickCheck
+ , safe, vector
}:
mkDerivation {
pname = "hw-bits";
- version = "0.7.0.3";
- sha256 = "1z6h8ljws92jdchzbkv7siig859b21ck04xnp2fka2j8p97d437w";
+ version = "0.7.0.5";
+ sha256 = "1p3bqkzsmmz66chrwykj8pawgg7m5dvzsqmr9lrsdxldgqq62i8s";
libraryHaskellDepends = [
base bytestring hw-int hw-prim hw-string-parse safe vector
];
testHaskellDepends = [
- base bytestring hspec hw-prim QuickCheck vector
+ base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck
+ vector
];
benchmarkHaskellDepends = [ base criterion hw-prim vector ];
description = "Bit manipulation";
@@ -114188,16 +118985,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 +119004,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,43 +119034,72 @@ 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.2";
+ sha256 = "14xkyvqggax9vx46kvsg3w0h7pnsfsbwbd5jbr95p5nw8yrsa8pg";
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;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hw-dump" = callPackage
+ ({ mkDerivation, base, bits-extra, bytestring, criterion, hedgehog
+ , hspec, hw-bits, hw-hspec-hedgehog, hw-prim, lens
+ , optparse-applicative, QuickCheck, safe, vector
+ }:
+ mkDerivation {
+ pname = "hw-dump";
+ version = "0.0.0.1";
+ sha256 = "0sxw0fgrq83ahil1sa2mqndwxw7bjxya42sxym6jjsky9jr0mygl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bits-extra bytestring hw-bits hw-prim safe vector
+ ];
+ executableHaskellDepends = [
+ base bits-extra bytestring hw-bits hw-prim lens
+ optparse-applicative vector
+ ];
+ testHaskellDepends = [
+ base bits-extra bytestring hedgehog hspec hw-bits hw-hspec-hedgehog
+ hw-prim QuickCheck vector
+ ];
+ benchmarkHaskellDepends = [
+ base bits-extra bytestring criterion hw-bits hw-prim vector
+ ];
+ description = "File Dump";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hw-eliasfano" = callPackage
({ mkDerivation, base, hspec, hw-bits, hw-int, hw-packed-vector
, hw-prim, QuickCheck, safe, vector
@@ -114381,16 +119225,16 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hw-ip_0_2_0_2" = callPackage
- ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec
- , hw-bits, hw-hspec-hedgehog, text
+ "hw-ip_1_0_0_0" = callPackage
+ ({ mkDerivation, appar, attoparsec, base, generic-lens, hedgehog
+ , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
}:
mkDerivation {
pname = "hw-ip";
- version = "0.2.0.2";
- sha256 = "0c2nz9iq5x7mys90zy29ka4zkdggqngz77wjm51kv1jp7rsnpqn7";
+ version = "1.0.0.0";
+ sha256 = "0di0r4dq1fzmb1cgmks54wqamx9jsjgnv4qjs3s8kwszz19plpfw";
libraryHaskellDepends = [
- attoparsec base generic-lens hw-bits text
+ appar attoparsec base generic-lens hw-bits iproute text
];
testHaskellDepends = [
attoparsec base generic-lens hedgehog hspec hw-bits
@@ -114413,8 +119257,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 +119288,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 +119308,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
@@ -114505,8 +119351,8 @@ self: {
}:
mkDerivation {
pname = "hw-kafka-avro";
- version = "2.1.0";
- sha256 = "06yz55g4hqv8lbx0ywkiwwww81dmk44zi37s7sq09vkvbk9hm9v2";
+ version = "4.0.0";
+ sha256 = "0khqvd1l44bx4mnrv7hbvr0qbak6n17l4qqk3lwga21qnchnlgak";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -114637,8 +119483,8 @@ self: {
}:
mkDerivation {
pname = "hw-prim";
- version = "0.6.2.9";
- sha256 = "1c2ykdxvrg0i1wbjgfc0mank5z7466crqcs5hdyddjc833xhmv2d";
+ version = "0.6.2.22";
+ sha256 = "16dfajzylki7g7p8q2a79dvx3xymxkrpckajdks9k3q4rxsc6k0i";
libraryHaskellDepends = [
base bytestring mmap semigroups transformers vector
];
@@ -114653,30 +119499,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 +119517,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 +119618,8 @@ self: {
}:
mkDerivation {
pname = "hw-simd";
- version = "0.1.1.1";
- sha256 = "1mcingwc7z6ybsn32c3g66r4j9sfwpm4jkqvwh8cbbbd97lhalmq";
+ version = "0.1.1.3";
+ sha256 = "0wryx86ycpcyw1dyp2ks1j0rk7pk6yqihmwsa1sij1pf36qdkbrq";
libraryHaskellDepends = [
base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
hw-rankselect-base vector
@@ -114817,6 +119640,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.8";
+ sha256 = "08pj20r1is6kyinj60xrl0wz7kcjlcc5xivzrhwmjws5qbscimgw";
+ 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 {
@@ -114946,8 +119795,8 @@ self: {
}:
mkDerivation {
pname = "hwhile";
- version = "0.1.1.2";
- sha256 = "1zilz8fdy90dpq6rzj98d70jw5j668fqpx28jhkpj50k72xlrpkb";
+ version = "0.1.1.3";
+ sha256 = "1cd5a6szangr456dsw6j4zf8cgg30lw4dkhsjhw02lag9ips6v7s";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -115000,6 +119849,39 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hwormhole" = callPackage
+ ({ mkDerivation, aeson, async, base, binary, binary-conduit
+ , bytestring, conduit, conduit-extra, containers, cryptonite
+ , directory, filepath, haskeline, hedgehog, hex, hspec
+ , magic-wormhole, memory, mtl, network, network-info
+ , optparse-applicative, pathwalk, protolude, random, saltine
+ , spake2, temporary, text, transformers, unix-compat, zip
+ }:
+ mkDerivation {
+ pname = "hwormhole";
+ version = "0.2.0.0";
+ sha256 = "0y0wg4zxq8wzym8x7b103h0ai2z5ji22vvqz4i64pnzq83ksmxym";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson async base binary bytestring conduit conduit-extra containers
+ cryptonite directory filepath haskeline hex magic-wormhole memory
+ mtl network network-info pathwalk protolude random saltine spake2
+ temporary text transformers unix-compat zip
+ ];
+ executableHaskellDepends = [
+ aeson base binary bytestring optparse-applicative protolude text
+ transformers
+ ];
+ testHaskellDepends = [
+ aeson base binary binary-conduit bytestring conduit conduit-extra
+ containers hedgehog hspec magic-wormhole protolude saltine text
+ ];
+ description = "magic-wormhole client";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"hws" = callPackage
({ mkDerivation, array, base, containers, directory, haskell98
, html, mtl, network, old-time, regex-compat, text, unix
@@ -115206,6 +120088,7 @@ self: {
libraryHaskellDepends = [ base bytestring curl hxt parsec ];
description = "LibCurl interface for HXT";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hxt-expat" = callPackage
@@ -115217,6 +120100,7 @@ self: {
libraryHaskellDepends = [ base bytestring hexpat hxt ];
description = "Expat parser for HXT";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hxt-extras" = callPackage
@@ -115323,6 +120207,7 @@ self: {
];
description = "TagSoup parser for HXT";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hxt-unicode" = callPackage
@@ -115348,6 +120233,7 @@ self: {
];
description = "The XPath modules for HXT";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hxt-xslt" = callPackage
@@ -115363,6 +120249,7 @@ self: {
];
description = "The XSLT modules for HXT";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hxthelper" = callPackage
@@ -116005,6 +120892,8 @@ self: {
pname = "hyraxAbif";
version = "0.2.3.10";
sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b";
+ revision = "2";
+ editedCabalFile = "1dwkqlkjg5hbjlwl7cjxmhg1camhlqpaqjrpmkwknscj76hfckvi";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -116017,7 +120906,7 @@ self: {
base binary bytestring hedgehog protolude text
];
description = "Modules for parsing, generating and manipulating AB1 files";
- license = stdenv.lib.licenses.bsd3;
+ license = "(BSD-3-Clause OR Apache-2.0)";
}) {};
"hzaif" = callPackage
@@ -116136,8 +121025,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 +121480,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 +121718,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 }:
@@ -117130,6 +122019,20 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "ihs_0_1_0_3" = callPackage
+ ({ mkDerivation, base, process }:
+ mkDerivation {
+ pname = "ihs";
+ version = "0.1.0.3";
+ sha256 = "1zfmxgb3l7mihzjyggzb30d9b57y2z80yk562z2x2padsqx95gqk";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base process ];
+ description = "Interpolated Haskell";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ihttp" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, contstuff, enumerator, netlines, network
@@ -117285,8 +122188,8 @@ self: {
}:
mkDerivation {
pname = "imap";
- version = "0.3.0.8";
- sha256 = "1ha6cxfv77ip85vlg0y39jx92zb1mf35gy39lalhzm59a3cfj97b";
+ version = "0.3.0.9";
+ sha256 = "1lskisk4aacqiv1v6fr95zcc5mrn9l4ikxf7xpj568k2i3aqcnwk";
libraryHaskellDepends = [
attoparsec base bytestring connection containers either exceptions
hslogger list-t network pipes random rolling-queue stm stm-delay
@@ -117570,6 +122473,19 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "impl" = callPackage
+ ({ mkDerivation, base, containers, named, template-haskell }:
+ mkDerivation {
+ pname = "impl";
+ version = "0.2.0.0";
+ sha256 = "00fyb41abz9k52ninlavnldm2vz20wbhdrdq5r2s7ir1karv551g";
+ libraryHaskellDepends = [ base containers named template-haskell ];
+ doHaddock = false;
+ description = "Framework for defaulting superclasses";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"implicit" = callPackage
({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg
, bytestring, bytestring-builder, containers, criterion, deepseq
@@ -117816,8 +122732,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 +122820,8 @@ self: {
}:
mkDerivation {
pname = "incremental-parser";
- version = "0.3.1.1";
- sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz";
+ version = "0.3.2.1";
+ sha256 = "07banm2lnrhjvihs0iaij0kqgff198qcbah02s3cjyyl70cmllfr";
libraryHaskellDepends = [ base monoid-subclasses ];
testHaskellDepends = [
base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
@@ -117955,8 +122871,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 +122886,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 +122899,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 +122913,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 +122962,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 +123035,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 +123237,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 +123279,8 @@ self: {
}:
mkDerivation {
pname = "influxdb";
- version = "1.6.0.7";
- sha256 = "1fafcsrwfwxjzlz69qz9bq0pxc5iym12xnr6zv7j34yj6j96xzb2";
+ version = "1.6.1";
+ sha256 = "1hfyp284lpvgy0rqn7rjr7c8z0ah8h0vl3xhfrff8x1z1511n2dp";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -118431,6 +123370,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 +123443,8 @@ self: {
pname = "inline-c";
version = "0.5.6.1";
sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd";
+ revision = "1";
+ editedCabalFile = "0q8wxvsi2gycyv98hw910p87633l9azchnn9783vsknbycsi1c64";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -118554,8 +123506,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 +123628,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 +123688,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "inspection-testing_0_3" = callPackage
+ "inspection-testing_0_4_1_1" = callPackage
({ mkDerivation, base, containers, ghc, mtl, template-haskell
, transformers
}:
mkDerivation {
pname = "inspection-testing";
- version = "0.3";
- sha256 = "0drrfl1k9y7vm270iwr1l451vifffn3qmxjm92rmdq9sk3kij3al";
+ version = "0.4.1.1";
+ sha256 = "1liysxim5lhf0a09asvv7j9hin60bljhp1p642j5j1j0hh2jax4l";
libraryHaskellDepends = [
base containers ghc mtl template-haskell transformers
];
@@ -118940,6 +123892,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 +123941,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
@@ -119144,8 +124100,8 @@ self: {
}:
mkDerivation {
pname = "interlude-l";
- version = "0.4.0.0";
- sha256 = "0dh3n0kx1i46k7v7y7i4i39raacjc6kf5yb8p410hlsk4wwijw1n";
+ version = "0.5.0.0";
+ sha256 = "1p3qv356lqw5m88wilj7mb2hyqhbcd67rcg9kdaqg3pibmyiq3bx";
libraryHaskellDepends = [
aeson base exceptions lens monad-control MonadRandom mtl protolude
string-conv text transformers witherable
@@ -119197,8 +124153,8 @@ self: {
}:
mkDerivation {
pname = "intero";
- version = "0.1.32";
- sha256 = "0xk693yhq2hkilznjzsszamvg7pg1l0qyb2y17ffr2s966i4pfr0";
+ version = "0.1.34";
+ sha256 = "02yq6rxg50za2lcsf6hvld5f1ab4q91kmw74j6kngm7921fa8fi3";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -119258,14 +124214,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 +124266,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 +124418,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "intro_0_5_2_1" = 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.2.1";
+ sha256 = "0i5cpa5jx82nb1gi1wdhgnbmxlb7s4nbya46k6byajf7g50i5qp8";
+ 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 {
@@ -119560,6 +124540,8 @@ self: {
pname = "invariant";
version = "0.5.1";
sha256 = "0aqj7z55632qdg45074kgn9qfdxzb0a2f8lgjzr0l0i4mm2rr37b";
+ revision = "1";
+ editedCabalFile = "100gsacbpal53khj94m5qs4aq70hbsp4dz4065czfm49ysd4yqq4";
libraryHaskellDepends = [
array base bifunctors comonad containers contravariant ghc-prim
profunctors semigroups StateVar stm tagged template-haskell
@@ -119588,6 +124570,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 +124613,7 @@ self: {
];
description = "invertible transformer instances for HXT Picklers";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"invertible-syntax" = callPackage
@@ -119681,6 +124665,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "io-choice_0_0_7" = callPackage
+ ({ mkDerivation, base, hspec, lifted-base, monad-control
+ , template-haskell, transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "io-choice";
+ version = "0.0.7";
+ sha256 = "16v6b9r5k2y5vm2s8k3j7xc5wh77nqd8j636mc6wxcxwn3260jir";
+ libraryHaskellDepends = [
+ base lifted-base monad-control template-haskell transformers
+ transformers-base
+ ];
+ testHaskellDepends = [
+ base hspec lifted-base monad-control transformers
+ ];
+ description = "Choice for IO and lifted IO";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"io-machine" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -119767,8 +124771,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 +124796,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 +124831,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 +124953,7 @@ self: {
];
description = "Library for IP and MAC addresses";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ip_1_4_1" = callPackage
@@ -120004,6 +125009,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ip2proxy" = callPackage
+ ({ mkDerivation, base, binary, bytestring, iproute }:
+ mkDerivation {
+ pname = "ip2proxy";
+ version = "1.0.0";
+ sha256 = "0f1plyy6hxkk7xz9m4fv7p56vqmvnna9frg21ms1n3f99wfimldx";
+ libraryHaskellDepends = [ base binary bytestring iproute ];
+ description = "IP2Proxy Haskell package for proxy detection";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ip6addr" = callPackage
({ mkDerivation, base, cmdargs, IPv6Addr, text }:
mkDerivation {
@@ -120107,8 +125123,8 @@ self: {
}:
mkDerivation {
pname = "iproute";
- version = "1.7.5";
- sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
+ version = "1.7.6";
+ sha256 = "1svczhzy126w7pa5vyfg90xrvi2ym34f47nj4hhcpx13dv06g5wi";
libraryHaskellDepends = [
appar base byteorder containers network
];
@@ -120120,6 +125136,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "iproute_1_7_7" = callPackage
+ ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
+ , network, QuickCheck, safe
+ }:
+ mkDerivation {
+ pname = "iproute";
+ version = "1.7.7";
+ sha256 = "0gab5930nvzrpvisx3x43ydnp2rd4fbmy9cq1zpgqy1adx5gx8z6";
+ libraryHaskellDepends = [
+ appar base byteorder containers network
+ ];
+ testHaskellDepends = [
+ appar base byteorder containers doctest hspec network QuickCheck
+ safe
+ ];
+ description = "IP Routing Table";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"iptables-helpers" = callPackage
({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe
, syb, utf8-string
@@ -120222,8 +125258,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
@@ -120271,6 +125307,8 @@ self: {
pname = "irc-core";
version = "2.5.0";
sha256 = "124zfp6s8hj7z3m873145bnr0z8xlkbr1qgj2hvasd2qs2zrb8y8";
+ revision = "1";
+ editedCabalFile = "06n7shnd8ij4wlzm5xhxdqv26b3am8mgbqfcvsqppk6hgmmyvggq";
libraryHaskellDepends = [
attoparsec base base64-bytestring bytestring hashable primitive
text time vector
@@ -120452,8 +125490,8 @@ self: {
}:
mkDerivation {
pname = "iri";
- version = "0.3.4";
- sha256 = "071vg01q5swwscvfsqqyk6ysqbl1yqpwnwklhj0h985sxv9zdkm6";
+ version = "0.3.4.1";
+ sha256 = "0lissbq0rajhds1s68shba227v0qsq51ffs171rnw31m92rn1c54";
libraryHaskellDepends = [
attoparsec base base-prelude bug bytestring contravariant hashable
ip profunctors ptr punycode semigroups template-haskell text
@@ -120470,24 +125508,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
@@ -120546,9 +125584,9 @@ self: {
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "is";
- version = "0.4.1";
- sha256 = "1133npzv5rvcfxarafbmm6jfam45qdm3r33wc5qq920m0w60xi2a";
- libraryHaskellDepends = [ base ];
+ version = "0.4.3";
+ sha256 = "1zw6pmfr2fyy6bghr1zx7gp62ywphnkcqkbql8yi6lgl0yq5qvh7";
+ libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base template-haskell ];
description = "Generic pattern predicates";
license = stdenv.lib.licenses.bsd3;
@@ -120778,8 +125816,8 @@ self: {
}:
mkDerivation {
pname = "itanium-abi";
- version = "0.1.0.0";
- sha256 = "19ywiim8jjkpj2f7agvq98j4p7l1bw8lp2lmgimwq3bz17nrawwk";
+ version = "0.1.1.0";
+ sha256 = "01fhzxgarbaccmkixn6l09wrbl5xr23kxcq3pf21k13zq6p971d8";
libraryHaskellDepends = [
base boomerang text transformers unordered-containers
];
@@ -120790,6 +125828,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 +126035,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 +126381,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 +126400,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 +126488,8 @@ self: {
}:
mkDerivation {
pname = "jack";
- version = "0.7.1.3";
- sha256 = "1n0znnk3q8vic47k1vlv6mdqghrklagcwalvz1arsdfvpy74ig4c";
+ version = "0.7.1.4";
+ sha256 = "018lsa5mgl7vb0hrd4jswa40d6w7alfq082brax8p832zf0v5bj2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121441,6 +126540,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "jaeger-flamegraph" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, extra
+ , optparse-applicative, QuickCheck, tasty, tasty-discover
+ , tasty-hspec, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "jaeger-flamegraph";
+ version = "1.1.0";
+ sha256 = "01aa2wk95hwkdh6b3m4c9j73ym2xl1ndys81fvvam6wq0dwf9k14";
+ isLibrary = false;
+ isExecutable = true;
+ libraryHaskellDepends = [ base QuickCheck ];
+ executableHaskellDepends = [
+ aeson base bytestring containers extra optparse-applicative text
+ ];
+ testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ];
+ testToolDepends = [ tasty-discover ];
+ doHaddock = false;
+ description = "Generate flamegraphs from Jaeger .json dumps.";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"jail" = callPackage
({ mkDerivation, base, containers, directory, monads-fd
, transformers
@@ -121517,10 +126639,8 @@ self: {
}:
mkDerivation {
pname = "jammittools";
- version = "0.5.5";
- sha256 = "0x9khnf9ykhgi7aghc24nynfyrh6557mmf8s38597h4zdsd897xz";
- revision = "1";
- editedCabalFile = "0pznd9xkwadls2npdsaj69c5ssn3mdri82qxf1q7h7vyba34qibi";
+ version = "0.5.5.1";
+ sha256 = "1q660fvnvrj8cb9rzj7b5qmrbmqy8krq2w1bg824mf6pmvlw52z6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -121534,6 +126654,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
@@ -121617,8 +126749,8 @@ self: {
({ mkDerivation, alex, array, base, happy, pretty }:
mkDerivation {
pname = "java-adt";
- version = "0.2016.11.28";
- sha256 = "1p4j42nzsbd2dsag2gfnngvbdn5vx9cp8lmli6x05sdywabyckc7";
+ version = "0.2018.11.4";
+ sha256 = "1pdp7yvq0gpbxw7gp61r5mkrhdiff0cvlxssxzvg770idp46j6p5";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -121915,6 +127047,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 +127080,8 @@ self: {
pname = "jmacro";
version = "0.6.15";
sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s";
+ revision = "1";
+ editedCabalFile = "07jghfxn4m26q8rksxn4v6pcc8mwcjdlz1ypy7dqsvhzc3hs2s4i";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -122011,6 +127168,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
@@ -122111,15 +127280,15 @@ self: {
}) {};
"jord" = callPackage
- ({ mkDerivation, base, haskeline, hspec, HUnit }:
+ ({ mkDerivation, base, criterion, haskeline, hspec, HUnit }:
mkDerivation {
pname = "jord";
- version = "0.4.0.0";
- sha256 = "0sa19hr49l71dlvm1wpkw6901zzws12higd4xksk8b81cwrgp8l2";
+ version = "0.5.0.0";
+ sha256 = "19rjqdvgbsgl62z3d2ggb5m7c5fassr7b3h5gsv9dp1zdp76sbbc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
- executableHaskellDepends = [ base haskeline ];
+ executableHaskellDepends = [ base criterion haskeline ];
testHaskellDepends = [ base hspec HUnit ];
description = "Geographical Position Calculations";
license = stdenv.lib.licenses.bsd3;
@@ -122309,6 +127478,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
@@ -122491,6 +127662,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "json-alt" = callPackage
+ ({ mkDerivation, aeson, base }:
+ mkDerivation {
+ pname = "json-alt";
+ version = "1.0.0";
+ sha256 = "1ivmbm5gw362vlss1w5s2z7byrzxdh8z1qdfsh0xmywkvwx56l5q";
+ libraryHaskellDepends = [ aeson base ];
+ description = "Union 'alternative' or Either that has untagged JSON encoding";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"json-api" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, data-default, hspec, lens, lens-aeson, text, unordered-containers
@@ -122577,29 +127759,32 @@ self: {
"json-autotype" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
- , filepath, GenericPretty, hashable, lens, mtl
+ , filepath, GenericPretty, hashable, json-alt, lens, mtl
, optparse-applicative, pretty, process, QuickCheck, scientific
- , smallcheck, text, uniplate, unordered-containers, vector, yaml
+ , smallcheck, template-haskell, text, uniplate
+ , unordered-containers, vector, yaml
}:
mkDerivation {
pname = "json-autotype";
- version = "2.0.0";
- sha256 = "0mip3k489321sqzzwbv0sbcscv2q9n4lbc63sx8lslsy95da9x68";
+ version = "3.0.1";
+ sha256 = "0nir4nx4wchl10zs753a3ayg9lgixg2ap3liwz9xpz191c8rkbka";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base containers filepath GenericPretty hashable lens mtl
- pretty process scientific text uniplate unordered-containers vector
+ aeson base containers filepath GenericPretty hashable json-alt lens
+ mtl pretty process QuickCheck scientific smallcheck
+ template-haskell text uniplate unordered-containers vector
];
executableHaskellDepends = [
aeson base bytestring containers filepath GenericPretty hashable
- lens mtl optparse-applicative pretty process scientific text
- uniplate unordered-containers vector yaml
+ json-alt lens mtl optparse-applicative pretty process scientific
+ template-haskell text uniplate unordered-containers vector yaml
];
testHaskellDepends = [
aeson base bytestring containers directory filepath GenericPretty
- hashable lens mtl optparse-applicative pretty process QuickCheck
- scientific smallcheck text uniplate unordered-containers vector
+ hashable json-alt lens mtl optparse-applicative pretty process
+ QuickCheck scientific smallcheck template-haskell text uniplate
+ unordered-containers vector
];
description = "Automatic type declaration for JSON input data";
license = stdenv.lib.licenses.bsd3;
@@ -122724,8 +127909,8 @@ self: {
}:
mkDerivation {
pname = "json-feed";
- version = "1.0.3";
- sha256 = "08y6w4sad6f0f5gs3znw9yfp51cskw9q81xq5q70g6glq14lph50";
+ version = "1.0.5";
+ sha256 = "17y8hnqp4ahg7cx6fwfd4y65pz16py1avhfkn4fcfjs06xv465qs";
libraryHaskellDepends = [
aeson base bytestring mime-types network-uri tagsoup text time
];
@@ -122918,8 +128103,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 +128121,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 +128138,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 +128149,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 +128174,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 +128197,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 +128230,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 +128653,8 @@ self: {
}:
mkDerivation {
pname = "jukebox";
- version = "0.4.1";
- sha256 = "1vpd5j71x85ni6wmvmifb5fw8h3y77l67a3dsngsdcs22jilbbgw";
+ version = "0.4.2";
+ sha256 = "0vxy06dan6iq03p8p2frzvyab5zaahh4pd37rzqg2vh71m6rqka7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -123627,8 +128793,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 +128934,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 +129260,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 +129350,8 @@ self: {
}:
mkDerivation {
pname = "katip";
- version = "0.6.0.0";
- sha256 = "1ll33qvxlqdja7yljyv1mlc5sy4q8izgdscz6zvbyqnjl9iczrn3";
+ version = "0.7.0.0";
+ sha256 = "1z4533952sal5ma71xpsrwbi9pniy1cciw20w31igrx9rw9kx98b";
libraryHaskellDepends = [
aeson async auto-update base bytestring containers either hostname
microlens microlens-th monad-control mtl old-locale resourcet
@@ -124202,8 +129383,8 @@ self: {
}:
mkDerivation {
pname = "katip-elasticsearch";
- version = "0.4.2.0";
- sha256 = "0h6v9jsdc6r1zqz4wgvqr3y0ghqprjbfhlgmwh6q2cjixm3mxw1x";
+ version = "0.5.1.1";
+ sha256 = "199xqrvzb5158zcz5p8njxflnb0f32ca1mdyqjd2xq3d8jn3maj0";
libraryHaskellDepends = [
aeson async base bloodhound bytestring enclosed-exceptions
exceptions http-client http-types katip retry scientific semigroups
@@ -124320,21 +129501,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 +129602,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 +130156,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 +130417,46 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "kind-apply" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "kind-apply";
+ version = "0.3.0.0";
+ sha256 = "1k4plkf7j0spjvi565zfg25fshm2lkh6xjb5a0mr9c5nmq3cp2q7";
+ libraryHaskellDepends = [ base ];
+ description = "Utilities to work with lists of types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "kind-generics" = callPackage
+ ({ mkDerivation, base, kind-apply }:
+ mkDerivation {
+ pname = "kind-generics";
+ version = "0.3.0.0";
+ sha256 = "0xkrijwhldgx742xj9nhr8268vdbbgk4pg9mj73c7j13laj27y8x";
+ libraryHaskellDepends = [ base kind-apply ];
+ description = "Generic programming in GHC style for arbitrary kinds and GADTs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "kind-generics-th" = callPackage
+ ({ mkDerivation, base, kind-generics, template-haskell
+ , th-abstraction
+ }:
+ mkDerivation {
+ pname = "kind-generics-th";
+ version = "0.1.0.0";
+ sha256 = "1dbx24yb8imy7sn9x6372ckdzhslxv9i0svzlwslaavbycpqyvzd";
+ libraryHaskellDepends = [
+ base kind-generics template-haskell th-abstraction
+ ];
+ testHaskellDepends = [ base kind-generics ];
+ description = "Template Haskell support for generating `GenericK` instances";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"kinds" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -125270,6 +130498,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 +130572,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;
}) {};
@@ -125498,8 +130728,8 @@ self: {
pname = "kqueue";
version = "0.2";
sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h";
- revision = "2";
- editedCabalFile = "1c7xskqgv45xsiwa2djfia0mq9f0p6gbb0dwlj5sd8swi3msbsfz";
+ revision = "3";
+ editedCabalFile = "17wanwn4pmh6z6v7ncg50q4sgg87lllld50wa5j5mmb07q4c3mj7";
libraryHaskellDepends = [ base directory filepath mtl time unix ];
libraryToolDepends = [ c2hs ];
description = "A binding to the kqueue event library";
@@ -125515,8 +130745,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
];
@@ -125815,8 +131045,8 @@ self: {
({ mkDerivation, base, hspec, servant, servant-foreign, text }:
mkDerivation {
pname = "lackey";
- version = "1.0.5";
- sha256 = "0ixiqppj7sdkbhp2i6nr4xch82j4r6gxwwn0rvbb0x6wzikkdrf3";
+ version = "1.0.7";
+ sha256 = "0n90m4dsqfp4x4bckwxasg2cmjrzxp2szrlqf43pmp2dsc8g0646";
libraryHaskellDepends = [ base servant servant-foreign text ];
testHaskellDepends = [ base hspec servant servant-foreign text ];
description = "Generate Ruby clients from Servant APIs";
@@ -125921,6 +131151,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 +131323,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 +131348,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 +131374,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 +131395,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 +131415,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 +131435,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 +131452,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 +131468,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 +131481,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";
@@ -126264,6 +131509,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "lambdabot-zulip" = callPackage
+ ({ mkDerivation, base, containers, hint, hspec, HUnit, hzulip
+ , mueval, optparse-applicative, say, text, yaml
+ }:
+ mkDerivation {
+ pname = "lambdabot-zulip";
+ version = "0.1.0";
+ sha256 = "1gjilhmkgbxdrf97mrfcmn84d8wx1g50k7sd27q5q2mldb4vr0xg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers hint hzulip mueval optparse-applicative say text
+ yaml
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec HUnit text ];
+ description = "Lambdabot for Zulip Chat";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lambdacat" = callPackage
({ mkDerivation, base, cmdargs, containers, dyre, glade, gtk, mtl
, network, webkit
@@ -126650,20 +131916,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.5";
+ sha256 = "1vdn1f5bx395jynacmpsvfsyyr29jgpg1y25i1jmbkzjdzkb0h2b";
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 +131946,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 +131987,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 +132042,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 +132142,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
@@ -126979,13 +132272,18 @@ self: {
}) {};
"language-elm" = callPackage
- ({ mkDerivation, base, hspec, MissingH, mtl, pretty, protolude }:
+ ({ mkDerivation, base, doctest, hspec, MissingH, mtl, pretty
+ , protolude
+ }:
mkDerivation {
pname = "language-elm";
- version = "0.1.0.3";
- sha256 = "07pyj3ibrpa3mrqn6skjpk0w44hi32mm0c08yqpnql3qv2xy4wcz";
+ version = "0.2.0.0";
+ sha256 = "13hlkdkxybldwkri0r93pn14lbx9msj4vhyxkibkkjyx7hc9zi9i";
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [ base MissingH mtl pretty protolude ];
+ libraryToolDepends = [ doctest ];
testHaskellDepends = [ base hspec mtl pretty protolude ];
+ testToolDepends = [ doctest ];
description = "Generate elm code";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -127022,10 +132320,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 +132405,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 +132678,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "language-ocaml" = callPackage
+ ({ mkDerivation, alex, array, base, containers, data-default
+ , directory, extensible-effects, extra, filepath, happy
+ , interpolate, lens, megaparsec, mtl, prettyprinter, string-qq
+ , tasty, tasty-golden, tasty-hunit, zlib
+ }:
+ mkDerivation {
+ pname = "language-ocaml";
+ version = "0.2.0";
+ sha256 = "1z9qk9vyv0nimkpgjkmnjvqg0schyiffyx59myi6r9gnmdagifh5";
+ libraryHaskellDepends = [
+ array base containers data-default directory extensible-effects
+ extra filepath interpolate lens megaparsec mtl prettyprinter
+ string-qq tasty tasty-golden tasty-hunit
+ ];
+ libraryPkgconfigDepends = [ zlib ];
+ libraryToolDepends = [ alex happy ];
+ testHaskellDepends = [
+ base directory extra filepath interpolate megaparsec prettyprinter
+ string-qq tasty tasty-golden 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 +132756,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,45 +132787,44 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "language-puppet_1_3_20_1" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
+ "language-puppet_1_4_2" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, async, 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
+ , cryptonite, directory, filecache, filepath, formatting, Glob
+ , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
+ , http-client, lens, lens-aeson, megaparsec, memory, mtl
+ , operational, optparse-applicative, parsec, parser-combinators
+ , pcre-utils, 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.2";
+ sha256 = "0bdi51cjl8m48clkqj6lb9vyxdagx2a4q6f48a1q4b50mpinx5qq";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
- 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
+ case-insensitive containers cryptonite directory filecache filepath
+ formatting hashable hruby hslogger http-api-data http-client lens
+ lens-aeson megaparsec memory mtl operational parsec
+ parser-combinators pcre-utils 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
- http-client lens megaparsec mtl optparse-applicative parallel-io
- regex-pcre-builtin strict-base-types text transformers
- unordered-containers vector yaml
+ aeson ansi-wl-pprint async base bytestring containers Glob hslogger
+ http-client lens mtl optparse-applicative regex-pcre-builtin
+ strict-base-types text transformers unordered-containers vector
+ yaml
];
testHaskellDepends = [
base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
- pcre-utils protolude scientific strict-base-types temporary text
- transformers unordered-containers vector
+ pcre-utils scientific strict-base-types temporary text transformers
+ unordered-containers vector
];
description = "Tools to parse and evaluate the Puppet DSL";
license = stdenv.lib.licenses.bsd3;
@@ -127798,8 +133123,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 +133237,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 +133345,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
@@ -128236,6 +133563,8 @@ self: {
pname = "lazy-hash";
version = "0.1.0.0";
sha256 = "1xa2c8gxk5l4njbs58zpq2ybdvjd4y214p71nfmfrzw0arwz49pa";
+ revision = "1";
+ editedCabalFile = "07sn3q7q29zkxpillprx2d05pybjpvpglz8s7jq07akdhwmwx9mk";
libraryHaskellDepends = [
base constrained-categories hashable haskell-src-meta tagged
template-haskell vector-space
@@ -128358,6 +133687,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;
@@ -128373,6 +133704,7 @@ self: {
libraryHaskellDepends = [ array base vector ];
description = "L-BFGS optimization";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lca" = callPackage
@@ -128529,20 +133861,20 @@ 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
+ "leancheck_0_8_0" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "leancheck";
- version = "0.7.3";
- sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9";
+ version = "0.8.0";
+ sha256 = "1lblxlg881asqgbdv6sivzxryis7cgkpclgyyks598ii06vd0z1s";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base ];
description = "Enumerative property-based testing";
@@ -128550,6 +133882,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "leancheck-enum-instances" = callPackage
+ ({ mkDerivation, base, enum-types, leancheck }:
+ mkDerivation {
+ 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;
+ }) {};
+
+ "leancheck-instances" = callPackage
+ ({ mkDerivation, base, bytestring, leancheck, nats, text }:
+ mkDerivation {
+ pname = "leancheck-instances";
+ version = "0.0.1";
+ sha256 = "1p7d6z82s689l8vi1c0rq6cnzvzlcx17nmr3wzy4yj3h80g1hnlq";
+ libraryHaskellDepends = [ base bytestring leancheck nats text ];
+ testHaskellDepends = [ base bytestring leancheck nats text ];
+ description = "Common LeanCheck instances";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"leankit-api" = callPackage
({ mkDerivation, aeson, base, bytestring, colour, curl, split }:
mkDerivation {
@@ -128601,17 +133956,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 +134308,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 +134374,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 +134387,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 +134422,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 +134487,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 +134535,8 @@ self: {
pname = "lens-sop";
version = "0.2.0.2";
sha256 = "16bd95cwqiprz55s5272mv6wiw5pmv6mvihviiwbdbilhq400s3z";
+ revision = "1";
+ editedCabalFile = "0k7xdwj64kd56kjh7ghjwm79rjwjqxlw5nwzwj0cq5q56vb340jm";
libraryHaskellDepends = [
base fclabels generics-sop transformers
];
@@ -129199,8 +134574,8 @@ self: {
}:
mkDerivation {
pname = "lens-toml-parser";
- version = "0.1.0.2";
- sha256 = "1akp8mm62pnz8ncg235rdxzcrxv36paw723m7dcyr3139qflzxkn";
+ version = "0.1.0.3";
+ sha256 = "1b81v3lncqpmsc0899wk7hnddn359qjwqkmrxcj5yh4ijjqdrrmg";
libraryHaskellDepends = [ base profunctors text time toml-parser ];
testHaskellDepends = [
base containers dwergaz hlint lens-family text toml-parser
@@ -129223,6 +134598,18 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lens-utils" = callPackage
({ mkDerivation, aeson, base, containers, data-default, lens
, monoid, split, template-haskell
@@ -129285,8 +134672,8 @@ self: {
}:
mkDerivation {
pname = "lentil";
- version = "1.0.11.3";
- sha256 = "0kb9fydcv0skp94bhvhbqggam8vrq2wv5iradxmggaf41h0ly123";
+ version = "1.1.0.1";
+ sha256 = "1psb3ywbzg6k0cir5bxphjqmbzd0n1l2w3skkr31px79haa4wbm7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -129333,6 +134720,7 @@ self: {
];
description = "Van Laarhoven lens templates";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"level-monad" = callPackage
@@ -129574,8 +134962,8 @@ self: {
}:
mkDerivation {
pname = "lhs2tex";
- version = "1.20";
- sha256 = "0fmhvxi1a839h3i6s2aqckh64bc0qyp4hbzc3wp85zr5gmzix1df";
+ version = "1.22";
+ sha256 = "1g9966m4pw5rp7a83839k46jmih64rn6w0xnmjlrl0df9ddkpsky";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [
@@ -129934,8 +135322,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 +135352,7 @@ self: {
];
description = "Bindings to the nix package manager";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"libnotify" = callPackage
@@ -130062,6 +135451,44 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) postgresql;};
+ "libraft" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, cereal, concurrency
+ , containers, dejafu, directory, exceptions, haskeline
+ , hunit-dejafu, mtl, network, network-simple, parsec, protolude
+ , QuickCheck, random, repline, stm, tasty, tasty-dejafu
+ , tasty-discover, tasty-expected-failure, tasty-hunit
+ , tasty-quickcheck, text, time, transformers, word8
+ }:
+ mkDerivation {
+ pname = "libraft";
+ version = "0.1.1.0";
+ sha256 = "1kjrrpgci6f1wsb75xrndp7xx50xgw8fgh4f6l345wyy2xxlpj8c";
+ revision = "1";
+ editedCabalFile = "0bzfkay18wphlqfm0i6rmr7rm1d6s16nxvrmc4wp0szim1k9k0gh";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base bytestring cereal concurrency containers directory
+ exceptions haskeline mtl network network-simple parsec protolude
+ random repline text time transformers word8
+ ];
+ executableHaskellDepends = [
+ attoparsec base bytestring cereal concurrency containers directory
+ exceptions haskeline mtl network network-simple parsec protolude
+ random repline stm text time transformers word8
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring cereal concurrency containers dejafu
+ directory exceptions haskeline hunit-dejafu mtl network
+ network-simple parsec protolude QuickCheck random repline tasty
+ tasty-dejafu tasty-discover tasty-expected-failure tasty-hunit
+ tasty-quickcheck text time transformers word8
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "Raft consensus algorithm";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"librandomorg" = callPackage
({ mkDerivation, base, bytestring, curl }:
mkDerivation {
@@ -130131,8 +135558,8 @@ self: {
}:
mkDerivation {
pname = "libssh2";
- version = "0.2.0.6";
- sha256 = "17v006ixkn9wblhnq1nyx1xi7sc9lshyh1ma2y82483w18n849s1";
+ version = "0.2.0.7";
+ sha256 = "05h0awwhqlswjjybw6y1p8byyvfggnx63n0cbqvknrkq338qfnyw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring network syb time unix ];
@@ -130325,6 +135752,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 +135839,7 @@ self: {
];
testToolDepends = [ tasty-discover ];
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lift-generics" = callPackage
@@ -130441,8 +135880,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 +135934,7 @@ self: {
];
description = "lifted IO operations from the base library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lifted-protolude" = callPackage
@@ -130521,14 +135961,15 @@ 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
];
description = "STM operations lifted through monad transformer stacks";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lifted-threads" = callPackage
@@ -130681,8 +136122,8 @@ self: {
}:
mkDerivation {
pname = "limp";
- version = "0.3.2.2";
- sha256 = "0dx2xgkrqda8qwfiwm3pd5lfnfw5sxf1qdz5sbp54jf6516m2c4w";
+ version = "0.3.2.3";
+ sha256 = "1jshdnvrgjpgcqzl7c3q019k6iipk3v19waqxl43va60wfkj4iw8";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [
base containers QuickCheck tasty tasty-quickcheck tasty-th
@@ -130698,8 +136139,8 @@ self: {
}:
mkDerivation {
pname = "limp-cbc";
- version = "0.3.2.2";
- sha256 = "0v637hrm980iqj3bh9p0ixirkhg3dwq7i36pff3n1fiav516qbww";
+ version = "0.3.2.3";
+ sha256 = "1fdjhifnx2yhfbzjs5lsaa8vn5ps4li5j3id8sjj7fwj4yn4m453";
libraryHaskellDepends = [ base containers limp vector ];
libraryToolDepends = [ c2hs ];
testHaskellDepends = [
@@ -130928,22 +136369,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 +136436,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;
@@ -131045,6 +136481,8 @@ self: {
pname = "linearmap-category";
version = "0.3.5.0";
sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf";
+ revision = "1";
+ editedCabalFile = "15yqlsx8wdp8lxkr8pgr1cfrjpy5v1zsgpi584bcd7szwm76mmsw";
libraryHaskellDepends = [
base call-stack constrained-categories containers
free-vector-spaces ieee754 lens linear manifolds-core semigroups
@@ -131895,8 +137333,8 @@ self: {
}:
mkDerivation {
pname = "list-tries";
- version = "0.6.5";
- sha256 = "1bdqja3favvxxlqxyh4r07xhkgsxan7lg8vb0nrahkfbifa4m6by";
+ version = "0.6.6";
+ sha256 = "0n837h2ffgqgram5kvnshlqk5jc87bw49z4pxa94qdmc323z51ak";
libraryHaskellDepends = [ base binary containers dlist ];
testHaskellDepends = [
base binary ChasingBottoms HUnit QuickCheck template-haskell
@@ -131910,14 +137348,36 @@ 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;
}) {};
+ "list-zipper" = callPackage
+ ({ mkDerivation, base, checkers, comonad, deriving-compat, hedgehog
+ , hedgehog-fn, lens, mtl, QuickCheck, semigroupoids, semigroups
+ , tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
+ , transformers
+ }:
+ mkDerivation {
+ pname = "list-zipper";
+ version = "0.0.9";
+ sha256 = "1926a02k9z97arbr622w1j13h8kik6ba148glpnmnm5kyr8d5xk4";
+ libraryHaskellDepends = [
+ base comonad deriving-compat lens mtl semigroupoids semigroups
+ transformers
+ ];
+ testHaskellDepends = [
+ base checkers hedgehog hedgehog-fn lens mtl QuickCheck tasty
+ tasty-hedgehog tasty-hunit tasty-quickcheck transformers
+ ];
+ description = "A list zipper";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"listenbrainz-client" = callPackage
({ mkDerivation, aeson, base, free, freer-effects, http-client
, kan-extensions, mtl, servant, servant-client, text, time
@@ -131971,26 +137431,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 +137705,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 +137744,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 +137838,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
@@ -132408,6 +137906,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "llvm-hs-pretty_0_6_1_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, directory, filepath
+ , llvm-hs, llvm-hs-pure, mtl, prettyprinter, tasty, tasty-golden
+ , tasty-hspec, tasty-hunit, text, transformers
+ }:
+ mkDerivation {
+ pname = "llvm-hs-pretty";
+ version = "0.6.1.0";
+ sha256 = "12w1rkkaf50jl2vdkyk4xpvjmsxzjbfkdyklaq5p6b8ykw872pda";
+ libraryHaskellDepends = [
+ array base bytestring llvm-hs-pure prettyprinter text
+ ];
+ testHaskellDepends = [
+ base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden
+ tasty-hspec tasty-hunit text transformers
+ ];
+ description = "A pretty printer for LLVM IR";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"llvm-hs-pure" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers, fail
, mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
@@ -132428,6 +137947,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 +138049,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 +138199,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
@@ -132701,8 +138241,8 @@ self: {
({ mkDerivation, base, containers, doctest, hedgehog }:
mkDerivation {
pname = "loc";
- version = "0.1.3.3";
- sha256 = "0vnnw8ix38r441czsgmcwn7iavvmy6v5c12qflhz0ah055ahl8xa";
+ version = "0.1.3.4";
+ sha256 = "1xdqnqr4wy3xw9vyfkf6c8xsq74nryhb8z31grcwpn6ppdgzyqy2";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers doctest hedgehog ];
description = "Types representing line and column positions and ranges in text files";
@@ -132714,8 +138254,8 @@ self: {
({ mkDerivation, base, containers, hedgehog, loc }:
mkDerivation {
pname = "loc-test";
- version = "0.1.3.3";
- sha256 = "148nc6qy4afrw707kvq7k1052pfj717apsmr2b98x8w5xcc7f567";
+ version = "0.1.3.4";
+ sha256 = "1lzmyxm34zvkdz3piwmnhd7m0ijjnlwqbpi5lgbqvbrikbw579qp";
libraryHaskellDepends = [ base containers hedgehog loc ];
description = "Test-related utilities related to the /loc/ package";
license = stdenv.lib.licenses.asl20;
@@ -133007,8 +138547,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 +138784,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 +138973,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 +139283,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;
@@ -134022,8 +139576,8 @@ self: {
({ mkDerivation, base, containers, contravariant }:
mkDerivation {
pname = "lrucache";
- version = "1.2.0.0";
- sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz";
+ version = "1.2.0.1";
+ sha256 = "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw";
libraryHaskellDepends = [ base containers contravariant ];
description = "a simple, pure LRU cache";
license = stdenv.lib.licenses.bsd3;
@@ -134037,8 +139591,8 @@ self: {
pname = "lrucaching";
version = "0.3.3";
sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma";
- revision = "3";
- editedCabalFile = "0y7j6m0n1xi40c7dmabi9lk6mjic9h49xx60rq9xc4xap90hjfqb";
+ revision = "5";
+ editedCabalFile = "0dfrgg60nd7l7pfjar1s1g380r4591y6ccv9fyh0n34ymhizk84y";
libraryHaskellDepends = [
base base-compat deepseq hashable psqueues vector
];
@@ -134095,8 +139649,8 @@ self: {
}:
mkDerivation {
pname = "lsp-test";
- version = "0.2.1.0";
- sha256 = "1nd3nn5lyn9cwviijzfhqybj38zg10nf7ypb76ifaax91vj2hrkw";
+ version = "0.5.0.2";
+ sha256 = "0g5kw8y59bdyzj7zzwif1810q7wk87d7q53idpw250g6s4dwycxa";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal base bytestring conduit
conduit-parse containers data-default Diff directory filepath
@@ -134109,6 +139663,7 @@ self: {
];
description = "Functional test framework for LSP servers";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lss" = callPackage
@@ -134157,8 +139712,8 @@ self: {
}:
mkDerivation {
pname = "ltext";
- version = "0.1.2.2";
- sha256 = "12ql2p9zkib4m7hbfxzn8pxg0n9rgf35bhf1csrf48b6kzl9z28f";
+ version = "0.1.3";
+ sha256 = "1sd8iqcfm7qsp8rq1ckixi8lss8mwi4siqqgsybbxjg6ajs9m2x6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -134172,8 +139727,9 @@ self: {
transformers unordered-containers
];
testHaskellDepends = [
- base QuickCheck quickcheck-combinators quickcheck-instances tasty
- tasty-quickcheck text
+ attoparsec base directory exceptions extra mtl pretty QuickCheck
+ quickcheck-combinators quickcheck-instances tasty tasty-quickcheck
+ text transformers unordered-containers
];
description = "Parameterized file evaluator";
license = stdenv.lib.licenses.bsd3;
@@ -134323,10 +139879,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 +140287,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 +140361,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
@@ -135129,25 +140683,25 @@ self: {
"madlang" = callPackage
({ mkDerivation, ansi-wl-pprint, base, binary, Cabal, cli-setup
, composition-prelude, containers, criterion, directory, file-embed
- , hspec, hspec-megaparsec, http-client, http-client-tls, megaparsec
- , MonadRandom, mtl, optparse-applicative, random-shuffle, recursion
- , tar, template-haskell, text, th-lift-instances, titlecase
- , zip-archive, zlib
+ , filepath, hspec, hspec-megaparsec, http-client, http-client-tls
+ , megaparsec, MonadRandom, mtl, optparse-applicative
+ , random-shuffle, recursion, tar, template-haskell, text
+ , th-lift-instances, titlecase, zip-archive, zlib
}:
mkDerivation {
pname = "madlang";
- version = "4.0.2.12";
- sha256 = "0g3nciqjfqkhi6j5kcyp4zwrzbik3v9qrj0jpl374g4r1sw3piq9";
+ version = "4.0.2.14";
+ sha256 = "1fpqs3cyb0iwld53gljkzsz7xhwamkd4g2irk7j3z6pxvn36bhin";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cli-setup ];
libraryHaskellDepends = [
ansi-wl-pprint base binary composition-prelude containers directory
- file-embed megaparsec MonadRandom mtl random-shuffle recursion
- template-haskell text th-lift-instances titlecase
+ file-embed filepath megaparsec MonadRandom mtl random-shuffle
+ recursion template-haskell text th-lift-instances titlecase
];
executableHaskellDepends = [
- base directory http-client http-client-tls megaparsec
+ base directory filepath http-client http-client-tls megaparsec
optparse-applicative tar text zip-archive zlib
];
testHaskellDepends = [ base hspec hspec-megaparsec text ];
@@ -135194,8 +140748,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 +140801,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 +141005,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 +141042,8 @@ self: {
pname = "mainland-pretty";
version = "0.7";
sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi";
+ revision = "1";
+ editedCabalFile = "1apyqnbcsbjfkqc1d6mk74pxl12130r6ijwhj555gddls9g0qdf3";
libraryHaskellDepends = [
base containers srcloc text transformers
];
@@ -135593,14 +141197,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 +141602,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 +141709,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 +141732,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 +141778,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 +141888,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 +142050,7 @@ self: {
];
description = "Abstraction for HTML-embedded content";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"markup-preview" = callPackage
@@ -136645,18 +142252,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.5.0";
+ sha256 = "0r7556mxsqzxg1kp4hrbv3c07xzkf08sycaqbfyy2xrzzczgiy9z";
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;
@@ -136716,6 +142326,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "matchable" = callPackage
+ ({ mkDerivation, base, containers, doctest, doctest-discover, Glob
+ , hashable, hspec, tagged, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "matchable";
+ version = "0.1.1.1";
+ sha256 = "0sd661pp54hyg6igkr90cdjlnx8widl2yxkf0ggyqfna6ak5ml53";
+ libraryHaskellDepends = [
+ base containers hashable tagged unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base containers doctest doctest-discover Glob hashable hspec tagged
+ unordered-containers vector
+ ];
+ description = "A type class for Matchable Functors";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"matcher" = callPackage
({ mkDerivation, base, base-prelude, profunctors, success, text
, transformers
@@ -136765,15 +142394,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "math-functions_0_3_0_1" = callPackage
+ "math-functions_0_3_1_0" = 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.1.0";
+ sha256 = "0mb61yn7faxhpj5d6w5dzgawz2hbjbdqbxz3dkw4855r1bnfnh1k";
libraryHaskellDepends = [
base data-default-class deepseq primitive vector vector-th-unbox
];
@@ -136783,7 +142412,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 +142661,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
@@ -137055,30 +142704,31 @@ self: {
"matterhorn" = callPackage
({ mkDerivation, aeson, aspell-pipe, async, base, base-compat
, brick, brick-skylighting, bytestring, cheapskate, checkers
- , config-ini, connection, containers, directory, filepath, gitrev
- , hashable, Hclip, mattermost-api, mattermost-api-qc
- , microlens-platform, mtl, process, quickcheck-text, random
- , semigroups, skylighting-core, stm, stm-delay, strict
- , string-conversions, tasty, tasty-hunit, tasty-quickcheck
- , temporary, text, text-zipper, time, timezone-olson
- , timezone-series, transformers, Unique, unix, unordered-containers
- , utf8-string, uuid, vector, vty, word-wrap, xdg-basedir
+ , config-ini, connection, containers, data-clist, directory
+ , filepath, gitrev, hashable, Hclip, mattermost-api
+ , mattermost-api-qc, microlens-platform, mtl, process
+ , quickcheck-text, random, semigroups, skylighting-core, stm
+ , stm-delay, strict, string-conversions, tasty, tasty-hunit
+ , tasty-quickcheck, temporary, text, text-zipper, time
+ , timezone-olson, timezone-series, transformers, Unique, unix
+ , unordered-containers, utf8-string, uuid, vector, vty, word-wrap
+ , xdg-basedir
}:
mkDerivation {
pname = "matterhorn";
- version = "40901.0.0";
- sha256 = "1ra1ikivf5y17mzwjvfsvg1kz4438wllv2qwxzaigb9cirrz0n4r";
+ version = "50200.1.1";
+ sha256 = "1s022iyid3msyvpimd88bs7684nvlxmalhwsp7bjxv4mlx3fz0zp";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
aeson aspell-pipe async base base-compat brick brick-skylighting
- bytestring cheapskate config-ini connection containers directory
- filepath gitrev hashable Hclip mattermost-api microlens-platform
- mtl process random semigroups skylighting-core stm stm-delay strict
- temporary text text-zipper time timezone-olson timezone-series
- transformers unix unordered-containers utf8-string uuid vector vty
- word-wrap xdg-basedir
+ bytestring cheapskate config-ini connection containers data-clist
+ directory filepath gitrev hashable Hclip mattermost-api
+ microlens-platform mtl process random semigroups skylighting-core
+ stm stm-delay strict temporary text text-zipper time timezone-olson
+ timezone-series transformers unix unordered-containers utf8-string
+ uuid vector vty word-wrap xdg-basedir
];
testHaskellDepends = [
base base-compat brick bytestring cheapskate checkers config-ini
@@ -137103,8 +142753,8 @@ self: {
}:
mkDerivation {
pname = "mattermost-api";
- version = "40900.1.0";
- sha256 = "1ngpinpal50s8bizwvnpafx6zh8zqb7m0yc21lcp7ybh4yhwikad";
+ version = "50200.1.0";
+ sha256 = "1adqh3s34zw74x4idjy1ln8qq9qlqq146kb9b4gd2lijrr8zrjn7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -137128,8 +142778,8 @@ self: {
}:
mkDerivation {
pname = "mattermost-api-qc";
- version = "40900.1.0";
- sha256 = "0mdwi6130hz508bxbhriyg7fr6rqpbalmjwwizvj9nb7cz1dmrsl";
+ version = "50200.1.0";
+ sha256 = "1rlzq0dqpqqnwzz1sknf8zfnsbqpz1w51ik9k4hi8qydkpbf3sdz";
libraryHaskellDepends = [
base containers mattermost-api QuickCheck text time
];
@@ -137413,17 +143063,15 @@ self: {
}:
mkDerivation {
pname = "mcm";
- version = "0.6.5.0";
- sha256 = "1vf54aziyybxyc9bwnn57pfcjmgli2hjjd2kzij8vy2g64ipip9m";
- revision = "1";
- editedCabalFile = "1anhhrl8a627y7vfvcmiwbfjiyvglwrqcim1gc6zycqidyqq22pq";
+ version = "0.6.8.1";
+ sha256 = "1nn6s15c6wwi7b0afzqfczdmc0ivrc8ncychmjym93lw967vjm67";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base blaze-html bytestring containers directory filepath hostname
MissingH polyparse process text unix
];
- description = "Manages the contents of files and directories";
+ description = "Machine Configuration Manager";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -137573,8 +143221,8 @@ self: {
}:
mkDerivation {
pname = "mealstrom";
- version = "0.0.0.1";
- sha256 = "0gz8aybj5fcx1mjyh0d1pvxrcg848bn1gvj861kz97xkjz8pprxx";
+ version = "0.0.1.0";
+ sha256 = "1nsbh00c5d5n1w3vkf63s9y9snbqvk5f590a8gyp00ikz85m3c23";
libraryHaskellDepends = [
aeson async base bytestring containers hashable list-t
postgresql-simple resource-pool stm stm-containers text time uuid
@@ -137875,6 +143523,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mega-sdist_0_3_3_2" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, conduit-extra
+ , http-conduit, optparse-simple, rio, rio-orphans, tar-conduit
+ , yaml
+ }:
+ mkDerivation {
+ pname = "mega-sdist";
+ version = "0.3.3.2";
+ sha256 = "0jhlaww753spj5k2mrzrizcb408265wglc7gycdicnashsxc7qd4";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring conduit conduit-extra http-conduit optparse-simple
+ rio rio-orphans tar-conduit yaml
+ ];
+ description = "Handles uploading to Hackage from mega repos";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"megaparsec" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, criterion, deepseq, hspec, hspec-discover, hspec-expectations
@@ -137885,8 +143553,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 +143569,33 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "megaparsec_7_0_4" = 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.4";
+ sha256 = "1hg83m85f4v78mqdkznd1ddk9y32hnrv0bgva7ir3vydx37aanrj";
+ 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 +143940,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";
@@ -138294,8 +143989,8 @@ self: {
}:
mkDerivation {
pname = "menoh";
- version = "0.2.0";
- sha256 = "0n6wl03d8gyvmdjmxz0hrbvwvbyzc4qyz7qr5ydgxyxj56pg2cb4";
+ version = "0.3.0";
+ sha256 = "0w2p2g5zk4n3k84yrk7hs7kgk82w6avd2i0zk6iczjhhkihh1c6m";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -138307,7 +144002,8 @@ self: {
base filepath JuicyPixels optparse-applicative vector
];
testHaskellDepends = [
- async base filepath JuicyPixels tasty tasty-hunit tasty-th vector
+ async base bytestring filepath JuicyPixels tasty tasty-hunit
+ tasty-th vector
];
description = "Haskell binding for Menoh DNN inference library";
license = stdenv.lib.licenses.mit;
@@ -138347,8 +144043,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 +144052,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;
}) {};
@@ -138408,10 +144104,8 @@ self: {
}:
mkDerivation {
pname = "merkle-tree";
- version = "0.1.0";
- sha256 = "0k9ifkl8ywp0svn83rlczrq2s1aamwri2vx25cs42f64bgxr7ics";
- revision = "1";
- editedCabalFile = "1ibsr79qmzykn2i7p8zvzp8v79lsr54gc3zdqmfgk2cjx1x8k6dz";
+ version = "0.1.1";
+ sha256 = "1am2bfyzdhr2skvjwrvgkk7ihnili0z0lyigpy5lndrhc93n4ni1";
libraryHaskellDepends = [
base bytestring cereal cryptonite memory protolude random
];
@@ -138419,7 +144113,7 @@ self: {
base bytestring cereal cryptonite memory protolude QuickCheck
random tasty tasty-quickcheck
];
- description = "An implementation of a Merkle Tree and merkle tree proofs";
+ description = "An implementation of a Merkle tree and merkle tree proofs of inclusion";
license = stdenv.lib.licenses.asl20;
}) {};
@@ -138568,6 +144262,7 @@ self: {
libraryHaskellDepends = [ base ];
description = "metamorphisms: ana . cata or understanding folds and unfolds";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"metaplug" = callPackage
@@ -138582,6 +144277,56 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"metric" = callPackage
({ mkDerivation, base, data-default, edit-distance, hmatrix
, QuickCheck, test-framework, test-framework-quickcheck2, vector
@@ -138728,6 +144473,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 +144513,8 @@ self: {
pname = "microaeson";
version = "0.1.0.0";
sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz";
+ revision = "1";
+ editedCabalFile = "0pxgpmr0xv355rnpr8m7l07swbzsjbfiba3dxyz53bdjcc8ya9dq";
libraryHaskellDepends = [
array base bytestring containers deepseq text
];
@@ -138866,6 +144629,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens_0_4_10" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "microlens";
+ version = "0.4.10";
+ sha256 = "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw";
+ libraryHaskellDepends = [ base ];
+ description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-aeson" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
, deepseq, hashable, lens, lens-aeson, microlens, scientific, tasty
@@ -138897,8 +144672,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;
@@ -138922,8 +144697,8 @@ self: {
}:
mkDerivation {
pname = "microlens-ghc";
- version = "0.4.9";
- sha256 = "0wdwra9s7gllw0i7sf7d371h6d5qwlk6jrvhdm8hafj4fxagafma";
+ version = "0.4.9.1";
+ sha256 = "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj";
libraryHaskellDepends = [
array base bytestring containers microlens transformers
];
@@ -138931,14 +144706,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "microlens-ghc_0_4_9_1" = callPackage
+ "microlens-ghc_0_4_10" = callPackage
({ mkDerivation, array, base, bytestring, containers, microlens
, transformers
}:
mkDerivation {
pname = "microlens-ghc";
- version = "0.4.9.1";
- sha256 = "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj";
+ version = "0.4.10";
+ sha256 = "102dbrdsdadxbbhvx8avv1wbk84767a7lkb8ckp3zxk9g7qlly33";
libraryHaskellDepends = [
array base bytestring containers microlens transformers
];
@@ -138978,14 +144753,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microlens-platform_0_3_11" = callPackage
+ ({ mkDerivation, base, hashable, microlens, microlens-ghc
+ , microlens-mtl, microlens-th, text, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "microlens-platform";
+ version = "0.3.11";
+ sha256 = "18950lxgmsg5ksvyyi3zs1smjmb1qf1q73a3p3g44bh21miz0xwb";
+ libraryHaskellDepends = [
+ base hashable microlens microlens-ghc microlens-mtl microlens-th
+ text unordered-containers vector
+ ];
+ description = "Feature-complete microlens";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"microlens-th" = callPackage
({ mkDerivation, base, containers, microlens, template-haskell
, th-abstraction, transformers
}:
mkDerivation {
pname = "microlens-th";
- version = "0.4.2.1";
- sha256 = "0hpwwk50a826s87ad0k6liw40qp6av0hmdhnsdfhhk5mka710mzc";
+ version = "0.4.2.3";
+ sha256 = "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j";
libraryHaskellDepends = [
base containers microlens template-haskell th-abstraction
transformers
@@ -138995,24 +144787,6 @@ self: {
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";
- 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;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"micrologger" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, hspec, lens
, text, text-format, time, transformers
@@ -139055,18 +144829,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_1_3" = callPackage
+ ({ mkDerivation, base, QuickCheck, time }:
mkDerivation {
pname = "microspec";
- version = "0.2.0.0";
- sha256 = "0nz9achmckza9n6hx7ix7yyh9fhhfjnbszzjssz4mnghcmm8l0wv";
- libraryHaskellDepends = [ base QuickCheck ];
+ version = "0.2.1.3";
+ sha256 = "0615gdbsk7i3w71adjp69zabw4mli965wffm2h846hp6pjj31xcb";
+ libraryHaskellDepends = [ base QuickCheck time ];
description = "Tiny QuickCheck test library with minimal dependencies";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -139081,8 +144857,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
@@ -139141,8 +144917,8 @@ self: {
({ mkDerivation, base, containers, safe, stm }:
mkDerivation {
pname = "midair";
- version = "0.2.0.0";
- sha256 = "1fdii0pj3f1bskj9bnphhy9gbp58cqjk0q3cmfj3ynkqz20j49ij";
+ version = "0.2.0.1";
+ sha256 = "1dkja5arps41wanhv1jnkf99xrc8f5aiimp27myd595lqqdr87s2";
libraryHaskellDepends = [ base containers safe stm ];
description = "Hot-swappable FRP";
license = stdenv.lib.licenses.gpl3;
@@ -139192,8 +144968,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 = [
@@ -139232,6 +145008,8 @@ self: {
pname = "midi-util";
version = "0.2.0.1";
sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc";
+ revision = "1";
+ editedCabalFile = "0a3hasbhvd327m65yqqyjah7y8r48l65bqg1ymcrc0s2zff10gl5";
libraryHaskellDepends = [
base containers event-list midi non-negative
];
@@ -139429,8 +145207,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
@@ -139521,6 +145299,7 @@ self: {
];
description = "MIME implementation for String's";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mime-types" = callPackage
@@ -139565,6 +145344,7 @@ self: {
executableHaskellDepends = [ base directory mtl random ];
description = "Minesweeper simulation using neural networks";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"minesweeper" = callPackage
@@ -139647,6 +145427,7 @@ self: {
];
description = "Minimal ini like configuration library with a few extras";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"minimorph" = callPackage
@@ -139665,6 +145446,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "minimorph_0_2_1_0" = callPackage
+ ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
+ , text
+ }:
+ mkDerivation {
+ pname = "minimorph";
+ version = "0.2.1.0";
+ sha256 = "1phpsd0j8c987sw99p4hyywr4ydcxf5aq4h6xqdl3acwi0dv4zhj";
+ libraryHaskellDepends = [ base text ];
+ testHaskellDepends = [
+ base HUnit test-framework test-framework-hunit text
+ ];
+ description = "English spelling functions with an emphasis on simplicity";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"minimung" = callPackage
({ mkDerivation, base, GLUT, haskell98, unix }:
mkDerivation {
@@ -139841,6 +145639,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "miniutter_0_5_0_0" = callPackage
+ ({ mkDerivation, base, binary, containers, HUnit, minimorph
+ , test-framework, test-framework-hunit, text
+ }:
+ mkDerivation {
+ pname = "miniutter";
+ version = "0.5.0.0";
+ sha256 = "0hgsk54s07497rsgsck8lhpfbrxavx1chq90hsw14w3ggr1xnc7f";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base binary containers minimorph text ];
+ testHaskellDepends = [
+ base containers HUnit test-framework test-framework-hunit text
+ ];
+ description = "Simple English clause creation from arbitrary words";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"minlen" = callPackage
({ mkDerivation, base, mono-traversable, semigroups, transformers
}:
@@ -139881,21 +145697,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 +145767,8 @@ self: {
}:
mkDerivation {
pname = "miso";
- version = "0.21.1.0";
- sha256 = "1yz909nmm0qjvm4kbq5r8a5r4881pcq0n2jzf29y9svcz8apw08l";
+ version = "0.21.2.0";
+ sha256 = "061bjvxcs6psh8hj947p4jm9ki9ngrwvn23szvk8i3x4xd87jbfm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -140017,8 +145839,8 @@ self: {
}:
mkDerivation {
pname = "mixed-types-num";
- version = "0.3.1.4";
- sha256 = "0061in4wv9hs5d8bvq5ycv8x176z3fz8fcfymwghmbjybbmgzzy4";
+ version = "0.3.1.5";
+ sha256 = "0n60s5vy6l6mbc5z7di91whb3hn0qav2c98fmb7l7inxq8abzw3w";
libraryHaskellDepends = [
base convertible hspec hspec-smallcheck QuickCheck smallcheck
template-haskell
@@ -140035,8 +145857,8 @@ self: {
}:
mkDerivation {
pname = "mixpanel-client";
- version = "0.1.0.0";
- sha256 = "0m3l68b3mvpzsxr61rfvn89i5lym9yd3akvmwn001zdzqxk4l9v7";
+ version = "0.1.1";
+ sha256 = "1dr7h8ss3msnabz6nisq3q4khi48b4ahmghil9sz4in4s1dvn9am";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring http-client http-client-tls
servant servant-client string-conv text time
@@ -140048,6 +145870,7 @@ self: {
testToolDepends = [ hspec-discover markdown-unlit ];
description = "Mixpanel client";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mkbndl" = callPackage
@@ -140176,6 +145999,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 = "2";
+ editedCabalFile = "1nxw8vfqji8x63qkrcjnjc2rq1japrylz2wi1s76dm86pcs6hfw1";
+ 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 +146053,29 @@ self: {
];
description = "Command line interface to MMark markdown processor";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "mmark-cli_0_0_5_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory
+ , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark
+ , mmark-ext, optparse-applicative, stache, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "mmark-cli";
+ version = "0.0.5.0";
+ sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base bytestring directory ghc-syntax-highlighter 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
@@ -140206,17 +146085,18 @@ self: {
}:
mkDerivation {
pname = "mmark-ext";
- version = "0.2.1.0";
- sha256 = "1k9zw9fbfhlp5irbykycpw5qkjyhlcb8qrnbmsrn133hh1m3j0hs";
+ version = "0.2.1.1";
+ sha256 = "01av7d9n75mg9yzkxszrvbxjbsv4n0gsdmg3n2620zn40j5lwmcq";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri
skylighting text
];
- testHaskellDepends = [ base hspec lucid mmark text ];
+ testHaskellDepends = [ base hspec lucid mmark skylighting text ];
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 +146280,35 @@ 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";
+ revision = "1";
+ editedCabalFile = "13q0lapxk1v3ci3bqv21942jf2fw87frbbam53apd3i2iv69bqyr";
+ 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
@@ -140445,6 +146354,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "modular" = callPackage
+ ({ mkDerivation, base, ghc-typelits-knownnat }:
+ mkDerivation {
+ pname = "modular";
+ version = "0.1.0.8";
+ sha256 = "1igg7am4z1kfvpyp5a53rsqan5i209rp1s0z9xamqydx60ilc2s3";
+ libraryHaskellDepends = [ base ghc-typelits-knownnat ];
+ description = "Type-safe modular arithmetic";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"modular-arithmetic" = callPackage
({ mkDerivation, base, doctest, Glob }:
mkDerivation {
@@ -140602,8 +146522,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 +146549,8 @@ self: {
pname = "mole";
version = "0.0.6";
sha256 = "0shsx1sc6rc5jxijvrc4bzqpjw4xdjq5ghlj8jnmm7gp8b6h6y5b";
+ revision = "2";
+ editedCabalFile = "1qykba99djdhwm0mmkrfbjdyjcx47gi5clxm8kz87ccx9qs72kfy";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -140854,10 +146776,8 @@ self: {
}:
mkDerivation {
pname = "monad-dijkstra";
- version = "0.1.1.0";
- sha256 = "1vchyiaxawjgixxc9b3pssdrdmsy5ji0f3gwwgjr8gp0dp73yki4";
- revision = "1";
- editedCabalFile = "1jkxalyj9libzgg1whzp3dw152j8abxng4jm9xrh2y2i48dw412c";
+ version = "0.1.1.1";
+ sha256 = "0j29ffim7hwvj791na92yrbgly1frn0qvcpyc1z29837kawap190";
libraryHaskellDepends = [ base free mtl psqueues transformers ];
testHaskellDepends = [ base hlint tasty tasty-hspec ];
description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm";
@@ -141062,6 +146982,8 @@ self: {
pname = "monad-log";
version = "0.1.1.0";
sha256 = "1hcbgqp7rxvcs4scz94pxhzwwwx510b76ylakb2k4jry11i0q01l";
+ revision = "1";
+ editedCabalFile = "1qmc3qdkw8cgch93hmm74hga0ajxrgjn5zwiwaw8711c7vn7na9m";
libraryHaskellDepends = [
aeson base bytestring exceptions fast-logger lifted-base
monad-control template-haskell text text-show transformers
@@ -141080,8 +147002,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 +147143,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 +147344,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 +147663,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
@@ -141950,8 +147871,8 @@ self: {
({ mkDerivation, base, monad-control, mtl, transformers-base }:
mkDerivation {
pname = "monadoid";
- version = "0.0.2";
- sha256 = "0xy89vhndmsrg0cz93ril79zrffb6fnj75vd3ivfrnsn0kxykhi6";
+ version = "0.0.3";
+ sha256 = "073ma6429m92z1pdglxvb02d6f17wdnh90mnscrjwdvzb406w0cy";
libraryHaskellDepends = [
base monad-control mtl transformers-base
];
@@ -141966,6 +147887,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 +147976,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 +148198,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 +148255,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 +148296,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 +148354,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "monopati" = callPackage
+ ({ mkDerivation, base, directory, free, hedgehog, peano, split
+ , transformers
+ }:
+ mkDerivation {
+ pname = "monopati";
+ version = "0.1.4";
+ sha256 = "159r99x00vylxb50hyrb8xd67ag4x1mmrfddj5bq31bxiwb6j47s";
+ libraryHaskellDepends = [ base directory free peano split ];
+ testHaskellDepends = [
+ base directory free hedgehog peano split transformers
+ ];
+ description = "Well-typed paths";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"montage" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, ListLike
, old-locale, pool-conduit, protocol-buffers
@@ -142480,6 +148437,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
@@ -142506,20 +148479,20 @@ self: {
"moo" = callPackage
({ mkDerivation, array, base, containers, gray-code, HUnit
- , mersenne-random-pure64, monad-mersenne-random, mtl, random
- , random-shuffle, time
+ , mersenne-random-pure64, MonadRandom, mtl, parallel, random
+ , random-shuffle, time, vector
}:
mkDerivation {
pname = "moo";
- version = "1.0";
- sha256 = "02ah9v6h4ansd8kz76jnrx0yra9nz6ql92p5rm01pxri1gc7kn6w";
+ version = "1.2";
+ sha256 = "1j3dg835qwjk0nji0pdfkpgqrpfd3ijlpz5b5hy03rmi05k8vlfq";
libraryHaskellDepends = [
- array base gray-code mersenne-random-pure64 monad-mersenne-random
- mtl random random-shuffle time
+ array base containers gray-code mersenne-random-pure64 MonadRandom
+ mtl parallel random random-shuffle time vector
];
testHaskellDepends = [
array base containers gray-code HUnit mersenne-random-pure64
- monad-mersenne-random mtl random random-shuffle time
+ MonadRandom mtl parallel random random-shuffle time vector
];
description = "Genetic algorithm library";
license = stdenv.lib.licenses.bsd3;
@@ -142547,8 +148520,8 @@ self: {
({ mkDerivation, base, containers, hspec }:
mkDerivation {
pname = "more-containers";
- version = "0.1.0.5";
- sha256 = "1q1fs56a61ryild0zp43ash5mm83162v5v61x29vmc3hv1h79bnm";
+ version = "0.1.1.0";
+ sha256 = "1gy7h36spmksn1d3vg56l93kfgd24im304ync20pzaymkbljh1gk";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers hspec ];
description = "A few more collections";
@@ -142574,8 +148547,8 @@ self: {
}:
mkDerivation {
pname = "morfette";
- version = "0.4.4";
- sha256 = "064wgdk0yrrjh8b7xnpmhk541fwqh24pg7hq1rh28vf2fbv6blcy";
+ version = "0.4.7";
+ sha256 = "1vxqg55zsj36pi1bsydm0v4fls4blya9jjfdv56jgdfjsjzzljyh";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -142626,6 +148599,16 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "morphisms" = callPackage
+ ({ mkDerivation }:
+ mkDerivation {
+ pname = "morphisms";
+ version = "0.1.0";
+ sha256 = "0mgkpasj9jd4fhmxcxaij8jkcvp57q8xymf2wvldpwcgi05602az";
+ description = "It's all about functions";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"morte" = callPackage
({ mkDerivation, alex, array, base, binary, code-page, containers
, criterion, deepseq, Earley, formatting, http-client
@@ -142659,7 +148642,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 +148652,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 +148706,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 +148936,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) mpg123;};
+ "mpi-hs" = callPackage
+ ({ mkDerivation, base, binary, bytestring, c2hs, criterion
+ , monad-loops, openmpi, packman, store
+ }:
+ mkDerivation {
+ pname = "mpi-hs";
+ version = "0.4.1.0";
+ sha256 = "0bf0ghzvakww5slvfd3fq0sa0972i6y60lg6ibby49nslfkl52wd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring monad-loops packman store
+ ];
+ librarySystemDepends = [ openmpi ];
+ libraryToolDepends = [ c2hs ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base monad-loops ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "MPI bindings for Haskell";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) openmpi;};
+
"mpppc" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, split, text }:
mkDerivation {
@@ -143613,8 +149661,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";
@@ -143753,6 +149801,50 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "multilinear" = callPackage
+ ({ mkDerivation, base, containers, criterion, deepseq
+ , generic-random, parallel, QuickCheck, quickcheck-instances
+ , vector, weigh
+ }:
+ mkDerivation {
+ pname = "multilinear";
+ version = "0.5.0.0";
+ sha256 = "03j34gcacd5va2ldd1hmchnfrymsh0l60kp2m4q39gfgzpicm62g";
+ libraryHaskellDepends = [
+ base containers deepseq parallel vector
+ ];
+ testHaskellDepends = [
+ base containers deepseq generic-random QuickCheck
+ quickcheck-instances
+ ];
+ benchmarkHaskellDepends = [ base criterion deepseq weigh ];
+ description = "Comprehensive and efficient (multi)linear algebra implementation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "multilinear-io" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, cassava, cereal
+ , cereal-vector, conduit, criterion, deepseq, directory, either
+ , multilinear, transformers, vector, zlib
+ }:
+ mkDerivation {
+ pname = "multilinear-io";
+ version = "0.5.0.0";
+ sha256 = "1lvizs4lbjy8ki9v5ikmc23fmxkk9w5d3nh4v0iljwyz5cgds05c";
+ libraryHaskellDepends = [
+ aeson base bytestring cassava cereal cereal-vector conduit either
+ multilinear transformers vector zlib
+ ];
+ testHaskellDepends = [
+ base directory either multilinear transformers
+ ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq directory either multilinear transformers
+ ];
+ description = "Conduit-based input/output capability for multilinear package";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"multimap" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -143904,32 +149996,34 @@ self: {
"multipool-persistent-postgresql" = callPackage
({ mkDerivation, base, monad-logger, mtl, multipool
, multipool-persistent, persistent, persistent-postgresql
- , postgresql-common-persistent, unliftio-core, unordered-containers
+ , persistent-qq, postgresql-common-persistent, unliftio-core
+ , unordered-containers
}:
mkDerivation {
pname = "multipool-persistent-postgresql";
- version = "0.1.0.1";
- sha256 = "11y8hr9f5f7ni7nxz1h6bi7jn3pj09ngjrqgliwihx60ind2dk6q";
+ version = "0.1.1.0";
+ sha256 = "0hna597qbsa81rly8cmxj45ix6iyw83w9v4ai9gpm5yb5g21bdf9";
libraryHaskellDepends = [
base monad-logger mtl multipool multipool-persistent persistent
- persistent-postgresql postgresql-common-persistent unliftio-core
- unordered-containers
+ persistent-postgresql persistent-qq postgresql-common-persistent
+ unliftio-core unordered-containers
];
testHaskellDepends = [
base monad-logger mtl multipool multipool-persistent persistent
- persistent-postgresql postgresql-common-persistent unliftio-core
- unordered-containers
+ persistent-postgresql persistent-qq postgresql-common-persistent
+ unliftio-core unordered-containers
];
description = "Read and write appropriately from both master and replicated postgresql instances";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"multirec" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
pname = "multirec";
- version = "0.7.8";
- sha256 = "0n5rsjrg8b98aim1wsv1s2i17299h8g4k2gb7mgn1swzldrigjhz";
+ version = "0.7.9";
+ sha256 = "0a6kc3kkg7hz5wigp28fhp01pryb8gaw03fjc35mm4i2jfcjrplz";
libraryHaskellDepends = [ base template-haskell ];
testHaskellDepends = [ base ];
description = "Generic programming for families of recursive datatypes";
@@ -143969,8 +150063,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 +150101,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 +150719,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 +150842,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;
@@ -145043,8 +151135,8 @@ self: {
}:
mkDerivation {
pname = "mysql";
- version = "0.1.5";
- sha256 = "0x9hdwg94s0baw7jn7ba2mk0rr7qpf1hyf88pm6gv4vdgz86gcs9";
+ version = "0.1.6";
+ sha256 = "1vlr4z3ng8sibb7g8363xlhff3811z8b5nmm0ljai6r5r5hrym4y";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [ base bytestring containers ];
librarySystemDepends = [ mysql ];
@@ -145097,6 +151189,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
@@ -145260,6 +151376,7 @@ self: {
executableHaskellDepends = [ base HSH mtl process ];
description = "Utility to call iwconfig";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"n-tuple" = callPackage
@@ -145274,6 +151391,68 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "n2o" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, hspec, text
+ }:
+ mkDerivation {
+ pname = "n2o";
+ version = "0.11.1";
+ sha256 = "0yvgis2v2jgdny50py8xmc9b1p2zi5kjgf45xsgsyyhzjyr30kb7";
+ libraryHaskellDepends = [ base binary bytestring containers text ];
+ testHaskellDepends = [ base hspec ];
+ description = "Abstract Protocol Loop";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "n2o-nitro" = callPackage
+ ({ mkDerivation, base, base64-bytestring, binary, bytestring
+ , containers, n2o, text
+ }:
+ mkDerivation {
+ pname = "n2o-nitro";
+ version = "0.11.2";
+ sha256 = "1vh0r03h0k60z4q722pw4h5q0l7l56fmyp57im0nankci8vj0s38";
+ libraryHaskellDepends = [
+ base base64-bytestring binary bytestring containers n2o text
+ ];
+ description = "Nitro Elements, Events and Actions";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "n2o-protocols" = callPackage
+ ({ mkDerivation, base, base64-bytestring, binary, bytestring
+ , containers, n2o, n2o-nitro, time
+ }:
+ mkDerivation {
+ pname = "n2o-protocols";
+ version = "0.11.2";
+ sha256 = "1w5r99k9wvhbwvx0hzgpn1aahhnb84ib0n7xgq1ybpgy3s9cggzk";
+ libraryHaskellDepends = [
+ base base64-bytestring binary bytestring containers n2o n2o-nitro
+ time
+ ];
+ description = "N2O Protocols Starter Pack";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "n2o-web" = callPackage
+ ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+ , bytestring, case-insensitive, containers, n2o, n2o-protocols
+ , network, text, websockets
+ }:
+ mkDerivation {
+ pname = "n2o-web";
+ version = "0.11.2";
+ sha256 = "0d01lsfd2rwavzm01bkk3020r0wpfqyyqjbdf1pc8hw1im3843p6";
+ libraryHaskellDepends = [
+ attoparsec base base64-bytestring binary bytestring
+ case-insensitive containers n2o n2o-protocols network text
+ websockets
+ ];
+ description = "N2O adapter for WebSockets";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"nagios-check" = callPackage
({ mkDerivation, base, bifunctors, exceptions, hspec, mtl
, QuickCheck, text
@@ -145343,8 +151522,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
@@ -145401,6 +151580,8 @@ self: {
pname = "named";
version = "0.2.0.0";
sha256 = "17ldvxypf099wj5phzh2aymzfwmyiyzhz24h1aj2s21nrys5n6n0";
+ revision = "2";
+ editedCabalFile = "0h9d74h6g685g1g0ylqf7kws1ancdy3q6fi39vinf5alkqa7kxwd";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base ];
description = "Named parameters (keyword arguments) for Haskell";
@@ -145501,12 +151682,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;
@@ -145665,6 +151852,24 @@ self: {
}) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL;
inherit (pkgs) libGLU;};
+ "nanovg-simple" = callPackage
+ ({ mkDerivation, base, GLFW-b, monad-loops, nanovg, OpenGL
+ , safe-exceptions, text
+ }:
+ mkDerivation {
+ pname = "nanovg-simple";
+ version = "0.4.0.0";
+ sha256 = "0k9sykyipj6gndkgk9j2l4r7a4kac851g077279a2j1k45dilcjn";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base GLFW-b monad-loops nanovg OpenGL safe-exceptions text
+ ];
+ description = "Simple interface to rendering with NanoVG";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"nanq" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, extensible-effects, kanji, microlens, microlens-aeson
@@ -145693,6 +151898,8 @@ self: {
pname = "naperian";
version = "0.1.0.0";
sha256 = "0ydlwk1m3xi12bv2rylay4lrz5j5aj1lz95ivilnh89qg4ahrnlb";
+ revision = "1";
+ editedCabalFile = "10bby5qlkw6yv2mh6zyscwda49hkxmxmrqfqjinlj246xi879f3m";
libraryHaskellDepends = [
adjunctions base comonad distributive free streams transformers
];
@@ -145855,8 +152062,8 @@ self: {
}:
mkDerivation {
pname = "natural";
- version = "0.3.0.2";
- sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd";
+ version = "0.3.0.3";
+ sha256 = "18ycqn164kl203wmvrdyfbwfgbbyzyl38i86sllmkwpqq2ciarwi";
libraryHaskellDepends = [ base lens semigroupoids ];
testHaskellDepends = [
base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
@@ -145924,8 +152131,8 @@ self: {
pname = "natural-transformation";
version = "0.4";
sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
- revision = "6";
- editedCabalFile = "0qdjf1756gmq6vjd1p7i4b398s7j1gqfiaz3yf894h5p6x1ym0zl";
+ revision = "7";
+ editedCabalFile = "03nkhdrwki9j81clgfck4yl7ylv6dwa7gi77kknzq3s3nqlp728v";
libraryHaskellDepends = [ base ];
testHaskellDepends = [
base containers quickcheck-instances tasty tasty-quickcheck
@@ -146070,6 +152277,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
@@ -146326,8 +152550,8 @@ self: {
}:
mkDerivation {
pname = "nested-routes";
- version = "9.0.1.1";
- sha256 = "1s9jf5ik6m85nqjclj0m8ba41s3lfd93mqm6azynv7kg3cp9v4rl";
+ version = "9.0.2";
+ sha256 = "197q5fapwj5rnlqvwlzajjn8sjb960mgxqd7sbw2sih6cj63a9a2";
libraryHaskellDepends = [
attoparsec base errors exceptions extractable-singleton hashable
monad-control-aligned mtl poly-arity pred-trie regex-compat text
@@ -146409,6 +152633,28 @@ self: {
broken = true;
}) {ghc-binary = null;};
+ "net-spider" = callPackage
+ ({ mkDerivation, aeson, base, containers, data-interval, doctest
+ , doctest-discover, extended-reals, greskell, greskell-websocket
+ , hashable, hspec, monad-logger, safe-exceptions, text, time
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "net-spider";
+ version = "0.2.0.0";
+ sha256 = "0xka2fa5zxznm2fg5xmc2c2ppamwybdlmh5jqy00ivxjmliy20s0";
+ libraryHaskellDepends = [
+ aeson base containers data-interval extended-reals greskell
+ greskell-websocket hashable monad-logger safe-exceptions text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ base doctest doctest-discover 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 +152840,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 +153087,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 +153182,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
@@ -147016,6 +153260,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "network-bsd" = callPackage
+ ({ mkDerivation, base, network }:
+ mkDerivation {
+ pname = "network-bsd";
+ version = "2.8.0.0";
+ sha256 = "0dfbwgrr28y6ypw7p1ppqg7v746qf14569q4xazj4ahdjw2xkpi5";
+ libraryHaskellDepends = [ base network ];
+ doHaddock = false;
+ description = "Network.BSD";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"network-builder" = callPackage
({ mkDerivation, aeson, base, bytestring, cabal-test-bin, hspec
, hspec-server, optparse-applicative, process, shelly, text, yaml
@@ -147038,6 +153294,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 +153322,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 +153529,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 +153546,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 +153557,7 @@ self: {
];
description = "WebSocket backend for MessagePack RPC";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"network-metrics" = callPackage
@@ -147304,6 +153573,7 @@ self: {
];
description = "Send metrics to Ganglia, Graphite, and statsd";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"network-minihttp" = callPackage
@@ -147335,6 +153605,7 @@ self: {
libraryHaskellDepends = [ base binary bytestring network unix ];
description = "Recvmsg and sendmsg bindings";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"network-msgpack-rpc" = callPackage
@@ -147471,15 +153742,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 +153773,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 +154030,8 @@ self: {
({ mkDerivation, base, doctest, network-uri, template-haskell }:
mkDerivation {
pname = "network-uri-static";
- version = "0.1.0.0";
- sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9";
+ version = "0.1.2.0";
+ sha256 = "1r1blpz313v6qacvbns53c2i1zgvadvl0ibmp2s3bv1ymm4caj74";
libraryHaskellDepends = [ base network-uri template-haskell ];
testHaskellDepends = [ base doctest ];
description = "A small utility to declare type-safe static URIs";
@@ -147931,14 +154202,13 @@ self: {
}:
mkDerivation {
pname = "newsynth";
- version = "0.3.0.3";
- sha256 = "1vbh9d17mibzjkakqwda2dcmqkamaq48zv0dcd104xmgkgmqzvw2";
+ version = "0.3.0.4";
+ sha256 = "0w31h7xqv9sk0jb1mdviv107w8y7v018bzdvdw8gcrjyvp47307q";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [
- base containers fixedprec random superdoc
- ];
- executableHaskellDepends = [ base random superdoc time ];
+ setupHaskellDepends = [ base superdoc ];
+ libraryHaskellDepends = [ base containers fixedprec random ];
+ executableHaskellDepends = [ base random time ];
description = "Exact and approximate synthesis of quantum circuits";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -148091,6 +154361,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.1";
+ sha256 = "1y6fznq60r52xwvf9i99k5mczll2x8k064jn6ww97fldhrij1g1k";
+ 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 +154407,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export";
- version = "1.4.1";
- sha256 = "1a9swysq72igyfbqw078fj3j8vw6hw1v5h4f64kh9wvvdcrdl2rh";
+ version = "1.6.2";
+ sha256 = "1wvh33raci7s4hczcfn5sj2kk1g61ry6xwn3lg7g3yy5bn7azv73";
libraryHaskellDepends = [
async base binary bytestring deepseq monad-loops template-haskell
unix
@@ -148126,6 +154417,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.4.1.0";
+ sha256 = "0q70p894sqzzx534vxl8grrizllzhw3cx1d02nfg88h7gr82zp3f";
+ 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
@@ -148333,18 +154639,18 @@ self: {
}) {};
"nix-delegate" = callPackage
- ({ mkDerivation, base, foldl, managed, neat-interpolation
- , optparse-applicative, text, turtle
+ ({ mkDerivation, base, bytestring, foldl, managed
+ , neat-interpolation, optparse-applicative, text, turtle
}:
mkDerivation {
pname = "nix-delegate";
- version = "1.0.0";
- sha256 = "1fzk6a2izs8sf2gq93m91m6l7h8i3374as8979h106588ww2ghhb";
+ version = "1.0.1";
+ sha256 = "00wyzj4xck0kjn3151q9crsycgh26nvg56567c0ifdr0s5h5f00w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base foldl managed neat-interpolation optparse-applicative text
- turtle
+ base bytestring foldl managed neat-interpolation
+ optparse-applicative text turtle
];
executableHaskellDepends = [ base ];
description = "Convenient utility for distributed Nix builds";
@@ -148353,18 +154659,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;
@@ -148377,8 +154683,8 @@ self: {
}:
mkDerivation {
pname = "nix-derivation";
- version = "1.0.1";
- sha256 = "1z36ihzcnll6vpvv8hr95j9vx0j69v7nir6bxgd6wmidpzigkdmc";
+ version = "1.0.2";
+ sha256 = "16xx4817ncgqvhmydbfr35lhgiw34js2n5liyfing3qvbfprmscw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -148395,18 +154701,18 @@ self: {
"nix-diff" = callPackage
({ mkDerivation, attoparsec, base, containers, Diff, mtl
- , nix-derivation, optparse-generic, system-filepath, text, unix
+ , nix-derivation, optparse-applicative, system-filepath, text, unix
, vector
}:
mkDerivation {
pname = "nix-diff";
- version = "1.0.4";
- sha256 = "1ggsqm8bcfvx3l2nji90gwllkq2v832wihf8msfi9br4mqwx234j";
+ version = "1.0.5";
+ sha256 = "1gs19y4k4aykm3hzpkygdx5wqblcnqxbh3jq3hl18sm8h4cf9871";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- attoparsec base containers Diff mtl nix-derivation optparse-generic
- system-filepath text unix vector
+ attoparsec base containers Diff mtl nix-derivation
+ optparse-applicative system-filepath text unix vector
];
description = "Explain why two Nix derivations differ";
license = stdenv.lib.licenses.bsd3;
@@ -148479,6 +154785,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 +154832,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 ];
@@ -148574,8 +154904,8 @@ self: {
({ mkDerivation, base, containers, megaparsec, Nmis }:
mkDerivation {
pname = "nmis-parser";
- version = "0.1.0.1";
- sha256 = "0fgh0x2b468j3pxx5nqkvq1wavgap9q7hdnypmdqn5v5jp45l36z";
+ version = "0.1.0.2";
+ sha256 = "0ad30rdpsd80ysqsaa72m3nnwzslr666ssnwlxyhvmbn3aqqvfbb";
libraryHaskellDepends = [ base containers megaparsec ];
testHaskellDepends = [ base Nmis ];
description = "NMIS file parser";
@@ -148712,6 +155042,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "nominal" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "nominal";
+ version = "0.2.0.0";
+ sha256 = "1wd2vd0qn8ln3a5r29gikdcr4c2c2rf43p6kq3wmqm8ww30djgca";
+ libraryHaskellDepends = [ base containers ];
+ description = "Binders and alpha-equivalence made easy";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"nomyx-api" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, either
, hslogger, lens, mtl, network-uri, nomyx-core, nomyx-language
@@ -148864,12 +155205,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;
}) {};
@@ -148894,6 +155235,7 @@ self: {
testHaskellDepends = [ base doctest Glob hspec QuickCheck text ];
description = "Non empty Data.Text type";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"non-empty-zipper" = callPackage
@@ -148959,12 +155301,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "nonempty-containers" = callPackage
+ ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
+ , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these
+ }:
+ mkDerivation {
+ pname = "nonempty-containers";
+ version = "0.1.1.0";
+ sha256 = "1vhpanz5n7fljc86kxif9kp9fr75wr87wy1fmawd7c5qmhk1b61k";
+ libraryHaskellDepends = [
+ base comonad containers deepseq semigroupoids these
+ ];
+ testHaskellDepends = [
+ base comonad containers hedgehog hedgehog-fn semigroupoids tasty
+ tasty-hedgehog text these
+ ];
+ description = "Non-empty variants of containers data types, with full API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"nonemptymap" = callPackage
({ mkDerivation, base, containers, semigroupoids }:
mkDerivation {
pname = "nonemptymap";
- version = "0.0.4.0";
- sha256 = "0rkdhbg0bps8ws20xspw98fkmbcgzfir9kk5pxwir8x6pwwbfd8h";
+ version = "0.0.6.0";
+ sha256 = "1pzs51kmsyarv62qqbskhw2xlkjp74bwcgs9a8ri1jk96m64rg94";
libraryHaskellDepends = [ base containers semigroupoids ];
description = "A NonEmptyMap Implementation";
license = stdenv.lib.licenses.bsd3;
@@ -149142,6 +155503,7 @@ self: {
libraryHaskellDepends = [ base ];
description = "Useful utility functions that only depend on base";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"notcpp" = callPackage
@@ -149231,6 +155593,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 +155656,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 +155783,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 +156020,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 +156228,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;
@@ -149877,17 +156267,21 @@ self: {
}) {};
"nuxeo" = callPackage
- ({ mkDerivation, attoparsec, base, bytestring, conduit
- , conduit-extra, text, time
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
+ , conduit-extra, http-conduit, http-types, optparse-applicative
+ , text, time, url
}:
mkDerivation {
pname = "nuxeo";
- version = "0.2.0.3";
- sha256 = "1assz03rv0vdbgl2ihcr7sbx7ifsv7m2mp6lg2jgy5h0ghnlwzcd";
+ version = "0.3.2";
+ sha256 = "0m0rnrcay92vi47dd6cbba5vdjzdrmwb9s7wic95cbsb7wmajc72";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- attoparsec base bytestring conduit conduit-extra text time
+ aeson attoparsec base bytestring conduit conduit-extra http-conduit
+ http-types text time url
];
- description = "Nuxeo";
+ executableHaskellDepends = [ base optparse-applicative text ];
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -149903,8 +156297,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 +156371,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 +156440,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 ];
@@ -150129,6 +156523,32 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "oauth2-jwt-bearer" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, cryptonite
+ , hedgehog, http-client, http-client-tls, http-types, jose, lens
+ , mmorph, network, Spock-core, streaming-commons, text, time
+ , transformers, transformers-bifunctors, unordered-containers, warp
+ , x509, x509-store
+ }:
+ mkDerivation {
+ pname = "oauth2-jwt-bearer";
+ version = "0.0.1";
+ sha256 = "0fcq0ggzhjpr8v2s0k6izjs1pp0lcbf7kb12vmclyy5bzby8vkcn";
+ libraryHaskellDepends = [
+ aeson base bytestring http-client http-client-tls http-types jose
+ lens text time transformers transformers-bifunctors
+ unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson async base bytestring cryptonite hedgehog http-client
+ http-client-tls http-types jose mmorph network Spock-core
+ streaming-commons text warp x509 x509-store
+ ];
+ description = "OAuth2 jwt-bearer client flow as per rfc7523";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"oauthenticated" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
, bytestring, case-insensitive, cryptonite, exceptions, hspec
@@ -150278,14 +156698,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "oblivious-transfer" = callPackage
+ ({ mkDerivation, base, bytestring, cryptonite, memory, protolude
+ , QuickCheck, random, tasty, tasty-discover, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "oblivious-transfer";
+ version = "0.1.0";
+ sha256 = "1kq5ppm151q1im14j6zm2w0pn60baj6gzxmfqfx8p0m7a7wwl7sz";
+ revision = "1";
+ editedCabalFile = "1v9js45kc94zirg530d0f3r9wwsx60xnz7diqzvfxlbvw01649yk";
+ libraryHaskellDepends = [
+ base bytestring cryptonite memory protolude random
+ ];
+ testHaskellDepends = [
+ base bytestring cryptonite memory protolude QuickCheck random tasty
+ tasty-discover tasty-hunit tasty-quickcheck
+ ];
+ testToolDepends = [ tasty-discover ];
+ description = "An implementation of the Oblivious Transfer protocol in Haskell";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"observable" = callPackage
- ({ mkDerivation, async, base, transformers }:
+ ({ mkDerivation, base, transformers }:
mkDerivation {
pname = "observable";
- version = "0.1.1";
- sha256 = "1mcjmna0fra3xcxxxq4a7rzndrmh752ps0ykim1ikcjrgh2r0cpp";
- libraryHaskellDepends = [ async base transformers ];
- description = "Make your action to be observable and listen events from them";
+ version = "0.1.5";
+ sha256 = "0hi9y867yg48nv0756ylblxmsdw9vkfg72n0bb0ali227695d6qb";
+ libraryHaskellDepends = [ base transformers ];
+ description = "Continuation patterns";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -150334,8 +156777,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 +156891,8 @@ self: {
}:
mkDerivation {
pname = "odbc";
- version = "0.2.0";
- sha256 = "1dv7h2c6y59dsyhz99k1lzydms618i65jra7gzacf88zb4idnvi7";
+ version = "0.2.2";
+ sha256 = "0dkkkrv43kl3643i0j4hgj1mcsk1jhrl086dygd6hqb9hd4156k5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -150524,6 +156967,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "oeis2" = callPackage
+ ({ mkDerivation, aeson, base, containers, hspec, http-conduit, lens
+ , lens-aeson, QuickCheck, text, vector
+ }:
+ mkDerivation {
+ pname = "oeis2";
+ version = "1.0.0";
+ sha256 = "0rrzdv5ida7vlvrpchzsjq3r8pnkrjxn8c6413qxnz2q512igi9l";
+ libraryHaskellDepends = [
+ aeson base containers http-conduit lens lens-aeson text vector
+ ];
+ testHaskellDepends = [
+ aeson base containers hspec http-conduit lens lens-aeson QuickCheck
+ text vector
+ ];
+ description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"off-simple" = callPackage
({ mkDerivation, base, parsec3, vector }:
mkDerivation {
@@ -150894,6 +157356,27 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "once_0_4" = callPackage
+ ({ mkDerivation, async, base, containers, hashable, hspec
+ , hspec-discover, HUnit, template-haskell, unordered-containers
+ }:
+ mkDerivation {
+ pname = "once";
+ version = "0.4";
+ sha256 = "0az973cg4mf1azvh3x1gvp395ism7300mlajj9pvqmawvfar3g9h";
+ libraryHaskellDepends = [
+ base containers hashable template-haskell unordered-containers
+ ];
+ testHaskellDepends = [
+ async base containers hashable hspec HUnit template-haskell
+ unordered-containers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "memoization for IO actions and functions";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"one-line-aeson-text" = callPackage
({ mkDerivation, aeson, base, doctest, text, unordered-containers
}:
@@ -151054,8 +157537,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 +157555,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
@@ -151140,6 +157626,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "open-adt" = callPackage
+ ({ mkDerivation, base, constraints, recursion-schemes, row-types
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "open-adt";
+ version = "1.0";
+ sha256 = "1v9gb06cifykapx2kjbi8kmkbvs625ydciv7g77ngnmaijzfsm4a";
+ libraryHaskellDepends = [
+ base constraints recursion-schemes row-types template-haskell
+ ];
+ description = "Open algebraic data types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "open-adt-tutorial" = callPackage
+ ({ mkDerivation, base, constraints, deriving-compat, open-adt
+ , recursion-schemes, row-types, template-haskell
+ }:
+ mkDerivation {
+ pname = "open-adt-tutorial";
+ version = "1.0";
+ sha256 = "19sgj0k0axlv15jlr945hh4j6wq8aqhafmj5m7njd5qp7yrbw66w";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base constraints deriving-compat open-adt recursion-schemes
+ row-types template-haskell
+ ];
+ executableHaskellDepends = [ base ];
+ description = "Open algebraic data type examples";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"open-browser" = callPackage
({ mkDerivation, base, process }:
mkDerivation {
@@ -151263,6 +157783,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "openapi-petstore" = 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 = "openapi-petstore";
+ version = "0.0.3.0";
+ sha256 = "1zm76djxnr2hrws3rhby144m2hqgwfk57cm3my2r26py76lf8c5i";
+ 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 openapi-petstore API Client";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"opench-meteo" = callPackage
({ mkDerivation, aeson, base, data-default, text, time }:
mkDerivation {
@@ -151300,9 +157848,6 @@ self: {
pname = "opencv";
version = "0.0.2.1";
sha256 = "1bwl3csl2bsgz32i7s59hb25hxj05vn9g3fa8xix9klz8kyrzam1";
- configureFlags = [
- "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++"
- ];
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
aeson base base64-bytestring bindings-DSL bytestring containers
@@ -151390,23 +157935,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 +157949,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 +158155,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 +158210,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 +158426,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 +158443,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 +158630,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 +158639,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 +158772,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
];
@@ -152295,6 +158832,8 @@ self: {
pname = "optparse-helper";
version = "0.2.1.1";
sha256 = "043mdm25lpzbfghmda0iayv7lnff1gni9g29pd5h2ssgscyvs2qa";
+ revision = "1";
+ editedCabalFile = "13zhsnpdw3kckjrc3sz2i5cqgxwd6sisvik02q0j43d940jmmdk0";
libraryHaskellDepends = [ base optparse-applicative ];
description = "Helper functions for optparse-applicative";
license = stdenv.lib.licenses.bsd3;
@@ -152354,6 +158893,7 @@ self: {
];
description = "Orchestration-style co-ordination EDSL";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"orchestrate" = callPackage
@@ -152455,8 +158995,8 @@ self: {
}:
mkDerivation {
pname = "order-statistic-tree";
- version = "0.1.1.0";
- sha256 = "1gcjlvb0wbjkb3vg1bsiqip3wmacpvbc3s96f0vcm67dssdaws80";
+ version = "0.1.1.1";
+ sha256 = "13fhnbsx95w79r7lb1mfah8hj3cp6cqpphy31ajc6gcnzbiaqgk5";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
benchmarkHaskellDepends = [
@@ -152499,8 +159039,8 @@ self: {
({ mkDerivation, base, containers }:
mkDerivation {
pname = "ordered-containers";
- version = "0.1.0";
- sha256 = "11smyc3z6xhb8j23wlgvvs8dvr82xmzpx2nhvkzazmgzrx3rf26b";
+ version = "0.1.1";
+ sha256 = "0m86imawwvr0bl18bbv9np8hlhs8ssn4l2dvxswa8f83fm61ai5a";
libraryHaskellDepends = [ base containers ];
description = "Set- and Map-like types that remember the order elements were inserted";
license = stdenv.lib.licenses.bsd3;
@@ -152582,21 +159122,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.3.0";
+ sha256 = "0p1lb3ba060nnr3msqzqy0ymbm4i0nkmwix8xx5zz6hir74ix3y9";
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 +159144,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 +159562,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
@@ -153358,6 +159912,33 @@ self: {
libraryHaskellDepends = [ base text ];
description = "Colorization of text for command-line output";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "pairing" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, cryptonite, memory
+ , protolude, QuickCheck, random, tasty, tasty-discover, tasty-hunit
+ , tasty-quickcheck, wl-pprint-text
+ }:
+ mkDerivation {
+ pname = "pairing";
+ version = "0.1.4";
+ sha256 = "13g1waqb32by4qlrl2hy3mgrr3lmfwkixy0745xv33vvw8wmm36c";
+ libraryHaskellDepends = [
+ base bytestring cryptonite memory protolude QuickCheck random
+ wl-pprint-text
+ ];
+ testHaskellDepends = [
+ base bytestring cryptonite memory protolude QuickCheck random tasty
+ tasty-discover tasty-hunit tasty-quickcheck wl-pprint-text
+ ];
+ testToolDepends = [ tasty-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion cryptonite memory protolude QuickCheck
+ random tasty tasty-hunit tasty-quickcheck wl-pprint-text
+ ];
+ description = "Optimal ate pairing over Barreto-Naehrig curves";
+ license = stdenv.lib.licenses.mit;
}) {};
"palette" = callPackage
@@ -153466,12 +160047,16 @@ self: {
base bytestring containers criterion mtl text time weigh
];
doCheck = false;
+ postInstall = ''
+ mkdir -p $out/share
+ mv $data/*/*/man $out/share/
+ '';
description = "Conversion between markup formats";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
- "pandoc_2_2_3_2" = callPackage
+ "pandoc_2_5" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
, binary, blaze-html, blaze-markup, bytestring, Cabal
, case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -153481,13 +160066,16 @@ self: {
, http-types, JuicyPixels, mtl, network, network-uri, pandoc-types
, parsec, process, QuickCheck, random, safe, SHA, skylighting
, split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
- , tasty-quickcheck, temporary, texmath, text, time, unix
- , unordered-containers, vector, weigh, xml, zip-archive, zlib
+ , tasty-quickcheck, temporary, texmath, text, time
+ , unicode-transforms, unix, unordered-containers, vector, weigh
+ , xml, zip-archive, zlib
}:
mkDerivation {
pname = "pandoc";
- version = "2.2.3.2";
- sha256 = "0dmk2vy0kfsi8xzpa8h0kypidf264d5rjvcqyd7jf34rjj47ikk2";
+ version = "2.5";
+ sha256 = "0bi26r2qljdfxq26gaxj1xnhrawrfndfavs3f3g098x0g3dwazfm";
+ revision = "1";
+ editedCabalFile = "15jzrlf1qnn3qkzy1zk5f300y7748qdz8yk0zg0zy7ygi36b403v";
configureFlags = [ "-fhttps" "-f-trypandoc" ];
isLibrary = true;
isExecutable = true;
@@ -153500,8 +160088,8 @@ self: {
Glob haddock-library hslua hslua-module-text HsYAML HTTP
http-client http-client-tls http-types JuicyPixels mtl network
network-uri pandoc-types parsec process random safe SHA skylighting
- split syb tagsoup temporary texmath text time unix
- unordered-containers vector xml zip-archive zlib
+ split syb tagsoup temporary texmath text time unicode-transforms
+ unix unordered-containers vector xml zip-archive zlib
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -153513,7 +160101,10 @@ self: {
benchmarkHaskellDepends = [
base bytestring containers criterion mtl text time weigh
];
- doCheck = false;
+ postInstall = ''
+ mkdir -p $out/share
+ mv $data/*/*/man $out/share/
+ '';
description = "Conversion between markup formats";
license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -153529,8 +160120,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-citeproc";
- version = "0.14.3.1";
- sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22";
+ version = "0.14.8.1";
+ sha256 = "04cdx0b9k3xk2ss97vws21pydxcwxffsgh7xrqrnwwc3v7jn80fz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -153554,6 +160145,41 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pandoc-citeproc_0_15_0_1" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+ , Cabal, containers, data-default, directory, filepath, hs-bibutils
+ , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+ , setenv, split, syb, tagsoup, temporary, text, time
+ , unordered-containers, vector, xml-conduit, yaml
+ }:
+ mkDerivation {
+ pname = "pandoc-citeproc";
+ version = "0.15.0.1";
+ sha256 = "1y4jmralmcikmk75cf5bjlv4ymr42x35a6174ybqa99jmlm5znr9";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal ];
+ libraryHaskellDepends = [
+ aeson base bytestring containers data-default directory filepath
+ hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+ setenv split syb tagsoup text time unordered-containers vector
+ xml-conduit yaml
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty attoparsec base bytestring filepath pandoc
+ pandoc-types syb text yaml
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers directory filepath mtl pandoc
+ pandoc-types process temporary text yaml
+ ];
+ doCheck = false;
+ description = "Supports using pandoc with citeproc";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pandoc-citeproc-preamble" = callPackage
({ mkDerivation, base, directory, filepath, pandoc-types, process
}:
@@ -153573,14 +160199,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.4.0";
+ sha256 = "15vfqpfkw4wnsg98804l5ylqbc926s2j5z4ik5zhval4d3kiamgz";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -153593,7 +160219,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 = [
@@ -153611,8 +160237,8 @@ self: {
({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
mkDerivation {
pname = "pandoc-csv2table";
- version = "1.0.5";
- sha256 = "12692c1lpp4pz08x1b9yxanpki5sxb5h9373vjp9af88rykqykl1";
+ version = "1.0.6";
+ sha256 = "0yv58p7l0cdk8xnn0nczmnff189dci04jr9psxzsj1yfkrvpc32h";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -153749,8 +160375,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 +160411,25 @@ 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.3.0";
+ sha256 = "0nzpww21j79s1ww2q26856m6zq325pz32jjd4hanki7ch0ni2kg2";
+ 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 +160469,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
@@ -153859,8 +160504,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-vimhl";
- version = "0.1.1.0";
- sha256 = "0xb7xz3b5vg9biq0zg1d4l3hkk6lxb6j9kzkrddy3h18yhnhzayf";
+ version = "0.1.2.4";
+ sha256 = "16gvlskbp2d000mbx2rkbz6dg6758ni4x2mkzxjyk5m475h13w6b";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -153911,15 +160556,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 +160736,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 +161143,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 +161234,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 +161323,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 +161345,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 +161363,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 {
@@ -154851,6 +161524,7 @@ self: {
];
description = "Parsec combinators for parsing Haskell numeric types";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"parsec-parsers" = callPackage
@@ -155108,8 +161782,8 @@ self: {
}:
mkDerivation {
pname = "parsers-megaparsec";
- version = "0.1.0.0";
- sha256 = "1xn12jbxv72hgkp9xarm9nr9rpqcijlyma47y31jz985r32nhaxj";
+ version = "0.1.0.1";
+ sha256 = "1fgxnxv5ispf7zg40fa35f1n7x7mk1pc8r96sbqpjbzasga79rx8";
libraryHaskellDepends = [
base fail megaparsec mtl parsers semigroups text transformers
];
@@ -155262,8 +161936,8 @@ self: {
({ mkDerivation, base, doctest, hedgehog }:
mkDerivation {
pname = "partial-semigroup";
- version = "0.3.0.3";
- sha256 = "1vsn82kpv2ny4yjj8gq8xaq8kvi55wzy8ix0k4lsppsda8j3s9rx";
+ version = "0.5.0.0";
+ sha256 = "03wfizykalpnv2i2qmj2vm27ajs1s8kmzy7ynsh8b2l43nafixqm";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest hedgehog ];
description = "A partial binary associative operator";
@@ -155275,8 +161949,8 @@ self: {
({ mkDerivation, base, hedgehog, partial-semigroup }:
mkDerivation {
pname = "partial-semigroup-hedgehog";
- version = "0.3.0.1";
- sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr";
+ version = "0.5.0.0";
+ sha256 = "17j27i0b971abz2j51a9nr599bqnwb65d2p1445a5s62hcz2jdzl";
libraryHaskellDepends = [ base hedgehog partial-semigroup ];
description = "Property testing for partial semigroups using Hedgehog";
license = stdenv.lib.licenses.asl20;
@@ -155287,8 +161961,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";
@@ -155305,6 +161979,7 @@ self: {
libraryHaskellDepends = [ base network-uri ];
description = "Datatype for passing around unresolved URIs";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"partly" = callPackage
@@ -155357,6 +162032,8 @@ self: {
pname = "passman-cli";
version = "0.2.0.0";
sha256 = "0l0cbhngg2dxsy95a24x1g19cpnmngcgdkxklzjymmcnqmxp7jd8";
+ revision = "1";
+ editedCabalFile = "197mlc2v7azdgdnvr2pxm2whhpqj4v2czwn5vi6ksrax82xswcnc";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -155370,25 +162047,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 +162127,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.2";
+ sha256 = "0lvgb0jl0bfzjqpap3gxlhn0mhbwbd15h33l1idpghxqpmzgvczy";
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 +162161,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";
@@ -155630,8 +162308,8 @@ self: {
({ mkDerivation, base, bytestring, path, safe-exceptions, text }:
mkDerivation {
pname = "path-text-utf8";
- version = "0.0.1.1";
- sha256 = "0c572nkkanz9n862q87q5jfpmg17v6flhl4201i67r7fp5icihwr";
+ version = "0.0.1.2";
+ sha256 = "1z8wyjsr7mgl120ayfl520i6p6s961380b1xy63zl7qp4cnnbhpn";
libraryHaskellDepends = [
base bytestring path safe-exceptions text
];
@@ -155678,6 +162356,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
@@ -155717,12 +162397,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "patience" = callPackage
+ "patience_0_1_1" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "patience" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "patience";
+ version = "0.2.0.0";
+ sha256 = "0jkw6ip6fvmxpjzsfxwx7jbh58asrsq5wnc9i5jq4cv3pgql8a0j";
libraryHaskellDepends = [ base containers ];
description = "Patience diff and longest increasing subsequence";
license = stdenv.lib.licenses.bsd3;
@@ -155762,6 +162456,8 @@ self: {
pname = "pattern-trie";
version = "0.1.0";
sha256 = "1ldy1b81sryngf4rlfsw3f2qw0cirjnbvddvw98wrl2m50wzdmlg";
+ revision = "1";
+ editedCabalFile = "1v9f28gpns5v646hdzn7xfimq2v0sx3rws56r7lfh1qgcfdavy9f";
libraryHaskellDepends = [
base bytestring containers deepseq hashable text
unordered-containers
@@ -156080,12 +162776,14 @@ self: {
pname = "pcre-heavy";
version = "1.0.0.2";
sha256 = "1lfbjgvl55jh226n307c2w8mrb3l1myzbkjh4j0jfcb8nybzcp4a";
+ revision = "1";
+ editedCabalFile = "14pprgwxkiaji3rqhsm0fv454wic6qxm7vy4a475yigadb1vz1ls";
libraryHaskellDepends = [
base base-compat bytestring pcre-light semigroups
string-conversions template-haskell
];
testHaskellDepends = [ base doctest Glob ];
- description = "A regexp library on top of pcre-light you can actually use";
+ description = "A regexp (regex) library on top of pcre-light you can actually use";
license = stdenv.lib.licenses.publicDomain;
}) {};
@@ -156401,6 +163099,7 @@ self: {
libraryHaskellDepends = [ base ];
description = "Peano numbers";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"peano-inf" = callPackage
@@ -156471,6 +163170,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 +163659,7 @@ self: {
];
description = "Permutations of finite sets";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"permute" = callPackage
@@ -156963,6 +163674,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "persist" = callPackage
+ ({ mkDerivation, base, bytestring, containers, QuickCheck
+ , test-framework, test-framework-quickcheck2, text
+ }:
+ mkDerivation {
+ pname = "persist";
+ version = "0.1.1.0";
+ sha256 = "1rk0pgy3dk9aq17p1kn2pzhppvpjzcs9righ3n7xchmsmiqqs2ji";
+ libraryHaskellDepends = [ base bytestring containers 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 +163815,40 @@ 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";
+ revision = "1";
+ editedCabalFile = "0c58yyqwvasby9gdv2502b8symdr0i9aqsli56wk9wjanb1fskj3";
+ 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 +164045,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 +164072,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 +164089,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 +164097,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 +164168,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 +164208,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 +164335,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 +164355,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 +164363,8 @@ self: {
}:
mkDerivation {
pname = "persistent-sqlite";
- version = "2.8.2";
- sha256 = "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6";
+ version = "2.9.0";
+ sha256 = "0yn99m64p49x0bghpbnm77bk3ghk99w2w5d1772cmx15aq2d7w0y";
configureFlags = [ "-fsystemlib" ];
isLibrary = true;
isExecutable = true;
@@ -157572,8 +164394,8 @@ self: {
pname = "persistent-template";
version = "2.5.4";
sha256 = "008afcy7zbw7bzp9jww8gdldb51kfm0fg4p0x4xcp61gx4679bjc";
- revision = "2";
- editedCabalFile = "03qgwk32krldph3blw5agiqcpccr3649hajyn8wm9k71zz82dpn6";
+ revision = "3";
+ editedCabalFile = "12f4pqxwfv2li78sd9s56p66xd0w465cmjycpkqvg8n1rjxkc8vs";
libraryHaskellDepends = [
aeson aeson-compat base bytestring containers ghc-prim
http-api-data monad-control monad-logger path-pieces persistent
@@ -157587,6 +164409,27 @@ self: {
maintainers = with stdenv.lib.maintainers; [ psibi ];
}) {};
+ "persistent-template-classy" = callPackage
+ ({ mkDerivation, base, lens, persistent, persistent-sqlite
+ , persistent-template, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "persistent-template-classy";
+ version = "0.1.0.1";
+ sha256 = "0ph5cfm5gj6qydv70s9bmb5ynymqnrhqiwcqpd0s87xj2iv9v46a";
+ libraryHaskellDepends = [
+ base lens persistent persistent-sqlite persistent-template
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base lens persistent persistent-sqlite persistent-template
+ template-haskell text
+ ];
+ description = "Generate classy lens field accessors for persistent models";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"persistent-test" = callPackage
({ mkDerivation, aeson, aeson-compat, attoparsec, base
, base64-bytestring, blaze-builder, blaze-html, blaze-markup
@@ -158040,12 +164883,15 @@ self: {
}) {};
"phaser" = callPackage
- ({ mkDerivation, base, bytestring, containers, text }:
+ ({ mkDerivation, base, bytestring, containers, QuickCheck, text }:
mkDerivation {
pname = "phaser";
- version = "1.0.0.1";
- sha256 = "1ig3hcalfg2qxb092krii6zv95kvq0kng4acvq7l3wz03x66wj29";
+ version = "1.0.1.0";
+ sha256 = "0c4b5mx2nz8r0bpk29knzgs1hq5f69wsscplk7dcfsqwkngid930";
libraryHaskellDepends = [ base bytestring containers text ];
+ testHaskellDepends = [
+ base bytestring containers QuickCheck text
+ ];
description = "Incremental multiple pass parser library";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -158117,8 +164963,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 +165120,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
@@ -158481,8 +165338,8 @@ self: {
({ mkDerivation, base, containers, random, rdtsc, transformers }:
mkDerivation {
pname = "picosat";
- version = "0.1.4";
- sha256 = "0fch3s2q5g5sif6xqd69v0kbf41061vdviifr6l9aym70jp9yvas";
+ version = "0.1.5";
+ sha256 = "0wc6zd1llyb880xvb8712b8mcil3arxnci68q2gmjb0gxa40jj6y";
libraryHaskellDepends = [ base containers transformers ];
testHaskellDepends = [ base containers random rdtsc transformers ];
description = "Bindings to the PicoSAT solver";
@@ -158532,33 +165389,46 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"piet" = callPackage
({ mkDerivation, array, base, containers, Imlib, mtl }:
mkDerivation {
@@ -158612,8 +165482,8 @@ self: {
}:
mkDerivation {
pname = "pinboard";
- version = "0.9.12.10";
- sha256 = "0jdhckdlpmgqrp8xy7m285w7kclg8dpl02szl6fd6iwzs8l8vjds";
+ version = "0.9.12.11";
+ sha256 = "12vj9lg7l2nb92j9mydsa8hcy0ql71qnphfhgdm30xrsps79vwd0";
libraryHaskellDepends = [
aeson base bytestring containers http-client http-client-tls
http-types monad-logger mtl network profunctors random
@@ -158628,6 +165498,33 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "pinboard_0_10_0_2" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, hspec
+ , http-client, http-client-tls, http-types, monad-logger, mtl
+ , network, profunctors, QuickCheck, random, semigroups, text, time
+ , transformers, unliftio, unliftio-core, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "pinboard";
+ version = "0.10.0.2";
+ sha256 = "0yi9xnvy153mrb6ypjx7pnbjapdsh65bxqfp6y0s7s6f8vwzpqff";
+ revision = "1";
+ editedCabalFile = "08khbrpsk9yhd795l2zjfhsp8f0wxxwwycrkhsfkqw295zcbaqbh";
+ libraryHaskellDepends = [
+ aeson base bytestring containers http-client http-client-tls
+ http-types monad-logger mtl network profunctors random text time
+ transformers unliftio unliftio-core unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers hspec mtl QuickCheck semigroups
+ text time transformers unliftio unliftio-core unordered-containers
+ ];
+ description = "Access to the Pinboard API";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pinch" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
, ghc-prim, hashable, hspec, hspec-discover, QuickCheck, semigroups
@@ -158635,8 +165532,8 @@ self: {
}:
mkDerivation {
pname = "pinch";
- version = "0.3.3.0";
- sha256 = "0bhds7k9bsma1bvihvz6qf832gi2krak3yd8lnddcv87hnjsr4hq";
+ version = "0.3.4.0";
+ sha256 = "10rmk6f9cb2l7dyybwpbin0i5dqdg59d17m627kj9abyrlhcyf8a";
libraryHaskellDepends = [
array base bytestring containers deepseq ghc-prim hashable
semigroups text unordered-containers vector
@@ -158785,6 +165682,8 @@ self: {
pname = "pipes";
version = "4.3.9";
sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w";
+ revision = "1";
+ editedCabalFile = "0mkwbbn8vlrsvm3pl2cyaw1qr9hbjqfm831naj7cbrmiksf2l5aa";
libraryHaskellDepends = [
base exceptions mmorph mtl semigroups transformers void
];
@@ -159078,8 +165977,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 +166309,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 ];
@@ -159605,18 +166508,16 @@ self: {
"pipes-s3" = callPackage
({ mkDerivation, aws, base, bytestring, exceptions, http-client
, http-client-tls, http-types, pipes, pipes-bytestring, pipes-safe
- , QuickCheck, resourcet, tasty, tasty-quickcheck, text
+ , QuickCheck, resourcet, semigroups, tasty, tasty-quickcheck, text
, transformers
}:
mkDerivation {
pname = "pipes-s3";
- version = "0.3.0.3";
- sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa";
- revision = "3";
- editedCabalFile = "14cz2sfyz0q0jrpjwj9a25flvcm7mhjhihg4pr356niyvnx1b01p";
+ version = "0.3.1";
+ sha256 = "1z32mgx3w5xiiaxcc22v492f03xlgkprn3pv1hqfqcfgsnxqbj5l";
libraryHaskellDepends = [
aws base bytestring http-client http-client-tls http-types pipes
- pipes-bytestring pipes-safe resourcet text transformers
+ pipes-bytestring pipes-safe resourcet semigroups text transformers
];
testHaskellDepends = [
base bytestring exceptions pipes pipes-bytestring pipes-safe
@@ -159635,8 +166536,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 +166546,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
@@ -159896,6 +166814,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pixela" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, data-default, http-client
+ , http-client-tls, http-types, split, text, unordered-containers
+ , uri-encode, vector
+ }:
+ mkDerivation {
+ pname = "pixela";
+ version = "0.2.1.0";
+ sha256 = "15bzvwd1dh27p1gs6kfilk34gfkbczz43w70xagk60hvf1mdlcxl";
+ libraryHaskellDepends = [
+ aeson base bytestring data-default http-client http-client-tls
+ http-types split text unordered-containers uri-encode vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring data-default http-client http-client-tls
+ http-types split text unordered-containers uri-encode vector
+ ];
+ description = "Pixela client";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"pixelated-avatar-generator" = callPackage
({ mkDerivation, async, base, bytestring, cli, hspec, JuicyPixels
, pureMD5, QuickCheck, random, split
@@ -159940,6 +166879,7 @@ self: {
];
description = "Haskell game engine like fantasy console";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pkcs1" = callPackage
@@ -160011,6 +166951,7 @@ self: {
libraryHaskellDepends = [ base containers ];
description = "Implementation of the PKTree spatial index data structure";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"placeholders" = callPackage
@@ -160117,6 +167058,78 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"plankton" = callPackage
({ mkDerivation, adjunctions, base, protolude }:
mkDerivation {
@@ -160224,6 +167237,7 @@ self: {
];
description = "run a subprocess, combining stdout and stderr";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"plist" = callPackage
@@ -160422,15 +167436,15 @@ self: {
"plotlyhs" = callPackage
({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
- , lucid, microlens, microlens-th, text
+ , lucid, microlens, microlens-th, text, time
}:
mkDerivation {
pname = "plotlyhs";
- version = "0.2";
- sha256 = "0n9jwp8j201mw29vagbz6f2jn8hbm46pfay5glsnf8p9nd309yw5";
+ version = "0.2.1";
+ sha256 = "1d7cqy22myp6r0x0b00amn64fra0lklb9jy2hd8ic9lxg0nd8pn9";
libraryHaskellDepends = [
aeson base blaze-html blaze-markup bytestring lucid microlens
- microlens-th text
+ microlens-th text time
];
description = "Haskell bindings to Plotly.js";
license = stdenv.lib.licenses.mit;
@@ -160789,6 +167803,7 @@ self: {
];
description = "Tool for refactoring expressions into pointfree form";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pointfree-fancy" = callPackage
@@ -160911,7 +167926,8 @@ self: {
librarySystemDepends = [ poker-eval ];
description = "Binding to libpoker-eval";
license = stdenv.lib.licenses.publicDomain;
- }) {inherit (pkgs) poker-eval;};
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {poker-eval = null;};
"pokitdok" = callPackage
({ mkDerivation, aeson, base, base64-string, bytestring
@@ -161166,6 +168182,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 +168258,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 +168273,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 +168488,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 = [
@@ -161529,6 +168557,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "port-utils" = callPackage
+ ({ mkDerivation, async, base, hspec, network, stm, transformers }:
+ mkDerivation {
+ pname = "port-utils";
+ version = "0.2.0.0";
+ sha256 = "1lvalwbizmvrrpbl2l1lblbv0c3qln1ln61x61zn26jxq2h8p7g1";
+ libraryHaskellDepends = [ base network ];
+ testHaskellDepends = [ async base hspec network stm transformers ];
+ description = "Utilities for creating and waiting on ports";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"portable-lines" = callPackage
({ mkDerivation, base, bytestring }:
mkDerivation {
@@ -161581,6 +168621,7 @@ self: {
librarySystemDepends = [ portaudio ];
description = "Haskell bindings for the PortAudio library";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) portaudio;};
"porte" = callPackage
@@ -161634,6 +168675,7 @@ self: {
libraryHaskellDepends = [ base directory process ];
description = "Library to interact with port tools on FreeBSD";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"positive" = callPackage
@@ -161712,6 +168754,7 @@ self: {
libraryHaskellDepends = [ base transformers unix ];
description = "Nice wrapper around POSIX fcntl advisory locks";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"posix-paths" = callPackage
@@ -161867,18 +168910,18 @@ self: {
}) {};
"postgres-websockets" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, base, base64-bytestring
- , bytestring, configurator, containers, contravariant, either
- , hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json
- , http-types, jose, jwt, lens, lens-aeson, optparse-applicative
- , postgresql-libpq, protolude, retry, stm, stm-containers
- , stringsearch, text, time, transformers, unordered-containers, wai
- , wai-app-static, wai-extra, wai-websockets, warp, websockets
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , containers, contravariant, either, envparse, hasql, hasql-pool
+ , hspec, hspec-wai, hspec-wai-json, http-types, jose, jwt, lens
+ , lens-aeson, postgresql-libpq, protolude, retry, stm
+ , stm-containers, stringsearch, text, time, transformers
+ , unordered-containers, wai, wai-app-static, wai-extra
+ , wai-websockets, warp, websockets
}:
mkDerivation {
pname = "postgres-websockets";
- version = "0.4.2.1";
- sha256 = "0jh4ms9lz456as24v9d4vqj2b52i9gw7svk5lzvb65nhfdpb4kfp";
+ version = "0.5.0.1";
+ sha256 = "0afhrzhixy0f31050jb04w8np6935wcl3j7ckbk0dm23mqz2z3zy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -161888,9 +168931,8 @@ self: {
unordered-containers wai wai-websockets websockets
];
executableHaskellDepends = [
- ansi-wl-pprint base base64-bytestring bytestring configurator hasql
- hasql-pool heredoc optparse-applicative protolude text time
- transformers wai wai-app-static wai-extra warp
+ base base64-bytestring bytestring envparse hasql hasql-pool
+ protolude text time transformers wai wai-app-static wai-extra warp
];
testHaskellDepends = [
aeson base containers hasql hasql-pool hspec hspec-wai
@@ -161913,8 +168955,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-binary";
- version = "0.12.1.1";
- sha256 = "181npyfnz9xbmwjfzcrmbwlzw2xchy2fsibiw6d3c01y45xv607v";
+ version = "0.12.1.2";
+ sha256 = "10h5299fxqmfz0kxyvivfy396q35gzg60spnjagyha33kx5m3bc3";
libraryHaskellDepends = [
aeson base base-prelude binary-parser bytestring
bytestring-strict-builder containers loch-th network-ip
@@ -161988,8 +169030,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 +169078,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 +169147,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 +169212,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
@@ -162194,8 +169267,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-simple-migration";
- version = "0.1.12.0";
- sha256 = "18sx8ila7w7k4ym4rs36dc48v0cdl3b4il5jfqyfcx34n3mb5y4q";
+ version = "0.1.13.0";
+ sha256 = "0rpcl6s1hwb5z0lkcrahh6ljx5zcb0aq8mrk691hfwazlhbv01zk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -162218,8 +169291,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 +169370,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 +169396,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 +169462,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 +169479,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 +169561,8 @@ self: {
}:
mkDerivation {
pname = "postmark";
- version = "0.2.3";
- sha256 = "140z6r01byld665471dbk5zdqaf6lrcxwqp0wvbs5fbpjq37mfmp";
+ version = "0.2.6";
+ sha256 = "0x8nvxhw6wwq9w9dl16gvh6j6la224s2ldakx694518amqd4avrx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -162551,8 +169627,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 +169637,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 +169659,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 +169895,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 +169979,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;
@@ -162972,8 +170051,8 @@ self: {
}:
mkDerivation {
pname = "pred-trie";
- version = "0.6.0.1";
- sha256 = "0hymhjh7idpibzdx0214laf0zjf3a4anhsmxn0p5g9xkgh7l7m72";
+ version = "0.6.1";
+ sha256 = "1db4dw9d1r8z1qvwcv4q6imws65811skj5a04j032qbrnshsvjfr";
libraryHaskellDepends = [
base containers deepseq hashable hashtables mtl poly-arity pred-set
QuickCheck semigroups strict tries unordered-containers
@@ -163521,14 +170600,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "pretty-show_1_8_1" = callPackage
+ "pretty-show_1_9_2" = 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.2";
+ sha256 = "01vqa5z364cgj73360rpb4rcysfgfyil9l7gxfp96vzcca3gi37a";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -163542,6 +170621,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pretty-show-ansi-wl" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, array, base, ghc-prim, happy
+ , haskell-lexer
+ }:
+ mkDerivation {
+ pname = "pretty-show-ansi-wl";
+ version = "1.9.2.1";
+ sha256 = "00g6crhwshscvchf4321sig1p7dr82is5vfa2x8vmxm7kr6ciki6";
+ libraryHaskellDepends = [
+ ansi-wl-pprint array base ghc-prim haskell-lexer
+ ];
+ libraryToolDepends = [ happy ];
+ description = "Like pretty-show, but only for ansi-wl-pprint";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"pretty-simple" = callPackage
({ mkDerivation, ansi-terminal, base, containers, criterion
, doctest, Glob, mtl, parsec, text, transformers
@@ -163561,14 +170656,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "pretty-simple_2_2_0_0" = callPackage
+ "pretty-simple_2_2_0_1" = callPackage
({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl
, text, transformers
}:
mkDerivation {
pname = "pretty-simple";
- version = "2.2.0.0";
- sha256 = "0cf7pfx98dq8ykxja7gi2y7zpczj41sqfg4dindm8v5knlv1ppik";
+ version = "2.2.0.1";
+ sha256 = "0wsi9235ihm15s145lxi7325vv2k4bhighc5m88kn1lk0pl81aqq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -163587,6 +170682,8 @@ self: {
pname = "pretty-sop";
version = "0.2.0.2";
sha256 = "0x1j5ngxwk176kr1qb0vr7zzjph1jxjc3bpzqcnph3rn2j6z4kyn";
+ revision = "2";
+ editedCabalFile = "04hzf2ajlnh3ynk72xr5s396v8y0d8fkr4pf11nqss7yf60dkxwi";
libraryHaskellDepends = [ base generics-sop pretty-show ];
description = "A generic pretty-printer using generics-sop";
license = stdenv.lib.licenses.bsd3;
@@ -163757,6 +170854,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 +170884,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 +170906,7 @@ self: {
];
description = "prim typeclass instances";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"prim-ref" = callPackage
@@ -163938,24 +171040,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 +171073,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 +171101,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 +171142,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 +171376,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 +171384,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
@@ -164333,16 +171444,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "process_1_6_4_0" = callPackage
+ "process_1_6_5_0" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, filepath
, unix
}:
mkDerivation {
pname = "process";
- version = "1.6.4.0";
- sha256 = "1w12ssmwpz5glmm964rxdc3fgi2w5sq9lac17rxs8p626r5p6rkn";
- revision = "1";
- editedCabalFile = "1sijph1gkqbdsdbwqlibhglzsdscmhskpys71b3lzlw0ga7c3k0a";
+ version = "1.6.5.0";
+ sha256 = "0a04jch13d0va47yhkf1ni7pk9hxsdr3m4h8645r4qs0mzvsby60";
libraryHaskellDepends = [ base deepseq directory filepath unix ];
testHaskellDepends = [ base bytestring directory ];
description = "Process libraries";
@@ -164637,18 +171746,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 +171755,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
@@ -164680,6 +171776,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "prof-flamegraph" = callPackage
+ ({ mkDerivation, base, optparse-applicative }:
+ mkDerivation {
+ pname = "prof-flamegraph";
+ version = "1.0.0";
+ sha256 = "10ca6jmgnavqf8p8zf643rg1pjnzzndri4rbpmz6jshgy55vikf6";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base optparse-applicative ];
+ description = "Generate flamegraphs from ghc RTS .prof files";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"prof2dot" = callPackage
({ mkDerivation, base, containers, filepath, haskell98, parsec }:
mkDerivation {
@@ -164765,6 +171874,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "profunctor-monad" = callPackage
+ ({ mkDerivation, base, constraints, hashable, mtl, profunctors
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "profunctor-monad";
+ version = "0.1.0.0";
+ sha256 = "15lz4mbf7jcg19gn0hh9q58713p26hvbm5q0sa4baxrwk9n3rghs";
+ libraryHaskellDepends = [ base constraints profunctors ];
+ testHaskellDepends = [
+ base hashable mtl transformers unordered-containers
+ ];
+ description = "Monadic bidirectional programming";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"profunctors" = callPackage
({ mkDerivation, base, base-orphans, bifunctors, comonad
, contravariant, distributive, semigroups, tagged, transformers
@@ -164911,16 +172036,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 +172057,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 +172437,8 @@ self: {
}:
mkDerivation {
pname = "propellor";
- version = "5.4.1";
- sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd";
+ version = "5.5.0";
+ sha256 = "0mcj3xsi125vcxf605h8fm4swg84b79iv01qnhv5vmp872dhmwbv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -165423,8 +172548,8 @@ self: {
({ mkDerivation, base, bytestring, c2hs, libpulseaudio }:
mkDerivation {
pname = "proteaaudio";
- version = "0.7.0.1";
- sha256 = "1v56qmgwj5cd8xbk19qgjwwkc1nbya1vagai7kypf5aj8c07gjrq";
+ version = "0.7.1.0";
+ sha256 = "1mmfcy7wwyniv5cpakcd73fapzy6z9n1yz66zsnk15ds2jclmqip";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring ];
@@ -165434,6 +172559,41 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) libpulseaudio;};
+ "proteome" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
+ , data-default-class, deepseq, directory, filepath, hslogger, HTF
+ , lens, messagepack, MissingH, mtl, nvim-hs, pretty-terminal
+ , prettyprinter, process, resourcet, split, stm, strings, text
+ , time, transformers, unliftio, utf8-string
+ }:
+ mkDerivation {
+ pname = "proteome";
+ version = "0.3.8.0";
+ sha256 = "1lr0a5vyf305ikhzf8xqrdzksz48vjlikx7zvjxkp0wsarz07ikd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal base bytestring containers data-default-class
+ deepseq directory filepath hslogger lens messagepack MissingH mtl
+ nvim-hs pretty-terminal prettyprinter process resourcet split stm
+ strings text time transformers unliftio utf8-string
+ ];
+ executableHaskellDepends = [
+ aeson ansi-terminal base bytestring containers data-default-class
+ deepseq directory filepath hslogger lens messagepack MissingH mtl
+ nvim-hs pretty-terminal prettyprinter process resourcet split stm
+ strings text time transformers unliftio utf8-string
+ ];
+ testHaskellDepends = [
+ aeson ansi-terminal base bytestring containers data-default-class
+ deepseq directory filepath hslogger HTF lens messagepack MissingH
+ mtl nvim-hs pretty-terminal prettyprinter process resourcet split
+ stm strings text time transformers unliftio utf8-string
+ ];
+ description = "neovim project manager";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"proto-lens_0_2_2_0" = callPackage
({ mkDerivation, attoparsec, base, bytestring, containers
, data-default-class, lens-family, parsec, pretty, text
@@ -165470,22 +172630,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "proto-lens-arbitrary" = callPackage
- ({ mkDerivation, base, bytestring, containers, lens-family
- , proto-lens, QuickCheck, text
+ "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-arbitrary";
- version = "0.1.2.1";
- sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2";
+ pname = "proto-lens";
+ version = "0.4.0.1";
+ sha256 = "1ryz183ds1k28nvw6y1w84k29aq5mgrpv5yyqarj0g463gp137cm";
+ enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base bytestring containers lens-family proto-lens QuickCheck text
+ attoparsec base bytestring containers deepseq lens-family
+ lens-labels parsec pretty text transformers void
];
- description = "Arbitrary instances for proto-lens";
+ description = "A lens-based implementation of protocol buffers in Haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "proto-lens-arbitrary_0_1_2_2" = callPackage
+ "proto-lens-arbitrary" = callPackage
({ mkDerivation, base, bytestring, containers, lens-family
, proto-lens, QuickCheck, text
}:
@@ -165498,6 +172662,21 @@ self: {
];
description = "Arbitrary instances for proto-lens";
license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "proto-lens-arbitrary_0_1_2_5" = callPackage
+ ({ mkDerivation, base, bytestring, containers, lens-family
+ , proto-lens, QuickCheck, text
+ }:
+ mkDerivation {
+ pname = "proto-lens-arbitrary";
+ version = "0.1.2.5";
+ sha256 = "13cd9r9r2g913p3d3m7ljgv97wsdlr0v6js1r7k2w6npclgj13hd";
+ libraryHaskellDepends = [
+ base bytestring containers lens-family proto-lens QuickCheck text
+ ];
+ description = "Arbitrary instances for proto-lens";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -165508,8 +172687,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 +172702,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,8 +172745,8 @@ self: {
({ mkDerivation, base, optparse-applicative, proto-lens, text }:
mkDerivation {
pname = "proto-lens-optparse";
- version = "0.1.1.1";
- sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw";
+ version = "0.1.1.4";
+ sha256 = "1dn5cjwbagcykh1fv99v6mmj7mlnl46nqlwpz1878fy7vl7i8lzh";
libraryHaskellDepends = [
base optparse-applicative proto-lens text
];
@@ -165575,20 +172754,6 @@ self: {
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";
- 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
({ mkDerivation, base, Cabal, lens-family, proto-lens
, proto-lens-protoc, protobuf, text
@@ -165624,17 +172789,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";
@@ -165670,32 +172835,6 @@ self: {
}) {inherit (pkgs) protobuf;};
"proto-lens-protoc" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, containers
- , data-default-class, deepseq, directory, filepath
- , haskell-src-exts, lens-family, lens-labels, pretty, process
- , proto-lens, protobuf, text
- }:
- mkDerivation {
- pname = "proto-lens-protoc";
- version = "0.3.1.0";
- sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx";
- 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
- ];
- libraryToolDepends = [ protobuf ];
- executableHaskellDepends = [
- base bytestring containers data-default-class deepseq filepath
- haskell-src-exts lens-family proto-lens text
- ];
- description = "Protocol buffer compiler for the proto-lens library";
- 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
@@ -165719,9 +172858,65 @@ self: {
];
description = "Protocol buffer compiler for the proto-lens library";
license = stdenv.lib.licenses.bsd3;
+ }) {inherit (pkgs) protobuf;};
+
+ "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.4.0.1";
+ sha256 = "1vigmy8aq65yaspgq803a4vxsq5v3zwlaq95yrf47zrvcx1lw3ni";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers filepath haskell-src-exts lens-family pretty
+ proto-lens text
+ ];
+ libraryToolDepends = [ protobuf ];
+ executableHaskellDepends = [
+ 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 +172969,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 = [
@@ -165808,6 +173003,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "protocol-buffers_2_4_12" = callPackage
+ ({ mkDerivation, aeson, array, base, base16-bytestring, binary
+ , bytestring, containers, directory, filepath, mtl, parsec, syb
+ , text, utf8-string, vector
+ }:
+ mkDerivation {
+ pname = "protocol-buffers";
+ version = "2.4.12";
+ sha256 = "0z1vkqdhj41bqnjhks4d82jby6l9j91k8ycna76bhv9p2w0gvp4g";
+ libraryHaskellDepends = [
+ aeson array base base16-bytestring binary bytestring containers
+ directory filepath mtl parsec syb text utf8-string vector
+ ];
+ description = "Parse Google Protocol Buffer specifications";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"protocol-buffers-descriptor" = callPackage
({ mkDerivation, base, bytestring, containers, protocol-buffers }:
mkDerivation {
@@ -165822,6 +173035,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "protocol-buffers-descriptor_2_4_12" = callPackage
+ ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
+ mkDerivation {
+ pname = "protocol-buffers-descriptor";
+ version = "2.4.12";
+ sha256 = "0h4c1pgl51h7xrsm76mz6wd1l41ps93y3nvdl0p7mks9w7wlpccn";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base bytestring containers protocol-buffers
+ ];
+ description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"protocol-buffers-descriptor-fork" = callPackage
({ mkDerivation, base, bytestring, containers
, protocol-buffers-fork
@@ -165857,22 +173085,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 +173098,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 +173134,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 +173302,8 @@ self: {
}:
mkDerivation {
pname = "pseudo-boolean";
- version = "0.1.6.0";
- sha256 = "1v28vbhcrx0mvciazlanwyaxwav0gfjc7sxz7adgims7mj64g1ra";
- revision = "2";
- editedCabalFile = "1wnp16zs9nx3b250cmh6j84scv821arc0grb8k08h0a3kphavqx1";
+ version = "0.1.8.0";
+ sha256 = "0na3kx4zxjmznfhw9121w8963vm2qppij5i93j4lvd3sflpwry9b";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder containers deepseq
dlist hashable megaparsec parsec void
@@ -166630,6 +173857,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "pure-shuffle" = callPackage
+ ({ mkDerivation, base, hspec, mono-traversable, QuickCheck
+ , random-shuffle, transformers
+ }:
+ mkDerivation {
+ pname = "pure-shuffle";
+ version = "0.1.1.1";
+ sha256 = "0wgb32xjgknq6ncq54frpzzkzrf1firg9blpl79pi2y477slgr6m";
+ libraryHaskellDepends = [ base mono-traversable random-shuffle ];
+ testHaskellDepends = [
+ base hspec mono-traversable QuickCheck random-shuffle transformers
+ ];
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"pure-zlib" = callPackage
({ mkDerivation, array, base, base-compat, bytestring
, bytestring-builder, containers, filepath, fingertree, HUnit
@@ -166678,56 +173920,59 @@ self: {
"purescript" = callPackage
({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
, ansi-wl-pprint, base, base-compat, blaze-html, bower-json, boxes
- , bytestring, cheapskate, clock, containers, data-ordlist, deepseq
- , directory, dlist, edit-distance, file-embed, filepath, fsnotify
- , gitrev, Glob, haskeline, hspec, hspec-discover, http-types, HUnit
- , language-javascript, lens, lifted-base, monad-control
- , monad-logger, mtl, network, optparse-applicative, parallel
- , parsec, pattern-arrows, process, protolude, regex-tdfa, safe
- , scientific, semigroups, sourcemap, spdx, split, stm, stringsearch
- , syb, tasty, tasty-hspec, text, time, transformers
- , transformers-base, transformers-compat, unordered-containers
- , utf8-string, vector, wai, wai-websockets, warp, websockets
+ , bytestring, Cabal, cheapskate, clock, containers, data-ordlist
+ , deepseq, directory, dlist, edit-distance, file-embed, filepath
+ , fsnotify, gitrev, Glob, haskeline, hspec, hspec-discover
+ , http-types, HUnit, language-javascript, lifted-base
+ , microlens-platform, monad-control, monad-logger, mtl, network
+ , optparse-applicative, parallel, parsec, pattern-arrows, process
+ , protolude, regex-tdfa, safe, scientific, semigroups, sourcemap
+ , split, stm, stringsearch, syb, tasty, tasty-hspec, text, time
+ , transformers, transformers-base, transformers-compat
+ , unordered-containers, utf8-string, vector, wai, wai-websockets
+ , warp, websockets
}:
mkDerivation {
pname = "purescript";
- version = "0.12.0";
- sha256 = "0lkrlry4rr1l1c5ncy7wlbv1ll6n0dkw7j1gjpxn3706gan921rb";
+ version = "0.12.1";
+ sha256 = "0m1460p8kllcbbk2ppp9hcf1jbzfnlim0nnkapj4wpm8jklngaw1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson aeson-better-errors ansi-terminal base base-compat blaze-html
- bower-json boxes bytestring cheapskate clock containers
+ bower-json boxes bytestring Cabal cheapskate clock containers
data-ordlist deepseq directory dlist edit-distance file-embed
- filepath fsnotify Glob haskeline language-javascript lens
- lifted-base monad-control monad-logger mtl parallel parsec
+ filepath fsnotify Glob haskeline language-javascript lifted-base
+ microlens-platform monad-control monad-logger mtl parallel parsec
pattern-arrows process protolude regex-tdfa safe scientific
- semigroups sourcemap spdx split stm stringsearch syb text time
+ semigroups sourcemap split stm stringsearch syb text time
transformers transformers-base transformers-compat
unordered-containers utf8-string vector
];
executableHaskellDepends = [
aeson aeson-better-errors ansi-terminal ansi-wl-pprint base
- base-compat blaze-html bower-json boxes bytestring cheapskate clock
- containers data-ordlist deepseq directory dlist edit-distance
+ base-compat blaze-html bower-json boxes bytestring Cabal cheapskate
+ clock containers data-ordlist deepseq directory dlist edit-distance
file-embed filepath fsnotify gitrev Glob haskeline http-types
- language-javascript lens lifted-base monad-control monad-logger mtl
- network optparse-applicative parallel parsec pattern-arrows process
- protolude regex-tdfa safe scientific semigroups sourcemap spdx
- split stm stringsearch syb text time transformers transformers-base
- transformers-compat unordered-containers utf8-string vector wai
- wai-websockets warp websockets
+ language-javascript lifted-base microlens-platform monad-control
+ monad-logger mtl network optparse-applicative parallel parsec
+ pattern-arrows process protolude regex-tdfa safe scientific
+ semigroups sourcemap split stm stringsearch syb text time
+ transformers transformers-base transformers-compat
+ unordered-containers utf8-string vector wai wai-websockets warp
+ websockets
];
testHaskellDepends = [
aeson aeson-better-errors ansi-terminal base base-compat blaze-html
- bower-json boxes bytestring cheapskate clock containers
+ bower-json boxes bytestring Cabal cheapskate clock containers
data-ordlist deepseq directory dlist edit-distance file-embed
filepath fsnotify Glob haskeline hspec hspec-discover HUnit
- language-javascript lens lifted-base monad-control monad-logger mtl
- parallel parsec pattern-arrows process protolude regex-tdfa safe
- scientific semigroups sourcemap spdx split stm stringsearch syb
- tasty tasty-hspec text time transformers transformers-base
- transformers-compat unordered-containers utf8-string vector
+ language-javascript lifted-base microlens-platform monad-control
+ monad-logger mtl parallel parsec pattern-arrows process protolude
+ regex-tdfa safe scientific semigroups sourcemap split stm
+ stringsearch syb tasty tasty-hspec text time transformers
+ transformers-base transformers-compat unordered-containers
+ utf8-string vector
];
testToolDepends = [ hspec-discover ];
doCheck = false;
@@ -166774,28 +174019,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, vector
+ , zeromq4-haskell, zeromq4-simple
}:
mkDerivation {
pname = "purescript-iso";
- version = "0.0.1.2";
- sha256 = "0mlrj4q40d71r61lc5h9a7wfycmj1kgn6appaqbffrdjz64hmrfh";
+ version = "0.0.6";
+ sha256 = "0zz71c8mv86ihqwcqsp0cjw9dlyd0xw394dz14mwg16frajn986k";
libraryHaskellDepends = [
- aeson async attoparsec-uri base bytestring containers monad-control
- mtl QuickCheck quickcheck-instances stm strict text time
- utf8-string uuid zeromq4-haskell zeromq4-simple
+ 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 vector zeromq4-haskell zeromq4-simple
];
testHaskellDepends = [
- 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
+ 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 vector 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
@@ -166863,24 +174113,25 @@ self: {
"push-notify-apn" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring
- , containers, data-default, http2, http2-client
- , optparse-applicative, random, text, time, tls, x509, x509-store
+ , containers, data-default, hspec, http2, http2-client
+ , optparse-applicative, random, semigroups, text, time, tls, x509
+ , x509-store
}:
mkDerivation {
pname = "push-notify-apn";
- version = "0.1.0.8";
- sha256 = "1077sgc2fhaf99y7p09638bx3w1xlayg2jsf0sf2g85rc6j971nd";
+ version = "0.1.1.0";
+ sha256 = "06hm83g88mbaikx3gy51vkslhhpvy5ipajwgyxcczkvh7x4a3z2j";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base base16-bytestring binary bytestring containers
- data-default http2 http2-client random text time tls x509
- x509-store
+ data-default http2 http2-client random semigroups text time tls
+ x509 x509-store
];
executableHaskellDepends = [
- base bytestring optparse-applicative text
+ base bytestring optparse-applicative semigroups text
];
- testHaskellDepends = [ base ];
+ testHaskellDepends = [ aeson base hspec ];
description = "Send push notifications to mobile iOS devices";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -166981,8 +174232,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
@@ -167446,8 +174697,8 @@ self: {
}:
mkDerivation {
pname = "qnap-decrypt";
- version = "0.3.2";
- sha256 = "1qq1cpnn7bg3nb3ig86wcc6xvjyljckjd1bgivh1sfhxh8p0p4ys";
+ version = "0.3.3";
+ sha256 = "0gwnpyzyrfw6i8a5arm8q6psjhwa8kl8n94wcglsnl59k1iadfb6";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -167488,8 +174739,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
@@ -167533,6 +174784,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "qsem" = callPackage
+ ({ mkDerivation, base, ghc-prim }:
+ mkDerivation {
+ pname = "qsem";
+ version = "0.1.0.0";
+ sha256 = "1y9c22jr0frflgzmpzpz4d7zgcz7wbql8xwr6bx912rh6gm4gx9h";
+ libraryHaskellDepends = [ base ghc-prim ];
+ description = "quantity semaphores";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"qt" = callPackage
({ mkDerivation, base, OpenGL, qtc_core, qtc_gui, qtc_network
, qtc_opengl, qtc_script, qtc_tools
@@ -167557,8 +174819,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 +174877,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 +174910,10 @@ self: {
}:
mkDerivation {
pname = "quadratic-irrational";
- version = "0.0.5";
- sha256 = "1z9a1q8px4sx7fq9i1lwfx98kz0nv8zhkz5vsfn31krvd4xvkndz";
+ version = "0.0.6";
+ sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0";
+ revision = "1";
+ editedCabalFile = "0i7dsl7zm9r7sgfs2cwmic3qbk15lc7kbhjd53vin89p21fh8mzm";
libraryHaskellDepends = [
arithmoi base containers mtl transformers
];
@@ -167700,15 +174964,17 @@ 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";
+ revision = "1";
+ editedCabalFile = "0fn5ixppdyw4niyyf9iasvrbnaimjhwwi7di4l13bfylnmriliw9";
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 +175355,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
@@ -168107,14 +175373,24 @@ self: {
({ mkDerivation, base, QuickCheck, unfoldable-restricted }:
mkDerivation {
pname = "quickcheck-combinators";
- version = "0.0.4";
- sha256 = "0i5hv58b8vgqbmwb7j8c9xr6qv0v5n2zjh3a9rab8x6hsdlb0mvv";
+ version = "0.0.5";
+ sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd";
libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
- description = "Simple type-level combinators for augmenting QuickCheck instances";
license = stdenv.lib.licenses.bsd3;
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 +175399,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 +175576,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.3";
+ sha256 = "0f9hsjhrnab8gy51m4m1fn5i594ixx1qw14hsfwsakbn8f78aarx";
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 +175685,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 +176241,7 @@ self: {
];
description = "Radix tree data structive over short byte-strings";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"radixtree" = callPackage
@@ -169221,8 +176494,8 @@ self: {
({ mkDerivation, base, criterion, deepseq, hspec }:
mkDerivation {
pname = "ralist";
- version = "0.2.1.0";
- sha256 = "19fnjza5gk02vdl4yvg453h44x41y19c81ldd7h60h82mkhsvc43";
+ version = "0.2.1.1";
+ sha256 = "0fy8c36ygdn609nq6wasc685y3z7g188nkhym7bpb7rigi1si7xj";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
benchmarkHaskellDepends = [ base criterion deepseq ];
@@ -169353,6 +176626,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 +176914,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 +176934,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 +176989,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;
}) {};
@@ -169759,6 +177043,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "rank2classes_1_2" = callPackage
+ ({ mkDerivation, base, distributive, doctest, tasty, tasty-hunit
+ , template-haskell, transformers
+ }:
+ mkDerivation {
+ pname = "rank2classes";
+ version = "1.2";
+ sha256 = "1qaqsg4xfvhdvffr42y1r95lkvm2spj27pwxz4vrhkxq56fkbj2p";
+ libraryHaskellDepends = [
+ base distributive template-haskell transformers
+ ];
+ testHaskellDepends = [
+ base distributive doctest tasty tasty-hunit
+ ];
+ description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"rapid" = callPackage
({ mkDerivation, async, base, containers, foreign-store, stm }:
mkDerivation {
@@ -170023,10 +177326,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 +177348,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;
@@ -170061,8 +177364,8 @@ self: {
}:
mkDerivation {
pname = "ratel";
- version = "1.0.5";
- sha256 = "0an55fbl8q7d0h4zlpx8vg4kijwmw99f2fvf50nq06c6snlfjg4r";
+ version = "1.0.7";
+ sha256 = "1kp6f45wn3a7wnsvj08a3b0kp5wwprw4rjrrqqd22yr9mpwx2z7w";
libraryHaskellDepends = [
aeson base bytestring case-insensitive containers http-client
http-client-tls http-types text uuid
@@ -170081,8 +177384,8 @@ self: {
}:
mkDerivation {
pname = "ratel-wai";
- version = "1.0.3";
- sha256 = "0bkk41qk0040a6sbsc5ky968gw1y5501ji7l2040hwz8j4z8wm84";
+ version = "1.0.4";
+ sha256 = "1cri461f40xa43kwg3wq5k98irfqypsi97xdk9n60yqhc8msca4m";
libraryHaskellDepends = [
base bytestring case-insensitive containers http-client ratel wai
];
@@ -170142,6 +177445,38 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "rattletrap_6_0_2" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
+ , bytestring, clock, containers, filepath, http-client
+ , http-client-tls, HUnit, template-haskell, temporary, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "rattletrap";
+ version = "6.0.2";
+ sha256 = "1904g1s61zazhg6zn189m7y9v5aap39zd0gfypzd9jrk6489aqi1";
+ 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 clock
+ 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 +177751,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 = [
@@ -170499,6 +177835,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {inherit (pkgs) re2;};
+ "re2_0_3" = callPackage
+ ({ mkDerivation, base, bytestring, HUnit, re2, vector }:
+ mkDerivation {
+ pname = "re2";
+ version = "0.3";
+ sha256 = "0slrbgpqccnxywy0aqlg65w6kzvfiqsf0n273m8cv3c32wvkw8nb";
+ libraryHaskellDepends = [ base bytestring vector ];
+ librarySystemDepends = [ re2 ];
+ testHaskellDepends = [ base bytestring HUnit vector ];
+ description = "Bindings to the re2 regular expression library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) re2;};
+
"react-flux" = callPackage
({ mkDerivation, aeson, base, bytestring, deepseq, mtl
, template-haskell, text, time, unordered-containers
@@ -170620,8 +177970,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 +178027,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 +178179,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 +178200,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 +178489,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 +178572,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 +178681,10 @@ self: {
}:
mkDerivation {
pname = "records-sop";
- version = "0.1.0.0";
- sha256 = "0ipxs13mlkhndbssa218fiajj2c26l5q5dl8n0p3h1qk6gjyfqa1";
+ version = "0.1.0.2";
+ sha256 = "187x3cq7h1rkmbv8qp810fcnr5y4byqwgw329v7f0s0px2vmg4h5";
+ revision = "1";
+ editedCabalFile = "082f4dmdvbnv6jq28mrva8clxif366vcbn9m8d1bb8lcf9h3qxjb";
libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ];
testHaskellDepends = [
base deepseq generics-sop hspec should-not-typecheck
@@ -171339,8 +178715,8 @@ self: {
({ mkDerivation, base, composition-prelude }:
mkDerivation {
pname = "recursion";
- version = "1.2.0.1";
- sha256 = "1j36fyyfml7i0dxxfammaaqmg6yg1whdar1ffsvpkjg4b8lkxlr4";
+ version = "2.2.0.0";
+ sha256 = "075rmdrfvaq14p6c3fpg8svf3klrxi5a43a4cgl2j61q5yhhgb3a";
libraryHaskellDepends = [ base composition-prelude ];
description = "A recursion schemes library for GHC";
license = stdenv.lib.licenses.bsd3;
@@ -171354,8 +178730,8 @@ self: {
pname = "recursion-schemes";
version = "5.0.3";
sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v";
- revision = "1";
- editedCabalFile = "0r0qwxa0yg6814w8zfdla3k25x971a7pdr06sqws7fz5zri8rrn8";
+ revision = "3";
+ editedCabalFile = "05fvpi3dc44h2a097fb9cq1jqdjq2b3sdf5hzfn9g00bid37bb5q";
libraryHaskellDepends = [
base base-orphans comonad free template-haskell th-abstraction
transformers
@@ -171505,8 +178881,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 +178919,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 +179213,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 +179381,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 = [
@@ -172269,8 +179662,8 @@ self: {
}:
mkDerivation {
pname = "regex";
- version = "1.0.1.3";
- sha256 = "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb";
+ version = "1.0.1.4";
+ sha256 = "15kdlb8wgdv72wsxd0av7j085vd3hg6lhpnx4wn3q659f43g6ahc";
libraryHaskellDepends = [
array base base-compat bytestring containers hashable regex-base
regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
@@ -172305,8 +179698,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;
@@ -172421,8 +179814,8 @@ self: {
}:
mkDerivation {
pname = "regex-examples";
- version = "1.0.1.3";
- sha256 = "0hmpq8w08n0vslnzqn6zsxp622dipg0ma42b4d47rjnv9ihl0jad";
+ version = "1.0.1.4";
+ sha256 = "0lxwp1kqacw7dvhbrzy7kl0w5g79gp22b9143m6cgd2f2z7bgzqp";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -172446,6 +179839,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "regex-generator" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , exceptions, hspec, HUnit, random, regex-pcre
+ }:
+ mkDerivation {
+ pname = "regex-generator";
+ version = "0.1.0.3";
+ sha256 = "0b8mgjnmdmiiliwnvq2qbn5af427swvzawa3az5w1xab8xszc9nl";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers exceptions random
+ ];
+ testHaskellDepends = [
+ base bytestring hspec HUnit random regex-pcre
+ ];
+ description = "Generate a random string from a PCRE";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"regex-genex" = callPackage
({ mkDerivation, base, containers, logict, mtl, regex-tdfa, sbv
, stream-monad, text
@@ -172708,8 +180119,8 @@ self: {
}:
mkDerivation {
pname = "regex-with-pcre";
- version = "1.0.1.3";
- sha256 = "17pq70wiyq97rh6ba1zsl6rzifi8k5mykn6kwwxcvjqqs9n2nzh9";
+ version = "1.0.1.4";
+ sha256 = "0pgy9bym4450kzhrzy3amw8dhswzvmqnj5i8pn33l8rvsyr37zp7";
libraryHaskellDepends = [
base base-compat bytestring containers regex regex-base
regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
@@ -172764,8 +180175,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 +180326,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "registry" = callPackage
+ ({ mkDerivation, async, base, exceptions, hedgehog, hedgehog-corpus
+ , io-memoize, MonadRandom, mtl, protolude, random, resourcet, tasty
+ , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base
+ }:
+ mkDerivation {
+ pname = "registry";
+ version = "0.1.2.0";
+ sha256 = "1y2fvb5qf2gz3nzw983v7r1xgdxxxg0n62sambngf7w8pww5p27d";
+ libraryHaskellDepends = [
+ base exceptions mtl protolude resourcet text transformers-base
+ ];
+ testHaskellDepends = [
+ async base exceptions hedgehog hedgehog-corpus io-memoize
+ MonadRandom mtl 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,25 +180765,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "relude_0_2_0" = callPackage
+ "relude_0_4_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, doctest
, gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
, tasty-hedgehog, text, transformers, unordered-containers
- , utf8-string
}:
mkDerivation {
pname = "relude";
- version = "0.2.0";
- sha256 = "097kiflrwvkb3mxpkydh6a6x84azv4xla9nlm5qscacl4kn5z3q5";
- revision = "1";
- editedCabalFile = "10zqh8j0k7q6l5ag009c432has7zpwbi57drr12dpyqa1ldrk6h0";
+ version = "0.4.0";
+ sha256 = "03z8ji8hssb811d1xvmv2zlnq7h7dsr801x05xydhfl1srbg5i9f";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable mtl stm text
- transformers unordered-containers utf8-string
+ transformers unordered-containers
];
testHaskellDepends = [
base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
- utf8-string
];
benchmarkHaskellDepends = [
base containers gauge unordered-containers
@@ -173621,10 +181050,10 @@ self: {
}:
mkDerivation {
pname = "repa";
- version = "3.4.1.3";
- sha256 = "0w3swrv5rdzkngcv1b6lndsg93y0y0wcxg7asgnxd529jsrdfciy";
- revision = "2";
- editedCabalFile = "0kmypfnpzjszdzhpd1lskp0plja8zyr8r2y9xyscx4g5md9hh0zp";
+ version = "3.4.1.4";
+ sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
+ revision = "1";
+ editedCabalFile = "1c5rf3ky5lw9q1ji2y37m721gs7m5liw3j84159ib0w0bb3ddzmi";
libraryHaskellDepends = [
base bytestring ghc-prim QuickCheck template-haskell vector
];
@@ -173636,10 +181065,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 +181150,10 @@ self: {
}:
mkDerivation {
pname = "repa-examples";
- version = "3.4.1.1";
- sha256 = "16jg56021r7974z66rhfyp246cj0r7h6wabnpl590q3fljwh5039";
- revision = "3";
- editedCabalFile = "0vdzcx1fixvgqzmjxra8gfwhzs56qdrzixscq074sddv7jh5iz2f";
+ version = "3.4.1.2";
+ sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d";
+ revision = "1";
+ editedCabalFile = "00w3cyd3r2jp1z962fwchsg4ffqfhq99mnl4anwcylxdkp15jv0l";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -173784,8 +181211,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 +181397,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
@@ -174148,6 +181587,8 @@ self: {
pname = "req";
version = "1.2.1";
sha256 = "1s8gjifc9jixl4551hay013fwyhlamcyrxjb00qr76wwikqa0g8k";
+ revision = "1";
+ editedCabalFile = "1ksqfsln8v08ibm89cgn1clxrvhk889421q5h52v1m9kzkh52njq";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson authenticate-oauth base blaze-builder bytestring
@@ -174322,11 +181763,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 +181865,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 +181874,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 +182039,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 +182240,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 +182292,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 +182402,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 +182464,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 +182793,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 +182826,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 +182863,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 +182883,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
@@ -175486,6 +182943,7 @@ self: {
benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
description = "A Haskell client for the Riak decentralized data store";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"riak-protobuf" = callPackage
@@ -175501,6 +182959,7 @@ self: {
];
description = "Haskell types for the Riak protocol buffer API";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"riak-protobuf-lens" = callPackage
@@ -175522,6 +182981,7 @@ self: {
];
description = "Lenses for riak-protobuf";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"richreports" = callPackage
@@ -175654,8 +183114,8 @@ self: {
}:
mkDerivation {
pname = "rio";
- version = "0.1.5.0";
- sha256 = "064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g";
+ version = "0.1.6.0";
+ sha256 = "0fwrzlh36rrv42qmavspr1km1yawhh54hw51bnklnr5bhf8vrpl2";
libraryHaskellDepends = [
base bytestring containers deepseq directory exceptions filepath
hashable microlens mtl primitive process text time typed-process
@@ -176011,8 +183471,8 @@ self: {
}:
mkDerivation {
pname = "rncryptor";
- version = "0.3.0.0";
- sha256 = "0878dn69my16y6nvz7nagx7pxb5wk5hq6mzj9qyzf284bqb4zcgp";
+ version = "0.3.0.1";
+ sha256 = "0j8y2iqxsin4gcgl85si7gl4bjrmdw9psvc7j3maa91fyh40dx49";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -176158,6 +183618,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "roc-id" = callPackage
+ ({ mkDerivation, base, generic-arbitrary, hspec, MonadRandom, Only
+ , QuickCheck, text, vector-sized
+ }:
+ mkDerivation {
+ pname = "roc-id";
+ version = "0.1.0.0";
+ sha256 = "0ac4hrl6qihrhcyx41rf0qnmf9bi848nhdgs71mq3i9gqbnxfi1i";
+ libraryHaskellDepends = [
+ base MonadRandom Only text vector-sized
+ ];
+ testHaskellDepends = [
+ base generic-arbitrary hspec MonadRandom Only QuickCheck text
+ vector-sized
+ ];
+ description = "Implementation of the ROC National ID standard";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rocksdb-haskell" = callPackage
({ mkDerivation, base, binary, bytestring, data-default, directory
, filepath, hspec, hspec-expectations, process, QuickCheck
@@ -176180,6 +183659,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
@@ -176195,6 +183692,7 @@ self: {
];
description = "Sci-fi roguelike game. Client application.";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"roguestar-engine" = callPackage
@@ -176283,8 +183781,8 @@ self: {
}:
mkDerivation {
pname = "rollbar";
- version = "1.1.1";
- sha256 = "0fwkmp55qddajbbc9dkd3y0z8x14ybvyad8pb5d7i0snxksksjrg";
+ version = "1.1.2";
+ sha256 = "1ip4bsnav2bwbbasz0mmfkq7cvi72jfdbz00r1ql4kpgwwkdhysz";
libraryHaskellDepends = [
aeson base basic-prelude http-conduit lifted-base monad-control
network resourcet text vector
@@ -176377,6 +183875,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ron" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+ , containers, criterion, data-default, deepseq, Diff, directory
+ , errors, extra, filepath, hashable, hedn, mtl, network-info, safe
+ , template-haskell, text, time, transformers, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "ron";
+ version = "0.3";
+ sha256 = "09mpv535rahaclj5yppzkg4n083d0rpqkr3r2zrmj1ywg5nw5h0i";
+ libraryHaskellDepends = [
+ aeson attoparsec base binary bytestring containers data-default
+ Diff directory errors extra filepath hashable hedn mtl network-info
+ safe template-haskell text time transformers unordered-containers
+ vector
+ ];
+ benchmarkHaskellDepends = [ base criterion deepseq ];
+ description = "RON, RON-RDT, and RON-Schema";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"roots" = callPackage
({ mkDerivation, base, tagged }:
mkDerivation {
@@ -176641,6 +184161,24 @@ 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.0.1";
+ sha256 = "04abl192vq1xq7kf9fackcb17wjyxw4068fsks3pxm9dd4iymgls";
+ 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 = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
+
"rounding" = callPackage
({ mkDerivation, array, base, numeric-extras }:
mkDerivation {
@@ -176661,6 +184199,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 +184216,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 +184299,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
@@ -176963,6 +184519,7 @@ self: {
testHaskellDepends = [ base QuickCheck safe ];
description = "Range set";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rspp" = callPackage
@@ -176978,16 +184535,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;
@@ -177078,6 +184631,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rstream" = callPackage
+ ({ mkDerivation, base, ghc-prim }:
+ mkDerivation {
+ pname = "rstream";
+ version = "0.1.0.0";
+ sha256 = "14l2jww91w993b61xn1m9y9wh27dvy1l1x2fh7g9f0l8mc5a9dpv";
+ libraryHaskellDepends = [ base ghc-prim ];
+ description = "stream-fusion framework from vector";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rtcm" = callPackage
({ mkDerivation, aeson, array, base, base64-bytestring
, basic-prelude, binary, binary-bits, binary-conduit, bytestring
@@ -177086,8 +184650,8 @@ self: {
}:
mkDerivation {
pname = "rtcm";
- version = "0.2.17";
- sha256 = "0g40krmbjy4irrxs3iabbr296l8hr98driz75j3s0dhqqzdxv4vm";
+ version = "0.2.36";
+ sha256 = "0gvkah51mnqpy20v2f3n1gvad1abmbkxljm4pz3yh3x9mkscnc2m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -177115,6 +184679,7 @@ self: {
libraryHaskellDepends = [ base ];
description = "dynamic linker tools for Haskell";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rtlsdr" = callPackage
@@ -177215,8 +184780,8 @@ self: {
pname = "rubberband";
version = "0.1.0.2";
sha256 = "15j402a7vwrx6sjn29jrby4qxc27c1aa4mkbalssn8jlpjhlpffm";
- revision = "2";
- editedCabalFile = "0md8149l4grv6y3v0yxismc4yj36izx0viinyra9pff0ixpq81z1";
+ revision = "3";
+ editedCabalFile = "17kws58vhdh71vhn3s06pk03ns49zp36svb56qy9pif8gnm8zz9x";
libraryHaskellDepends = [ base vector ];
librarySystemDepends = [ rubberband ];
libraryPkgconfigDepends = [ rubberband ];
@@ -177573,8 +185138,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 +185153,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";
@@ -177879,8 +185444,8 @@ self: {
}:
mkDerivation {
pname = "safecopy";
- version = "0.9.4.1";
- sha256 = "110fa0x7dq4flaprwhzlwxa7j1465a6mnj9jl8xskb5s6p0whxhl";
+ version = "0.9.4.2";
+ sha256 = "08glsr8mwxkz3hw68d6j7v285nay2a6xkyqpyc1b6wc9iw2g82r7";
libraryHaskellDepends = [
array base bytestring cereal containers old-time template-haskell
text time vector
@@ -178110,6 +185675,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 +185703,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 +185739,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";
@@ -178393,18 +185979,15 @@ self: {
"sandi" = callPackage
({ mkDerivation, base, bytestring, conduit, criterion, exceptions
- , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck
- , tasty-th
+ , tasty, tasty-hunit, tasty-quickcheck, tasty-th
}:
mkDerivation {
pname = "sandi";
- version = "0.4.2";
- sha256 = "0dvkpk91n9kz2ha04rvp231ra9sgd1ilyc1qkzf9l03iir7zrh9b";
- libraryHaskellDepends = [
- base bytestring conduit exceptions stringsearch
- ];
+ version = "0.4.3";
+ sha256 = "0ji1zn9nkh8rdm0m9zpxdnz5zw0q0qypzyp2k9fn6j9v08r17p3n";
+ libraryHaskellDepends = [ base bytestring conduit exceptions ];
testHaskellDepends = [
- base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
+ base bytestring tasty tasty-hunit tasty-quickcheck tasty-th
];
benchmarkHaskellDepends = [ base bytestring criterion ];
description = "Data encoding library";
@@ -178758,24 +186341,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 +187128,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 +187270,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
@@ -179848,12 +187445,13 @@ self: {
"script-monad" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, http-client
, http-types, lens, lens-aeson, QuickCheck, tasty, tasty-hunit
- , tasty-quickcheck, text, time, unordered-containers, vector, wreq
+ , tasty-quickcheck, tasty-quickcheck-laws, text, time
+ , unordered-containers, vector, wreq
}:
mkDerivation {
pname = "script-monad";
- version = "0.0.1";
- sha256 = "0s1wb3wgkma7ia8mn4fl8jyl74vrx195m37n71fnbi22z56y8k5j";
+ version = "0.0.2.1";
+ sha256 = "1lmla9jwb46d4ffm4igd23v0v2pr45sfbizgg7n29kkv8i2czhkz";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -179863,6 +187461,7 @@ self: {
executableHaskellDepends = [ base ];
testHaskellDepends = [
base bytestring tasty tasty-hunit tasty-quickcheck
+ tasty-quickcheck-laws
];
description = "Transformer stack of error, reader, writer, state, and prompt monads";
license = stdenv.lib.licenses.bsd3;
@@ -179973,6 +187572,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 +188068,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 +188240,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 +188404,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 +188644,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 +188679,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
];
@@ -181061,6 +188701,7 @@ self: {
benchmarkHaskellDepends = [ base criterion text ];
description = "Representation, manipulation, and de/serialisation of Semantic Versions";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"semver-range" = callPackage
@@ -181180,8 +188821,8 @@ self: {
}:
mkDerivation {
pname = "sensu-run";
- version = "0.6.0";
- sha256 = "1hzi5bkzc3wl031jhpr7j639zxijb33sdwg7zrb5xqdrpmfhg1zm";
+ version = "0.6.1";
+ sha256 = "1anxb5b8kmwf4bjzh49yxgnx3kkx37ydr4aw2xd46dph1gdk07mb";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -181264,8 +188905,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 +188970,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 +188993,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 +189165,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 +189324,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
@@ -181704,6 +189342,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant_0_15" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors
+ , bytestring, Cabal, cabal-doctest, case-insensitive, doctest
+ , hspec, hspec-discover, http-api-data, http-media, http-types
+ , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances
+ , singleton-bool, string-conversions, tagged, text, transformers
+ , vault
+ }:
+ mkDerivation {
+ pname = "servant";
+ version = "0.15";
+ sha256 = "0fgsddg8yn23izk3g4bmax6rlh56qhx13j8h5n6fxr7mq34kagsg";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec base base-compat bifunctors bytestring
+ case-insensitive http-api-data http-media http-types mmorph mtl
+ network-uri QuickCheck singleton-bool string-conversions tagged
+ text transformers vault
+ ];
+ testHaskellDepends = [
+ aeson base base-compat bytestring doctest hspec mtl QuickCheck
+ quickcheck-instances string-conversions text transformers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "A family of combinators for defining webservices APIs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-JuicyPixels" = callPackage
({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant
, servant-server, wai, warp
@@ -181712,6 +189379,8 @@ self: {
pname = "servant-JuicyPixels";
version = "0.3.0.4";
sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv";
+ revision = "1";
+ editedCabalFile = "185ym0ac6gx7f98pd92ykc1ib305lswzjzvykly4ij9vk85jn0ax";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -181756,6 +189425,8 @@ self: {
pname = "servant-auth";
version = "0.3.2.0";
sha256 = "12s1m7vqp0ka8nani4cnrb6fad2y5mxji95bba2b6b07ih8xbd3v";
+ revision = "1";
+ editedCabalFile = "10ss4v45lclf5n0k6rch22zzs59v7p5ppd04dbc97pqxiygpbnd9";
libraryHaskellDepends = [ base ];
description = "Authentication combinators for servant";
license = stdenv.lib.licenses.bsd3;
@@ -181772,6 +189443,8 @@ self: {
pname = "servant-auth-client";
version = "0.3.3.0";
sha256 = "1pxkwpg1in3anamfvrp8gd7iihng0ikhl4k7ymz5d75ma1qwa2j9";
+ revision = "2";
+ editedCabalFile = "05ibhx700r0xn746g691ypysnjgxqb0lkq2gjrih5ylzc7nfvv2s";
libraryHaskellDepends = [
base bytestring containers servant servant-auth servant-client-core
text
@@ -181826,8 +189499,8 @@ self: {
pname = "servant-auth-docs";
version = "0.2.10.0";
sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd";
- revision = "1";
- editedCabalFile = "0rg38ibrw110c3dllqda7badbf6y89g2ilqybkzipyprwkg8s69x";
+ revision = "2";
+ editedCabalFile = "0309a6pc8jj24xwqmzj1yslgij9g212hnaqh2qkcvlm6k6riffil";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base lens servant servant-auth servant-docs text
@@ -181888,8 +189561,10 @@ 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
@@ -181907,6 +189582,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-auth-server_0_4_2_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.2.0";
+ sha256 = "000szizds1c8amxm7gl75gpwrlj38gv665bhp59d35wcq03na4ap";
+ revision = "2";
+ editedCabalFile = "188chzggs5ahc2v1mxrr5cda5dqjwwar8b85yz7ysvlvbxb1zsb3";
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-auth-swagger" = callPackage
({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck
, servant, servant-auth, servant-swagger, swagger2, text
@@ -181915,6 +189623,8 @@ self: {
pname = "servant-auth-swagger";
version = "0.2.10.0";
sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh";
+ revision = "1";
+ editedCabalFile = "105rniz4cmmwr0ynyv75s4ap1fgfwxy2k5mvvj66gwpvzmj55cnx";
libraryHaskellDepends = [
base lens servant servant-auth servant-swagger swagger2 text
];
@@ -181928,17 +189638,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 +189666,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 +189685,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 +189697,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 +189720,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;
@@ -182060,8 +189769,8 @@ self: {
pname = "servant-blaze";
version = "0.8";
sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6";
- revision = "1";
- editedCabalFile = "1sw72b1x6diyk13mwxfmv50nix0n2lf7cv55p4n2d4bs7r5388q3";
+ revision = "2";
+ editedCabalFile = "1cfla60vn4kk5gb7fawlp34jr2k6b2fprysq05561wdfv990x4bj";
libraryHaskellDepends = [ base blaze-html http-media servant ];
testHaskellDepends = [ base blaze-html servant-server wai warp ];
description = "Blaze-html support for servant";
@@ -182076,8 +189785,8 @@ self: {
pname = "servant-cassava";
version = "0.10";
sha256 = "03jnyghwa5kjbl5j55njmp7as92flw91zs9cgdvb4jrsdy85sb4v";
- revision = "3";
- editedCabalFile = "1asq4w9dbl0ccwqdpvkhbh5fkvwd73iqd09a776ynf0vq3k05kh6";
+ revision = "4";
+ editedCabalFile = "0kk7vqnh5ycrvhrvhi3ahva6v56fvi17k3qrh8a8qnhx25094jaj";
libraryHaskellDepends = [
base base-compat bytestring cassava http-media servant vector
];
@@ -182149,8 +189858,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
@@ -182169,6 +189878,38 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "servant-client_0_15" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+ , deepseq, entropy, exceptions, generics-sop, hspec, hspec-discover
+ , http-api-data, http-client, http-media, http-types, HUnit
+ , kan-extensions, markdown-unlit, monad-control, mtl, network
+ , QuickCheck, semigroupoids, servant, servant-client-core
+ , servant-server, stm, tdigest, text, time, transformers
+ , transformers-base, transformers-compat, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-client";
+ version = "0.15";
+ sha256 = "098aaickq6j6f0d7bl2y72fcl53xp2w29qg3gy7yls4z8wd76v1a";
+ libraryHaskellDepends = [
+ base base-compat bytestring containers deepseq exceptions
+ http-client http-media http-types kan-extensions monad-control mtl
+ semigroupoids servant servant-client-core stm text time
+ transformers transformers-base transformers-compat
+ ];
+ testHaskellDepends = [
+ aeson base base-compat bytestring entropy generics-sop hspec
+ http-api-data http-client http-types HUnit kan-extensions
+ markdown-unlit mtl network QuickCheck servant servant-client-core
+ servant-server tdigest text transformers transformers-compat wai
+ warp
+ ];
+ testToolDepends = [ hspec-discover markdown-unlit ];
+ description = "Automatic derivation of querying functions for servant";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-client-core" = callPackage
({ mkDerivation, base, base-compat, base64-bytestring, bytestring
, containers, deepseq, exceptions, free, generics-sop, hspec
@@ -182179,6 +189920,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
@@ -182190,6 +189933,49 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-client-core_0_15" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+ , bytestring, containers, deepseq, exceptions, free, generics-sop
+ , hspec, hspec-discover, http-media, http-types, network-uri
+ , QuickCheck, safe, servant, template-haskell, text, transformers
+ }:
+ mkDerivation {
+ pname = "servant-client-core";
+ version = "0.15";
+ sha256 = "0q3rrbdplzzj90kdb7cmb6qknsbd9dy4w5lkqcb95nndwgjlk3lv";
+ libraryHaskellDepends = [
+ aeson base base-compat base64-bytestring bytestring containers
+ deepseq exceptions free generics-sop http-media http-types
+ network-uri safe servant template-haskell text transformers
+ ];
+ testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
+ testToolDepends = [ hspec-discover ];
+ description = "Core functionality and class for client function generation for servant APIs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "servant-conduit" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, conduit
+ , http-client, http-media, mtl, resourcet, servant, servant-client
+ , servant-server, unliftio-core, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-conduit";
+ version = "0.15";
+ sha256 = "0mpnkqcls4mrxfd3ksy53k7vvm0hildj21b8mdy53z993wq1blfz";
+ libraryHaskellDepends = [
+ base bytestring conduit mtl resourcet servant unliftio-core
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring conduit http-client http-media
+ resourcet servant servant-client servant-server wai warp
+ ];
+ description = "Servant Stream support for conduit";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-csharp" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath
, heredocs, http-types, lens, mtl, servant, servant-foreign
@@ -182257,8 +190043,8 @@ self: {
pname = "servant-dhall";
version = "0.1.0.1";
sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll";
- revision = "1";
- editedCabalFile = "0p8ygb5l79zzawnmy992wnicxv2cbbr0860063mbchmjwjf39x33";
+ revision = "3";
+ editedCabalFile = "13mq4pwffxqpjirb6rfhzd2xqhm0xyycl98h6kf4j0ic38g3saz1";
libraryHaskellDepends = [
base base-compat bytestring dhall http-media megaparsec
prettyprinter servant text
@@ -182281,8 +190067,8 @@ self: {
pname = "servant-docs";
version = "0.11.2";
sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b";
- revision = "5";
- editedCabalFile = "10b463waaa75aawjdag52yjv2bhkpnp3xygb39zyifpaf6iix100";
+ revision = "6";
+ editedCabalFile = "0w9yi4rmfq4irmnia9rl9pb66ix086ic9nd0grspnk54ib7970cl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -182301,6 +190087,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-docs_0_11_3" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
+ , case-insensitive, control-monad-omega, hashable, http-media
+ , http-types, lens, servant, string-conversions, tasty
+ , tasty-golden, tasty-hunit, text, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "servant-docs";
+ version = "0.11.3";
+ sha256 = "0cys1h3m0aq77aw0szj7k6p7zqcr8074zrxzsjp58lss1daqisq7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base-compat bytestring case-insensitive
+ control-monad-omega hashable http-media http-types lens servant
+ string-conversions text unordered-containers
+ ];
+ executableHaskellDepends = [
+ aeson base lens servant string-conversions text
+ ];
+ testHaskellDepends = [
+ aeson base base-compat lens servant string-conversions tasty
+ tasty-golden tasty-hunit transformers
+ ];
+ description = "generate API docs for your servant webservice";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-ede" = callPackage
({ mkDerivation, aeson, base, bytestring, ede, either, filepath
, http-media, http-types, semigroups, servant, servant-server, text
@@ -182432,8 +190248,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
];
@@ -182443,14 +190259,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-foreign_0_15" = callPackage
+ ({ mkDerivation, base, base-compat, hspec, hspec-discover
+ , http-types, lens, servant, text
+ }:
+ mkDerivation {
+ pname = "servant-foreign";
+ version = "0.15";
+ sha256 = "0wxx9drycam46vcmf3kxp2lq1drlpxb1b6fxbxyb6dd7349py6gi";
+ libraryHaskellDepends = [
+ base base-compat http-types lens servant text
+ ];
+ testHaskellDepends = [ base hspec servant ];
+ testToolDepends = [ hspec-discover ];
+ description = "Helpers for generating clients for servant APIs in any programming language";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-generate" = callPackage
({ mkDerivation, base, servant, servant-server }:
mkDerivation {
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 +190381,58 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-iCalendar" = callPackage
({ mkDerivation, base, data-default, http-media, iCalendar, servant
}:
@@ -182554,8 +190440,8 @@ self: {
pname = "servant-iCalendar";
version = "0.1.0.1";
sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
- revision = "2";
- editedCabalFile = "0c4d69rm08hpzlagl22qnnq9y85bp3zwix5h2hazr1m4na09hj1l";
+ revision = "3";
+ editedCabalFile = "0bcab5xk354glypz15lnlzvr157pbvh4mjfd5ln59hr3ip84bzi9";
libraryHaskellDepends = [
base data-default http-media iCalendar servant
];
@@ -182592,8 +190478,32 @@ self: {
pname = "servant-js";
version = "0.9.3.2";
sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02";
- revision = "2";
- editedCabalFile = "1mz21yf77nzfb30hlqncyx3jwr50ab7qh0m0cv8pds6s76s6k9sj";
+ revision = "3";
+ editedCabalFile = "0j5kmqzhkyb1wmvyxz0r20473myzp9bqcdgjbi8i4k1lfvcjsigq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base-compat charset lens servant servant-foreign text
+ ];
+ testHaskellDepends = [
+ base base-compat hspec hspec-expectations language-ecmascript lens
+ QuickCheck servant text
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Automatically derive javascript functions to query servant webservices";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "servant-js_0_9_4" = callPackage
+ ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover
+ , hspec-expectations, language-ecmascript, lens, QuickCheck
+ , servant, servant-foreign, text
+ }:
+ mkDerivation {
+ pname = "servant-js";
+ version = "0.9.4";
+ sha256 = "041wigqgn5ygcs49ndc39rk66j5bcvgpihshxk678jk470ysfszq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -182616,8 +190526,8 @@ self: {
}:
mkDerivation {
pname = "servant-kotlin";
- version = "0.1.1.2";
- sha256 = "1ad1n1yp6b125fa5gjjnbksnjqf714jf9d8cvxrvpwkl9lxn9ppb";
+ version = "0.1.1.5";
+ sha256 = "0wgx3yc6ay84mlwjw28dfrn633lcmpmr0968h4ncl99xa8vz1wnv";
libraryHaskellDepends = [
base containers directory formatting lens servant servant-foreign
text time wl-pprint-text
@@ -182642,12 +190552,33 @@ self: {
pname = "servant-lucid";
version = "0.8.1";
sha256 = "0g8icz12ydyxyv710fhixswdphiri0b44pw5p0dr21cvwbaxawb6";
+ revision = "1";
+ editedCabalFile = "0jna96jy6nmhk6w5zxdd3qn3vlrnhnvh4s3f2bqkn3c0had5py7d";
libraryHaskellDepends = [ base http-media lucid servant text ];
testHaskellDepends = [ base lucid servant-server wai warp ];
description = "Servant support for lucid";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-machines" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, http-client
+ , http-media, machines, mtl, servant, servant-client
+ , servant-server, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-machines";
+ version = "0.15";
+ sha256 = "137c0svvwvkh3ad8cc5q5vygci3c5951hbwlhk09znqaqycck35i";
+ libraryHaskellDepends = [ base bytestring machines mtl servant ];
+ testHaskellDepends = [
+ base base-compat bytestring http-client http-media machines servant
+ servant-client servant-server wai warp
+ ];
+ description = "Servant Stream support for machines";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-match" = callPackage
({ mkDerivation, base, bytestring, hspec, http-types, network-uri
, servant, text, utf8-string
@@ -182695,8 +190626,8 @@ self: {
pname = "servant-mock";
version = "0.8.4";
sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr";
- revision = "2";
- editedCabalFile = "0brnvssfcg105kkkj646wih8apnhd5gvy25c576i93x0nxb0n39j";
+ revision = "3";
+ editedCabalFile = "13sbgnzr0yfrbrbvzc6v66lxrgvg3pb7h9alvmg77kmm95gmx8mm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -182715,22 +190646,51 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-mock_0_8_5" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, bytestring
+ , bytestring-conversion, hspec, hspec-discover, hspec-wai
+ , http-types, QuickCheck, servant, servant-server, transformers
+ , wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-mock";
+ version = "0.8.5";
+ sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base-compat bytestring http-types QuickCheck servant
+ servant-server transformers wai
+ ];
+ executableHaskellDepends = [
+ aeson base QuickCheck servant-server warp
+ ];
+ testHaskellDepends = [
+ aeson base bytestring-conversion hspec hspec-wai QuickCheck servant
+ servant-server wai
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Derive a mock server for free from your servant API types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-multipart" = callPackage
({ mkDerivation, base, bytestring, directory, http-client
, http-media, lens, network, resourcet, servant, servant-docs
- , servant-server, text, transformers, wai, wai-extra, warp
+ , servant-foreign, servant-server, text, transformers, wai
+ , wai-extra, warp
}:
mkDerivation {
pname = "servant-multipart";
- version = "0.11.2";
- sha256 = "0w58gab42l3sz7min2pgv6ihfjz28gys5yky0p83kj5smwhys5nx";
- revision = "1";
- editedCabalFile = "0xidc0kbagv4ksaci3hxwgb7rvshvnracpzqpcmv8n2whkk26f6h";
+ version = "0.11.3";
+ sha256 = "0xkzzsi4d3hjn33zfrqadxjv7ymp4z7r5g37fidj3ryhwc1l6d9v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base bytestring directory http-media lens resourcet servant
- servant-docs servant-server text transformers wai wai-extra
+ servant-docs servant-foreign servant-server text transformers wai
+ wai-extra
];
executableHaskellDepends = [
base bytestring http-client network servant servant-server text
@@ -182738,6 +190698,7 @@ self: {
];
description = "multipart/form-data (e.g file upload) support for servant";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-named" = callPackage
@@ -182801,8 +190762,8 @@ self: {
}:
mkDerivation {
pname = "servant-pagination";
- version = "2.1.1";
- sha256 = "1kinql7rmwnrmqmlqkz1pakl52xl1pq32gr589dff00l55df2w2c";
+ version = "2.1.3";
+ sha256 = "152kp27p1zj0h7gm37skb0kghw9db3nbfrfcdsgp98gll81lyd54";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base safe servant servant-server text ];
@@ -182828,6 +190789,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "servant-pipes" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, http-client
+ , http-media, monad-control, mtl, pipes, pipes-bytestring
+ , pipes-safe, servant, servant-client, servant-server, wai, warp
+ }:
+ mkDerivation {
+ pname = "servant-pipes";
+ version = "0.15";
+ sha256 = "04ypy9vjrfggrk7dg3sxwj9nav50v85vpr5mnp5r2c9ka6xn4v90";
+ libraryHaskellDepends = [
+ base bytestring monad-control mtl pipes pipes-safe servant
+ ];
+ testHaskellDepends = [
+ base base-compat bytestring http-client http-media pipes
+ pipes-bytestring pipes-safe servant servant-client servant-server
+ wai warp
+ ];
+ description = "Servant Stream support for pipes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-pool" = callPackage
({ mkDerivation, base, resource-pool, servant, time }:
mkDerivation {
@@ -182867,8 +190850,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
];
@@ -182928,21 +190911,20 @@ self: {
"servant-py" = callPackage
({ mkDerivation, aeson, base, base-compat, bytestring, charset
- , hspec, hspec-expectations, lens, QuickCheck, servant
- , servant-foreign, text
+ , hspec, lens, QuickCheck, servant, servant-foreign, text
}:
mkDerivation {
pname = "servant-py";
- version = "0.1.0.4";
- sha256 = "0cc4cwny1y0iwchasxl8ncg2ladndpxcdh7ydfr2z91y97m15yx6";
+ version = "0.1.1.0";
+ sha256 = "1s708lcib9956x0ww14kcrhn5chg0sz9jnzk456kyjmwar8qssmc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring charset lens servant servant-foreign text
];
testHaskellDepends = [
- aeson base base-compat bytestring hspec hspec-expectations lens
- QuickCheck servant servant-foreign text
+ aeson base base-compat bytestring hspec lens QuickCheck servant
+ servant-foreign text
];
description = "Automatically derive python functions to query servant webservices";
license = stdenv.lib.licenses.bsd3;
@@ -182959,10 +190941,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 +190963,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;
@@ -183046,22 +191028,22 @@ self: {
}:
mkDerivation {
pname = "servant-ruby";
- version = "0.8.0.1";
- sha256 = "07pdz6zdax415virbx30cjbiywlzfwzsaq9426l14zwmgf7pw155";
+ version = "0.8.0.2";
+ sha256 = "11h70gpar931qh3v1llp8zzk5922p31bmmfp5ynp7nzxv3zdrim6";
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
+ "servant-ruby_0_9_0_0" = callPackage
({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign
, text
}:
mkDerivation {
pname = "servant-ruby";
- version = "0.8.0.2";
- sha256 = "11h70gpar931qh3v1llp8zzk5922p31bmmfp5ynp7nzxv3zdrim6";
+ version = "0.9.0.0";
+ sha256 = "1x1746k97i3y836mr5h29l70ldzrg8akhfmg2qicwbwz6qs7hy33";
libraryHaskellDepends = [ base casing servant-foreign text ];
testHaskellDepends = [ base doctest QuickCheck ];
description = "Generate a Ruby client from a Servant API with Net::HTTP";
@@ -183102,6 +191084,8 @@ self: {
pname = "servant-server";
version = "0.14.1";
sha256 = "1fnxmy6k0ml11035ac4x2knvpraxpc0g076wx3a9k013xyqi0h02";
+ revision = "1";
+ editedCabalFile = "028vqbmqkc9gjsk34n74ssi0xfn085v26zdvpixgfi5yd7cvfg03";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -183124,6 +191108,44 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-server_0_15" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+ , bytestring, Cabal, cabal-doctest, containers, directory, doctest
+ , exceptions, filepath, hspec, hspec-discover, hspec-wai
+ , http-api-data, http-media, http-types, monad-control, mtl
+ , network, network-uri, QuickCheck, resourcet, safe, servant
+ , should-not-typecheck, string-conversions, tagged, temporary, text
+ , transformers, transformers-base, transformers-compat, wai
+ , wai-app-static, wai-extra, warp, word8
+ }:
+ mkDerivation {
+ pname = "servant-server";
+ version = "0.15";
+ sha256 = "1qlkdgls2z71sx09lbkrqcxwx1wam3hn7dnyps6z2i7qixhlw0wq";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base base-compat base64-bytestring bytestring containers exceptions
+ filepath http-api-data http-media http-types monad-control mtl
+ network network-uri resourcet servant string-conversions tagged
+ text transformers transformers-base wai wai-app-static word8
+ ];
+ executableHaskellDepends = [
+ aeson base base-compat servant text wai warp
+ ];
+ testHaskellDepends = [
+ aeson base base-compat base64-bytestring bytestring directory
+ doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe
+ servant should-not-typecheck string-conversions temporary text
+ transformers transformers-compat wai wai-extra
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "A family of combinators for defining webservices APIs and serving them";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-smsc-ru" = callPackage
({ mkDerivation, aeson, base, bytestring, http-client
, http-client-tls, HUnit, mtl, QuickCheck, quickcheck-text
@@ -183242,6 +191264,8 @@ self: {
pname = "servant-streaming";
version = "0.3.0.0";
sha256 = "0k2sgh7qhp54050k6xlz4zi5jf29xnar2iv02f4rg1k5fxjlh3cq";
+ revision = "3";
+ editedCabalFile = "04mc3k97sk0r90m8ca34gqpb2bz8yljp3j613xx7xz90sffqc1hq";
libraryHaskellDepends = [ base http-types servant ];
testHaskellDepends = [ base hspec http-types QuickCheck servant ];
description = "Servant combinators for the 'streaming' package";
@@ -183258,6 +191282,8 @@ self: {
pname = "servant-streaming-client";
version = "0.3.0.0";
sha256 = "1h3haws61m064zziyzn03n0450swffmr46gsv9k88lrpz8lv5qj2";
+ revision = "1";
+ editedCabalFile = "07xkgnhi8aspnqms5gx67ssw5m595gda8yqypdg2q59wwc6ib68d";
libraryHaskellDepends = [
base bytestring http-media http-types resourcet servant
servant-client-core servant-streaming streaming
@@ -183280,6 +191306,8 @@ self: {
pname = "servant-streaming-docs";
version = "0.3.0.0";
sha256 = "0jy0na8cavym2vsy1a059n0yjzfb5a0xylyzxpz0i5apafv1xvlz";
+ revision = "1";
+ editedCabalFile = "02majkszg6d340mq07b9xyfd200xqpq9znl2j9dxqj7d9bqkrdrz";
libraryHaskellDepends = [
base lens servant servant-docs servant-streaming
];
@@ -183297,6 +191325,8 @@ self: {
pname = "servant-streaming-server";
version = "0.3.0.0";
sha256 = "0lsh3x6hkbk7p095pkp7ld0m54xlkw0101x6nrxhjvhmw13aiq66";
+ revision = "1";
+ editedCabalFile = "1xfx22a83xwq2bzv7gm3z9drd5hiq6wz7yyvfpjz1c2dcicwflvm";
libraryHaskellDepends = [
base bytestring http-media http-types resourcet servant
servant-server servant-streaming streaming streaming-wai wai
@@ -183339,33 +191369,58 @@ 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";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-swagger_1_1_7" = callPackage
+ ({ 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, template-haskell
+ , text, time, unordered-containers, utf8-string
+ }:
+ mkDerivation {
+ pname = "servant-swagger";
+ version = "1.1.7";
+ sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base-compat bytestring hspec http-media
+ insert-ordered-containers lens QuickCheck servant singleton-bool
+ swagger2 text unordered-containers
+ ];
+ testHaskellDepends = [
+ 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";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-swagger-ui" = callPackage
({ mkDerivation, base, bytestring, file-embed-lzma, servant
, servant-server, servant-swagger-ui-core, swagger2, text
@@ -183384,6 +191439,25 @@ 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";
+ revision = "1";
+ editedCabalFile = "0k2s6y93ii3d1myacq70ifpjf9q0mglxdr97wmxll6ixzsn7fjpl";
+ 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,22 +191478,44 @@ 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";
+ revision = "1";
+ editedCabalFile = "0dd97qvi5w1y90ln58pk0y2vb5f1bhwsix9ym3cnnq8h0snfda4p";
+ 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";
+ revision = "1";
+ editedCabalFile = "1n735zxdkfnhr0vh6r3cgw97pggp0lnpd6bq6fspzv5bbylg3mkc";
libraryHaskellDepends = [
base bytestring file-embed-lzma servant servant-server
servant-swagger-ui-core swagger2 text
];
description = "Servant swagger ui: Jens-Ole Graulund theme";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-swagger-ui-redoc" = callPackage
@@ -183428,16 +191524,17 @@ 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";
+ revision = "1";
+ editedCabalFile = "030zf1z5h96d40ifwagxblz1dij2ypbcqyy0wpqvjqbianyqgcim";
libraryHaskellDepends = [
base bytestring file-embed-lzma servant servant-server
servant-swagger-ui-core swagger2 text
];
description = "Servant swagger ui: ReDoc theme";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-tracing" = callPackage
@@ -183516,8 +191613,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
];
@@ -183529,6 +191626,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-yaml_0_1_0_1" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
+ , servant, servant-server, wai, warp, yaml
+ }:
+ mkDerivation {
+ pname = "servant-yaml";
+ version = "0.1.0.1";
+ sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01";
+ libraryHaskellDepends = [
+ base bytestring http-media servant yaml
+ ];
+ testHaskellDepends = [
+ aeson base base-compat bytestring http-media servant servant-server
+ wai warp yaml
+ ];
+ description = "Servant support for yaml";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-zeppelin" = callPackage
({ mkDerivation, base, singletons }:
mkDerivation {
@@ -183654,26 +191771,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "serverless-haskell_0_7_5" = callPackage
+ "serverless-haskell_0_8_4" = 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
- , text, time, unix, unordered-containers
+ , hspec, hspec-discover, http-types, iproute, lens, network
+ , network-simple, raw-strings-qq, text, time, unix
+ , unordered-containers
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.7.5";
- sha256 = "13l5day4dlwyykwx17v2znyh0ck1paaxjzzawnjklcjzk1rzj0i3";
+ version = "0.8.4";
+ sha256 = "0hbva555n2xypq7sby6frkrwhn6xxx1hdq7hgdi07cx60vs8b6l4";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
- lens text time unix unordered-containers
+ lens network network-simple text time unix unordered-containers
];
testHaskellDepends = [
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 text time unix
- unordered-containers
+ http-types iproute lens network network-simple raw-strings-qq text
+ time unix unordered-containers
];
testToolDepends = [ hspec-discover ];
description = "Deploying Haskell code onto AWS Lambda using Serverless";
@@ -183976,6 +192094,8 @@ self: {
pname = "set-cover";
version = "0.0.9";
sha256 = "1qbk5y2pg6jlclszd2nras5240r0ahapsibykkcqrxhgq0hgvsxg";
+ revision = "1";
+ editedCabalFile = "0mcg15645maj1ymfrgs9ghi8n3hwwd72441zxcg9gn1w3pq7zsaw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -184000,14 +192120,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 +192207,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 +192215,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "Haskell bindings to setlocale";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"setoid" = callPackage
@@ -184150,32 +192269,35 @@ self: {
}) {};
"sets" = callPackage
- ({ mkDerivation, base, commutative, composition, containers
- , contravariant, criterion, hashable, keys, mtl, QuickCheck
- , quickcheck-instances, semigroupoids, semigroups, tasty
- , tasty-hunit, tasty-quickcheck, transformers, transformers-base
- , unordered-containers, witherable
+ ({ mkDerivation, base, bytestring, commutative, composition
+ , containers, contravariant, criterion, hashable, keys, mtl
+ , QuickCheck, quickcheck-instances, semigroupoids, semigroups
+ , tasty, tasty-hunit, tasty-quickcheck, transformers
+ , transformers-base, unordered-containers, vector, witherable
}:
mkDerivation {
pname = "sets";
- version = "0.0.5.2";
- sha256 = "04w7wisn9fzkg7wqfzmibd6myj3c4bvkx7w7i5q0nxx5njvxa85y";
+ version = "0.0.6";
+ sha256 = "0vnh4wy4p4x0jcxlwzj3mpxhkjv3igg2lphjgxj4dqzd2qddj63d";
libraryHaskellDepends = [
- base commutative composition containers contravariant hashable keys
- mtl QuickCheck semigroupoids semigroups transformers
- transformers-base unordered-containers witherable
+ base bytestring commutative composition containers contravariant
+ hashable keys mtl QuickCheck semigroupoids semigroups transformers
+ transformers-base unordered-containers vector witherable
];
testHaskellDepends = [
- base commutative containers contravariant QuickCheck
- quickcheck-instances tasty tasty-hunit tasty-quickcheck
- unordered-containers
+ base bytestring commutative composition containers contravariant
+ hashable keys mtl QuickCheck quickcheck-instances semigroupoids
+ semigroups tasty tasty-hunit tasty-quickcheck transformers
+ transformers-base unordered-containers vector witherable
];
benchmarkHaskellDepends = [
- base commutative containers contravariant criterion
- unordered-containers
+ base bytestring commutative composition containers contravariant
+ criterion hashable keys mtl QuickCheck semigroupoids semigroups
+ transformers transformers-base unordered-containers vector
+ witherable
];
description = "Ducktyped set interface for Haskell containers";
- license = stdenv.lib.licenses.mit;
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -184317,6 +192439,7 @@ self: {
librarySystemDepends = [ libsndfile openal ];
description = "minimal bindings to the audio module of sfml";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
"sfmt" = callPackage
@@ -184359,8 +192482,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
@@ -184401,6 +192524,32 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "sh2md" = callPackage
+ ({ mkDerivation, base, containers, Hclip, optparse-applicative
+ , process, text, transformers, unix
+ }:
+ mkDerivation {
+ pname = "sh2md";
+ version = "0.1.0.0";
+ sha256 = "1yw47xzfi7yappsx2ra1a75xdxq9wfn7wrdnxflf6s9bzj9bhc1g";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers Hclip optparse-applicative process text
+ transformers unix
+ ];
+ executableHaskellDepends = [
+ base containers Hclip optparse-applicative process text
+ transformers unix
+ ];
+ testHaskellDepends = [
+ base containers Hclip optparse-applicative process text
+ transformers unix
+ ];
+ description = "Record your shell session and print in the markdown format";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"sha-streams" = callPackage
({ mkDerivation, base, binary, bytestring, io-streams, SHA }:
mkDerivation {
@@ -184520,30 +192669,30 @@ self: {
"shake" = callPackage
({ mkDerivation, base, binary, bytestring, deepseq, directory
- , extra, filepath, hashable, js-flot, js-jquery, primitive, process
- , QuickCheck, random, time, transformers, unix
+ , extra, filepath, hashable, heaps, js-flot, js-jquery, primitive
+ , process, QuickCheck, random, time, transformers, unix
, unordered-containers, utf8-string
}:
mkDerivation {
pname = "shake";
- version = "0.16.4";
- sha256 = "0dhlkcn1zsg1w97vzs1yrpkn6iwhlzh36dwclx2lafzbdjja6cmp";
+ version = "0.17.3";
+ sha256 = "0k0r44csgrlw9y80m88npvanw5ddqm634799qjiab39gvbd3p6kw";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base binary bytestring deepseq directory extra filepath hashable
- js-flot js-jquery primitive process random time transformers unix
- unordered-containers utf8-string
+ heaps js-flot js-jquery primitive process random time transformers
+ unix unordered-containers utf8-string
];
executableHaskellDepends = [
base binary bytestring deepseq directory extra filepath hashable
- js-flot js-jquery primitive process random time transformers unix
- unordered-containers utf8-string
+ heaps js-flot js-jquery primitive process random time transformers
+ unix unordered-containers utf8-string
];
testHaskellDepends = [
base binary bytestring deepseq directory extra filepath hashable
- js-flot js-jquery primitive process QuickCheck random time
+ 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";
@@ -184557,8 +192706,8 @@ self: {
}:
mkDerivation {
pname = "shake-ats";
- version = "1.9.0.3";
- sha256 = "1c1vphg9vv4lizcsg681wxq5dmvg5fkhp6x15738j7sfbd0k87ja";
+ version = "1.10.2.0";
+ sha256 = "0kc7yy2qv4d2n3j0qwsg37ga9yyb380d6zni08l1jabrl84maly8";
libraryHaskellDepends = [
base binary dependency directory hs2ats language-ats microlens
shake shake-c shake-cabal shake-ext text
@@ -184580,14 +192729,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;
@@ -184733,6 +192883,7 @@ self: {
libraryHaskellDepends = [ base path path-io shake ];
description = "path alternatives to shake functions";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"shake-persist" = callPackage
@@ -184787,8 +192938,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 +192955,8 @@ self: {
}:
mkDerivation {
pname = "shakespeare";
- version = "2.0.15";
- sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23";
+ version = "2.0.20";
+ sha256 = "00wybn9dcwi2y1cp87fyvhcqn8filvb8as7k78g1m1c5wpwby3pm";
libraryHaskellDepends = [
aeson base blaze-html blaze-markup bytestring containers directory
exceptions ghc-prim parsec process scientific template-haskell text
@@ -184914,6 +193065,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shannon-fano" = callPackage
+ ({ mkDerivation, base, bytestring, QuickCheck, split }:
+ mkDerivation {
+ pname = "shannon-fano";
+ version = "0.1.0.1";
+ sha256 = "11xpz5mi1yk9zcy22fhn6j4xnyifxgn07nd6nrx588h1g6w8r2df";
+ revision = "1";
+ editedCabalFile = "1da8hsqrv7nz9nlkdlqvjcssfzf4r6fxdhv8lryz92d7jjjxyjcc";
+ libraryHaskellDepends = [ base bytestring split ];
+ testHaskellDepends = [ base QuickCheck ];
+ description = "Shannon-fano compression algorithm implementation in Haskell";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"shapefile" = callPackage
({ mkDerivation, base, binary, bytestring, data-binary-ieee754, dbf
, filepath, rwlock
@@ -185065,8 +193231,8 @@ self: {
({ mkDerivation, base, bytestring, unix }:
mkDerivation {
pname = "shared-memory";
- version = "0.1.0.0";
- sha256 = "15h4j81q2v97dx61pnpaqs99z4vvlw7xl1dxbh878imxj8zn4z84";
+ version = "0.2.0.0";
+ sha256 = "1g1s08zjpj9xaaff3qg29k6fhnpiig9fqv9i7879yhllh50kjrr6";
libraryHaskellDepends = [ base unix ];
testHaskellDepends = [ base bytestring unix ];
description = "POSIX shared memory";
@@ -185174,8 +193340,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 +193474,8 @@ self: {
pname = "shelly";
version = "1.8.1";
sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y";
+ revision = "1";
+ editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -185360,22 +193528,44 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "shh" = callPackage
+ ({ mkDerivation, async, base, deepseq, directory, filepath, mtl
+ , process, split, tasty, tasty-hunit, tasty-quickcheck
+ , template-haskell, unix
+ }:
+ mkDerivation {
+ pname = "shh";
+ version = "0.1.0.0";
+ sha256 = "0ixvfwrz1bsj1c2ln7fhvf6wawf75nzqfb784xgral33hmflm518";
+ revision = "1";
+ editedCabalFile = "10h2hz3fda9zg6zpkmmjjfxjghs7g0cj3r85vifp0za9ap41ph3k";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async base deepseq directory filepath mtl process split
+ template-haskell unix
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+ description = "Simple shell scripting from Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"shift" = callPackage
({ mkDerivation, ansi-terminal, base, binary, bytestring
- , composition-prelude, data-default, microlens
- , optparse-applicative, system-fileio, system-filepath, text
- , turtle
+ , composition-prelude, microlens, optparse-applicative
+ , system-fileio, system-filepath, text, turtle
}:
mkDerivation {
pname = "shift";
- version = "0.2.1.0";
- sha256 = "04949ljq0xi1s0k5llq56idykn6myr4l2hqai9vlqmcj47m5f23j";
+ version = "0.2.1.1";
+ sha256 = "1sxzgbdha8caf4xhsma45wiqagzga1zifkp14a5s01a2013pdizm";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- ansi-terminal base binary bytestring composition-prelude
- data-default microlens optparse-applicative system-fileio
- system-filepath text turtle
+ ansi-terminal base binary bytestring composition-prelude microlens
+ optparse-applicative system-fileio system-filepath text turtle
];
description = "A tool to quickly switch between directories";
license = stdenv.lib.licenses.mit;
@@ -185387,8 +193577,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
@@ -185428,8 +193618,8 @@ self: {
}:
mkDerivation {
pname = "shine";
- version = "0.2.0.2";
- sha256 = "0r0rl65rkcdg8c8lzli87nfad8bk4xypiqvb2qs68fhhzwx1zfg2";
+ version = "0.2.0.3";
+ sha256 = "16h5igycgas28qk22yg08qkfwsrar9g4bw7q8p94vmf993p4542k";
libraryHaskellDepends = [
base ghcjs-dom ghcjs-prim keycode mtl time transformers
];
@@ -186045,6 +194235,23 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"simple-atom" = callPackage
({ mkDerivation, base, containers, deepseq }:
mkDerivation {
@@ -186093,6 +194300,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "simple-cmd" = 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;
+ }) {};
+
"simple-conduit" = callPackage
({ mkDerivation, base, bifunctors, bytestring, CC-delcont
, chunked-data, conduit, conduit-combinators, conduit-extra
@@ -186182,8 +194400,10 @@ self: {
}:
mkDerivation {
pname = "simple-effects";
- version = "0.12.0.0";
- sha256 = "1k7wslyiv0hqpq7b92xyxlv3a1431cbaraxiw1ircjrm3ay28bd0";
+ version = "0.13.0.0";
+ sha256 = "14ik7rw9qszfq010g6c951r59g1gds3lpczsrqi4gq932s1rr4rn";
+ revision = "1";
+ editedCabalFile = "15zca24ldx643cyp1f7l5d69g3micqrha2sk5arz5xygxhas2yrm";
libraryHaskellDepends = [
array async base bytestring exceptions list-t monad-control
MonadRandom mtl text transformers transformers-base
@@ -186277,8 +194497,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "simple-get-opt";
- version = "0.1.0.0";
- sha256 = "1hia6kjx3nnv6i5wrkmvj6vz52pw12fwsz48gkz7049ygpa5jnl5";
+ version = "0.2.0";
+ sha256 = "1xx751j2vszqr8x9nf4f56aj5b6v0j8qdf90pd1xdasrfc67af9c";
libraryHaskellDepends = [ base ];
description = "A simple library for processing command-line options";
license = stdenv.lib.licenses.bsd3;
@@ -186308,10 +194528,8 @@ self: {
}:
mkDerivation {
pname = "simple-log";
- version = "0.9.6";
- sha256 = "0cbzc5ib63x2m4xz88ks6xfg99c2plp2y6y7bzx3i3rrhd3y1pjn";
- revision = "1";
- editedCabalFile = "0qifmlqxd2pwh5rm7pzfwn6nq09yvjs7nfg8si4b3q7xlgal2sbx";
+ version = "0.9.10";
+ sha256 = "19gznqypfx452xmspvp1my5z39r6sk7g0cj5p245x806krjfi65k";
libraryHaskellDepends = [
async base base-unicode-symbols containers data-default deepseq
directory exceptions filepath hformat microlens microlens-platform
@@ -186352,8 +194570,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 +194676,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 +194793,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 +194806,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 ];
@@ -186717,8 +194937,8 @@ self: {
}:
mkDerivation {
pname = "simple-vec3";
- version = "0.4.0.8";
- sha256 = "0jikq60ixk21gb7j3rayxqha73m9vn4n8kz4799rcw5qiii7rr4a";
+ version = "0.4.0.9";
+ sha256 = "1rx4nifv75lpxrdgq6x3a61d56qp0ln9rhf2d10l2ds049dlq0pz";
libraryHaskellDepends = [ base QuickCheck vector ];
testHaskellDepends = [
base doctest doctest-driver-gen tasty tasty-quickcheck
@@ -186946,10 +195166,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 +195217,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 +195240,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 +195278,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "singletons_2_5_1" = 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.1";
+ sha256 = "0izi487dpn5dx5yzm0bqrrjj2fcy6y6jyk81848yq4i8fcx0mc10";
+ 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 +195430,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 +195478,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
];
@@ -187265,22 +195507,22 @@ self: {
"sized-grid" = callPackage
({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad
- , constraints, distributive, generics-sop, hedgehog, HUnit, lens
- , markdown-unlit, mtl, random, tasty, tasty-hedgehog, tasty-hunit
- , vector, vector-space
+ , constraints, distributive, generics-sop, HUnit, lens
+ , markdown-unlit, mtl, QuickCheck, random, tasty, tasty-hunit
+ , tasty-quickcheck, vector, vector-space
}:
mkDerivation {
pname = "sized-grid";
- version = "0.1.1.1";
- sha256 = "0v3350z1p9bmwancn205jbbqj1wwi7f6415jzz3fcypkmyq90bav";
+ version = "0.1.1.6";
+ sha256 = "06qbbih3gn92b85aqk7qx8q4yg56jqh9ncczb66q6sn599xay1s9";
libraryHaskellDepends = [
adjunctions aeson base comonad constraints distributive
generics-sop lens mtl random vector vector-space
];
testHaskellDepends = [
adjunctions aeson ansi-terminal base comonad distributive
- generics-sop hedgehog HUnit lens markdown-unlit tasty
- tasty-hedgehog tasty-hunit vector-space
+ generics-sop HUnit lens markdown-unlit QuickCheck tasty tasty-hunit
+ tasty-quickcheck vector vector-space
];
testToolDepends = [ markdown-unlit ];
description = "Multidimensional grids with sized specified at compile time";
@@ -187484,12 +195726,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 +195795,8 @@ self: {
}:
mkDerivation {
pname = "skylighting";
- version = "0.7.2";
- sha256 = "1rh3z1a7a4clvksdw1qlpmhxqkfahwypi70k91whgfamzsqpxdch";
+ version = "0.7.5";
+ sha256 = "080kmpqaqh76qqjml34rfm7m6pchdmd2519g6y3kdb3x5vj01qbx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187574,10 +195819,8 @@ self: {
}:
mkDerivation {
pname = "skylighting-core";
- version = "0.7.2";
- sha256 = "066fwmwsd7xcvwlinfk2izlzq0xp8697i6lnbgsbl71jdybyackq";
- revision = "1";
- editedCabalFile = "0qjmk3i9kjnd3195fhphjgqvsgbw6blfjl40mdyiblw1piyvc6yw";
+ version = "0.7.5";
+ sha256 = "129q860xk59n8dxsxl7prk0jk3ddl96r9i6r4lsk5l9pbpms41pp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -187704,8 +195947,8 @@ self: {
}:
mkDerivation {
pname = "slack-web";
- version = "0.2.0.6";
- sha256 = "1rydw71na7qninys7nqyn36mld5a5csvlsf01yzansnn2gvpdh2a";
+ version = "0.2.0.9";
+ sha256 = "1lw7haxp27h6q13763cq1h7ilfv7281q0k794ir66sv2l79jq7a2";
libraryHaskellDepends = [
aeson base containers errors http-api-data http-client
http-client-tls megaparsec mtl servant servant-client
@@ -187727,8 +195970,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,21 +196011,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "slave-thread_1_0_2_1" = callPackage
- ({ mkDerivation, base, deferred-folds, foldl, HTF, mmorph
- , partial-handler, QuickCheck, quickcheck-instances, rerebase
- , SafeSemaphore, stm-containers, transformers
+ "slave-thread_1_0_3" = callPackage
+ ({ mkDerivation, base, deferred-folds, focus, foldl, QuickCheck
+ , quickcheck-instances, rerebase, SafeSemaphore, stm-containers
+ , tasty, tasty-hunit, tasty-quickcheck
}:
mkDerivation {
pname = "slave-thread";
- version = "1.0.2.1";
- sha256 = "1bnx07zy89ym45bs1dhnwgxls7jz8yv64j5j0wsym3qqzqdk04dh";
+ version = "1.0.3";
+ sha256 = "09yvcgd997lj8wbal443hafr1w72v45ks4fxrm05b45malb3vs98";
libraryHaskellDepends = [
- base deferred-folds foldl mmorph partial-handler stm-containers
- transformers
+ base deferred-folds focus foldl stm-containers
];
testHaskellDepends = [
- HTF QuickCheck quickcheck-instances rerebase SafeSemaphore
+ QuickCheck quickcheck-instances rerebase SafeSemaphore tasty
+ tasty-hunit tasty-quickcheck
];
description = "A fundamental solution to ghost threads and silent exceptions";
license = stdenv.lib.licenses.mit;
@@ -187827,8 +196070,8 @@ self: {
}:
mkDerivation {
pname = "slick";
- version = "0.1.0.2";
- sha256 = "1s5ya5h253h599m3hkcilq7fya9ghgz4b5mlk8v1ywpdm1jab3dm";
+ version = "0.2.0.0";
+ sha256 = "0pxbrqykf11nrdc6zyjxvfc57dfajp5nm4qpqyk26l2jh1gaklz7";
libraryHaskellDepends = [
aeson base binary bytestring containers lens lens-aeson mustache
pandoc shake text time
@@ -187944,6 +196187,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 +196701,8 @@ self: {
}:
mkDerivation {
pname = "smuggler";
- version = "0.0.1";
- sha256 = "16f2s1gp5ww2ingil60fq5w6ghs3f1cscsl8qn7ibg0jqj0w5q89";
+ version = "0.1.0";
+ sha256 = "0iyisn5s39haik3g1wld67pdpnl8h3zafxhkgyd3ajx9lg9nf741";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -188456,7 +196711,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 +196876,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 +196954,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;
@@ -188743,8 +196998,8 @@ self: {
pname = "snap-loader-dynamic";
version = "1.0.0.0";
sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg";
- revision = "2";
- editedCabalFile = "1q5lal77sgxwcwbabw5rqwlrx84xv1c24zs2ry2gz57ccdr6n9qm";
+ revision = "3";
+ editedCabalFile = "0kk3viaz5hikj9815ja9l3fqq3653vx7q9jamkz68hyfxyvf8qxh";
libraryHaskellDepends = [
base directory directory-tree hint mtl snap-core template-haskell
time unix
@@ -188760,8 +197015,8 @@ self: {
pname = "snap-loader-static";
version = "1.0.0.0";
sha256 = "04i9fn84101w8ybns8m2830zlw2vvg81pzrs0vmj6s691y3ivxas";
- revision = "2";
- editedCabalFile = "1f9dn3x8m53rywlmmn274cfh0ahvaz9vqfc6cwc79bmbz0r7fq1z";
+ revision = "3";
+ editedCabalFile = "07f2j0fsw6hhg6qjzfis72ka9dd7iijx09lwypp2mk0qsx6y63bi";
libraryHaskellDepends = [ base template-haskell ];
description = "Snap static loader";
license = stdenv.lib.licenses.bsd3;
@@ -188825,8 +197080,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;
@@ -189067,8 +197322,8 @@ self: {
}:
mkDerivation {
pname = "snaplet-customauth";
- version = "0.1.1";
- sha256 = "0alh5jaygcxnjpm5r3qx2c6al1x73shzwqi67820rzqxix2np8pc";
+ version = "0.1.2";
+ sha256 = "0y1a8c9j1q1pzby5v4ajnafm6dr9fvxvvkiynvscyjsf73gp2myb";
libraryHaskellDepends = [
aeson base base64-bytestring binary binary-orphans bytestring
configurator containers errors heist hoauth2 http-client
@@ -189840,12 +198095,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;
@@ -190136,8 +198391,8 @@ self: {
}:
mkDerivation {
pname = "socket";
- version = "0.8.1.0";
- sha256 = "1sbxcs1fmd7x95yk7sqv3q6gg2azn77l6sngiiv692966a0bxba0";
+ version = "0.8.2.0";
+ sha256 = "176px9n2f8mnxi3r2sqshrpbp7i11fskch1nkjhgqzq917sz0zgb";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -190176,8 +198431,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 +198600,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 +198671,16 @@ self: {
}) {};
"solve" = callPackage
- ({ mkDerivation, base, containers }:
+ ({ mkDerivation, base, containers, filepath, QuickCheck }:
mkDerivation {
pname = "solve";
- version = "1.0";
- sha256 = "06sk2imqgzk9zjr10ignigs04avnjjxfsi2qkk7vqfslhcfzgqnq";
- libraryHaskellDepends = [ base containers ];
+ version = "1.3";
+ sha256 = "1hd7vbbxcn9x3xzxnfscmbg8bjaqm7bkhjkrkdq2b0ys04sahxs8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers filepath ];
+ executableHaskellDepends = [ base containers filepath ];
+ testHaskellDepends = [ base containers QuickCheck ];
description = "Solving simple games";
license = stdenv.lib.licenses.mit;
}) {};
@@ -190446,6 +198706,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 +198935,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 +198946,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,25 +199138,26 @@ 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.3.1";
+ sha256 = "1rhmj14z9ypv9z5pg6494kbp4mr5906cpjgsrn1cc5rkgj1xlv59";
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";
+ description = "Unified streaming data-dependency framework for web apps";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -191038,10 +199310,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 +199338,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,8 +199461,8 @@ self: {
({ mkDerivation, base, cmdargs, containers, leancheck }:
mkDerivation {
pname = "speculate";
- version = "0.3.2";
- sha256 = "0cf8121hfmyj1jrklf2i1bp2q4517627vgaz1flf363n93jnckfk";
+ version = "0.3.5";
+ sha256 = "0i7a6mq0f46iihq7kd3a1780pqqhmmdi706c42y4dmmj32nb4v3h";
libraryHaskellDepends = [ base cmdargs containers leancheck ];
testHaskellDepends = [ base leancheck ];
benchmarkHaskellDepends = [ base leancheck ];
@@ -191191,20 +199470,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "speculate_0_3_4" = callPackage
- ({ mkDerivation, base, cmdargs, containers, leancheck }:
- mkDerivation {
- pname = "speculate";
- version = "0.3.4";
- sha256 = "10b6ka8rws62byxi4whncs77hl2jcx6pr3gibbh804v07dnl2dnv";
- 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
({ mkDerivation, base, ghc-prim, stm, transformers }:
mkDerivation {
@@ -191298,6 +199563,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 +199881,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 +199995,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 +200007,48 @@ 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 +200448,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
@@ -192477,11 +200789,12 @@ self: {
({ mkDerivation, base, gdp, ghc-prim, primitive }:
mkDerivation {
pname = "st2";
- version = "0.1.0.0";
- sha256 = "0gly0l191cwnahdrmgi1i2rx4430b9d684kl9s5frxa3k1711agj";
+ version = "0.1.0.2";
+ sha256 = "0i7v9yacwgf6aj67c4r2n8zcm07jrcff9nl52sx7ylsjs65ym2qz";
libraryHaskellDepends = [ base gdp ghc-prim primitive ];
description = "shared heap regions between local mutable state threads";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"stable-heap" = callPackage
@@ -192592,17 +200905,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 = "2";
+ editedCabalFile = "17da7jih43nl3zqgpmlk3n2kpwjmb2np4w8ldpq2vyi9ab8p6vjm";
+ 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 +200956,14 @@ self: {
}:
mkDerivation {
pname = "stack";
- version = "1.7.1";
- sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
- revision = "9";
- editedCabalFile = "12gbrnhmci2kpz42x7nwfzcq3syp0z2l14fjcakw8bhjmgd9wp34";
+ version = "1.9.3";
+ sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf";
+ revision = "2";
+ editedCabalFile = "1cza3s075a1rnfkyr8ds471lf96ah0zrmgzaxyj61nll40xyrl0b";
+ configureFlags = [
+ "-fdisable-git-info" "-fhide-dependency-versions"
+ "-fsupported-build"
+ ];
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -192642,15 +200989,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 +201205,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 +201261,8 @@ self: {
}:
mkDerivation {
pname = "stack2nix";
- version = "0.2";
- sha256 = "103cimrwr8j0b1zjpw195mjkfrgcgkicrpygcc5y82nyrl1cc74f";
+ version = "0.2.1";
+ sha256 = "0rwl6fzxv2ly20mn0pgv63r0ik4zpjigbkc4771ni7zazkxvx1gy";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -192909,6 +201277,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
@@ -193093,18 +201462,20 @@ self: {
}) {};
"stackage-query" = callPackage
- ({ mkDerivation, base, Cabal, containers, directory, filepath
- , optparse-applicative, process, stackage-types, text, yaml
+ ({ mkDerivation, aeson, base, Cabal, containers, directory
+ , exceptions, filepath, hashable, optparse-applicative, process
+ , safe, semigroups, text, time, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "stackage-query";
- version = "0.1.2";
- sha256 = "0lxln46nwsz7646yc65c07biqg35vr75l1hdvb864ajv680wp2l0";
+ version = "0.1.3";
+ sha256 = "01fjxgxbyd7hxr2js7jpa7gm6d0bdm58gxz4pzzwsgnbchm50q25";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base Cabal containers directory filepath optparse-applicative
- process stackage-types text yaml
+ aeson base Cabal containers directory exceptions filepath hashable
+ optparse-applicative process safe semigroups text time
+ unordered-containers vector yaml
];
description = "Stackage package query";
license = stdenv.lib.licenses.mit;
@@ -193156,6 +201527,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "stackage-to-hackage" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, containers, directory
+ , extra, filepath, HsOpenSSL, HsYAML, http-streams, network-uri
+ , optparse-applicative, semigroupoids, text
+ }:
+ mkDerivation {
+ pname = "stackage-to-hackage";
+ version = "1.0.2";
+ sha256 = "0s474q0hwz917vhh9hmx33j9jjbgm58ajgl0wacw8hfbs8awwk20";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring Cabal containers directory extra filepath HsOpenSSL
+ HsYAML http-streams network-uri optparse-applicative semigroupoids
+ text
+ ];
+ description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
+ license = stdenv.lib.licenses.gpl3Plus;
+ }) {};
+
"stackage-types" = callPackage
({ mkDerivation, aeson, base, Cabal, containers, exceptions
, hashable, safe, semigroups, text, time, unordered-containers
@@ -193242,6 +201633,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 {
@@ -193251,6 +201661,7 @@ self: {
libraryHaskellDepends = [ base ];
description = "Numerical statistics for Foldable containers";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"stagen" = callPackage
@@ -193326,6 +201737,7 @@ self: {
libraryHaskellDepends = [ base ];
description = "the * -> * types, operators, and covariant instances";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"star-to-star-contra" = callPackage
@@ -193337,6 +201749,7 @@ self: {
libraryHaskellDepends = [ base star-to-star ];
description = "contravariant instances for * -> * types and operators";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"starling" = callPackage
@@ -193530,8 +201943,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
];
@@ -193566,6 +201979,7 @@ self: {
librarySystemDepends = [ libstatgrab ];
description = "Collect system level metrics and statistics";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libstatgrab;};
"static-canvas" = callPackage
@@ -193661,8 +202075,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 +202128,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 +202278,30 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"status-notifier-item" = callPackage
({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger
, filepath, hslogger, lens, network, optparse-applicative, spool
@@ -194045,6 +202511,8 @@ self: {
pname = "stemmer-german";
version = "0.1.1.1";
sha256 = "037dw03zb4xdfbzp8js04ymrxii7rsin7pwiansa9khb29w2jqsn";
+ revision = "1";
+ editedCabalFile = "0pvghdxgd56yjm33lrzk6343lklnfdw77g30vhbfddwwdx1ifx2v";
libraryHaskellDepends = [ base text ];
description = "Extract the stem of a German inflected word form";
license = stdenv.lib.licenses.mit;
@@ -194059,6 +202527,8 @@ self: {
pname = "step-function";
version = "0.2";
sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j";
+ revision = "1";
+ editedCabalFile = "03ga9vwaxsf0c73fciavkm925l7lkgya1a6xghyb8ainrav0bfq4";
libraryHaskellDepends = [
base base-compat-batteries containers deepseq QuickCheck
];
@@ -194134,12 +202604,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 +202663,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 +202708,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 +202779,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 +202817,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 +202885,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;
@@ -194592,12 +203064,12 @@ self: {
}) {};
"storable-complex" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, base-orphans }:
mkDerivation {
pname = "storable-complex";
- version = "0.2.2";
- sha256 = "01kwwkpbfjrv26vj83cd92px5qbq1bpgxj0r45534aksqhany1xb";
- libraryHaskellDepends = [ base ];
+ version = "0.2.3.0";
+ sha256 = "0fnwbfmd5vsaaqvf9182qdcjrzcfjd1zhdyvjwzifbwvn6r9kx4s";
+ libraryHaskellDepends = [ base base-orphans ];
description = "Storable instance for Complex";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -194708,7 +203180,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 +203191,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 +203205,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
@@ -194793,6 +203265,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "stp" = callPackage
+ ({ mkDerivation, base, containers, regex-compat }:
+ mkDerivation {
+ pname = "stp";
+ version = "0.1.0.1";
+ sha256 = "1vg2w6iawqydg2n4k6m6pzfxr7sr10cx33aabyx6b9wp1i8xa5kl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers ];
+ executableHaskellDepends = [ base regex-compat ];
+ description = "Simple Theorem Prover";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"str" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, Crypto
, hashable, MissingH, text, utf8-string
@@ -194834,15 +203320,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_25_0" = callPackage
+ "stratosphere_0_28_1" = 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.28.1";
+ sha256 = "1brypavqh8049adidzgsjsrfd2sxbv387cckwxl4kkm4s49zrx18";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -195048,8 +203534,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
@@ -195066,8 +203552,8 @@ self: {
pname = "streaming-attoparsec";
version = "1.0.0";
sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z";
- revision = "1";
- editedCabalFile = "0ssikp3ckvlgh9px4v6ppjlyi7ch319j0l3s9a5z07j6fg3j4wkp";
+ revision = "2";
+ editedCabalFile = "07hqs8nn1rhsqckqmw46yp19kd0vk35q139al6yq0k1dzpvsrcsx";
libraryHaskellDepends = [
attoparsec base bytestring streaming streaming-bytestring
];
@@ -195287,6 +203773,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 +203984,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 +204016,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 +204171,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;
@@ -195734,14 +204238,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "strict-tuple" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "strict-tuple";
+ version = "0.1.1";
+ sha256 = "13r72i95d0aal7i6v1mrviin2i5c6j9zs0f3qvc66wyy7mkr1h5n";
+ libraryHaskellDepends = [ base ];
+ description = "Strict tuples";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"strict-types" = callPackage
({ mkDerivation, array, base, bytestring, containers, deepseq
, hashable, text, unordered-containers, vector
}:
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 +204570,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;
@@ -196110,8 +204627,8 @@ self: {
}:
mkDerivation {
pname = "stripe-core";
- version = "2.4.0";
- sha256 = "1xmi8msjmnf6321z09yvxz4spm7ac1abv9d7h3zin340h46zv1bx";
+ version = "2.4.1";
+ sha256 = "1ab3smzvm9qw4g1b5prin7njifwfls51c4cb625aaziljmpwyg27";
libraryHaskellDepends = [
aeson base bytestring mtl text time transformers
unordered-containers
@@ -196125,8 +204642,8 @@ self: {
({ mkDerivation, base, stripe-core, stripe-http-client }:
mkDerivation {
pname = "stripe-haskell";
- version = "2.4.0";
- sha256 = "0q2ikxzxhlk6n4a2pwfd02ayidp6xrl91hbs021ghhy0ni1vibhi";
+ version = "2.4.1";
+ sha256 = "041kj0dh6qzpmcwb6wm5ii9l6dwdpja3big57n0134z41hw0p45f";
libraryHaskellDepends = [ base stripe-core stripe-http-client ];
description = "Stripe API for Haskell";
license = stdenv.lib.licenses.mit;
@@ -196139,8 +204656,8 @@ self: {
}:
mkDerivation {
pname = "stripe-http-client";
- version = "2.4.0";
- sha256 = "0ljnvd5b2pzmbikdyjyr2s0qzq5ghh8k7jgwv1qm52d38jpnd82f";
+ version = "2.4.1";
+ sha256 = "1x7720awkh97wpkyn6mbqb788a07lfshd8w55qwywfxlp42qg4a3";
libraryHaskellDepends = [
aeson base bytestring http-client http-client-tls http-types
stripe-core text
@@ -196159,8 +204676,8 @@ self: {
}:
mkDerivation {
pname = "stripe-http-streams";
- version = "2.4.0";
- sha256 = "0xhv3y13m43a90i6hfgib0a18ldwgvw5sprh9mc6xnyqfklpg2zf";
+ version = "2.4.1";
+ sha256 = "0ln0w5q5g0g4p4zrcpb6pfv6jna7mmyq48bwb27cq6zn20i0m2vc";
libraryHaskellDepends = [
aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
text
@@ -196181,8 +204698,8 @@ self: {
}:
mkDerivation {
pname = "stripe-tests";
- version = "2.4.0";
- sha256 = "0mpkqy1frx5h6sj4aj7h0faq2zzgrx0ckljqahczxn9ikpnzgmk5";
+ version = "2.4.1";
+ sha256 = "1lq2m450y7ylalcimy2fm2c6vhl0m3pyj7m52cni5dm398qskmr6";
libraryHaskellDepends = [
aeson base bytestring free hspec hspec-core mtl random stripe-core
text time transformers unordered-containers
@@ -196213,8 +204730,8 @@ self: {
}:
mkDerivation {
pname = "strive";
- version = "5.0.6";
- sha256 = "0dpf986nbsz5j47dl26073qyz290nznghi85mzj2gw0rlj9dp937";
+ version = "5.0.7";
+ sha256 = "0hxy5znrfcls6bd8hjil97mya3w8zkppfd4jrz0ayz7zidbws5kg";
libraryHaskellDepends = [
aeson base bytestring data-default gpolyline http-client
http-client-tls http-types template-haskell text time transformers
@@ -196302,8 +204819,8 @@ self: {
}:
mkDerivation {
pname = "structured-cli";
- version = "0.9.4.1";
- sha256 = "15dyr7a122d43ddkadn6syy356yccp0gk087bw5slv80isgp95zi";
+ version = "2.5.0.1";
+ sha256 = "0a28m0i0fygs1i0lxq27vs2l749saqwph1rjdvv10xvxa16kx552";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -196322,6 +204839,8 @@ self: {
pname = "structured-haskell-mode";
version = "1.1.0";
sha256 = "1d1qv9d8qifcxbxqb6a6j0fsi65lg8sndn7hn2s38hgnxdb7llf5";
+ revision = "1";
+ editedCabalFile = "0z3rd0wpnw9xrz2jrda6n8lg0mnzmgkjrjc48vzdjsf76ysjnfka";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -196446,18 +204965,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 +205374,30 @@ 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, base-noprelude
+ , bytestring, directory, filepath, generic-deriving, gitrev
+ , hedgehog, hspec, neat-interpolation, optparse-applicative
+ , process, relude, text, time, tomland
}:
mkDerivation {
pname = "summoner";
- version = "1.0.6";
- sha256 = "0sb877846l34qp2cjl7gayb517fi5igf9vcmksryasnjxlbhs7vx";
+ version = "1.2.0";
+ sha256 = "04shi46j44g81zylmrm807rlinfx6sjpdwvxxyw9rhnpx56b8r34";
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 relude ];
- testHaskellDepends = [ base hedgehog relude tasty tasty-hedgehog ];
- testToolDepends = [ tasty-discover ];
- description = "Tool for creating completely configured production Haskell projects";
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base-noprelude filepath hedgehog hspec neat-interpolation relude
+ tomland
+ ];
+ description = "Tool for scaffolding completely configured production Haskell projects";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"sump" = callPackage
@@ -196988,28 +205511,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;
@@ -197110,17 +205632,12 @@ self: {
({ mkDerivation, base, Cabal, containers, directory, filepath }:
mkDerivation {
pname = "superdoc";
- version = "0.1.2.7";
- sha256 = "0pfqvw6a9c29fsar1xiqwbsdc294l9iy3jlc6ax0wxdkfqyqwagv";
- isLibrary = true;
- isExecutable = true;
+ version = "0.1.2.9";
+ sha256 = "0svkvbrc9h1c32anfkfz0pllqzjnj5lg73c2sc7hpb8nzg16qv0v";
setupHaskellDepends = [ base Cabal containers directory filepath ];
libraryHaskellDepends = [
base Cabal containers directory filepath
];
- executableHaskellDepends = [
- base Cabal containers directory filepath
- ];
description = "Additional documentation markup and Unicode support";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -197221,6 +205738,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "supervisors" = callPackage
+ ({ mkDerivation, async, base, containers, hspec, stm, unliftio }:
+ mkDerivation {
+ pname = "supervisors";
+ version = "0.1.0.0";
+ sha256 = "1sxralp0hcz2zn5byn67xq612nzmpm890gnjs827sidvr7r7h31j";
+ revision = "2";
+ editedCabalFile = "08qz4qbfrj7hpk3pgyjy3r149dz48jpxajyjs10fgiz16xg11zyl";
+ libraryHaskellDepends = [ async base containers stm unliftio ];
+ testHaskellDepends = [ base hspec ];
+ description = "Monitor groups of threads with non-hierarchical lifetimes";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"supplemented" = callPackage
({ mkDerivation, base, base-prelude, QuickCheck
, quickcheck-instances, rebase, tasty, tasty-hunit
@@ -197265,15 +205797,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 = "3";
+ editedCabalFile = "08fzw4v5w48d9x315hvl27pbg8c0dch9ihmw1f74g9pxnxmpfbxi";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring contravariant hw-dsv
semigroupoids sv-core transformers utf8-string validation
@@ -197283,6 +205817,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 +205832,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 +205855,10 @@ self: {
}:
mkDerivation {
pname = "sv-core";
- version = "0.2.2";
- sha256 = "08wd9ajzzhkqg5ghqr3vilq1w8h8vypd3yy63ql6amnqdnjw02mf";
+ version = "0.3";
+ sha256 = "12mjv13rgix4h064ch01hbmkxxz7dp69nazpksvj1fjx16m5dvw6";
+ revision = "1";
+ editedCabalFile = "06wj1r1f06a594y3h9dl11wb7ra9993s2kdfzlf74w4r14bp7j4a";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
deepseq lens mtl parsec profunctors readable semigroupoids
@@ -197342,8 +205880,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 +205921,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 +205953,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
@@ -197549,6 +206089,7 @@ self: {
testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
description = "Implementation of swagger data model";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"swagger-petstore" = callPackage
@@ -197642,31 +206183,32 @@ 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_1" = callPackage
+ ({ mkDerivation, aeson, base, base-compat-batteries, bytestring
+ , Cabal, cabal-doctest, containers, cookie, 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.1";
+ sha256 = "0717i4bv97sywbdf94bszh2g858wznvl8q7ngv0zirnlvx8a27y6";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
- aeson base base-compat-batteries bytestring containers generics-sop
- hashable http-media insert-ordered-containers lens mtl network
- scientific template-haskell text time transformers
- transformers-compat unordered-containers uuid-types vector
+ aeson base base-compat-batteries bytestring containers cookie
+ generics-sop hashable http-media insert-ordered-containers lens mtl
+ network QuickCheck scientific template-haskell text time
+ transformers 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";
@@ -197765,15 +206307,15 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {};
- "swish_0_10_0_0" = callPackage
+ "swish_0_10_0_1" = callPackage
({ mkDerivation, base, containers, directory, filepath, hashable
, HUnit, intern, mtl, network-uri, old-locale, polyparse
, semigroups, test-framework, test-framework-hunit, text, time
}:
mkDerivation {
pname = "swish";
- version = "0.10.0.0";
- sha256 = "1dm388lwfxrpdbqm3fdk9gjr8pp8y8s02wl9aan86av956g2kr4h";
+ version = "0.10.0.1";
+ sha256 = "1ikqqyra9r79vw2s969kyqh1vgijcr33y7irriylsp51n7pspagk";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -197798,8 +206340,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 +206399,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 +206498,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 +206508,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 +206545,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 +206562,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,13 +206584,24 @@ 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;
}) {};
+ "symbols" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "symbols";
+ version = "0.2.0.1";
+ sha256 = "00c28qy0g011acgf98981x7pw3d58dcsmb8iqfna5f6qmcya6393";
+ libraryHaskellDepends = [ base ];
+ description = "Symbol manipulation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"symengine" = callPackage
({ mkDerivation, base, gmp, gmpxx, symengine, tasty, tasty-hunit
, tasty-quickcheck
@@ -198449,8 +207022,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 +207070,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 +207137,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 +207279,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,9 +207643,12 @@ self: {
pname = "tabl";
version = "1.0.3";
sha256 = "1pxh6g1xjbp37fsab3hl2ldrpnbxdnp4s7pcr3mqxv62qi9b3m2f";
+ revision = "1";
+ editedCabalFile = "15zmgsylfmm8pf355i0ph1dcczy0z6jw0d9dh4xfmfba8ailvcdg";
libraryHaskellDepends = [ base safe text ];
description = "Table layout";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"table" = callPackage
@@ -199097,8 +207673,8 @@ self: {
}:
mkDerivation {
pname = "table-layout";
- version = "0.8.0.2";
- sha256 = "0dxdk1yjbk0f648q59dfkgx9asc24f733ww3cs98p799n7jnfl1v";
+ version = "0.8.0.3";
+ sha256 = "03q3icqgxiwbyl9bhqzhdwsdirr9r40k20k1j8z1barg2309r2aa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -199205,6 +207781,7 @@ self: {
];
description = "Pretty-printing of CSV files";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tabloid" = callPackage
@@ -199326,8 +207903,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 +208147,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 +208174,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
@@ -199729,21 +208306,22 @@ self: {
"tailfile-hinotify" = callPackage
({ mkDerivation, async, base, bytestring, conceit, directory
- , filepath, foldl, hinotify, pipes, process-streaming, streaming
- , streaming-eversion, tasty, tasty-hunit
+ , filepath, foldl, hinotify, pipes, pipes-transduce
+ , process-streaming, streaming, streaming-eversion, tasty
+ , tasty-hunit, text
}:
mkDerivation {
pname = "tailfile-hinotify";
- version = "1.0.0.3";
- sha256 = "0czw1ahm4zcxhyhzg6by3rfbirkhv9jlcw9yzp7q1zrxb3schbyz";
+ version = "2.0.0.0";
+ sha256 = "0qnpikj8fbjnks95wwza8m773j0b9sg7fn16dvpfps189icm85gi";
libraryHaskellDepends = [
async base bytestring foldl hinotify pipes streaming
- streaming-eversion
+ streaming-eversion text
];
testHaskellDepends = [
async base bytestring conceit directory filepath foldl hinotify
- pipes process-streaming streaming streaming-eversion tasty
- tasty-hunit
+ pipes pipes-transduce process-streaming streaming
+ streaming-eversion tasty tasty-hunit text
];
description = "Tail files in Unix, using hinotify";
license = stdenv.lib.licenses.mit;
@@ -199979,6 +208557,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 +208581,8 @@ 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
@@ -200019,6 +208599,32 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tar-conduit_0_3_1" = 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.1";
+ sha256 = "15w1qs276x2j13s3dg5a0d8jjcs3rf8hhnfa2m6p8jm7kjirvahm";
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tardis" = callPackage
({ mkDerivation, base, mmorph, mtl }:
mkDerivation {
@@ -200175,8 +208781,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
@@ -200185,6 +208791,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tasty_1_2" = callPackage
+ ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
+ , optparse-applicative, stm, tagged, unbounded-delays, unix
+ , wcwidth
+ }:
+ mkDerivation {
+ pname = "tasty";
+ version = "1.2";
+ sha256 = "05w3bl5kah238pds818sxp9x58rp1nszbiicb1l21hf9k83mw66n";
+ libraryHaskellDepends = [
+ ansi-terminal async base clock containers mtl optparse-applicative
+ stm tagged unbounded-delays unix wcwidth
+ ];
+ description = "Modern and extensible testing framework";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tasty-ant-xml" = callPackage
({ mkDerivation, base, containers, directory, filepath
, generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -200227,8 +208851,8 @@ self: {
({ mkDerivation, base, dejafu, random, tagged, tasty }:
mkDerivation {
pname = "tasty-dejafu";
- version = "1.2.0.7";
- sha256 = "1wg6baw9rll5wajbr10av664i0dswy72flfha320137s6s3by2wc";
+ version = "1.2.0.8";
+ sha256 = "0v9939w2vppa3zfgmyzgb4880cx5z9hw5cssg25qg6ymr6rczdr4";
libraryHaskellDepends = [ base dejafu random tagged tasty ];
description = "Deja Fu support for the Tasty test framework";
license = stdenv.lib.licenses.mit;
@@ -200266,6 +208890,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 +208961,8 @@ self: {
pname = "tasty-hedgehog";
version = "0.2.0.0";
sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
- revision = "4";
- editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
+ revision = "6";
+ editedCabalFile = "0d7s1474pvnyad6ilr5rvpama7s468ya9ns4ksbl0827z9vvga43";
libraryHaskellDepends = [ base hedgehog tagged tasty ];
testHaskellDepends = [
base hedgehog tasty tasty-expected-failure
@@ -200354,6 +208980,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
@@ -200371,10 +208999,10 @@ self: {
}:
mkDerivation {
pname = "tasty-hspec";
- version = "1.1.5";
- sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v";
+ version = "1.1.5.1";
+ sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y";
revision = "1";
- editedCabalFile = "0zgbcrahzfg37bnni6fj0qb0fpbk5rdha589mh960d5sbq58pljf";
+ editedCabalFile = "18k4p273qnvfmk5cbm89rjqr0v03v0q22q7bbl7z3bxpwnnkmhqf";
libraryHaskellDepends = [
base hspec hspec-core QuickCheck tasty tasty-quickcheck
tasty-smallcheck
@@ -200508,6 +209136,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
@@ -200557,14 +209197,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "tasty-quickcheck-laws" = callPackage
+ ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }:
+ mkDerivation {
+ pname = "tasty-quickcheck-laws";
+ version = "0.0.1";
+ sha256 = "0hlp1l2my0wydvlxqb8kvqyy1avcnx47brj16ikann83r6za67dp";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base QuickCheck tasty ];
+ description = "Pre-built tasty trees for checking lawful class properties using QuickCheck";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"tasty-rerun" = callPackage
({ mkDerivation, base, containers, mtl, optparse-applicative
, reducers, split, stm, tagged, tasty, transformers
}:
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 +209236,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 +209314,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";
@@ -200668,6 +209323,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "tasty-wai" = callPackage
+ ({ mkDerivation, base, bytestring, http-types, tasty, wai
+ , wai-extra
+ }:
+ mkDerivation {
+ pname = "tasty-wai";
+ version = "0.1.0.1";
+ sha256 = "0h2zqwj19vamn2rcqpq17wjcx3v8xfixgzh0b30k37vbqcgz62va";
+ libraryHaskellDepends = [
+ base bytestring http-types tasty wai wai-extra
+ ];
+ testHaskellDepends = [ base http-types tasty wai ];
+ description = "Test 'wai' endpoints via Test.Tasty";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"tateti-tateti" = callPackage
({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }:
mkDerivation {
@@ -200897,6 +209568,8 @@ self: {
pname = "tdigest";
version = "0.2.1";
sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl";
+ revision = "1";
+ editedCabalFile = "1jrq22j9jbvx31pspwjvyb539gix7vfb8cinqkkb2abmr0jrhibn";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base base-compat binary deepseq reducers semigroupoids transformers
@@ -201195,12 +209868,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;
@@ -201255,17 +209928,19 @@ self: {
}) {};
"template-toolkit" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, directory
- , mtl, parsec, pcre-utils, regex-pcre-builtin, scientific, text
- , unordered-containers, uri-encode
+ ({ mkDerivation, aeson, base, binary, bytestring, containers
+ , directory, hashtables, mtl, parsec, pcre-utils
+ , regex-pcre-builtin, scientific, text, time, unordered-containers
+ , uri-encode
}:
mkDerivation {
pname = "template-toolkit";
- version = "0.1.0.1";
- sha256 = "1xbc4azsa7q90g2fpp16djy3zkfimsr31a9sjan3gygny0dx2mgg";
+ version = "0.1.1.0";
+ sha256 = "0nqsgfqj28d6qqc4639d8paqb8d9fw5kpijggbmxdnaqd64xc4p1";
libraryHaskellDepends = [
- aeson base bytestring containers directory mtl parsec pcre-utils
- regex-pcre-builtin scientific text unordered-containers uri-encode
+ aeson base binary bytestring containers directory hashtables mtl
+ parsec pcre-utils regex-pcre-builtin scientific text time
+ unordered-containers uri-encode
];
description = "Template Toolkit implementation for Haskell";
license = stdenv.lib.licenses.gpl3;
@@ -201566,7 +210241,6 @@ self: {
];
description = "TensorFlow bindings";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libtensorflow;};
"tensorflow-core-ops" = callPackage
@@ -201587,7 +210261,6 @@ self: {
];
description = "Haskell wrappers for Core Tensorflow Ops";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-logging" = callPackage
@@ -201616,7 +210289,6 @@ self: {
];
description = "TensorBoard related functionality";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-mnist" = callPackage
@@ -201669,7 +210341,6 @@ self: {
];
description = "Code generation for TensorFlow operations";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-ops" = callPackage
@@ -201699,7 +210370,6 @@ self: {
];
description = "Friendly layer around TensorFlow bindings";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-proto" = callPackage
@@ -201717,7 +210387,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 +210432,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 +210468,8 @@ self: {
pname = "termbox";
version = "0.1.0";
sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa";
+ revision = "1";
+ editedCabalFile = "0qwab9ayd9b8gmcnvy6pbbp16vwnqdzji9qi71jmgvviayqdlly5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ array base ];
@@ -201895,12 +210578,12 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "terminfo_0_4_1_2" = callPackage
+ "terminfo_0_4_1_3" = callPackage
({ mkDerivation, base, ncurses }:
mkDerivation {
pname = "terminfo";
- version = "0.4.1.2";
- sha256 = "0g5y4s82bh26wj3x3f7g3s4qipnxvg71m3xw32rqy59inwxvvpsm";
+ version = "0.4.1.3";
+ sha256 = "09hf9wrp2q3k4y9fcp4fzmk34zh7hfmp0mfqxc0v6h5clajdbvai";
libraryHaskellDepends = [ base ];
librarySystemDepends = [ ncurses ];
description = "Haskell bindings to the terminfo library";
@@ -201925,36 +210608,39 @@ self: {
}) {};
"termonad" = callPackage
- ({ mkDerivation, base, Cabal, cabal-doctest, classy-prelude, colour
- , constraints, data-default, directory, doctest, dyre, filepath
- , gi-gdk, gi-gio, gi-glib, gi-gtk, gi-pango, gi-vte, gtk3
- , haskell-gi-base, hedgehog, lens, pretty-simple, QuickCheck, tasty
- , tasty-hedgehog, template-haskell, xml-conduit, xml-html-qq
+ ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest
+ , classy-prelude, colour, constraints, containers, data-default
+ , directory, distributive, doctest, dyre, filepath, focuslist
+ , genvalidity-containers, genvalidity-hspec, gi-gdk, gi-gio
+ , gi-glib, gi-gtk, gi-pango, gi-vte, gtk3, haskell-gi-base
+ , hedgehog, lens, mono-traversable, pretty-simple, QuickCheck
+ , singletons, tasty, tasty-hedgehog, tasty-hspec, template-haskell
+ , vte_291, xml-conduit, xml-html-qq
}:
mkDerivation {
pname = "termonad";
- version = "0.2.1.0";
- sha256 = "1js9sj0gj4igigdnbc5ygbn5l2wfhbrm1k565y3advi99imidsd3";
+ version = "1.0.1.0";
+ sha256 = "1mmj7zamq83yb8wg2p127pa969pf06cwdcrvy2h6nb72m098fqcx";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
- base classy-prelude colour constraints data-default directory dyre
- filepath gi-gdk gi-gio gi-glib gi-gtk gi-pango gi-vte
- haskell-gi-base lens pretty-simple QuickCheck xml-conduit
+ adjunctions base classy-prelude colour constraints containers
+ data-default directory distributive dyre filepath focuslist gi-gdk
+ gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base lens
+ mono-traversable pretty-simple QuickCheck singletons xml-conduit
xml-html-qq
];
- libraryPkgconfigDepends = [ gtk3 ];
+ libraryPkgconfigDepends = [ gtk3 vte_291 ];
executableHaskellDepends = [ base ];
testHaskellDepends = [
- base doctest hedgehog lens QuickCheck tasty tasty-hedgehog
- template-haskell
+ base doctest genvalidity-containers genvalidity-hspec hedgehog lens
+ QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell
];
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {gtk3 = pkgs.gnome3.gtk;};
+ }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;};
"termplot" = callPackage
({ mkDerivation, base, brick, data-default, optparse-applicative
@@ -202121,6 +210807,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 +210852,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 +210981,8 @@ self: {
}:
mkDerivation {
pname = "test-karya";
- version = "0.0.2";
- sha256 = "16vrpp8qilhfk47fmcvbvdjfgzjh878kn1d4cq0bacihkv79zmf3";
+ version = "0.0.3";
+ sha256 = "1z9zyva8cqrz04ckg7dny297jp5k961nk1l7pp9kz8z78pd7p19q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -202302,6 +210998,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "test-lib" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath, HUnit
+ , process, simple-get-opt, test-framework, test-framework-hunit
+ }:
+ mkDerivation {
+ pname = "test-lib";
+ version = "0.2";
+ sha256 = "0i9q483sd5a8f7d95fxjqzyb4vsi3w1bycs518wi0k0w1rlfm33i";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers directory filepath HUnit process simple-get-opt
+ test-framework test-framework-hunit
+ ];
+ executableHaskellDepends = [ base simple-get-opt ];
+ description = "A library to make a quick test-runner script";
+ license = stdenv.lib.licenses.isc;
+ }) {};
+
"test-pkg" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -202636,8 +211351,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 +211375,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 +211388,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 +211396,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
];
@@ -202727,6 +211444,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "text-ansi" = callPackage
+ ({ mkDerivation, base, text, text-builder }:
+ mkDerivation {
+ pname = "text-ansi";
+ version = "0.1.0";
+ sha256 = "08klbx8jwam3ngxh8kv6z83yh5sbsyb0glycsb1w4zdr8ijsyd3z";
+ libraryHaskellDepends = [ base text text-builder ];
+ description = "Text styling for ANSI terminals";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-binary" = callPackage
({ mkDerivation, base, binary, text }:
mkDerivation {
@@ -202745,8 +211474,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 +211489,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 +211577,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 +211593,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 +211624,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 +211699,7 @@ self: {
];
description = "ICU transliteration";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) icu;};
"text-json-qq" = callPackage
@@ -202999,27 +211735,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 +211753,6 @@ self: {
];
description = "Parser and Printer for LDAP text data stream";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"text-lens" = callPackage
@@ -203103,6 +211817,7 @@ self: {
benchmarkHaskellDepends = [ base criterion text ];
description = "Case conversion, word boundary manipulation, and textual subjugation";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"text-markup" = callPackage
@@ -203131,8 +211846,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 +212001,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 +212048,8 @@ 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
@@ -203352,6 +212069,41 @@ self: {
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";
+ revision = "1";
+ editedCabalFile = "1v8czpi9mn54850k0pilqh1f3yfr5n5vykmg5k57wmrdpx25vkws";
+ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-show-instances" = callPackage
({ mkDerivation, base, base-compat-batteries, bifunctors, binary
, containers, directory, generic-deriving, ghc-boot-th, ghc-prim
@@ -203365,8 +212117,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 +212140,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 +212321,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 +212584,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 +212592,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 +212616,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 +212655,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 +212791,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 +212803,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 +212907,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 +212915,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 +213075,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 +213176,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 +213429,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 +213455,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;
@@ -204762,8 +213527,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "thrist";
- version = "0.3.0.2";
- sha256 = "01y4s5mpk7d0y878fr40j9k19dryj37am9g86v2s9lr5d0q2nnqp";
+ version = "0.4";
+ sha256 = "16alzsalzlvwg3cjfy8yysv8z72v7v1in1hbi5prz6gm1ws4rcly";
libraryHaskellDepends = [ base ];
description = "Type-threaded list";
license = stdenv.lib.licenses.bsd3;
@@ -204851,6 +213616,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 +213639,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 +213730,8 @@ 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
];
@@ -204974,6 +213742,25 @@ self: {
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
+ ];
+ testHaskellDepends = [
+ base hspec hspec-megaparsec megaparsec text
+ ];
+ description = "Parse and display tibetan numerals";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tic-tac-toe" = callPackage
({ mkDerivation, base, glade, gtk, haskell98 }:
mkDerivation {
@@ -205176,6 +213963,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 +214153,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 +214161,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 +214212,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
@@ -205633,6 +214410,8 @@ self: {
pname = "timeit";
version = "2.0";
sha256 = "1sliqpvl501rlcj6s0lhmsf5ym24j4h881wzc1f1wdyvg3jz8kd1";
+ revision = "1";
+ editedCabalFile = "0d4vjg48xyqjmydnjqjxica0zr30vgb91b3vv75cig686ikpjmq7";
libraryHaskellDepends = [ base ];
description = "Time monadic computations with an IO base";
license = stdenv.lib.licenses.bsd3;
@@ -205835,6 +214614,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 +215104,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.1";
+ sha256 = "0nc581y9jjzwd8l88g48c72mla7k6q1w102akl7gl5jsk9ljamd3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -206338,7 +215120,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;
}) {};
@@ -206524,6 +215306,7 @@ self: {
libraryHaskellDepends = [ attoparsec base bytestring utf8-string ];
description = "Library for encoding/decoding TNET strings for PGI";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"to-haskell" = callPackage
@@ -206725,6 +215508,7 @@ self: {
executableHaskellDepends = [ base ];
description = "TokTok C code style checker";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"toktok" = callPackage
@@ -206804,6 +215588,8 @@ self: {
pname = "toml-parser";
version = "0.1.0.0";
sha256 = "0p1nl3009qlcqn4jjggbm1v719a6bswklkyjb3plm0cz3bsyr0fs";
+ revision = "1";
+ editedCabalFile = "0w5vpr6gh0671znv3k90gy9fzjvxzn3g7bir2c6z27ks6y39w0qf";
libraryHaskellDepends = [ array base text time ];
libraryToolDepends = [ alex happy ];
description = "Parser for the TOML configuration language";
@@ -206821,6 +215607,8 @@ self: {
pname = "tomland";
version = "0.3.1";
sha256 = "0kpgcqix32m0nik54rynpphm4mpd8r05mspypjiwj9sidjxn11gw";
+ revision = "1";
+ editedCabalFile = "0pxc2065zjvsw3qwxhj2iw4d08f4j6y40nr51k6nxkz1px855gyk";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -206837,28 +215625,32 @@ self: {
license = stdenv.lib.licenses.mpl20;
}) {};
- "tomland_0_4_0" = callPackage
- ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec
- , megaparsec, mtl, parser-combinators, tasty, tasty-discover
- , tasty-hedgehog, tasty-hspec, text, time, transformers
- , unordered-containers
+ "tomland_0_5_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , gauge, hashable, hedgehog, hspec-megaparsec, htoml
+ , htoml-megaparsec, megaparsec, mtl, parsec, parser-combinators
+ , tasty, tasty-discover, tasty-hedgehog, tasty-hspec, tasty-silver
+ , text, time, transformers, unordered-containers
}:
mkDerivation {
pname = "tomland";
- version = "0.4.0";
- sha256 = "1rkdlq6js5ia807wh9hga6y9r92bxj8j5g7nynba1ilc3x70znfr";
+ version = "0.5.0";
+ sha256 = "001gw3yj0ibg3dm4q5wz8akjpcdx6zj3jza1y6gq7m5h13fzrvgf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base hashable megaparsec mtl parser-combinators text time
- transformers unordered-containers
+ base bytestring containers deepseq hashable megaparsec mtl
+ parser-combinators text time transformers unordered-containers
];
executableHaskellDepends = [ base text time unordered-containers ];
testHaskellDepends = [
base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog
- tasty-hspec text time unordered-containers
+ tasty-hspec tasty-silver text time unordered-containers
];
testToolDepends = [ tasty-discover ];
+ benchmarkHaskellDepends = [
+ aeson base deepseq gauge htoml htoml-megaparsec parsec text time
+ ];
description = "Bidirectional TOML parser";
license = stdenv.lib.licenses.mpl20;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -206866,19 +215658,51 @@ self: {
"tomlcheck" = callPackage
({ mkDerivation, base, htoml-megaparsec, megaparsec
- , optparse-generic, text
+ , optparse-applicative, text
}:
mkDerivation {
pname = "tomlcheck";
- version = "0.1.0.29";
- sha256 = "1blq3yjzd39fjpavjl5k3567algdl424l0al0rvr25xd239kvwzg";
+ version = "0.1.0.39";
+ sha256 = "1kz3bbrymh23b8iadq8baircqh11r3q3zv75390ymxiz3ns26vh8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base htoml-megaparsec megaparsec optparse-generic text
+ base htoml-megaparsec megaparsec optparse-applicative text
];
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, hspec
+ , hspec-expectations, megaparsec, MissingH, regex-posix, servant
+ , servant-blaze, servant-server, strict, text, wai, warp, yaml
+ }:
+ mkDerivation {
+ pname = "toodles";
+ version = "1.0.2";
+ sha256 = "066nc1xgy9g7w82f0s1lagxjpf5hw9zxpnbcf5lbjdj58ssrkdr5";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base blaze-html cmdargs directory hspec hspec-expectations
+ megaparsec MissingH regex-posix servant servant-blaze
+ servant-server strict text wai warp yaml
+ ];
+ executableHaskellDepends = [
+ aeson base blaze-html cmdargs directory hspec hspec-expectations
+ megaparsec MissingH regex-posix servant servant-blaze
+ servant-server strict text wai warp yaml
+ ];
+ testHaskellDepends = [
+ aeson base blaze-html cmdargs directory hspec hspec-expectations
+ 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 +215838,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.1.0";
+ sha256 = "0fqgazhs3ppv4ywdxjrhrdzp5z1szgkq4l0lqpbzqwrhi7axgl69";
+ libraryHaskellDepends = [ base containers semiring-num ];
description = "Finitely represented /total/ maps";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -207386,6 +216210,7 @@ self: {
base hedgehog mmorph postgresql-simple resource-pool text
];
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tracy" = callPackage
@@ -207407,8 +216232,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
@@ -207728,8 +216555,8 @@ self: {
pname = "transformers-lift";
version = "0.2.0.1";
sha256 = "17g03r5hpnygx0c9ybr9za6208ay0cjvz47rkyplv1r9zcivzn0b";
- revision = "1";
- editedCabalFile = "1dy9vg0drkm9ria80hlfx6v72ji2fwmv3ik7lryv7i7hk0bdzk8l";
+ revision = "2";
+ editedCabalFile = "16gpca2wfa7w2b5kzfvqsjjyd61pkv0wyi2mk5b34367p4chnsc5";
libraryHaskellDepends = [
base transformers writer-cps-transformers
];
@@ -207916,6 +216743,7 @@ self: {
];
description = "Type safe http requests";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"trasa-reflex" = callPackage
@@ -208074,10 +216902,8 @@ self: {
}:
mkDerivation {
pname = "tree-diff";
- version = "0.0.1";
- sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz";
- revision = "4";
- editedCabalFile = "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp";
+ version = "0.0.2";
+ sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq";
libraryHaskellDepends = [
aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
containers generics-sop hashable MemoTrie parsec parsers pretty
@@ -208290,30 +217116,47 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "trie-simple" = callPackage
+ ({ mkDerivation, base, containers, criterion, deepseq, hspec, mtl
+ , mwc-random, QuickCheck, vector
+ }:
+ mkDerivation {
+ pname = "trie-simple";
+ version = "0.4.1.1";
+ sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7";
+ libraryHaskellDepends = [ base containers deepseq mtl ];
+ testHaskellDepends = [ base containers hspec QuickCheck vector ];
+ benchmarkHaskellDepends = [
+ base containers criterion deepseq mwc-random vector
+ ];
+ description = "Simple Map-based Trie";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"tries" = callPackage
- ({ mkDerivation, base, bytestring, bytestring-trie, composition
- , containers, criterion, deepseq, hashable, keys, mtl, QuickCheck
+ ({ mkDerivation, base, bytestring, composition, containers
+ , criterion, deepseq, hashable, keys, mtl, QuickCheck
, quickcheck-instances, rose-trees, semigroups, sets, tasty
, tasty-quickcheck, unordered-containers
}:
mkDerivation {
pname = "tries";
- version = "0.0.5";
- sha256 = "1xljwkdwfwd962f7bdbds89m93hw24b54624d4fqlq4n0dyq50x0";
+ version = "0.0.6";
+ sha256 = "0765my34c8fcd8ri9acrcymgpjfqqq7a98zr94z8czrnh5zsmzjv";
libraryHaskellDepends = [
- base bytestring bytestring-trie composition containers deepseq
- hashable keys QuickCheck quickcheck-instances rose-trees semigroups
- sets unordered-containers
+ base bytestring composition containers deepseq hashable keys
+ QuickCheck quickcheck-instances rose-trees semigroups sets
+ unordered-containers
];
testHaskellDepends = [
- base bytestring bytestring-trie composition containers deepseq
- hashable keys mtl QuickCheck quickcheck-instances rose-trees
- semigroups sets tasty tasty-quickcheck unordered-containers
+ base bytestring composition containers deepseq hashable keys mtl
+ QuickCheck quickcheck-instances rose-trees semigroups sets tasty
+ tasty-quickcheck unordered-containers
];
benchmarkHaskellDepends = [
- base bytestring bytestring-trie composition containers criterion
- deepseq hashable keys mtl QuickCheck quickcheck-instances
- rose-trees semigroups sets unordered-containers
+ base bytestring composition containers criterion deepseq hashable
+ keys mtl QuickCheck quickcheck-instances rose-trees semigroups sets
+ unordered-containers
];
description = "Various trie implementations in Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -208416,6 +217259,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "triplesec_0_2_2_0" = callPackage
+ ({ mkDerivation, base, bytestring, cryptonite, doctest, memory, mtl
+ , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, transformers
+ }:
+ mkDerivation {
+ pname = "triplesec";
+ version = "0.2.2.0";
+ sha256 = "1gxks45hjr3a1lnr2v75cl0iwsmlzaq3yzd3p9s0pn5227f34zh7";
+ libraryHaskellDepends = [
+ base cryptonite memory mtl transformers
+ ];
+ testHaskellDepends = [
+ base bytestring doctest memory QuickCheck tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ description = "TripleSec is a simple, triple-paranoid, symmetric encryption library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"trivia" = callPackage
({ mkDerivation, base, comonad, distributive }:
mkDerivation {
@@ -209122,8 +217985,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 +218057,7 @@ self: {
];
description = "An equational theorem prover";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"twee-lib" = callPackage
@@ -209220,8 +218084,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 = [
@@ -209479,8 +218343,8 @@ self: {
}:
mkDerivation {
pname = "twilio";
- version = "0.2.0.1";
- sha256 = "0qj2v4m30ik0qk2m9wghkgbhklql4jnyb0cnyfpip4yn1lczp34s";
+ version = "0.3.0.0";
+ sha256 = "1qxbv6w482hjya6bypz8d6mizy9w03b1j43m0v1h4jwi7v71br9r";
libraryHaskellDepends = [
aeson base binary bytestring containers deepseq errors exceptions
free hashable http-client http-client-tls http-types mtl
@@ -209570,8 +218434,8 @@ self: {
}:
mkDerivation {
pname = "twitch";
- version = "0.1.7.1";
- sha256 = "1nhc6w0ax0fhr1rhdpf8k4j58kxp05fzkfkykbdgn9hjrmmxfn41";
+ version = "0.1.7.2";
+ sha256 = "1l42vifrq025s98gl8n0v2j42l9w6nys916a3pi0av17kqaa29v0";
libraryHaskellDepends = [
base data-default directory filepath fsnotify Glob
optparse-applicative time transformers
@@ -209807,8 +218671,8 @@ self: {
({ mkDerivation, base, containers, template-haskell }:
mkDerivation {
pname = "tyfam-witnesses";
- version = "0.1.1.1";
- sha256 = "1rnmnj2dlzbzj12fddv73mg0p0qgvn5blknb7d9ayns6pxc57aap";
+ version = "0.1.1.2";
+ sha256 = "0gsx2syy58gq7n2yi4whslbnwg4dh34x8jy56h11k8z6n01inppc";
libraryHaskellDepends = [ base containers template-haskell ];
description = "Provide proof witnesses for closed type family evaluation";
license = stdenv.lib.licenses.mit;
@@ -210186,8 +219050,8 @@ self: {
({ mkDerivation, base, ghc-prim }:
mkDerivation {
pname = "type-level-sets";
- version = "0.8.7.0";
- sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7";
+ version = "0.8.9.0";
+ sha256 = "1acsr7g9ssli9yil9kws47gc6h3csmk2afncyki41pipa1vsriv4";
libraryHaskellDepends = [ base ghc-prim ];
description = "Type-level sets and finite maps (with value-level counterparts)";
license = stdenv.lib.licenses.bsd3;
@@ -210223,8 +219087,8 @@ self: {
}:
mkDerivation {
pname = "type-map";
- version = "0.1.2.0";
- sha256 = "0cm2b4xkassjh71ndc5nddpmqyr5bcf3fqxs74wzd11dycmfqfaa";
+ version = "0.1.3.0";
+ sha256 = "146kc36z6fljcgmgl9vii1pmf3hs80v2vz21r84p823znrqjs8gc";
libraryHaskellDepends = [ base containers ghc-prim vector ];
testHaskellDepends = [
base HUnit test-framework test-framework-hunit
@@ -210258,8 +219122,8 @@ self: {
}:
mkDerivation {
pname = "type-of-html";
- version = "1.4.0.1";
- sha256 = "1bcjpkrqa7pmgb7a48q2q8rkx15yz40d91mn7jhj91hzc1h2z6g3";
+ version = "1.4.1.0";
+ sha256 = "05c9rsbfivw7dsjmci7rnv08i4xmyg59kqghqi0f3dr5hrvas8dv";
libraryHaskellDepends = [
base bytestring double-conversion ghc-prim text
];
@@ -210272,6 +219136,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "type-of-html_1_5_0_0" = callPackage
+ ({ mkDerivation, base, blaze-html, bytestring, containers
+ , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim
+ , hspec, QuickCheck, random, temporary, text, weigh
+ }:
+ mkDerivation {
+ pname = "type-of-html";
+ version = "1.5.0.0";
+ sha256 = "0bj05wmhsgn7x3437l6488mkalffn90c4g33njx6xy8p81ls26l9";
+ libraryHaskellDepends = [
+ base bytestring containers double-conversion ghc-prim text
+ ];
+ testHaskellDepends = [ base bytestring hspec QuickCheck ];
+ benchmarkHaskellDepends = [
+ base blaze-html bytestring criterion deepseq ghc ghc-paths random
+ temporary text weigh
+ ];
+ description = "High performance type driven html generation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"type-of-html-static" = callPackage
({ mkDerivation, base, template-haskell, type-of-html }:
mkDerivation {
@@ -210670,16 +219556,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 +219570,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 +219670,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 +219714,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
@@ -210877,8 +219786,8 @@ self: {
}:
mkDerivation {
pname = "tz";
- version = "0.1.3.1";
- sha256 = "1ygzrkx01y1x729y7x2fs81gpcw69q6ijy4fxq00xsb0gff74m0b";
+ version = "0.1.3.2";
+ sha256 = "0k35pw27a3hwg5wqjpfqij0y7rkdlmd85n4kj4ckna4z2v86dl7h";
libraryHaskellDepends = [
base binary bytestring containers data-default deepseq
template-haskell time tzdata vector
@@ -210902,8 +219811,8 @@ self: {
}:
mkDerivation {
pname = "tzdata";
- version = "0.1.20180122.0";
- sha256 = "17fv2jvmbplyaxw4jpq78kqws4cmwc53mlnnjw70vmagx52xh6x3";
+ version = "0.1.20181026.0";
+ sha256 = "0b531ydcb63q44zjpcd2l70xp2hgkxqppnfld7n16ifh9vrxm6gf";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers deepseq vector
@@ -210923,8 +219832,8 @@ self: {
}:
mkDerivation {
pname = "u2f";
- version = "0.1.0.1";
- sha256 = "1gjpxdx4m74mwl7hili74asicvl8rm90k8q9bakx8mjki8akv15m";
+ version = "0.1.0.2";
+ sha256 = "0yn4r5pp84aqvkm1md722mkh7qqy7rnaw3fr99a2inwplqx6pzfr";
libraryHaskellDepends = [
aeson asn1-encoding asn1-types base base64-bytestring binary
bytestring cryptohash cryptonite text
@@ -211025,6 +219934,56 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ucam-webauth" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+ , cryptonite, errors, generic-random, here, hspec, hspec-discover
+ , http-api-data, http-types, microlens, microlens-mtl, mtl
+ , parser-combinators, pem, QuickCheck, quickcheck-instances, text
+ , time, time-qq, ucam-webauth-types, x509
+ }:
+ mkDerivation {
+ pname = "ucam-webauth";
+ version = "0.1.0.0";
+ sha256 = "14l989aasyqdw1x7aq9ikhcq9p3s1ax4qk53rd5s53wdgbc20n9k";
+ revision = "2";
+ editedCabalFile = "1myl5nncwmld4hr0b9990dnqn9ydvza5ciqw5b8pjl747g9qky9f";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring containers cryptonite errors
+ http-api-data http-types microlens microlens-mtl mtl
+ parser-combinators pem text time ucam-webauth-types x509
+ ];
+ testHaskellDepends = [
+ aeson attoparsec base bytestring containers cryptonite errors
+ generic-random here hspec http-api-data http-types microlens
+ microlens-mtl mtl parser-combinators pem QuickCheck
+ quickcheck-instances text time time-qq ucam-webauth-types x509
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "The Ucam-Webauth protocol, used by Raven";
+ license = "(BSD-3-Clause OR Apache-2.0)";
+ }) {};
+
+ "ucam-webauth-types" = callPackage
+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+ , case-insensitive, containers, deepseq, hspec, hspec-discover
+ , http-types, microlens, microlens-mtl, mtl, text, time, timerep
+ }:
+ mkDerivation {
+ pname = "ucam-webauth-types";
+ version = "0.1.0.0";
+ sha256 = "0jq66amdmrbkg69m0cbbw7xfvsc9iy74khn1k39n7jkq821pzjni";
+ revision = "2";
+ editedCabalFile = "1pbl2sy17pkc15170h96ard4z155fm45g18jdxjcdx9hacl003rw";
+ libraryHaskellDepends = [
+ aeson base base64-bytestring bytestring case-insensitive containers
+ deepseq http-types microlens microlens-mtl mtl text time timerep
+ ];
+ testHaskellDepends = [ base hspec ];
+ testToolDepends = [ hspec-discover ];
+ description = "Types for the Ucam-Webauth protocol, as used by Raven";
+ license = "(BSD-3-Clause OR Apache-2.0)";
+ }) {};
+
"uconv" = callPackage
({ mkDerivation, base, icu }:
mkDerivation {
@@ -211046,6 +220005,8 @@ self: {
pname = "udbus";
version = "0.2.3";
sha256 = "1ifl280n2ib26j4h7h46av6k7ms0j1n2wy4shbqk5xli5bbj3k9n";
+ revision = "1";
+ editedCabalFile = "036yscknrmc7dcm111bsjk7q0ghb6ih5b6z1ffsqf442dg83x8w7";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -211207,8 +220168,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 +220280,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 +220333,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 +220355,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 +220369,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 +220486,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 {
@@ -211509,6 +220506,7 @@ self: {
libraryHaskellDepends = [ base ];
description = "IO without any non-error, synchronous exceptions";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"unexceptionalio-trans" = callPackage
@@ -211523,6 +220521,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 +220541,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 +220691,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 ];
@@ -211778,8 +220788,8 @@ self: {
}:
mkDerivation {
pname = "unicode-transforms";
- version = "0.3.4";
- sha256 = "0lh8bj6kxvpkmc14qa34vdrmcsis82mvnq6gs11ddqyjlz5sr7l2";
+ version = "0.3.5";
+ sha256 = "0gm0dwbhr666s7xx71qdrha5r3qwfyyv0wsrvq8jxva3mcwd3xy9";
libraryHaskellDepends = [ base bitarray bytestring text ];
testHaskellDepends = [
base deepseq getopt-generics QuickCheck split text
@@ -211858,28 +220868,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 +220958,8 @@ self: {
pname = "uniprot-kb";
version = "0.1.2.0";
sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l";
+ revision = "2";
+ editedCabalFile = "1kyqbp32a9wys94rxbm5k022crpnm6fnz8w2d3anb7zch17l80qw";
libraryHaskellDepends = [ attoparsec base text ];
testHaskellDepends = [
attoparsec base hspec neat-interpolation QuickCheck text
@@ -212002,8 +221018,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 +221140,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 +221226,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 +221288,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 +221335,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 +221394,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "universum_1_3_0" = callPackage
+ "universum_1_5_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 +221402,8 @@ self: {
}:
mkDerivation {
pname = "universum";
- version = "1.3.0";
- sha256 = "17ggcbkfympmj0y99ycdvck2iliqscz4hp1wz6qgl0gmb3ywx0gp";
+ version = "1.5.0";
+ sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable microlens
microlens-mtl mtl safe-exceptions stm text transformers
@@ -212395,8 +221427,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 +221447,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 +221455,6 @@ self: {
libraryHaskellDepends = [ base unix ];
description = "Portable POSIX-compatibility layer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"unix-fcntl" = callPackage
@@ -212542,6 +221560,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unix-time_0_4_0" = callPackage
+ ({ mkDerivation, base, binary, bytestring, doctest, hspec
+ , old-locale, old-time, QuickCheck, time
+ }:
+ mkDerivation {
+ pname = "unix-time";
+ version = "0.4.0";
+ sha256 = "0fb9mdg596db9wbxsr5m3zc3wasvwblb32fsva0zrac93c9rq51r";
+ libraryHaskellDepends = [ base binary bytestring old-time ];
+ testHaskellDepends = [
+ base bytestring doctest hspec old-locale old-time QuickCheck time
+ ];
+ description = "Unix time parser/formatter and utilities";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unjson" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, containers
, free, hashable, HUnit, invariant, pretty, primitive, scientific
@@ -212549,10 +221584,8 @@ self: {
}:
mkDerivation {
pname = "unjson";
- version = "0.15.2.0";
- sha256 = "040s1b9frl0sj8saa9b0bzsnqhmb4vdrscff2jzzcdn0papn5rbj";
- revision = "1";
- editedCabalFile = "1kv5ybjgpqxq7xy8x1rgr8ia7kaffgih0z7jx74ixdijkqk69447";
+ version = "0.15.2.1";
+ sha256 = "1zx66qjx4rikbs8f2j1vazasin5fr6pxks3j5b7fkpriyxk49khs";
libraryHaskellDepends = [
aeson attoparsec base bytestring containers free hashable invariant
pretty primitive scientific semigroups text time
@@ -212581,14 +221614,27 @@ self: {
license = "GPL";
}) {};
+ "unlifted-list" = callPackage
+ ({ mkDerivation, base, ghc-prim, semigroups }:
+ mkDerivation {
+ pname = "unlifted-list";
+ version = "0.1.0.0";
+ sha256 = "06ygxv8c1435rn9yrg27l1zsihzh4argqn677g0qrigw6wcvn0gg";
+ libraryHaskellDepends = [ base ghc-prim semigroups ];
+ description = "GHC Haskell lists of non-thunks (things of kind TYPE 'UnliftedRep)";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"unliftio" = callPackage
({ mkDerivation, async, base, deepseq, directory, filepath, hspec
, process, stm, time, transformers, unix, unliftio-core
}:
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
@@ -212601,14 +221647,40 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "unliftio_0_2_9_0" = callPackage
+ ({ mkDerivation, async, base, deepseq, directory, filepath, gauge
+ , hspec, process, QuickCheck, stm, time, transformers, unix
+ , unliftio-core
+ }:
+ mkDerivation {
+ pname = "unliftio";
+ version = "0.2.9.0";
+ sha256 = "1f1rrmajnz5j2ljryi9gqx64hjr30yy7pz9rjx02pdfi6alrcrgz";
+ libraryHaskellDepends = [
+ async base deepseq directory filepath process stm time transformers
+ unix unliftio-core
+ ];
+ testHaskellDepends = [
+ async base deepseq directory filepath hspec process QuickCheck stm
+ time transformers unix unliftio-core
+ ];
+ benchmarkHaskellDepends = [
+ async base deepseq directory filepath gauge process stm time
+ transformers unix unliftio-core
+ ];
+ description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unliftio-core" = callPackage
({ 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 +221701,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 {
@@ -212837,6 +221923,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "unparse-attoparsec" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, constraints
+ , mtl, profunctor-monad, profunctors, scientific, text
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "unparse-attoparsec";
+ version = "0.1.0.0";
+ sha256 = "1xkvjdnnks7897fgnk93vn1xsvg67yvr8p7jnsbsmsdhd5d6c5fs";
+ libraryHaskellDepends = [
+ attoparsec base bytestring mtl profunctors
+ ];
+ testHaskellDepends = [
+ aeson base bytestring constraints mtl profunctor-monad profunctors
+ scientific text unordered-containers vector
+ ];
+ description = "An attoparsec roundtrip";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"unroll-ghc-plugin" = callPackage
({ mkDerivation, base, ghc }:
mkDerivation {
@@ -212958,8 +222064,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;
@@ -213037,6 +222143,17 @@ self: {
executableHaskellDepends = [ base ports-tools process ];
description = "Software management tool";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "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
@@ -213171,11 +222288,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 +222306,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
@@ -213211,8 +222329,8 @@ self: {
({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
mkDerivation {
pname = "uri-bytestring-aeson";
- version = "0.1.0.6";
- sha256 = "02pgzkgmcam06qy1lqbmmjbah95b08hl5d5q61smmx78f83mzgfq";
+ version = "0.1.0.7";
+ sha256 = "16zg0fsxzdii72119jyhn2g2gy7j6pk7r8i7w5hk9a353kmvb43y";
libraryHaskellDepends = [
aeson base bytestring text uri-bytestring
];
@@ -213469,9 +222587,10 @@ self: {
];
description = "Painfully simple URL deployment";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "urlpath_9_0_0_1" = callPackage
+ "urlpath_9_0_1" = callPackage
({ mkDerivation, attoparsec-uri, base, exceptions, mmorph
, monad-control, monad-control-aligned, monad-logger, mtl, path
, path-extra, resourcet, split, strict, text, transformers
@@ -213479,8 +222598,8 @@ self: {
}:
mkDerivation {
pname = "urlpath";
- version = "9.0.0.1";
- sha256 = "009836gw2gmmjb08nqqdklpr967gfnnnk1r5lpy3wjyspky03vgv";
+ version = "9.0.1";
+ sha256 = "0acflpvb0imf2qc2gqbqziv4lk6a5p9gxkvbm0mv3kszqslh7rrg";
libraryHaskellDepends = [
attoparsec-uri base exceptions mmorph monad-control
monad-control-aligned monad-logger mtl path path-extra resourcet
@@ -213826,17 +222945,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 +222953,6 @@ self: {
libraryHaskellDepends = [ base ];
description = "Utilities";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"util-exception" = callPackage
@@ -213857,6 +222964,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 +222992,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
@@ -213992,8 +223133,10 @@ self: {
pname = "uu-tc";
version = "2015.1.1";
sha256 = "03x7s7imcrqz1qdlwbgyw2gnrjhl7y5v8bz209kxswyldxz270lg";
+ revision = "1";
+ editedCabalFile = "1jz4w3fnhaz631yrlxrxj1vfl0i0vby038v70hmwhsg10wz7w764";
libraryHaskellDepends = [ base ];
- description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University";
+ description = "Haskell 98 parser combinators for INFOB3TC at Utrecht University";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -214081,6 +223224,7 @@ self: {
executableHaskellDepends = [ base process ];
description = "A debugger for the UUAG system";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"uuid" = callPackage
@@ -214421,6 +223565,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 +223578,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 +223616,8 @@ self: {
pname = "validation";
version = "1";
sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh";
+ revision = "1";
+ editedCabalFile = "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3";
libraryHaskellDepends = [
base bifunctors deepseq lens semigroupoids semigroups
];
@@ -214524,6 +223678,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "validity_0_9_0_0" = callPackage
+ ({ mkDerivation, base, hspec }:
+ mkDerivation {
+ pname = "validity";
+ version = "0.9.0.0";
+ sha256 = "1rm0gw049v7f9i5rqn8f8ps4ksawmmggmhw9yclgh4qhhql7gz3q";
+ 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 +223742,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 +223755,6 @@ self: {
];
description = "Validity instances for Path";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"validity-primitive" = callPackage
@@ -214619,17 +223769,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 +223777,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 +223788,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 +223799,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 +223812,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 +223823,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 +223834,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 +223975,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 +224059,7 @@ self: {
];
description = "A monad transformer for vault-tool";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"vaultaire-common" = callPackage
@@ -215176,8 +224253,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
@@ -215250,46 +224327,25 @@ self: {
}) {};
"vector" = callPackage
- ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive
- , QuickCheck, random, template-haskell, test-framework
+ ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, HUnit
+ , primitive, QuickCheck, random, template-haskell, test-framework
, test-framework-hunit, test-framework-quickcheck2, transformers
}:
mkDerivation {
pname = "vector";
- version = "0.12.0.1";
- sha256 = "0yrx2ypiaxahvaz84af5bi855hd3107kxkbqc8km29nsp5wyw05i";
- revision = "3";
- editedCabalFile = "0y5rh8k710i2a3p1h2rghvr5cfg78p5h0kbfi7ifxqqf6pzlyr1x";
+ version = "0.12.0.2";
+ sha256 = "1wy0pfa3ks6s2dkp1fwrl1s9d3wjmqy9d09icnwfs2zimyn9vs2j";
libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
testHaskellDepends = [
- base HUnit QuickCheck random template-haskell test-framework
- test-framework-hunit test-framework-quickcheck2 transformers
+ base base-orphans HUnit primitive QuickCheck random
+ template-haskell test-framework test-framework-hunit
+ test-framework-quickcheck2 transformers
];
description = "Efficient Arrays";
license = stdenv.lib.licenses.bsd3;
}) {};
"vector-algorithms" = callPackage
- ({ mkDerivation, base, bytestring, containers, primitive
- , QuickCheck, vector
- }:
- mkDerivation {
- pname = "vector-algorithms";
- version = "0.7.0.1";
- sha256 = "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd";
- revision = "2";
- editedCabalFile = "186nxwg02m16v68gi186f0z99cafp4g87flhfccnzlrvshlfb83m";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [ base bytestring primitive vector ];
- testHaskellDepends = [
- base bytestring containers QuickCheck vector
- ];
- description = "Efficient algorithms for vector arrays";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "vector-algorithms_0_7_0_4" = callPackage
({ mkDerivation, base, bytestring, containers, primitive
, QuickCheck, vector
}:
@@ -215305,6 +224361,23 @@ self: {
];
description = "Efficient algorithms for vector arrays";
license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "vector-algorithms_0_8_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, mwc-random
+ , primitive, QuickCheck, vector
+ }:
+ mkDerivation {
+ pname = "vector-algorithms";
+ 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;
}) {};
@@ -215320,21 +224393,19 @@ self: {
}) {};
"vector-binary-instances" = callPackage
- ({ mkDerivation, base, binary, bytestring, criterion, deepseq
- , tasty, tasty-quickcheck, vector
+ ({ mkDerivation, base, binary, bytestring, deepseq, gauge, tasty
+ , tasty-quickcheck, vector
}:
mkDerivation {
pname = "vector-binary-instances";
- version = "0.2.4";
- sha256 = "1y236jb72iab9ska1mc48z6yb0xgwmj45laaqdyjxksd84z7hbrb";
- revision = "1";
- editedCabalFile = "196frl4akhfk7xf1nxzn8lmq99dxhzhsimanswn9yy7ym8zhki4i";
+ version = "0.2.5.1";
+ sha256 = "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r";
libraryHaskellDepends = [ base binary vector ];
testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
benchmarkHaskellDepends = [
- base binary bytestring criterion deepseq vector
+ base binary bytestring deepseq gauge vector
];
- description = "Instances of Data.Binary and Data.Serialize for vector";
+ description = "Instances of Data.Binary for vector";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -215437,14 +224508,31 @@ 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 {
pname = "vector-fftw";
version = "0.1.3.8";
sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6";
- revision = "1";
- editedCabalFile = "0417f7grdvs3ws508a7k9ngpnisw7f7b6bcmmasflvvr66m6166f";
+ revision = "2";
+ editedCabalFile = "16qbqswgrx48lc4h5fa8ccyxv448scad9f2p9qvgzsn66lmm7iqc";
libraryHaskellDepends = [ base primitive storable-complex vector ];
librarySystemDepends = [ fftw ];
description = "A binding to the fftw library for one-dimensional vectors";
@@ -215574,23 +224662,54 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "vector-sized_1_1_1_0" = callPackage
+ ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive
+ , finite-typelits, indexed-list-literals, primitive, vector
+ }:
+ mkDerivation {
+ pname = "vector-sized";
+ version = "1.1.1.0";
+ sha256 = "05rrfiy0zzcq5jmr1kfbpv1p6f35pqsd5k6zf78byznzjwk758nb";
+ libraryHaskellDepends = [
+ adjunctions base comonad deepseq distributive finite-typelits
+ indexed-list-literals primitive vector
+ ];
+ description = "Size tagged vectors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vector-space" = callPackage
({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
mkDerivation {
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";
@@ -215843,8 +224962,8 @@ self: {
({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }:
mkDerivation {
pname = "versioning";
- version = "0.3.0.0";
- sha256 = "12d5xxc8i0ldbsb6y22f9gvk0d61nrgjz3yf7ppvqrzhilgs6yyf";
+ version = "0.3.0.1";
+ sha256 = "08072xwz094qdawczggxx8gk734cas8767zcah84q30qdb5ywzwf";
libraryHaskellDepends = [ aeson base bytestring semigroupoids ];
testHaskellDepends = [ aeson base bytestring hspec ];
description = "Type-safe data versioning";
@@ -215858,8 +224977,8 @@ self: {
}:
mkDerivation {
pname = "versioning-servant";
- version = "0.1.0.0";
- sha256 = "14a1fk2mgcjjlb1z01xb5ngf496kpfr2y588265zn72q54a7l08k";
+ version = "0.1.0.1";
+ sha256 = "0hk30p8wjn00dzxyd45hf7r1qhn944j12km00birgqhf4vcmw7c4";
libraryHaskellDepends = [
aeson attoparsec base bytestring http-media servant versioning
];
@@ -215889,6 +225008,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 +225141,8 @@ self: {
}:
mkDerivation {
pname = "viewprof";
- version = "0.0.0.22";
- sha256 = "07sa15nrwdjyzqmzvrdvl0nggdx5ca6w7qijhv7na9ivr0p2h495";
+ version = "0.0.0.25";
+ sha256 = "0k3mlivbkir5jwqkpbka2fvihkw2ck4549kvl1hcqr1h48zjr5ws";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -216075,8 +225215,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 +225304,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_1" = 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.1";
+ sha256 = "1x2x40cgyhj3yzw4kajssjvlnwlcrrnz7vaa8as2k9xmv9x76ig4";
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 +225334,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
@@ -216429,6 +225571,26 @@ self: {
license = "GPL";
}) {};
+ "vivid_0_4_2_3" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, directory
+ , filepath, hashable, MonadRandom, mtl, network, process, random
+ , random-shuffle, split, stm, time, transformers, utf8-string
+ , vivid-osc, vivid-supercollider
+ }:
+ mkDerivation {
+ pname = "vivid";
+ version = "0.4.2.3";
+ sha256 = "0awm9cnjgfqx1qf6jsnwmf0kxqxwny82q1ddqna8ilqcdrbsxh0i";
+ libraryHaskellDepends = [
+ base binary bytestring containers directory filepath hashable
+ MonadRandom mtl network process random random-shuffle split stm
+ time transformers utf8-string vivid-osc vivid-supercollider
+ ];
+ description = "Sound synthesis with SuperCollider";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vivid-osc" = callPackage
({ mkDerivation, base, binary, bytestring, cereal, microspec, time
}:
@@ -216442,6 +225604,19 @@ self: {
license = "GPL";
}) {};
+ "vivid-osc_0_5_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, microspec, time }:
+ mkDerivation {
+ pname = "vivid-osc";
+ version = "0.5.0.0";
+ sha256 = "041m4k1aqkw35fp7l03i3ba1jyppr8lia2v2zyq7v8yzby8ngys6";
+ libraryHaskellDepends = [ base 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
@@ -216461,6 +225636,26 @@ self: {
license = "GPL";
}) {};
+ "vivid-supercollider_0_4_1_1" = callPackage
+ ({ mkDerivation, base, binary, bytestring, cereal, microspec
+ , QuickCheck, split, utf8-string, vivid-osc
+ }:
+ mkDerivation {
+ pname = "vivid-supercollider";
+ version = "0.4.1.1";
+ sha256 = "1qf4hnslcmqkahxs5d55iljiybn46is41a5kikjd2vnbns4va0fb";
+ libraryHaskellDepends = [
+ base binary bytestring cereal split utf8-string vivid-osc
+ ];
+ testHaskellDepends = [
+ base binary bytestring cereal microspec QuickCheck utf8-string
+ vivid-osc
+ ];
+ description = "Implementation of SuperCollider server specifications";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"vk-aws-route53" = callPackage
({ mkDerivation, aws, base, bytestring, containers, http-conduit
, http-types, old-locale, resourcet, text, time, xml-conduit
@@ -216507,24 +225702,28 @@ self: {
}) {};
"voicebase" = callPackage
- ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client
- , http-client-openssl, json-autotype, lens, mime-types, options
+ ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL
+ , hspec, http-client, http-client-openssl, lens, lens-aeson
+ , mime-types, mtl, optparse-applicative, roundtrip, roundtrip-aeson
, text, wreq
}:
mkDerivation {
pname = "voicebase";
- version = "0.1.1.1";
- sha256 = "1nc2cmfmdalggb7f9xw4xrhms31cky478wxxkq50as6bryl3k3q3";
+ version = "0.2.0.0";
+ sha256 = "0ih0z27vz7767gr11lz227vb84i2kwc6wn9z1yd0zma5nj8x73hw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring HsOpenSSL http-client http-client-openssl
- json-autotype lens mime-types text wreq
+ lens lens-aeson mime-types mtl roundtrip roundtrip-aeson text wreq
];
- executableHaskellDepends = [ base bytestring mime-types options ];
- testHaskellDepends = [ base ];
+ executableHaskellDepends = [
+ aeson base bytestring filepath mime-types optparse-applicative text
+ ];
+ testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
description = "Upload audio files to voicebase to get a transcription";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"void" = callPackage
@@ -216611,6 +225810,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) vrpn;};
+ "vt-utils" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, directory, HUnit, parsec
+ , text, time, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "vt-utils";
+ version = "1.0.1.0";
+ sha256 = "1a33bxnyyhs4ibnrgz5472bqvg4irqh4z5cv0wcwmmpi8s4i629w";
+ libraryHaskellDepends = [
+ aeson base bytestring directory HUnit parsec text time
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring directory HUnit parsec text time
+ unordered-containers vector
+ ];
+ description = "Vector and Text utilities";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"vte" = callPackage
({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools, pango
, vte
@@ -216681,7 +225900,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "vty_5_23_1" = callPackage
+ "vty_5_25_1" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
, deepseq, directory, filepath, hashable, HUnit, microlens
, microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -216692,8 +225911,8 @@ self: {
}:
mkDerivation {
pname = "vty";
- version = "5.23.1";
- sha256 = "1cd328prv1pddza87a2kfh93l101jg1afs5s951yhr9z93mgd7d9";
+ version = "5.25.1";
+ sha256 = "1x15jlf9x6c8nhdbp6alr17vigclkaf5qy5jpp14g5n568p7karw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -216808,6 +226027,41 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "waargonaut" = callPackage
+ ({ mkDerivation, attoparsec, base, bifunctors, bytestring, Cabal
+ , cabal-doctest, containers, contravariant, digit, directory
+ , distributive, doctest, errors, filepath, generics-sop, hedgehog
+ , hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json
+ , hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers
+ , scientific, semigroupoids, semigroups, tagged, tasty
+ , tasty-expected-failure, tasty-hedgehog, tasty-hunit
+ , template-haskell, text, transformers, vector, witherable
+ , wl-pprint-annotated, zippers
+ }:
+ mkDerivation {
+ pname = "waargonaut";
+ version = "0.4.2.0";
+ sha256 = "19zfzff6cp57xv220yyxfi0j36x1qic7v4sa93yclshyjmhm7vnm";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base bifunctors bytestring containers contravariant digit
+ distributive errors generics-sop hoist-error hw-balancedparens
+ hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats natural
+ parsers scientific semigroupoids semigroups tagged text
+ transformers vector witherable wl-pprint-annotated zippers
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring containers contravariant digit directory
+ distributive doctest filepath generics-sop hedgehog hedgehog-fn
+ lens mtl natural scientific semigroupoids semigroups tagged tasty
+ tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell
+ text vector zippers
+ ];
+ description = "JSON wrangling";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wacom-daemon" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
, filepath, Glob, libnotify, process, select, text, udev
@@ -217074,6 +226328,7 @@ self: {
];
description = "Helpers to bind digestive-functors onto wai requests";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-dispatch" = callPackage
@@ -217104,23 +226359,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
+ , 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.1";
- sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604";
+ 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
@@ -217130,37 +226384,6 @@ self: {
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
- }:
- mkDerivation {
- pname = "wai-extra";
- version = "3.0.24.2";
- sha256 = "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci";
- 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;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"wai-frontend-monadcgi" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, cgi
, containers, http-types, transformers, wai
@@ -217676,8 +226899,8 @@ self: {
}:
mkDerivation {
pname = "wai-middleware-content-type";
- version = "0.6.1.2";
- sha256 = "057xrb6nik8imxg91chyhakddb0ywm7ccfkwjlyrbwrd5hm84j8r";
+ version = "0.6.2";
+ sha256 = "18ay8ng3gmyn25iziwlw82z5vbbkc6pgp5d0iz29qmc2lm6y6wgw";
libraryHaskellDepends = [
aeson base blaze-builder blaze-html bytestring clay exceptions
extractable-singleton hashable http-media http-types lucid mmorph
@@ -217918,6 +227141,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 +227150,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 +227261,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 +227291,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
@@ -218112,6 +227340,7 @@ self: {
];
description = "WAI request predicates";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-request-spec" = callPackage
@@ -218146,21 +227375,24 @@ self: {
}) {};
"wai-route" = callPackage
- ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck
- , tasty, tasty-quickcheck, unordered-containers, wai
+ ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+ , http-api-data, http-types, mtl, pattern-trie, QuickCheck, tasty
+ , tasty-quickcheck, text, unordered-containers, wai
}:
mkDerivation {
pname = "wai-route";
- version = "0.4.0";
- sha256 = "1rdrb7v17svz6y502bg49pj1wik7zy7r2l8bldfkssqh9kbrjiyp";
+ version = "1.0.0";
+ sha256 = "1hm947mzp3lynsjlhbl9nawa3p35cca15xj32cv5dyyllf0lac8w";
libraryHaskellDepends = [
- base bytestring http-types unordered-containers wai
+ base bytestring containers deepseq http-api-data http-types
+ pattern-trie text unordered-containers wai
];
testHaskellDepends = [
- base bytestring http-types mtl QuickCheck tasty tasty-quickcheck
- wai
+ base bytestring containers deepseq doctest http-types mtl
+ pattern-trie QuickCheck tasty tasty-quickcheck text
+ unordered-containers wai
];
- description = "Minimalistic, efficient routing for WAI";
+ description = "WAI middleware for path-based request routing with captures";
license = stdenv.lib.licenses.mpl20;
}) {};
@@ -218224,6 +227456,7 @@ self: {
];
description = "Declarative routing for WAI";
license = stdenv.lib.licenses.mpl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-secure-cookies" = callPackage
@@ -218260,6 +227493,7 @@ self: {
];
description = "Flexible session middleware for WAI";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-session-alt" = callPackage
@@ -218293,6 +227527,7 @@ self: {
];
description = "Session store based on clientsession";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-session-mysql" = callPackage
@@ -218478,6 +227713,7 @@ self: {
];
description = "Collection of utility functions for use with WAI";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-websockets" = callPackage
@@ -218640,8 +227876,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 +227917,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 +227997,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
@@ -218862,8 +228116,8 @@ self: {
pname = "wave";
version = "0.1.5";
sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5";
- revision = "1";
- editedCabalFile = "1wvgxay0r5rpcc7yxkznxxcp1za0ifxvk87w0xrilxgb35r3izz8";
+ revision = "2";
+ editedCabalFile = "0zs0mw42z9xzs1r935pd5dssf0x10qbkhxlpfknv0x75n2k0azzj";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring cereal containers data-default-class transformers
@@ -218882,8 +228136,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 +228215,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 +228320,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 +228599,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "web3_0_8_2_1" = 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.2.1";
+ sha256 = "1dcv7977r98lrwh12si9vzvm5bcjdyfdivl63r5zwkykapd15z00";
+ 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 +229155,8 @@ self: {
}:
mkDerivation {
pname = "websockets";
- version = "0.12.5.1";
- sha256 = "1v9zmd34bmh0y02njff4n1vkp1d5jdpq9dlva0z7sr0glv8c3drz";
+ version = "0.12.5.2";
+ sha256 = "0wacifjbskkfv6xq1sbmc8p60wn767xcjhz8hn8hyijxrrmjabci";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -219915,8 +229216,8 @@ self: {
}:
mkDerivation {
pname = "websockets-simple";
- version = "0.1.2.1";
- sha256 = "1g3cqbdycjx82px06xvh4q3jjnp71llzsw4v0s815933fgfcck54";
+ version = "0.1.3";
+ sha256 = "1nknnb7zmkcm377q9i9whcw4fd43q2nk5vla2yilr9lnp5g4gqr0";
libraryHaskellDepends = [
aeson async base bytestring exceptions extractable-singleton
monad-control-aligned profunctors stm transformers vector
@@ -219984,20 +229285,21 @@ self: {
"wedged" = callPackage
({ mkDerivation, array, base, colour, containers, diagrams-lib
- , diagrams-rasterific, MonadRandom, strict
+ , diagrams-postscript, MonadRandom, strict
}:
mkDerivation {
pname = "wedged";
- version = "2";
- sha256 = "1aw29dk0h25zw60m288423bakz36k0jpmzdhy7kq2wns3l5k6jqs";
+ version = "3";
+ sha256 = "1v7xc7bnyhlb2fs0j8zafbnvzyl0hsdyl59f0kibmn0w6sxq34xl";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- array base colour containers diagrams-lib diagrams-rasterific
+ array base colour containers diagrams-lib diagrams-postscript
MonadRandom strict
];
description = "Wedged postcard generator";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"weeder" = callPackage
@@ -220281,15 +229583,13 @@ self: {
}) {};
"wide-word" = callPackage
- ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec
- , QuickCheck
- }:
+ ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog }:
mkDerivation {
pname = "wide-word";
- version = "0.1.0.6";
- sha256 = "0y3wdd5kslz71nlk32nvmi3yqd331jjl49njm58bixqanyc0k30x";
+ version = "0.1.0.7";
+ sha256 = "0qqam1sxssxq43r8i586lrs2zslm2qnw5yhjdqj5zxksk2jrcxrd";
libraryHaskellDepends = [ base deepseq ghc-prim ];
- testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
+ testHaskellDepends = [ base bytestring ghc-prim hedgehog ];
description = "Data types for large but fixed width signed and unsigned integers";
license = stdenv.lib.licenses.bsd2;
}) {};
@@ -220367,8 +229667,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 +229717,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 +229734,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 +229759,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 +229802,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 +229928,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 {
@@ -220685,6 +229993,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "witherable_0_3" = callPackage
+ ({ mkDerivation, base, base-orphans, containers, hashable
+ , transformers, transformers-compat, unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "witherable";
+ version = "0.3";
+ sha256 = "1h0rvygjr76avrpp8dzhama1accm2i9q3245m54543nm6yfn23v2";
+ libraryHaskellDepends = [
+ base base-orphans containers hashable transformers
+ transformers-compat unordered-containers vector
+ ];
+ description = "filterable traversable";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"witness" = callPackage
({ mkDerivation, base, constraints, semigroupoids, transformers }:
mkDerivation {
@@ -220709,6 +230034,7 @@ self: {
executableHaskellDepends = [ base bytestring network unix ];
description = "A network server to show bottlenecks of GHC";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wizard" = callPackage
@@ -220728,10 +230054,8 @@ self: {
}:
mkDerivation {
pname = "wizards";
- version = "1.0.2";
- sha256 = "02yk9d01d39c3hpvlh2c6v35fzyf3nm92f6vff0qns30dmr2r8ab";
- revision = "1";
- editedCabalFile = "15vwynd5v6xm92dxkxf125grd8sv599n5bnj92qqmhlc89psxhxk";
+ version = "1.0.3";
+ sha256 = "1clvbd1ckhvy29qrbmpkn7bya7300fq6znnps23nn3nxyrxhsr85";
libraryHaskellDepends = [
base containers control-monad-free haskeline mtl transformers
];
@@ -220758,6 +230082,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 {
@@ -221501,8 +230847,8 @@ self: {
}:
mkDerivation {
pname = "wreq";
- version = "0.5.2.1";
- sha256 = "0dqj94lky93jwrkq65pn4nfl2cv8yjgqaxdwbvfyr6vhinrnkl5k";
+ version = "0.5.3.0";
+ sha256 = "1bi78y0jzm8mvwbfc4mphg8iyjz5v1f4ziqpk1dskvb1f3ysw3d9";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -221525,6 +230871,45 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wreq_0_5_3_1" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec
+ , authenticate-oauth, base, base16-bytestring, base64-bytestring
+ , bytestring, Cabal, cabal-doctest, case-insensitive, containers
+ , cryptonite, directory, doctest, exceptions, filepath, ghc-prim
+ , hashable, http-client, http-client-tls, http-types, HUnit, lens
+ , lens-aeson, memory, mime-types, network-info, psqueues
+ , QuickCheck, snap-core, snap-server, template-haskell, temporary
+ , test-framework, test-framework-hunit, test-framework-quickcheck2
+ , text, time, time-locale-compat, transformers, unix-compat
+ , unordered-containers, uuid, vector
+ }:
+ mkDerivation {
+ pname = "wreq";
+ version = "0.5.3.1";
+ sha256 = "1i2f2bxx84l8qzkz9v3qhx5sbl78ysc3vqadfhrxk3h0ljklwfz3";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec authenticate-oauth base base16-bytestring
+ bytestring case-insensitive containers cryptonite exceptions
+ ghc-prim hashable http-client http-client-tls http-types lens
+ lens-aeson memory mime-types psqueues template-haskell text time
+ time-locale-compat unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson aeson-pretty base base64-bytestring bytestring
+ case-insensitive containers directory doctest filepath hashable
+ http-client http-types HUnit lens lens-aeson network-info
+ QuickCheck snap-core snap-server temporary test-framework
+ test-framework-hunit test-framework-quickcheck2 text time
+ transformers unix-compat unordered-containers uuid vector
+ ];
+ description = "An easy-to-use HTTP client library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wreq-sb" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec
, authenticate-oauth, base, base16-bytestring, base64-bytestring
@@ -221619,6 +231004,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 +231138,32 @@ self: {
];
description = "A simple CLI utility for interacting with a websocket";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "ws_0_0_5" = callPackage
+ ({ mkDerivation, async, attoparsec, attoparsec-uri, base
+ , bytestring, exceptions, haskeline, mtl, network
+ , optparse-applicative, strict, text, vector, websockets, wuss
+ }:
+ mkDerivation {
+ pname = "ws";
+ version = "0.0.5";
+ sha256 = "1qj4yq2z7ml88jgcqfy8i1cn1cbmdv56vg7v6b2inh4b4h41yax6";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async attoparsec-uri base bytestring exceptions haskeline mtl
+ network text websockets wuss
+ ];
+ executableHaskellDepends = [
+ async attoparsec attoparsec-uri base bytestring exceptions
+ haskeline mtl network optparse-applicative strict text vector
+ websockets wuss
+ ];
+ 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 +231253,8 @@ self: {
pname = "wss-client";
version = "0.2.1.1";
sha256 = "1wgqd8hh22ld72c1ccfr191ydqb5fija6c1l0vbg7n8pldhmi92w";
+ revision = "1";
+ editedCabalFile = "03q6mpdy93y8kjmjcxpjasg6q1mg64az28z99gm2w2iih3mqa702";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -221835,6 +231263,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
@@ -221949,8 +231378,8 @@ self: {
}:
mkDerivation {
pname = "wuss";
- version = "1.1.10";
- sha256 = "0l4mlmr3b8ndx4nmb3rf0n0bpjxhzxmqv1mslxl432kf02312z09";
+ version = "1.1.11";
+ sha256 = "1mlqgi80r5db0j58r0laiwp1044n4insq89bv1v3y26j726yjvp0";
libraryHaskellDepends = [
base bytestring connection network websockets
];
@@ -222197,10 +231626,10 @@ self: {
}:
mkDerivation {
pname = "x509";
- version = "1.7.3";
- sha256 = "0mkk29g32fs70bqkikg83v45h9jig9c8aail3mrdqwxpkfa0yx21";
+ version = "1.7.5";
+ sha256 = "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i";
revision = "1";
- editedCabalFile = "06zzirygvzp0ssdg9blipdwmd0b41p4gxh3ldai7ngjyjsdclwsx";
+ editedCabalFile = "1z98llpggldy4yb7afcsn3r3q4vklvx2pqyrhy9fir5y2yd5l601";
libraryHaskellDepends = [
asn1-encoding asn1-parse asn1-types base bytestring containers
cryptonite hourglass memory mtl pem
@@ -222220,8 +231649,8 @@ self: {
}:
mkDerivation {
pname = "x509-store";
- version = "1.6.6";
- sha256 = "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va";
+ version = "1.6.7";
+ sha256 = "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp";
libraryHaskellDepends = [
asn1-encoding asn1-types base bytestring containers cryptonite
directory filepath mtl pem x509
@@ -222249,21 +231678,22 @@ self: {
"x509-util" = callPackage
({ mkDerivation, asn1-encoding, asn1-types, base, bytestring
- , cryptonite, directory, hourglass, pem, x509, x509-store
+ , cryptonite, directory, hourglass, memory, pem, x509, x509-store
, x509-system, x509-validation
}:
mkDerivation {
pname = "x509-util";
- version = "1.6.4";
- sha256 = "0qv33r1p1mdl8yskl0hzy3s989y929lk2q23i9qb9fb6w63g6nfb";
+ version = "1.6.5";
+ sha256 = "1d8s1aaymc0bim871cblv1jpy6vnkadxz4spd7wpr90vswkd2hl7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
asn1-encoding asn1-types base bytestring cryptonite directory
- hourglass pem x509 x509-store x509-system x509-validation
+ hourglass memory pem x509 x509-store x509-system x509-validation
];
description = "Utility for X509 certificate and chain";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"x509-validation" = callPackage
@@ -222273,17 +231703,16 @@ self: {
}:
mkDerivation {
pname = "x509-validation";
- version = "1.6.10";
- sha256 = "1ms51scawldgyfcim5a2qlgyn3rnrclyh205d6djaa1569vrs73n";
- revision = "1";
- editedCabalFile = "1isap8v1gh31q4pj3gn155ya8nd1da0a5a3cryqh4yhf0ivbwl0w";
+ version = "1.6.11";
+ sha256 = "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr";
libraryHaskellDepends = [
asn1-encoding asn1-types base bytestring containers cryptonite
data-default-class hourglass memory mtl pem x509 x509-store
];
testHaskellDepends = [
asn1-encoding asn1-types base bytestring cryptonite
- data-default-class hourglass tasty tasty-hunit x509 x509-store
+ data-default-class hourglass memory tasty tasty-hunit x509
+ x509-store
];
description = "X.509 Certificate and CRL validation";
license = stdenv.lib.licenses.bsd3;
@@ -222495,8 +231924,8 @@ self: {
}:
mkDerivation {
pname = "xeno";
- version = "0.3.4";
- sha256 = "1srlyg0wc2mwsa84isv0brcbwsrw6i7jbi0b2mjhnhd6d7cmcajs";
+ version = "0.3.5.1";
+ sha256 = "1bdvj5ql0q9i8vb3429d8kl3hyk45r37s23rm76mhwhazhqxcm60";
libraryHaskellDepends = [
array base bytestring deepseq hspec mtl mutable-containers vector
];
@@ -222916,8 +232345,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 +232399,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";
@@ -223031,6 +232460,7 @@ self: {
];
description = "Streaming XML parser based on conduits";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"xml-conduit-writer" = callPackage
@@ -223609,8 +233039,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
@@ -223679,39 +233109,43 @@ self: {
}) {};
"xmobar" = callPackage
- ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring
- , containers, dbus, directory, filepath, hinotify, hspec, HTTP
- , http-conduit, http-types, iwlib, libmpd, libXpm, libXrandr
- , libXrender, mtl, old-locale, parsec, parsec-numbers, process
- , regex-compat, stm, time, timezone-olson, timezone-series
- , transformers, unix, utf8-string, wirelesstools, X11, X11-xft
+ ({ mkDerivation, alsa-core, alsa-mixer, async, base, bytestring
+ , containers, dbus, directory, extensible-exceptions, filepath
+ , hinotify, hspec, HTTP, http-conduit, http-types, iwlib, libmpd
+ , libXpm, libXrandr, libXrender, mtl, old-locale, parsec
+ , parsec-numbers, process, regex-compat, stm, temporary, time
+ , timezone-olson, timezone-series, transformers, unix, utf8-string
+ , wirelesstools, X11, X11-xft
}:
mkDerivation {
pname = "xmobar";
- version = "0.28";
- sha256 = "1xh87asg8y35srvp7d3gyyy4bkxsw122liihxgzgm8pqv2z3h4zd";
+ version = "0.29.3";
+ sha256 = "1bg8nj9k8r7i7328djnf6bgqzdq7lgx9yjgvl9fqq76bkxzkgx0a";
configureFlags = [
"-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
"-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
"-fwith_rtsopts" "-fwith_threaded" "-fwith_utf8" "-fwith_uvmeter"
"-fwith_weather" "-fwith_xft" "-fwith_xpm"
];
- isLibrary = false;
+ isLibrary = true;
isExecutable = true;
- executableHaskellDepends = [
- alsa-core alsa-mixer base bytestring containers dbus directory
- filepath hinotify HTTP http-conduit http-types iwlib libmpd mtl
- old-locale parsec parsec-numbers process regex-compat stm time
- timezone-olson timezone-series transformers unix utf8-string X11
- X11-xft
+ libraryHaskellDepends = [
+ alsa-core alsa-mixer async base bytestring containers dbus
+ directory extensible-exceptions filepath hinotify HTTP http-conduit
+ http-types iwlib libmpd mtl old-locale parsec parsec-numbers
+ process regex-compat stm time timezone-olson timezone-series
+ transformers unix utf8-string X11 X11-xft
];
- executableSystemDepends = [
+ librarySystemDepends = [
libXpm libXrandr libXrender wirelesstools
];
+ executableHaskellDepends = [
+ async base containers directory filepath parsec unix X11
+ ];
testHaskellDepends = [
- base bytestring containers directory filepath hspec mtl old-locale
- parsec parsec-numbers process regex-compat stm time transformers
- unix X11
+ alsa-core alsa-mixer async base bytestring containers directory
+ filepath hspec mtl old-locale parsec parsec-numbers process
+ regex-compat stm temporary time transformers unix X11
];
description = "A Minimalistic Text Based Status Bar";
license = stdenv.lib.licenses.bsd3;
@@ -223726,8 +233160,8 @@ self: {
}:
mkDerivation {
pname = "xmonad";
- version = "0.14.2";
- sha256 = "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949";
+ version = "0.15";
+ sha256 = "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -223775,8 +233209,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
@@ -223858,8 +233292,8 @@ self: {
}:
mkDerivation {
pname = "xmonad-extras";
- version = "0.14";
- sha256 = "1p1xc8qcrrdv3hhvlmg6l6mcywz7q2i81y6frnf3iz00n01b3d9f";
+ version = "0.15";
+ sha256 = "0yi6p4s9vl92bnr0sbcvm80x37n4fyglm4x3lrc9l8mapbpxjr02";
configureFlags = [
"-f-with_hlist" "-fwith_parsec" "-fwith_split"
];
@@ -223885,16 +233319,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.1.0";
+ sha256 = "1pihi0959wys3sd4r8r1rmh5vx84174wmjpanbyihzjhykvf7n2j";
+ libraryHaskellDepends = [ base containers dbus X11 ];
description = "Bind media keys to work with Spotify";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -223919,13 +233349,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 +233367,14 @@ 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.1.0";
+ sha256 = "0bc52vy142hn75k52zz8afjfxwv86p73kmqmi48rqiws10kpnclw";
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;
@@ -223957,6 +233386,8 @@ self: {
pname = "xmonad-wallpaper";
version = "0.0.1.4";
sha256 = "0f6214kqp86xnk1zginjiprnqlj2fzcvh3w5sv3yvqg98mwdd0cg";
+ revision = "1";
+ editedCabalFile = "1vxgv702wgr0k0kzd602v8xv11q5dap4mfhqifnr928bwf9scp28";
libraryHaskellDepends = [ base magic mtl random unix xmonad ];
description = "xmonad wallpaper extension";
license = stdenv.lib.licenses.lgpl3;
@@ -224442,6 +233873,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 +234073,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 +234089,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 +234097,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
@@ -224882,15 +234328,14 @@ self: {
({ mkDerivation, base, blank-canvas, stm, time, Yampa }:
mkDerivation {
pname = "yampa-canvas";
- version = "0.2.2";
- sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n";
- revision = "5";
- editedCabalFile = "18my271nsvb26sh5l45ng2zvwnm6fzw589cr9cipbpdaaqhyppfg";
+ version = "0.2.3";
+ sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
description = "blank-canvas frontend for Yampa";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yampa-glfw" = callPackage
@@ -224911,6 +234356,20 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yampa-glut" = callPackage
({ mkDerivation, base, GLUT, newtype, OpenGL, vector-space
, Yampa-core
@@ -224948,6 +234407,25 @@ 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;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yampa2048" = callPackage
({ mkDerivation, base, gloss, random, Yampa }:
mkDerivation {
@@ -225231,8 +234709,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 +234728,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 +234748,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 +234898,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 +235041,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
@@ -225582,8 +235060,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth-hashdb";
- version = "1.7";
- sha256 = "072g8c2phhgphj0469qg9chbninxwjkigy2pzhfl51zbm50skfb5";
+ version = "1.7.1";
+ sha256 = "1rfz2xanm6d70fx8ywh8j8py8003akzgi10s9n7syqm8kaj2fvqd";
libraryHaskellDepends = [
aeson base bytestring persistent text yesod-auth yesod-core
yesod-form yesod-persistent
@@ -225705,15 +235183,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 +235204,8 @@ self: {
}:
mkDerivation {
pname = "yesod-auth-oauth2";
- version = "0.5.1.0";
- sha256 = "18mm1394rs93cchzglwdhzh5sc025bglgrqi4c0hi5hhw893k38z";
+ version = "0.6.0.0";
+ sha256 = "12n2af0by708d5g2080y6w1xf8h692v1nxzgmwqfmsqf0c51ad05";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -225970,20 +235448,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.9";
+ sha256 = "0jwfxcp0hdp1lw63gcqpqbvdrzifyds3x42wk0m5wxy7hj0x0r6a";
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 +235684,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 +235745,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
@@ -226291,12 +235769,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "yesod-form-bootstrap4_2_0_0" = callPackage
+ "yesod-form-bootstrap4_2_1_0" = callPackage
({ mkDerivation, base, text, yesod-core, yesod-form }:
mkDerivation {
pname = "yesod-form-bootstrap4";
- version = "2.0.0";
- sha256 = "19aiifq8rmdjlzl1slh3rqhggp6h52nsb6v9wnhpi6c3nq4l2paf";
+ version = "2.1.0";
+ sha256 = "1wf1jbhfs4f75977rnrrkahgysxqrcas4qi1ay1ggq29hp1z4hic";
libraryHaskellDepends = [ base text yesod-core yesod-form ];
description = "renderBootstrap4";
license = stdenv.lib.licenses.mit;
@@ -226511,8 +235989,8 @@ self: {
}:
mkDerivation {
pname = "yesod-markdown";
- version = "0.12.3";
- sha256 = "10vnip7yifq3li4jwql5pzrdaqf1z2bb4h99rf1iqzvd3b8mqq30";
+ version = "0.12.6.0";
+ sha256 = "005brhqz52q6r03fx7ka2i1r2b1s2j7nis5a2ycdmr0mw5mb2scm";
libraryHaskellDepends = [
base blaze-html blaze-markup bytestring directory pandoc persistent
shakespeare text xss-sanitize yesod-core yesod-form
@@ -226589,17 +236067,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 +236127,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 +236387,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 +236582,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 +236700,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 +236870,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 +236892,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 {
@@ -227978,20 +237487,32 @@ self: {
pname = "yoctoparsec";
version = "0.1.0.0";
sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp";
- revision = "1";
- editedCabalFile = "12qzdi2dx22kvfmvsj8yy82fgl29m15ys9myra3jrq4fqr5n0br9";
+ revision = "2";
+ editedCabalFile = "149a34hpbm6fkkmck70wgqg6792yl91kjirpwf6wdkkr4ga0v514";
libraryHaskellDepends = [ base free mtl ];
description = "A truly tiny monadic parsing library";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yoda" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "yoda";
+ version = "0.1.3.0";
+ sha256 = "0qkg8aykr8whjrkwfnsds3bjbrb51r83rd60mpdwcs12zyqlpi0d";
+ libraryHaskellDepends = [ base ];
+ description = "Parser combinators for young padawans";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"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 +237930,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.1";
+ sha256 = "0yhpy1dwh1axbh3xgxn97vnh616pywz56r7gy6sfvqaxj9bqviha";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -228433,8 +237955,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 +238159,7 @@ self: {
];
description = "More constrained extensions to zeromq4-haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zeroth" = callPackage
@@ -228843,6 +238366,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
@@ -228868,6 +238422,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) unzip;};
+ "zip-archive_0_4" = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, containers
+ , digest, directory, filepath, HUnit, mtl, pretty, process
+ , temporary, text, time, unix, unzip, zlib
+ }:
+ mkDerivation {
+ pname = "zip-archive";
+ version = "0.4";
+ sha256 = "06fs9959w807iy4xmngpnv1rps5sr1kqr2pd7b3iw6xfjlfskgjz";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers digest directory filepath
+ mtl pretty text time unix zlib
+ ];
+ testHaskellDepends = [
+ base bytestring directory filepath HUnit process temporary time
+ unix
+ ];
+ testToolDepends = [ unzip ];
+ description = "Library for creating and modifying zip archives";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) unzip;};
+
"zip-conduit" = callPackage
({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
, criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl
@@ -228921,6 +238500,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 {
@@ -228954,8 +238558,8 @@ self: {
({ mkDerivation, base, multirec }:
mkDerivation {
pname = "zipper";
- version = "0.4.2";
- sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44";
+ version = "0.4.3";
+ sha256 = "1p8yn91snyv5p6bmll7d0gm0zbrhp99fl4kziq0vkbchlpcdjapf";
libraryHaskellDepends = [ base multirec ];
description = "Generic zipper for families of recursive datatypes";
license = stdenv.lib.licenses.bsd3;
@@ -229406,20 +239010,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 a93637623d3e..e3b73641989a 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.
@@ -258,6 +259,9 @@ rec {
*/
buildStrictly = pkg: buildFromSdist (failOnAllWarnings pkg);
+ /* Disable core optimizations, significantly speeds up build time */
+ disableOptimization = pkg: appendConfigureFlag pkg "--disable-optimization";
+
/* Turn on most of the compiler warnings and fail the build if any
of them occur. */
failOnAllWarnings = drv: appendConfigureFlag drv "--ghc-option=-Wall --ghc-option=-Werror";
@@ -299,12 +303,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 +338,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 45cc37117883..e36933a81944 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;
@@ -125,6 +125,7 @@ let
name = "cabal2nix-${name}";
nativeBuildInputs = [ pkgs.buildPackages.cabal2nix ];
preferLocalBuild = true;
+ allowSubstitutes = false;
phases = ["installPhase"];
LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive";
@@ -176,34 +177,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 +219,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 +262,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 000000000000..68fcbdb79a5d
--- /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/opencv-fix-116.patch b/pkgs/development/haskell-modules/patches/opencv-fix-116.patch
new file mode 100644
index 000000000000..bf89d8daf9fc
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/opencv-fix-116.patch
@@ -0,0 +1,11 @@
+diff -ur opencv-0.0.2.1.bak/Setup.hs opencv-0.0.2.1/Setup.hs
+--- opencv-0.0.2.1.bak/Setup.hs 2018-11-10 17:18:41.355731189 +0100
++++ opencv-0.0.2.1/Setup.hs 2018-11-10 17:18:56.901681162 +0100
+@@ -3,6 +3,6 @@
+
+ main = do
+ args <- getArgs
+- let args' | "configure" `elem` args = args ++ ["--with-gcc","c++", "--with-ld","c++"]
++ let args' | "configure" `elem` args = args ++ ["--with-gcc","c++"]
+ | otherwise = args
+ defaultMainArgs args'
diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix
index d16d9b2245d6..844ce98cd4c3 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 53b4fb0a004f..3a915cd67f41 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 3ed1404fef7c..5e1288685a7e 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 72e5e3f5be7e..0f6e258ee202 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 1e234b3f6934..91ee174dadff 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 7dbd12110888..c5e33f4594f2 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 c12ea54f5f9f..2fe783da4486 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 7b6cb64cfe37..7f3164f3160d 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 3989b8f41135..8b968c9732ab 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 8e979ea796ec..06b8ec5e82d2 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 17706d1b0969..79df925323ed 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 09fabb6715db..9e9736d25661 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 d8b469ca7689..5629221d601b 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 2281e4821f7a..dae310cda053 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 9f4af7cc3b85..197cb1552cbd 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 9ba8c6bb2d4d..5ce9ad7e915d 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 8bcb67fa759a..21b81f4a95c5 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 78f3674aeabd..dab6913ee8bc 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 00252b6a7cd6..433fdf647697 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 c8d993ccb8a2..6d752fed0f98 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 7f80a1ce3c50..98f4b4ea4d63 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 bd895a33bae3..00d4adba5dc8 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 7f1ecb61c8ec..f6fdaf7a75e2 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 ec689ce4805a..61efb8cd575e 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 0231555b4ad6..ebe92f468982 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 14b9a78af46e..cc88b32119e7 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 081f1a547d69..85794b09ae0b 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 0a54a916ba73..e6112c5a3343 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/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
new file mode 100644
index 000000000000..bc2d0e5be5a8
--- /dev/null
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -0,0 +1,257 @@
+{ stdenv, lib, fetchurl, clojure,
+ nodejs, jre, unzip, nodePackages,
+ python, openssl, pkgs }:
+
+let # packageJSON=./package.json;
+ version = "1.9.0";
+ nodeVersion = "10.9.0";
+ nodeSources = fetchurl {
+ url="https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz";
+ sha256="0wgawq3wzw07pir73bxz13dggcc1fj0538y7y69n3cc0a2kiplqy";
+ };
+ lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH";
+
+ # as found in cljs/snapshot/lumo/repl.cljs
+ requireDeps = '' \
+ cljs.analyzer \
+ cljs.compiler \
+ cljs.env \
+ cljs.js \
+ cljs.reader \
+ cljs.repl \
+ cljs.source-map \
+ cljs.source-map.base64 \
+ cljs.source-map.base64-vlq \
+ cljs.spec.alpha \
+ cljs.spec.gen.alpha \
+ cljs.tagged-literals \
+ cljs.tools.reader \
+ cljs.tools.reader.reader-types \
+ cljs.tools.reader.impl.commons \
+ cljs.tools.reader.impl.utils \
+ clojure.core.rrb-vector \
+ clojure.core.rrb-vector.interop \
+ clojure.core.rrb-vector.nodes \
+ clojure.core.rrb-vector.protocols \
+ clojure.core.rrb-vector.rrbt \
+ clojure.core.rrb-vector.transients \
+ clojure.core.rrb-vector.trees \
+ clojure.string \
+ clojure.set \
+ clojure.walk \
+ cognitect.transit \
+ fipp.visit \
+ fipp.engine \
+ fipp.deque \
+ lazy-map.core \
+ lumo.pprint.data \
+ lumo.repl \
+ lumo.repl-resources \
+ lumo.js-deps \
+ lumo.common '';
+
+ compileClojurescript = (simple: ''
+ (require '[cljs.build.api :as cljs])
+ (cljs/build \"src/cljs/snapshot\"
+ {:optimizations ${if simple then ":simple" else ":none"}
+ :main 'lumo.core
+ :cache-analysis true
+ :source-map false
+ :dump-core false
+ :static-fns true
+ :optimize-constants false
+ :npm-deps false
+ :verbose true
+ :closure-defines {'cljs.core/*target* \"nodejs\"
+ 'lumo.core/*lumo-version* \"${version}\"}
+ :compiler-stats true
+ :process-shim false
+ :fn-invoke-direct true
+ :parallel-build false
+ :browser-repl false
+ :target :nodejs
+ :hashbang false
+ ;; :libs [ \"src/cljs/bundled\" \"src/js\" ]
+ :output-dir ${if simple
+ then ''\"cljstmp\"''
+ else ''\"target\"''}
+ :output-to ${if simple
+ then ''\"cljstmp/main.js\"''
+ else ''\"target/deleteme.js\"'' }})
+ '');
+
+
+ cacheToJsons = ''
+ (import [java.io ByteArrayOutputStream FileInputStream])
+ (require '[cognitect.transit :as transit]
+ '[clojure.edn :as edn]
+ '[clojure.string :as str])
+
+ (defn write-transit-json [cache]
+ (let [out (ByteArrayOutputStream. 1000000)
+ writer (transit/writer out :json)]
+ (transit/write writer cache)
+ (.toString out)))
+
+ (defn process-caches []
+ (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\"
+ cache-aot-edn (edn/read-string (slurp cache-aot-path))
+ cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\"
+ cache-macros-stream (FileInputStream. cache-macros-path)
+ cache-macros-edn (transit/read (transit/reader cache-macros-stream :json))
+ caches [[cache-aot-path cache-aot-edn]
+ [cache-macros-path cache-macros-edn]]]
+ (doseq [[path cache-edn] caches]
+ (doseq [key (keys cache-edn)]
+ (let [out-path (str/replace path #\"(\.json|\.edn)\$\"
+ (str \".\" (munge key) \".json\"))
+ tr-json (write-transit-json (key cache-edn))]
+ (spit out-path tr-json))))))
+
+ (process-caches)
+ '';
+
+ trimMainJsEnd = ''
+ (let [string (slurp \"target/main.js\")]
+ (spit \"target/main.js\"
+ (subs string 0 (.indexOf string \"cljs.nodejs={};\"))))
+ '';
+
+
+ cljdeps = import ./deps.nix { inherit pkgs; };
+ cljpaths = cljdeps.makePaths {};
+ classp = cljdeps.makeClasspaths {
+ extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"];
+ };
+
+
+ getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar;
+
+in stdenv.mkDerivation rec {
+ inherit version;
+ name = "lumo-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz";
+ sha256 = "1mr3zjslznhv7y3mzvg1pmmvzn10d6di26izz4x8p4nfnshacwgw";
+ };
+
+
+ buildInputs = [ nodejs clojure jre unzip python openssl
+ nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" ];
+
+ buildPhase = ''
+ # Copy over lumo-build-deps environment
+ rm yarn.lock
+ cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./
+
+ # configure clojure-cli
+ mkdir ./.cpcache
+ export CLJ_CONFIG=`pwd`
+ export CLJ_CACHE=`pwd`/.cpcache
+
+ # require more namespaces for cljs-bundle
+ sed -i "s!ns lumo.core! \
+ ns lumo.core \
+ (:require ${requireDeps}) \
+ (:require-macros [clojure.template :as temp] \
+ [cljs.test :as test])!g" \
+ ./src/cljs/snapshot/lumo/core.cljs
+
+ # Step 1: compile clojurescript with :none and :simple
+ ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}"
+ ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript false}"
+ cp -f cljstmp/main.js target/main.js
+ ${clojure}/bin/clojure -Scp ${classp} -e "${trimMainJsEnd}"
+
+ # Step 2: sift files
+ unzip -o ${getJarPath "org.clojure/clojurescript"} -d ./target
+ unzip -j ${getJarPath "org.clojure/clojure"} "clojure/template.clj" -d ./target/clojure
+ unzip -o ${getJarPath "org.clojure/google-closure-library"} -d ./target
+ unzip -o ${getJarPath "org.clojure/google-closure-library-third-party"} -d ./target
+ unzip -o ${getJarPath "org.clojure/tools.reader"} -d ./target
+ unzip -o ${getJarPath "org.clojure/test.check"} -d ./target
+ cp -rf ./src/cljs/bundled/lumo/* ./target/lumo/
+ cp -rf ./src/cljs/snapshot/lumo/repl.clj ./target/lumo/
+ # cleanup
+ mv ./target/main.js ./target/main
+ rm ./target/*\.js
+ mv ./target/main ./target/main.js
+ rm ./target/AUTHORS
+ rm ./target/LICENSE
+ rm ./target/*.edn
+ rm ./target/*.md
+ rm -rf ./target/css
+ rm -rf ./target/META-INF
+ rm -rf ./target/com
+ rm -rf ./target/cljs/build
+ rm -rf ./target/cljs/repl
+ rm ./target/cljs/core\.cljs\.cache.aot\.json
+ rm ./target/cljs/source_map\.clj
+ rm ./target/cljs/repl\.cljc
+ rm ./target/cljs/externs\.clj
+ rm ./target/cljs/closure\.clj
+ rm ./target/cljs/util\.cljc
+ rm ./target/cljs/js_deps\.cljc
+ rm ./target/cljs/analyzer/utils\.clj
+ rm ./target/cljs/core/macros\.clj
+ rm ./target/cljs/compiler/api.clj
+ rm ./target/goog/test_module*
+ rm ./target/goog/transpile\.js
+ rm ./target/goog/base_*
+ find ./target -type f -name '*.class' -delete
+ find ./target -type d -empty -delete
+
+ # Step 3: generate munged cache jsons
+ ${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}"
+ rm ./target/cljs/core\$macros\.cljc\.cache\.json
+
+
+ # Step 4: Bunde javascript
+ NODE_ENV=production node scripts/bundle.js
+ node scripts/bundleForeign.js
+
+ # Step 5: Backup resources
+ cp -R target resources_bak
+
+ # Step 6: Package executeable 1st time
+ # fetch node sources and copy to palce that nexe will find
+ mkdir -p tmp/${nodeVersion}
+ cp ${nodeSources} tmp/${nodeVersion}/node-${nodeVersion}.tar.gz
+ tar -C ./tmp/${nodeVersion} -xf ${nodeSources}
+ mv ./tmp/${nodeVersion}/node-v${nodeVersion}/* ./tmp/${nodeVersion}/
+ rm -rf ${lumo-internal-classpath}
+ mv target ${lumo-internal-classpath}
+ node scripts/package.js ${nodeVersion}
+ rm -rf ${lumo-internal-classpath}
+
+ # Step 7: AOT Macros
+ sh scripts/aot-bundle-macros.sh
+
+ # Step 8: Package executeable 2nd time
+ rm -rf ${lumo-internal-classpath}
+ mv target ${lumo-internal-classpath}
+ node scripts/package.js ${nodeVersion}
+ '';
+
+ dontStrip = true;
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp build/lumo $out/bin
+ '';
+
+ meta = {
+ description = "Fast, cross-platform, standalone ClojureScript environment";
+ longDescription = ''
+ Lumo is a fast, standalone ClojureScript REPL that runs on Node.js and V8.
+ Thanks to V8's custom startup snapshots, Lumo starts up instantaneously,
+ making it the fastest Clojure REPL in existence.
+ '';
+ homepage = https://github.com/anmonteiro/lumo;
+ license = stdenv.lib.licenses.epl10;
+ maintainers = [ stdenv.lib.maintainers.hlolli ];
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
+
diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/pkgs/development/interpreters/clojurescript/lumo/deps.edn
new file mode 100644
index 000000000000..e1563599a8cc
--- /dev/null
+++ b/pkgs/development/interpreters/clojurescript/lumo/deps.edn
@@ -0,0 +1,12 @@
+{:deps
+ {org.clojure/clojure {:mvn/version "1.10.0-beta5"}
+ org.clojure/clojurescript {:mvn/version "1.10.439"}
+ org.clojure/test.check {:mvn/version "0.10.0-alpha3"}
+ org.clojure/tools.reader {:mvn/version "1.3.2"
+ :exclusions [org.clojure/clojure org.clojure/clojurescript]}
+ com.cognitect/transit-cljs {:mvn/version "0.8.256"
+ :exclusions [org.clojure/clojure org.clojure/clojurescript]}
+ malabarba/lazy-map {:mvn/version "1.3"
+ :exclusions [org.clojure/clojure org.clojure/clojurescript]}
+ fipp {:mvn/version "0.6.14"
+ :exclusions [org.clojure/clojure org.clojure/clojurescript]}}}
diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix
new file mode 100644
index 000000000000..3e53c7f98dd7
--- /dev/null
+++ b/pkgs/development/interpreters/clojurescript/lumo/deps.nix
@@ -0,0 +1,393 @@
+# generated by clj2nix-1.0.3
+{ pkgs }:
+
+ let repos = [
+ "https://repo.clojars.org/"
+ "https://repo1.maven.org/"
+ "http://central.maven.org/maven2/"
+ "http://oss.sonatype.org/content/repositories/releases/"
+ "http://oss.sonatype.org/content/repositories/public/"
+ "http://repo.typesafe.com/typesafe/releases/"
+ ];
+
+ in rec {
+ makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths;
+ makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;});
+
+ packages = [
+ {
+ name = "com.cognitect/transit-java";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "transit-java";
+ groupId = "com.cognitect";
+ sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708";
+ version = "0.8.332";
+ };
+ }
+
+ {
+ name = "org.clojure/data.json";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "data.json";
+ groupId = "org.clojure";
+ sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6";
+ version = "0.2.6";
+ };
+ }
+
+ {
+ name = "org.clojure/clojure";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "clojure";
+ groupId = "org.clojure";
+ sha512 = "f7a6b207b1bcbb6523d32ecfdd3c8c25d4d0b0a59c78baf06cdc69ba3c21c5e96b5dac8e9efcb331efd94e10bccbb9b54fca62a4312309db65a1f9d89d9da3f4";
+ version = "1.10.0-beta5";
+ };
+ }
+
+ {
+ name = "commons-codec/commons-codec";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "commons-codec";
+ groupId = "commons-codec";
+ sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3";
+ version = "1.10";
+ };
+ }
+
+ {
+ name = "com.google.errorprone/error_prone_annotations";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "error_prone_annotations";
+ groupId = "com.google.errorprone";
+ sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b";
+ version = "2.1.3";
+ };
+ }
+
+ {
+ name = "org.clojure/core.specs.alpha";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "core.specs.alpha";
+ groupId = "org.clojure";
+ sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4";
+ version = "0.2.44";
+ };
+ }
+
+ {
+ name = "org.clojure/spec.alpha";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "spec.alpha";
+ groupId = "org.clojure";
+ sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd";
+ version = "0.2.176";
+ };
+ }
+
+ {
+ name = "org.codehaus.mojo/animal-sniffer-annotations";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "animal-sniffer-annotations";
+ groupId = "org.codehaus.mojo";
+ sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136";
+ version = "1.14";
+ };
+ }
+
+ {
+ name = "com.googlecode.json-simple/json-simple";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "json-simple";
+ groupId = "com.googlecode.json-simple";
+ sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742";
+ version = "1.1.1";
+ };
+ }
+
+ {
+ name = "com.cognitect/transit-cljs";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "transit-cljs";
+ groupId = "com.cognitect";
+ sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd";
+ version = "0.8.256";
+ };
+ }
+
+ {
+ name = "org.clojure/google-closure-library";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "google-closure-library";
+ groupId = "org.clojure";
+ sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a";
+ version = "0.0-20170809-b9c14c6b";
+ };
+ }
+
+ {
+ name = "fipp";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "fipp";
+ groupId = "fipp";
+ sha512 = "155b5bb7045ac7c3a75c638e65464ca1fc90e5b4692328fc2da73b26792178fdbce5ab01ba0397e1986b6162b06b8904712d2c366f32ea43ea5fa2b454a526a5";
+ version = "0.6.14";
+ };
+ }
+
+ {
+ name = "org.clojure/clojurescript";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "clojurescript";
+ groupId = "org.clojure";
+ sha512 = "4aec5abdd48aaf95f7a729e11d225a99d02caa3a4ddff3e9e4f8db80dea83ab70a4440691cb372562c8c16e73c2850b22806a2851df3849c852fddd49b57fc58";
+ version = "1.10.439";
+ };
+ }
+
+ {
+ name = "com.google.jsinterop/jsinterop-annotations";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "jsinterop-annotations";
+ groupId = "com.google.jsinterop";
+ sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d";
+ version = "1.0.0";
+ };
+ }
+
+ {
+ name = "com.fasterxml.jackson.core/jackson-core";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "jackson-core";
+ groupId = "com.fasterxml.jackson.core";
+ sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64";
+ version = "2.8.7";
+ };
+ }
+
+ {
+ name = "malabarba/lazy-map";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "lazy-map";
+ groupId = "malabarba";
+ sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f";
+ version = "1.3";
+ };
+ }
+
+ {
+ name = "com.cognitect/transit-js";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "transit-js";
+ groupId = "com.cognitect";
+ sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623";
+ version = "0.8.846";
+ };
+ }
+
+ {
+ name = "org.mozilla/rhino";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "rhino";
+ groupId = "org.mozilla";
+ sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc";
+ version = "1.7R5";
+ };
+ }
+
+ {
+ name = "org.clojure/google-closure-library-third-party";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "google-closure-library-third-party";
+ groupId = "org.clojure";
+ sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35";
+ version = "0.0-20170809-b9c14c6b";
+ };
+ }
+
+ {
+ name = "com.google.javascript/closure-compiler-externs";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "closure-compiler-externs";
+ groupId = "com.google.javascript";
+ sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82";
+ version = "v20180805";
+ };
+ }
+
+ {
+ name = "org.javassist/javassist";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "javassist";
+ groupId = "org.javassist";
+ sha512 = "ad65ee383ed83bedecc2073118cb3780b68b18d5fb79a1b2b665ff8529df02446ad11e68f9faaf4f2e980065f5946761a59ada379312cbb22d002625abed6a4f";
+ version = "3.18.1-GA";
+ };
+ }
+
+ {
+ name = "com.google.guava/guava";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "guava";
+ groupId = "com.google.guava";
+ sha512 = "429ceeec0350ba98e2b089b8b70ded2ec570c3a684894a7545d10592c1c7be42dacd1fad8b2cb9123aa3612575ce1b56e1bb54923443fc293f8e9adeac2762ee";
+ version = "25.1-jre";
+ };
+ }
+
+ {
+ name = "org.msgpack/msgpack";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "msgpack";
+ groupId = "org.msgpack";
+ sha512 = "a2741bed01f9c37ba3dbe6a7ab9ce936d36d4da97c35e215250ac89ac0851fc5948d83975ea6257d5dce1d43b6b5147254ecfb4b33f9bbdc489500b3ff060449";
+ version = "0.6.12";
+ };
+ }
+
+ {
+ name = "com.google.j2objc/j2objc-annotations";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "j2objc-annotations";
+ groupId = "com.google.j2objc";
+ sha512 = "a4a0b58ffc2d9f9b516f571bcd0ac14e4d3eec15aacd6320a4a1a12045acce8c6081e8ce922c4e882221cedb2cc266399ab468487ae9a08124d65edc07ae30f0";
+ version = "1.1";
+ };
+ }
+
+ {
+ name = "com.cognitect/transit-clj";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "transit-clj";
+ groupId = "com.cognitect";
+ sha512 = "ad838d9e5688c8cebe54972ad0c9a6db428ec1cece8c8b078e8e8d4b0c7870b328239d2bc9dd8fcbedcba56ca0de9afb5a0a843ff5f630dc039118de7eb45eba";
+ version = "0.8.309";
+ };
+ }
+
+ {
+ name = "args4j/args4j";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "args4j";
+ groupId = "args4j";
+ sha512 = "5f0651234c8f8b130fddb39fa832c6da47d3e21bc3434307554314c47e672c28d005c64e9effe85d552190cfc27966b1f005740ffd40b4e1bec2cb257d7feedb";
+ version = "2.0.26";
+ };
+ }
+
+ {
+ name = "org.clojure/core.rrb-vector";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "core.rrb-vector";
+ groupId = "org.clojure";
+ sha512 = "5f737bf3ca3acf567b2b5c14b5761c8c38e94e1f6168f8cba9f46d2ae41334ae3d68d2c00663827a6214094d96b9767f6803f66ab44b0012c6f2e3c2997b1796";
+ version = "0.0.13";
+ };
+ }
+
+ {
+ name = "org.checkerframework/checker-qual";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "checker-qual";
+ groupId = "org.checkerframework";
+ sha512 = "3c38b0b9e0bde464268cff5fdb1894a048240b039093ee3abe5b32976a22737d26b355f8793f630a7f0b319fdb019a6fcd9ee1d5219676f0f10c0b0f496b61b7";
+ version = "2.0.0";
+ };
+ }
+
+ {
+ name = "org.clojure/tools.reader";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "tools.reader";
+ groupId = "org.clojure";
+ sha512 = "290a2d98b2eec08a8affc2952006f43c0459c7e5467dc454f5fb5670ea7934fa974e6be19f7e7c91dadcfed62082d0fbcc7788455b7446a2c9c5af02f7fc52b6";
+ version = "1.3.2";
+ };
+ }
+
+ {
+ name = "com.google.javascript/closure-compiler-unshaded";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "closure-compiler-unshaded";
+ groupId = "com.google.javascript";
+ sha512 = "4fa7029aabd9ff84255d56004707486726db9c770f43cb10dc44fb53a3254d588a0f47f937f55401d7f319267ec2362c87f5ea709bcfa06f12a66fe22cb8c53d";
+ version = "v20180805";
+ };
+ }
+
+ {
+ name = "org.clojure/test.check";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "test.check";
+ groupId = "org.clojure";
+ sha512 = "bf57571a9d31d50cf15b38134f4d7c34d03eb458bc62b30c7a1dbf233e300c67f1fda6673dbd1584a0497cf8875f972e6697e7f13d0c3e70e4254697b1b75cc6";
+ version = "0.10.0-alpha3";
+ };
+ }
+
+ {
+ name = "com.google.protobuf/protobuf-java";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "protobuf-java";
+ groupId = "com.google.protobuf";
+ sha512 = "230fc4360b8b2ee10eb73d756c58478b6c779433aa4ca91938404bbfd0ada516d3215664dbe953c96649e33bbef293958e4ad4616671f0c246883196ece92998";
+ version = "3.0.2";
+ };
+ }
+
+ {
+ name = "com.google.code.findbugs/jsr305";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "jsr305";
+ groupId = "com.google.code.findbugs";
+ sha512 = "bb09db62919a50fa5b55906013be6ca4fc7acb2e87455fac5eaf9ede2e41ce8bbafc0e5a385a561264ea4cd71bbbd3ef5a45e02d63277a201d06a0ae1636f804";
+ version = "3.0.2";
+ };
+ }
+
+ {
+ name = "com.google.code.gson/gson";
+ path = pkgs.fetchMavenArtifact {
+ inherit repos;
+ artifactId = "gson";
+ groupId = "com.google.code.gson";
+ sha512 = "c3cdaf66a99e6336abc80ff23374f6b62ac95ab2ae874c9075805e91d849b18e3f620cc202b4978fc92b73d98de96089c8714b1dd096b2ae1958cfa085715f7a";
+ version = "2.7";
+ };
+ }
+
+ ];
+ }
diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json
new file mode 100644
index 000000000000..358595ef1eb8
--- /dev/null
+++ b/pkgs/development/interpreters/clojurescript/lumo/package.json
@@ -0,0 +1,42 @@
+{
+ "name": "lumo-build-deps",
+ "version": "1.9.0",
+ "dependencies": {
+ "@babel/core": "^7.1.5",
+ "@babel/plugin-external-helpers": "7.0.0",
+ "@babel/plugin-proposal-class-properties": "^7.1.0",
+ "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+ "@babel/plugin-transform-runtime": "^7.1.0",
+ "@babel/preset-env": "^7.1.5",
+ "@babel/preset-stage-2": "7.0.0",
+ "@babel/runtime": "^7.1.5",
+ "async-retry": "^1.2.3",
+ "babel-core": "^7.0.0-bridge.0",
+ "babel-eslint": "10.0.1",
+ "babel-jest": "^23.6.0",
+ "babel-loader": "^8.0.4",
+ "babel-plugin-transform-flow-strip-types": "6.22.0",
+ "chalk": "^2.4.1",
+ "cross-env": "5.2.0",
+ "death": "^1.1.0",
+ "flow-bin": "0.85.0",
+ "google-closure-compiler-js": "20170910.0.1",
+ "jszip": "github:anmonteiro/jszip#patch-1",
+ "nexe": "3.0.0-beta.7",
+ "node-fetch": "^2.2.1",
+ "paredit.js": "0.3.4",
+ "posix-getopt": "github:anmonteiro/node-getopt#master",
+ "prettier": "1.15.1",
+ "progress": "^2.0.0",
+ "read-pkg": "^4.0.1",
+ "rollup": "0.67.0",
+ "rollup-plugin-babel": "4.0.3",
+ "rollup-plugin-babel-minify": "6.1.1",
+ "rollup-plugin-commonjs": "9.2.0",
+ "rollup-plugin-node-resolve": "3.4.0",
+ "rollup-plugin-replace": "2.1.0",
+ "webpack": "^4.25.1",
+ "webpack-cli": "^3.1.2",
+ "which-promise": "^1.0.0"
+ }
+}
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 4c697ec4e802..fa8996f0fb56 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 d97d416bc27d..adbbbaff890b 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 ee524feb4c6c..58b7fd71f0be 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 d94d4a5a14d0..e0d4ecbc95ac 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 19ac6d355926..c408d21d9b31 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 e9aa2a3dc426..b787f3f44f54 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.2";
+ sha256 = "0v9smdp2vxkpsz65a6ypwzl12fqdfrsi7k29f5i7af0v27r308cm";
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 eb685f1d7185..0529c9f1e28c 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
@@ -117,7 +120,8 @@ in stdenv.mkDerivation ({
tolerance.
'';
- platforms = platforms.unix;
+ # aarch64 is supposed to work but started failing in https://hydra.nixos.org/build/83735973
+ platforms = subtractLists [ "aarch64-linux" ] platforms.unix;
maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ];
license = licenses.asl20;
} // meta);
diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix
index 599126d2eff9..f60e5d286140 100644
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Free interpreter for the APL programming language";
- homepage = http://www.gnu.org/software/apl/;
+ homepage = https://www.gnu.org/software/apl/;
license = licenses.gpl3Plus;
maintainers = [ maintainers.kovirobi ];
platforms = with platforms; linux ++ darwin;
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 95484c9258a6..dccba8ebb0e4 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
- version = "2.5.2";
+ version = "2.5.4";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
- sha256 = "0bi85gvgpwd9ndg0kiwlrp560934dzy1072zpf587vrmpvqrcps9";
+ sha256 = "1s661d5kwiafv5i1pq2b7k8b2fd7m2zp3xwcrf4iv1iik033djdj";
};
buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index 13a0d45dbe41..fd270dedefcc 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
# One test fails.
# ERROR: file: "libtest-asmobs", message: "file not found"
# This is fixed here:
- # .
+ # .
doCheck = false;
doInstallCheck = doCheck;
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Embeddable Scheme implementation";
- homepage = http://www.gnu.org/software/guile/;
+ homepage = https://www.gnu.org/software/guile/;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index ea34fd61f3b7..b65dfb1d4a1e 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -41,7 +41,7 @@
patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
(fetchpatch {
# Fixes stability issues with 00-repl-server.test
- url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
+ url = "https://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
})
./riscv.patch
@@ -94,7 +94,7 @@
meta = {
description = "Embeddable Scheme implementation";
- homepage = http://www.gnu.org/software/guile/;
+ homepage = https://www.gnu.org/software/guile/;
license = stdenv.lib.licenses.lgpl3Plus;
maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
platforms = stdenv.lib.platforms.all;
@@ -114,7 +114,7 @@
//
(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
- # Work around .
+ # Work around .
SHELL = "/bin/sh";
CONFIG_SHELL = "/bin/sh";
})
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index aacc5dc49a10..1943b10bdcaf 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -90,7 +90,7 @@
meta = {
description = "Embeddable Scheme implementation";
- homepage = http://www.gnu.org/software/guile/;
+ homepage = https://www.gnu.org/software/guile/;
license = stdenv.lib.licenses.lgpl3Plus;
maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index 3f08ca8f7c22..02ce07bdf471 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 cb351446301d..11feb1170c2c 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 5b8ae7e9eccf..21a7cfba4064 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.10.1";
goPackagePath = "github.com/candid82/joker";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "candid82";
repo = "joker";
- sha256 = "1sgxz0z6p92k1rhs5095l952a2db5w9yb2jy6cgglxw2arihxxb7";
+ sha256 = "1c3p61jmlljljbiwsylmfa75pi00y7yj5wabx1rxmpswc41g5mab";
};
preBuild = "go generate ./...";
diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix
index ee99aeab69f8..4eff988796b3 100644
--- a/pkgs/development/interpreters/joker/deps.nix
+++ b/pkgs/development/interpreters/joker/deps.nix
@@ -8,6 +8,15 @@
sha256 = "1ny3rws671sa9bj5phg6k1rprlgzys73kfdr14vxq4wnwz84zbrc";
};
}
+ {
+ goPackagePath = "github.com/pkg/profile";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/profile";
+ rev = "5b67d428864e92711fcbd2f8629456121a56d91f";
+ sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
+ };
+ }
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index c67fae936ce7..330e6b282ce1 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
jruby = stdenv.mkDerivation rec {
name = "jruby-${version}";
- version = "9.2.0.0";
+ version = "9.2.4.0";
src = fetchurl {
url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
- sha256 = "1106s1vmcm36gm3vrl1sjrrr2wj6splgik1zrfb7c2y9bzm8swa2";
+ sha256 = "034asndnqjgha74b6qr1gza9xfrmq9m8f6ysnblgd2axr218qqxr";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix
index e92a84b40b86..77cbd8a8245a 100644
--- a/pkgs/development/interpreters/love/11.1.nix
+++ b/pkgs/development/interpreters/love/11.1.nix
@@ -5,7 +5,7 @@
let
pname = "love";
- version = "11.1";
+ version = "11.2";
in
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
owner = "rude";
repo = "love";
rev = "${version}";
- sha256 = "16jn6klbsz8qi2wn3llbr7ri5arlc0b19la19ypzk6p7v20z4sfr";
+ sha256 = "0bp22mzkjy48gncj5vm9b7whzrggcbs5pd4cnb6k8jpl9j02dhdv";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix
deleted file mode 100644
index be49d2dd9215..000000000000
--- 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 d343ec6c63b1..000000000000
--- 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 6d8de7bae27e..a8badf647c0c 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/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream
index 4a94595f7723..8a8b08fcd68a 100644
--- a/pkgs/development/interpreters/lush/default.upstream
+++ b/pkgs/development/interpreters/lush/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/lush/files/lush2/
+url https://sourceforge.net/projects/lush/files/lush2/
version_link '[.]tar[.]gz/download$'
SF_redirect
minimize_overwrite
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 9ead7176d4ed..30013946886b 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -46,6 +46,11 @@ stdenv.mkDerivation rec {
install -D -m 444 full-maude.maude $out/share/maude/full-maude.maude
'';
+ # bison -dv surface.yy -o surface.c
+ # mv surface.c surface.cc
+ # mv: cannot stat 'surface.c': No such file or directory
+ enableParallelBuilding = false;
+
meta = {
homepage = http://maude.cs.illinois.edu/;
description = "High-level specification language";
diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
new file mode 100644
index 000000000000..2fb1ccb24bc4
--- /dev/null
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+ name = "metamath-${version}";
+ version = "0.168";
+
+ buildInputs = [ autoreconfHook ];
+
+ # This points to my own repository because there is no official repository
+ # for metamath; there's a download location but it gets updated in place with
+ # no permanent link. See discussion at
+ # https://groups.google.com/forum/#!topic/metamath/N4WEWQQVUfY
+ src = fetchFromGitHub {
+ owner = "Taneb";
+ repo = "metamath";
+ rev = "542bfd5e53d8ce026ce5d29da9e7069ec807f5e0";
+ sha256 = "07ssgqh9ipiw1bf60snmjaxngln1an1h9q0vgszadc94wzw06zi4";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Interpreter for the metamath proof language";
+ longDescription = ''
+ The metamath program is an ASCII-based ANSI C program with a command-line
+ interface. It was used (along with mmj2) to build and verify the proofs
+ in the Metamath Proof Explorer, and it generated its web pages. The *.mm
+ ASCII databases (set.mm and others) are also included in this derivation.
+ '';
+ homepage = http://us.metamath.org;
+ downloadPage = "http://us.metamath.org/#downloads";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.taneb ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f6bd96af40f5..cbe919c70929 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 ec4f971eeeff..8d21d92ef430 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.4";
+ sha256 = "153r0f6jdqrl7hxrvhfivf5g8ivhbvggfhg841q3hi3db5rc86k4";
+ };
}
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 1793273a76f9..000000000000
--- 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 37a51ffded31..ae4e9b9635d0 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,9 +1,9 @@
# pcre functionality is tested in nixos/tests/php-pcre.nix
-{ lib, stdenv, fetchurl, flex, bison
+{ lib, stdenv, fetchurl, flex, bison, autoconf
, mysql, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
+, openssl, pcre, pcre2, 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, libzip
}:
with lib;
@@ -12,6 +12,8 @@ let
generic =
{ version
, sha256
+ , extraPatches ? []
+ , withSystemd ? config.php.systemd or stdenv.isLinux
, imapSupport ? config.php.imap or (!stdenv.isDarwin)
, ldapSupport ? config.php.ldap or true
, mhashSupport ? config.php.mhash or true
@@ -40,7 +42,7 @@ let
, intlSupport ? config.php.intl or true
, exifSupport ? config.php.exif or true
, xslSupport ? config.php.xsl or false
- , mcryptSupport ? config.php.mcrypt or true
+ , mcryptSupport ? (config.php.mcrypt or true) && (versionOlder version "7.2")
, bz2Support ? config.php.bz2 or false
, zipSupport ? config.php.zip or true
, ftpSupport ? config.php.ftp or true
@@ -51,6 +53,12 @@ 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")
+ , libzipSupport ? (config.php.libzip or true) && (versionAtLeast version "7.3")
+ , phpdbgSupport ? config.php.phpdbg or true
+ , cgiSupport ? config.php.cgi or true
+ , cliSupport ? config.php.cli or true
+ , pharSupport ? config.php.phar or true
}:
let
@@ -64,9 +72,11 @@ let
enableParallelBuilding = true;
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ flex bison pcre ]
- ++ optional stdenv.isLinux systemd
+ nativeBuildInputs = [ pkgconfig autoconf ];
+ buildInputs = [ flex bison ]
+ ++ optional (versionOlder version "7.3") pcre
+ ++ optional (versionAtLeast version "7.3") pcre2
+ ++ optional withSystemd systemd
++ optionals imapSupport [ uwimap openssl pam ]
++ optionals curlSupport [ curl openssl ]
++ optionals ldapSupport [ openldap openssl ]
@@ -92,17 +102,19 @@ let
++ optional bz2Support bzip2
++ optional (mssqlSupport && !stdenv.isDarwin) freetds
++ optional sodiumSupport libsodium
- ++ optional tidySupport html-tidy;
+ ++ optional tidySupport html-tidy
+ ++ optional argon2Support libargon2
+ ++ optional libzipSupport libzip;
CXXFLAGS = optional stdenv.cc.isClang "-std=c++11";
-
configureFlags = [
"--with-config-file-scan-dir=/etc/php.d"
- "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
]
+ ++ optional (versionOlder version "7.3") "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
+ ++ optional (versionAtLeast version "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
- ++ optional stdenv.isLinux "--with-fpm-systemd"
+ ++ optional withSystemd "--with-fpm-systemd"
++ optionals imapSupport [
"--with-imap=${uwimap}"
"--with-imap-ssl"
@@ -131,6 +143,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,8 +170,14 @@ 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}"
+ ++ optional libzipSupport "--with-libzip=${libzip.dev}"
+ ++ optional phpdbgSupport "--enable-phpdbg"
+ ++ optional (!phpdbgSupport) "--disable-phpdbg"
+ ++ optional (!cgiSupport) "--disable-cgi"
+ ++ optional (!cliSupport) "--disable-cli"
+ ++ optional (!pharSupport) "--disable-phar";
hardeningDisable = [ "bindnow" ];
@@ -178,9 +197,12 @@ let
configureFlags+=(--with-config-file-path=$out/etc \
--includedir=$dev/include)
+
+ ./buildconf --force
'';
postInstall = ''
+ test -d $out/etc || mkdir $out/etc
cp php.ini-production $out/etc/php.ini
'';
@@ -206,7 +228,7 @@ let
outputsToInstall = [ "out" "dev" ];
};
- patches = [ ./fix-paths-php7.patch ];
+ patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
postPatch = optional stdenv.isDarwin ''
substituteInPlace configure --replace "-lstdc++" "-lc++"
@@ -220,12 +242,30 @@ let
in {
php71 = generic {
- version = "7.1.21";
- sha256 = "104mn4kppklb21hgz1a50kgmc0ak5y996sx990xpc8yy9dbrqh62";
+ version = "7.1.25";
+ sha256 = "1b5az5vhap593ggjxirs1zdlg20hcv9h94iq5kgaxky71a4dqb00";
+
+ # https://bugs.php.net/bug.php?id=76826
+ extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch;
};
php72 = generic {
- version = "7.2.8";
- sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
+ version = "7.2.13";
+ sha256 = "0bg9nfc250p24hxn4bdjz7ngcw75h8rpf4qjxqzcs6s9fvxlcjjv";
+
+ # https://bugs.php.net/bug.php?id=71041
+ # https://bugs.php.net/bug.php?id=76826
+ extraPatches = [ ./fix-bug-71041.patch ]
+ ++ optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
+ };
+
+ php73 = generic {
+ version = "7.3.0";
+ sha256 = "0rvwx37dsmxivgrf4wfc1y778iln498c6a40biy9k6lnr6p7s9ks";
+
+ # https://bugs.php.net/bug.php?id=71041
+ # https://bugs.php.net/bug.php?id=76826
+ extraPatches = [ ./fix-bug-71041.patch ]
+ ++ optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
};
}
diff --git a/pkgs/development/interpreters/php/fix-bug-71041.patch b/pkgs/development/interpreters/php/fix-bug-71041.patch
new file mode 100644
index 000000000000..350b635bdf36
--- /dev/null
+++ b/pkgs/development/interpreters/php/fix-bug-71041.patch
@@ -0,0 +1,25 @@
+diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
+index 24d454d..6307620 100644
+--- a/Zend/zend_signal.c
++++ b/Zend/zend_signal.c
+@@ -399,7 +399,7 @@ void zend_signal_init(void) /* {{{ */
+
+ /* {{{ zend_signal_startup
+ * alloc zend signal globals */
+-void zend_signal_startup(void)
++ZEND_API void zend_signal_startup(void)
+ {
+
+ #ifdef ZTS
+diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h
+index e8ee7d6..462d06f 100644
+--- a/Zend/zend_signal.h
++++ b/Zend/zend_signal.h
+@@ -89,7 +89,7 @@ ZEND_API void zend_signal_handler_unblock(void);
+ void zend_signal_activate(void);
+ void zend_signal_deactivate(void);
+ BEGIN_EXTERN_C()
+-void zend_signal_startup(void);
++ZEND_API void zend_signal_startup(void);
+ END_EXTERN_C()
+ void zend_signal_init(void);
diff --git a/pkgs/development/interpreters/php/fix-paths-php7.patch b/pkgs/development/interpreters/php/fix-paths-php7.patch
index 2b9e4ad0ebbf..908f06ec49ab 100644
--- a/pkgs/development/interpreters/php/fix-paths-php7.patch
+++ b/pkgs/development/interpreters/php/fix-paths-php7.patch
@@ -1,16 +1,8 @@
---- php-7.0.0beta1/configure 2015-07-10 12:11:41.810045613 +0000
-+++ php-7.0.0beta1-new/configure 2015-07-17 16:10:21.775528267 +0000
-@@ -6172,7 +6172,7 @@
- as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
- fi
-
-- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-+ APXS_LIBEXECDIR="$prefix/modules"
- if test -z `$APXS -q SYSCONFDIR`; then
- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-@@ -37303,9 +37303,7 @@
-
+diff -ru a/ext/gettext/config.m4 b/ext/gettext/config.m4
+--- a/ext/gettext/config.m4 2018-11-07 15:35:26.000000000 +0000
++++ b/ext/gettext/config.m4 2018-11-27 00:33:07.000000000 +0000
+@@ -6,9 +6,7 @@
+ [ --with-gettext[=DIR] Include GNU gettext support])
if test "$PHP_GETTEXT" != "no"; then
- for i in $PHP_GETTEXT /usr/local /usr; do
@@ -19,5 +11,16 @@
+ GETTEXT_DIR=$PHP_GETTEXT
if test -z "$GETTEXT_DIR"; then
- as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5
-
+ AC_MSG_ERROR(Cannot locate header file libintl.h)
+diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
+--- a/sapi/apache2handler/config.m4 2018-11-07 15:35:23.000000000 +0000
++++ b/sapi/apache2handler/config.m4 2018-11-27 00:32:28.000000000 +0000
+@@ -66,7 +66,7 @@
+ AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
+ fi
+
+- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
++ APXS_LIBEXECDIR="$prefix/modules"
+ if test -z `$APXS -q SYSCONFDIR`; then
+ INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
diff --git a/pkgs/development/interpreters/php/php71-darwin-isfinite.patch b/pkgs/development/interpreters/php/php71-darwin-isfinite.patch
new file mode 100644
index 000000000000..ebfcd94f8d4b
--- /dev/null
+++ b/pkgs/development/interpreters/php/php71-darwin-isfinite.patch
@@ -0,0 +1,60 @@
+diff -ru a/Zend/configure.in b/Zend/configure.in
+--- a/Zend/configure.in 2018-11-07 15:35:26.000000000 +0000
++++ b/Zend/configure.in 2018-11-27 00:28:48.000000000 +0000
+@@ -70,7 +70,7 @@
+ #endif
+
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -79,7 +79,7 @@
+ #endif
+ #endif
+
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -90,7 +90,7 @@
+ #define zend_isinf(a) 0
+ #endif
+
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
+diff -ru a/configure.in b/configure.in
+--- a/configure.in 2018-11-07 15:35:26.000000000 +0000
++++ b/configure.in 2018-11-27 00:28:48.000000000 +0000
+@@ -75,7 +75,7 @@
+ #endif
+
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -84,7 +84,7 @@
+ #endif
+ #endif
+
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -95,7 +95,7 @@
+ #define zend_isinf(a) 0
+ #endif
+
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
diff --git a/pkgs/development/interpreters/php/php72-darwin-isfinite.patch b/pkgs/development/interpreters/php/php72-darwin-isfinite.patch
new file mode 100644
index 000000000000..ea2e3e28f2cc
--- /dev/null
+++ b/pkgs/development/interpreters/php/php72-darwin-isfinite.patch
@@ -0,0 +1,62 @@
+diff --git a/Zend/configure.ac b/Zend/configure.ac
+index b95c1360b8..fe16c86007 100644
+--- a/Zend/configure.ac
++++ b/Zend/configure.ac
+@@ -60,7 +60,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #include
+
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -69,7 +69,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #endif
+ #endif
+
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -80,7 +80,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #define zend_isinf(a) 0
+ #endif
+
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
+diff --git a/configure.ac b/configure.ac
+index d3f3cacd07..ddbf712ba2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,7 +68,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #include
+
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -77,7 +77,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #endif
+ #endif
+
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -88,7 +88,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
+ #define zend_isinf(a) 0
+ #endif
+
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
diff --git a/pkgs/development/interpreters/php/php73-darwin-isfinite.patch b/pkgs/development/interpreters/php/php73-darwin-isfinite.patch
new file mode 100644
index 000000000000..7f784e0f5a95
--- /dev/null
+++ b/pkgs/development/interpreters/php/php73-darwin-isfinite.patch
@@ -0,0 +1,60 @@
+diff -ru a/configure.ac b/configure.ac
+--- a/configure.ac 2018-12-04 19:12:20.000000000 +0300
++++ b/configure.ac 2018-12-10 12:30:37.798917520 +0300
+@@ -68,7 +68,7 @@
+ #include
+
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -77,7 +77,7 @@
+ #endif
+ #endif
+
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -88,7 +88,7 @@
+ #define zend_isinf(a) 0
+ #endif
+
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
+diff -ru a/Zend/configure.ac b/Zend/configure.ac
+--- a/Zend/configure.ac 2018-12-04 19:12:30.000000000 +0300
++++ b/Zend/configure.ac 2018-12-10 12:28:50.350929699 +0300
+@@ -59,7 +59,7 @@
+ #include
+
+ #ifndef zend_isnan
+-#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISNAN && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isnan(a) isnan(a)
+ #elif defined(HAVE_FPCLASS)
+ #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN))
+@@ -68,7 +68,7 @@
+ #endif
+ #endif
+
+-#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISINF && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_isinf(a) isinf(a)
+ #elif defined(INFINITY)
+ /* Might not work, but is required by ISO C99 */
+@@ -79,7 +79,7 @@
+ #define zend_isinf(a) 0
+ #endif
+
+-#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L)
++#if HAVE_DECL_ISFINITE && (defined(__APPLE__) || defined(__APPLE_CC__) || !defined(__cplusplus) || __cplusplus < 201103L)
+ #define zend_finite(a) isfinite(a)
+ #elif defined(HAVE_FINITE)
+ #define zend_finite(a) finite(a)
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/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix
index b55d6d874bbb..391086a662ec 100644
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/pkgs/development/interpreters/python/build-python-package.nix
@@ -12,6 +12,8 @@
, namePrefix
, bootstrapped-pip
, flit
+, writeScript
+, update-python-libraries
}:
let
@@ -20,7 +22,8 @@ let
wheel-specific = import ./build-python-package-wheel.nix { };
common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
mkPythonDerivation = import ./mk-python-derivation.nix {
- inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix;
+ inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook;
+ inherit toPythonModule namePrefix writeScript update-python-libraries;
};
in
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 7d6f2541d3d1..976d30819dbe 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/cpython/2.7/cross-compile.patch b/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch
new file mode 100644
index 000000000000..c83b56437a49
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch
@@ -0,0 +1,32 @@
+--- ./setup.py.orig 2018-04-29 15:47:33.000000000 -0700
++++ ./setup.py 2018-11-11 09:41:58.097682221 -0800
+@@ -458,8 +458,6 @@
+ if not cross_compiling:
+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+- if cross_compiling:
+- self.add_gcc_paths()
+ self.add_multiarch_paths()
+
+ # Add paths specified in the environment variables LDFLAGS and
+@@ -517,7 +515,10 @@
+ # be assumed that no additional -I,-L directives are needed.
+ inc_dirs = self.compiler.include_dirs[:]
+ lib_dirs = self.compiler.library_dirs[:]
+- if not cross_compiling:
++ if cross_compiling:
++ inc_dirs = []
++ lib_dirs = []
++ else:
+ for d in (
+ '/usr/include',
+ ):
+@@ -582,6 +584,8 @@ class PyBuildExt(build_ext):
+ # Some modules that are normally always on:
+ #exts.append( Extension('_weakref', ['_weakref.c']) )
+
++ self.compiler.library_dirs = lib_dirs + [ '.' ]
++
+ # array objects
+ exts.append( Extension('array', ['arraymodule.c']) )
+
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 2609c053d95b..63dad3bf42ff 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -74,6 +74,12 @@ let
url = "file://${./type_getattro.patch}";
sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd";
})
+
+ (fetchpatch {
+ name = "CVE-2018-1000802.patch";
+ url = "https://github.com/python/cpython/pull/8985.patch";
+ sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97";
+ })
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [
@@ -104,6 +110,8 @@ let
# only works for GCC and Apple Clang. This makes distutils to call C++
# compiler when needed.
./python-2.7-distutils-C++.patch
+ ] ++ optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+ ./cross-compile.patch
];
preConfigure = ''
@@ -176,10 +184,14 @@ let
LIBRARY_PATH = makeLibraryPath paths;
};
+ # Python 2.7 needs this
+ crossCompileEnv = stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
+ { _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; };
+
# Build the basic Python interpreter without modules that have
# external dependencies.
-in stdenv.mkDerivation {
+in stdenv.mkDerivation ({
name = "python-${version}";
pythonVersion = majorVersion;
@@ -278,4 +290,4 @@ in stdenv.mkDerivation {
# in case both 2 and 3 are installed.
priority = -100;
};
- }
+ } // crossCompileEnv)
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
deleted file mode 100644
index 18b90cd1da46..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ /dev/null
@@ -1,214 +0,0 @@
-{ stdenv, fetchurl, fetchpatch
-, bzip2
-, expat
-, libffi
-, gdbm
-, lzma
-, ncurses
-, openssl
-, readline
-, sqlite
-, tcl ? null, tk ? null, tix ? null, libX11 ? null, xproto ? null, x11Support ? false
-, zlib
-, callPackage
-, self
-, CF, configd
-, python-setup-hook
-# For the Python package set
-, packageOverrides ? (self: super: {})
-}:
-
-assert x11Support -> tcl != null
- && tk != null
- && xproto != null
- && libX11 != null;
-
-with stdenv.lib;
-
-let
- majorVersion = "3.4";
- minorVersion = "9";
- minorVersionSuffix = "";
- version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
- libPrefix = "python${majorVersion}";
- sitePackages = "lib/${libPrefix}/site-packages";
-
- buildInputs = filter (p: p != null) [
- zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
- ++ optionals x11Support [ tcl tk libX11 xproto ]
- ++ optionals stdenv.isDarwin [ CF configd ];
-
- hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
-
-in stdenv.mkDerivation {
- name = "python3-${version}";
- pythonVersion = majorVersion;
- inherit majorVersion version;
-
- inherit buildInputs;
-
- src = fetchurl {
- url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
- sha256 = "1n9b1kavmw8b7rc3gkrka4fjzrbfq9iqy791yncaf09bp9v9cqjr";
- };
-
- NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
-
- # Determinism: The interpreter is patched to write null timestamps when compiling python files.
- # This way python doesn't try to update them when we freeze timestamps in nix store.
- DETERMINISTIC_BUILD=1;
- # Determinism: We fix the hashes of str, bytes and datetime objects.
- PYTHONHASHSEED=0;
-
- prePatch = optionalString stdenv.isDarwin ''
- substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
- substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
- '';
-
- patches = [
- ./no-ldconfig.patch
- ./ld_library_path.patch
- ] ++ optionals (x11Support && stdenv.isDarwin) [
- ./use-correct-tcl-tk-on-darwin.patch
- ] ++ optionals hasDistutilsCxxPatch [
- # Fix for http://bugs.python.org/issue1222585
- # Upstream distutils is calling C compiler to compile C++ code, which
- # only works for GCC and Apple Clang. This makes distutils to call C++
- # compiler when needed.
- (fetchpatch {
- url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch";
- sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8";
- extraPrefix = "";
- })
- ];
-
- postPatch = ''
- # Determinism
- substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
- # Determinism. This is done unconditionally
- substituteInPlace "Lib/importlib/_bootstrap.py" --replace "source_mtime = int(source_stats['mtime'])" "source_mtime = 1"
- '' + optionalString (x11Support && (tix != null)) ''
- substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
- ''
- # Avoid picking up getentropy() from glibc >= 2.25, as that would break
- # on older kernels. http://bugs.python.org/issue29157
- + optionalString stdenv.isLinux ''
- substituteInPlace Python/random.c --replace 'defined(HAVE_GETENTROPY)' '0'
- cat Python/random.c
- '';
-
- CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}";
- LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}";
- LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
-
- configureFlags = [
- "--enable-shared"
- "--with-threads"
- "--without-ensurepip"
- "--with-system-expat"
- "--with-system-ffi"
- ]
- # Never even try to use lchmod on linux,
- # don't rely on detecting glibc-isms.
- ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
-
- preConfigure = ''
- for i in /usr /sw /opt /pkg; do # improve purity
- substituteInPlace ./setup.py --replace $i /no-such-path
- done
- ${optionalString stdenv.isDarwin ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
- export MACOSX_DEPLOYMENT_TARGET=10.6
- ''
- + optionalString stdenv.hostPlatform.isMusl ''
- export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
- ''}
- '';
-
- setupHook = python-setup-hook sitePackages;
-
- postInstall = ''
- # needed for some packages, especially packages that backport functionality
- # to 2.x from 3.x
- for item in $out/lib/python${majorVersion}/test/*; do
- if [[ "$item" != */test_support.py*
- && "$item" != */test/support
- && "$item" != */test/libregrtest
- && "$item" != */test/regrtest.py* ]]; then
- rm -rf "$item"
- else
- echo $item
- fi
- done
- touch $out/lib/python${majorVersion}/test/__init__.py
-
- ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
- paxmark E $out/bin/python${majorVersion}
-
- # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
- echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
-
- # Determinism: Windows installers were not deterministic.
- # We're also not interested in building Windows installers.
- find "$out" -name 'wininst*.exe' | xargs -r rm -f
-
- # Use Python3 as default python
- ln -s "$out/bin/idle3" "$out/bin/idle"
- ln -s "$out/bin/pydoc3" "$out/bin/pydoc"
- ln -s "$out/bin/python3" "$out/bin/python"
- ln -s "$out/bin/python3-config" "$out/bin/python-config"
- ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc"
-
- # Get rid of retained dependencies on -dev packages, and remove
- # some $TMPDIR references to improve binary reproducibility.
- # Note that the .pyc file of _sysconfigdata.py should be regenerated!
- for i in $out/lib/python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do
- sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g"
- done
-
- # Determinism: rebuild all bytecode
- # We exclude lib2to3 because that's Python 2 code which fails
- # We rebuild three times, once for each optimization level
- find $out -name "*.py" | $out/bin/python -m compileall -q -f -x "lib2to3" -i -
- find $out -name "*.py" | $out/bin/python -O -m compileall -q -f -x "lib2to3" -i -
- find $out -name "*.py" | $out/bin/python -OO -m compileall -q -f -x "lib2to3" -i -
- '';
-
- passthru = let
- pythonPackages = callPackage ../../../../../top-level/python-packages.nix {
- python = self;
- overrides = packageOverrides;
- };
- in rec {
- inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
- executable = "${libPrefix}m";
- buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
- withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
- pkgs = pythonPackages;
- isPy3 = true;
- isPy34 = true;
- is_py3k = true; # deprecated
- interpreter = "${self}/bin/${executable}";
- };
-
- enableParallelBuilding = true;
-
- doCheck = false; # expensive, and fails
-
- meta = {
- homepage = http://python.org;
- description = "A high-level dynamically-typed programming language";
- longDescription = ''
- Python is a remarkably powerful dynamic programming language that
- is used in a wide variety of application domains. Some of its key
- distinguishing features include: clear, readable syntax; strong
- introspection capabilities; intuitive object orientation; natural
- expression of procedural code; full modularity, supporting
- hierarchical packages; exception-based error handling; and very
- high level dynamic data types.
- '';
- license = licenses.psfl;
- platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ fridh ];
- };
-}
diff --git a/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch b/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch
deleted file mode 100644
index 3172eb6d18e4..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/ld_library_path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 85991e0d7f0e631240f3f6233bd65d1128a66dec Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk
-Date: Thu, 14 Sep 2017 10:00:31 +0200
-Subject: [PATCH] ctypes.util: support LD_LIBRARY_PATH
-
-Backports support for LD_LIBRARY_PATH from 3.6
----
- Lib/ctypes/util.py | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 780cd5d21b..d7ac15070f 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -181,8 +181,32 @@ elif os.name == "posix":
- def _findSoname_ldconfig(name):
- return None
-
-+ def _findLib_ld(name):
-+ # See issue #9998 for why this is needed
-+ expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
-+ cmd = ['ld', '-t']
-+ libpath = os.environ.get('LD_LIBRARY_PATH')
-+ if libpath:
-+ for d in libpath.split(':'):
-+ cmd.extend(['-L', d])
-+ cmd.extend(['-o', os.devnull, '-l%s' % name])
-+ result = None
-+ try:
-+ p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-+ stderr=subprocess.PIPE,
-+ universal_newlines=True)
-+ out, _ = p.communicate()
-+ res = re.search(expr, os.fsdecode(out))
-+ if res:
-+ result = res.group(0)
-+ except Exception as e:
-+ pass # result will be None
-+ return result
-+
- def find_library(name):
-- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
-+ # See issue #9998
-+ return _findSoname_ldconfig(name) or \
-+ _get_soname(_findLib_gcc(name) or _findLib_ld(name))
-
- ################################################################
- # test code
---
-2.14.1
-
diff --git a/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
deleted file mode 100644
index 3cb77a107254..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 81bd99ad9058feb1d0361bc8862e8567c21a6142 Mon Sep 17 00:00:00 2001
-From: Frederik Rietdijk
-Date: Mon, 28 Aug 2017 09:24:06 +0200
-Subject: [PATCH] Don't use ldconfig and speed up uuid load
-
----
- Lib/ctypes/util.py | 52 ++--------------------------------------------------
- Lib/uuid.py | 50 ++------------------------------------------------
- 2 files changed, 4 insertions(+), 98 deletions(-)
-
-diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
-index 595113bffd..780cd5d21b 100644
---- a/Lib/ctypes/util.py
-+++ b/Lib/ctypes/util.py
-@@ -88,28 +88,7 @@ elif os.name == "posix":
- import re, tempfile
-
- def _findLib_gcc(name):
-- expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
-- fdout, ccout = tempfile.mkstemp()
-- os.close(fdout)
-- cmd = 'if type gcc >/dev/null 2>&1; then CC=gcc; elif type cc >/dev/null 2>&1; then CC=cc;else exit 10; fi;' \
-- 'LANG=C LC_ALL=C $CC -Wl,-t -o ' + ccout + ' 2>&1 -l' + name
-- try:
-- f = os.popen(cmd)
-- try:
-- trace = f.read()
-- finally:
-- rv = f.close()
-- finally:
-- try:
-- os.unlink(ccout)
-- except FileNotFoundError:
-- pass
-- if rv == 10:
-- raise OSError('gcc or cc command not found')
-- res = re.search(expr, trace)
-- if not res:
-- return None
-- return res.group(0)
-+ return None
-
-
- if sys.platform == "sunos5":
-@@ -200,34 +179,7 @@ elif os.name == "posix":
- else:
-
- def _findSoname_ldconfig(name):
-- import struct
-- if struct.calcsize('l') == 4:
-- machine = os.uname().machine + '-32'
-- else:
-- machine = os.uname().machine + '-64'
-- mach_map = {
-- 'x86_64-64': 'libc6,x86-64',
-- 'ppc64-64': 'libc6,64bit',
-- 'sparc64-64': 'libc6,64bit',
-- 's390x-64': 'libc6,64bit',
-- 'ia64-64': 'libc6,IA-64',
-- }
-- abi_type = mach_map.get(machine, 'libc6')
--
-- # XXX assuming GLIBC's ldconfig (with option -p)
-- regex = os.fsencode(
-- '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type))
-- try:
-- with subprocess.Popen(['/sbin/ldconfig', '-p'],
-- stdin=subprocess.DEVNULL,
-- stderr=subprocess.DEVNULL,
-- stdout=subprocess.PIPE,
-- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
-- res = re.search(regex, p.stdout.read())
-- if res:
-- return os.fsdecode(res.group(1))
-- except OSError:
-- pass
-+ return None
-
- def find_library(name):
- return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
-diff --git a/Lib/uuid.py b/Lib/uuid.py
-index 1061bffc43..846f5819f5 100644
---- a/Lib/uuid.py
-+++ b/Lib/uuid.py
-@@ -451,57 +451,11 @@ def _netbios_getnode():
- return ((bytes[0]<<40) + (bytes[1]<<32) + (bytes[2]<<24) +
- (bytes[3]<<16) + (bytes[4]<<8) + bytes[5])
-
--# Thanks to Thomas Heller for ctypes and for his help with its use here.
-
--# If ctypes is available, use it to find system routines for UUID generation.
--# XXX This makes the module non-thread-safe!
- _uuid_generate_random = _uuid_generate_time = _UuidCreate = None
--try:
-- import ctypes, ctypes.util
-
-- # The uuid_generate_* routines are provided by libuuid on at least
-- # Linux and FreeBSD, and provided by libc on Mac OS X.
-- for libname in ['uuid', 'c']:
-- try:
-- lib = ctypes.CDLL(ctypes.util.find_library(libname))
-- except:
-- continue
-- if hasattr(lib, 'uuid_generate_random'):
-- _uuid_generate_random = lib.uuid_generate_random
-- if hasattr(lib, 'uuid_generate_time'):
-- _uuid_generate_time = lib.uuid_generate_time
-- if _uuid_generate_random is not None:
-- break # found everything we were looking for
--
-- # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
-- # in issue #8621 the function generates the same sequence of values
-- # in the parent process and all children created using fork (unless
-- # those children use exec as well).
-- #
-- # Assume that the uuid_generate functions are broken from 10.5 onward,
-- # the test can be adjusted when a later version is fixed.
-- import sys
-- if sys.platform == 'darwin':
-- import os
-- if int(os.uname().release.split('.')[0]) >= 9:
-- _uuid_generate_random = _uuid_generate_time = None
--
-- # On Windows prior to 2000, UuidCreate gives a UUID containing the
-- # hardware address. On Windows 2000 and later, UuidCreate makes a
-- # random UUID and UuidCreateSequential gives a UUID containing the
-- # hardware address. These routines are provided by the RPC runtime.
-- # NOTE: at least on Tim's WinXP Pro SP2 desktop box, while the last
-- # 6 bytes returned by UuidCreateSequential are fixed, they don't appear
-- # to bear any relationship to the MAC address of any network device
-- # on the box.
-- try:
-- lib = ctypes.windll.rpcrt4
-- except:
-- lib = None
-- _UuidCreate = getattr(lib, 'UuidCreateSequential',
-- getattr(lib, 'UuidCreate', None))
--except:
-- pass
-+_uuid_generate_time = _UuidCreate = None
-+
-
- def _unixdll_getnode():
- """Get the hardware address on Unix using ctypes."""
---
-2.14.1
-
diff --git a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch b/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
deleted file mode 100644
index b73f62b97ec5..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/use-correct-tcl-tk-on-darwin.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2779658..902d0eb 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1699,9 +1699,6 @@ class PyBuildExt(build_ext):
- # Rather than complicate the code below, detecting and building
- # AquaTk is a separate method. Only one Tkinter will be built on
- # Darwin - either AquaTk, if it is found, or X11 based Tk.
-- if (host_platform == 'darwin' and
-- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
-- return
-
- # Assume we haven't found any of the libraries or include files
- # The versions with dots are used on Unix, and the versions without
-@@ -1747,22 +1744,6 @@ class PyBuildExt(build_ext):
- if dir not in include_dirs:
- include_dirs.append(dir)
-
-- # Check for various platform-specific directories
-- if host_platform == 'sunos5':
-- include_dirs.append('/usr/openwin/include')
-- added_lib_dirs.append('/usr/openwin/lib')
-- elif os.path.exists('/usr/X11R6/include'):
-- include_dirs.append('/usr/X11R6/include')
-- added_lib_dirs.append('/usr/X11R6/lib64')
-- added_lib_dirs.append('/usr/X11R6/lib')
-- elif os.path.exists('/usr/X11R5/include'):
-- include_dirs.append('/usr/X11R5/include')
-- added_lib_dirs.append('/usr/X11R5/lib')
-- else:
-- # Assume default location for X11
-- include_dirs.append('/usr/X11/include')
-- added_lib_dirs.append('/usr/X11/lib')
--
- # If Cygwin, then verify that X is installed before proceeding
- if host_platform == 'cygwin':
- x11_inc = find_file('X11/Xlib.h', [], include_dirs)
-@@ -1786,10 +1767,6 @@ class PyBuildExt(build_ext):
- if host_platform in ['aix3', 'aix4']:
- libs.append('ld')
-
-- # Finally, link with the X11 libraries (not appropriate on cygwin)
-- if host_platform != "cygwin":
-- libs.append('X11')
--
- ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
- define_macros=[('WITH_APPINIT', 1)] + defs,
- include_dirs = include_dirs,
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 5b5041f5bcd3..4c9d0c2a8962 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -26,7 +26,7 @@ with stdenv.lib;
let
majorVersion = "3.6";
- minorVersion = "6";
+ minorVersion = "7";
minorVersionSuffix = "";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@@ -51,7 +51,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
- sha256 = "0vz1wqg50zq6g15givdx1s2rq5752y5g2f1978bs6wvf8mfw36yp";
+ sha256 = "0zgp8nvz3rkiz5cxd42vgpah4rvw3kmg9qz9lfq36rfnm40i9zc1";
};
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix
index be503d29b3a7..093d8599690c 100644
--- a/pkgs/development/interpreters/python/cpython/3.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix
@@ -26,7 +26,7 @@ with stdenv.lib;
let
majorVersion = "3.7";
- minorVersion = "0";
+ minorVersion = "1";
minorVersionSuffix = "";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@@ -48,7 +48,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
- sha256 = "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3";
+ sha256 = "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps";
};
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 63ffdbb8c0ac..eb913e1a3752 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -10,6 +10,8 @@
# Whether the derivation provides a Python module or not.
, toPythonModule
, namePrefix
+, writeScript
+, update-python-libraries
}:
{ name ? "${attrs.pname}-${attrs.version}"
@@ -64,7 +66,7 @@ if disabled
then throw "${name} not supported for interpreter ${python.executable}"
else
-toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
+let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
"disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts"
] // {
@@ -106,4 +108,14 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
platforms = python.meta.platforms;
isBuildPythonPackage = python.meta.platforms;
} // meta;
-}))
+}));
+
+passthru = {
+ updateScript = let
+ filename = builtins.head (lib.splitString ":" self.meta.position);
+ in writeScript "update-python" ''
+ #!${python.stdenv.shell}
+ ${update-python-libraries} ${filename}
+ '';
+};
+in lib.extendDerivation true passthru self
diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/development/interpreters/python/update-python-libraries/default.nix
new file mode 100644
index 000000000000..762ca2bdd34b
--- /dev/null
+++ b/pkgs/development/interpreters/python/update-python-libraries/default.nix
@@ -0,0 +1,12 @@
+{ python3, runCommand, git }:
+
+runCommand "update-python-libraries" {
+ buildInputs = [
+ (python3.withPackages(ps: with ps; [ packaging requests toolz ]))
+ git
+ ];
+} ''
+ cp ${./update-python-libraries.py} $out
+ patchShebangs $out
+ substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"'
+''
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
new file mode 100755
index 000000000000..9292a9307030
--- /dev/null
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@@ -0,0 +1,362 @@
+#!/usr/bin/env python3
+
+"""
+Update a Python package expression by passing in the `.nix` file, or the directory containing it.
+You can pass in multiple files or paths.
+
+You'll likely want to use
+``
+ $ ./update-python-libraries ../../pkgs/development/python-modules/*
+``
+to update all libraries in that folder.
+"""
+
+import argparse
+import logging
+import os
+import re
+import requests
+import toolz
+from concurrent.futures import ThreadPoolExecutor as Pool
+from packaging.version import Version as _Version
+from packaging.version import InvalidVersion
+from packaging.specifiers import SpecifierSet
+import collections
+import subprocess
+
+INDEX = "https://pypi.io/pypi"
+"""url of PyPI"""
+
+EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
+"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
+
+PRERELEASES = False
+
+GIT = "git"
+
+import logging
+logging.basicConfig(level=logging.INFO)
+
+
+class Version(_Version, collections.abc.Sequence):
+
+ def __init__(self, version):
+ super().__init__(version)
+ # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21`
+ # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882
+ self.raw_version = version
+
+ def __getitem__(self, i):
+ return self._version.release[i]
+
+ def __len__(self):
+ return len(self._version.release)
+
+ def __iter__(self):
+ yield from self._version.release
+
+
+def _get_values(attribute, text):
+ """Match attribute in text and return all matches.
+
+ :returns: List of matches.
+ """
+ regex = '{}\s+=\s+"(.*)";'.format(attribute)
+ regex = re.compile(regex)
+ values = regex.findall(text)
+ return values
+
+def _get_unique_value(attribute, text):
+ """Match attribute in text and return unique match.
+
+ :returns: Single match.
+ """
+ values = _get_values(attribute, text)
+ n = len(values)
+ if n > 1:
+ raise ValueError("found too many values for {}".format(attribute))
+ elif n == 1:
+ return values[0]
+ else:
+ raise ValueError("no value found for {}".format(attribute))
+
+def _get_line_and_value(attribute, text):
+ """Match attribute in text. Return the line and the value of the attribute."""
+ regex = '({}\s+=\s+"(.*)";)'.format(attribute)
+ regex = re.compile(regex)
+ value = regex.findall(text)
+ n = len(value)
+ if n > 1:
+ raise ValueError("found too many values for {}".format(attribute))
+ elif n == 1:
+ return value[0]
+ else:
+ raise ValueError("no value found for {}".format(attribute))
+
+
+def _replace_value(attribute, value, text):
+ """Search and replace value of attribute in text."""
+ old_line, old_value = _get_line_and_value(attribute, text)
+ new_line = old_line.replace(old_value, value)
+ new_text = text.replace(old_line, new_line)
+ return new_text
+
+def _fetch_page(url):
+ r = requests.get(url)
+ if r.status_code == requests.codes.ok:
+ return r.json()
+ else:
+ raise ValueError("request for {} failed".format(url))
+
+
+SEMVER = {
+ 'major' : 0,
+ 'minor' : 1,
+ 'patch' : 2,
+}
+
+
+def _determine_latest_version(current_version, target, versions):
+ """Determine latest version, given `target`.
+ """
+ current_version = Version(current_version)
+
+ def _parse_versions(versions):
+ for v in versions:
+ try:
+ yield Version(v)
+ except InvalidVersion:
+ pass
+
+ versions = _parse_versions(versions)
+
+ index = SEMVER[target]
+
+ ceiling = list(current_version[0:index])
+ if len(ceiling) == 0:
+ ceiling = None
+ else:
+ ceiling[-1]+=1
+ ceiling = Version(".".join(map(str, ceiling)))
+
+ # We do not want prereleases
+ versions = SpecifierSet(prereleases=PRERELEASES).filter(versions)
+
+ if ceiling is not None:
+ versions = SpecifierSet(f"<{ceiling}").filter(versions)
+
+ return (max(sorted(versions))).raw_version
+
+
+def _get_latest_version_pypi(package, extension, current_version, target):
+ """Get latest version and hash from PyPI."""
+ url = "{}/{}/json".format(INDEX, package)
+ json = _fetch_page(url)
+
+ versions = json['releases'].keys()
+ version = _determine_latest_version(current_version, target, versions)
+
+ try:
+ releases = json['releases'][version]
+ except KeyError as e:
+ raise KeyError('Could not find version {} for {}'.format(version, package)) from e
+ for release in releases:
+ if release['filename'].endswith(extension):
+ # TODO: In case of wheel we need to do further checks!
+ sha256 = release['digests']['sha256']
+ break
+ else:
+ sha256 = None
+ return version, sha256
+
+
+def _get_latest_version_github(package, extension, current_version, target):
+ raise ValueError("updating from GitHub is not yet supported.")
+
+
+FETCHERS = {
+ 'fetchFromGitHub' : _get_latest_version_github,
+ 'fetchPypi' : _get_latest_version_pypi,
+ 'fetchurl' : _get_latest_version_pypi,
+}
+
+
+DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz'
+
+
+FORMATS = {
+ 'setuptools' : DEFAULT_SETUPTOOLS_EXTENSION,
+ 'wheel' : 'whl'
+}
+
+def _determine_fetcher(text):
+ # Count occurences of fetchers.
+ nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys())
+ if nfetchers == 0:
+ raise ValueError("no fetcher.")
+ elif nfetchers > 1:
+ raise ValueError("multiple fetchers.")
+ else:
+ # Then we check which fetcher to use.
+ for fetcher in FETCHERS.keys():
+ if 'src = {}'.format(fetcher) in text:
+ return fetcher
+
+
+def _determine_extension(text, fetcher):
+ """Determine what extension is used in the expression.
+
+ If we use:
+ - fetchPypi, we check if format is specified.
+ - fetchurl, we determine the extension from the url.
+ - fetchFromGitHub we simply use `.tar.gz`.
+ """
+ if fetcher == 'fetchPypi':
+ try:
+ src_format = _get_unique_value('format', text)
+ except ValueError as e:
+ src_format = None # format was not given
+
+ try:
+ extension = _get_unique_value('extension', text)
+ except ValueError as e:
+ extension = None # extension was not given
+
+ if extension is None:
+ if src_format is None:
+ src_format = 'setuptools'
+ elif src_format == 'flit':
+ raise ValueError("Don't know how to update a Flit package.")
+ extension = FORMATS[src_format]
+
+ elif fetcher == 'fetchurl':
+ url = _get_unique_value('url', text)
+ extension = os.path.splitext(url)[1]
+ if 'pypi' not in url:
+ raise ValueError('url does not point to PyPI.')
+
+ elif fetcher == 'fetchFromGitHub':
+ raise ValueError('updating from GitHub is not yet implemented.')
+
+ return extension
+
+
+def _update_package(path, target):
+
+ # Read the expression
+ with open(path, 'r') as f:
+ text = f.read()
+
+ # Determine pname.
+ pname = _get_unique_value('pname', text)
+
+ # Determine version.
+ version = _get_unique_value('version', text)
+
+ # First we check how many fetchers are mentioned.
+ fetcher = _determine_fetcher(text)
+
+ extension = _determine_extension(text, fetcher)
+
+ new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target)
+
+ if new_version == version:
+ logging.info("Path {}: no update available for {}.".format(path, pname))
+ return False
+ elif Version(new_version) <= Version(version):
+ raise ValueError("downgrade for {}.".format(pname))
+ if not new_sha256:
+ raise ValueError("no file available for {}.".format(pname))
+
+ text = _replace_value('version', new_version, text)
+ text = _replace_value('sha256', new_sha256, text)
+
+ with open(path, 'w') as f:
+ f.write(text)
+
+ logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version))
+
+ result = {
+ 'path' : path,
+ 'target': target,
+ 'pname': pname,
+ 'old_version' : version,
+ 'new_version' : new_version,
+ #'fetcher' : fetcher,
+ }
+
+ return result
+
+
+def _update(path, target):
+
+ # We need to read and modify a Nix expression.
+ if os.path.isdir(path):
+ path = os.path.join(path, 'default.nix')
+
+ # If a default.nix does not exist, we quit.
+ if not os.path.isfile(path):
+ logging.info("Path {}: does not exist.".format(path))
+ return False
+
+ # If file is not a Nix expression, we quit.
+ if not path.endswith(".nix"):
+ logging.info("Path {}: does not end with `.nix`.".format(path))
+ return False
+
+ try:
+ return _update_package(path, target)
+ except ValueError as e:
+ logging.warning("Path {}: {}".format(path, e))
+ return False
+
+
+def _commit(path, pname, old_version, new_version, **kwargs):
+ """Commit result.
+ """
+
+ msg = f'python: {pname}: {old_version} -> {new_version}'
+
+ try:
+ subprocess.check_call([GIT, 'add', path])
+ subprocess.check_call([GIT, 'commit', '-m', msg])
+ except subprocess.CalledProcessError as e:
+ subprocess.check_call([GIT, 'checkout', path])
+ raise subprocess.CalledProcessError(f'Could not commit {path}') from e
+
+ return True
+
+
+def main():
+
+ parser = argparse.ArgumentParser()
+ parser.add_argument('package', type=str, nargs='+')
+ parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major')
+ parser.add_argument('--commit', action='store_true', help='Create a commit for each package update')
+
+ args = parser.parse_args()
+ target = args.target
+
+ packages = list(map(os.path.abspath, args.package))
+
+ logging.info("Updating packages...")
+
+ # Use threads to update packages concurrently
+ with Pool() as p:
+ results = list(p.map(lambda pkg: _update(pkg, target), packages))
+
+ logging.info("Finished updating packages.")
+
+ # Commits are created sequentially.
+ if args.commit:
+ logging.info("Committing updates...")
+ list(map(lambda x: _commit(**x), filter(bool, results)))
+ logging.info("Finished committing updates")
+
+ count = sum(map(bool, results))
+ logging.info("{} package(s) updated".format(count))
+
+
+
+if __name__ == '__main__':
+ main()
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 8d4e68bf57ca..27d01e4e1f51 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 e8b6cc93c2c1..ba66404062be 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,6 +1,10 @@
{ stdenv, fetchurl, makeFontsConf, makeWrapper
, cairo, coreutils, fontconfig, freefont_ttf
-, glib, gmp, gtk3, libedit, libffi, libjpeg
+, glib, gmp
+, gtk3
+, libedit, libffi
+, libiconv
+, libjpeg
, libpng, libtool, mpfr, openssl, pango, poppler
, readline, sqlite
, disableDocs ? false
@@ -36,7 +40,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 +49,7 @@ stdenv.mkDerivation rec {
}
)) {
inherit name;
- sha256 = "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a";
+ sha256 = "180z0z6srzyipi9wfnbh61nbvzxr5d1cls7wxapv6fw92y52jwz9";
};
FONTCONFIG_FILE = fontsConf;
@@ -56,7 +60,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
preConfigure = ''
unset AR
@@ -98,6 +102,6 @@ stdenv.mkDerivation rec {
homepage = http://racket-lang.org/;
license = licenses.lgpl3;
maintainers = with maintainers; [ kkallio henrytill vrthra ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-darwin" "x86_64-linux" ];
};
}
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index ba4e94cbf13f..114023defcd4 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/regina/default.upstream b/pkgs/development/interpreters/regina/default.upstream
index 7b3c6905a1ca..481d9848f830 100644
--- a/pkgs/development/interpreters/regina/default.upstream
+++ b/pkgs/development/interpreters/regina/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/regina-rexx/files/regina-rexx/
+url https://sourceforge.net/projects/regina-rexx/files/regina-rexx/
SF_version_dir
SF_version_tarball
SF_redirect
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 4dff7e6974ef..947f05809034 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.3";
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 = "0z6s1vzjb5jh0i79pv5kgynfrzqj1a1f3afrpmp2aaqbrljkidbn";
};
patches = [
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 9e6d35b818f4..f1d48578541e 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 ca180b3c2294..c87cb120b401 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 ecbb1abb40ca..ea96e5ed334a 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/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix
new file mode 100644
index 000000000000..de65006be95a
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/60.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
+
+let
+ version = "60.3.0";
+in stdenv.mkDerivation rec {
+ name = "spidermonkey-${version}";
+
+ src = fetchurl {
+ url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
+ sha256 = "0qak5gmkx8xm88xgnxdmj4z7sivbbvmg2v029fp9q5ms38cg6rjm";
+ };
+
+ buildInputs = [ readline icu zlib nspr ];
+ nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
+
+ patches = [
+ (fetchpatch {
+ url = https://bug1415202.bmoattachments.org/attachment.cgi?id=8926363;
+ sha256 = "082ryrvqa3lvs67v3sq9kf2jshf4qp1fpi195wffc40jdrl8fnin";
+ })
+ ];
+
+ preConfigure = ''
+ export CXXFLAGS="-fpermissive"
+ export LIBXUL_DIST=$out
+ export PYTHON="${python2.interpreter}"
+
+ # We can't build in js/src/, so create a build dir
+ mkdir obj
+ cd obj/
+ configureScript=../js/src/configure
+ '';
+
+ # We need the flags specified here for gjs:
+ # https://gitlab.gnome.org/GNOME/gnome-sdk-images/blob/bc8829439a4f1019d0c56a293ddd84e936fdf9f9/org.gnome.Sdk.json.in#L744
+ configureFlags = [
+ "--with-system-zlib"
+ "--with-system-icu"
+ "--with-intl-api"
+ "--enable-readline"
+ "--enable-shared-js"
+ "--enable-posix-nspr-emulation"
+ "--disable-jemalloc"
+ "--enable-release"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Mozilla's JavaScript engine written in C/C++";
+ homepage = https://developer.mozilla.org/en/SpiderMonkey;
+ license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
+ maintainers = [ maintainers.abbradar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 2737fd6fae04..c16b57dcb9c5 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig
+{ stdenv, fetchurl, cmake, pkgconfig, alsaLib
, libjack2, libsndfile, fftw, curl, gcc
, libXt, qtbase, qttools, qtwebkit, readline
, useSCEL ? false, emacs
@@ -28,12 +28,13 @@ stdenv.mkDerivation rec {
buildInputs = [
gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ]
+ ++ optional (!stdenv.isDarwin) alsaLib
++ optional useSCEL emacs;
meta = {
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 000000000000..cf0fad18d1ca
--- /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 000000000000..3144dd898374
--- /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 23a539491d0e..787c54c1b0a3 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/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 7bbb1a5e1c92..e2ff66a47084 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
-, openglSupport ? false, libGL, libGLU
-, alsaSupport ? true, alsaLib
-, x11Support ? stdenv.hostPlatform == stdenv.buildPlatform, libXext, libICE, libXrandr
-, pulseaudioSupport ? true, libpulseaudio
+{ stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
+, openglSupport ? libGLSupported, libGL, libGLU
+, alsaSupport ? stdenv.isLinux, alsaLib
+, x11Support ? !stdenv.isCygwin, libXext, libICE, libXrandr
+, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
, OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
+, cf-private
}:
# NOTE: When editing this expression see if the same change applies to
# SDL2 expression too
-with lib;
+with stdenv.lib;
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null);
@@ -41,7 +42,11 @@ stdenv.mkDerivation rec {
buildInputs = [ ]
++ optional (!stdenv.hostPlatform.isMinGW) audiofile
- ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
+ ++ optionals stdenv.isDarwin [
+ AudioUnit CoreAudio CoreServices Kernel OpenGL
+ # Needed for NSDefaultRunLoopMode symbols.
+ cf-private
+ ];
configureFlags = [
"--disable-oss"
@@ -86,7 +91,7 @@ stdenv.mkDerivation rec {
# Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
(fetchpatch {
name = "SDL_SetGamma.patch";
- url = "http://src.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
+ url = "https://src.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv";
})
# Fix a build failure on OS X Mavericks
@@ -109,7 +114,7 @@ stdenv.mkDerivation rec {
postFixup = ''
for lib in $out/lib/*.so* ; do
if [[ -L "$lib" ]]; then
- patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib"
+ patchelf --set-rpath "$(patchelf --print-rpath $lib):${makeLibraryPath propagatedBuildInputs}" "$lib"
fi
done
'';
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 7d8f5b2caee6..e009204133ef 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -1,31 +1,31 @@
-{ stdenv, lib, fetchurl, pkgconfig, pruneLibtoolFiles
-, openglSupport ? false, libGL
-, alsaSupport ? true, alsaLib
-, x11Support ? true, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
-, waylandSupport ? true, wayland, wayland-protocols, libxkbcommon
-, dbusSupport ? false, dbus
+{ stdenv, config, libGLSupported, fetchurl, pkgconfig, pruneLibtoolFiles
+, openglSupport ? libGLSupported, libGL
+, alsaSupport ? stdenv.isLinux, alsaLib
+, x11Support ? !stdenv.isCygwin, libX11, xproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
+, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols, libxkbcommon
+, dbusSupport ? stdenv.isLinux, dbus
, udevSupport ? false, udev
, ibusSupport ? false, ibus
-, pulseaudioSupport ? true, libpulseaudio
+, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio
, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL
-, audiofile, libiconv
+, audiofile, cf-private, libiconv
}:
# NOTE: When editing this expression see if the same change applies to
# SDL expression too
-with lib;
+with stdenv.lib;
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
stdenv.mkDerivation rec {
name = "SDL2-${version}";
- version = "2.0.8";
+ version = "2.0.9";
src = fetchurl {
url = "https://www.libsdl.org/release/${name}.tar.gz";
- sha256 = "1v4js1gkr75hzbxzhwzzif0sf9g07234sd23x1vdaqc661bprizd";
+ sha256 = "1c94ndagzkdfqaa838yqg589p1nnqln8mv0hpwfhrkbfczf8cl95";
};
outputs = [ "out" "dev" ];
@@ -54,11 +54,13 @@ stdenv.mkDerivation rec {
buildInputs = [ audiofile libiconv ]
++ dlopenBuildInputs
++ optional ibusSupport ibus
- ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ];
+ ++ optionals stdenv.isDarwin [
+ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL
+ # Needed for NSDefaultRunLoopMode symbols.
+ cf-private
+ ];
- # /build/SDL2-2.0.7/src/video/wayland/SDL_waylandevents.c:41:10: fatal error:
- # pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
- enableParallelBuilding = false;
+ enableParallelBuilding = true;
configureFlags = [
"--disable-oss"
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index 17a2dd14b272..5ab4a0dc6c7f 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "SDL2_image-${version}";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz";
- sha256 = "0s13dmakn21q6yw8avl67d4zkxzl1wap6l5nwf6cvzrmlxfw441m";
+ sha256 = "1b6f7002bm007y3zpyxb5r6ag0lml51jyvx1pwpj9sq24jfc8kp7";
};
buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 3819aeb3c316..61e15d621bcd 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "SDL2_mixer-${version}";
- version = "2.0.2";
+ version = "2.0.4";
src = fetchurl {
url = "https://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz";
- sha256 = "1fw3kkqi5346ai5if4pxrcbhs5c4vv3a4smgz6fl6kyaxwkmwqaf";
+ sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl";
};
preAutoreconf = ''
diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix
index 2a009a3b7104..0e717c530357 100644
--- a/pkgs/development/libraries/SDL_sound/default.nix
+++ b/pkgs/development/libraries/SDL_sound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, libvorbis, flac, libmikmod }:
+{ stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }:
stdenv.mkDerivation rec {
name = "SDL_sound-${version}";
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL libvorbis flac libmikmod ];
- meta = with stdenv.lib; {
+ configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
+
+ meta = with lib; {
description = "SDL sound library";
- platforms = platforms.linux;
+ platforms = platforms.unix;
license = licenses.lgpl21;
homepage = https://www.icculus.org/SDL_sound/;
};
diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix
index 0a7f02f17e59..3e496b7e981f 100644
--- a/pkgs/development/libraries/Xaw3d/default.nix
+++ b/pkgs/development/libraries/Xaw3d/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
};
+ dontUseImakeConfigure = true;
nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
buildInputs = [ libXpm libXp ];
propagatedBuildInputs = [ xlibsWrapper libXmu ];
diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 36d7912d0f8a..b42240a26c4e 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 }:
+, gobject-introspection, 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 gobject-introspection 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 f26f5c738227..ef1a59b0249f 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 a1741513642f..560ccb768b1e 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/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index f9bb982a7842..f9559d94174d 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
installTargets = [ "install" "install-lib" "install-dev" ];
meta = with stdenv.lib; {
- homepage = "http://savannah.nongnu.org/projects/acl";
+ homepage = "https://savannah.nongnu.org/projects/acl";
description = "Library and tools for manipulating access control lists";
platforms = platforms.linux;
license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index a1c466605228..5ccb7f95ee19 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 ce25521ad2e5..3ab4ed3e9623 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 bd4270e8b935..12d35e270209 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 015c48d01411..7dd0fcb55905 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 21d9ce23d319..f53aa873b482 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 48dfe9ad894e..9569f51ba792 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
-, gtk-doc, libarchive, gobjectIntrospection, libxslt, pngquant
+, gtk-doc, libarchive, gobject-introspection, libxslt, pngquant
, sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42
, libuuid, json-glib, meson, gperf, ninja
}:
stdenv.mkDerivation rec {
- name = "appstream-glib-0.7.10";
+ name = "appstream-glib-0.7.14";
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 = "1908ilra1l0m2a224azmj6p4yglzdwwk41rr6rhby959sgw3iaky";
};
nativeBuildInputs = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib gettext sqlite libsoup
attr acl libuuid json-glib
- libarchive gobjectIntrospection gperf
+ libarchive gobject-introspection gperf
];
propagatedBuildInputs = [ gtk3 ];
diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 5e4218852e51..f53b63472cce 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -1,24 +1,24 @@
{ stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext
, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
-, libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection
+, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
, pcre, itstool, gperf, vala
}:
stdenv.mkDerivation rec {
name = "appstream-${version}";
- version = "0.12.2";
+ version = "0.12.3";
src = fetchFromGitHub {
owner = "ximion";
repo = "appstream";
rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
- sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb";
+ sha256 = "154yfn10vm5v7vwa2jz60bgpcznzm3nkjg31g92rm9b39rd2y1ja";
};
nativeBuildInputs = [
meson ninja pkgconfig gettext
libxslt xmlto docbook_xsl docbook_xml_dtd_45
- gobjectIntrospection itstool vala
+ gobject-introspection itstool vala
];
buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ];
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 4e2de01e9adb..fe159afe6854 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 705f61445b59..ea84609868cf 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/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix
new file mode 100644
index 000000000000..dc98de1c2cb6
--- /dev/null
+++ b/pkgs/development/libraries/aravis/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool
+, audit, glib, libusb, libxml2
+, wrapGAppsHook
+, gstreamer ? null
+, gst-plugins-base ? null
+, gst-plugins-good ? null
+, gst-plugins-bad ? null
+, libnotify ? null
+, gnome3 ? null
+, enableUsb ? true
+, enablePacketSocket ? true
+, enableViewer ? true
+, enableGstPlugin ? true
+, enableCppTest ? false
+, enableFastHeartbeat ? false
+, enableAsan ? false
+}:
+
+let
+ gstreamerAtLeastVersion1 =
+ stdenv.lib.all
+ (pkg: pkg != null && stdenv.lib.versionAtLeast (stdenv.lib.getVersion pkg) "1.0")
+ [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
+in
+ assert enableGstPlugin -> stdenv.lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
+ assert enableViewer -> enableGstPlugin;
+ assert enableViewer -> libnotify != null;
+ assert enableViewer -> gnome3 != null;
+ assert enableViewer -> gstreamerAtLeastVersion1;
+
+ stdenv.mkDerivation rec {
+
+ pname = "aravis";
+ version = "0.5.13";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "AravisProject";
+ repo = "aravis";
+ rev= "c56e530b8ef53b84e17618ea2f334d2cbae04f48";
+ sha256 = "1dj24dir239zmiscfhyy1m8z5rcbw0m1vx9lipx0r7c39bzzj5gy";
+ };
+
+ outputs = [ "bin" "dev" "out" "lib" ];
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkgconfig
+ intltool
+ gtk-doc
+ ] ++ stdenv.lib.optional enableViewer wrapGAppsHook;
+
+ buildInputs =
+ [ glib libxml2 ]
+ ++ stdenv.lib.optional enableUsb libusb
+ ++ stdenv.lib.optional enablePacketSocket audit
+ ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]
+ ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.defaultIconTheme ];
+
+ preAutoreconf = ''./autogen.sh'';
+
+ configureFlags =
+ stdenv.lib.optional enableUsb "--enable-usb"
+ ++ stdenv.lib.optional enablePacketSocket "--enable-packet-socket"
+ ++ stdenv.lib.optional enableViewer "--enable-viewer"
+ ++ stdenv.lib.optional enableGstPlugin
+ (if gstreamerAtLeastVersion1 then "--enable-gst-plugin" else "--enable-gst-0.10-plugin")
+ ++ stdenv.lib.optional enableCppTest "--enable-cpp-test"
+ ++ stdenv.lib.optional enableFastHeartbeat "--enable-fast-heartbeat"
+ ++ stdenv.lib.optional enableAsan "--enable-asan";
+
+ postPatch = ''
+ ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make .
+ '';
+
+ doCheck = true;
+
+ meta = {
+ description = "Library for video acquisition using GenICam cameras";
+ longDescription = ''
+ Implements the gigabit ethernet and USB3 protocols used by industrial cameras.
+ '';
+ homepage = https://aravisproject.github.io/docs/aravis-0.5;
+ license = stdenv.lib.licenses.lgpl2;
+ maintainers = [];
+ platforms = stdenv.lib.platforms.unix;
+ };
+ }
+
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index bca519c76283..f94e0a3ee780 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/arb/git.nix b/pkgs/development/libraries/arb/git.nix
deleted file mode 100644
index a281e2a085fe..000000000000
--- a/pkgs/development/libraries/arb/git.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
-stdenv.mkDerivation rec {
- name = "${pname}-${version}";
- pname = "arb";
- version = "2.9.0pre20161013";
- src = fetchFromGitHub {
- owner = "fredrik-johansson";
- repo = "${pname}";
- rev = "10bc615ce5999caf4723444b2b1219b74781d8a4";
- sha256 = "1xb40x3hv9nh76aizhskj5gdhalgn7r95a7zji2nn4ih3lmh40hl";
- };
- buildInputs = [ mpir gmp mpfr flint ];
- configureFlags = [ "--with-gmp=${gmp}" "--with-mpir=${mpir}" "--with-mpfr=${mpfr}" "--with-flint=${flint}" ];
- meta = {
- inherit version;
- description = ''A library for arbitrary-precision interval arithmetic'';
- license = stdenv.lib.licenses.lgpl21Plus;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix
new file mode 100644
index 000000000000..f14c77f666bd
--- /dev/null
+++ b/pkgs/development/libraries/argp-standalone/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, fetchpatch }:
+
+stdenv.mkDerivation rec {
+ name = "argp-standalone-1.3";
+
+ src = fetchurl {
+ url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-1.3.tar.gz";
+ sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be";
+ };
+
+ patches = [
+ (if stdenv.hostPlatform.isDarwin then
+ fetchpatch {
+ name = "patch-argp-fmtstream.h";
+ url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h";
+ sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8";
+ }
+ else null)
+ ];
+
+ patchFlags = "-p0";
+
+ postInstall =
+ ''
+ mkdir -p $out/lib $out/include
+ cp libargp.a $out/lib
+ cp argp.h $out/include
+ '';
+
+ doCheck = true;
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://www.lysator.liu.se/~nisse/misc/";
+ description = "Standalone version of arguments parsing functions from GLIBC";
+ platforms = platforms.darwin;
+ maintainers = with maintainers; [ amar1729 ];
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix
index 60fafd60ad0b..ebef604e1be6 100644
--- a/pkgs/development/libraries/arguments/default.nix
+++ b/pkgs/development/libraries/arguments/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
#cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" "-DBUILD_TESTING=FALSE" ];
- checkPhase = "ctest --output-on-failure";
doCheck = false;
# internal_volume_io.h: No such file or directory
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 16ba6b32382a..7685a0d9eb4f 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
stdenv.mkDerivation rec {
- version = "9.100.5";
+ version = "9.200.4";
name = "armadillo-${version}";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
- sha256 = "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby";
+ sha256 = "0rkry405vacvlvkc7xdkzh20zf7yni9hsp65v0dby91na0wcrl8h";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/arrow-cpp/darwin.patch b/pkgs/development/libraries/arrow-cpp/darwin.patch
new file mode 100644
index 000000000000..de9b1986ffed
--- /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 8e89aeb21a24..96259dc66948 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 000000000000..336fdde9e8fb
--- /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 000000000000..1bdeecaef990
--- /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 58dd4f614231..72305cb633fb 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/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index f1db64cc9ea5..2962e099f255 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "at-spi2-atk";
- version = "2.26.2";
+ version = "2.30.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1";
+ sha256 = "16lav8k3mcxf2hblfh95zcw41glmb92wwwwljrf10yza0h85gqg2";
};
nativeBuildInputs = [ meson ninja pkgconfig ]
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index d9251c2bdc5d..cae674809644 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -4,7 +4,7 @@
, meson
, ninja
, pkgconfig
-, gobjectIntrospection
+, gobject-introspection
, dbus
, glib
@@ -19,16 +19,16 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "at-spi2-core";
- version = "2.28.0";
+ version = "2.30.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "11qwdxxx4jm0zj04xydlwah41axiz276dckkiql3rr0wn5x4i8j2";
+ sha256 = "0azvgdmmivfz1fki25mz582gmwvfpajcnqhlq7s53nhr7lwzax81";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]
+ nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]
# Fixup rpaths because of meson, remove with meson-0.47
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ dbus glib libX11 libXtst libXi ];
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 813f8c3c9640..b56c84f57bd0 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,33 +1,25 @@
{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib
-, fixDarwinDylibNames, gobjectIntrospection, gnome3
+, fixDarwinDylibNames, gobject-introspection, gnome3
}:
let
pname = "atk";
- version = "2.28.1";
+ version = "2.30.0";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1z7laf6qwv5zsqcnj222dm5f43c6f3liil0cgx4s4s62xjk1wfnd";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "0yq25iisnf0rmlg2x5ghzqk9vhf2jramb2khxqghqakz47a90kfx";
};
- patches = [
- # darwin linker arguments https://bugzilla.gnome.org/show_bug.cgi?id=794326
- (fetchurl {
- url = https://bugzilla.gnome.org/attachment.cgi?id=369680;
- sha256 = "11v8fhpsbapa04ifb2268cga398vfk1nq8i628441632zjz1diwg";
- })
- ];
-
outputs = [ "out" "dev" ];
buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
- nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
propagatedBuildInputs = [
# Required by atk.pc
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 944f33b7a3f9..f859894cd47b 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = "http://savannah.nongnu.org/projects/attr/";
+ homepage = "https://savannah.nongnu.org/projects/attr/";
description = "Library and tools for manipulating extended attributes";
platforms = platforms.linux;
license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index adcb86cedf84..01ca9a3ec833 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,24 +1,18 @@
{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
-, libsndfile, pkgconfig, python
+, libsndfile, pkgconfig, python, wafHook
}:
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 ];
+ nativeBuildInputs = [ pkgconfig python wafHook ];
buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ];
- configurePhase = "python waf configure --prefix=$out";
-
- buildPhase = "python waf";
-
- installPhase = "python waf install";
-
meta = with stdenv.lib; {
description = "Library for audio labelling";
homepage = https://aubio.org/;
diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index f28e374c852a..373d50a0a434 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
+{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }:
stdenv.mkDerivation rec {
name = "lilv-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ lv2 python serd sord sratom ];
- configurePhase = "${python.interpreter} waf configure --prefix=$out";
-
- buildPhase = "${python.interpreter} waf";
-
- installPhase = "${python.interpreter} waf install";
-
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/lilv;
description = "A C library to make the use of LV2 plugins";
diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix
index 3df8f5e30789..5b98a88a8fb5 100644
--- a/pkgs/development/libraries/audio/lv2/default.nix
+++ b/pkgs/development/libraries/audio/lv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python }:
+{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "lv2-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0chxwys3vnn3nxc9x2vchm74s9sx0vfra6y893byy12ci61jc1dq";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ gtk2 libsndfile python ];
- configurePhase = "${python.interpreter} waf configure --prefix=$out";
-
- buildPhase = "${python.interpreter} waf";
-
- installPhase = "${python.interpreter} waf install";
-
meta = with stdenv.lib; {
homepage = http://lv2plug.in;
description = "A plugin standard for audio systems";
diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix
index 4a632d07006b..81cc868f52ca 100644
--- a/pkgs/development/libraries/audio/lv2/unstable.nix
+++ b/pkgs/development/libraries/audio/lv2/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }:
+{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "lv2-unstable-${version}";
@@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ gtk2 libsndfile python ];
- configurePhase = "${python.interpreter} waf configure --prefix=$out";
-
- buildPhase = "${python.interpreter} waf";
-
- installPhase = "${python.interpreter} waf install";
-
meta = with stdenv.lib; {
homepage = http://lv2plug.in;
description = "A plugin standard for audio systems";
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index c74c8caa23fd..b6203a159e6c 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python }:
+{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "lvtk-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
};
- nativeBuildInputs = [ pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig python wafHook ];
buildInputs = [ boost gtkmm2 lv2 ];
enableParallelBuilding = true;
@@ -19,15 +19,10 @@ stdenv.mkDerivation rec {
sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build
'';
- configurePhase = ''
- python waf configure --prefix=$out \
- --boost-includes="${boost.dev}/include" \
- --boost-libs="${boost.out}/lib"
- '';
-
- buildPhase = "python waf";
-
- installPhase = "python waf install";
+ configureFlags = [
+ "--boost-includes=${boost.dev}/include"
+ "--boost-libs=${boost.out}/lib"
+ ];
meta = with stdenv.lib; {
description = "A set C++ wrappers around the LV2 C API";
diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index 6e7cb8d020bd..ddd3940098a4 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2 }:
+{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }:
stdenv.mkDerivation rec {
name = "ntk-${version}";
@@ -10,20 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [
cairo libjpeg libXft python2
];
- buildPhase = ''
- python waf configure --prefix=$out
- python waf
- '';
-
- installPhase = ''
- python waf install
- '';
-
meta = {
description = "Fork of FLTK 1.3.0 with additional functionality";
version = "${version}";
diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix
index 63e3ae36028b..51234a415fd7 100644
--- a/pkgs/development/libraries/audio/raul/default.nix
+++ b/pkgs/development/libraries/audio/raul/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, boost, gtk2, pkgconfig, python }:
+{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "raul-unstable-${rev}";
@@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ boost gtk2 python ];
- configurePhase = "${python.interpreter} waf configure --prefix=$out";
-
- buildPhase = "${python.interpreter} waf";
-
- installPhase = "${python.interpreter} waf install";
-
meta = with stdenv.lib; {
description = "A C++ utility library primarily aimed at audio/musical applications";
homepage = http://drobilla.net/software/raul;
diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix
index acfbced52720..09a6230184af 100644
--- a/pkgs/development/libraries/audio/sratom/default.nix
+++ b/pkgs/development/libraries/audio/sratom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord }:
+{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }:
stdenv.mkDerivation rec {
name = "sratom-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ lv2 python serd sord ];
- configurePhase = "${python.interpreter} waf configure --prefix=$out";
-
- buildPhase = "${python.interpreter} waf";
-
- installPhase = "${python.interpreter} waf install";
-
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/sratom;
description = "A library for serialising LV2 atoms to/from RDF";
diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index e29c7b5cb122..10d650d66425 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -1,4 +1,5 @@
{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
+, wafHook
, withQt4 ? true, qt4 ? null
, withQt5 ? false, qt5 ? null }:
@@ -16,17 +17,11 @@ stdenv.mkDerivation rec {
sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ gtk2 lv2 python serd sord sratom ]
++ (lib.optionals withQt4 [ qt4 ])
++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
- configurePhase = "python waf configure --prefix=$out";
-
- buildPhase = "python waf";
-
- installPhase = "python waf install";
-
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/suil;
description = "A lightweight C library for loading and wrapping LV2 plugin UIs";
diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix
index e3c0f0394772..320fc41f76c5 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 11a06d4f39ac..4fc5c12ccc4c 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 00a0a5082137..e9cccab39f02 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 53e3f5468abc..971637bc7870 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 9afb03e0d0c6..0825cdcfc098 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.52";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
- sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z";
+ sha256 = "17hyq6rv1xl3f70p2pfkkxm86gbfimq2pwpakv1wv3xjibmppbrf";
};
# 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 1e341d3124b4..4c942cac3f69 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.60";
src = fetchurl {
url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
- sha256 = "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla";
+ sha256 = "0kv0y12j4k9khrxqa7rryfb4ikcnrax6x4nwi70wnz05nv6fxld3";
};
doCheck = true;
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index 0a2badea7cbf..e741305f9913 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,54 +1,67 @@
-{ 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, gobject-introspection, gtk-doc, docbook_xsl
, xorgserver, dbus, python2 }:
stdenv.mkDerivation rec {
- pname = "bamf";
- version = "0.5.3";
- name = "${pname}-${version}";
+ name = "bamf-${version}";
+ version = "0.5.4";
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 = version;
+ sha256 = "1klvij1wyhdj5d8sr3b16pfixc1yk8ihglpjykg7zrr1f50jfgsz";
};
nativeBuildInputs = [
- pkgconfig
+ autoconf
+ automake
+ docbook_xsl
+ gnome3.gnome-common
+ gobject-introspection
gtk-doc
- gobjectIntrospection
+ libtool
+ pkgconfig
vala
+ which
# Tests
- xorgserver
+ python2
+ python2.pkgs.libxslt
+ python2.pkgs.libxml2
dbus
- (python2.withPackages (pkgs: with pkgs; [ libxslt libxml2 ]))
+ xorgserver
];
buildInputs = [
- libgtop
- libwnck3
- libstartup_notification
glib
+ libgtop
+ libstartup_notification
+ 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 000000000000..da71e40187f4
--- /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 da71e40187f4..ad7aff6b5407 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 = "8.0.0";
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 = "014gjv3f1qycsv5yh3fyhvrvsig60yc288pipzr0ml4312igj8wg";
};
buildInputs = [ libatomic_ops ];
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 617484e5a403..c79b874ecb69 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/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix
index b64cdd5245fd..0ed223832b6c 100644
--- a/pkgs/development/libraries/bootil/default.nix
+++ b/pkgs/development/libraries/bootil/default.nix
@@ -23,21 +23,21 @@ stdenv.mkDerivation rec {
url = https://github.com/garrynewman/bootil/pull/22.patch;
name = "github-pull-request-22.patch";
sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
- })];
+ }) ];
- platform =
- if stdenv.isLinux then "linux"
- else if stdenv.isDarwin then "macosx"
- else throw "unrecognized system ${stdenv.hostPlatform.system}";
+ # Avoid guessing where files end up. Just use current directory.
+ postPatch = ''
+ substituteInPlace projects/premake4.lua \
+ --replace 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )'
+ substituteInPlace projects/bootil.lua \
+ --replace 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )'
+ '';
- buildInputs = [ premake4 ];
-
- configurePhase = "premake4 --file=projects/premake4.lua gmake";
- makeFlags = "-C projects/${platform}/gmake";
+ nativeBuildInputs = [ premake4 ];
+ premakefile = "projects/premake4.lua";
installPhase = ''
- mkdir -p $out/lib
- cp lib/${platform}/gmake/libbootil_static.a $out/lib/
- cp -r include $out/
+ install -D libbootil_static.a $out/lib/libbootil_static.a
+ cp -r include $out
'';
}
diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index ff48ffe67f0a..9d65fb554ffe 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 000000000000..b4a57396cc8b
--- /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 4d94faa9566a..fca5e8d70a3b 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 1835356e627d..9e38398dfad1 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -2,22 +2,13 @@
let self =
stdenv.mkDerivation rec {
- name = "c-ares-1.14.0";
+ name = "c-ares-1.15.0";
src = fetchurl {
url = "https://c-ares.haxx.se/download/${name}.tar.gz";
- sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
+ sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
};
- # ares_android.h header is missing
- # see issue https://github.com/c-ares/c-ares/issues/216
- postPatch = if stdenv.hostPlatform.isAndroid then ''
- cp ${fetchurl {
- url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h";
- sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8";
- }} ares_android.h
- '' else null;
-
meta = with stdenv.lib; {
description = "A C library for asynchronous DNS requests";
homepage = https://c-ares.haxx.se;
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 397e80961e06..f1cad37d438f 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.2";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = "${version}";
- sha256 = "0qmb18k162xdvf8z03mybjazkwb2vqda5xd1qh5bwkvxracwq3sb";
+ sha256 = "0sdr9mrrkrj9nfwqbznz3pkqfsnsi8kanfy99x01js1spqihy1s3";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index db46412ceb55..8f7a04cbb68f 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.16.0";
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 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
};
outputs = [ "out" "dev" "devdoc" ];
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index 78fcad5c1fe2..b175250872f3 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/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 116216d500e2..d83060fc24d8 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "catch-${version}";
- version = "1.12.0";
+ version = "1.12.2";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch";
rev = "v${version}";
- sha256 = "0hkcmycvyyazzi9dywnyiipnmbx399iirh5xk5g957c8zl0505kd";
+ sha256 = "1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
new file mode 100644
index 000000000000..073736ce66d9
--- /dev/null
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, python }:
+
+stdenv.mkDerivation rec {
+ name = "catch2-${version}";
+ version = "2.4.2";
+
+ src = fetchFromGitHub {
+ owner = "catchorg";
+ repo = "Catch2";
+ rev = "v${version}";
+ sha256="1105bxbvh1xxl4yxjjp6l6w6hgsh8xbdiwlnga9di5y2x92b9bjd";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [
+ "-H.."
+ "-DBUILD_TESTING=OFF"];
+
+ meta = with stdenv.lib; {
+ description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)";
+ homepage = http://catch-lib.net;
+ license = licenses.boost;
+ maintainers = with maintainers; [ edwtjo knedlsepp ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix
index bd83a5c79d55..db2d177b710c 100644
--- a/pkgs/development/libraries/ccrtp/1.8.nix
+++ b/pkgs/development/libraries/ccrtp/1.8.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
meta = {
description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF";
- homepage = http://www.gnu.org/software/ccrtp/;
+ homepage = https://www.gnu.org/software/ccrtp/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix
index 5df7c2279c55..cd9d031788a8 100644
--- a/pkgs/development/libraries/ccrtp/default.nix
+++ b/pkgs/development/libraries/ccrtp/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "An implementation of the IETF real-time transport protocol (RTP)";
- homepage = http://www.gnu.org/software/ccrtp/;
+ homepage = https://www.gnu.org/software/ccrtp/;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ marcweber ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 432e49c4354f..043b9e263d8a 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 7cb75d8de0f3..1890d2b25a0d 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 e39386dca3f4..7764e9c67ed2 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 0db253bbec26..004c01a5b69e 100644
--- a/pkgs/development/libraries/clucene-core/2.x.nix
+++ b/pkgs/development/libraries/clucene-core/2.x.nix
@@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
buildInputs = [ boost zlib ];
- cmakeFlags = [ "-DBUILD_CONTRIBS=ON" "-DBUILD_CONTRIBS_LIB=ON" ];
+ cmakeFlags = [
+ "-DBUILD_CONTRIBS=ON"
+ "-DBUILD_CONTRIBS_LIB=ON"
+ "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
+ ];
patches = # From debian
[ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch
@@ -20,15 +24,11 @@ stdenv.mkDerivation rec {
./Install-contribs-lib.patch
] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
- postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
- install_name_tool -change libclucene-shared.1.dylib \
- $out/lib/libclucene-shared.1.dylib \
- $out/lib/libclucene-core.1.dylib
- '';
+ # fails with "Unable to find executable:
+ # /build/clucene-core-2.3.3.4/build/bin/cl_test"
+ doCheck = false;
- 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 b65e794a92aa..8451b0853729 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 a06691d5c715..428114986d1b 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 9759e4904b29..d59bc5161af5 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, meson, ninja
-, gobjectIntrospection, clutter, gtk3, gnome3 }:
+, gobject-introspection, clutter, gtk3, gnome3 }:
let
pname = "clutter-gtk";
@@ -10,12 +10,14 @@ 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 ];
+ nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
postBuild = "rm -rf $out/share/gtk-doc";
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 705aa7252d1f..7095a808540f 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
+, gobject-introspection, 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 gobject-introspection 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 81df7e863193..a7b604bc0d2e 100644
--- a/pkgs/development/libraries/cmark/default.nix
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -13,9 +13,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
doCheck = !stdenv.isDarwin;
- checkPhase = ''
+ preCheck = ''
export LD_LIBRARY_PATH=$(readlink -f ./src)
- CTEST_OUTPUT_ON_FAILURE=1 make test
'';
meta = with stdenv.lib; {
@@ -23,5 +22,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 e06c71c15db4..e4296810f35f 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
-, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
+, pangoSupport ? true, pango, cairo, gobject-introspection, 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 = [
@@ -25,7 +44,7 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
propagatedBuildInputs = with xorg; [
- glib gdk_pixbuf gobjectIntrospection wayland mesa_noglu
+ glib gdk_pixbuf gobject-introspection wayland mesa_noglu
libGL libXrandr libXfixes libXcomposite libXdamage
]
++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
@@ -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/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix
index f578cd2f87d5..0c5ab7585833 100644
--- a/pkgs/development/libraries/commoncpp2/default.nix
+++ b/pkgs/development/libraries/commoncpp2/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
to build native threading applications for Microsoft Windows.
'';
- homepage = http://www.gnu.org/software/commoncpp/;
+ homepage = https://www.gnu.org/software/commoncpp/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix
deleted file mode 100644
index 3257dfe5d37c..000000000000
--- a/pkgs/development/libraries/confuse/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
- name = "confuse-${version}";
- version = "3.2.1";
- src = fetchurl {
- url = "https://github.com/martinh/libconfuse/releases/download/v${version}/${name}.tar.xz";
- sha256 = "0pnjmlj9i0alp407qd7c0vq83sz7gpsjrbdgpcn4xvzjp9r35ii3";
- };
-
- meta = {
- homepage = http://www.nongnu.org/confuse/;
- description = "Configuration file parser library";
- license = stdenv.lib.licenses.isc;
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix
index 1f4b43db16c3..c2f3ce9b9b4a 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.1";
src = fetchFromGitHub {
- sha256 = "0mfpz349c3arihvngw1a1gfhwlcw6wiwyc44bghjx1q109w7wm1m";
+ sha256 = "0ar7q3rp46m01wvfa289bxnk9xma3ydc67by7i4nrpz8vamvhwc3";
rev = version;
repo = "cpp-hocon";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix
index 8f66b65e49ac..6ec18b9514d7 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 d50aca1679b8..fd81de5139d6 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 55835cdb63db..5a2a53ef24d5 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/cyrus-sasl-ac-try-run-fix.patch b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
new file mode 100644
index 000000000000..8662e812e995
--- /dev/null
+++ b/pkgs/development/libraries/cyrus-sasl/cyrus-sasl-ac-try-run-fix.patch
@@ -0,0 +1,12 @@
+--- a/m4/sasl2.m4 2018-11-18 22:33:29.902625600 +0300
++++ b/m4/sasl2.m4 2018-11-18 22:33:59.828746176 +0300
+@@ -339,7 +339,8 @@
+ ],
+ [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
+ AC_MSG_RESULT(yes) ],
+- AC_MSG_RESULT(no))
++ AC_MSG_RESULT(no),
++ AC_MSG_RESULT(no))
+ LIBS="$cmu_save_LIBS"
+
+ else
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 7a9e3991aadb..27a8b7b1119e 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,62 +1,45 @@
-{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext,
- pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false }:
+{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext
+, pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false
+, buildPackages, pruneLibtoolFiles }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "cyrus-sasl-${version}${optionalString (kerberos == null) "-without-kerberos"}";
- version = "2.1.26";
+ version = "2.1.27";
src = fetchurl {
url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz";
- sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g";
+ sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames pruneLibtoolFiles ];
buildInputs =
[ openssl db gettext kerberos ]
++ lib.optional enableLdap openldap
- ++ lib.optional stdenv.isFreeBSD autoreconfHook
- ++ lib.optional stdenv.isLinux pam
- ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ ++ lib.optional stdenv.isLinux pam;
patches = [
./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
- (fetchpatch {
- name = "CVE-2013-4122.patch";
- url = "http://sourceforge.net/projects/miscellaneouspa/files/glibc217/cyrus-sasl-2.1.26-glibc217-crypt.diff";
- sha256 = "05l7dh1w9d5fvzg0pjwzqh0fy4ah8y5cv6v67s4ssbq8xwd4pkf2";
- })
- ] ++ lib.optional stdenv.isFreeBSD (
- fetchurl {
- url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";
- sha256 = "1vh4pc2rxxm6yvykx0b7kg09jbcwcxwv5rs6yq2ag3y8p6a9x86w";
- }
- );
+ ./cyrus-sasl-ac-try-run-fix.patch
+ ];
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
- )
- '';
-
installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
- postInstall = ''
- for f in $out/lib/*.la $out/lib/sasl2/*.la; do
- substituteInPlace $f --replace "${openssl.dev}/lib" "${openssl.out}/lib"
- done
- '';
-
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 840fa34d6ae1..67e005943fa5 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 208288bfca1d..0f897d97467f 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 ef1ddd9bfff5..cd020317f4c2 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 013913e52972..18ea3ad3ecb7 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 40c633dda523..2704ef2de9fd 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 47f3794f5ad5..1f8f9a4e69cc 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/dee/default.nix b/pkgs/development/libraries/dee/default.nix
index 1288f4ac2f57..fb7ec512319e 100644
--- a/pkgs/development/libraries/dee/default.nix
+++ b/pkgs/development/libraries/dee/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, pkgconfig
-, glib, icu, gobjectIntrospection }:
+, glib, icu, gobject-introspection }:
stdenv.mkDerivation rec {
name = "dee-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "12mzffk0lyd566y46x57jlvb9af152b4dqpasr40zal4wrn37w0v";
};
- buildInputs = [ glib gobjectIntrospection icu ];
+ buildInputs = [ glib gobject-introspection icu ];
nativeBuildInputs = [ python pkgconfig ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" ]; # gcc-6
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index e5e3c2d662c2..a88b3f1b9b68 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 7a33559cbc79..96375fcd5beb 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 000000000000..8cc7a0bba62e
--- /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/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index 49d570c8896a..8eae64eae2ed 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
];
platforms = platforms.linux;
license = licenses.lgpl21;
- downloadPage = "http://sourceforge.net/projects/dssi/files/dssi/";
+ downloadPage = "https://sourceforge.net/projects/dssi/files/dssi/";
};
}
diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index 8c6337cfaf60..96e294ab2fbd 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 5cd004c8d136..57a55cfc39b9 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.2";
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 = "18gjzhz7bkibc34a0djq1r4b2y3hpn7ym0zs0nj07yq58v4pdx08";
};
+ 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 d9b5a2b64d63..90e3ee9af5b2 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
deleted file mode 100644
index e6d13a5915a1..000000000000
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, fetchurl, fetchpatch, cmake}:
-
-let
- version = "3.3.4";
-in
-stdenv.mkDerivation {
- name = "eigen-${version}";
-
- src = fetchurl {
- url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
- name = "eigen-${version}.tar.gz";
- sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2";
- };
-
- 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 = ''
- sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc
- '';
-
- meta = with stdenv.lib; {
- description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
- license = licenses.lgpl3Plus;
- homepage = http://eigen.tuxfamily.org ;
- platforms = platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ sander raskin ];
- inherit version;
- };
-}
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index c120132dcb8b..c48f8e4c9732 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, cmake}:
+{stdenv, fetchurl, fetchpatch, cmake}:
let
- version = "3.2.10";
+ version = "3.3.5";
in
stdenv.mkDerivation {
name = "eigen-${version}";
@@ -9,17 +9,15 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
name = "eigen-${version}.tar.gz";
- sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04";
+ sha256 = "13p60x6k61zq2y2in7g4fy5p55cr5dbmj3zvw10zcazxraxbcm04";
};
+ patches = [
+ ./include-dir.patch
+ ];
+
nativeBuildInputs = [ cmake ];
- doCheck = false; # a couple of tests fail with "Child aborted"
-
- postInstall = ''
- sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc
- '';
-
meta = with stdenv.lib; {
description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/eigen/include-dir.patch b/pkgs/development/libraries/eigen/include-dir.patch
new file mode 100644
index 000000000000..7f3bd88557ec
--- /dev/null
+++ b/pkgs/development/libraries/eigen/include-dir.patch
@@ -0,0 +1,49 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ project(Eigen3)
+
+-cmake_minimum_required(VERSION 2.8.5)
++cmake_minimum_required(VERSION 3.7)
+
+ # guard against in-source builds
+
+@@ -408,13 +408,6 @@ install(FILES
+ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+ )
+
+-if(EIGEN_BUILD_PKGCONFIG)
+- configure_file(eigen3.pc.in eigen3.pc @ONLY)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
+- DESTINATION ${PKGCONFIG_INSTALL_DIR}
+- )
+-endif()
+-
+ add_subdirectory(Eigen)
+
+ add_subdirectory(doc EXCLUDE_FROM_ALL)
+@@ -510,8 +503,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} )
+ set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} )
+ set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} )
+ set ( EIGEN_DEFINITIONS "")
+-set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" )
+ set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} )
++GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR)
++
++if(EIGEN_BUILD_PKGCONFIG)
++ configure_file(eigen3.pc.in eigen3.pc @ONLY)
++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
++ DESTINATION ${PKGCONFIG_INSTALL_DIR}
++ )
++endif()
+
+ # Interface libraries require at least CMake 3.0
+ if (NOT CMAKE_VERSION VERSION_LESS 3.0)
+--- a/eigen3.pc.in
++++ b/eigen3.pc.in
+@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r
+ Requires:
+ Version: @EIGEN_VERSION_NUMBER@
+ Libs:
+-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@
++Cflags: -I@EIGEN_INCLUDE_DIR@
diff --git a/pkgs/development/libraries/elf-header/default.nix b/pkgs/development/libraries/elf-header/default.nix
index 48e5b73d9e72..47b39eeb7e97 100644
--- a/pkgs/development/libraries/elf-header/default.nix
+++ b/pkgs/development/libraries/elf-header/default.nix
@@ -12,7 +12,7 @@ let
in
stdenvNoCC.mkDerivation {
- name = "elf-header";
+ pname = "elf-header";
inherit (libc) version;
src = null;
@@ -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 c51475ecc2a9..dc0967ef61ef 100644
--- a/pkgs/development/libraries/enchant/default.nix
+++ b/pkgs/development/libraries/enchant/default.nix
@@ -2,20 +2,21 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
- version = "1.6.0";
+ version = "1.6.1";
pname = "enchant";
src = fetchurl {
- url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
- sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g";
+ url = "https://github.com/AbiWord/${pname}/releases/download/${pname}-1-6-1/${name}.tar.gz";
+ sha256 = "1xg3m7mniyqyff8qv46jbfwgchb6di6qxdjnd5sfir7jzv0dkw5y";
};
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;
+ homepage = https://abiword.github.io/enchant;
+ platforms = platforms.unix;
+ license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index cc62b2776ede..7c3dd19a4795 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 6f50b9d262b5..8f38ee27174b 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 ac2c21d4cf0e..3bc5270f0537 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 020d04542864..e884bb41e20e 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base
-, gst-python, gupnp-igd, gobjectIntrospection
+, gst-python, gupnp-igd, gobject-introspection
, gst-plugins-good, gst-plugins-bad, gst-libav
}:
@@ -17,17 +17,17 @@ in stdenv.mkDerivation rec {
buildInputs = [ libnice python pygobject2 gupnp-igd libnice ];
- nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig gobject-introspection ];
propagatedBuildInputs = [
gstreamer gst-plugins-base gst-python
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 660cdfa6414b..49e929821f7f 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 7d72de2a2ded..d11ef732a01f 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 fb74c4ff4d24..504b58b6aa4d 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 6591b13834e0..41ab930a30ed 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,36 +1,41 @@
{ 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
+, gobject-introspection, 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.5";
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 = "1wj88lp23bzz0c5n1i84nr2xff572i5cc10fqd9xh7qhj3ivk1w0";
};
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
];
nativeBuildInputs = [
- autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
+ autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobject-introspection
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 000000000000..49fcaa2b3f9b
--- /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 3f4bc56721ee..d00e4fa7f895 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 e855902a9301..408198bda5cb 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/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix
new file mode 100644
index 000000000000..5d6397c6a1b6
--- /dev/null
+++ b/pkgs/development/libraries/fltk/1.4.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
+, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
+, libtiff, freetype, cf-private, Cocoa, AGL, GLUT
+}:
+
+let
+ version = "1.4.x-r13121";
+in stdenv.mkDerivation {
+ name = "fltk-${version}";
+
+ src = fetchurl {
+ url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
+ sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
+ };
+
+ preConfigure = "make clean";
+
+ patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [
+ libGLU_combined
+ libjpeg
+ zlib
+ libpng
+ libXft
+ ];
+
+ configureFlags = [
+ "--enable-gl"
+ "--enable-largefile"
+ "--enable-shared"
+ "--enable-threads"
+ "--enable-xft"
+ ];
+
+ propagatedBuildInputs = [ inputproto ]
+ ++ (if stdenv.isDarwin
+ then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
+ else [ xlibsWrapper libXi freeglut ]);
+
+ enableParallelBuilding = true;
+
+ meta = {
+ description = "A C++ cross-platform lightweight GUI library";
+ homepage = http://www.fltk.org;
+ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+ license = stdenv.lib.licenses.gpl2;
+ };
+
+}
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index 405d80031e37..b1c798476ead 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
-, darwin, libtiff, freetype
+, libtiff, freetype, cf-private, Cocoa, AGL, GLUT
}:
let
@@ -35,7 +35,7 @@ in stdenv.mkDerivation {
propagatedBuildInputs = [ inputproto ]
++ (if stdenv.isDarwin
- then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff])
+ then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
else [ xlibsWrapper libXi freeglut ]);
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
new file mode 100644
index 000000000000..6c535c3b51f3
--- /dev/null
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, enableShared ? true }:
+
+stdenv.mkDerivation rec {
+ version = "5.2.1";
+ name = "fmt-${version}";
+
+ src = fetchFromGitHub {
+ owner = "fmtlib";
+ repo = "fmt";
+ rev = "${version}";
+ sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk";
+ };
+
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/fmtlib/fmt/commit/9d0c9c4bb145a286f725cd38c90331eee7addc7f.patch";
+ sha256 = "1gy93mb1s1mq746kxj4c564k2mppqp5khqdfa6im88rv29cvrl4y";
+ })
+ ];
+
+ 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 d188cb9810a7..1598dafaad05 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, libevent
-, double-conversion, glog, google-gflags, python, libiberty, openssl }:
+{ stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog
+, google-gflags, libiberty, openssl }:
stdenv.mkDerivation rec {
name = "folly-${version}";
- version = "2018.08.13.00";
+ version = "2018.10.29.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "1lhq3l7rirhi4vwgiym0r3rff1i69c7bdpi1hm8r4axs2dfjvxdr";
+ sha256 = "0bbp4w8wbawh3ilgkl7rwvbqkdczpvfn92f9lcvxj8sili0nldab";
};
- nativeBuildInputs = [ autoreconfHook python pkgconfig ];
- buildInputs = [ libiberty boost libevent double-conversion glog google-gflags openssl ];
+ nativeBuildInputs = [ cmake ];
- postPatch = "cd folly";
- preBuild = ''
- patchShebangs build
- '';
-
- configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+ # See CMake/folly-deps.cmake in the Folly source tree.
+ buildInputs = [
+ boost
+ double-conversion
+ glog
+ google-gflags
+ libevent
+ libiberty
+ openssl
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 1a028526726c..f730e3e3408f 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
propagatedBuildInputs = [ freetype ];
- nativeBuildInputs = [ pkgconfig gperf ];
+ nativeBuildInputs = [ pkgconfig gperf libxslt ];
buildInputs = [ expat ];
configureFlags = [
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
postInstall = ''
cd "$out/etc/fonts"
- "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${dejavu_fonts.minimal}" \
+ xsltproc --stringparam fontDirectories "${dejavu_fonts.minimal}" \
--stringparam fontconfigConfigVersion "${configVersion}" \
--path $out/share/xml/fontconfig \
${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \
@@ -77,4 +77,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.vcunat ];
};
}
-
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 76e89b97617e..1c88235b9257 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -3,6 +3,7 @@
runCommand "fc-cache"
rec {
buildInputs = [ fontconfig.bin ];
+ preferLocalBuild = true;
passAsFile = [ "fontDirs" ];
fontDirs = ''
@@ -27,5 +28,5 @@ runCommand "fc-cache"
# This is not a cache dir in the normal sense -- it won't be automatically
# recreated.
- rm "$out/CACHEDIR.TAG"
+ rm -f "$out/CACHEDIR.TAG"
''
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 8dd78c41b14a..40430f34334c 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/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 4f07316bd3f1..03324d548991 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig
, openssl
-, odbcSupport ? false, unixODBC ? null }:
+, odbcSupport ? true, unixODBC ? null }:
assert odbcSupport -> unixODBC != null;
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
stdenv.mkDerivation rec {
name = "freetds-${version}";
- version = "1.00.94";
+ version = "1.00.104";
src = fetchurl {
url = "http://www.freetds.org/files/stable/${name}.tar.bz2";
- sha256 = "1r03ns0jp2sbbivys5bks376vbdqbnx8v764kjh74gpbajjmkksz";
+ sha256 = "0mlg027mppv2348f4wwdpxpac9baqkdsg7xqx21kyx5dx5kmr71g";
};
buildInputs = [
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index fce052aeb223..5a11d03c5917 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/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 08b0a87e3e20..b60f4be245e2 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchurl
+, fetchpatch
, meson
, ninja
@@ -21,6 +22,13 @@ stdenv.mkDerivation rec {
sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/fribidi/fribidi/pull/88.patch";
+ sha256 = "1n4l6333vhbxfckwg101flmvq6bbygg66fjp69ddcjqaqb6gh9k9";
+ })
+ ];
+
postPatch = ''
patchShebangs test
'';
diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix
new file mode 100644
index 000000000000..68f3c9d0ee59
--- /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/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix
index 5a21af6a2b33..58356f0bc676 100644
--- a/pkgs/development/libraries/ganv/default.nix
+++ b/pkgs/development/libraries/ganv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python }:
+{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "ganv-unstable-${rev}";
@@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ graphviz gtk2 gtkmm2 python ];
- configurePhase = "${python.interpreter} waf configure --prefix=$out";
-
- buildPhase = "${python.interpreter} waf";
-
- installPhase = "${python.interpreter} waf install";
-
meta = with stdenv.lib; {
description = "An interactive Gtk canvas widget for graph-based interfaces";
homepage = http://drobilla.net;
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
index dc0ca5fffa3a..0b5f1002c234 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig
+{ stdenv, fetchurl, gettext, gobject-introspection, pkgconfig
, meson, ninja, glibcLocales, git, vala, glib, zlib
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0l19sr6pg0cfcddmi5n79d08mjjbhn427ip5jlsy9zddq9r24aqr";
};
- nativeBuildInputs = [ meson ninja glibcLocales git pkgconfig vala gettext gobjectIntrospection ];
+ nativeBuildInputs = [ meson ninja glibcLocales git pkgconfig vala gettext gobject-introspection ];
buildInputs = [ glib zlib ];
diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
index f8397052b770..4762d1fb119f 100644
--- a/pkgs/development/libraries/gcc/libstdc++/5.nix
+++ b/pkgs/development/libraries/gcc/libstdc++/5.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://gcc.gnu.org/;
+ homepage = https://gcc.gnu.org/;
license = licenses.lgpl3Plus;
description = "GNU Compiler Collection, version ${version} -- C++ standard library";
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index f6d8cd6fa4c2..642063220b2c 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 685775e2918d..9b1fc2b4ac56 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.1";
+ # FIXME: remove on update to > 1.18.1
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 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6";
};
doCheck = true; # not cross;
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
package also provides traditional dbm and ndbm interfaces.
'';
- homepage = http://www.gnu.org/software/gdbm/;
+ homepage = https://www.gnu.org/software/gdbm/;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index cba31f45d557..91c384b249a4 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, vtk }:
stdenv.mkDerivation rec {
- version = "2.8.7";
+ version = "2.8.8";
name = "gdcm-${version}";
src = fetchurl {
url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
- sha256 = "1psl4r0i3hfhjjm9y8q5ml9lnlal4212bm8df21087dddi9nfl62";
+ sha256 = "1iwfrk04sd22wkr1ivbg8gixl34fv9zfzwnfqvrq121nadb0s29b";
};
dontUseCmakeBuildDir = true;
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 3fb50e98c1c8..20f05d28bfe4 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,25 +1,16 @@
-{ stdenv, fetchurl, fetchFromGitLab, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
+, jasper, gobject-introspection, doCheck ? false, makeWrapper }:
let
pname = "gdk-pixbuf";
- version = "2.36.12";
-in
-stdenv.mkDerivation rec {
+ version = "2.38.0";
+in stdenv.mkDerivation rec {
name = "${pname}-${version}";
- # 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";
- # sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
- # };
- src = fetchFromGitLab {
- domain = "gitlab.gnome.org";
- owner = "GNOME";
- repo = "gdk-pixbuf";
- rev = version;
- sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
+ src = fetchurl {
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "0ixfmnxjylx06mjaw116apymwi1a8rnkmkbbvqaxxg2pfwy9fl6x";
};
patches = [
@@ -28,21 +19,13 @@ stdenv.mkDerivation rec {
# For now, we are patching the build script to avoid the dependency.
./no-mime-sniffing.patch
- # Fix installed tests with meson
- # https://bugzilla.gnome.org/show_bug.cgi?id=795527
- (fetchurl {
- url = https://bugzilla.gnome.org/attachment.cgi?id=371381;
- sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn";
- })
-
- # Add missing test file bug753605-atsize.jpg
- (fetchpatch {
- url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch;
- sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0";
- })
-
# Move installed tests to a separate output
./installed-tests-path.patch
+
+ (fetchpatch {
+ url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch;
+ sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92";
+ })
];
outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
@@ -54,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
- gtk-doc gobjectIntrospection makeWrapper
+ gtk-doc gobject-introspection makeWrapper
]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
@@ -64,7 +47,7 @@ stdenv.mkDerivation rec {
"-Ddocs=true"
"-Djasper=true"
"-Dx11=true"
- "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
+ "-Dgir=${if gobject-introspection != null then "true" else "false"}"
];
postPatch = ''
@@ -99,6 +82,10 @@ stdenv.mkDerivation rec {
done
'';
+ preInstall = ''
+ PATH=$PATH:$out/bin # for install script
+ '';
+
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
inherit doCheck;
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index c8b7b3b8eca5..cb7f2621353d 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -3,7 +3,7 @@
, libwebp, gnome3, libintl }:
let
- version = "0.4.8";
+ version = "0.4.12";
in stdenv.mkDerivation rec {
name = "gegl-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
- sha256 = "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i";
+ sha256 = "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 56d8cd21f844..e1f243f8fd3b 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -7,7 +7,7 @@
, evemu
, frame
, gdk_pixbuf
-, gobjectIntrospection
+, gobject-introspection
, grail
, gtk3
, libX11
@@ -29,13 +29,15 @@ 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 ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython];
- buildInputs = [ atk dbus evemu frame gdk_pixbuf gobjectIntrospection grail
+ buildInputs = [ atk dbus evemu frame gdk_pixbuf gobject-introspection grail
gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
];
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index da7041b6786f..f2eeb9ae40b8 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, fetchpatch, intltool, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
-, modemmanager, avahi, glib-networking, wrapGAppsHook, gobjectIntrospection
+{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
+, modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala
, withDemoAgent ? false
}:
@@ -7,17 +7,20 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "geoclue-${version}";
- version = "2.4.12";
+ version = "2.5.1";
- src = fetchurl {
- url = "https://www.freedesktop.org/software/geoclue/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1jnad1f3rf8h05sz1lc172jnqdhqdpz76ff6m7i5ss3s0znf5l05";
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "geoclue";
+ repo = "geoclue";
+ rev = version;
+ sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs";
};
outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [
- pkgconfig intltool wrapGAppsHook gobjectIntrospection
+ pkgconfig intltool meson ninja wrapGAppsHook python3 vala gobject-introspection
# devdoc
gtk-doc docbook_xsl docbook_xml_dtd_412
];
@@ -30,26 +33,20 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib glib-networking ];
- # Whitelist elementary's agent
- patches = [
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2b0491e408be1ebcdbe8751bb2637c1acb78f71e.patch";
- sha256 = "0pac94y55iksk340dlx3gkhb9lrci90mxqqy5fnh1zbjw9bqxfn4";
- })
+ mesonFlags = [
+ "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
+ "-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
+ ] ++ optionals stdenv.isDarwin [
+ "-D3g-source=false"
+ "-Dcdma-source=false"
+ "-Dmodem-gps-source=false"
+ "-Dnmea-source=false"
];
- configureFlags = [
- "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
- "--enable-introspection"
- "--enable-gtk-doc"
- "--enable-demo-agent=${if withDemoAgent then "yes" else "no"}"
- ] ++ optionals stdenv.isDarwin [
- "--disable-silent-rules"
- "--disable-3g-source"
- "--disable-cdma-source"
- "--disable-modem-gps-source"
- "--disable-nmea-source"
- ];
+ postPatch = ''
+ chmod +x demo/install-file.py
+ patchShebangs demo/install-file.py
+ '';
meta = with stdenv.lib; {
description = "Geolocation framework and some data providers";
diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index c1b4c88aa479..2417af3dbfd8 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 4531a5a01d4c..8ed898813aef 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";
@@ -74,7 +75,7 @@ stdenv.mkDerivation rec {
GNU packages produce multi-lingual messages.
'';
- homepage = http://www.gnu.org/software/gettext/;
+ homepage = https://www.gnu.org/software/gettext/;
maintainers = with maintainers; [ zimbatm vrthra ];
license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix
index 357ca751ccf1..6336d30aebad 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 bafd6be37df6..93948a1b0d67 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.7";
name = "libgit2-${version}";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
- sha256 = "1cmc8ldhpyp62pswb7dmjjya3ng0ssaggcsxs1labvp6xyxjvp6s";
+ sha256 = "1q3mp7xjpbmdsnk4sdzf2askbb4pgbxcmr1h7y7zk2738dndwkha";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];
diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix
index 339e0d8d60b9..60778df663a0 100644
--- a/pkgs/development/libraries/glbinding/default.nix
+++ b/pkgs/development/libraries/glbinding/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "glbinding";
- version = "2.1.4";
+ version = "3.0.2";
src = fetchFromGitHub {
owner = "cginternals";
repo = pname;
rev = "v${version}";
- sha256 = "1yic3p2iqzxc7wrjnqclx7vcaaqx5fiysq9rqbi6v390jqkg3zlz";
+ sha256 = "1lvcps0n0p8gg0p2bkm5aq4b4kv8bvxlaaf4fcham2pgbgzil9d4";
};
buildInputs = [ cmake libGLU xlibsWrapper ];
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 8d4d4d10038a..668fe436e915 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11
-, darwin, fixDarwinDylibNames
+, cf-private, Cocoa, Kernel, fixDarwinDylibNames
}:
stdenv.mkDerivation rec {
@@ -21,10 +21,18 @@ stdenv.mkDerivation rec {
buildInputs = [
libX11 libXrandr libXinerama libXcursor
- ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]);
+ ] ++ lib.optionals stdenv.isDarwin [
+ Cocoa Kernel fixDarwinDylibNames
+ # Needed for NSDefaultRunLoopMode symbols.
+ cf-private
+ ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+ preConfigure = lib.optional (!stdenv.isDarwin) ''
+ substituteInPlace src/glx_context.c --replace "libGL.so.1" "${lib.getLib libGL}/lib/libGL.so.1"
+ '';
+
meta = with stdenv.lib; {
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
homepage = http://www.glfw.org/;
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 3deaf28373dd..e8105ef08237 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -1,28 +1,20 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, glib, gettext, gnutls, p11-kit, libproxy, gnome3
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gettext, python3, gnutls, p11-kit, libproxy, gnome3
, gsettings-desktop-schemas }:
let
pname = "glib-networking";
- version = "2.56.0";
+ version = "2.58.0";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "14vw8xwajd7m31bpavg2psk693plhjikwpk8bzf3jl1fmsy11za7";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx";
};
outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs
- patches = [
- # Use GNUTLS system trust for certificates
- (fetchpatch {
- url = https://gitlab.gnome.org/GNOME/glib-networking/commit/f1c8feee014007cc913b71357acb609f8d1200df.patch;
- sha256 = "1rbxqsrcb5if3xs2d18pqzd9xnjysdj715ijc41n5w326fsawg7i";
- })
- ];
-
PKG_CONFIG_GIO_2_0_GIOMODULEDIR = "${placeholder "out"}/lib/gio/modules";
postPatch = ''
@@ -30,7 +22,10 @@ stdenv.mkDerivation rec {
patchShebangs meson_post_install.py
'';
- nativeBuildInputs = [ meson ninja pkgconfig gettext ];
+ nativeBuildInputs = [
+ meson ninja pkgconfig gettext
+ python3 # install_script
+ ];
propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ];
doCheck = false; # tests need to access the certificates (among other things)
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 428b9ee482ec..1eb50fc4f100 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, gettext, pkgconfig, perl, python
-, libiconv, zlib, libffi, pcre, libelf, gnome3
+{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales
+, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
, utillinuxMinimal ? null
@@ -43,15 +43,15 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
'';
- version = "2.56.0";
+ version = "2.58.1";
in
stdenv.mkDerivation rec {
name = "glib-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/glib/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1iqgi90fmpl3l23jm2iv44qp7hqsxvnv7978s18933bvx4bnxvzc";
+ url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp";
};
patches = optional stdenv.isDarwin ./darwin-compilation.patch
@@ -59,57 +59,71 @@ stdenv.mkDerivation rec {
++ optionals stdenv.hostPlatform.isMusl [
./quark_init_on_demand.patch
./gobject_init_on_demand.patch
- ] ++ [ ./schema-override-variable.patch ];
+ ] ++ [
+ ./schema-override-variable.patch
+ # Require substituteInPlace in postPatch
+ ./fix-gio-launch-desktop-path.patch
+ ];
- outputs = [ "out" "dev" "devdoc" ];
+ outputs = [ "bin" "out" "dev" "devdoc" ];
outputBin = "dev";
setupHook = ./setup-hook.sh;
- buildInputs = [ libelf setupHook pcre ]
- ++ optionals stdenv.isLinux [ utillinuxMinimal ]; # for libmount
+ buildInputs = [
+ libelf setupHook pcre
+ bash gnum4 # install glib-gettextize and m4 macros for other apps to use
+ ] ++ optionals stdenv.isLinux [
+ libselinux
+ utillinuxMinimal # for libmount
+ ];
- nativeBuildInputs = [ pkgconfig perl python gettext ];
+ nativeBuildInputs = [ meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales ];
propagatedBuildInputs = [ zlib libffi gettext libiconv ];
- # internal pcre would only add <200kB, but it's relatively common
- configureFlags = [ "--with-pcre=system" ]
- ++ optional stdenv.isDarwin "--disable-compile-warnings"
- ++ optional stdenv.isSunOS "--disable-dtrace"
- # Can't run this test when cross-compiling
- ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)
- [ "glib_cv_stack_grows=no" "glib_cv_uscore=no" ]
- # GElf only supports elf64 hosts
- ++ optional (!stdenv.hostPlatform.is64bit) "--disable-libelf";
+ mesonFlags = [
+ "-Dgtk_doc=true"
+ ];
+
+ LC_ALL = "en_US.UTF-8";
NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP";
- preConfigure = optionalString stdenv.isSunOS ''
- sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
- '';
+ postPatch = ''
+ substituteInPlace meson.build --replace "install_dir : 'bin'," "install_dir : glib_bindir,"
- postConfigure = ''
- patchShebangs ./gobject/
+ # substitute fix-gio-launch-desktop-path.patch
+ substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin"
+
+ chmod +x gio/tests/gengiotypefuncs.py
+ patchShebangs gio/tests/gengiotypefuncs.py
+ patchShebangs glib/gen-unicode-tables.pl
+ patchShebangs tests/gen-casefold-txt.py
+ patchShebangs tests/gen-casemap-txt.py
'';
LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}";
LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf";
- preBuild = optionalString stdenv.isDarwin ''
- export MACOSX_DEPLOYMENT_TARGET=
- '';
-
- enableParallelBuilding = true;
DETERMINISTIC_BUILD = 1;
postInstall = ''
+ mkdir -p $bin/bin
+ for app in gapplication gdbus gio gsettings; do
+ mv "$dev/bin/$app" "$bin/bin"
+ done
+
+ # Add gio-launch-desktop to $out so we can refer to it from $dev
+ mkdir $out/bin
+ mv "$dev/bin/gio-launch-desktop" "$out/bin/"
+ ln -s "$out/bin/gio-launch-desktop" "$bin/bin/"
+
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/glib/fix-gio-launch-desktop-path.patch b/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch
new file mode 100644
index 000000000000..4fdec2dd7e7d
--- /dev/null
+++ b/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch
@@ -0,0 +1,11 @@
+--- a/gio/gdesktopappinfo.c
++++ b/gio/gdesktopappinfo.c
+@@ -2725,7 +2725,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
+
+ /* Fall back on usual searching in $PATH */
+ if (tmp == NULL)
+- tmp = "gio-launch-desktop";
++ tmp = "@bindir@/gio-launch-desktop";
+ g_once_init_leave (&gio_launch_desktop_path, tmp);
+ }
+
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index 233845c6541f..5275529991f7 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -9,7 +9,7 @@ addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas
# Install gschemas, if any, in a package-specific directory
glibPreInstallPhase() {
- installFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
+ makeFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
}
preInstallPhases+=" glibPreInstallPhase"
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index a7a4c2fbacdb..50d8c6e268c2 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison ];
- buildInputs = lib.optionals withGd [ gd libpng ];
+ buildInputs = [ 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
@@ -187,7 +187,7 @@ stdenv.mkDerivation ({
doCheck = false; # fails
meta = {
- homepage = http://www.gnu.org/software/libc/;
+ homepage = https://www.gnu.org/software/libc/;
description = "The GNU C Library";
longDescription =
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 8b17ff9e5585..27a1267f0cfe 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -10,6 +10,12 @@ callPackage ./common.nix { inherit stdenv; } {
inherit withLinuxHeaders profilingLibraries installLocales withGd;
+ # Note:
+ # Things you write here override, and do not add to,
+ # the values in `common.nix`.
+ # (For example, if you define `patches = [...]` here, it will
+ # override the patches in `common.nix`.)
+
NIX_NO_SELF_RPATH = true;
postConfigure = ''
@@ -29,7 +35,10 @@ callPackage ./common.nix { inherit stdenv; } {
# The stackprotector and fortify hardening flags are autodetected by glibc
# and enabled by default if supported. Setting it for every gcc invocation
# does not work.
- hardeningDisable = [ "stackprotector" "fortify" ];
+ hardeningDisable = [ "stackprotector" "fortify" ]
+ # XXX: Not actually musl-speciic but since only musl enables pie by default,
+ # limit rebuilds by only disabling pie w/musl
+ ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie";
# When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
# any program we run, because the gcc will have been placed at a new
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 481ae32bdc61..1d35c0696d27 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
programming language and organized in the form of a library.
'';
- homepage = http://www.gnu.org/software/glpk/;
+ homepage = https://www.gnu.org/software/glpk/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ bjg timokau ];
diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix
index b25f5c90bfae..1c6dfc4a8524 100644
--- a/pkgs/development/libraries/gmime/2.nix
+++ b/pkgs/development/libraries/gmime/2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, libgpgerror, gobject-introspection }:
stdenv.mkDerivation rec {
version = "2.6.23";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig gobject-introspection ];
propagatedBuildInputs = [ glib zlib libgpgerror ];
configureFlags = [ "--enable-introspection=yes" ];
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 65c99610a5c7..d036140567fe 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, gobject-introspection }:
stdenv.mkDerivation rec {
- version = "3.2.0";
+ version = "3.2.3";
name = "gmime-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
- sha256 = "1q6palbpf6lh6bvy9ly26q5apl5k0z0r4mvl6zzqh90rz4rn1v3m";
+ sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a";
};
outputs = [ "out" "dev" ];
- buildInputs = [ gobjectIntrospection zlib gpgme libidn ];
+ buildInputs = [ gobject-introspection 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 7f8a2276ef25..6423e1fce981 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/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix
index a14d7486e96f..3f0fcafa4475 100644
--- a/pkgs/development/libraries/gnu-config/default.nix
+++ b/pkgs/development/libraries/gnu-config/default.nix
@@ -5,11 +5,11 @@ let
# Don't use fetchgit as this is needed during Aarch64 bootstrapping
configGuess = fetchurl {
- url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
+ url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv";
};
configSub = fetchurl {
- url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
+ url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc";
};
in
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Attempt to guess a canonical system name";
- homepage = http://savannah.gnu.org/projects/config;
+ homepage = https://savannah.gnu.org/projects/config;
license = licenses.gpl3;
# In addition to GPLv3:
# As a special exception to the GNU General Public License, if you
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 1f8a518d69e4..036863c9c0bf 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnu-efi-${version}";
- version = "3.0.8";
+ version = "3.0.9";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
- sha256 = "08mpw8s79azip9jbzm6msq0999pnkqzd82axydrcyyynm276s03n";
+ sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7";
};
buildInputs = [ pciutils ];
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
index a81cd91fdc76..d1d3c8575b0f 100644
--- a/pkgs/development/libraries/gnutls-kdh/generic.nix
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
[ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
# Build of the Guile bindings is not parallel-safe. See
- #
+ #
# for the actual fix. Also an apparent race in the generation of
# systemkey-args.h.
enableParallelBuilding = false;
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 081d896a6e0b..052438241426 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
tampering, or message forgery."
'';
- homepage = http://www.gnu.org/software/gnutls/;
+ homepage = https://www.gnu.org/software/gnutls/;
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ eelco wkennington fpletz ];
platforms = platforms.all;
diff --git a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
index f7e1bedd3e18..d4160b51d68c 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch
@@ -2,10 +2,10 @@
+++ b/gir/cairo-1.0.gir.in
@@ -5,7 +5,7 @@
xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-
+
0:
+ if len(patterns) > 0:
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
-@@ -113,17 +113,11 @@
+@@ -116,17 +116,11 @@
if dlname is None:
return None
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f5ab5005bad4..3dc66aec1595 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,37 +1,38 @@
-{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
-, libintl, cctools, cairo, gnome3
+{ stdenv, fetchurl, glib, flex, bison, meson, ninja, pkgconfig, libffi, python3
+, libintl, cctools, cairo, gnome3, glibcLocales, fetchpatch
, substituteAll, nixStoreDir ? builtins.storeDir
, x11Support ? true
}:
-# now that gobjectIntrospection creates large .gir files (eg gtk3 case)
+# now that gobject-introspection creates large .gir files (eg gtk3 case)
# it may be worth thinking about using multiple derivation outputs
# In that case its about 6MB which could be separated
let
pname = "gobject-introspection";
- version = "1.56.0";
+ version = "1.58.1";
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1y50pbn5qqbcv2h9rkz96wvv5jls2gma9bkqjq6wapmaszx5jw0d";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "12fzs3044047icdfs7cb2lsmnfi6w6fyhkci3m2rbvf5llgnhm29";
};
- outputs = [ "out" "dev" ];
+ outputs = [ "out" "dev" "man" ];
outputBin = "dev";
- outputMan = "dev"; # tiny pages
- nativeBuildInputs = [ pkgconfig libintl ];
- buildInputs = [ flex bison python setupHook/*move .gir*/ ]
+ LC_ALL = "en_US.UTF-8"; # for tests
+
+ nativeBuildInputs = [ meson ninja pkgconfig libintl glibcLocales ];
+ buildInputs = [ flex bison python3 setupHook/*move .gir*/ ]
++ stdenv.lib.optional stdenv.isDarwin cctools;
propagatedBuildInputs = [ libffi glib ];
- preConfigure = ''
- sed 's|/usr/bin/env ||' -i tools/g-ir-tool-template.in
- '';
+ mesonFlags = [
+ "--datadir=${placeholder "dev"}/share"
+ ];
# outputs TODO: share/gobject-introspection-1.0/tests is needed during build
# by pygobject3 (and maybe others), but it's only searched in $out
@@ -39,6 +40,11 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
patches = [
+ ./macos-shared-library.patch
+ (substituteAll {
+ src = ./test_shlibs.patch;
+ inherit nixStoreDir;
+ })
(substituteAll {
src = ./absolute_shlib_path.patch;
inherit nixStoreDir;
@@ -49,12 +55,11 @@ stdenv.mkDerivation rec {
cairoLib = "${getLib cairo}/lib";
});
- doCheck = false; # fails
+ doCheck = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
- attrPath = "gobjectIntrospection";
};
};
@@ -63,6 +68,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/gobject-introspection/macos-shared-library.patch b/pkgs/development/libraries/gobject-introspection/macos-shared-library.patch
new file mode 100644
index 000000000000..9941878c427b
--- /dev/null
+++ b/pkgs/development/libraries/gobject-introspection/macos-shared-library.patch
@@ -0,0 +1,36 @@
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index c93d20c..4d4915d 100644
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -43,6 +43,22 @@ def _resolve_libtool(options, binary, libraries):
+
+ return shlibs
+
++def _sanitize_install_name(install_name):
++ '''
++ On macOS, the dylib can be built with install_name as @rpath/libfoo.so
++ instead of the absolute path to the library, so handle that. The name
++ can also be @loader_path or @executable_path.
++ '''
++ if not install_name.startswith('@'):
++ return install_name
++ if install_name.startswith('@rpath/'):
++ return install_name[7:]
++ if install_name.startswith('@loader_path/'):
++ return install_name[13:]
++ if install_name.startswith('@executable_path/'):
++ return install_name[17:]
++ raise RuntimeError('Unknown install_name {!r}'.format(install_name))
++
+
+ # Assume ldd output is something vaguely like
+ #
+@@ -136,7 +152,7 @@ def resolve_from_ldd_output(libraries, output, basename=False):
+ m = pattern.match(word)
+ if m:
+ del patterns[library]
+- shlibs.append(m.group())
++ shlibs.append(_sanitize_install_name(m.group()))
+ break
+
+ if len(patterns) > 0:
diff --git a/pkgs/development/libraries/gobject-introspection/test_shlibs.patch b/pkgs/development/libraries/gobject-introspection/test_shlibs.patch
new file mode 100644
index 000000000000..c3152982d199
--- /dev/null
+++ b/pkgs/development/libraries/gobject-introspection/test_shlibs.patch
@@ -0,0 +1,50 @@
+--- a/tests/scanner/test_shlibs.py
++++ b/tests/scanner/test_shlibs.py
+@@ -10,6 +10,46 @@ from giscanner.shlibs import resolve_from_ldd_output
+
+ class TestLddParser(unittest.TestCase):
+
++ def test_resolve_from_ldd_output_nix(self):
++ output = '''\
++ libglib-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0 (0x00007f0ee1b28000)
++ libgobject-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgobject-2.0.so.0 (0x00007f0ee18cf000)
++ libgio-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0 (0x00007f0ee1502000)
++ libxml2.so.2 => @nixStoreDir@/72mxkk74cv266snkjpz1kwl1i2rg8rpc-libxml2-2.9.8/lib/libxml2.so.2 (0x00007f0ee119c000)
++ libsqlite3.so.0 => @nixStoreDir@/ck5ay23hsmlc67pg3m34kzd1k2hhvww0-sqlite-3.24.0/lib/libsqlite3.so.0 (0x00007f0ee0e98000)
++ libpsl.so.5 => @nixStoreDir@/qn3l2gn7m76f318676wflrs2z6d4rrkj-libpsl-0.20.2-list-2017-02-03/lib/libpsl.so.5 (0x00007f0ee0c88000)
++ libc.so.6 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libc.so.6 (0x00007f0ee08d4000)
++ libpcre.so.1 => @nixStoreDir@/hxbq8lpc53qsf1bc0dfcsm47wmcxzjvh-pcre-8.42/lib/libpcre.so.1 (0x00007f0ee0662000)
++ @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib64/ld-linux-x86-64.so.2 (0x00007f0ee20ff000)
++ libblkid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libblkid.so.1 (0x00007f0edd0cd000)
++ libuuid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libuuid.so.1 (0x00007f0edcec5000)
++ librt.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/librt.so.1 (0x00007f0edccbd000)
++ libstdc++.so.6 => @nixStoreDir@/3v5r7fkrbkw2qajadvjbf6p6qriz9p1i-gcc-7.3.0-lib/lib/libstdc++.so.6 (0x00007f0edc936000)
++ libgcc_s.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libgcc_s.so.1 (0x00007f0edc720000)
++ '''
++ libraries = ['glib-2.0', 'gio-2.0']
++
++ self.assertEqual(
++ ['@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0',
++ '@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0'],
++ resolve_from_ldd_output(libraries, output, basename=False))
++
++ def test_resolve_from_ldd_output_macos(self):
++ output = '''\
++ @rpath/libatk-1.0.0.dylib
++ @rpath/libgstreamer-1.0.0.dylib (compatibility version 0.0.0, current version 0.0.0)
++ /Volumes/USB_SSD/cerbero/build/dist/darwin_x86_64/lib/libglib-2.0.0.dylib (compatibility version 0.0.0, current version 0.0.0)
++ /Volumes/USB_SSD/cerbero/build/dist/darwin_x86_64/lib/libintl.dylib (compatibility version 0.0.0, current version 0.0.0)
++ /Volumes/USB_SSD/cerbero/build/dist/darwin_x86_64/lib/libgobject-2.0.0.dylib (compatibility version 0.0.0, current version 0.0.0)
++ /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1252.50.4)
++ '''
++ libraries = ['atk-1.0']
++ fallback_libpath = '@nixStoreDir@/1ynd5b01z87c1nw75k5iy7sq49hpkw53-atk-2.30.0/lib'
++
++ self.assertEqual(
++ [ '%s/libatk-1.0.0.dylib' % fallback_libpath ],
++ resolve_from_ldd_output(libraries, output, basename=False, fallback_libpath=fallback_libpath))
++
+ def test_resolve_from_ldd_output(self):
+ output = '''\
+ libglib-2.0.so.0 => /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 (0x00007fbe12d68000)
+
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 6155b8b18bd0..4795f45812b2 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/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index ef36a9c076fb..99b1307179a5 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobjectIntrospection, python2, gtk3, cairo, glib }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }:
let
version = "2.0.4";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ];
- buildInputs = [ gtk3 cairo glib gobjectIntrospection ];
+ buildInputs = [ gtk3 cairo glib gobject-introspection ];
configureFlags = [
"--disable-python"
diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix
index dbcb0342156b..a6f062b8126a 100644
--- a/pkgs/development/libraries/google-gflags/default.nix
+++ b/pkgs/development/libraries/google-gflags/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "google-gflags-${version}";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "gflags";
repo = "gflags";
rev = "v${version}";
- sha256 = "12wkihc4f07qmhyqk3cjylj8v5xz2bjrq75p7aq1vvvj60fbp58k";
+ sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 71fe23ea6b0d..44086538cd04 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/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index 1ee0970ffad2..2113b4f690bb 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
+{ stdenv, fetchFromGitHub, cmake, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext }:
stdenv.mkDerivation rec {
- name = "granite-${version}";
- version = "5.1.0";
+ pname = "granite";
+ version = "5.2.1";
+
+ name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "elementary";
- repo = "granite";
+ repo = pname;
rev = version;
- sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40";
+ sha256 = "18rw1lv6zk5w2cq8bv6b869z3cdikn9gzk30gw1s9f8n06bh737h";
};
cmakeFlags = [
@@ -19,12 +21,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
gettext
- gobjectIntrospection
+ gobject-introspection
ninja
- perl
pkgconfig
- vala_0_40
+ vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
];
+
buildInputs = [
glib
gnome3.libgee
@@ -33,9 +35,12 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An extension to GTK+ used by elementary OS";
- longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS.";
+ longDescription = ''
+ Granite is a companion library for GTK+ and GLib. Among other things, it provides complex widgets and convenience functions
+ designed for use in apps built for elementary OS.
+ '';
homepage = https://github.com/elementary/granite;
- license = licenses.lgpl3;
+ license = licenses.lgpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ vozz worldofpeace ];
};
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index aa670cd4c86b..52c087b19147 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 9dde67b5c795..1446e339745e 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 7f680b6b59bf..938a47a40374 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.16.1";
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 = "v${version}";
+ sha256 = "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
@@ -24,6 +26,8 @@ stdenv.mkDerivation rec {
rm -vf BUILD
'';
+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option";
+
enableParallelBuilds = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 71da2c716f84..899aa116b2ca 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-gssapi-impl=mit" ];
- doCheck = true;
+ doCheck = !stdenv.hostPlatform.isDarwin;
meta = {
description = "GNU SASL, Simple Authentication and Security Layer library";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
(e.g. IMAP, SMTP, etc.) to authenticate peers.
'';
- homepage = http://www.gnu.org/software/gsasl/;
+ homepage = https://www.gnu.org/software/gsasl/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ shlevy ];
diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix
index 9e893932a64c..3f9cd8120d89 100644
--- a/pkgs/development/libraries/gsettings-qt/default.nix
+++ b/pkgs/development/libraries/gsettings-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchbzr, pkgconfig, qmake, qtbase, qtdeclarative, glib, gobjectIntrospection }:
+{ stdenv, fetchbzr, pkgconfig, qmake, qtbase, qtdeclarative, glib, gobject-introspection }:
stdenv.mkDerivation rec {
name = "gsettings-qt-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkgconfig
qmake
- gobjectIntrospection
+ gobject-introspection
];
buildInputs = [
diff --git a/pkgs/development/libraries/gsignond/conf.patch b/pkgs/development/libraries/gsignond/conf.patch
new file mode 100644
index 000000000000..0aa2034e3996
--- /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 000000000000..a81e72bf66fb
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, glib, glib-networking
+, sqlite, gobject-introspection, 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 = "1.2.0";
+
+ outputs = [ "out" "dev" "devdoc" ];
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = pname;
+ rev = version;
+ sha256 = "17cpil3lpijgyj2z5c41vhb7fpk17038k5ggyw9p6049jrlf423m";
+ };
+
+ nativeBuildInputs = [
+ docbook_xml_dtd_43
+ docbook_xml_dtd_45
+ docbook_xsl
+ glibcLocales
+ gobject-introspection
+ 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 000000000000..5da2b4c157e8
--- /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 000000000000..7c15e10620a5
--- /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, gobject-introspection }:
+
+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 = [
+ gobject-introspection
+ 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 that handles 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 000000000000..c4d23bd834c9
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/plugins/mail.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja, vala, glib, gsignond, gobject-introspection }:
+
+stdenv.mkDerivation rec {
+ pname = "gsignond-plugin-mail";
+ version = "0.3.0";
+
+ src = fetchFromGitLab {
+ owner = "accounts-sso";
+ repo = "gsignond-plugin-mail";
+ rev = version;
+ sha256 = "0x8jcl0ra9kacm80f1im5wpxp9r9wxayjwnk6dkv7fhjbl2p4nh0";
+ };
+
+ nativeBuildInputs = [
+ gobject-introspection
+ 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 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 000000000000..6182ea283cba
--- /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, gobject-introspection }:
+
+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
+ gobject-introspection
+ 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 000000000000..d1fa37939a78
--- /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, gobject-introspection }:
+
+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
+ gobject-introspection
+ 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 000000000000..04463aac3796
--- /dev/null
+++ b/pkgs/development/libraries/gsignond/wrapper.nix
@@ -0,0 +1,25 @@
+{ 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
+ '';
+
+ inherit (gsignond) meta;
+}
diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index 8a419d678655..9fd3f8a7a998 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
patches = [
# ToDo: there might be more impurities than FMA support check
- ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
+ ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
];
# https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The GNU Scientific Library, a large numerical library";
- homepage = http://www.gnu.org/software/gsl/;
+ homepage = https://www.gnu.org/software/gsl/;
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix
index ede2b51c5599..f569d9c3ea12 100644
--- a/pkgs/development/libraries/gsl/gsl-1_16.nix
+++ b/pkgs/development/libraries/gsl/gsl-1_16.nix
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
patches = [
# ToDo: there might be more impurities than FMA support check
- ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
+ ./disable-fma.patch # https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
(fetchpatch {
name = "bug-39055.patch";
- url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
+ url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d";
sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8";
})
];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The GNU Scientific Library, a large numerical library";
- homepage = http://www.gnu.org/software/gsl/;
+ homepage = https://www.gnu.org/software/gsl/;
license = stdenv.lib.licenses.gpl3Plus;
longDescription = ''
diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix
index 051228aeb152..776125a7537d 100644
--- a/pkgs/development/libraries/gspell/default.nix
+++ b/pkgs/development/libraries/gspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, libxml2, glib, gtk3, enchant2, isocodes, vala, gobject-introspection, gnome3 }:
let
pname = "gspell";
@@ -10,13 +10,13 @@ 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";
};
propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig
- nativeBuildInputs = [ pkgconfig vala gobjectIntrospection libxml2 ];
+ nativeBuildInputs = [ pkgconfig vala gobject-introspection libxml2 ];
buildInputs = [ glib gtk3 isocodes ];
passthru = {
diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index 0cc6a07e0839..9f3bb3c7eadf 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://www.gnu.org/software/gss/;
+ homepage = https://www.gnu.org/software/gss/;
description = "Generic Security Service";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ bjg wkennington ];
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index d48ba9082af2..ed1e5b6faabb 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, gobject-introspection, 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 gobject-introspection 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 96e02c605f54..5d9c03b19190 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext
-, pkgconfig, python, gst-plugins-base, orc
+, pkgconfig, python3, gst-plugins-base, orc
, faacSupport ? false, faac ? null
, faad2, libass, libkate, libmms, librdf, ladspaH
, libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom
@@ -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.4";
meta = with stdenv.lib; {
description = "Gstreamer Bad Plugins";
@@ -53,12 +54,12 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
- sha256 = "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd";
+ sha256 = "1r8dma3x127rbx42yab7kwq7q1bhkmvz2ykn0rnqnzl95q74w2wi";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkgconfig python gettext ];
+ nativeBuildInputs = [ meson ninja pkgconfig python3 gettext ];
buildInputs = [
gst-plugins-base orc
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index dd4007bd142b..0acdf71fb72f 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, lib
-, pkgconfig, meson, ninja, gettext, gobjectIntrospection
-, python, gstreamer, orc, pango, libtheora
+, pkgconfig, meson, ninja, gettext, gobject-introspection
+, python3, gstreamer, orc, pango, libtheora
, libintl, libopus
, enableX11 ? stdenv.isLinux, libXv
, enableWayland ? stdenv.isLinux, wayland
@@ -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.4";
meta = with lib; {
description = "Base plugins and helper libraries";
@@ -21,12 +22,12 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
- sha256 = "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y";
+ sha256 = "0qbllw4kphchwhy4p7ivdysigx69i97gyw6q0rvkx1j81r4kjqfa";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig python gettext gobjectIntrospection ]
+ nativeBuildInputs = [ pkgconfig python3 gettext gobject-introspection ]
# Broken meson with Darwin. Should hopefully be fixed soon. Tracking
# in https://bugzilla.gnome.org/show_bug.cgi?id=781148.
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 5845c8c50db2..2c1faac387e6 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -1,12 +1,13 @@
{ stdenv, fetchurl, fetchpatch, meson, ninja
-, pkgconfig, gettext, gobjectIntrospection
+, pkgconfig, gettext, gobject-introspection
, bison, flex, python3, glib, makeWrapper
, libcap,libunwind, darwin
, lib
}:
stdenv.mkDerivation rec {
- name = "gstreamer-1.14.0";
+ name = "gstreamer-${version}";
+ version = "1.14.4";
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 = "1izzhnlsy83rgr4zl3jcl1sryxqbbigrrqw3j4x3nnphqnb6ckzr";
};
patches = [
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
outputBin = "dev";
nativeBuildInputs = [
- meson ninja pkgconfig gettext bison flex python3 makeWrapper gobjectIntrospection
+ meson ninja pkgconfig gettext bison flex python3 makeWrapper gobject-introspection
];
buildInputs =
lib.optionals stdenv.isLinux [ libcap libunwind ]
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 895f298c8269..6e1f2f4a2c55 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -1,10 +1,11 @@
{ stdenv, fetchurl, fetchpatch, meson, ninja
, pkgconfig, python, gst-plugins-base, libxml2
-, flex, perl, gettext, gobjectIntrospection
+, flex, perl, gettext, gobject-introspection
}:
stdenv.mkDerivation rec {
- name = "gstreamer-editing-services-1.14.0";
+ name = "gstreamer-editing-services-${version}";
+ version = "1.14.4";
meta = with stdenv.lib; {
description = "Library for creation of audio/video non-linear editors";
@@ -15,12 +16,12 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
- sha256 = "14cdd6y9p4k603hsnyhdjw2igg855gwpx0362jmg8k1gagmr0pwd";
+ sha256 = "0pxk65jib3mqszjkyvlzklwia4kbdj6j2b6jw1d502b06mdx5lak";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection python flex perl ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection python flex perl ];
propagatedBuildInputs = [ gst-plugins-base libxml2 ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 99d27523b1c9..d4e7b8c5da42 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.4";
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 = "0y89qynb4b6fry3h43z1r99qslmi3m8xhlq0i5baq2nbc0r5b2sz";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 564b37fab794..7f7393bba28e 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.4";
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 = "1nk5g24z2xx5kaw5cg8dv8skdc516inahmkymcz8bxqxj28qbmyz";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index a9e7f9fcff3e..a099643061a1 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 9ff799b0a27b..6236edec6a40 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -1,9 +1,10 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig
-, gst-plugins-base, gettext, gobjectIntrospection
+, gst-plugins-base, gettext, gobject-introspection
}:
stdenv.mkDerivation rec {
- name = "gst-rtsp-server-1.14.0";
+ name = "gst-rtsp-server-${version}";
+ version = "1.14.4";
meta = with stdenv.lib; {
description = "Gstreamer RTSP server";
@@ -18,12 +19,12 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
- sha256 = "0mlp9ms5hfbyzyvmc9xgi7934g4zrh1sbgky2p9zc5fqprvs0rbb";
+ sha256 = "1wc4d0y57hpfvv9sykjg8mxj86dw60mf696fbqbiqq6dzlmcw3ix";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja gettext gobjectIntrospection pkgconfig ];
+ nativeBuildInputs = [ meson ninja gettext gobject-introspection pkgconfig ];
buildInputs = [ gst-plugins-base ];
}
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 004bb0715f26..6bc2ea8af896 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.4";
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 = "08vd1xgwmapnviah47zv5h2r02qdd20y4f07rvv5zhv6y4vxh0mc";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 7255894f3b1f..e84f8dce9125 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.4";
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
- sha256 = "1whxk428badv8ibji00sn6hj17cp8l9n93rr948bz2gjbq41zqz4";
+ sha256 = "18yha6119v7mwz47idv2vykzfssqfmh6hc824wqqsshwjvzdn66f";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index bd33d9c52807..916185bf7ecf 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -1,9 +1,10 @@
{ stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base
-, python, gobjectIntrospection, json-glib
+, python, gobject-introspection, json-glib
}:
stdenv.mkDerivation rec {
- name = "gst-validate-1.14.0";
+ name = "gst-validate-${version}";
+ version = "1.14.4";
meta = {
description = "Integration testing infrastructure for the GStreamer framework";
@@ -14,13 +15,13 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
- sha256 = "1pzzxqkv1spjrzpzpazdm2h4s2wk7gg5gag8nxj5v2gjfyzhiprk";
+ sha256 = "1ismv4i7ldi04swq76pcpd5apxqd52yify5hvlyan2yw9flwrp0q";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
- pkgconfig gobjectIntrospection
+ pkgconfig gobject-introspection
];
buildInputs = [
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index f5fc635a5a43..cf4069871d1d 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+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 4bf42e1b5b65..266abe16c103 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg
-, gdk_pixbuf, xlibsWrapper, gobjectIntrospection
+, gdk_pixbuf, xlibsWrapper, gobject-introspection
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? true, cups ? null
, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
- nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ];
+ nativeBuildInputs = [ setupHook perl pkgconfig gettext gobject-introspection ];
patches = [
./2.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 27052d1922f6..421029a9d55f 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info
-, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection
+, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection
, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3
, x11Support ? stdenv.isLinux
, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols
@@ -13,20 +13,20 @@ assert cupsSupport -> cups != null;
with stdenv.lib;
let
- version = "3.22.30";
+ version = "3.24.1";
in
stdenv.mkDerivation rec {
name = "gtk+3-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz";
- sha256 = "0rv5k8fyi2i19k4zncai6vf429s6zy3kncr8vb6f3m034z0sb951";
+ url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
+ sha256 = "0bxhsp7cjph7szg1iyv16nwi60bz59x1smjkqv6sv6mr0zipnf38";
};
outputs = [ "out" "dev" ];
outputBin = "dev";
- nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl makeWrapper ];
+ nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper ];
patches = [
./3.0-immodules.cache.patch
diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix
index 0171a4b6833b..26d0b5c35958 100644
--- a/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/pkgs/development/libraries/gtk-mac-integration/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobjectIntrospection }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk-doc, gtk, gobject-introspection }:
stdenv.mkDerivation rec {
name = "gtk-mac-integration-2.0.8";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";
};
- nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobjectIntrospection ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc gobject-introspection ];
buildInputs = [ glib ];
propagatedBuildInputs = [ gtk ];
diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix
index b92bbf64514e..7f35f088da2b 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 5b3ca828a3f8..c037db97c044 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 3a473d6303ad..f8f1f20cc2fd 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 c0dc0753cd01..d89b00af4ced 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 fe81c97ab6eb..58c8ebccc3c2 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
-, libxml2, perl, intltool, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }:
+, libxml2, perl, intltool, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
let
checkInputs = [ xvfb_run dbus ];
in stdenv.mkDerivation rec {
name = "gtksourceview-${version}";
- version = "3.24.6";
+ version = "3.24.8";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
+ url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "1zinqid62zjcsq7vy1y4mq1qh3hzd3zj7p8np7g0bdqd37zvi6qy";
};
propagatedBuildInputs = [
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig intltool perl gobjectIntrospection vala_0_40 ]
+ nativeBuildInputs = [ pkgconfig intltool perl gobject-introspection vala_0_40 ]
++ stdenv.lib.optionals doCheck checkInputs;
buildInputs = [ atk cairo glib pango libxml2 gettext ];
diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix
index 2501e0253b39..4ff1e999145f 100644
--- a/pkgs/development/libraries/gtksourceview/4.x.nix
+++ b/pkgs/development/libraries/gtksourceview/4.x.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango, vala_0_40
-, libxml2, perl, gettext, gnome3, gobjectIntrospection, dbus, xvfb_run, shared-mime-info }:
+, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info }:
let
checkInputs = [ xvfb_run dbus ];
in stdenv.mkDerivation rec {
name = "gtksourceview-${version}";
- version = "4.0.0";
+ version = "4.0.3";
src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0amkspjsvxr3rjznmnwjwsgw030hayf6bw49ya4nligslwl7lp3f";
+ url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "0wwxgw43dmmaz07lzdzpladir26l2bly3lnf2ks6pna152wafm9x";
};
propagatedBuildInputs = [
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig gettext perl gobjectIntrospection vala_0_40 ]
+ nativeBuildInputs = [ pkgconfig gettext perl gobject-introspection vala_0_40 ]
++ stdenv.lib.optionals doCheck checkInputs;
buildInputs = [ atk cairo glib pango libxml2 ];
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
packageName = "gtksourceview";
- attrPath = "gnome3.gtksourceview";
+ attrPath = "gtksourceview4";
};
};
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index d5fc094844a7..6d4288376800 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool, gobjectIntrospection, vala}:
+{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant2, isocodes, intltool, gobject-introspection, vala}:
stdenv.mkDerivation rec {
name = "gtkspell-${version}";
- version = "3.0.9";
+ version = "3.0.10";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz";
- sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54";
+ sha256 = "0cjp6xdcnzh6kka42w9g0w2ihqjlq8yl8hjm9wsfnixk6qwgch5h";
};
- nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection vala ];
- buildInputs = [ aspell gtk3 enchant isocodes ];
- propagatedBuildInputs = [ enchant ];
+ nativeBuildInputs = [ pkgconfig intltool gobject-introspection vala ];
+ buildInputs = [ aspell gtk3 enchant2 isocodes ];
+ propagatedBuildInputs = [ enchant2 ];
configureFlags = [
"--enable-introspection"
diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix
index 22094f3a3f64..14676be0dcb9 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 04456b440193..cb141f8c5569 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 9b61f4b648e1..5e68a027470b 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, gobject-introspection, 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 gobject-introspection 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 75818f756921..a6c11a569cfa 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, gobject-introspection, 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 gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+ buildInputs = [ gupnp gst_all_1.gst-plugins-base ];
- meta = {
+ configureFlags = [
+ "--enable-gtk-doc"
+ ];
+
+ doCheck = true;
+
+ postPatch = ''
+ chmod +x tests/test-discoverer.sh.in
+ patchShebangs tests/test-discoverer.sh.in
+ '';
+
+ 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 182905e9546a..05c8522aebc8 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, gobject-introspection, 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 gobject-introspection 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 963b93ef6917..648209125fe3 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, gobject-introspection, 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 gobject-introspection 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"
+ ];
- meta = {
+ doCheck = true;
+
+ 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 000000000000..4538fc55460f
--- /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 4da9db3ef047..78a2d365033e 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, gobject-introspection
+, 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
+ gobject-introspection 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 360c1fb41f4e..03f4b0fe687a 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -1,83 +1,59 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gnome3
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus
, glib, libgudev, udisks2, libgcrypt, libcap, polkit
, libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
, gnomeSupport ? false, gnome, makeWrapper
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
, libsecret, libgdata, python3
-# Remove when switching back to meson
-, autoreconfHook, lzma, bzip2
}:
-# TODO: switch to meson when upstream fixes a non-deterministic build failure
-# See https://bugzilla.gnome.org/show_bug.cgi?id=794549
-
-# Meson specific things are commented out and annotated, so switching back
-# should simply require deleting autotools specific things and adding back meson
-# flags etc.
-
let
pname = "gvfs";
- version = "1.36.2";
-in
-stdenv.mkDerivation rec {
+ version = "1.38.1";
+in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+ sha256 = "18311pn5kp9b4kf5prvhcjs0cwf7fm3mqh6s6p42avcr5j26l4zd";
};
postPatch = ''
+ # patchShebangs requires executable file
+ chmod +x codegen.py meson_post_install.py
+ patchShebangs meson_post_install.py
+ patchShebangs codegen.py
patchShebangs test test-driver
'';
- # Uncomment when switching back to meson
- # postPatch = ''
- # chmod +x meson_post_install.py # patchShebangs requires executable file
- # patchShebangs meson_post_install.py
- # '';
-
nativeBuildInputs = [
- autoreconfHook # Remove when switching to meson
- # meson ninja
+ meson ninja python3
pkgconfig gettext makeWrapper
libxml2 libxslt docbook_xsl docbook_xml_dtd_42
];
- buildInputs =
- [ glib libgudev udisks2 libgcrypt
- libgphoto2 avahi libarchive fuse libcdio
- samba libmtp libcap polkit libimobiledevice libbluray
- libcdio-paranoia libnfs openssh
- # Remove when switching back to meson
- lzma bzip2
- # ToDo: a ligther version of libsoup to have FTP/HTTP support?
- ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
- libsoup gcr
- gnome-online-accounts libsecret libgdata
- ]);
+ buildInputs = [
+ glib libgudev udisks2 libgcrypt dbus
+ libgphoto2 avahi libarchive fuse libcdio
+ samba libmtp libcap polkit libimobiledevice libbluray
+ libcdio-paranoia libnfs openssh
+ # ToDo: a ligther version of libsoup to have FTP/HTTP support?
+ ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
+ libsoup gcr
+ gnome-online-accounts libsecret libgdata
+ ]);
- # Remove when switching back to meson
- configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr";
+ mesonFlags = [
+ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
+ "-Dtmpfilesdir=no"
+ ] ++ stdenv.lib.optionals (!gnomeSupport) [
+ "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
+ "-Dgoogle=false"
+ ] ++ stdenv.lib.optionals (samba == null) [
+ # Xfce don't want samba
+ "-Dsmb=false"
+ ];
- # Uncomment when switching back to meson
- # mesonFlags = [
- # "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
- # "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
- # "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
- # "-Dtmpfilesdir=no"
- # ] ++ stdenv.lib.optionals (!gnomeSupport) [
- # "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
- # "-Dgoogle=false"
- # ] ++ stdenv.lib.optionals (samba == null) [
- # # Xfce don't want samba
- # "-Dsmb=false"
- # ];
-
- enableParallelBuilding = true;
-
- checkInputs = [ python3 ];
doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
doInstallCheck = doCheck;
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 383f7f60f9bf..7a7624c96753 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 = "2.1.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 = "1y8jzm76wj8pcj3z47fikhasipyizd6w9r20yc7p139jqxp4jnwf";
};
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 75dd8693d2cf..a5f8f00a6bfd 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 7ff8ed61cab3..0f68d7df2981 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/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index edb1dc01aa80..db7dab1b6a7d 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "hpx-${version}";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "STEllAR-GROUP";
repo = "hpx";
rev = "${version}";
- sha256 = "0xlhnycmpy2jgiqyzpwmkdrl6drf46ywdsl0qm4vksvjxqfgk9z3";
+ sha256 = "1rliv42glns60bpmmvmgrglgmii42p8bmji349r6mr68f48iv4dx";
};
buildInputs = [ boost hwloc gperftools ];
diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix
index 20dda589b9cc..32743e617970 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/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 5d4eae4e0639..02d767000682 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }:
+{ stdenv, fetchurl }:
let
version = "2.8.1";
@@ -10,38 +10,18 @@ in stdenv.mkDerivation {
sha256 = "15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai";
};
+ NIX_CFLAGS_COMPILE = "-Wno-error";
patches = [ ./build-shared.patch ];
+ makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
+ buildFlags = "library";
+ doCheck = true;
+ checkTarget = "test";
- configurePhase = "gyp -f make --depth=`pwd` http_parser.gyp";
-
- buildFlags = [ "BUILDTYPE=Release" ];
-
- buildInputs =
- [ python2Packages.gyp ]
- ++ stdenv.lib.optional stdenv.isLinux utillinux
- ++ stdenv.lib.optionals stdenv.isDarwin [ python2Packages.python fixDarwinDylibNames ];
-
- doCheck = !stdenv.isDarwin;
-
- checkPhase = ''
- out/Release/test-nonstrict
- out/Release/test-strict
- '';
-
- installPhase = ''
- mkdir -p $out/lib
- mv out/Release/${if stdenv.isDarwin then "*.dylib" else "lib.target/*"} $out/lib
-
- mkdir -p $out/include
- mv http_parser.h $out/include
- '';
-
- meta = {
+ meta = with stdenv.lib; {
description = "An HTTP message parser written in C";
-
homepage = https://github.com/joyent/http-parser;
-
- license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.unix;
+ maintainers = with maintainers; [ matthewbauer ];
+ license = licenses.mit;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index b3914a4438b3..3728c05e516c 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ncurses, readline, autoreconfHook }:
stdenv.mkDerivation rec {
- version = "1.6.2";
+ version = "1.7.0";
name = "hunspell-${version}";
src = fetchurl {
url = "https://github.com/hunspell/hunspell/archive/v${version}.tar.gz";
- sha256 = "1i7lsv2cm0713ia3j5wjkcrhpfp3lqpjpwp4d3v18n7ycaqcxn9w";
+ sha256 = "12mwwqz6qkx7q1lg9vpjiiwh4fk4c8xs6g6g0xa2ia0hp5pbh9xv";
};
outputs = [ "bin" "dev" "out" "man" ];
@@ -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 90a16bcf7f94..8f38170d87e4 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 f99aa0b6f0cf..516e4184623a 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/hyperscan/default.nix b/pkgs/development/libraries/hyperscan/default.nix
new file mode 100644
index 000000000000..35966442da2d
--- /dev/null
+++ b/pkgs/development/libraries/hyperscan/default.nix
@@ -0,0 +1,69 @@
+{ lib, stdenv, fetchFromGitHub, cmake, ragel, python27
+, boost
+}:
+
+# NOTICE: pkgconfig, pcap and pcre intentionally omitted from build inputs
+# pcap used only in examples, pkgconfig used only to check for pcre
+# which is fixed 8.41 version requirement (nixpkgs have 8.42+, and
+# I not see any reason (for now) to backport 8.41.
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "hyperscan";
+ version = "5.0.0";
+
+ src = fetchFromGitHub {
+ owner = "intel";
+ repo = "hyperscan";
+ sha256 = "017dxg0n3gn9i4j27rcvpnp4rkqgycqni6x5d15dqpidl7zg7059";
+ rev = "v${version}";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ buildInputs = [ boost ];
+ nativeBuildInputs = [ cmake ragel python27 ];
+
+ cmakeFlags = [
+ "-DFAT_RUNTIME=ON"
+ "-DBUILD_AVX512=ON"
+ "-DBUILD_STATIC_AND_SHARED=ON"
+ ];
+
+ prePatch = ''
+ sed -i '/examples/d' CMakeLists.txt
+ '';
+
+ postInstall = ''
+ mkdir -p $dev/lib
+ mv $out/lib/*.a $dev/lib/
+ ln -sf $out/lib/libhs.so $dev/lib/
+ ln -sf $out/lib/libhs_runtime.so $dev/lib/
+ '';
+
+ postFixup = ''
+ sed -i "s,$out/include,$dev/include," $dev/lib/pkgconfig/libhs.pc
+ sed -i "s,$out/lib,$dev/lib," $dev/lib/pkgconfig/libhs.pc
+ '';
+
+ meta = {
+ description = "High-performance multiple regex matching library";
+ longDescription = ''
+ Hyperscan is a high-performance multiple regex matching library.
+ It follows the regular expression syntax of the commonly-used
+ libpcre library, but is a standalone library with its own C API.
+
+ Hyperscan uses hybrid automata techniques to allow simultaneous
+ matching of large numbers (up to tens of thousands) of regular
+ expressions and for the matching of regular expressions across
+ streams of data.
+
+ Hyperscan is typically used in a DPI library stack.
+ '';
+
+ homepage = https://www.hyperscan.io/;
+ maintainers = with lib.maintainers; [ avnik ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ license = lib.licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index dda1435c1dac..ddce76b10f72 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/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index 4ac3ebc09889..aab64b941caa 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -3,12 +3,12 @@
flex, yacc, zlib, libxml2 }:
stdenv.mkDerivation rec {
- name = "igraph";
+ pname = "igraph";
version = "0.7.1";
src = fetchFromGitHub {
owner = "igraph";
- repo = name;
+ repo = pname;
rev = version;
sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8";
};
diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix
index 99f6df9c5f06..bb6e23937c05 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/ilmbase/cross.patch b/pkgs/development/libraries/ilmbase/cross.patch
new file mode 100644
index 000000000000..207a440a0d85
--- /dev/null
+++ b/pkgs/development/libraries/ilmbase/cross.patch
@@ -0,0 +1,35 @@
+From: Helmut Grohne <>
+Subject: compile build tools with the build architecture compiler
+
+Patch-Source: https://github.com/openexr/openexr/issues/221
+
+Index: ilmbase-2.2.0/configure.ac
+===================================================================
+--- ilmbase-2.2.0.orig/configure.ac
++++ ilmbase-2.2.0/configure.ac
+@@ -28,6 +28,7 @@
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
++AX_PROG_CXX_FOR_BUILD
+
+ dnl
+ dnl PKGCONFIG preparations
+Index: ilmbase-2.2.0/Half/Makefile.am
+===================================================================
+--- ilmbase-2.2.0.orig/Half/Makefile.am
++++ ilmbase-2.2.0/Half/Makefile.am
+@@ -17,9 +17,11 @@
+
+ CLEANFILES = eLut eLut.h toFloat toFloat.h
+
+-eLut_SOURCES = eLut.cpp
++eLut$(EXEEXT): eLut.cpp
++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@
+
+-toFloat_SOURCES = toFloat.cpp
++toFloat$(EXEEXT): toFloat.cpp
++ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@
+
+ eLut.h: eLut
+ ./eLut > eLut.h
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 3989e941b6b2..98370f52e183 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automake, autoconf, libtool, which }:
+{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }:
stdenv.mkDerivation rec {
name = "ilmbase-${version}";
@@ -16,11 +16,12 @@ stdenv.mkDerivation rec {
./bootstrap
'';
- buildInputs = [ automake autoconf libtool which ];
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ automake autoconf libtool which ];
NIX_CFLAGS_LINK = [ "-pthread" ];
- patches = [ ./bootstrap.patch ];
+ patches = [ ./bootstrap.patch ./cross.patch ];
# fails 1 out of 1 tests with
# "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"
diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix
index 2b95742c44c0..eec68015c25b 100644
--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation {
buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng];
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "An image loading and rendering library for X11";
+ platforms = platforms.unix;
+ license = with licenses; [ gpl2 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 18b42ea4b4fa..2576580908a3 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "imlib2-1.5.0";
+ name = "imlib2-1.5.1";
src = fetchurl {
url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
- sha256 = "0kg28b5wp886hiy12v7abdybrvlymb7g3nvg0ysn2y8h883s5w8m";
+ sha256 = "1bms2iwmvnvpz5jqq3r52glarqkafif47zbh1ykz8hw85d2mfkps";
};
buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ]
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index b9781ba9aa08..a4a009c66580 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "incrtcl-${version}";
version = "4.0.4";
-
+
src = fetchurl {
url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz;
sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3";
@@ -22,9 +22,10 @@ stdenv.mkDerivation rec {
libPrefix = "itcl3.4";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = http://incrtcl.sourceforge.net/;
description = "Object Oriented Enhancements for Tcl/Tk";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.tcltk;
};
}
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
new file mode 100644
index 000000000000..f61c507c764b
--- /dev/null
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+ name = "intel-gmmlib-${version}";
+ version = "18.3.0";
+
+ src = fetchFromGitHub {
+ owner = "intel";
+ repo = "gmmlib";
+ rev = name;
+ sha256 = "1x1p4xvi870vjka2ag6rmmw897hl7zhav1sgwhnrzrggsx9jrw80";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/intel/gmmlib;
+ license = licenses.mit;
+ description = "Intel Graphics Memory Management Library";
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ jfrankenau ];
+ };
+}
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
new file mode 100644
index 000000000000..45a90ff520f9
--- /dev/null
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub
+, cmake, pkgconfig
+, libva, libpciaccess, intel-gmmlib, libX11
+}:
+
+stdenv.mkDerivation rec {
+ name = "intel-media-driver-${version}";
+ version = "18.3.0";
+
+ src = fetchFromGitHub {
+ owner = "intel";
+ repo = "media-driver";
+ rev = "intel-media-${version}";
+ sha256 = "15kcyg9ss2v1bbw6yvxqb833h1vs0h659n8ix0x5x03cfm1wsi57";
+ };
+
+ cmakeFlags = [ "-DINSTALL_DRIVER_SYSCONF=OFF" ];
+
+ preConfigure = ''
+ cmakeFlags="$cmakeFlags -DLIBVA_DRIVERS_PATH=$out/lib/dri"
+ '';
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [ libva libpciaccess intel-gmmlib libX11 ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/intel/media-driver;
+ license = with licenses; [ bsd3 mit ];
+ description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ jfrankenau ];
+ };
+}
diff --git a/pkgs/development/libraries/isl/0.12.2.nix b/pkgs/development/libraries/isl/0.12.2.nix
deleted file mode 100644
index 880f91fccedc..000000000000
--- a/pkgs/development/libraries/isl/0.12.2.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, gmp }:
-
-stdenv.mkDerivation rec {
- name = "isl-0.12.2"; # CLooG 0.16.3 fails to build with ISL 0.08.
-
- src = fetchurl {
- url = "http://isl.gforge.inria.fr/${name}.tar.bz2";
- sha256 = "1d0zs64yw6fzs6b7kxq6nh9kvas16h8b43agwh30118jjzpdpczl";
- };
-
- buildInputs = [ gmp ];
-
- enableParallelBuilding = true;
-
- meta = {
- homepage = https://www.kotnet.org/~skimo/isl/;
- license = stdenv.lib.licenses.lgpl21;
- description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/development/libraries/isl/0.15.0.nix b/pkgs/development/libraries/isl/0.20.0.nix
similarity index 74%
rename from pkgs/development/libraries/isl/0.15.0.nix
rename to pkgs/development/libraries/isl/0.20.0.nix
index 8b6080c2880a..72ef581725b9 100644
--- a/pkgs/development/libraries/isl/0.15.0.nix
+++ b/pkgs/development/libraries/isl/0.20.0.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
- name = "isl-0.15";
+ name = "isl-0.20";
src = fetchurl {
url = "http://isl.gforge.inria.fr/${name}.tar.xz";
- sha256 = "1m922l5bz69lvkcxrib7lvjqwfqsr8rpbzgmb2aq07bp76460jhh";
+ sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5";
};
buildInputs = [ gmp ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
- homepage = https://www.kotnet.org/~skimo/isl/;
+ homepage = http://isl.gforge.inria.fr/;
license = stdenv.lib.licenses.lgpl21;
description = "A library for manipulating sets and relations of integer points bounded by linear constraints";
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index d78c59e9c25a..80154f504d41 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/jama/default.nix b/pkgs/development/libraries/jama/default.nix
index 36eedadc4c2e..29fabdbb3b63 100644
--- a/pkgs/development/libraries/jama/default.nix
+++ b/pkgs/development/libraries/jama/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "jama-${version}";
version = "1.2.5";
-
+
src = fetchurl {
url = https://math.nist.gov/tnt/jama125.zip;
sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl";
@@ -21,9 +21,10 @@ stdenv.mkDerivation rec {
cp *.h $out/include
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://math.nist.gov/tnt/;
description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates";
- platforms = stdenv.lib.platforms.unix;
+ platforms = platforms.unix;
+ license = licenses.publicDomain;
};
}
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index de4848c7dda4..eb9282274328 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
homepage = https://www.ece.uvic.ca/~frodo/jasper/;
description = "JPEG2000 Library";
platforms = platforms.unix;
+ license = licenses.jasper;
maintainers = with maintainers; [ pSub ];
};
}
diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index cf9c554d57f4..3c729f42320a 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 d43dcd2a91d5..10c39f037890 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/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix
index daee9adb1fdc..5ec10cc7e0df 100644
--- a/pkgs/development/libraries/java/dbus-java/default.nix
+++ b/pkgs/development/libraries/java/dbus-java/default.nix
@@ -18,8 +18,9 @@ stdenv.mkDerivation {
-e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile
'';
- meta = {
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.sander ];
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = [ maintainers.sander ];
+ license = licenses.afl21;
};
}
diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
index b9d66fdc9716..e34699d7740e 100644
--- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix
+++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
@@ -3,13 +3,14 @@
stdenv.mkDerivation {
name = "gwt-dnd-2.6.5";
builder = ./builder.sh;
-
+
src = fetchurl {
url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar;
sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw";
- };
+ };
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix
index b182964f6579..ec407076906d 100644
--- a/pkgs/development/libraries/java/gwt-widgets/default.nix
+++ b/pkgs/development/libraries/java/gwt-widgets/default.nix
@@ -3,13 +3,14 @@
stdenv.mkDerivation {
name = "gwt-widgets-0.2.0";
builder = ./builder.sh;
-
+
src = fetchurl {
url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz;
sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
- };
+ };
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ platforms = platforms.unix;
+ license = with licenses; [ afl21 lgpl2 ];
};
}
diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix
index 97ffcb647d62..a478ab0fc502 100644
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/pkgs/development/libraries/java/hsqldb/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation {
buildInputs = [ unzip
];
-
- meta = {
- platforms = stdenv.lib.platforms.unix;
+
+ meta = with stdenv.lib; {
+ platforms = platforms.unix;
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix
index 221a2e93e4fc..500c575f73aa 100644
--- a/pkgs/development/libraries/java/httpunit/default.nix
+++ b/pkgs/development/libraries/java/httpunit/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation {
inherit unzip;
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ homepage = http://httpunit.sourceforge.net;
+ platforms = platforms.unix;
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix
index 99d213a01dac..16755471acd7 100644
--- a/pkgs/development/libraries/java/jdom/default.nix
+++ b/pkgs/development/libraries/java/jdom/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation {
sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf";
};
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code";
+ homepage = http://www.jdom.org;
+ platforms = platforms.unix;
+ license = licenses.bsdOriginal;
};
}
diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix
index 6947536fafb7..1bc918af8352 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@@ -1,21 +1,31 @@
-{stdenv, fetchurl} :
+{stdenv, fetchurl, jre} :
stdenv.mkDerivation rec {
- name = "jflex-1.6.1";
+ name = "jflex-1.7.0";
src = fetchurl {
- url = "http://jflex.de/${name}.tar.gz";
- sha256 = "1h7q2vhb4s42g4pqz5xxxliagprray7i9krr6hyaz1mjlx7gnycq";
+ url = "http://jflex.de/release/${name}.tar.gz";
+ sha256 = "1k7bqw1mn569g9dxc0ia3yz1bzgzs5w52lh1xn3hgj7k5ymh54kk";
};
sourceRoot = name;
- phases = [ "unpackPhase" "installPhase" ];
-
installPhase = ''
+ runHook preInstall
mkdir -p $out
cp -a * $out
+ rm -f $out/bin/jflex.bat
+
patchShebangs $out
+ sed -i -e '/^JAVA=java/ s#java#${jre}/bin/java#' $out/bin/jflex
+ runHook postInstall
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
+ $out/bin/jflex --version
+ runHook postInstallCheck
'';
meta = {
diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix
index ad5192f94ce2..98291a7763ca 100644
--- a/pkgs/development/libraries/java/libmatthew-java/default.nix
+++ b/pkgs/development/libraries/java/libmatthew-java/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation {
PREFIX=''''${out}'';
buildInputs = [ jdk ];
- meta = {
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.sander ];
+ meta = with stdenv.lib; {
+ platforms = platforms.linux;
+ maintainers = [ maintainers.sander ];
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix
index 5ec4634d6323..7f932d52dc41 100644
--- a/pkgs/development/libraries/java/lombok/default.nix
+++ b/pkgs/development/libraries/java/lombok/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "lombok-1.16.22";
+ name = "lombok-1.18.4";
src = fetchurl {
url = "https://projectlombok.org/downloads/${name}.jar";
- sha256 = "1hr2jjlqdnxrw7ablqkf7ljc6n2q6a04ww14di06zs6i3l82zzpa";
+ sha256 = "0hlpycnmzd71ihn59hzf445dvwky2lkv57jimx91i6v7xcnr5wrr";
};
buildCommand = ''
diff --git a/pkgs/development/libraries/java/lucene/default.nix b/pkgs/development/libraries/java/lucene/default.nix
index 6f6534cee3ea..691b9905b04f 100644
--- a/pkgs/development/libraries/java/lucene/default.nix
+++ b/pkgs/development/libraries/java/lucene/default.nix
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
};
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Java full-text search engine";
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix
index 551375d33bd6..ae93765ff981 100644
--- a/pkgs/development/libraries/java/mockobjects/default.nix
+++ b/pkgs/development/libraries/java/mockobjects/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz";
};
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Generic unit testing framework and methodology for testing any kind of code";
+ platforms = platforms.unix;
+ license = licenses.asl20;
};
}
diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index ca9aa8fc36e8..687e1e8a1deb 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 cc838be0f4f0..04a165866faf 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 d8866ae3ff89..5ac1067d92fb 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -1,6 +1,13 @@
-{ stdenv, fetchurl, version, sha256, ... }@args:
+{ version, sha256 }:
+{ stdenv, fetchurl,
+# 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.
+# Causes segfaults with some software (ex. rustc), but defaults to true for backward
+# compatibility. Ignored on non OSX.
+stripPrefix ? true }:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
name = "jemalloc-${version}";
inherit version;
@@ -9,14 +16,8 @@ stdenv.mkDerivation (rec {
inherit sha256;
};
- # 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";
+ # see the comment on stripPrefix
+ configureFlags = stdenv.lib.optional (stdenv.isDarwin && stripPrefix) "--with-jemalloc-prefix=";
doCheck = true;
enableParallelBuilding = true;
@@ -32,4 +33,4 @@ stdenv.mkDerivation (rec {
platforms = platforms.all;
maintainers = with maintainers; [ wkennington ];
};
-} // (builtins.removeAttrs args [ "stdenv" "fetchurl" "version" "sha256" ]))
+}
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 40c06cbffdf0..7ea7bccd6b87 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,10 +1,4 @@
-{ 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/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix
index 00b38a855532..d328ab8016a1 100644
--- a/pkgs/development/libraries/jemalloc/jemalloc450.nix
+++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl }:
import ./common.nix {
- inherit stdenv fetchurl;
version = "4.5.0";
sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";
-}
+}
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
new file mode 100644
index 000000000000..175097ef7855
--- /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/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index be83dbc52f45..9a18b025fabe 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,30 +1,22 @@
-{ stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext
-, gobjectIntrospection, fixDarwinDylibNames, gnome3
+{ stdenv, fetchurl, glib, meson, ninja, pkgconfig, gettext
+, gobject-introspection, fixDarwinDylibNames, gnome3
}:
let
pname = "json-glib";
- version = "1.4.2";
+ version = "1.4.4";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8";
+ sha256 = "0ixwyis47v5bkx6h8a1iqlw3638cxcv57ivxv4gw2gaig51my33j";
};
propagatedBuildInputs = [ glib ];
- nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ];
buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
- patches = [
- # https://gitlab.gnome.org/GNOME/json-glib/issues/27
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/json-glib/merge_requests/2.diff";
- sha256 = "0pf006jxj1ki7a0w4ykxm6b24m0wafrhpdcmixsw9x83m227156c";
- })
- ];
-
outputs = [ "out" "dev" ];
doCheck = true;
diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix
index a73122d8253e..2324f1280a5e 100644
--- a/pkgs/development/libraries/jsonrpc-glib/default.nix
+++ b/pkgs/development/libraries/jsonrpc-glib/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
-let
- version = "3.28.1";
+{ stdenv, fetchurl, meson, ninja, glib, json-glib, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
+stdenv.mkDerivation rec {
pname = "jsonrpc-glib";
-in
-stdenv.mkDerivation {
- name = "${pname}-${version}";
+ version = "3.30.1";
outputs = [ "out" "dev" "devdoc" ];
- nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
+ nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ];
buildInputs = [ glib json-glib ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0avff2ldjvwrb8rnzlgslagdjf6x7bmdx69rsq20k6f38icw4ang";
+ sha256 = "1iqxfdymsspsn1xr5bv7xllw73yhqq6k9bfixsggrf2g85pwwxdn";
};
mesonFlags = [
diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix
index 1e687ff722b3..01ba605b506c 100644
--- a/pkgs/development/libraries/judy/default.nix
+++ b/pkgs/development/libraries/judy/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
# gcc 4.8 optimisations break judy.
- # http://sourceforge.net/p/judy/mailman/message/31995144/
+ # https://sourceforge.net/p/judy/mailman/message/31995144/
preConfigure = stdenv.lib.optionalString stdenv.cc.isGNU ''
configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
'';
diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix
new file mode 100644
index 000000000000..47c87da065ba
--- /dev/null
+++ b/pkgs/development/libraries/jxrlib/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, python }:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "jxrlib";
+ version = "1.1";
+
+ # Use the source from a fork on github because CodePlex does not
+ # deliver an easily downloadable tarball.
+ src = fetchFromGitHub {
+ owner = "4creators";
+ repo = pname;
+ rev = "f7521879862b9085318e814c6157490dd9dbbdb4";
+ sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w";
+ };
+
+ nativeBuildInputs = [ python ];
+
+ makeFlags = [ "DIR_INSTALL=$(out)" "SHARED=1" ];
+
+ meta = with stdenv.lib; {
+ description = "Implementation of the JPEG XR image codec standard";
+ homepage = https://jxrlib.codeplex.com;
+ license = licenses.bsd2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo ];
+ };
+}
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ea8f30f0bba2..62ae433ff710 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 48f009f8d3e0..0a87918f2108 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.52/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index e4e4c90bfe14..281778d9d07f 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 4f866974b61b..56cab6f2e81b 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.52.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.52/attica-5.52.0.tar.xz";
+ sha256 = "0770wq0ijkxyi6mcxh1xlkf2xmxpdphqg0dii6kwn2b9dnblswxn";
+ name = "attica-5.52.0.tar.xz";
};
};
baloo = {
- version = "5.49.0";
+ version = "5.52.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.52/baloo-5.52.0.tar.xz";
+ sha256 = "1a2ypz3xy6zh4smrfny7y243hxddzn02nmkvydlcinklmv38bpwd";
+ name = "baloo-5.52.0.tar.xz";
};
};
bluez-qt = {
- version = "5.49.0";
+ version = "5.52.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.52/bluez-qt-5.52.0.tar.xz";
+ sha256 = "1z2ckwc7h66a7fa194gawq0q95fxv4w081v7qds5yv10rbwm8n7n";
+ name = "bluez-qt-5.52.0.tar.xz";
};
};
breeze-icons = {
- version = "5.49.0";
+ version = "5.52.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.52/breeze-icons-5.52.0.tar.xz";
+ sha256 = "0nnwl5dijf0dhfg4gi7lycdy5ss0cj7rhcy1ranzfzlc1l2b17cp";
+ name = "breeze-icons-5.52.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.49.0";
+ version = "5.52.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.52/extra-cmake-modules-5.52.0.tar.xz";
+ sha256 = "0jcv87xagilkxvy0p0bl8fbfvy2npajvp9bnskggmqqi4sn8mh38";
+ name = "extra-cmake-modules-5.52.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.49.0";
+ version = "5.52.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.52/frameworkintegration-5.52.0.tar.xz";
+ sha256 = "1sbs14cbf0gxhx09dby606cff5mycvpblx20pr7n2wy7xxxs2zh1";
+ name = "frameworkintegration-5.52.0.tar.xz";
};
};
kactivities = {
- version = "5.49.0";
+ version = "5.52.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.52/kactivities-5.52.0.tar.xz";
+ sha256 = "0pckbkvf4l4c88sr01qkmzpqbjqiy4qsk98khg5858nl65ilrldd";
+ name = "kactivities-5.52.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.49.0";
+ version = "5.52.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.52/kactivities-stats-5.52.0.tar.xz";
+ sha256 = "0pnnpqw4q556yh95040rv9yby2ac1rb1vfbw26q8igs8z6lwqkms";
+ name = "kactivities-stats-5.52.0.tar.xz";
};
};
kapidox = {
- version = "5.49.0";
+ version = "5.52.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.52/kapidox-5.52.0.tar.xz";
+ sha256 = "1xhyc4j2fhrmcr4z12623x3jqv4kl8cxkskxkv6f9ag97g5ccgm8";
+ name = "kapidox-5.52.0.tar.xz";
};
};
karchive = {
- version = "5.49.0";
+ version = "5.52.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.52/karchive-5.52.0.tar.xz";
+ sha256 = "0l49chdbn5mpd72ldyfgy83dvsnphq0w59kv8rg9k7afy6wfm8ix";
+ name = "karchive-5.52.0.tar.xz";
};
};
kauth = {
- version = "5.49.0";
+ version = "5.52.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.52/kauth-5.52.0.tar.xz";
+ sha256 = "0y90yxqvqadkbd53vr823rfkikr08hsqfzkns02bkz1xw72aixxm";
+ name = "kauth-5.52.0.tar.xz";
};
};
kbookmarks = {
- version = "5.49.0";
+ version = "5.52.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.52/kbookmarks-5.52.0.tar.xz";
+ sha256 = "0j4bflbgwkb6dyia92rllbmz0w2j5j5aklaaahpb5awxjnlng0v0";
+ name = "kbookmarks-5.52.0.tar.xz";
};
};
kcmutils = {
- version = "5.49.0";
+ version = "5.52.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.52/kcmutils-5.52.0.tar.xz";
+ sha256 = "1cs2667gk1y1sa1728gy7wsnkmsxanbs7rqrfkgmn80wn6yvl6xi";
+ name = "kcmutils-5.52.0.tar.xz";
};
};
kcodecs = {
- version = "5.49.0";
+ version = "5.52.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.52/kcodecs-5.52.0.tar.xz";
+ sha256 = "1z2pk3q25hdvaliqsvkrdss0s0vva35w1p9alkh3bqv63lx8m62v";
+ name = "kcodecs-5.52.0.tar.xz";
};
};
kcompletion = {
- version = "5.49.0";
+ version = "5.52.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.52/kcompletion-5.52.0.tar.xz";
+ sha256 = "0favf0h59z7r599kf894pl5l8yq9civqkn8yl213h9cy4lym4jqb";
+ name = "kcompletion-5.52.0.tar.xz";
};
};
kconfig = {
- version = "5.49.0";
+ version = "5.52.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.52/kconfig-5.52.0.tar.xz";
+ sha256 = "12s2pa1dlr1p3y0nqj6vhq7wi1ka9jwsmfjhm3xf8a5fpqf1r8hx";
+ name = "kconfig-5.52.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.49.0";
+ version = "5.52.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.52/kconfigwidgets-5.52.0.tar.xz";
+ sha256 = "0630gabfmgnbvs8psla3vifl6jv8dbshzvksxmf6farx1zx05y53";
+ name = "kconfigwidgets-5.52.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.49.0";
+ version = "5.52.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.52/kcoreaddons-5.52.0.tar.xz";
+ sha256 = "1lvqgilng9z3jw0nhc9qzvcyvfwhsbj2xskqggpjlvqryh4sxaj9";
+ name = "kcoreaddons-5.52.0.tar.xz";
};
};
kcrash = {
- version = "5.49.0";
+ version = "5.52.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.52/kcrash-5.52.0.tar.xz";
+ sha256 = "10cl5xs8wjr0nqsid3n5g30q7fspkj4143yrkwxakazdcxyx6p1b";
+ name = "kcrash-5.52.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.49.0";
+ version = "5.52.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.52/kdbusaddons-5.52.0.tar.xz";
+ sha256 = "1fbxdsvf4mpyfjvpjhn42k49cvgya6z5rnswmmyl7di7aw738myp";
+ name = "kdbusaddons-5.52.0.tar.xz";
};
};
kdeclarative = {
- version = "5.49.0";
+ version = "5.52.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.52/kdeclarative-5.52.0.tar.xz";
+ sha256 = "0sskzb19xy5bivz69yi73y523j0fp1zv9656js2y18952mfy9sjk";
+ name = "kdeclarative-5.52.0.tar.xz";
};
};
kded = {
- version = "5.49.0";
+ version = "5.52.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.52/kded-5.52.0.tar.xz";
+ sha256 = "1mcv0w10af6mbczqm1v345i2xbiikaxnqag710r67npl0qds43bm";
+ name = "kded-5.52.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.49.0";
+ version = "5.52.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.52/portingAids/kdelibs4support-5.52.0.tar.xz";
+ sha256 = "08sag2fy3l13m125r3ampnxsp11pvf47701ny80mqkgd78pkhrpb";
+ name = "kdelibs4support-5.52.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.49.0";
+ version = "5.52.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.52/kdesignerplugin-5.52.0.tar.xz";
+ sha256 = "0xfzglhynrnqaywl1if6yv1b2mlka94pjc4dlxi6csbv8mh69d4d";
+ name = "kdesignerplugin-5.52.0.tar.xz";
};
};
kdesu = {
- version = "5.49.0";
+ version = "5.52.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.52/kdesu-5.52.0.tar.xz";
+ sha256 = "18m1gq825i6n6zdlaa5jvkl08w39v0l4lmjgsrbggjsbaqlpj7w2";
+ name = "kdesu-5.52.0.tar.xz";
};
};
kdewebkit = {
- version = "5.49.0";
+ version = "5.52.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.52/kdewebkit-5.52.0.tar.xz";
+ sha256 = "06z8b2330jvmjwr1gwf2gdfxjmxc12nik5791xpgi83b99d8h5lq";
+ name = "kdewebkit-5.52.0.tar.xz";
};
};
kdnssd = {
- version = "5.49.0";
+ version = "5.52.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.52/kdnssd-5.52.0.tar.xz";
+ sha256 = "1h8k2kygv48la3zyg1wzhlr56viv4y4liwrs6niy4vninyg2al7y";
+ name = "kdnssd-5.52.0.tar.xz";
};
};
kdoctools = {
- version = "5.49.0";
+ version = "5.52.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.52/kdoctools-5.52.0.tar.xz";
+ sha256 = "0f915i59cbm3vkyd14xla40n5c2bayavvyq5d9m01v2hibbg53in";
+ name = "kdoctools-5.52.0.tar.xz";
};
};
kemoticons = {
- version = "5.49.0";
+ version = "5.52.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.52/kemoticons-5.52.0.tar.xz";
+ sha256 = "1f846gjx4d9wwi526xpykhqssmswgh63zghksp2j9jfn3bri24ya";
+ name = "kemoticons-5.52.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.49.0";
+ version = "5.52.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.52/kfilemetadata-5.52.0.tar.xz";
+ sha256 = "1zjibm9si8ffmqmczya9xgqpz0p9ygc9qk5629znn09l88g2gamw";
+ name = "kfilemetadata-5.52.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.49.0";
+ version = "5.52.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.52/kglobalaccel-5.52.0.tar.xz";
+ sha256 = "03d37fm741qbyk2aaqnh4nbvlrfaicl587f4607qvs8lc56vbdhy";
+ name = "kglobalaccel-5.52.0.tar.xz";
};
};
kguiaddons = {
- version = "5.49.0";
+ version = "5.52.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.52/kguiaddons-5.52.0.tar.xz";
+ sha256 = "0m628ilab8g5ny389jp24z7jsxrmciki018il43pcqia4njignkb";
+ name = "kguiaddons-5.52.0.tar.xz";
};
};
kholidays = {
- version = "5.49.0";
+ version = "5.52.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.52/kholidays-5.52.0.tar.xz";
+ sha256 = "1pi9qqpakdyan2iyrx9yk5ncdwy5i3nd2jlhk9wm73gmir3l5bdl";
+ name = "kholidays-5.52.0.tar.xz";
};
};
khtml = {
- version = "5.49.0";
+ version = "5.52.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.52/portingAids/khtml-5.52.0.tar.xz";
+ sha256 = "0nhigbngq2rln1lqzgal6908rrjnfny4jwx7dkn6xv2mpfwkf1qm";
+ name = "khtml-5.52.0.tar.xz";
};
};
ki18n = {
- version = "5.49.0";
+ version = "5.52.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.52/ki18n-5.52.0.tar.xz";
+ sha256 = "0lxx8wan92njkpjg84s5snqfv4jjvqn85fyj0az3awh6lm7w3ndi";
+ name = "ki18n-5.52.0.tar.xz";
};
};
kiconthemes = {
- version = "5.49.0";
+ version = "5.52.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.52/kiconthemes-5.52.0.tar.xz";
+ sha256 = "0brzzn6k9srcixc3f15w26ml5kcqg6w6m0hbffn4xwsn8pkwpqq2";
+ name = "kiconthemes-5.52.0.tar.xz";
};
};
kidletime = {
- version = "5.49.0";
+ version = "5.52.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.52/kidletime-5.52.0.tar.xz";
+ sha256 = "1sa8815wqr9ps1wdjgm801al8vxjlw3w96h2bzz9dm786d56yanp";
+ name = "kidletime-5.52.0.tar.xz";
};
};
kimageformats = {
- version = "5.49.0";
+ version = "5.52.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.52/kimageformats-5.52.0.tar.xz";
+ sha256 = "1cmb47q90r67jkhf1fgrbipy3qrkq9rikncag13f4vw4plzakl6g";
+ name = "kimageformats-5.52.0.tar.xz";
};
};
kinit = {
- version = "5.49.0";
+ version = "5.52.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.52/kinit-5.52.0.tar.xz";
+ sha256 = "0pq02rp9zs14aqm7y1cd72wcgjnixxjwmpvggd30ljmvlya519nd";
+ name = "kinit-5.52.0.tar.xz";
};
};
kio = {
- version = "5.49.0";
+ version = "5.52.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.52/kio-5.52.0.tar.xz";
+ sha256 = "18946lql9ph2sanm8b2655ljgp7skw0igcnicfi82yh51xrmvc5c";
+ name = "kio-5.52.0.tar.xz";
};
};
kirigami2 = {
- version = "5.49.0";
+ version = "5.52.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.52/kirigami2-5.52.0.tar.xz";
+ sha256 = "094cqd8khmlybxadxcmj4p0k7z108zxirpj3bwxfwwbasl1w2pip";
+ name = "kirigami2-5.52.0.tar.xz";
};
};
kitemmodels = {
- version = "5.49.0";
+ version = "5.52.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.52/kitemmodels-5.52.0.tar.xz";
+ sha256 = "0pjv6vnd3l7ip7w1glfs9yh42lcgdhmgz9k9w68n5818wwcgbwsn";
+ name = "kitemmodels-5.52.0.tar.xz";
};
};
kitemviews = {
- version = "5.49.0";
+ version = "5.52.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.52/kitemviews-5.52.0.tar.xz";
+ sha256 = "1nq7zsqk0z56cydjg61rlr26qaqbjcn7rmk6zxf2h8s1cw6gwwgb";
+ name = "kitemviews-5.52.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.49.0";
+ version = "5.52.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.52/kjobwidgets-5.52.0.tar.xz";
+ sha256 = "1dzhcngdk1s979dirpkh2fms6w13h8sdfpxkaw0jmah6l5vkf782";
+ name = "kjobwidgets-5.52.0.tar.xz";
};
};
kjs = {
- version = "5.49.0";
+ version = "5.52.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.52/portingAids/kjs-5.52.0.tar.xz";
+ sha256 = "1vpn1dhhw6qfym3n58khanlg4r3gcid3y4yhrn4d5qsglvb0ssyr";
+ name = "kjs-5.52.0.tar.xz";
};
};
kjsembed = {
- version = "5.49.0";
+ version = "5.52.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.52/portingAids/kjsembed-5.52.0.tar.xz";
+ sha256 = "04v8b0liprr2pph18ns76fibc969lrknqf34vp73h4rk29fz3zyf";
+ name = "kjsembed-5.52.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.49.0";
+ version = "5.52.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.52/portingAids/kmediaplayer-5.52.0.tar.xz";
+ sha256 = "1gjizl8dpyly856rkyniccj07d8wzcbxdrx37mx3v0pkq2sh62wb";
+ name = "kmediaplayer-5.52.0.tar.xz";
};
};
knewstuff = {
- version = "5.49.0";
+ version = "5.52.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.52/knewstuff-5.52.0.tar.xz";
+ sha256 = "1x4vmdzkvm7v3pkhjhg09s23w6agxyxizgql611kv835xwvpcpxd";
+ name = "knewstuff-5.52.0.tar.xz";
};
};
knotifications = {
- version = "5.49.0";
+ version = "5.52.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.52/knotifications-5.52.0.tar.xz";
+ sha256 = "0mknmz464q62dxcliki4wnlzpxzjrg07n21566ajkx8blc7lpqi7";
+ name = "knotifications-5.52.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.49.0";
+ version = "5.52.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.52/knotifyconfig-5.52.0.tar.xz";
+ sha256 = "0k9x0ir2brfqg444gw0f6pswryfqcxad0986zc4pzp70a2rrlk5x";
+ name = "knotifyconfig-5.52.0.tar.xz";
};
};
kpackage = {
- version = "5.49.0";
+ version = "5.52.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.52/kpackage-5.52.0.tar.xz";
+ sha256 = "05388qwnhbvdrqpw1qp1nb41kx74qaz2ssm8kxppmz5lsk8av5rr";
+ name = "kpackage-5.52.0.tar.xz";
};
};
kparts = {
- version = "5.49.0";
+ version = "5.52.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.52/kparts-5.52.0.tar.xz";
+ sha256 = "10zpa7kndcch0w52klhvfmsnyn35q5n62s31qj0hg9b6chz8jb87";
+ name = "kparts-5.52.0.tar.xz";
};
};
kpeople = {
- version = "5.49.0";
+ version = "5.52.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.52/kpeople-5.52.0.tar.xz";
+ sha256 = "1i5nzfzik9x5lll2dy6i3mv59pb3cx0nb81xymmrdj36p9bnvfcq";
+ name = "kpeople-5.52.0.tar.xz";
};
};
kplotting = {
- version = "5.49.0";
+ version = "5.52.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.52/kplotting-5.52.0.tar.xz";
+ sha256 = "0inir47zgdjzjkz4jdhj739ppz9qgmk98s4p8ibv9dmkh12l9nfp";
+ name = "kplotting-5.52.0.tar.xz";
};
};
kpty = {
- version = "5.49.0";
+ version = "5.52.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.52/kpty-5.52.0.tar.xz";
+ sha256 = "12n7j7pqclnn6x5nddjxyprn9rjdn9ykhlwiwxv6v521zg35gk82";
+ name = "kpty-5.52.0.tar.xz";
};
};
kross = {
- version = "5.49.0";
+ version = "5.52.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.52/portingAids/kross-5.52.0.tar.xz";
+ sha256 = "158crvni2119gvh07dgzkl54ggj7z908n09wq66pa53nnlsvmbws";
+ name = "kross-5.52.0.tar.xz";
};
};
krunner = {
- version = "5.49.0";
+ version = "5.52.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.52/krunner-5.52.0.tar.xz";
+ sha256 = "1by900jijgb9005hx9q7vwlxh4gf7scgnva18lgbjv5ll05mazck";
+ name = "krunner-5.52.0.tar.xz";
};
};
kservice = {
- version = "5.49.0";
+ version = "5.52.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.52/kservice-5.52.0.tar.xz";
+ sha256 = "1plpvj3a6ans8piygb09n3blks8abb0rwl6d44skdf670bc06zil";
+ name = "kservice-5.52.0.tar.xz";
};
};
ktexteditor = {
- version = "5.49.0";
+ version = "5.52.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.52/ktexteditor-5.52.0.tar.xz";
+ sha256 = "18q3mns9rmjsa06clnqr3j5q1p1s8rb81ya5z40x19cc58a3hp11";
+ name = "ktexteditor-5.52.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.49.0";
+ version = "5.52.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.52/ktextwidgets-5.52.0.tar.xz";
+ sha256 = "1qbrflawx4ibl4jkifpkq8am6zjai0xh7a2scv6rpjcmxmi7dppi";
+ name = "ktextwidgets-5.52.0.tar.xz";
};
};
kunitconversion = {
- version = "5.49.0";
+ version = "5.52.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.52/kunitconversion-5.52.0.tar.xz";
+ sha256 = "1ybd29ygwchm69nc523f8b8qvmzwg2mr9vn29zzwy5jn6r8m581n";
+ name = "kunitconversion-5.52.0.tar.xz";
};
};
kwallet = {
- version = "5.49.0";
+ version = "5.52.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.52/kwallet-5.52.0.tar.xz";
+ sha256 = "1nw41rwqnavqkf3nq543qc9ipdr1326jbr2qywapyryxaiv7jfmh";
+ name = "kwallet-5.52.0.tar.xz";
};
};
kwayland = {
- version = "5.49.0";
+ version = "5.52.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.52/kwayland-5.52.0.tar.xz";
+ sha256 = "0dylwr1cnil5dgaf96rvzd90732v6ki5wnh247ld7yv51fqyj1j0";
+ name = "kwayland-5.52.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.49.0";
+ version = "5.52.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.52/kwidgetsaddons-5.52.0.tar.xz";
+ sha256 = "1na7y1ix2icxhnmz8bazj8iknfpwakj3n335b2qb1ss9iq0b1j3n";
+ name = "kwidgetsaddons-5.52.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.49.0";
+ version = "5.52.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.52/kwindowsystem-5.52.0.tar.xz";
+ sha256 = "1axfpma24lg0fhqjjia9fw594l37kzcs26zalz6k4dw0ivjxwypx";
+ name = "kwindowsystem-5.52.0.tar.xz";
};
};
kxmlgui = {
- version = "5.49.0";
+ version = "5.52.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.52/kxmlgui-5.52.0.tar.xz";
+ sha256 = "0cdn05q44jchh9c707fpbn8nhxiyhcbmyy7ajc0f63k3i97lyqp4";
+ name = "kxmlgui-5.52.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.49.0";
+ version = "5.52.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.52/kxmlrpcclient-5.52.0.tar.xz";
+ sha256 = "1sa6dwkaw3s7w3872kcrly1f6c5dy2z20494ncd1sq1ckdsc052m";
+ name = "kxmlrpcclient-5.52.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.49.0";
+ version = "5.52.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.52/modemmanager-qt-5.52.0.tar.xz";
+ sha256 = "14y6ficyimb3ny5ynbqh5h39pfaw3gj0x91wjppdp0z6vnmwpj88";
+ name = "modemmanager-qt-5.52.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.49.0";
+ version = "5.52.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.52/networkmanager-qt-5.52.0.tar.xz";
+ sha256 = "0pmxb6cjziilqamnqyi5wrz97fv6djizqfbpr4549icrki1ssy8p";
+ name = "networkmanager-qt-5.52.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.49.0";
+ version = "5.52.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.52/oxygen-icons5-5.52.0.tar.xz";
+ sha256 = "1pnky38m4mzlplzj90l5nzvvdk7h3nj0alzm273y2r8lm6szvjhn";
+ name = "oxygen-icons5-5.52.0.tar.xz";
};
};
plasma-framework = {
- version = "5.49.0";
+ version = "5.52.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.52/plasma-framework-5.52.0.tar.xz";
+ sha256 = "1krqsn7k2xv4adwymcd1cxd2y5g3xs11nfrir598pibgxicx9hk4";
+ name = "plasma-framework-5.52.0.tar.xz";
};
};
prison = {
- version = "5.49.0";
+ version = "5.52.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.52/prison-5.52.0.tar.xz";
+ sha256 = "1cf4g446r1h9gm9ghx3vhfy3k6bm4cnd9n0sq4ng9awmg49qi6ld";
+ name = "prison-5.52.0.tar.xz";
};
};
purpose = {
- version = "5.49.0";
+ version = "5.52.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.52/purpose-5.52.0.tar.xz";
+ sha256 = "0qg24d215m98vb90glp3i4kq03zk4zlpm5l94whsqpy7sqgxcdsn";
+ name = "purpose-5.52.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.49.0";
+ version = "5.52.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.52/qqc2-desktop-style-5.52.0.tar.xz";
+ sha256 = "1dqh7d3wp25vp6ahbcxc0p53v0nfg9l9zpcpw1qqlb8blnrs7s1f";
+ name = "qqc2-desktop-style-5.52.0.tar.xz";
};
};
solid = {
- version = "5.49.0";
+ version = "5.52.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.52/solid-5.52.0.tar.xz";
+ sha256 = "1jh2i6g6b7cgc2q1pdbqs082rnm6bc6bajx6zbr715aijp2pdxxj";
+ name = "solid-5.52.0.tar.xz";
};
};
sonnet = {
- version = "5.49.0";
+ version = "5.52.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.52/sonnet-5.52.0.tar.xz";
+ sha256 = "1a711dcrwa6c82vvypg8jnc45xhkpzi6rprgsagkipcql0n7y0qi";
+ name = "sonnet-5.52.0.tar.xz";
+ };
+ };
+ syndication = {
+ version = "5.52.0";
+ src = fetchurl {
+ url = "${mirror}/stable/frameworks/5.52/syndication-5.52.0.tar.xz";
+ sha256 = "16ly3lsdd4q8mm36lq8ygnqx98kdmgqz41fzh3si0lygxsvf96hd";
+ name = "syndication-5.52.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.49.0";
+ version = "5.52.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.52/syntax-highlighting-5.52.0.tar.xz";
+ sha256 = "0dv1yijl755900pvkxf130q1idjlvrcq1ah660s9d108yam1ff19";
+ name = "syntax-highlighting-5.52.0.tar.xz";
};
};
threadweaver = {
- version = "5.49.0";
+ version = "5.52.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.52/threadweaver-5.52.0.tar.xz";
+ sha256 = "1hlnwfnknc7937hg0jl3f100ch9qpffsxxy5c180i9infgqanqm2";
+ name = "threadweaver-5.52.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 000000000000..71ee520995c4
--- /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 24adb2a141e8..5b92458d89e9 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/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 4e3ba399cc3f..165f9139ff1f 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
# Provides the mig command used by the build scripts
++ optional stdenv.isDarwin bootstrap_cmds;
buildInputs = [ openssl ]
- ++ optionals (stdenv.hostPlatform.isLinux) [ keyutils ]
+ ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic") [ keyutils ]
++ optionals (!libOnly) [ openldap libedit ];
preConfigure = "cd ./src";
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
description = "MIT Kerberos 5";
homepage = http://web.mit.edu/kerberos/;
license = licenses.mit;
- platforms = platforms.unix;
+ platforms = platforms.unix ++ platforms.windows;
maintainers = with maintainers; [ wkennington ];
};
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 20ab104874dc..abbb2457f6ae 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3
-, gtk-doc, gtk2, python2Packages, lua, gobjectIntrospection
+, gtk-doc, gtk2, python2Packages, lua, gobject-introspection
}:
let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
autoconf automake libtool gnome3.gnome-common gtk-doc gtk2
- python pygtk lua gobjectIntrospection
+ python pygtk lua gobject-introspection
];
preConfigure = ''
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index 194b57c05342..91ad59ad27a0 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3
-, gtk-doc, gtk3, libX11, libXext, libXrender, gobjectIntrospection
+, gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection
}:
stdenv.mkDerivation rec {
name = "keybinder3-${version}";
- version = "0.3.0";
+ version = "0.3.2";
src = fetchFromGitHub {
- owner = "engla";
+ owner = "kupferlauncher";
repo = "keybinder";
rev = "keybinder-3.0-v${version}";
- sha256 = "1jdcrfhvqffhc2h69197wkpc5j5synk5mm8rqhz27qfrfhh4vf0q";
+ sha256 = "196ibn86j54fywfwwgyh89i9wygm4vh7ls19fn20vrnm6ijlzh9r";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
buildInputs = [
- autoconf automake libtool gnome3.gnome-common gtk-doc
- libX11 libXext libXrender gobjectIntrospection gtk3
+ gnome3.gnome-common gtk-doc gtk3
+ libX11 libXext libXrender gobject-introspection
];
preConfigure = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library for registering global key bindings";
- homepage = https://github.com/engla/keybinder/;
+ homepage = https://github.com/kupferlauncher/keybinder/;
license = licenses.mit;
platforms = platforms.linux;
maintainers = [ maintainers.cstrahan ];
diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index 8be8eb713572..d270e2f0678d 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/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix
index 935f52eeb71c..5ca68b4361af 100644
--- a/pkgs/development/libraries/kyotocabinet/default.nix
+++ b/pkgs/development/libraries/kyotocabinet/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
patches = [(fetchurl {
name = "gcc6.patch";
- url = "http://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch";
+ url = "https://src.fedoraproject.org/rpms/kyotocabinet/raw/master/f/kyotocabinet-1.2.76-gcc6.patch";
sha256 = "1h5k38mkiq7lz8nd2gbn7yvimcz49g3z7phn1cr560bzjih8rz23";
})];
diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix
index 873ccc5665df..54d33e5f425e 100644
--- a/pkgs/development/libraries/lasso/default.nix
+++ b/pkgs/development/libraries/lasso/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobjectIntrospection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }:
+{ stdenv, autoconf, automake, autoreconfHook, fetchurl, glib, gobject-introspection, gtk-doc, libtool, libxml2, libxslt, openssl, pkgconfig, python27Packages, xmlsec, zlib }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ autoconf automake glib gobjectIntrospection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];
+ buildInputs = [ autoconf automake glib gobject-introspection gtk-doc libtool libxml2 libxslt openssl python27Packages.six xmlsec zlib ];
configurePhase = ''
./configure --with-pkg-config=$PKG_CONFIG_PATH \
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index a269069fb048..26e2bd0811c0 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.3";
src = fetchFromGitHub {
- sha256 = "0lhdncwg2xbd3gy65rx8w2qcxvcwfirzkl762zdwqxf6bj6p2hvb";
+ sha256 = "04b2wii5d0ypar8wrk0msybdq01z1r23xsvnn67bi2mffvczi5l2";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix
index 824c685ce932..f4018cbf9614 100644
--- a/pkgs/development/libraries/lensfun/default.nix
+++ b/pkgs/development/libraries/lensfun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }:
+{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, cmake }:
stdenv.mkDerivation rec {
version = "0.3.95";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib zlib libpng cmake gnumake3 ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ glib zlib libpng ];
configureFlags = [ "-v" ];
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 04e8eab4d287..b678a0893867 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/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 2b50c09af5cc..c459a4048e45 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -2,21 +2,21 @@
stdenv.mkDerivation rec {
name = "leveldb-${version}";
- version = "1.18";
+ version = "1.20";
src = fetchFromGitHub {
owner = "google";
repo = "leveldb";
rev = "v${version}";
- sha256 = "1bnsii47vbyqnbah42qgq6pbmmcg4k3fynjnw7whqfv6lpdgmb8d";
+ sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y";
};
buildPhase = ''
- make all leveldbutil libmemenv.a
+ make all
'';
installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
- for file in *.dylib*; do
+ for file in out-shared/*.dylib*; do
install_name_tool -id $out/lib/$file $file
done
'') + # XXX consider removing above after transition to cmake in the next release
@@ -27,9 +27,10 @@ stdenv.mkDerivation rec {
mkdir -p $out/include/leveldb/helpers
cp helpers/memenv/memenv.h $out/include/leveldb/helpers
- cp lib* $out/lib
+ cp out-shared/lib* $out/lib
+ cp out-static/lib* $out/lib
- cp leveldbutil $out/bin
+ cp out-static/leveldbutil $out/bin
";
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix
index 7de72ed73a65..39f493d821c3 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 de796307de1a..7bd2a1ec5738 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 4bb806b91d8a..525ec6e35f60 100644
--- a/pkgs/development/libraries/libaccounts-glib/default.nix
+++ b/pkgs/development/libraries/libaccounts-glib/default.nix
@@ -1,31 +1,52 @@
-{ stdenv, fetchFromGitLab, autoconf, automake, glib
-, gtk-doc, libtool, libxml2, libxslt, pkgconfig, sqlite }:
+{ stdenv, fetchFromGitLab, meson, ninja, glib, check, python3, vala, gtk-doc, glibcLocales
+, libxml2, libxslt, pkgconfig, sqlite, docbook_xsl, docbook_xml_dtd_43, gobject-introspection }:
-let version = "1.23"; in
stdenv.mkDerivation rec {
name = "libaccounts-glib-${version}";
+ version = "1.24";
+
+ outputs = [ "out" "dev" "devdoc" "py" ];
src = fetchFromGitLab {
- sha256 = "11cvl3ch0y93756k90mw1swqv0ylr8qgalmvcn5yari8z4sg6cgg";
- rev = "VERSION_${version}";
- repo = "libaccounts-glib";
owner = "accounts-sso";
+ repo = "libaccounts-glib";
+ rev = version;
+ sha256 = "0y8smg1rd279lrr9ad8b499i8pbkajmwd4xn41rdh9h93hs9apn7";
};
- buildInputs = [ glib libxml2 libxslt sqlite ];
- nativeBuildInputs = [ autoconf automake gtk-doc libtool pkgconfig ];
+ # See: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/22
+ patches = [ ./py-override.patch ];
- postPatch = ''
- NOCONFIGURE=1 ./autogen.sh
- '';
+ nativeBuildInputs = [
+ check
+ docbook_xml_dtd_43
+ docbook_xsl
+ glibcLocales
+ gobject-introspection
+ gtk-doc
+ meson
+ ninja
+ pkgconfig
+ vala
+ ];
- configurePhase = ''
- HAVE_GCOV_FALSE="#" ./configure $configureFlags --prefix=$out
- '';
+ buildInputs = [
+ glib
+ libxml2
+ libxslt
+ python3.pkgs.pygobject3
+ sqlite
+ ];
- NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46
+ LC_ALL = "en_US.UTF-8";
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ mesonFlags = [
+ "-Dpy-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides"
+ ];
+
+ 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/libaccounts-glib/py-override.patch b/pkgs/development/libraries/libaccounts-glib/py-override.patch
new file mode 100644
index 000000000000..4179f4fa0af0
--- /dev/null
+++ b/pkgs/development/libraries/libaccounts-glib/py-override.patch
@@ -0,0 +1,38 @@
+diff --git a/libaccounts-glib/pygobject/meson.build b/libaccounts-glib/pygobject/meson.build
+index fa1f4a0..588c4ce 100644
+--- a/libaccounts-glib/pygobject/meson.build
++++ b/libaccounts-glib/pygobject/meson.build
+@@ -1,11 +1,19 @@
+-python3 = import('python3')
+-python_exec = python3.find_python()
+-python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))'])
++py_override = get_option('py-overrides-dir')
+
+-if python_exec_result.returncode() != 0
+- error('Failed to retreive the python GObject override directory')
++if py_override == ''
++ python3 = import('python3')
++ python_exec = python3.find_python()
++
++ python_exec_result = run_command(python_exec, ['-c', 'import gi; from os.path import abspath; print(abspath(gi._overridesdir))'])
++
++ if python_exec_result.returncode() != 0
++ error('Failed to retreive the python GObject override directory')
++ endif
++
++ py_override = python_exec_result.stdout().strip()
+ endif
+
+-install_data('Accounts.py',
+- install_dir: join_paths(python_exec_result.stdout().strip())
++install_data(
++ 'Accounts.py',
++ install_dir: py_override
+ )
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index 0000000..2c33804
+--- /dev/null
++++ b/meson_options.txt
+@@ -0,0 +1 @@
++option('py-overrides-dir', type : 'string', value : '', description: 'Path to pygobject overrides directory')
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index b94c845479aa..a08a1e335232 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 000000000000..e63bfd20c797
--- /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/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 8bf0e4bcb93c..46cc30a8944f 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -5,7 +5,7 @@
, glib, dbus-glib, gtkVersion ? "3"
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
-, python2Packages, gobjectIntrospection, vala
+, python2Packages, gobject-introspection, vala
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
}:
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib dbus-glib
- python pygobject2 pygtk gobjectIntrospection vala
+ python pygobject2 pygtk gobject-introspection vala
] ++ (if gtkVersion == "2"
then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
else [ libindicator-gtk3 ]);
diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14166.patch b/pkgs/development/libraries/libarchive/CVE-2017-14166.patch
deleted file mode 100644
index b729ae41e0ad..000000000000
--- a/pkgs/development/libraries/libarchive/CVE-2017-14166.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001
-From: Joerg Sonnenberger
-Date: Tue, 5 Sep 2017 18:12:19 +0200
-Subject: [PATCH] Do something sensible for empty strings to make fuzzers
- happy.
-
----
- libarchive/archive_read_support_format_xar.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
-index 7a22beb9d..93eeacc5e 100644
---- a/libarchive/archive_read_support_format_xar.c
-+++ b/libarchive/archive_read_support_format_xar.c
-@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt)
- uint64_t l;
- int digit;
-
-+ if (char_cnt == 0)
-+ return (0);
-+
- l = 0;
- digit = *p - '0';
- while (digit >= 0 && digit < 10 && char_cnt-- > 0) {
-@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt)
- {
- int64_t l;
- int digit;
--
-+
-+ if (char_cnt == 0)
-+ return (0);
-+
- l = 0;
- while (char_cnt-- > 0) {
- if (*p >= '0' && *p <= '7')
diff --git a/pkgs/development/libraries/libarchive/CVE-2017-14502.patch b/pkgs/development/libraries/libarchive/CVE-2017-14502.patch
deleted file mode 100644
index dad8a93a8a81..000000000000
--- a/pkgs/development/libraries/libarchive/CVE-2017-14502.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001
-From: Joerg Sonnenberger
-Date: Sat, 9 Sep 2017 17:47:32 +0200
-Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR
- archives.
-
-Reported-By: OSS-Fuzz issue 573
----
- libarchive/archive_read_support_format_rar.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
-index cbb14c32d..751de6979 100644
---- a/libarchive/archive_read_support_format_rar.c
-+++ b/libarchive/archive_read_support_format_rar.c
-@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry,
- return (ARCHIVE_FATAL);
- }
- filename[filename_size++] = '\0';
-- filename[filename_size++] = '\0';
-+ /*
-+ * Do not increment filename_size here as the computations below
-+ * add the space for the terminating NUL explicitly.
-+ */
-+ filename[filename_size] = '\0';
-
- /* Decoded unicode form is UTF-16BE, so we have to update a string
- * conversion object for it. */
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 7625abf38fb3..029be971ac17 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,24 +10,13 @@ assert xarSupport -> libxml2 != null;
stdenv.mkDerivation rec {
name = "libarchive-${version}";
- version = "3.3.2";
+ version = "3.3.3";
src = fetchurl {
url = "${meta.homepage}/downloads/${name}.tar.gz";
- sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd";
+ sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms";
};
- patches = [
- ./CVE-2017-14166.patch
- ./CVE-2017-14502.patch
-
- # LibreSSL patch; this is from upstream, and can be removed when the next release is made.
- (fetchpatch {
- url = "https://github.com/libarchive/libarchive/commit/5da00ad75b09e262774ec3675bbe4d5a4502a852.patch";
- sha256 = "0np1i9r6mfxmbksj7mmf5abpnmlmg63704p9z3ihjh2rnq596c1v";
- })
- ];
-
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 0c0fc3861c9e..a887384f94da 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 54fb89df0451..5153b63e91c5 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/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index c02e2108f237..57c3e123377a 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
It is associated with GNU Binutils, and elsewhere often distributed with
it.
'';
- homepage = http://www.gnu.org/software/binutils/;
+ homepage = https://www.gnu.org/software/binutils/;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ericson2314 ];
platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix
index 585f6f18bbab..eb38c2e38a69 100644
--- a/pkgs/development/libraries/libblockdev/default.nix
+++ b/pkgs/development/libraries/libblockdev/default.nix
@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, libxslt, docbook_xsl
-, docbook_xml_dtd_43, python3, gobjectIntrospection, glib, udev, kmod, parted, libyaml
+, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted, libyaml
, cryptsetup, lvm2, dmraid, utillinux, libbytesize, libndctl, nss, volume_key
}:
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" ];
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
- autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 python3 gobjectIntrospection
+ autoreconfHook pkgconfig gtk-doc libxslt docbook_xsl docbook_xml_dtd_43 python3 gobject-introspection
];
buildInputs = [
diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch
deleted file mode 100644
index 81822654aeb4..000000000000
--- 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 4bddec6b0ffd..0f9cc9aaf964 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);
- size_t strlcat(char *dst, const char *src, size_t siz);
- 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_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);
++#endif
++
++#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)
-+#endif
{
- /* print type */
- switch (mode & S_IFMT) {
+@@ -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)
+ {
+ 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 36410e842a5d..a8d1925e5c0d 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 66bd1e9232ba..000000000000
--- 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 000000000000..fc07cfb6e855
--- /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 f61e0d242943..000000000000
--- 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 76977b745197..f68141ef3b47 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 000000000000..f116360474e4
--- /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 8addb6128f0c..460a58a19a70 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/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
index 9dc3c1d11ba1..5c50d093243c 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
ISO-9660 filesystems (libiso9660), as well as utility
programs such as an audio CD player and an extractor.
'';
- homepage = http://www.gnu.org/software/libcdio/;
+ homepage = https://www.gnu.org/software/libcdio/;
license = licenses.gpl2Plus;
platforms = platforms.linux ++ platforms.darwin;
};
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index e60f5e316bd0..6dec972e249b 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
-let version = "4.0.2"; in
+let version = "4.0.3"; in
stdenv.mkDerivation {
name = "libcec-${version}";
src = fetchurl {
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
- sha256 = "09xsw9hfymzl9fi9r2r8n5cxk80fc00x9drsy1r59pgbycqxvf5q";
+ sha256 = "1713qs4nrynkcr3mgs1i7xj10lcyaxqipwiz9p0lfn4xrzjdd47g";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 22debc6d68aa..9e7d608b5124 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 e4864aded279..b8d25f48b3b7 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, sqlite, gnome3
-, clutter-gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:
+, clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }:
let
pname = "libchamplain";
@@ -9,11 +9,13 @@ 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";
};
- nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [ pkgconfig gobject-introspection ];
propagatedBuildInputs = [ glib gtk3 cairo clutter-gtk sqlite libsoup ];
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index f524c9402558..c802bd68ab08 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./gets-undeclared.patch ./size_t.patch ];
nativeBuildInputs = [ pkgconfig gperf ];
-
+
buildInputs =
[ zlib bzip2 lzo
libgcrypt
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
line. It is written in C and has Guile (Scheme) bindings.
'';
- homepage = http://nongnu.org/libchop/;
+ homepage = https://www.nongnu.org/libchop/;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
platforms = platforms.gnu ++ platforms.linux;
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
index 6d37eb19c712..a2f6858a05c9 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 ce67a8efa80e..6e6ca647fc0f 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 347e3218c1dc..c4824bf7a05b 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";
@@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libevent openssl ];
+ # Running tests in parallel does not work
+ enableParallelChecking = false;
+
doCheck = !stdenv.isDarwin;
- checkPhase = "ctest";
meta = with stdenv.lib; {
description = "C client library for Couchbase";
diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix
index 59e576fd3923..5dc153dd5ccc 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 5a0006ad6c6e..d399998455e1 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/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index 0b06aef95240..bef7a161dd3b 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection, libxml2
-, gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }:
+{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection, libxml2
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43, glibcLocales, dbus, xvfb_run, glib, gtk3, gnome3 }:
let
- version = "3.28.5";
+ version = "3.30.2";
pname = "libdazzle";
in
stdenv.mkDerivation {
@@ -13,17 +13,20 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg";
+ sha256 = "1m9n1gcxndly24rjkxzvmx02a2rkb6ad4cy7p6ncanm1kyp0wxvq";
};
- nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ];
+ nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 glibcLocales dbus xvfb_run ];
buildInputs = [ glib gtk3 ];
mesonFlags = [
"-Denable_gtk_doc=true"
];
- doCheck = true;
+ LC_ALL = "en_US.UTF-8";
+
+ # https://gitlab.gnome.org/GNOME/libdazzle/issues/25
+ doCheck = false;
checkPhase = ''
export NO_AT_BRIDGE=1
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 1342ee6773f7..72c3ca0e2b05 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 9c25757efb03..32b0c9758f73 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/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix
index 730cef6f6960..8fbbae43f619 100644
--- a/pkgs/development/libraries/libdbusmenu/default.nix
+++ b/pkgs/development/libraries/libdbusmenu/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, lib, file
, pkgconfig, intltool
, glib, dbus-glib, json-glib
-, gobjectIntrospection, vala_0_38, gnome-doc-utils
+, gobject-introspection, vala_0_38, gnome-doc-utils
, gtkVersion ? null, gtk2 ? null, gtk3 ? null }:
with lib;
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
glib dbus-glib json-glib
- gobjectIntrospection vala_0_38 gnome-doc-utils
+ gobject-introspection vala_0_38 gnome-doc-utils
] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3);
postPatch = ''
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index 3df820bc1263..e3172c2fc1f8 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -2,12 +2,12 @@
, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
stdenv.mkDerivation rec {
- version = "3.13.6";
+ version = "3.13.7";
name = "libdigidocpp-${version}";
src = fetchurl {
url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
- sha256 = "1sdrj7664737k3kbnj2xrnilnx5ifj8hg42z8pxagb0j81x0pnqj";
+ sha256 = "1d8yx8avijp55p53fz4pd4ihjz6nyap0g8dq23bwg33411mdiqff";
};
nativeBuildInputs = [ cmake pkgconfig xxd ];
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 5107d8898d46..3d236ab5851a 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.96";
src = fetchurl {
url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2";
- sha256 = "0g6d9wsnb7lx8r1m4kq8js0wsc5jl20cz1csnlh6z9s8jpfd313f";
+ sha256 = "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd";
};
outputs = [ "out" "dev" "bin" ];
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index 649541e22627..edd84d5a9515 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libelf }:
let
- version = "20180809";
+ version = "20181024";
src = fetchurl {
url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
# Upstream displays this hash broken into three parts:
diff --git a/pkgs/development/libraries/libe-book/default.upstream b/pkgs/development/libraries/libe-book/default.upstream
index 30a6d3907877..a06a9af99bb4 100644
--- a/pkgs/development/libraries/libe-book/default.upstream
+++ b/pkgs/development/libraries/libe-book/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/libebook/files/
+url https://sourceforge.net/projects/libebook/files/
SF_version_dir libe-book-
version_link '[.]tar.xz/download$'
SF_redirect
diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix
index 96de7eb7b3c2..df67b849cd3f 100644
--- a/pkgs/development/libraries/libestr/default.nix
+++ b/pkgs/development/libraries/libestr/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libestr-0.1.10";
+ name = "libestr-0.1.11";
src = fetchurl {
url = "http://libestr.adiscon.com/files/download/${name}.tar.gz";
- sha256 = "0g3hmh3wxgjbn5g6cgy2l0ja806jd0ayp22bahcds3kmdq95wrdx";
+ sha256 = "0910ifzcs8kpd3srrr4fvbacgh2zrc6yn7i4rwfj6jpzhlkjnqs6";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 2ef1d3965ce9..7998655e46b6 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- name = "libevdev-1.5.9";
+ name = "libevdev-1.6.0";
src = fetchurl {
url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";
- sha256 = "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1";
+ sha256 = "057qdrwbhql2lvr4kxljk3yqjsmh65hyrfbr2b681nc7b635q07m";
};
buildInputs = [ python ];
diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index 8d264c929a5b..7b3df42c24c3 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/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 215f587bb6b4..384e3370ec9c 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
name = "libffi-3.2.1";
src = fetchurl {
- url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
+ url = "https://sourceware.org/pub/libffi/${name}.tar.gz";
sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
};
diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix
index 2c3085fc384f..4b02d651929b 100644
--- a/pkgs/development/libraries/libfive/default.nix
+++ b/pkgs/development/libraries/libfive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen3_3,
+{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen,
zlib, libpng, boost, qt5, guile
}:
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0";
};
nativeBuildInputs = [ cmake ninja pkgconfig ];
- buildInputs = [ eigen3_3 zlib libpng boost qt5.qtimageformats guile ];
+ buildInputs = [ eigen zlib libpng boost qt5.qtimageformats guile ];
# Link "Studio" binary to "libfive-studio" to be more obvious:
postFixup = ''
ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
'';
-
+
meta = with stdenv.lib; {
description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile";
homepage = https://libfive.com/;
diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index b59bf9a06ac5..1b00ff4c0fbb 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libusb1, confuse
+{ stdenv, fetchurl, cmake, pkgconfig, libusb1, libconfuse
, cppSupport ? true, boost ? null
, pythonSupport ? true, python ? null, swig ? null
, docSupport ? true, doxygen ? null
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = with stdenv.lib; [ cmake confuse ]
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = with stdenv.lib; [ libconfuse ]
++ optionals cppSupport [ boost ]
++ optionals pythonSupport [ python swig ]
++ optionals docSupport [ doxygen ];
diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix
new file mode 100644
index 000000000000..a6fe2bc1435f
--- /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/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index d8708114c8e6..173dc1f722b4 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
name = "libgcrypt-${version}";
- version = "1.8.3";
+ version = "1.8.4";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
- sha256 = "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36";
+ sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n";
};
outputs = [ "out" "dev" "info" ];
@@ -21,21 +21,13 @@ stdenv.mkDerivation rec {
# The build enables -O2 by default for everything else.
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
- # Accepted upstream, should be in next update: #42150, https://dev.gnupg.org/T4034
- patches = [ ./fix-jent-locking.patch ];
-
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ libgpgerror ]
++ stdenv.lib.optional stdenv.isDarwin gettext
++ stdenv.lib.optional enableCapabilities libcap;
- preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
- # This is intentional: gpg-error-config is a shell script that will work during the build
- mkdir -p "$NIX_BUILD_TOP"/bin
- ln -s ${libgpgerror.dev}/bin/gpg-error-config "$NIX_BUILD_TOP/bin"
- export PATH="$NIX_BUILD_TOP/bin:$PATH"
- '';
+ configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ];
# Make sure libraries are correct for .pc and .la files
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
diff --git a/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch b/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch
deleted file mode 100644
index 5394e51468e6..000000000000
--- a/pkgs/development/libraries/libgcrypt/fix-jent-locking.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bbe989be6ca5e093d5244413590bd80e12c2ec9b Mon Sep 17 00:00:00 2001
-From: Will Dietz
-Date: Sun, 17 Jun 2018 18:53:58 -0500
-Subject: [PATCH] rndjent: move locking to fix trying to obtain held lock,
- hanging
-
----
- random/rndjent.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/random/rndjent.c b/random/rndjent.c
-index 0c5a820b..3740ddd4 100644
---- a/random/rndjent.c
-+++ b/random/rndjent.c
-@@ -334,9 +334,10 @@ _gcry_rndjent_get_version (int *r_active)
- {
- if (r_active)
- {
-- lock_rng ();
- /* Make sure the RNG is initialized. */
- _gcry_rndjent_poll (NULL, 0, 0);
-+
-+ lock_rng ();
- /* To ease debugging we store 2 for a clock_gettime based
- * implementation and 1 for a rdtsc based code. */
- *r_active = jent_rng_collector? is_rng_available () : 0;
---
-2.18.0-rc2
-
diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix
similarity index 57%
rename from pkgs/desktops/gnome-3/misc/libgda/default.nix
rename to pkgs/development/libraries/libgda/default.nix
index 069c769efaa2..ee9323ebc5c0 100644
--- a/pkgs/desktops/gnome-3/misc/libgda/default.nix
+++ b/pkgs/development/libraries/libgda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, vala
, overrideCC, gcc6
, mysqlSupport ? false, mysql ? null
, postgresSupport ? false, postgresql ? null
@@ -8,26 +8,13 @@ assert mysqlSupport -> mysql != null;
assert postgresSupport -> postgresql != null;
(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec {
- name = "libgda-${version}";
- version = "5.2.4";
+ pname = "libgda";
+ version = "5.2.8";
src = fetchurl {
- url = "mirror://gnome/sources/libgda/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e";
+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0id4my5wh2m6rd7ijqp2azsjdb4l4yjrv3imq71kly00gjc6v1z2";
};
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "libgda"; attrPath = "gnome3.libgda"; };
- };
-
- patches = [
- (fetchurl {
- name = "libgda-fix-encoding-of-copyright-headers.patch";
- url = https://bug787685.bugzilla-attachments.gnome.org/attachment.cgi?id=359901;
- sha256 = "11qj7f7zsiw8jy18vlwz2prlxpg4iq350sws3qwfwsv0lnmncmfq";
- })
- ];
-
configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ]
++ (optional (mysqlSupport) "--with-mysql=yes")
++ (optional (postgresSupport) "--with-postgres=yes");
@@ -36,11 +23,17 @@ assert postgresSupport -> postgresql != null;
hardeningDisable = [ "format" ];
- nativeBuildInputs = [ pkgconfig intltool itstool libxml2 ];
- buildInputs = with stdenv.lib; [ gtk3 openssl ]
+ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 vala ];
+ buildInputs = with stdenv.lib; [ gtk3 openssl gnome3.libgee ]
++ optional (mysqlSupport) mysql.connector-c
++ optional (postgresSupport) postgresql;
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Database access library";
homepage = http://www.gnome-db.org/;
diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 5e94d00dcdb7..d54f9203d23d 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 29f346e9acfb..9bec00b9f52d 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
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
user. It provides X authentication facilities for running
programs in an X session.
'';
- homepage = http://www.nongnu.org/gksu/;
+ homepage = https://www.nongnu.org/gksu/;
license = stdenv.lib.licenses.lgpl2;
maintainers = [ stdenv.lib.maintainers.romildo ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index e7157afbaee5..8dcbab95e976 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 33276b424e7c..6938cfd8c51d 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 9d1427f7f451..e713eb7f8918 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -17,27 +17,22 @@
};
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) ''
ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h
- '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+ '' + lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl) ''
ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h
+ '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''
+ ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
+ ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
'';
outputs = [ "out" "dev" "info" ];
diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
new file mode 100644
index 000000000000..c498ef3460ac
--- /dev/null
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }:
+
+stdenv.mkDerivation rec {
+ name = "libgpiod-unstable-${version}";
+ version = "2018-10-07";
+
+ src = fetchgit {
+ url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git";
+ rev = "4bf402d3a49336eacd33654441d575bd267780b8";
+ sha256 = "01f3jzb133z189sxdiz9qiy65p0bjqhynfllidbpxdr0cxkyyc1d";
+ };
+
+ buildInputs = [ kmod ];
+ nativeBuildInputs = [
+ autoconf-archive
+ pkgconfig
+ autoreconfHook
+ ];
+
+ configureFlags = [
+ "--enable-tools=${if enable-tools then "yes" else "no"}"
+ "--enable-bindings-cxx"
+ "--prefix=$(out)"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "C library and tools for interacting with the linux GPIO character device";
+ longDescription = ''
+ Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use
+ the character device instead. This library encapsulates the ioctl calls and
+ data structures behind a straightforward API.
+ '';
+ homepage = https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/;
+ license = licenses.lgpl2;
+ maintainers = [ maintainers.expipiplus1 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index 74aee0f39c7e..f178af349088 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/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix
index 548114b642fa..430ebcfd309d 100644
--- a/pkgs/development/libraries/libgrss/default.nix
+++ b/pkgs/development/libraries/libgrss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, vala, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
let
version = "0.7.0";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7";
};
- nativeBuildInputs = [ pkgconfig vala gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+ nativeBuildInputs = [ pkgconfig vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
buildInputs = [ glib libxml2 libsoup ];
configureFlags = [
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 20a08885142a..bcd37396bf7f 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 d0be9e25b87e..fcc76938b3ed 100644
--- a/pkgs/development/libraries/libgtop/default.nix
+++ b/pkgs/development/libraries/libgtop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobjectIntrospection, libtool, gnome3, gtk-doc }:
+{ stdenv, fetchurl, fetchpatch, glib, pkgconfig, perl, gettext, gobject-introspection, libtool, gnome3, gtk-doc }:
let
pname = "libgtop";
version = "2.38.0";
@@ -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";
};
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [ glib ];
- nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig gnome3.gnome-common libtool gtk-doc perl gettext gobject-introspection ];
preConfigure = ''
./autogen.sh
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index 54760549a164..d3dea766cbbb 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, glib, gobjectIntrospection, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, udev, glib, gobject-introspection, gnome3 }:
let
pname = "libgudev";
@@ -9,11 +9,11 @@ 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";
};
- nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig gobject-introspection ];
buildInputs = [ udev glib ];
# There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway.
diff --git a/pkgs/development/libraries/libguestfs/appliance.nix b/pkgs/development/libraries/libguestfs/appliance.nix
index d47b0902818d..9c2b317ab086 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 6001946cb970..aad6365e4c2d 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/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
new file mode 100644
index 000000000000..7e80ec817d19
--- /dev/null
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
+, gtk-doc, docbook_xsl, docbook_xml_dtd_43
+, gtk3, gnome3
+, dbus, xvfb_run, libxml2
+}:
+
+let
+ pname = "libhandy";
+ version = "0.0.5";
+in stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+
+ outputs = [ "out" "dev" "devdoc" "glade" ];
+ outputBin = "dev";
+
+ src = fetchFromGitLab {
+ domain = "source.puri.sm";
+ owner = "Librem5";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08";
+ };
+
+ nativeBuildInputs = [
+ meson ninja pkgconfig gobject-introspection vala
+ gtk-doc docbook_xsl docbook_xml_dtd_43
+ ];
+ buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ];
+ checkInputs = [ dbus xvfb_run ];
+
+ mesonFlags = [
+ "-Dgtk_doc=true"
+ ];
+
+ PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
+ PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
+
+ doCheck = true;
+
+ checkPhase = ''
+ export NO_AT_BRIDGE=1
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ meson test --print-errorlogs
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A library full of GTK+ widgets for mobile phones";
+ homepage = https://source.puri.sm/Librem5/libhandy;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix
index 5d120f61e086..0830b45b308b 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 91e8e2d50f19..c1ec533ba5b8 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf
-, gnome3, glib, json-glib, libarchive, libsoup, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, meson, ninja, makeFontsConf, vala_0_40
+, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
let
pname = "libhttpseverywhere";
@@ -8,11 +8,12 @@ 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";
};
- nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig ];
+ # Broken with newest Vala https://gitlab.gnome.org/GNOME/libhttpseverywhere/issues/1
+ nativeBuildInputs = [ vala_0_40 gobject-introspection meson ninja pkgconfig ];
buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
mesonFlags = [ "-Denable_valadoc=true" ];
diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix
index bcc85abbd3ef..ab1858c51a61 100644
--- a/pkgs/development/libraries/libiberty/default.nix
+++ b/pkgs/development/libraries/libiberty/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://gcc.gnu.org/;
+ homepage = https://gcc.gnu.org/;
license = licenses.lgpl2;
description = "Collection of subroutines used by various GNU programs";
maintainers = with maintainers; [ abbradar ericson2314 ];
diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix
deleted file mode 100644
index 2243f832b7a6..000000000000
--- a/pkgs/development/libraries/libibverbs/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-
- verbs = rec {
- version = "1.1.8";
- name = "libibverbs-${version}";
- url = "http://downloads.openfabrics.org/verbs/${name}.tar.gz";
- sha256 = "13w2j5lrrqxxxvhpxbqb70x7wy0h8g329inzgfrvqv8ykrknwxkw";
- };
-
- drivers = {
- libmlx4 = rec {
- version = "1.0.6";
- name = "libmlx4-${version}";
- url = "http://downloads.openfabrics.org/mlx4/${name}.tar.gz";
- sha256 = "f680ecbb60b01ad893490c158b4ce8028a3014bb8194c2754df508d53aa848a8";
- };
- libmthca = rec {
- version = "1.0.6";
- name = "libmthca-${version}";
- url = "http://downloads.openfabrics.org/mthca/${name}.tar.gz";
- sha256 = "cc8ea3091135d68233d53004e82b5b510009c821820494a3624e89e0bdfc855c";
- };
- };
-
-in stdenv.mkDerivation rec {
-
- inherit (verbs) name version ;
-
- srcs = [
- ( fetchurl { inherit (verbs) url sha256 ; } )
- ( fetchurl { inherit (drivers.libmlx4) url sha256 ; } )
- ( fetchurl { inherit (drivers.libmthca) url sha256 ; } )
- ];
-
- sourceRoot = name;
-
- # Install userspace drivers
- postInstall = ''
- for dir in ${drivers.libmlx4.name} ${drivers.libmthca.name} ; do
- cd ../$dir
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include"
- export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS -L$out/lib"
- ./configure $configureFlags
- make -j$NIX_BUILD_CORES
- make install
- done
-
- mkdir -p $out/lib/pkgconfig
- cat >$out/lib/pkgconfig/ibverbs.pc < version.m4;
'';
meta = with stdenv.lib; {
- description = "Utility library for managing the libnvdimm (non-volatile memory device) sub-system in the Linux kernel";
- homepage = https://github.com/pmem/ndctl;
- license = licenses.lgpl21;
- maintainers = with maintainers; [];
- platforms = platforms.linux;
+ description = "Tools for managing the Linux Non-Volatile Memory Device sub-system";
+ homepage = https://github.com/pmem/ndctl;
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ thoughtpolice ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix
index 685518efbd22..925154e1d459 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 12a45d088ef6..94b3dc90a0b6 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 b6d5912581ba..87382bd1ae21 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-29";
src = fetchurl {
- url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
- sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
+ url = "mirror://sourceforge/ngspice/ngspice-29.tar.gz";
+ sha256 = "0jjwz73naq7l9yhwdqbpnrfckywp2ffkppivxjv8w92zq7xhyvcd";
};
nativeBuildInputs = [ flex bison ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "The Next Generation Spice (Electronic Circuit Simulator)";
homepage = http://ngspice.sourceforge.net;
- license = with licenses; [ "BSD" gpl2 ];
+ license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING
maintainers = with maintainers; [ bgamari ];
platforms = platforms.linux;
};
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index 1f58545574cd..8582dc4e1d90 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/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index 22eb8ed64dd8..a4b0b26a345b 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
name = "libnih-${version}";
src = fetchurl {
- url = "http://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
+ url = "https://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
};
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index fbde49a54d08..d427f7decf8b 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook
-, glib, gdk_pixbuf, gobjectIntrospection }:
+, glib, gdk_pixbuf, gobject-introspection }:
stdenv.mkDerivation rec {
ver_maj = "0.7";
@@ -14,12 +14,13 @@ stdenv.mkDerivation rec {
# disable tests as we don't need to depend on gtk+(2/3)
configureFlags = [ "--disable-tests" ];
- nativeBuildInputs = [ pkgconfig autoreconfHook gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook gobject-introspection ];
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 a66a1a88c743..cb70d803ac0c 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 855d921206e9..ea792b007bae 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/libodfgen/default.upstream b/pkgs/development/libraries/libodfgen/default.upstream
index 44f66561bd81..bd78e974e42f 100644
--- a/pkgs/development/libraries/libodfgen/default.upstream
+++ b/pkgs/development/libraries/libodfgen/default.upstream
@@ -1,4 +1,4 @@
-url http://sourceforge.net/projects/libwpd/files/libodfgen/
+url https://sourceforge.net/projects/libwpd/files/libodfgen/
SF_version_dir libodfgen-
version_link '[.]tar.xz/download$'
SF_redirect
diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix
index 531e30ba7552..8131420cfd65 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 f6fe9ecd03a0..d7c3b747924a 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/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix
index 2c59fa03ea06..a1db11d9a8e7 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/libraries/libopcodes/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A library from binutils for manipulating machine code";
- homepage = http://www.gnu.org/software/binutils/;
+ homepage = https://www.gnu.org/software/binutils/;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ericson2314 ];
platforms = platforms.unix;
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 135f1caf97e2..30fa7d749a12 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -2,14 +2,14 @@
, fixedPoint ? false, withCustomModes ? true }:
let
- version = "1.2.1";
+ version = "1.3";
in
stdenv.mkDerivation rec {
name = "libopus-${version}";
src = fetchurl {
url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
- sha256 = "0ch7yzgg4bn1g36bpjsfrgs4n19c84d7wpdida6yzifrrhwx7byg";
+ sha256 = "0l651n19h0vhc0sn6w2c95hgqks1i8m4b3j04ncaznzjznp6jgag";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix
new file mode 100644
index 000000000000..4ca0849447f3
--- /dev/null
+++ b/pkgs/development/libraries/libopusenc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, libopus }:
+
+let
+ version = "0.2.1";
+in
+stdenv.mkDerivation rec {
+ name = "libopusenc-${version}";
+
+ src = fetchurl {
+ url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
+ sha256 = "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ doCheck = true;
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libopus ];
+
+ meta = with stdenv.lib; {
+ description = "Library for encoding .opus audio files and live streams";
+ license = licenses.bsd3;
+ homepage = http://www.opus-codec.org/;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ pmiddend ];
+ };
+}
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index 111bea61eb65..e0f3be230709 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -1,25 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, gtk-doc, docbook_xsl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gobject-introspection, 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" ];
nativeBuildInputs = [
- pkgconfig vala intltool gobjectIntrospection gtk-doc docbook_xsl
+ pkgconfig vala intltool gobject-introspection gtk-doc docbook_xsl
];
buildInputs = [ glib libsoup libxml2 libxslt ];
checkInputs = [ check curl perl ];
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/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
new file mode 100644
index 000000000000..e889a3cb275c
--- /dev/null
+++ b/pkgs/development/libraries/libosmium/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, protozero, expat, zlib, bzip2, boost }:
+
+stdenv.mkDerivation rec {
+ name = "libosmium-${version}";
+ version = "2.14.2";
+
+ src = fetchFromGitHub {
+ owner = "osmcode";
+ repo = "libosmium";
+ rev = "v${version}";
+ sha256 = "123ri1l0a2b9fljgpwsl7z2w4i3kmgxz79d4ns9z4mwbp8sw0250";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ protozero zlib bzip2 expat boost ];
+
+
+ meta = with stdenv.lib; {
+ description = "Fast and flexible C++ library for working with OpenStreetMap data";
+ homepage = "https://osmcode.org/libosmium/";
+ license = licenses.boost;
+ maintainers = with maintainers; [ das-g ];
+ };
+}
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 1304aff9e3b3..8c0094a3152b 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/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 54e2616e782f..cb675f4d3e58 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libp11-${version}";
- version = "0.4.7";
+ version = "0.4.9";
src = fetchFromGitHub {
owner = "OpenSC";
repo = "libp11";
rev = name;
- sha256 = "0n1i0pxj6l0vdq8gpdwfp5p9qd7wkymg0lpy6a17ix8hpqsljlhr";
+ sha256 = "1f0ir1mnr4wxxnql8ld2aa6288fn04fai5pr0sics7kbdm1g0cki";
};
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index f94f327ea02e..267859cb217c 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 25e55e45d1e2..ffd195b6462d 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/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 0e5a4a866e8f..9c1ed80e51ed 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,20 +3,20 @@
assert zlib != null;
let
- patchVersion = "1.6.34";
+ patchVersion = "1.6.35";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
- sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6";
+ sha256 = "011fq5wgyz07pfrqs9albixbiksx3agx5nkcf3535gbvhlwv5khq";
};
whenPatched = stdenv.lib.optionalString apngSupport;
in stdenv.mkDerivation rec {
name = "libpng" + whenPatched "-apng" + "-${version}";
- version = "1.6.34";
+ version = "1.6.35";
src = fetchurl {
url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
- sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig";
+ sha256 = "1mxwjf5cdzk7g0y51gl9w3f0j5ypcls05i89kgnifjaqr742x493";
};
postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index 5afed2b2a2f5..4aa06c0cd704 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 ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A C++ library to access PostgreSQL databases";
homepage = http://pqxx.org/development/libpqxx/;
- license = lib.licenses.postgresql;
+ license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.eelco ];
};
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index f5c92e11c357..65da1f8e9d1d 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk-doc, icu
-, libxslt, pkgconfig, python2 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, icu
+, libxslt, pkgconfig, python3 }:
let
@@ -11,21 +11,21 @@ let
owner = "publicsuffix";
};
- libVersion = "0.17.0";
+ libVersion = "0.20.2";
in stdenv.mkDerivation rec {
name = "libpsl-${version}";
version = "${libVersion}-list-${listVersion}";
src = fetchFromGitHub {
- sha256 = "08dbl6ihnlf0kj4c9pdpjv9mmw7p676pzh1q184wl32csra5pzdd";
+ sha256 = "0ijingxpnvl5xnna32j93ijagvjsvw2lhj71q39hz9xhzjzrda9b";
rev = "libpsl-${libVersion}";
repo = "libpsl";
owner = "rockdaboot";
};
buildInputs = [ icu libxslt ];
- nativeBuildInputs = [ autoreconfHook docbook_xsl gtk-doc pkgconfig python2 ];
+ nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc pkgconfig python3 ];
postPatch = ''
substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h
@@ -33,7 +33,6 @@ in stdenv.mkDerivation rec {
'';
preAutoreconf = ''
- mkdir m4
gtkdocize
'';
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 377d9fe50be7..bb823f69135a 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "libqalculate-${version}";
- version = "2.6.2";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
- sha256 = "1wfffki5ib65z9ndph2c4a17qx62f07q12adzabs7ij9gv94y9j5";
+ sha256 = "1fakvv5vvx99pp5x72djp3313jxjwfhsl34gbyrpgkj5b4nnm7mz";
};
outputs = [ "out" "dev" "doc" ];
@@ -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 8cca5333d084..2f20150ad164 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 b291ec2fdf0b..048ba48bb674 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 9803e09610e6..e009a9f920b1 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 422ace462a94..30d8d8a94e9d 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/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix
deleted file mode 100644
index 3b84ead7cec1..000000000000
--- a/pkgs/development/libraries/librdmacm/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, libibverbs }:
-
-stdenv.mkDerivation rec {
- name = "librdmacm-${version}";
- version = "1.1.0";
-
- src = fetchurl {
- url = "https://www.openfabrics.org/downloads/rdmacm/${name}.tar.gz";
- sha256 = "1ic0qd5ayvkybh4pxc5qx7sqvny1fv4anhxlf1nmsn0h926q844g";
- };
-
- buildInputs = [ libibverbs ];
-
- postInstall = ''
- mkdir -p $out/lib/pkgconfig
- cat >$out/lib/pkgconfig/rdmacm.pc < $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/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index bf0393fd89a6..55c747540f77 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,28 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
+{ stdenv
+, fetchurl
+
+, pkgconfig
+
+, zlib
+, libjpeg
+, xz
+}:
-let
- version = "4.0.9";
-in
stdenv.mkDerivation rec {
+ version = "4.0.10";
name = "libtiff-${version}";
src = fetchurl {
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
- sha256 = "1kfg4q01r4mqn7dj63ifhi6pmqzbf4xax6ni6kkk81ri5kndwyvf";
+ sha256 = "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic";
};
- prePatch = let
- debian = fetchurl {
- # When the URL disappears, it typically means that Debian has new patches
- # (probably security) and updating to new tarball will apply them as well.
- url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.9-6.debian.tar.xz;
- sha256 = "10yk5npchxscgsnd7ihd3bbbw2fxkl7ni0plm43c9q4nwp6ms52f";
- };
- in ''
- tar xf ${debian}
- patches="$patches $(sed 's|^|debian/patches/|' < debian/patches/series)"
- '';
-
outputs = [ "bin" "dev" "out" "man" "doc" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix
index bd0084dbaaf7..7a72fa2b7a31 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 efd63148fb10..1af7548ac962 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 f19e9d274313..cd8192e34fb9 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.11";
formattedVersion = lib.replaceChars ["."] ["_"] version;
# Make sure we override python, so the correct version is chosen
@@ -16,8 +16,8 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "arvidn";
repo = "libtorrent";
- rev = "libtorrent-${formattedVersion}";
- sha256 = "04w3pjzd6q9wplj1dcphylxn1i2b2x0iw1l0ma58ymh14swdah7a";
+ rev = "libtorrent_${formattedVersion}";
+ sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index b3636eef2621..026674e44fc4 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -31,7 +31,6 @@ let
doCheck = false; # hangs, tries to access the net?
checkInputs = [ check ];
- checkPhase = "ctest";
meta = with stdenv.lib; {
description = "P2P FOSS instant messaging application aimed to replace Skype";
@@ -49,7 +48,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 21e3a15449c2..b0be3cb3c12d 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 b1e6938a1494..dcc406accbd7 100644
--- a/pkgs/development/libraries/libui/default.nix
+++ b/pkgs/development/libraries/libui/default.nix
@@ -1,57 +1,53 @@
-{ stdenv, fetchgit, cmake, pkgconfig, gtk3, darwin }:
+{ stdenv, fetchgit, cmake, pkgconfig, gtk3, cf-private, Cocoa }:
let
shortName = "libui";
version = "3.1a";
backend = if stdenv.isDarwin then "darwin" else "unix";
in
- stdenv.mkDerivation rec {
- name = "${shortName}-${version}";
- src = fetchgit {
- url = "https://github.com/andlabs/libui.git";
- rev = "6ebdc96b93273c3cedf81159e7843025caa83058";
- sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn";
- };
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake ] ++
- (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa]
- else if backend == "unix" then [gtk3]
- else null);
+stdenv.mkDerivation rec {
+ name = "${shortName}-${version}";
+ src = fetchgit {
+ url = "https://github.com/andlabs/libui.git";
+ rev = "6ebdc96b93273c3cedf81159e7843025caa83058";
+ sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn";
+ };
- preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
- sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
- '';
- cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
- "-DCMAKE_OSX_SYSROOT="
- "-DCMAKE_OSX_DEPLOYMENT_TARGET="
- ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = stdenv.lib.optional stdenv.isLinux gtk3
+ ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa cf-private /* For NSDefaultRunLoopMode */ ];
- installPhase = ''
- mkdir -p $out/{include,lib}
- mkdir -p $out/lib/pkgconfig
- '' + stdenv.lib.optionalString stdenv.isLinux ''
- mv ./out/${shortName}.so.0 $out/lib/
- ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so
- '' + stdenv.lib.optionalString stdenv.isDarwin ''
- mv ./out/${shortName}.A.dylib $out/lib/
- ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib
- '' + ''
- cp $src/ui.h $out/include
- cp $src/ui_${backend}.h $out/include
+ preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+ sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
+ '';
- cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc
- substituteInPlace $out/lib/pkgconfig/${shortName}.pc \
- --subst-var-by out $out \
- --subst-var-by version "${version}"
- '';
- postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
- install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib
- '';
+ installPhase = ''
+ mkdir -p $out/{include,lib}
+ mkdir -p $out/lib/pkgconfig
+ '' + stdenv.lib.optionalString stdenv.isLinux ''
+ mv ./out/${shortName}.so.0 $out/lib/
+ ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ mv ./out/${shortName}.A.dylib $out/lib/
+ ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib
+ '' + ''
+ cp $src/ui.h $out/include
+ cp $src/ui_${backend}.h $out/include
- meta = {
- 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;
- };
- }
+ cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc
+ substituteInPlace $out/lib/pkgconfig/${shortName}.pc \
+ --subst-var-by out $out \
+ --subst-var-by version "${version}"
+ '';
+ postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+ install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib
+ '';
+
+ 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.";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix
new file mode 100644
index 000000000000..e21f9400848d
--- /dev/null
+++ b/pkgs/development/libraries/libunarr/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+ name = "libunarr-${version}";
+ version = "1.0.1";
+
+ src = fetchurl {
+ url = "https://github.com/selmf/unarr/releases/download/v${version}/unarr-${version}.tar.xz";
+ sha256 = "1db500k6w90qn6qb4j3zcczailmmv81q9lv4bwq516hbncg5p4sl";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/selmf/unarr;
+ description = "A lightweight decompression library with support for rar, tar and zip archives";
+ license = licenses.lgpl3;
+ };
+}
diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix
index 1a4f16046fc1..a072591ca9db 100644
--- a/pkgs/development/libraries/libunique/3.x.nix
+++ b/pkgs/development/libraries/libunique/3.x.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
-, dbus, dbus-glib, gtk3, gobjectIntrospection
+, dbus, dbus-glib, gtk3, gobject-introspection
, gtkdoc, docbook_xml_dtd_45, docbook_xsl
, libxslt, libxml2 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ dbus dbus-glib gtk3 gobjectIntrospection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
+ buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
meta = {
homepage = https://wiki.gnome.org/Attic/LibUnique;
diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix
index 2bb53dd2b97f..8559731d707c 100644
--- a/pkgs/development/libraries/libunique/default.nix
+++ b/pkgs/development/libraries/libunique/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75";
};
+ NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
# patches from Gentoo portage
patches = [
./1.1.6-compiler-warnings.patch
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 24da3a8e2c7d..e066c0723679 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -19,10 +19,22 @@ 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/;
+ homepage = https://www.gnu.org/software/libunistring/;
description = "Unicode string library";
diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix
index f9f0b2b65551..52f01229c4af 100644
--- a/pkgs/development/libraries/libunity/default.nix
+++ b/pkgs/development/libraries/libunity/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
-, glib, vala, dee, gobjectIntrospection, libdbusmenu
+, glib, vala, dee, gobject-introspection, libdbusmenu
, gtk3, intltool, gnome-common, python3, icu }:
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
autoconf
automake
gnome-common
- gobjectIntrospection
+ gobject-introspection
intltool
libtool
pkgconfig
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 6a32ccf5c1b1..2453484cb9c4 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
doCheck = false; # fails
meta = with stdenv.lib; {
- homepage = http://www.nongnu.org/libunwind;
+ homepage = https://www.nongnu.org/libunwind;
description = "A portable and efficient API to determine the call-chain of a program";
maintainers = with maintainers; [ orivej ];
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix
index 4704a1e5c331..adf354c45f2e 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 7ec714f02237..ac5c38a34f11 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 a0ace84bc67d..4fed33a4d357 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.2";
name = "libuv-${version}";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${version}";
- sha256 = "1jjg34ppnlrnb634q9mla7whl7rm9xmjgnzckrznqcycwzir074b";
+ sha256 = "1xfggj0mbbshj7zyccnfw7wyk42qfg4ng3l4aslw014mg8gaskv7";
};
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/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix
index 6868e5c8cfa9..a31968a5373c 100644
--- a/pkgs/development/libraries/libva-utils/default.nix
+++ b/pkgs/development/libraries/libva-utils/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "01org";
repo = "libva-utils";
rev = version;
- sha256 = "113wdmi4r0qligizj9zmd4a8ml1996x9g2zp2i4pmhb8frv9m8j2";
+ sha256 = "0k5v72prcq462x780j9vpqf4ckrpqf536z6say81wpna0l0qbd98";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 0ba49da06cfe..435b7e3c915d 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -6,14 +6,14 @@
stdenv.mkDerivation rec {
name = "libva-${lib.optionalString minimal "minimal-"}${version}";
- version = "2.1.0";
+ version = "2.3.0";
# update libva-utils and vaapiIntel as well
src = fetchFromGitHub {
owner = "01org";
repo = "libva";
rev = version;
- sha256 = "1a60lrgr65hx9b2qp0gjky1298c4d4zp3ap6vnmmz850sxx5rm8w";
+ sha256 = "0zip22b5qwyjygsmrmjq62hdpl9z77d84h5hni8cn6xz5cmbw29z";
};
outputs = [ "dev" "out" ];
diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix
index 6e7005195bf0..0ace54582ebc 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.8.1";
in
stdenv.mkDerivation {
name = "libversion-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
owner = "repology";
repo = "libversion";
rev = version;
- sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601";
+ sha256 = "0h0yfcgxll09dckzjb1im3yf54cjkpsflr7r4kwz1jcr3fxq41fz";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 2d83955de696..74c3d24560cd 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -1,24 +1,24 @@
{ stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl
-, nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl
+, nettle, libgcrypt, pythonPackages, gobject-introspection, libcap_ng, numactl
, xen, libapparmor, vala
}:
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 ];
buildInputs = [
libvirt glib libxml2 intltool libtool yajl nettle libgcrypt
- python pygobject2 gobjectIntrospection libcap_ng numactl libapparmor
+ python pygobject2 gobject-introspection libcap_ng numactl libapparmor
] ++ stdenv.lib.optionals stdenv.isx86_64 [
xen
];
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index fd35864fe343..733482ce2687 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 28cfe56d59b8..44b2a81b2d3c 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/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
deleted file mode 100644
index a39113e05b67..000000000000
--- a/pkgs/development/libraries/libvpx/git.nix
+++ /dev/null
@@ -1,182 +0,0 @@
-{ stdenv, fetchgit, perl, yasm
-, vp8DecoderSupport ? true # VP8 decoder
-, vp8EncoderSupport ? true # VP8 encoder
-, vp9DecoderSupport ? true # VP9 decoder
-, vp9EncoderSupport ? true # VP9 encoder
-, extraWarningsSupport ? false # emit non-fatal warnings
-, werrorSupport ? false # treat warnings as errors (not available with all compilers)
-, debugSupport ? false # debug mode
-, gprofSupport ? false # gprof profiling instrumentation
-, gcovSupport ? false # gcov coverage instrumentation
-, sizeLimitSupport ? true # limit max size to allow in the decoder
-, optimizationsSupport ? true # compiler optimization flags
-, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
-, thumbSupport ? false # build arm assembly in thumb mode
-, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
-, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware
-, debugLibsSupport ? false # include debug version of each library
-, postprocSupport ? true # postprocessing
-, multithreadSupport ? true # multithreaded decoding & encoding
-, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
-, memTrackerSupport ? false # track memory usage
-, spatialResamplingSupport ? true # spatial sampling (scaling)
-, realtimeOnlySupport ? false # build for real-time encoding
-, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding
-, errorConcealmentSupport ? false # decoder conceals losses
-, smallSupport ? false # favor smaller binary over speed
-, postprocVisualizerSupport ? false # macro block/block level visualizers
-, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests
-, webmIOSupport ? true # input from and output to webm container
-, libyuvSupport ? true # libyuv
-, decodePerfTestsSupport ? false # build decoder perf tests with unit tests
-, encodePerfTestsSupport ? false # build encoder perf tests with unit tests
-, multiResEncodingSupport ? false # multiple-resolution encoding
-, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
-, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
-, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
-# Experimental features
-, experimentalSpatialSvcSupport ? false # Spatial scalable video coding
-, experimentalFpMbStatsSupport ? false
-, experimentalEmulateHardwareSupport ? false
-}:
-
-let
- inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
- inherit (stdenv.lib) enableFeature optional optionals;
-in
-
-assert isi686 || isx86_64 || isAarch32 || isMips; # Requires ARM with floating point support
-
-assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
-assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
-/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors.
- Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
- but is only executed if spatialResamplingSupport is enabled */
-assert spatialResamplingSupport;
-assert postprocVisualizerSupport -> postprocSupport;
-assert unitTestsSupport -> curl != null && coreutils != null;
-assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
-assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
-
-stdenv.mkDerivation rec {
- name = "libvpx-git-${version}";
- version = "2015-2-12";
-
- src = fetchgit {
- url = "https://chromium.googlesource.com/webm/libvpx";
- /* DO NOT under any circumstance ever just bump the git commit without
- confirming changes have not been made to the configure system */
- rev = "f4c29ae9ea16c502c980a81ca9683327d5051929";
- sha256 = "1w17vpcy44wlpr2icbwhcf3mrinybwy0bhif30p707hbxfxrj474";
- };
-
- patchPhase = ''patchShebangs .'';
-
- outputs = [ "bin" "dev" "out" ];
- setOutputFlags = false;
-
- configurePlatforms = [];
- configureFlags = [
- (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
- (enableFeature vp8EncoderSupport "vp8-encoder")
- (enableFeature vp8DecoderSupport "vp8-decoder")
- (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9")
- (enableFeature vp9EncoderSupport "vp9-encoder")
- (enableFeature vp9DecoderSupport "vp9-decoder")
- (enableFeature extraWarningsSupport "extra-warnings")
- (enableFeature werrorSupport "werror")
- "--disable-install-docs"
- (enableFeature examplesSupport "install-bins")
- "--enable-install-libs"
- "--disable-install-srcs"
- (enableFeature debugSupport "debug")
- (enableFeature gprofSupport "gprof")
- (enableFeature gcovSupport "gcov")
- # Required to build shared libraries
- (enableFeature (!isCygwin) "pic")
- (enableFeature (isi686 || isx86_64) "use-x86inc")
- (enableFeature optimizationsSupport "optimizations")
- (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
- (enableFeature thumbSupport "thumb")
- "--enable-libs"
- (enableFeature examplesSupport "examples")
- "--disable-docs"
- "--as=yasm"
- # Limit default decoder max to WHXGA
- (if sizeLimitSupport then "--size-limit=5120x3200" else null)
- (enableFeature fastUnalignedSupport "fast-unaligned")
- "--disable-codec-srcs"
- (enableFeature debugLibsSupport "debug-libs")
- (enableFeature isMips "dequant-tokens")
- (enableFeature isMips "dc-recon")
- (enableFeature postprocSupport "postproc")
- (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
- (enableFeature multithreadSupport "multithread")
- (enableFeature internalStatsSupport "internal-stats")
- (enableFeature memTrackerSupport "mem-tracker")
- (enableFeature spatialResamplingSupport "spatial-resampling")
- (enableFeature realtimeOnlySupport "realtime-only")
- (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
- (enableFeature errorConcealmentSupport "error-concealment")
- # Shared libraries are only supported on ELF platforms
- (if isDarwin || isCygwin then
- "--enable-static --disable-shared"
- else
- "--disable-static --enable-shared")
- (enableFeature smallSupport "small")
- (enableFeature postprocVisualizerSupport "postproc-visualizer")
- (enableFeature unitTestsSupport "unit-tests")
- (enableFeature webmIOSupport "webm-io")
- (enableFeature libyuvSupport "libyuv")
- (enableFeature decodePerfTestsSupport "decode-perf-tests")
- (enableFeature encodePerfTestsSupport "encode-perf-tests")
- (enableFeature multiResEncodingSupport "multi-res-encoding")
- (enableFeature temporalDenoisingSupport "temporal-denoising")
- (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising")
- (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking")
- (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth")
- (enableFeature (experimentalSpatialSvcSupport ||
- experimentalFpMbStatsSupport ||
- experimentalEmulateHardwareSupport) "experimental")
- ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- #"--extra-cflags="
- #"--prefix="
- #"--libc="
- #"--libdir="
- "--enable-external-build"
- # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
- # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
- # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
- "--force-target=${stdenv.hostPlatform.config}${
- if stdenv.hostPlatform.isDarwin then
- if stdenv.hostPlatform.osxMinVersion == "10.10" then "14"
- else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13"
- else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12"
- else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11"
- else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10"
- else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9"
- else "8"
- else ""}-gcc"
- (if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
- ] # Experimental features
- ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
- ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
- ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
-
- nativeBuildInputs = [ perl yasm ];
-
- buildInputs = [ ]
- ++ optionals unitTestsSupport [ coreutils curl ];
-
- enableParallelBuilding = true;
-
- postInstall = ''moveToOutput bin "$bin" '';
-
- meta = with stdenv.lib; {
- description = "WebM VP8/VP9 codec SDK";
- homepage = https://www.webmproject.org/;
- license = licenses.bsd3;
- maintainers = with maintainers; [ codyopel ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index cc3f19ab7d31..6cfc5060b610 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -1,20 +1,23 @@
-{ fetchurl, stdenv, glib, pkgconfig, udev, libgudev }:
+{ stdenv, fetchFromGitHub, autoreconfHook, glib, pkgconfig, udev, libgudev }:
stdenv.mkDerivation rec {
name = "libwacom-${version}";
- version = "0.29";
+ version = "0.31";
- src = fetchurl {
- url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";
- sha256 = "1diklgcjhmvcxi9p1ifp6wcnyr6k7z9jhrlzfhzjqd6zipk01slw";
+ src = fetchFromGitHub {
+ owner = "linuxwacom";
+ repo = "libwacom";
+ rev = "libwacom-${version}";
+ sha256 = "0qjd4bn2abwzic34cm0sw3srx02spszbsvfdbzbpn2cb62b5gjmw";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ glib udev libgudev ];
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/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 8cd0536e2946..0e8533a5639f 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -27,11 +27,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libwebp-${version}";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
- sha256 = "0nr2hd4iv61fphdbx49g96a56jkmdm9n2qss7jpkg1pii11rq9c4";
+ sha256 = "08nr124aqlfpmdawpfizp56x93pvhr0v741fz78s1zyv49a4lx4c";
};
configureFlags = [
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 1147c9606ad4..8c0db4a7396f 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 eed0c77af804..bf685862adf1 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 f2d05d14d693..eb591d4e184d 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobjectIntrospection, gnome3}:
+{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3}:
let
pname = "libwnck";
@@ -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";
};
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec{
configureFlags = [ "--enable-introspection" ];
- nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
propagatedBuildInputs = [ libX11 gtk3 ];
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0";
diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix
index 49012f8bddf8..736b1a45fa20 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 9d262910e14f..99808be2b216 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 b0730452db89..591a3e451ab3 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/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
new file mode 100644
index 000000000000..e730cc6eaabf
--- /dev/null
+++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:
+
+stdenv.mkDerivation rec {
+ name = "libxkbcommon-0.7.2";
+
+ src = fetchurl {
+ url = "http://xkbcommon.org/download/${name}.tar.xz";
+ sha256 = "1n5rv5n210kjnkyrvbh04gfwaa7zrmzy1393p8nyqfw66lkxr918";
+ };
+
+ outputs = [ "out" "dev" ];
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ yacc flex xkeyboard_config libxcb ];
+
+ configureFlags = [
+ "--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb"
+ "--with-x-locale-root=${libX11.out}/share/X11/locale"
+ ];
+
+ preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
+ sed -i 's/,--version-script=.*$//' Makefile
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A library to handle keyboard descriptions";
+ homepage = http://xkbcommon.org;
+ license = licenses.mit;
+ maintainers = with maintainers; [ garbas ttuegel ];
+ platforms = with platforms; unix;
+ };
+}
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 263796cdc783..773389e60f54 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl
-, glib, isocodes, gobjectIntrospection }:
+, glib, isocodes, gobject-introspection }:
let
version = "5.4";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig gtk-doc docbook_xsl ];
- buildInputs = [ gobjectIntrospection ];
+ buildInputs = [ gobject-introspection ];
preAutoreconf = ''
export NOCONFIGURE=1
diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix
index 035bfa8d6dc3..471789d3e0f6 100644
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/pkgs/development/libraries/libxl/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "libxl";
+ pname = "libxl";
version = "3.8.1";
src = fetchurl {
- url = "http://www.libxl.com/download/${name}-lin-${version}.tar.gz";
+ url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm";
};
diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix
index 81c5b5e2891b..aff5f8ac4451 100644
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
meta = {
description = "Library for rasterizing 2-D vector graphics";
- homepage = http://www.gnu.org/software/libxmi/;
+ homepage = https://www.gnu.org/software/libxmi/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
maintainers = [ ];
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index c359ea10b665..54ed569f666f 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"
@@ -33,10 +33,11 @@ in stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "doc" ]
++ lib.optional pythonSupport "py"
- ++ lib.optional enableStatic "static";
+ ++ lib.optional (enableStatic && enableShared) "static";
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.
@@ -66,7 +67,7 @@ in stdenv.mkDerivation rec {
moveToOutput bin/xml2-config "$dev"
moveToOutput lib/xml2Conf.sh "$dev"
moveToOutput share/man/man1 "$bin"
- '' + lib.optionalString enableStatic ''
+ '' + lib.optionalString (enableStatic && enableShared) ''
moveToOutput lib/libxml2.a "$static"
'';
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
new file mode 100644
index 000000000000..201940f1705e
--- /dev/null
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, libuuid, gobject-introspection, gtk-doc, shared-mime-info, python3, docbook_xsl, docbook_xml_dtd_43 }:
+
+stdenv.mkDerivation rec {
+ name = "libxmlb-${version}";
+ version = "0.1.5";
+
+ outputs = [ "out" "lib" "dev" "devdoc" ];
+
+ src = fetchFromGitHub {
+ owner = "hughsie";
+ repo = "libxmlb";
+ rev = version;
+ sha256 = "037j9fwkzsy3765gl2grkrmbxrfs67wlai213qbgsa5xn6fb8y68";
+ };
+
+ nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ];
+
+ buildInputs = [ glib libuuid ];
+
+ mesonFlags = [
+ "--libexecdir=${placeholder "out"}/libexec"
+ "-Dgtkdoc=true"
+ ];
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "A library to help create and query binary XML blobs";
+ homepage = https://github.com/hughsie/libxmlb;
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ jtojnar ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix
index c99c3f42bfc1..6b9375c73815 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/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 2ad14efa3223..3f963c7ca19a 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = {
- homepage = http://www.gnu.org/software/lightning/;
+ homepage = https://www.gnu.org/software/lightning/;
description = "Run-time code generation library";
longDescription = ''
GNU lightning is a library that generates assembly language code
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index f2a8d75a9cbb..ab0e51bae261 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 ad6d2df1d8bd..13fbe2b55b67 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/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 4dd5d8bcd26f..6463f83d282b 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -1,15 +1,16 @@
{ stdenv, fetchurl, lib, darwin }:
# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
-let
- version = "2018.02.28";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "live555-${version}";
+ version = "2018.11.26";
src = fetchurl { # the upstream doesn't provide a stable URL
- url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz";
- sha256 = "0zi47asv1qmb09g321m02q684i3c90vci0mgkdh1mlmx2rbg1d1d";
+ urls = [
+ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
+ "https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
+ ];
+ sha256 = "0izvy50xmyycrl7aj43kj1w9k8lcsmdqwwqk1cdizmc4wmj56f5k";
};
postPatch = ''
@@ -23,28 +24,39 @@ stdenv.mkDerivation {
'';
configurePhase = ''
+ runHook preConfigure
+
./genMakefiles ${{
x86_64-darwin = "macosx";
i686-linux = "linux";
x86_64-linux = "linux-64bit";
aarch64-linux = "linux-64bit";
}.${stdenv.hostPlatform.system}}
+
+ runHook postConfigure
'';
installPhase = ''
+ runHook preInstall
+
for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do
install -dm755 $out/{bin,lib,include/$dir}
install -m644 $dir/*.a "$out/lib"
install -m644 $dir/include/*.h* "$out/include/$dir"
done
+
+ runHook postInstall
'';
nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
+ enableParallelBuilding = true;
+
meta = with lib; {
description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
homepage = http://www.live555.com/liveMedia/;
license = licenses.lgpl21Plus;
platforms = platforms.unix;
+ broken = stdenv.hostPlatform.isAarch64;
};
}
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 0bb3a67d9502..ef187a15efc7 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
postInstall = ''
moveToOutput bin "$bin"
- moveToOutput "lib/*.a" REMOVE # until someone needs it
''
# add lmdb.pc (dynamic only)
+ ''
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix
index 34dfe26ad70b..232a67c23f3b 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 3fdad73d9fa5..7a390021d1fa 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 7b672aebe445..b2fba7df509b 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 aecd75656dae..cad5d0d7ecad 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 0546bdc6359b..0c88cff77732 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,67 +8,56 @@
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 ];
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
];
- configurePhase = ''
- scons configure PREFIX="$out" BOOST_INCLUDES="${boost.dev}/include" \
- BOOST_LIBS="${boost.out}/lib" \
- CAIRO_INCLUDES="${cairo.dev}/include" \
- CAIRO_LIBS="${cairo.out}/lib" \
- FREETYPE_INCLUDES="${freetype.dev}/include" \
- FREETYPE_LIBS="${freetype.out}/lib" \
- GDAL_CONFIG="${gdal}/bin/gdal-config" \
- HB_INCLUDES="${harfbuzz.dev}/include" \
- HB_LIBS="${harfbuzz.out}/lib" \
- ICU_INCLUDES="${icu.dev}/include" \
- ICU_LIBS="${icu.out}/lib" \
- JPEG_INCLUDES="${libjpeg.dev}/include" \
- JPEG_LIBS="${libjpeg.out}/lib" \
- PNG_INCLUDES="${libpng.dev}/include" \
- PNG_LIBS="${libpng.out}/lib" \
- PROJ_INCLUDES="${proj}/include" \
- PROJ_LIBS="${proj}/lib" \
- SQLITE_INCLUDES="${sqlite.dev}/include" \
- SQLITE_LIBS="${sqlite.out}/lib" \
- TIFF_INCLUDES="${libtiff.dev}/include" \
- TIFF_LIBS="${libtiff.out}/lib" \
- WEBP_INCLUDES="${libwebp}/include" \
- WEBP_LIBS="${libwebp}/lib" \
- XML2_INCLUDES="${libxml2.dev}/include" \
- XML2_LIBS="${libxml2.out}/lib"
- '';
+ prefixKey = "PREFIX=";
- buildPhase = false;
-
- installPhase = ''
- mkdir -p "$out"
- scons install
- '';
+ configureFlags = [
+ "BOOST_INCLUDES=${boost.dev}/include"
+ "BOOST_LIBS=${boost.out}/lib"
+ "CAIRO_INCLUDES=${cairo.dev}/include"
+ "CAIRO_LIBS=${cairo.out}/lib"
+ "FREETYPE_INCLUDES=${freetype.dev}/include"
+ "FREETYPE_LIBS=${freetype.out}/lib"
+ "GDAL_CONFIG=${gdal}/bin/gdal-config"
+ "HB_INCLUDES=${harfbuzz.dev}/include"
+ "HB_LIBS=${harfbuzz.out}/lib"
+ "ICU_INCLUDES=${icu.dev}/include"
+ "ICU_LIBS=${icu.out}/lib"
+ "JPEG_INCLUDES=${libjpeg.dev}/include"
+ "JPEG_LIBS=${libjpeg.out}/lib"
+ "PNG_INCLUDES=${libpng.dev}/include"
+ "PNG_LIBS=${libpng.out}/lib"
+ "PROJ_INCLUDES=${proj}/include"
+ "PROJ_LIBS=${proj}/lib"
+ "SQLITE_INCLUDES=${sqlite.dev}/include"
+ "SQLITE_LIBS=${sqlite.out}/lib"
+ "TIFF_INCLUDES=${libtiff.dev}/include"
+ "TIFF_LIBS=${libtiff.out}/lib"
+ "WEBP_INCLUDES=${libwebp}/include"
+ "WEBP_LIBS=${libwebp}/lib"
+ "XML2_INCLUDES=${libxml2.dev}/include"
+ "XML2_LIBS=${libxml2.out}/lib"
+ ];
meta = with stdenv.lib; {
description = "An open source toolkit for developing mapping applications";
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 3b6102715391..064f04f220cd 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 573215227369..f28ff1b0a21f 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/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix
index 764d50190b9e..5748d3402449 100644
--- a/pkgs/development/libraries/mbedtls/1.3.nix
+++ b/pkgs/development/libraries/mbedtls/1.3.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
- name = "mbedtls-1.3.20";
+ name = "mbedtls-1.3.22";
src = fetchurl {
url = "https://tls.mbed.org/download/${name}-gpl.tgz";
- sha256 = "0vv69c1c5rr7jcwwivx06fbfixgig90pjznh2c6cn841hgwm9z00";
+ sha256 = "0ms4s41z88mz7b6gsnp7jslms4v0115k7gw51i6kx6ng9am43l6y";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index d99944228c73..de72b8a6e1d9 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -4,22 +4,23 @@
, cmake
, ninja
, perl # Project uses Perl for scripting and testing
+, python
, enableThreading ? true # Threading can be disabled to increase security https://tls.mbed.org/kb/development/thread-safety-and-multi-threading
}:
stdenv.mkDerivation rec {
name = "mbedtls-${version}";
- version = "2.12.0";
+ version = "2.14.0";
src = fetchFromGitHub {
owner = "ARMmbed";
repo = "mbedtls";
rev = name;
- sha256 = "09snlzlbn8yq95dnfbj2g5bh6y4q82xkaph7qp9ddnlqiaqcji2h";
+ sha256 = "0115qk69j4dvkvw5ci34zlajzhk2hbkiqbjyzr0lxf0mnqacl03i";
};
- nativeBuildInputs = [ cmake ninja perl ];
+ nativeBuildInputs = [ cmake ninja perl python ];
postConfigure = stdenv.lib.optionals enableThreading ''
perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer
diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix
deleted file mode 100644
index 11bd437d377e..000000000000
--- a/pkgs/development/libraries/mdds/0.12.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- version = "0.12.1";
- name = "mdds-${version}";
-
- src = fetchurl {
- url = "https://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
- sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
- };
-
- meta = {
- homepage = https://gitlab.com/mdds/mdds;
- description = "A collection of multi-dimensional data structure and indexing algorithm";
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix
deleted file mode 100644
index 8ff1d6d5e9a2..000000000000
--- a/pkgs/development/libraries/mdds/0.7.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- version = "0.7.1";
- name = "mdds-${version}";
-
- src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/multidimalgorithm/mdds_${version}.tar.bz2";
- sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy";
- };
-
- meta = {
- homepage = https://gitlab.com/mdds/mdds/;
- description = "A collection of multi-dimensional data structure and indexing algorithm";
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index 43fee9ccead8..3b0a0441cc4e 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 2bfdb679156c..000000000000
--- 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 5466ffc90858..000000000000
--- 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 ff933b2ec284..000000000000
--- 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 919443045e46..000000000000
--- 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 565d5e6c2737..000000000000
--- 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 58ac66bd5511..000000000000
--- 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 5ec0d9024eff..000000000000
--- 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 372ce4a27a39..000000000000
--- 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 4818ee63d4c9..000000000000
--- 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 72841e2a2cce..000000000000
--- 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 e29a8464076d..000000000000
--- 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 000000000000..94e90a1c5871
--- /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 0a8a3c75a1c0..faf1261da4a5 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:
@@ -23,25 +25,27 @@
with stdenv.lib;
-if ! lists.elem stdenv.hostPlatform.system platforms.mesaPlatforms then
+if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then
throw "unsupported platform for Mesa"
else
let
defaultGalliumDrivers =
- if stdenv.isAarch32
+ optionals (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 (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.6";
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 = "04nwxykmc80gicmal0zkk8is34rmbqawmfckirqhrps9h97zmfly";
};
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 (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
+ ++ lib.optionals stdenv.isLinux [ 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/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
index 47391567fb9b..37813db89347 100644
--- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
+++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
@@ -1,4 +1,4 @@
-From 9c9df280b318c26aece9873cf77b32e4f95634c1 Mon Sep 17 00:00:00 2001
+From 2a1e32b4105fe95413a615a44d40938920ea1a19 Mon Sep 17 00:00:00 2001
From: David McFarland
Date: Mon, 6 Aug 2018 15:52:11 -0300
Subject: [PATCH] disk_cache: include dri driver path in cache key
@@ -11,10 +11,10 @@ timestamps in /nix/store are zero.
2 files changed, 6 insertions(+)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
-index 07bf052175..aea09f60b3 100644
+index bafb57439a..a22e2e41eb 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
-@@ -30,6 +30,9 @@ noinst_LTLIBRARIES = \
+@@ -35,6 +35,9 @@ noinst_LTLIBRARIES = \
libmesautil.la \
libxmlconfig.la
@@ -25,28 +25,28 @@ index 07bf052175..aea09f60b3 100644
$(PTHREAD_CFLAGS) \
-I$(top_srcdir)/include
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
-index 4a762eff20..8086c0be75 100644
+index 368ec41792..071220b2ba 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
-@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *timestamp,
+@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
/* Create driver id keys */
- size_t ts_size = strlen(timestamp) + 1;
+ size_t id_size = strlen(driver_id) + 1;
+ size_t key_size = strlen(DISK_CACHE_KEY) + 1;
size_t gpu_name_size = strlen(gpu_name) + 1;
- cache->driver_keys_blob_size += ts_size;
+ cache->driver_keys_blob_size += id_size;
+ cache->driver_keys_blob_size += key_size;
cache->driver_keys_blob_size += gpu_name_size;
/* We sometimes store entire structs that contains a pointers in the cache,
-@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *timestamp,
+@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
uint8_t *drv_key_blob = cache->driver_keys_blob;
DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size)
- DRV_KEY_CPY(drv_key_blob, timestamp, ts_size)
+ DRV_KEY_CPY(drv_key_blob, driver_id, id_size)
+ DRV_KEY_CPY(drv_key_blob, DISK_CACHE_KEY, key_size)
DRV_KEY_CPY(drv_key_blob, gpu_name, gpu_name_size)
DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size)
DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size)
--
-2.18.0
+2.19.1
diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch
index feb6ffe428c0..18e7d5437b15 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/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix
index 6779268dbdc1..c2a61ec6fc1c 100644
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
name = "mxml-${version}";
- version = "2.9";
+ version = "2.12";
- src = fetchurl {
- url = "http://www.msweet.org/files/project3/${name}.tar.gz";
- sha256 = "14pzhlfidj5v1qbxy7a59yn4jz9pnjrs2zwalz228jsq7ijm9vfd";
+ src = fetchFromGitHub {
+ owner = "michaelrsweet";
+ repo = "mxml";
+ rev = "v${version}";
+ sha256 = "1m8z503vnfpm576gjpp1h7zmx09n50if2i28v24yx80j820ip94s";
};
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "A small XML library";
homepage = https://www.msweet.org/mxml/;
diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix
index e68661b44ec3..ca72557242f1 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 d96f90b4bfd6..37195d385627 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/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index b5188cb66d29..849da2e6cad5 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchurl, SDL, eigen, epoxy, fftw, gtest, pkgconfig }:
+{ stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkgconfig }:
stdenv.mkDerivation rec {
name = "movit-${version}";
- version = "1.5.1";
+ version = "1.6.2";
src = fetchurl {
url = "https://movit.sesse.net/${name}.tar.gz";
- sha256 = "1259iq2ixiprk4mn7ypapinbg2w1sjq1aivzzbbch9i23kcfsd44";
+ sha256 = "1q9h086v6h3da4b9qyflcjx73cgnqjhb92rv6g4j90m34dndaa3l";
};
outputs = [ "out" "dev" ];
- GTEST_DIR = "${gtest}";
+ GTEST_DIR = "${gtest.src}/googletest";
propagatedBuildInputs = [ eigen epoxy ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ SDL fftw gtest ];
+ buildInputs = [ SDL2 fftw gtest ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "High-performance, high-quality video filters for the GPU";
diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 87d24854255a..bab52e0fbe07 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "mpich-${version}";
- version = "3.2.1";
+ version = "3.3";
src = fetchurl {
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
- sha256 = "1w9h4g7d46d9l5jbcyfxpaqzpjrc5hyvr9d0ns7278psxpr3pdax";
+ sha256 = "02zs118q9n4xz9qnfc24i2r84vnzgnwnyyqanfv03lf3wqpy17ij";
};
configureFlags = [
diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
index 306becf0c180..de277329961b 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 cfb02ddbf9dd..601e70427a13 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 000000000000..15c82cb12825
--- /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 dd40a3962449..01bf863bbbb1 100644
--- a/pkgs/development/libraries/mythes/default.nix
+++ b/pkgs/development/libraries/mythes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, hunspell, pkgconfig, perl }:
+{ stdenv, fetchurl, hunspell, ncurses, pkgconfig, perl }:
stdenv.mkDerivation rec {
name = "mythes-1.2.4";
@@ -9,11 +9,12 @@ stdenv.mkDerivation rec {
};
buildInputs = [ hunspell ];
- nativeBuildInputs = [ pkgconfig perl ];
+ nativeBuildInputs = [ ncurses pkgconfig perl ];
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 b5d4ea0f4ebf..f29fb9564f31 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 f50b64fca3ed..8f72b333aa48 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/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 56727f5a5d83..815db76d5ac3 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -13,17 +13,18 @@
}:
stdenv.mkDerivation rec {
- version = "6.1";
+ version = "6.1-20181027";
name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";
src = fetchurl {
- url = "mirror://gnu/ncurses/ncurses-${version}.tar.gz";
- sha256 = "05qdmbmrrn88ii9f66rkcmcyzp1kb1ymkx7g040lfkd1nkp7w1da";
+ urls = [
+ "https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz"
+ "ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz"
+ ];
+ sha256 = "1xn6wpi22jc61158w4ifq6s1fvilhmsy1in2srn3plk8pm0d4902";
};
- # The patch st-0.7.patch needs to be removed, if ncurses is upgraded in the future.
- # It is necessary for the 6.1 version of ncurses.
- patches = [ ./st-0.7.patch ] ++ lib.optional (!stdenv.cc.isClang) ./clang.patch;
+ patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;
outputs = [ "out" "dev" "man" ];
setOutputFlags = false; # some aren't supported
@@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
"--without-debug"
"--enable-pc-files"
"--enable-symlinks"
+ "--with-manpage-format=normal"
] ++ lib.optional unicode "--enable-widec"
++ lib.optional (!withCxx) "--without-cxx"
++ lib.optional (abiVersion == "5") "--with-abi-version=5"
@@ -158,7 +160,7 @@ stdenv.mkDerivation rec {
ported to OS/2 Warp!
'';
- homepage = http://www.gnu.org/software/ncurses/;
+ homepage = https://www.gnu.org/software/ncurses/;
license = lib.licenses.mit;
platforms = lib.platforms.all;
diff --git a/pkgs/development/libraries/ncurses/st-0.7.patch b/pkgs/development/libraries/ncurses/st-0.7.patch
deleted file mode 100644
index 956f9b68d68f..000000000000
--- a/pkgs/development/libraries/ncurses/st-0.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/misc/terminfo.src b/misc/terminfo.src
-index 84f4810..ac300a7 100644
---- a/misc/terminfo.src
-+++ b/misc/terminfo.src
-@@ -6260,7 +6260,7 @@ st-0.7|simpleterm 0.7,
- %=%t3%e%p1%d%;m,
- sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
- %t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
-- Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
-+ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
- kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
- kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
- kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index 1040cb9a9343..923bc61f67da 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -1,31 +1,23 @@
-{ stdenv, fetchgit, openssl, doxygen, boost, sqlite, cryptopp, pkgconfig, python, pythonPackages }:
+{ stdenv, fetchFromGitHub, openssl, doxygen
+, boost, sqlite, pkgconfig, python, pythonPackages, wafHook }:
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];
- preConfigure = ''
- patchShebangs waf
- ./waf configure \
- --with-cryptopp=${cryptopp} \
- --boost-includes=${boost.dev}/include \
- --boost-libs=${boost.out}/lib \
- --with-examples \
- --prefix=$out
- '';
- buildPhase = ''
- ./waf
- '';
- installPhase = ''
- ./waf install
- '';
+ nativeBuildInputs = [ pkgconfig wafHook ];
+ buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx];
+ configureFlags = [
+ "--with-openssl=${openssl.dev}"
+ "--boost-includes=${boost.dev}/include"
+ "--boost-libs=${boost.out}/lib"
+ ];
meta = with stdenv.lib; {
homepage = http://named-data.net/;
description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
@@ -45,6 +37,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 d0f992efb2bc..87f9b5effacd 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 7aad5be36f70..61a40753a56f 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 7d0e934d911c..0c597fc4b335 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 a10f52462a8e..1a5656b7ca16 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 68bffd4032d2..39fdb6d4eb2b 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;
@@ -17,11 +18,11 @@ let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
name = "nghttp2-${version}";
- version = "1.32.0";
+ version = "1.35.0";
src = fetchurl {
url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
- sha256 = "0jlndbp4bnyvdg8b59pznrzz0bvwb9nmag7zgcflg51lm1pq2q06";
+ sha256 = "0nfdagjb0apgvms28kr9m8k93di5fv6ww9i1jwpd83y0p4vf5zvh";
};
outputs = [ "bin" "out" "dev" "lib" ];
@@ -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 ff8a54f87f2a..cc5a115ed71e 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 15bdbb1b48e8..d57461853d33 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.4.0";
src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
- sha256 = "0585r6ai9x1bhspffn5w5620wxfl1q1gj476brsnaf7wwnr60hwk";
+ sha256 = "1140gz5za7yvfcphdgxaq1dm4b1vxy1m8d1w0s0smv4vvdvl26ym";
};
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/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 904cdc6a3daa..bbbc818db63d 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -1,13 +1,15 @@
-{ fetchurl, stdenv, octave ? null }:
+{ fetchurl, stdenv, octave ? null, cmake }:
stdenv.mkDerivation rec {
- name = "nlopt-2.4.2";
+ name = "nlopt-${version}";
+ version = "2.5.0";
src = fetchurl {
- url = "http://ab-initio.mit.edu/nlopt/${name}.tar.gz";
- sha256 = "12cfkkhcdf4zmb6h7y6qvvdvqjs2xf9sjpa3rl3bq76px4yn76c0";
+ url = "https://github.com/stevengj/nlopt/archive/v${version}.tar.gz";
+ sha256 = "1bmlsdzkw8xbigiihffyb0kdaqbyfn7dr8s5pdgavy7z05bpmpf6";
};
+ nativeBuildInputs = [ cmake ];
buildInputs = [ octave ];
configureFlags = [
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
];
meta = {
- homepage = http://ab-initio.mit.edu/nlopt/;
+ homepage = "https://nlopt.readthedocs.io/en/latest/";
description = "Free open-source library for nonlinear optimization";
license = stdenv.lib.licenses.lgpl21Plus;
hydraPlatforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix
index c7e133d94b23..3c5ae8537a41 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 ce18498ee858..56804d546673 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,15 @@
{ stdenv, fetchurl
-, CoreServices ? null }:
+, CoreServices ? null
+, buildPackages }:
-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" ];
@@ -21,6 +22,8 @@ stdenv.mkDerivation {
substituteInPlace configure.in --replace '@executable_path/' "$out/lib/"
'';
+ HOST_CC = "cc";
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
configureFlags = [
"--enable-optimize"
"--disable-debug"
@@ -35,9 +38,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 3089e6da23ae..4d48ae0b12bd 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,14 +5,16 @@ let
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
+ version = "3.40.1";
+ underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
name = "nss-${version}";
- version = "3.38";
+ inherit version;
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_${underscoreVersion}_RTM/src/${name}.tar.gz";
+ sha256 = "1wf8qapd2lh8pbjd6pp9m32mx1zyddrmv5c4cr86xj3r5ap6n3jy";
};
buildInputs = [ perl zlib sqlite ]
@@ -42,7 +44,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/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index 969e7534eac4..5fc57a2ef671 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig }:
stdenv.mkDerivation rec {
- name = "nss_wrapper-1.1.3";
+ name = "nss_wrapper-1.1.5";
src = fetchurl {
url = "mirror://samba/cwrap/${name}.tar.gz";
- sha256 = "18rsaw8r8xwn5003arc7xw8iliwbmzxfxgacmp6lhsdwqla4rf69";
+ sha256 = "0srk7hffhkwl811q4pjy0n0gm8rh26akb2bh6avcpbns0zzn9ldn";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix
new file mode 100644
index 000000000000..6c4a23ccaf28
--- /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 63a51a90ccd2..12d3c9ad9420 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.2";
src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
- sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s";
+ sha256 = "17bfsvn72zjqfibnxscyf4hbk3inndh4r89jd2zg7mgqmd2k3fl4";
};
buildInputs = [
diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix
index 44c8f51e856a..a2361b0188eb 100644
--- a/pkgs/development/libraries/ntrack/default.nix
+++ b/pkgs/development/libraries/ntrack/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
name = "ntrack-${version}";
src = fetchurl {
- url = "http://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz";
+ url = "https://launchpad.net/ntrack/main/${version}/+download/${name}.tar.gz";
sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w";
};
@@ -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 b67288296606..aa1886508609 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 f9a75801e101..956c8b58ffc1 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 f86e4d120976..1658e831ddd1 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 8d1a2876a375..3835822673ce 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 a9559c6abfba..136665425280 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 6af15d90cefd..05d78488957a 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -2,10 +2,10 @@
ftgl, freetype}:
stdenv.mkDerivation rec {
- name = "opencascade-oce-0.17.2";
+ name = "opencascade-oce-0.18.3";
src = fetchurl {
- url = https://github.com/tpaviot/oce/archive/OCE-0.17.2.tar.gz;
- sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd";
+ url = https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz;
+ sha256 = "0v4ny0qhr5hiialb2ss25bllfnd6j4g7mfxnqfmr1xsjpykxcly5";
};
buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ];
@@ -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 358c8cda592f..d3e1482feb4d 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.67";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenCOLLADA";
rev = "v${version}";
- sha256 = "1x8hz5nkz4lxsf17jv8sdl92dmbbpkqck8jkkc6g32d8gbs3gha1";
+ sha256 = "0x1h2ns0y05bdvn3i5s600jz6nb8qw8qqgg54njz7833bcy913mj";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 2724976c5ae8..e0a6c6a5705e 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 81d106a2a40c..f948cbb062f3 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -1,5 +1,5 @@
{ lib, stdenv
-, fetchurl, fetchFromGitHub
+, fetchurl, fetchFromGitHub, fetchpatch
, cmake, pkgconfig, unzip, zlib, pcre, hdf5
, glog, boost, google-gflags, protobuf
, config
@@ -31,29 +31,31 @@
, enableDC1394 ? false, libdc1394
, enableDocs ? false, doxygen, graphviz-nox
-, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
+, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
}:
let
- version = "3.4.2";
+ version = "3.4.4";
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
- sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx";
+ sha256 = "1xzbv0922r2zq4fgpkc1ldyq3kxp4c6x6dizydbspka18jrrxqlr";
};
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
- sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz";
+ sha256 = "0ylsljkmgfj5vam05cv0z3qwkqwjwz5fs5f5yif3pwvb99lxlbib";
};
# Contrib must be built in order to enable Tesseract support:
buildContrib = enableContrib || enableTesseract;
+ useSystemProtobuf = ! stdenv.isDarwin;
+
# See opencv/3rdparty/ippicv/ippicv.cmake
ippicv = {
src = fetchFromGitHub {
@@ -145,10 +147,12 @@ 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 ];
+ patches =
+ # https://github.com/opencv/opencv/pull/13254
+ lib.optional enablePython (fetchpatch {
+ url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
+ sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
+ });
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
@@ -170,8 +174,14 @@ 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 ]
+ [ zlib pcre hdf5 glog boost google-gflags ]
+ ++ lib.optional useSystemProtobuf protobuf
++ lib.optional enablePython pythonPackages.python
++ lib.optional enableGtk2 gtk2
++ lib.optional enableGtk3 gtk3
@@ -197,7 +207,7 @@ stdenv.mkDerivation rec {
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optional enableTbb tbb
++ lib.optional enableCuda cudatoolkit
- ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
+ ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
++ lib.optionals enableDocs [ doxygen graphviz-nox ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
@@ -211,8 +221,8 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DWITH_OPENMP=ON"
- "-DBUILD_PROTOBUF=OFF"
- "-DPROTOBUF_UPDATE_FILES=ON"
+ "-DBUILD_PROTOBUF=${printEnabled (!useSystemProtobuf)}"
+ "-DPROTOBUF_UPDATE_FILES=${printEnabled useSystemProtobuf}"
"-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
"-DBUILD_TESTS=OFF"
"-DBUILD_PERF_TESTS=OFF"
@@ -234,6 +244,8 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isDarwin [
"-DWITH_OPENCL=OFF"
"-DWITH_LAPACK=OFF"
+ ] ++ lib.optionals enablePython [
+ "-DOPENCV_SKIP_PYTHON_LOADER=ON"
];
enableParallelBuilding = true;
@@ -254,7 +266,8 @@ stdenv.mkDerivation rec {
# ${exec_prefix}. This causes linker errors in downstream packages so we strip
# of $out after the ${exec_prefix} prefix:
postInstall = ''
- sed -i "s|\''${exec_prefix}/$out|\''${exec_prefix}|" "$out/lib/pkgconfig/opencv.pc"
+ sed -i "s|{exec_prefix}/$out|{exec_prefix}|" \
+ "$out/lib/pkgconfig/opencv.pc"
'';
hardeningDisable = [ "bindnow" "relro" ];
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
new file mode 100644
index 000000000000..407070506ab0
--- /dev/null
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -0,0 +1,307 @@
+{ lib, stdenv
+, fetchurl, fetchFromGitHub, fetchpatch
+, cmake, pkgconfig, unzip, zlib, pcre, hdf5
+, glog, boost, google-gflags, protobuf
+, config
+
+, enableJPEG ? true, libjpeg
+, enablePNG ? true, libpng
+, enableTIFF ? true, libtiff
+, enableWebP ? true, libwebp
+, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
+, enableJPEG2K ? true, jasper
+, enableEigen ? true, eigen
+, enableOpenblas ? true, openblas
+, enableContrib ? true
+
+, enableCuda ? (config.cudaSupport or false), cudatoolkit
+
+, enableUnfree ? false
+, enableIpp ? false
+, enablePython ? false, pythonPackages
+, enableGtk2 ? false, gtk2
+, enableGtk3 ? false, gtk3
+, enableVtk ? false, vtk
+, enableFfmpeg ? false, ffmpeg
+, enableGStreamer ? false, gst_all_1
+, enableTesseract ? false, tesseract, leptonica
+, enableTbb ? false, tbb
+, enableOvis ? false, ogre
+, enableGPhoto2 ? false, libgphoto2
+, enableDC1394 ? false, libdc1394
+, enableDocs ? false, doxygen, graphviz-nox
+
+, cf-private, AVFoundation, Cocoa, QTKit, VideoDecodeAcceleration, bzip2
+}:
+
+let
+ version = "4.0.0";
+
+ src = fetchFromGitHub {
+ owner = "opencv";
+ repo = "opencv";
+ rev = version;
+ sha256 = "1r2hszm4044dfx65wv69rcs419jjd7bqllhnpcwk3n28f5ahln50";
+ };
+
+ contribSrc = fetchFromGitHub {
+ owner = "opencv";
+ repo = "opencv_contrib";
+ rev = version;
+ sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z";
+ };
+
+ # Contrib must be built in order to enable Tesseract support:
+ buildContrib = enableContrib || enableTesseract || enableOvis;
+
+ # See opencv/3rdparty/ippicv/ippicv.cmake
+ ippicv = {
+ src = fetchFromGitHub {
+ owner = "opencv";
+ repo = "opencv_3rdparty";
+ rev = "32e315a5b106a7b89dbed51c28f8120a48b368b4";
+ sha256 = "19w9f0r16072s59diqxsr5q6nmwyz9gnxjs49nglzhd66p3ddbkp";
+ } + "/ippicv";
+ files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in
+ if stdenv.hostPlatform.system == "x86_64-linux" then
+ { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; }
+ else if stdenv.hostPlatform.system == "i686-linux" then
+ { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; }
+ else if stdenv.hostPlatform.system == "x86_64-darwin" then
+ { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; }
+ else
+ throw "ICV is not available for this platform (or not yet supported by this package)";
+ dst = ".cache/ippicv";
+ };
+
+ # See opencv_contrib/modules/xfeatures2d/cmake/download_vgg.cmake
+ vgg = {
+ src = fetchFromGitHub {
+ owner = "opencv";
+ repo = "opencv_3rdparty";
+ rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d";
+ sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy";
+ };
+ files = {
+ "vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179";
+ "vgg_generated_64.i" = "7126a5d9a8884ebca5aea5d63d677225";
+ "vgg_generated_80.i" = "7cd47228edec52b6d82f46511af325c5";
+ "vgg_generated_120.i" = "151805e03568c9f490a5e3a872777b75";
+ };
+ dst = ".cache/xfeatures2d/vgg";
+ };
+
+ # See opencv_contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake
+ boostdesc = {
+ src = fetchFromGitHub {
+ owner = "opencv";
+ repo = "opencv_3rdparty";
+ rev = "34e4206aef44d50e6bbcd0ab06354b52e7466d26";
+ sha256 = "13yig1xhvgghvxspxmdidss5lqiikpjr0ddm83jsi0k85j92sn62";
+ };
+ files = {
+ "boostdesc_bgm.i" = "0ea90e7a8f3f7876d450e4149c97c74f";
+ "boostdesc_bgm_bi.i" = "232c966b13651bd0e46a1497b0852191";
+ "boostdesc_bgm_hd.i" = "324426a24fa56ad9c5b8e3e0b3e5303e";
+ "boostdesc_binboost_064.i" = "202e1b3e9fec871b04da31f7f016679f";
+ "boostdesc_binboost_128.i" = "98ea99d399965c03d555cef3ea502a0b";
+ "boostdesc_binboost_256.i" = "e6dcfa9f647779eb1ce446a8d759b6ea";
+ "boostdesc_lbgm.i" = "0ae0675534aa318d9668f2a179c2a052";
+ };
+ dst = ".cache/xfeatures2d/boostdesc";
+ };
+
+ # See opencv_contrib/modules/face/CMakeLists.txt
+ face = {
+ src = fetchFromGitHub {
+ owner = "opencv";
+ repo = "opencv_3rdparty";
+ rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12";
+ sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v";
+ };
+ files = {
+ "face_landmark_model.dat" = "7505c44ca4eb54b4ab1e4777cb96ac05";
+ };
+ dst = ".cache/data";
+ };
+
+ # See opencv/modules/gapi/cmake/DownloadADE.cmake
+ ade = rec {
+ src = fetchurl {
+ url = "https://github.com/opencv/ade/archive/${name}";
+ sha256 = "1r85vdkvcka7bcxk69pd0ai4hld4iakpj4xl0xbinx3p9pv5a4l8";
+ };
+ name = "v0.1.1d.zip";
+ md5 = "37479d90e3a5d47f132f512b22cbe206";
+ dst = ".cache/ade";
+ };
+
+ # See opencv/cmake/OpenCVDownload.cmake
+ installExtraFiles = extra : with lib; ''
+ mkdir -p "${extra.dst}"
+ '' + concatStrings (flip mapAttrsToList extra.files (name : md5 : ''
+ ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}"
+ ''));
+ installExtraFile = extra: ''
+ mkdir -p "${extra.dst}"
+ ln -s "${extra.src}" "${extra.dst}/${extra.md5}-${extra.name}"
+ '';
+
+ opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}";
+
+ printEnabled = enabled : if enabled then "ON" else "OFF";
+in
+
+stdenv.mkDerivation rec {
+ name = "opencv-${version}";
+ inherit version src;
+
+ postUnpack = lib.optionalString buildContrib ''
+ cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
+ '';
+
+ patches =
+ # Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
+ # PR: https://github.com/opencv/opencv_contrib/pull/1913
+ lib.optional buildContrib (fetchpatch {
+ url = https://github.com/opencv/opencv_contrib/commit/e068b62a1432d4d5688693a9e20bf175dfaa9a3e.patch;
+ sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9";
+ stripLen = 2;
+ extraPrefix = "opencv_contrib/";
+ }) ++
+ # https://github.com/opencv/opencv/pull/13254
+ lib.optional enablePython (fetchpatch {
+ url = https://github.com/opencv/opencv/commit/ad35b79e3f98b4ce30481e0299cca550ed77aef0.patch;
+ sha256 = "0rkvg6wm5fyncszfpd83wa4lvsb8srvk21r1jcld758i4f334sws";
+ });
+
+ # 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
+ # what appears to be some stray headers in dnn/misc/tensorflow
+ # in contrib when generating the Python bindings:
+ postPatch = ''
+ sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
+ sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
+ '';
+
+ preConfigure =
+ installExtraFile ade +
+ lib.optionalString enableIpp (installExtraFiles ippicv) + (
+ lib.optionalString buildContrib ''
+ cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
+
+ ${installExtraFiles vgg}
+ ${installExtraFiles boostdesc}
+ ${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
+ ++ lib.optional enableGtk2 gtk2
+ ++ lib.optional enableGtk3 gtk3
+ ++ lib.optional enableVtk vtk
+ ++ lib.optional enableJPEG libjpeg
+ ++ lib.optional enablePNG libpng
+ ++ lib.optional enableTIFF libtiff
+ ++ lib.optional enableWebP libwebp
+ ++ lib.optionals enableEXR [ openexr ilmbase ]
+ ++ lib.optional enableJPEG2K jasper
+ ++ lib.optional enableFfmpeg ffmpeg
+ ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
+ [ VideoDecodeAcceleration bzip2 ]
+ ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
+ ++ lib.optional enableOvis ogre
+ ++ lib.optional enableGPhoto2 libgphoto2
+ ++ lib.optional enableDC1394 libdc1394
+ ++ lib.optional enableEigen eigen
+ ++ lib.optional enableOpenblas openblas
+ # There is seemingly no compile-time flag for Tesseract. It's
+ # simply enabled automatically if contrib is built, and it detects
+ # tesseract & leptonica.
+ ++ lib.optionals enableTesseract [ tesseract leptonica ]
+ ++ lib.optional enableTbb tbb
+ ++ lib.optional enableCuda cudatoolkit
+ ++ lib.optionals stdenv.isDarwin [ cf-private AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ]
+ ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
+
+ propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
+
+ nativeBuildInputs = [ cmake pkgconfig unzip ];
+
+ NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR";
+
+ # Configure can't find the library without this.
+ OpenBLAS_HOME = lib.optionalString enableOpenblas openblas;
+
+ cmakeFlags = [
+ "-DOPENCV_GENERATE_PKGCONFIG=ON"
+ "-DWITH_OPENMP=ON"
+ "-DBUILD_PROTOBUF=OFF"
+ "-DPROTOBUF_UPDATE_FILES=ON"
+ "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}"
+ "-DBUILD_TESTS=OFF"
+ "-DBUILD_PERF_TESTS=OFF"
+ "-DBUILD_DOCS=${printEnabled enableDocs}"
+ (opencvFlag "IPP" enableIpp)
+ (opencvFlag "TIFF" enableTIFF)
+ (opencvFlag "JASPER" enableJPEG2K)
+ (opencvFlag "WEBP" enableWebP)
+ (opencvFlag "JPEG" enableJPEG)
+ (opencvFlag "PNG" enablePNG)
+ (opencvFlag "OPENEXR" enableEXR)
+ (opencvFlag "CUDA" enableCuda)
+ (opencvFlag "CUBLAS" enableCuda)
+ (opencvFlag "TBB" enableTbb)
+ ] ++ lib.optionals enableCuda [
+ "-DCUDA_FAST_MATH=ON"
+ "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
+ "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr"
+ ] ++ lib.optionals stdenv.isDarwin [
+ "-DWITH_OPENCL=OFF"
+ "-DWITH_LAPACK=OFF"
+ ] ++ lib.optionals enablePython [
+ "-DOPENCV_SKIP_PYTHON_LOADER=ON"
+ ];
+
+ enableParallelBuilding = true;
+
+ postBuild = lib.optionalString enableDocs ''
+ make doxygen
+ '';
+
+ # By default $out/lib/pkgconfig/opencv4.pc looks something like this:
+ #
+ # prefix=/nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0
+ # exec_prefix=${prefix}
+ # libdir=${exec_prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/lib
+ # includedir_old=${prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/include/opencv4/opencv
+ # includedir_new=${prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/include/opencv4
+ # ...
+ # Libs: -L${exec_prefix}//nix/store/g0wnfyjjh4rikkvp22cpkh41naa43i4i-opencv-4.0.0/lib ...
+ # Note that ${exec_prefix} is set to $out but that $out is also appended to
+ # ${exec_prefix}. This causes linker errors in downstream packages so we strip
+ # of $out after the ${exec_prefix} and ${prefix} prefixes:
+ postInstall = ''
+ sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
+ "$out/lib/pkgconfig/opencv4.pc"
+ '';
+
+ hardeningDisable = [ "bindnow" "relro" ];
+
+ passthru = lib.optionalAttrs enablePython { pythonPath = []; };
+
+ meta = with stdenv.lib; {
+ description = "Open Computer Vision Library with more than 500 algorithms";
+ homepage = https://opencv.org/;
+ license = with licenses; if enableUnfree then unfree else bsd3;
+ maintainers = with maintainers; [mdaiter basvandijk];
+ platforms = with platforms; linux ++ darwin;
+ };
+}
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index 66a840fa2a9e..4532285e53dc 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -10,7 +10,7 @@
, enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1
, enableEigen ? true, eigen
-, darwin
+, cf-private, Cocoa, QTKit
}:
let
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
++ lib.optional enableFfmpeg ffmpeg
++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
++ lib.optional enableEigen eigen
- ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ])
+ ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit cf-private /* For NSDefaultRunLoopMode */ ]
;
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;
diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch
deleted file mode 100644
index 62234a43e461..000000000000
--- 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 a073a29b507d..f954aaf72457 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 bd7d252e1a08..49d70bc211a6 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 0a0b4c8d5498..c8208ce27bae 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.1.nix
deleted file mode 100644
index d18c971dc112..000000000000
--- a/pkgs/development/libraries/openjpeg/2.1.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ callPackage, fetchpatch, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
- version = "2.3.0";
- branch = "2.3";
- revision = "v${version}";
- sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz";
-})
diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
new file mode 100644
index 000000000000..fd9c7eea8c2e
--- /dev/null
+++ b/pkgs/development/libraries/openjpeg/2.x.nix
@@ -0,0 +1,21 @@
+{ callPackage, fetchpatch, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+ version = "2.3.0";
+ branch = "2.3";
+ revision = "v${version}";
+ sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz";
+
+ patches = [
+ (fetchpatch {
+ name = "CVE-2018-7648.patch";
+ url = "https://github.com/uclouvain/openjpeg/commit/cc3824767bde397fedb8a1ae4786a222ba860c8d.patch";
+ sha256 = "1j5nxmlgyfkxldk2f1ij6h850xw45q3b5brxqa04dxsfsv8cdj5j";
+ })
+ (fetchpatch {
+ name = "CVE-2017-17480+CVE-2018-18088.patch";
+ url = "https://github.com/uclouvain/openjpeg/commit/92023cd6c377e0384a7725949b25655d4d94dced.patch";
+ sha256 = "0rrxxqcp3vjkmvywxj9ac766m3fppy0x0nszrkf8irrqy1gnp38k";
+ })
+ ];
+})
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index a279fe79940f..345dffa87f5b 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -9,15 +9,14 @@
}:
let
- majorVersion = "3.1";
- minorVersion = "0";
+ version = "3.1.3";
in stdenv.mkDerivation rec {
- name = "openmpi-${majorVersion}.${minorVersion}";
+ name = "openmpi-${version}";
- src = fetchurl {
- url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
- sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j";
+ src = with stdenv.lib.versions; fetchurl {
+ url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
+ sha256 = "1dks11scivgaskjs5955y9wprsl12wr3gn5r7wfl0l8gq03l7q4b";
};
postPatch = ''
diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix
index 7d84392d204a..339f60649997 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/openscenegraph/3.4.0.nix b/pkgs/development/libraries/openscenegraph/3.4.0.nix
new file mode 100644
index 000000000000..8d0839041890
--- /dev/null
+++ b/pkgs/development/libraries/openscenegraph/3.4.0.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip
+, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11
+, cairo, poppler, librsvg, libpng, libtiff, libXrandr
+, xineLib, boost
+, withApps ? false
+, withSDL ? false, SDL
+, withQt4 ? false, qt4
+}:
+
+stdenv.mkDerivation rec {
+ name = "openscenegraph-${version}";
+ version = "3.4.0";
+
+ src = fetchurl {
+ url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip";
+ sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw";
+ };
+
+ nativeBuildInputs = [ pkgconfig cmake doxygen unzip ];
+
+ buildInputs = [
+ freetype libjpeg jasper libxml2 zlib gdal curl libX11
+ cairo poppler librsvg libpng libtiff libXrandr boost
+ xineLib
+ ] ++ lib.optional withSDL SDL
+ ++ lib.optional withQt4 qt4;
+
+ enableParallelBuilding = true;
+
+ cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF";
+
+ meta = with stdenv.lib; {
+ description = "A 3D graphics toolkit";
+ homepage = http://www.openscenegraph.org/;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.linux;
+ license = "OpenSceneGraph Public License - free LGPL-based license";
+ };
+}
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index cddc2038791e..9f5ef3ff68c8 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
name = "openscenegraph-${version}";
- version = "3.6.2";
+ version = "3.6.3";
src = fetchFromGitHub {
owner = "openscenegraph";
repo = "OpenSceneGraph";
- rev = "fb40a0d1db018ff39a08699a7f17f7eb6d949c36";
- sha256 = "03jk6lclyd4biniaw04w7j0z1spkm69f1c19i37b8v9x3zv1p1id";
+ rev = "d011ca4e8d83549a3688bf6bb8cd468dd9684822";
+ sha256 = "0h32z15sa8sbq276j0iib0n707m8bs4p5ji9z2ah411446paad9q";
};
nativeBuildInputs = [ pkgconfig cmake doxygen ];
diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix
index 3e178d92013e..537b67c5a3c3 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/1.0.2/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
new file mode 100644
index 000000000000..5765409fdd57
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
@@ -0,0 +1,16 @@
+diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
+index e6d0e6e1a6..b89456fd87 100644
+--- a/crypto/x509/by_file.c
++++ b/crypto/x509/by_file.c
+@@ -97,7 +97,10 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
+ switch (cmd) {
+ case X509_L_FILE_LOAD:
+ if (argl == X509_FILETYPE_DEFAULT) {
+- file = ossl_safe_getenv(X509_get_default_cert_file_env());
++ file = ossl_safe_getenv("NIX_SSL_CERT_FILE");
++
++ if (!file)
++ file = ossl_safe_getenv(X509_get_default_cert_file_env());
+
+ if (file)
+ ok = (X509_load_cert_crl_file(ctx, file,
diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch
rename to pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
similarity index 100%
rename from pkgs/development/libraries/openssl/use-etc-ssl-certs.patch
rename to pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
diff --git a/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch
new file mode 100644
index 000000000000..9e871cfb1d31
--- /dev/null
+++ b/pkgs/development/libraries/openssl/1.1/nix-ssl-cert-file.patch
@@ -0,0 +1,15 @@
+diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
+index 244512c935..f0b70d7ea1 100644
+--- a/crypto/x509/by_file.c
++++ b/crypto/x509/by_file.c
+@@ -46,7 +46,9 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
+ switch (cmd) {
+ case X509_L_FILE_LOAD:
+ if (argl == X509_FILETYPE_DEFAULT) {
+- file = ossl_safe_getenv(X509_get_default_cert_file_env());
++ file = ossl_safe_getenv("NIX_SSL_CERT_FILE");
++ if (!file)
++ file = ossl_safe_getenv(X509_get_default_cert_file_env());
+ if (file)
+ ok = (X509_load_cert_crl_file(ctx, file,
+ X509_FILETYPE_PEM) != 0);
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
index 86015abb9817..f07ebad9e810 100644
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, perl, zlib
-, withCryptodev ? false, cryptodevHeaders
+, withCryptodev ? false, cryptodev
}:
with stdenv.lib;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
setOutputFlags = false;
nativeBuildInputs = [ perl zlib ];
- buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+ buildInputs = stdenv.lib.optional withCryptodev cryptodev;
configureScript = "./config";
@@ -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/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch
deleted file mode 100644
index 63db3efc0846..000000000000
--- a/pkgs/development/libraries/openssl/darwin-arch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' openssl-1.0.1c-orig/Configure openssl-1.0.1c/Configure
---- openssl-1.0.1c-orig/Configure 2012-03-14 23:20:40.000000000 +0100
-+++ openssl-1.0.1c/Configure 2012-12-18 17:29:30.268090633 +0100
-@@ -579,7 +579,7 @@
- "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
--"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- # iPhoneOS/iOS
- "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index de13f963b674..32fd6e727f7d 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, buildPackages, perl
-, withCryptodev ? false, cryptodevHeaders
+{ stdenv, fetchurl, buildPackages, perl, coreutils
+, withCryptodev ? false, cryptodev
, enableSSL2 ? false
, static ? false
}:
@@ -7,7 +7,7 @@
with stdenv.lib;
let
- common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec {
+ common = args@{ version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec {
name = "openssl-${version}";
src = fetchurl {
@@ -15,13 +15,7 @@ let
inherit sha256;
};
- patches =
- (args.patches or [])
- ++ [ ./nix-ssl-cert-file.patch ]
- ++ optional (versionOlder version "1.1.0")
- (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch)
- ++ optional (versionOlder version "1.0.2" && stdenv.hostPlatform.isDarwin)
- ./darwin-arch.patch;
+ inherit patches;
postPatch = ''
patchShebangs Configure
@@ -31,24 +25,28 @@ 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__)' \
'!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
'';
- outputs = [ "bin" "dev" "out" "man" ];
+ outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
setOutputFlags = false;
separateDebugInfo = stdenv.hostPlatform.isLinux;
nativeBuildInputs = [ perl ];
- buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+ buildInputs = stdenv.lib.optional withCryptodev cryptodev;
# TODO(@Ericson2314): Improve with mass rebuild
configurePlatforms = [];
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"
@@ -89,6 +87,7 @@ let
'' +
''
mkdir -p $bin
+ substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl}
mv $out/bin $bin/
mkdir $dev
@@ -121,13 +120,22 @@ let
in {
openssl_1_0_2 = common {
- version = "1.0.2p";
- sha256 = "003xh9f898i56344vpvpxxxzmikivxig4xwlm7vbi7m8n43qxaah";
+ version = "1.0.2q";
+ sha256 = "115nisqy7kazbg6br2wrcra9nphyph1l4dgp563b9cf2rv5wyi2p";
+ patches = [
+ ./1.0.2/nix-ssl-cert-file.patch
+
+ (if stdenv.hostPlatform.isDarwin
+ then ./1.0.2/use-etc-ssl-certs-darwin.patch
+ else ./1.0.2/use-etc-ssl-certs.patch)
+ ];
};
- openssl_1_1_0 = common {
- version = "1.1.0i";
- sha256 = "16fgaf113p6s5ixw227sycvihh3zx6f6rf0hvjjhxk68m12cigzb";
+ openssl_1_1 = common {
+ version = "1.1.1a";
+ sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w";
+ patches = [ ./1.1/nix-ssl-cert-file.patch ];
+ withDocs = true;
};
}
diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
deleted file mode 100644
index 893fb3eb6643..000000000000
--- a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c
---- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200
-+++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200
-@@ -97,7 +97,9 @@
- switch (cmd) {
- case X509_L_FILE_LOAD:
- if (argl == X509_FILETYPE_DEFAULT) {
-- file = getenv(X509_get_default_cert_file_env());
-+ file = getenv("NIX_SSL_CERT_FILE");
-+ if (!file)
-+ file = getenv(X509_get_default_cert_file_env());
- if (file)
- ok = (X509_load_cert_crl_file(ctx, file,
- X509_FILETYPE_PEM) != 0);
diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix
new file mode 100644
index 000000000000..3b0354b9fe8e
--- /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/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix
index 087a22dd61ba..4150f0f466cd 100644
--- a/pkgs/development/libraries/openzwave/default.nix
+++ b/pkgs/development/libraries/openzwave/default.nix
@@ -3,16 +3,18 @@
, systemd }:
let
- version = "2018-04-04";
+ version = "2018-11-04";
in stdenv.mkDerivation rec {
name = "openzwave-${version}";
+ # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw.
+ # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference.
src = fetchFromGitHub {
- owner = "OpenZWave";
+ owner = "home-assistant";
repo = "open-zwave";
- rev = "ab5fe966fee882bb9e8d78a91db892a60a1863d9";
- sha256 = "0yby8ygzjn5zp5vhysxaadbzysqanwd2zakz379299qs454pr2h9";
+ rev = "2cc174ad5c935d2d17828634aca2db5a60c59237";
+ sha256 = "1d13maj93i6h792cbvqpx43ffss44dxmvbwj2777vzvvjib8m4n8";
};
nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ];
diff --git a/pkgs/development/libraries/osip/3.nix b/pkgs/development/libraries/osip/3.nix
deleted file mode 100644
index b485fa3e947b..000000000000
--- a/pkgs/development/libraries/osip/3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
- version = "3.6.0";
- src = fetchurl {
- url = "mirror://gnu/osip/libosip2-${version}.tar.gz";
- sha256 = "1kcndqvsyxgbhkksgydvvjw15znfq6jiznvw058d21h5fq68p8f9";
- };
- name = "libosip2-${version}";
-
- meta = {
- license = stdenv.lib.licenses.lgpl21Plus;
- homepage = http://www.gnu.org/software/osip/;
- description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
- maintainers = with stdenv.lib.maintainers; [ raskin ];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix
index 814158276ce4..6ee934c60c3a 100644
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
meta = {
license = stdenv.lib.licenses.lgpl21Plus;
- homepage = http://www.gnu.org/software/osip/;
+ homepage = https://www.gnu.org/software/osip/;
description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
maintainers = with stdenv.lib.maintainers; [ raskin ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix
index b7033ea4ddf6..981ec2f0a3a5 100644
--- a/pkgs/development/libraries/osm-gps-map/default.nix
+++ b/pkgs/development/libraries/osm-gps-map/default.nix
@@ -1,4 +1,4 @@
-{ cairo, fetchzip, glib, gnome3, gobjectIntrospection, pkgconfig, stdenv }:
+{ cairo, fetchzip, glib, gnome3, gobject-introspection, pkgconfig, stdenv }:
stdenv.mkDerivation rec {
name = "osm-gps-map-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cairo glib gobjectIntrospection
+ cairo glib gobject-introspection
] ++ (with gnome3; [
gnome-common gtk libsoup
]);
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index e0e0b59a9a9f..b4bdd200211c 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/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix
index 367cef46dc44..c680efa95f89 100644
--- a/pkgs/development/libraries/pagmo2/default.nix
+++ b/pkgs/development/libraries/pagmo2/default.nix
@@ -31,10 +31,6 @@ stdenv.mkDerivation rec {
"-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so" "-DPAGMO_WITH_IPOPT=yes"
"-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" ];
- checkPhase = ''
- ctest
- '';
-
# All but one test pass skip for now (tests also take about 30 min to compile)
doCheck = false;
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 28f8a221700d..7b1d69ed42b0 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, gobject-introspection, 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 gobject-introspection 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; # fails 1 out of 12 tests with "Fontconfig error: Cannot load default config file"
+ doCheck = false; # /layout/valid-1.markup: FAIL
+
+ 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 aae6ed0f688a..b69ded648397 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 000000000000..3fd567ea098f
--- /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 e281e604380b..000000000000
--- 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/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 9fb2e0b7fedb..14eff45e4a17 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ];
cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
- "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET="
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
];
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index b29388790d02..67f343d60380 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 0487886a8966..773478f4dc03 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 000000000000..3eb4ddaab693
--- /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 000000000000..6509b04f0113
--- /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 000000000000..c1c8f618fbb3
--- /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 000000000000..1ad5dcb8b25b
--- /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 f837d807219f..f01fab74635b 100644
--- a/pkgs/development/libraries/physics/cernlib/default.nix
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace 2006/src/config/site.def \
--replace "# define MakeCmd gmake" "# define MakeCmd make"
+ substituteInPlace 2006/src/config/lnxLib.rules \
+ --replace "# lib" "// lib"
'';
configurePhase = ''
@@ -56,7 +58,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://cernlib.web.cern.ch;
description = "Legacy collection of libraries and modules for data analysis in high energy physics";
- platforms = stdenv.lib.platforms.unix;
+ broken = stdenv.isDarwin;
+ platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
maintainers = with stdenv.lib.maintainers; [ veprbl ];
license = stdenv.lib.licenses.gpl2;
};
diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index 7a65da25890f..3828cfda2aff 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -2,21 +2,15 @@
stdenv.mkDerivation rec {
name = "fastjet-${version}";
- version = "3.3.1";
+ version = "3.3.2";
src = fetchurl {
url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
- sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn";
+ sha256 = "1hk3k7dyik640dzg21filpywc2dl862nl2hbpg384hf5pw9syn9z";
};
buildInputs = [ python2 ];
- postPatch = ''
- substituteInPlace plugins/SISCone/SISConeBasePlugin.cc \
- --replace 'structure_of()' \
- 'structure_of()'
- '';
-
configureFlags = [
"--enable-allcxxplugins"
"--enable-pyext"
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 87af069c18a5..7123858b8edc 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;
+stdenv.mkDerivation rec {
+ version = "10.4.1";
+ name = "geant4-${version}";
-# 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;
+ 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 5d539b480d7d..000000000000
--- 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 886618abd34a..000000000000
--- 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 ee332171158d..551d61af3ada 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}:
+ # 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 version src geant4;
- name = "g4py-${version}";
+stdenv.mkDerivation rec {
+ inherit (geant4_nomt) version src;
+ name = "g4py-${version}";
- # ./configure overwrites $PATH, which clobbers everything.
- patches = [ ./configure.patch ];
- patchFlags = "-p0";
+ sourceRoot = "geant4.10.04.p01/environments/g4py";
- configurePhase = ''
- export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ geant4_nomt xercesc boost_python python ];
- source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
- cd environments/g4py
+ GEANT4_INSTALL = geant4_nomt;
- ./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
- '';
+ 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;
- buildInputs = [ geant4 boost python ];
+ enableParallelBuilding = true;
- setupHook = ./setup-hook.sh;
+ setupHook = ./setup-hook.sh;
- # Make sure we set PYTHONPATH
- shellHook = ''
- source $out/nix-support/setup-hook
- '';
+ # 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;
+ 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/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index a8655c2dcbe3..722dccaea7be 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "herwig-${version}";
- version = "7.1.3";
+ version = "7.1.4";
src = fetchurl {
url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
- sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm";
+ sha256 = "1awr1jz0q873x8bgwiilzklhk1zkgm6slvpychpnvsf9vk05mmdx";
};
nativeBuildInputs = [ autoconf automake libtool ];
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
homepage = https://herwig.hepforge.org/;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen...
};
}
diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix
new file mode 100644
index 000000000000..55714afbdce9
--- /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 7f89c92772c3..11a2640e97c8 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 000000000000..a608a7f6b0f7
--- /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 000000000000..1a3334562641
--- /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/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 639da1687a72..30f8ad8e8a32 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "rivet-${version}";
- version = "2.6.1";
+ version = "2.6.2";
src = fetchurl {
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
- sha256 = "08lhr10h97vqhy6ci4zna4ngx9875j32zs8ad5sy38xgbbrx3474";
+ sha256 = "0yp3mllr2b4bhsmixjmmpl2n4x78bgw74a9xy2as4f10q3alkplx";
};
patches = [
@@ -28,8 +28,6 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
preConfigure = ''
- substituteInPlace Makefile.in \
- --replace "SUBDIRS = src pyext data include bin analyses doc test" "SUBDIRS = src pyext data include bin analyses test"
substituteInPlace analyses/Makefile.in \
--replace "!(tmp)" ""
substituteInPlace bin/rivet-buildplugin.in \
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index feffa5c11d54..63bc3c06e102 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "thepeg-${version}";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchurl {
url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
- sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n";
+ sha256 = "1x9dfxmsbmzmsxrv3cczfyrnqkxjcpy89v6v7ycysrx9k8qkf320";
};
buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];
diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index c86b0ed3d1c8..6e4ffb9745d0 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yoda-${version}";
- version = "1.7.1";
+ version = "1.7.4";
src = fetchurl {
url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
- sha256 = "0yq20fnckf6h0a53ghxsgia6ikq71ch9a0w0khq188r7rlg9gmzd";
+ sha256 = "0fl9y1mh48xkjmqc76rfhvr3vs4v4lzybh06bwxyflzy82ylwi71";
};
pythonPath = []; # python wrapper support
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Provides small set of data analysis (specifically histogramming) classes";
- license = stdenv.lib.licenses.gpl2;
+ license = stdenv.lib.licenses.gpl3;
homepage = https://yoda.hepforge.org;
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 e87ed8e48a98..96b5239b7dbe 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/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index af4e12a014b7..61af6e7fdab8 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,24 +1,15 @@
-{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, autoreconfHook, pkgconfig, libpng, glib /*just passthru*/ }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libpng, glib /*just passthru*/ }:
stdenv.mkDerivation rec {
name = "pixman-${version}";
- version = "0.34.0";
+ version = "0.36.0";
src = fetchurl {
url = "mirror://xorg/individual/lib/${name}.tar.bz2";
- sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir";
+ sha256 = "1p40fygy9lcn6ypkzh14azksi570brcpr3979bjpff8qk76c14px";
};
- patches = stdenv.lib.optionals stdenv.cc.isClang [
- (fetchpatch {
- name = "builtin-shuffle.patch";
- url = https://patchwork.freedesktop.org/patch/177506/raw;
- sha256 = "0rvraq93769dy2im2m022rz99fcdxprgc2fbmasnddcwrqy1x3xr";
- })
- ];
-
- nativeBuildInputs = [ pkgconfig ]
- ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool autoreconfHook ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libpng ];
diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix
index ef4b3ea7e010..54a563c518fc 100644
--- a/pkgs/development/libraries/png++/default.nix
+++ b/pkgs/development/libraries/png++/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://www.nongnu.org/pngpp/;
+ homepage = https://www.nongnu.org/pngpp/;
description = "C++ wrapper for libpng library";
license = licenses.bsd3;
platforms = platforms.unix;
diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 9a43470de3b7..ce3f5ab6b789 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,30 +1,47 @@
{ 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";
sha256 = "0wj0y4zcmj4q79wrn3vv3xq4bb0vhhxs8yifafwy9f2sjm83c5p9";
};
- 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;
+ outputs = [ "out" "dev" "lib" ];
- # TODO(@Dridus) remove the ++ libc at next hash break
- buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;
+ nativeBuildInputs = [ cmake pkgconfig ];
- cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
+ buildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng
+ libidn expat lua5 ];
- meta = {
+ cmakeFlags = [
+ "-DPODOFO_BUILD_SHARED=ON"
+ "-DPODOFO_BUILD_STATIC=OFF"
+ "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON"
+ ];
+
+ postInstall = ''
+ moveToOutput lib "$lib"
+ '';
+
+ 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
deleted file mode 100644
index f6e7ed56adc4..000000000000
--- a/pkgs/development/libraries/poker-eval/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
- name = "poker-eval-138.0";
-
- src = fetchurl {
- url = "http://download.gna.org/pokersource/sources/${name}.tar.gz";
- sha256 = "0s6gvcdwdi6j7nrg6mmb5l971gclk0p99bcbfsynx1gnj159wrcj";
- };
-
- patchPhase = ''
- sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' Makefile.in
- sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' include/Makefile.in
- sed -i -e 's#includedir=@includedir@/poker-eval#includedir=@includedir@/#g' poker-eval.pc.in
- '';
-
- meta = {
- homepage = http://pokersource.org/poker-eval/;
- description = "Poker hand evaluator";
- license = stdenv.lib.licenses.gpl3;
- maintainers = [stdenv.lib.maintainers.mtreskin];
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix
index 54e10b965926..b13335561ac0 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/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 6675bbf91836..625e0d3e1041 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam, perl
-, intltool, spidermonkey_52 , gobjectIntrospection, libxslt, docbook_xsl, dbus
+, intltool, spidermonkey_52 , gobject-introspection, libxslt, docbook_xsl, dbus
, docbook_xml_dtd_412, gtk-doc, coreutils
, useSystemd ? stdenv.isLinux, systemd
, doCheck ? stdenv.isLinux
@@ -28,10 +28,10 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
nativeBuildInputs =
- [ gtk-doc pkgconfig autoreconfHook intltool gobjectIntrospection perl ]
+ [ gtk-doc pkgconfig autoreconfHook intltool gobject-introspection perl ]
++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
buildInputs =
- [ glib expat pam spidermonkey_52 gobjectIntrospection ]
+ [ glib expat pam spidermonkey_52 gobject-introspection ]
++ stdenv.lib.optional useSystemd systemd;
NIX_CFLAGS_COMPILE = " -Wno-deprecated-declarations "; # for polkit 0.114 and glib 2.56
diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix
index 4456cd7ff285..633c3d69618b 100644
--- a/pkgs/development/libraries/poppler/0.61.nix
+++ b/pkgs/development/libraries/poppler/0.61.nix
@@ -1,8 +1,8 @@
{ 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
+, introspectionSupport ? false, gobject-introspection ? null
, utils ? false
, minimal ? false, suffix ? "glib"
}:
@@ -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
@@ -28,7 +36,7 @@ stdenv.mkDerivation rec {
[ zlib freetype fontconfig libjpeg openjpeg ]
++ optionals (!minimal) [ cairo lcms curl ]
++ optional qt5Support qtbase
- ++ optional introspectionSupport gobjectIntrospection;
+ ++ optional introspectionSupport gobject-introspection;
nativeBuildInputs = [ cmake ninja pkgconfig ];
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index acfae1fc8883..53ed04527a84 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -2,7 +2,7 @@
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
, withData ? true, poppler_data
, qt5Support ? false, qtbase ? null
-, introspectionSupport ? false, gobjectIntrospection ? null
+, introspectionSupport ? false, gobject-introspection ? null
, utils ? false, nss ? null
, minimal ? false, suffix ? "glib"
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
++ optionals (!minimal) [ cairo lcms curl ]
++ optional qt5Support qtbase
++ optional utils nss
- ++ optional introspectionSupport gobjectIntrospection;
+ ++ optional introspectionSupport gobject-introspection;
nativeBuildInputs = [ cmake ninja pkgconfig ];
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index edec0b7f0699..592a1f1470a4 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 a577d318523d..37cf29c86581 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 29ff988a2266..d40b4442e38e 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 0ebf299a8bfb..55af1d8573a1 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 000000000000..0009209d9cef
--- /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 5f0006c05894..883dff56f2ee 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 803f5a9ba79c..4d53c42a3478 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/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix
new file mode 100644
index 000000000000..74e040e94ab0
--- /dev/null
+++ b/pkgs/development/libraries/protozero/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+ name = "protozero-${version}";
+ version = "1.6.4";
+
+ src = fetchFromGitHub {
+ owner = "mapbox";
+ repo = "protozero";
+ rev = "v${version}";
+ sha256 = "0hcawgyj3wxqikx5xqs1ag12w8vz00gb1rzx131jq51yhzc6bwrb";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ description = "Minimalistic protocol buffer decoder and encoder in C++";
+ homepage = "https://github.com/mapbox/protozero";
+ license = with licenses; [ bsd2 asl20 ];
+ maintainers = with maintainers; [ das-g ];
+ };
+}
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index 90dc647233d8..7a0eba2d67a4 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "The GNU Portable Threads library";
- homepage = http://www.gnu.org/software/pth;
+ homepage = https://www.gnu.org/software/pth;
license = licenses.lgpl21Plus;
platforms = platforms.all;
};
diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix
index ae60a6f69d63..d425de243f50 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 018a57ad0571..b5a01698e5e9 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 000000000000..1fb3a415dc6c
--- /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.5";
+
+ src = fetchFromGitHub {
+ owner = "FedoraQt";
+ repo = "QGnomePlatform";
+ rev = version;
+ sha256 = "01ncj21cxd5p7pch6p3zbhv5wp0dgn9vy5hrw54g49fmqnbb1ymz";
+ };
+
+ 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 29202396c058..a7077c69dd8d 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/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 79ed37dd2a9a..ba62324d586e 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }:
+{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }:
stdenv.mkDerivation rec {
- version = "0.1.0";
- name = "qmltermwidget-${version}";
+ version = "2018-11-24";
+ name = "qmltermwidget-unstable-${version}";
src = fetchFromGitHub {
repo = "qmltermwidget";
owner = "Swordfish90";
- rev = "v${version}";
- sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
+ rev = "48274c75660e28d44af7c195e79accdf1bd44963";
+ sha256 = "028nb1xp84jmakif5mmzx52q3rsjwckw27jdpahyaqw7j7i5znq6";
};
- buildInputs = [ qtbase qtquick1 qtmultimedia ];
+ buildInputs = [ qtbase qtquick1 qtmultimedia ]
+ ++ stdenv.lib.optional stdenv.isDarwin utmp;
nativeBuildInputs = [ qmake ];
patchPhase = ''
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
description = "A QML port of qtermwidget";
homepage = https://github.com/Swordfish90/qmltermwidget;
license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
maintainers = with stdenv.lib.maintainers; [ skeidel ];
};
}
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index d09c0d9a6ce0..0d9ae21e87e3 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 79deb482161f..456c28503e81 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 c8b01c460803..85e45d3fad03 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 0691f26b4712..95b82f8f3cff 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 f7ddf8ff780c..8715aaaa44d0 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 000000000000..c1338e98d851
--- /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 2a706fc7b6e8..6f90f1cea7f0 100644
--- a/pkgs/development/libraries/qt-5/5.11/default.nix
+++ b/pkgs/development/libraries/qt-5/5.11/default.nix
@@ -20,6 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
+ cf-private,
# options
developerBuild ? false,
@@ -33,14 +34,26 @@ let
qtCompatVersion = "5.11";
- mirror = "http://download.qt.io";
- srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
+ mirror = "https://download.qt.io";
+ 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 = [
./qtbase.patch
./qtbase-darwin.patch
./qtbase-revert-no-macos10.10.patch
+ ./qtbase-fixguicmake.patch
] ++ optionals stdenv.isDarwin [
./qtbase-darwin-nseventtype.patch
];
@@ -84,7 +97,9 @@ let
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
- qtmacextras = callPackage ../modules/qtmacextras.nix {};
+ qtmacextras = callPackage ../modules/qtmacextras.nix {
+ inherit cf-private;
+ };
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};
@@ -102,15 +117,8 @@ 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";
- };
+ qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
+ 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/5.11/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch
new file mode 100644
index 000000000000..8b46d432812a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch
@@ -0,0 +1,30 @@
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index 0bbc871..3673634 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
++ set(imported_location \"${PLUGIN_LOCATION}\")
+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
+ set_target_properties(Qt5::${Plugin} PROPERTIES
+ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
+diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+index 5baf0fd..3583745 100644
+--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+@@ -2,10 +2,10 @@
+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+ !!ENDIF
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+ !!ENDIF
+
+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 8732b1061342..e815cc8f70f2 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -46,7 +46,7 @@ let
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
patches = {
- qtbase = [ ./qtbase.patch ];
+ qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ];
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
new file mode 100644
index 000000000000..8b46d432812a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase-fixguicmake.patch
@@ -0,0 +1,30 @@
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index 0bbc871..3673634 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
++ set(imported_location \"${PLUGIN_LOCATION}\")
+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
+ set_target_properties(Qt5::${Plugin} PROPERTIES
+ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
+diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+index 5baf0fd..3583745 100644
+--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+@@ -2,10 +2,10 @@
+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+ !!ENDIF
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+ !!ENDIF
+
+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
index 755e6a9487e7..6fcb7a0dc5eb 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/default.nix
@@ -20,6 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
+ cf-private,
# options
developerBuild ? false,
@@ -37,7 +38,7 @@ let
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
patches = {
- qtbase = [ ./qtbase.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
+ qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
@@ -78,7 +79,9 @@ let
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
qtimageformats = callPackage ../modules/qtimageformats.nix {};
qtlocation = callPackage ../modules/qtlocation.nix {};
- qtmacextras = callPackage ../modules/qtmacextras.nix {};
+ qtmacextras = callPackage ../modules/qtmacextras.nix {
+ inherit cf-private;
+ };
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
inherit gstreamer gst-plugins-base;
};
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
new file mode 100644
index 000000000000..8b46d432812a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
@@ -0,0 +1,30 @@
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index 0bbc871..3673634 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
+ set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+
+- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
++ set(imported_location \"${PLUGIN_LOCATION}\")
+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
+ set_target_properties(Qt5::${Plugin} PROPERTIES
+ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
+diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+index 5baf0fd..3583745 100644
+--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+@@ -2,10 +2,10 @@
+ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
+
+ !!IF !isEmpty(CMAKE_RELEASE_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
+ !!ENDIF
+ !!IF !isEmpty(CMAKE_DEBUG_TYPE)
+-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
+ !!ENDIF
+
+ list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 0d9cb81afda9..f5f5c69455f5 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -18,7 +18,7 @@
withGtk3 ? false, dconf ? null, gtk3 ? null,
# options
- libGLSupported ? (!stdenv.isDarwin),
+ libGLSupported ? !stdenv.isDarwin,
libGL,
buildExamples ? false,
buildTests ? false,
@@ -53,6 +53,7 @@ stdenv.mkDerivation {
if stdenv.isDarwin
then with darwin.apple_sdk.frameworks;
[
+ # TODO: move to buildInputs, this should not be propagated.
AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth
CoreLocation CoreServices DiskArbitration Foundation OpenGL
darwin.libobjc libiconv
@@ -77,6 +78,9 @@ stdenv.mkDerivation {
[ libinput ]
++ lib.optional withGtk3 gtk3
)
+ ++ lib.optional stdenv.isDarwin
+ # Needed for OBJC_CLASS_$_NSDate symbols.
+ [ darwin.cf-private ]
++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.connector-c
diff --git a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix
index 888f627baab8..d0be6ae77694 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/qtmacextras.nix b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
index 5a3b1fe35cd8..3f254885986e 100644
--- a/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtmacextras.nix
@@ -1,9 +1,11 @@
-{ qtModule, qtbase, lib }:
+{ stdenv, qtModule, qtbase, cf-private }:
qtModule {
name = "qtmacextras";
- qtInputs = [ qtbase ];
- meta = with lib; {
+ qtInputs = [ qtbase ]
+ # Needed for _OBJC_CLASS_$_NSData symbols.
+ ++ stdenv.lib.optional stdenv.isDarwin cf-private;
+ meta = with stdenv.lib; {
maintainers = with maintainers; [ periklis ];
platforms = platforms.darwin;
};
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index aae15c62d73c..ad54a49e50b7 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/qtwebglplugin.nix b/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix
new file mode 100644
index 000000000000..444d0c1beae8
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/modules/qtwebglplugin.nix
@@ -0,0 +1,6 @@
+{ qtModule, qtbase, qtwebsockets }:
+
+qtModule {
+ name = "qtwebglplugin";
+ qtInputs = [ qtbase qtwebsockets ];
+}
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 833433fabeca..526fc2b8b2d1 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,9 +23,11 @@ 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 (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private OpenGL ])
++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ];
nativeBuildInputs = [
bison2 flex gdb gperf perl pkgconfig python2 ruby
@@ -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 e18564aaabe2..84a9d30918b1 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 5cf49450422f..ae99035d2267 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 000000000000..4cd7214e61e2
--- /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 220c6241096d..2b3c88d58860 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 040072cb463e..88591e880dee 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 cd981f8947aa..7fe4b504a992 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 000000000000..9d8ce8cef202
--- /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 4446226fedef..bd79e3628a14 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/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 11ae3a52adce..61c52de80b70 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "rdkafka-${version}";
- version = "0.11.5";
+ version = "0.11.6";
src = fetchFromGitHub {
owner = "edenhill";
repo = "librdkafka";
rev = "v${version}";
- sha256 = "1b0zp7k0775g5pzvkmpmsha63wx8wcwcas6w6wb09y0gymxz0xss";
+ sha256 = "17fah3x71ipnzvlj0yg8hfmqkk91s942z34p681r4k8giv7avm30";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix
index 9e7c5c1d4e3b..84062408d45c 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/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix
index e97b31896c1d..54aa42439d97 100644
--- a/pkgs/development/libraries/readline/6.2.nix
+++ b/pkgs/development/libraries/readline/6.2.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
desire its capabilities.
'';
- homepage = http://savannah.gnu.org/projects/readline/;
+ homepage = https://savannah.gnu.org/projects/readline/;
license = stdenv.lib.licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index cfa70f423db3..cbe6c083cb44 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
desire its capabilities.
'';
- homepage = http://savannah.gnu.org/projects/readline/;
+ homepage = https://savannah.gnu.org/projects/readline/;
license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 9c0c3d31b4b6..e96b4f1ebe27 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
desire its capabilities.
'';
- homepage = http://savannah.gnu.org/projects/readline/;
+ homepage = https://savannah.gnu.org/projects/readline/;
license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix
index f96addffb1ae..f8268b5eb7cd 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/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix
index 159bad4c68ea..d09e45a2d1e9 100644
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = ''
+ #!${stdenv.shell}
cd ${toString ./.}
${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix
'';
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index 0dc9c1afd2b4..b9830b65ffb7 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 000000000000..f727728943bd
--- /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/EBTKS/default.nix b/pkgs/development/libraries/science/biology/EBTKS/default.nix
index 67f868a91a7b..f4353f51d66c 100644
--- a/pkgs/development/libraries/science/biology/EBTKS/default.nix
+++ b/pkgs/development/libraries/science/biology/EBTKS/default.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
- checkPhase = "ctest --output-on-failure"; # but cmake doesn't run the tests ...
-
meta = with stdenv.lib; {
homepage = "https://github.com/BIC-MNI/${pname}";
description = "Library for working with MINC files";
diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix
index d00a74f61e20..f763e8a4fcc0 100644
--- a/pkgs/development/libraries/science/biology/bicpl/default.nix
+++ b/pkgs/development/libraries/science/biology/bicpl/default.nix
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBUILD_TESTING=FALSE" ];
- checkPhase = "ctest --output-on-failure";
doCheck = false;
# internal_volume_io.h: No such file or directory
diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix
index 7b9e6b24d418..5f4cbbaa5670 100644
--- a/pkgs/development/libraries/science/biology/elastix/default.nix
+++ b/pkgs/development/libraries/science/biology/elastix/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python ];
buildInputs = [ itk ];
- checkPhase = "ctest";
-
meta = with stdenv.lib; {
homepage = http://elastix.isi.uu.nl/;
description = "Image registration toolkit based on ITK";
diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix
index 48548bd72652..2ee9144b316d 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/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix
index 6ecc5159a3bc..ce2050e82e6d 100644
--- a/pkgs/development/libraries/science/biology/mirtk/default.nix
+++ b/pkgs/development/libraries/science/biology/mirtk/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, lib, gtest, fetchgit, cmake, boost, eigen, python, vtk, zlib }:
+{ stdenv, lib, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib }:
stdenv.mkDerivation rec {
version = "2.0.0";
name = "mirtk-${version}";
- # uses submodules so can't use fetchFromGitHub
- src = fetchgit {
- url = "https://github.com/BioMedIA/MIRTK.git";
+ src = fetchFromGitHub {
+ owner = "BioMedIA";
+ repo = "MIRTK";
rev = "v${version}";
sha256 = "0i2v97m66ir5myvi5b123r7zcagwy551b73s984gk7lksl5yiqxk";
+ fetchSubmodules = true;
};
cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON -DBUILD_TESTING=ON";
diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix
index 19e5644b9930..51eed36312dd 100644
--- a/pkgs/development/libraries/science/biology/nifticlib/default.nix
+++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib ];
- checkPhase = "ctest";
doCheck = false; # fails 7 out of 293 tests
meta = with stdenv.lib; {
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 000000000000..4668839ebb9c
--- /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 55c1a641fc3d..2a6c4af43fc3 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
deleted file mode 100644
index 8b740bdb6f6d..000000000000
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ /dev/null
@@ -1,125 +0,0 @@
-{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true, shared ? false
-, cpuConfig ? if stdenv.isi686 then "-b 32 -A 12 -V 1" else "-b 64 -A 14 -V 384"
-, cacheEdge ? "262144"
-, threads ? "0"
-, liblapack, withLapack
-}:
-
-# Atlas detects the CPU and optimizes its build accordingly. This is great when
-# the code is run on the same machine that built the binary, but in case of a
-# central build farm like Hydra, this feature is dangerous because the code may
-# be generated utilizing fancy features that users who download the binary
-# cannot execute.
-#
-# To avoid these issues, the build is configured using the 'cpuConfig'
-# parameter. Upstream recommends these defaults for distributions:
-#
-# | x86 CPU | x86_64 CPU |
-# |---------------------------------------------+------------------------|
-# | -b 32 | -b 64 |
-# | -A 12 (x86x87) | -A 14 (x86SSE2) |
-# | -V 1 (No SIMD) | -V 384 (SSE1 and SSE2) |
-#
-# These defaults should give consistent performance across machines.
-# Performance will be substantially lower than an optimized build, but a build
-# optimized for one machine will give even worse performance on others. If you
-# are a serious user of Atlas (e.g., you write code that uses it) you should
-# compile an optimized version for each of your machines.
-#
-# The parameter 'cacheEdge' sets the L2 cache per core (in bytes). Setting this
-# parameter reduces build time because some tests to detect the L2 cache size
-# will not be run. It will also reduce impurity; different build nodes on Hydra
-# may have different L2 cache sizes, but fixing the L2 cache size should
-# account for that. This also makes the performance of binary substitutes more
-# consistent.
-#
-# The -V flags can change with each release as new instruction sets are added
-# because upstream thinks it's a good idea to add entries at the start of an
-# enum, rather than the end. If the build suddenly fails with messages about
-# missing instruction sets, you may need to poke around in the source a bit.
-#
-# Upstream recommends the x86x87/x86SSE2 architectures for generic x86/x86_64
-# for distribution builds. Additionally, we set 'cacheEdge' to reduce impurity.
-# Otherwise, the cache parameters will be detected by timing which will be
-# highly variable on Hydra.
-
-let
- inherit (stdenv.lib) optional optionalString;
- # Don't upgrade until https://github.com/math-atlas/math-atlas/issues/44
- # is resolved.
- version = "3.10.3";
-in
-
-stdenv.mkDerivation {
- name = "atlas${optionalString withLapack "-with-lapack"}-${version}";
-
- src = fetchurl {
- url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2";
- sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216";
- };
-
- buildInputs = [ gfortran ];
-
- # Atlas aborts the build if it detects that some kind of CPU frequency
- # scaling is active on the build machine because that feature offsets the
- # performance timings. We ignore that check, however, because with binaries
- # being pre-built on Hydra those timings aren't accurate for the local
- # machine in the first place.
- patches = optional tolerateCpuTimingInaccuracy ./disable-timing-accuracy-check.patch
- ++ optional stdenv.isDarwin ./tmpdir.patch;
-
- hardeningDisable = [ "format" ];
-
- # Configure outside of the source directory.
- preConfigure = ''
- mkdir build
- cd build
- configureScript=../configure
- '';
-
- # * -t 0 disables use of multi-threading. It's not quite clear what the
- # consequences of that setting are and whether it's necessary or not.
- configureFlags = [
- "-t ${threads}"
- cpuConfig
- ] ++ optional shared "--shared"
- ++ optional withLapack "--with-netlib-lapack-tarfile=${liblapack.src}";
-
- postConfigure = ''
- if [[ -n "${cacheEdge}" ]]; then
- echo '#define CacheEdge ${cacheEdge}' >> include/atlas_cacheedge.h
- echo '#define CacheEdge ${cacheEdge}' >> include/atlas_tcacheedge.h
- fi
- '';
-
- doCheck = true;
-
- postInstall = ''
- # Avoid name collision with the real lapack (ATLAS only builds a partial
- # lapack unless withLapack = true).
- if ${if withLapack then "false" else "true"}; then
- mv $out/lib/liblapack.a $out/lib/liblapack_atlas.a
- fi
- '';
-
- # 1. /buildATLAS/build/bin/ATLrun.sh: multiple segfaults.
- # 2. "atlas does its own parallel builds"
- enableParallelBuilding = false;
-
- meta = {
- homepage = http://math-atlas.sourceforge.net/;
- description = "Automatically Tuned Linear Algebra Software (ATLAS)";
- license = stdenv.lib.licenses.bsd3;
- platforms = stdenv.lib.platforms.unix;
-
- longDescription = ''
- The ATLAS (Automatically Tuned Linear Algebra Software) project is an
- ongoing research effort focusing on applying empirical techniques in
- order to provide portable performance. At present, it provides C and
- Fortran77 interfaces to a portably efficient BLAS implementation, as well
- as a few routines from LAPACK.
- '';
-
- maintainers = with stdenv.lib.maintainers; [ ttuegel ];
- };
-}
diff --git a/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch b/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch
deleted file mode 100644
index ddacc742d142..000000000000
--- a/pkgs/development/libraries/science/math/atlas/disable-timing-accuracy-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ubr ATLAS-orig/CONFIG/src/config.c ATLAS/CONFIG/src/config.c
---- ATLAS-orig/CONFIG/src/config.c 2013-02-06 11:23:47.078036878 +0100
-+++ ATLAS/CONFIG/src/config.c 2013-02-06 11:24:16.481120888 +0100
-@@ -711,17 +711,7 @@
-
- int ProbeCPUThrottle(int verb, char *targarg, enum OSTYPE OS, enum ASMDIA asmb)
- {
-- int i, iret;
-- char *ln;
-- i = strlen(targarg) + 22 + 12;
-- ln = malloc(i*sizeof(char));
-- assert(ln);
-- sprintf(ln, "%s -O %d -s %d -t", targarg, OS, asmb);
-- iret = GetIntProbe(verb, ln, "arch", "CPU THROTTLE", 0);
-- free(ln);
-- if (iret) printf("CPU Throttling apparently enabled!\n");
-- else printf("Cannot detect CPU throttling.\n");
-- return(iret);
-+ return 0;
- }
-
- char *NewAppendedString_SFLAG(char *old, char *flag, char *str)
diff --git a/pkgs/development/libraries/science/math/atlas/tmpdir.patch b/pkgs/development/libraries/science/math/atlas/tmpdir.patch
deleted file mode 100644
index be571b94300c..000000000000
--- a/pkgs/development/libraries/science/math/atlas/tmpdir.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-diff --git a/CONFIG/ARCHS/negflt.c b/CONFIG/ARCHS/negflt.c
-index e5b7871..d45e387 100644
---- a/CONFIG/ARCHS/negflt.c
-+++ b/CONFIG/ARCHS/negflt.c
-@@ -239,7 +239,7 @@ void NegFile(char *fnam, int N, int *cols)
- FILE *fpin, *fpout;
- WORDS *wp0, *wp;
-
-- tnam = tmpnam(NULL);
-+ tnam = tempnam(NULL, NULL);
- fpin = fopen(fnam, "r");
- assert(fpin);
- fpout = fopen(tnam, "w");
-diff --git a/CONFIG/include/atlas_sys.h b/CONFIG/include/atlas_sys.h
-index b83a749..8902d38 100644
---- a/CONFIG/include/atlas_sys.h
-+++ b/CONFIG/include/atlas_sys.h
-@@ -216,12 +216,13 @@ static char *ATL_fgets_CWS(char *sout, int *plen, FILE *fpin)
-
- static char *ATL_tmpnam(void)
- {
-- static char tnam[L_tmpnam];
-+ static char *tnam;
- static char FirstTime=1;
- if (FirstTime)
- {
- FirstTime = 0;
-- assert(tmpnam(tnam));
-+ tnam = tempnam(NULL, NULL);
-+ assert(tnam);
- }
- return(tnam);
- }
-diff --git a/bin/atlas_install.c b/bin/atlas_install.c
-index 2753cbf..e49cc3e 100644
---- a/bin/atlas_install.c
-+++ b/bin/atlas_install.c
-@@ -662,7 +662,8 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- {
- const char TR[2] = {'N','T'};
- char prec[4] = {'d', 's', 'z', 'c'}, pre, upre, *typ;
-- char ln[1024], tnam[256], ln2[512], ln3[512], fnam[128];
-+ char ln[1024], ln2[512], ln3[512], fnam[128];
-+ char *tnam;
- char *mulinst, *peakstr, *peakstr2;
- int nprec=4;
- int iL1, lat, muladd, maused, latuse, lbnreg;
-@@ -681,7 +682,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- fpsum = fopen("INSTALL_LOG/SUMMARY.LOG", "a");
- ATL_Cassert(fpsum, "OPENING INSTALL_LOG/SUMMARY.LOG", NULL);
-
-- ATL_Cassert(tmpnam(tnam), "GETTING TEMPFILE", NULL);
-+ ATL_Cassert((tnam = tempnam(NULL, NULL)), "GETTING TEMPFILE", NULL);
-
- if (L1DEF)
- {
-diff --git a/bin/extract.c b/bin/extract.c
-index 7a5a926..53fb8bf 100644
---- a/bin/extract.c
-+++ b/bin/extract.c
-@@ -3378,7 +3378,7 @@ void PushProc0(EXTENV *EE, EXTPROC **basep, EXTPROC **myfuncs, char *ln)
- pp->argnams = KillWord(wp, wp);
- pp->nargs = CountWords(pp->argnams);
-
-- cp = tmpnam(NULL);
-+ cp = tempnam(NULL, NULL);
- if (cp == NULL) ExtErr(EE, "Out of tmpnams!!!");
- i = Wstrlen(cp) + 1;
- pp->FileNam = malloc(i*sizeof(char));
-diff --git a/include/atlas_mvtesttime.h b/include/atlas_mvtesttime.h
-index 9147fcb..ab6a99f 100644
---- a/include/atlas_mvtesttime.h
-+++ b/include/atlas_mvtesttime.h
-@@ -105,14 +105,15 @@ static int MVKernelFailsTest
- char ln[4096];
- char *sp;
- int i, lda0;
-- static char outnam[L_tmpnam];
-+ static char* outnam;
- static int FirstTime=1;
-
- if (FirstTime)
- {
-
- FirstTime = 0;
-- assert(tmpnam(outnam));
-+ outnam = tempnam(NULL, NULL);
-+ assert(outnam);
- }
- /*
- * If the file is generated, call generator to create it
-@@ -221,14 +222,15 @@ static double TimeMVKernel
- char ln[2048], resf[256], *sp;
- double *dp, mf;
- int i, align = pre2size(pre);
-- static char outnam[L_tmpnam];
-+ static char* outnam;
- static int FirstTime=1;
-
- if (FirstTime)
- {
-
- FirstTime = 0;
-- assert(tmpnam(outnam));
-+ outnam = tempnam(NULL, NULL);
-+ assert(outnam);
- }
- /*
- * If the file is generated, call generator to create it
-diff --git a/include/atlas_r1testtime.h b/include/atlas_r1testtime.h
-index b33213a..f27ee25 100644
---- a/include/atlas_r1testtime.h
-+++ b/include/atlas_r1testtime.h
-@@ -76,14 +76,15 @@ static int R1KernelFailsTest
- char ln[4096];
- char *sp;
- int i, lda0;
-- static char outnam[L_tmpnam];
-+ static char* outnam;
- static int FirstTime=1;
-
- if (FirstTime)
- {
-
- FirstTime = 0;
-- assert(tmpnam(outnam));
-+ outnam = tempnam(NULL, NULL);
-+ assert(outnam);
- }
- /*
- * If the file is generated, call generator to create it
-@@ -187,14 +188,15 @@ static double TimeR1Kernel
- char ln[2048], resf[256], *sp;
- double *dp, mf;
- int i, align = pre2size(pre);
-- static char outnam[L_tmpnam];
-+ static char* outnam;
- static int FirstTime=1;
-
- if (FirstTime)
- {
-
- FirstTime = 0;
-- assert(tmpnam(outnam));
-+ outnam = tempnam(NULL, NULL);
-+ assert(outnam);
- }
- /*
- * If the file is generated, call generator to create it
-diff --git a/include/atlas_r2testtime.h b/include/atlas_r2testtime.h
-index facc66d..c638dce 100644
---- a/include/atlas_r2testtime.h
-+++ b/include/atlas_r2testtime.h
-@@ -76,14 +76,15 @@ static int R2KernelFailsTest
- char ln[4096];
- char *sp;
- int i, lda0;
-- static char outnam[L_tmpnam];
-+ static char* outnam;
- static int FirstTime=1;
-
- if (FirstTime)
- {
-
- FirstTime = 0;
-- assert(tmpnam(outnam));
-+ outnam = tempnam(NULL, NULL);
-+ assert(outnam);
- }
- /*
- * If the file is generated, call generator to create it
-@@ -187,14 +188,15 @@ static double TimeR2Kernel
- char ln[2048], resf[256], *sp;
- double *dp, mf;
- int i, align = pre2size(pre);
-- static char outnam[L_tmpnam];
-+ static char* outnam;
- static int FirstTime=1;
-
- if (FirstTime)
- {
-
- FirstTime = 0;
-- assert(tmpnam(outnam));
-+ outnam = tempnam(NULL, NULL);
-+ assert(outnam);
- }
- /*
- * If the file is generated, call generator to create it
-diff --git a/include/atlas_sys.h b/include/atlas_sys.h
-index b83a749..b3f88d2 100644
---- a/include/atlas_sys.h
-+++ b/include/atlas_sys.h
-@@ -216,12 +216,13 @@ static char *ATL_fgets_CWS(char *sout, int *plen, FILE *fpin)
-
- static char *ATL_tmpnam(void)
- {
-- static char tnam[L_tmpnam];
-+ static char* tnam;
- static char FirstTime=1;
- if (FirstTime)
- {
- FirstTime = 0;
-- assert(tmpnam(tnam));
-+ tnam = tempnam(NULL, NULL);
-+ assert(tnam);
- }
- return(tnam);
- }
-diff --git a/tune/blas/gemm/usercomb.c b/tune/blas/gemm/usercomb.c
-index 59a7cd4..eb3eb05 100644
---- a/tune/blas/gemm/usercomb.c
-+++ b/tune/blas/gemm/usercomb.c
-@@ -138,11 +138,13 @@ int GetUserCase(char pre, int icase, int *iflag, int *mb, int *nb, int *kb,
-
- void CombineFiles(char *fout, int nfiles, char **fnams)
- {
-- char tnam[256], ln[512];
-+ char ln[512];
-+ char *tnam;
- int i, j, n, nn;
- FILE *fpout, *fpin;
-
-- assert(tmpnam(tnam));
-+ tnam = tempnam(NULL, NULL);
-+ assert(tnam);
- for (n=i=0; i < nfiles; i++) n += NumUserCases0(fnams[i]);
-
- fpout = fopen(tnam, "w");
-diff --git a/tune/blas/gemm/userflag.c b/tune/blas/gemm/userflag.c
-index c3983e4..b7dd70b 100644
---- a/tune/blas/gemm/userflag.c
-+++ b/tune/blas/gemm/userflag.c
-@@ -139,8 +139,8 @@ int GetUserCase(char pre, int icase, int *iflag, int *mb, int *nb, int *kb,
-
- void GoGetThem(char *infile, char *outfile)
- {
-- char ln[512], ln2[512], tnam[256], MCC[256], MMFLAGS[256];
-- char *chkfile = "FlagCheck.c", *sp, *sp2;
-+ char ln[512], ln2[512], MCC[256], MMFLAGS[256];
-+ char *chkfile = "FlagCheck.c", *sp, *sp2, *tnam;
- FILE *fpin, *fpout;
- int i, j, n, nmin=0, good;
- int wass;
-@@ -152,7 +152,8 @@ void GoGetThem(char *infile, char *outfile)
- n = NumUserCases0(infile);
- fpin = fopen(infile, "r");
- assert(fpin);
-- assert(tmpnam(tnam));
-+ tnam = tempnam(NULL, NULL);
-+ assert(tnam);
- fpout = fopen(tnam, "w");
- assert(fpout);
- assert(fgets(ln, 512, fpin));
-diff --git a/tune/sysinfo/emit_buildinfo.c b/tune/sysinfo/emit_buildinfo.c
-index 309c06a..3feaea7 100644
---- a/tune/sysinfo/emit_buildinfo.c
-+++ b/tune/sysinfo/emit_buildinfo.c
-@@ -41,14 +41,15 @@ static char SMCVERS[LNLEN], DMCVERS[LNLEN], SKCVERS[LNLEN], DKCVERS[LNLEN];
- static char UNAM[64], DATE[128];
- char *CmndResults(char *cmnd)
- {
-- static char tnam[128];
-+ static char* tnam;
- static int FirstTime=1;
- char ln[512];
-
- if (FirstTime)
- {
- FirstTime = 0;
-- assert(tmpnam(tnam));
-+ tnam = tempnam(NULL, NULL);
-+ assert(tnam);
- }
- sprintf(ln, "%s > %s\n", cmnd, tnam);
- fprintf(stderr, "system: %s", ln);
diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix
index c1994533b78d..d568e9452021 100644
--- a/pkgs/development/libraries/science/math/caffe2/default.nix
+++ b/pkgs/development/libraries/science/math/caffe2/default.nix
@@ -3,7 +3,7 @@
, glog, google-gflags, gtest
, protobuf, snappy
, python, future, six, python-protobuf, numpy, pydot
-, eigen3
+, eigen
, doxygen
, useCuda ? (config.cudaSupport or false), cudatoolkit ? null
, useCudnn ? (config.cudnnSupport or false), cudnn ? null
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" ];
propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle
- buildInputs = [ glog google-gflags protobuf snappy eigen3 ]
+ buildInputs = [ glog google-gflags protobuf snappy eigen ]
++ lib.optional useCuda cudatoolkit
++ lib.optional useCudnn cudnn
++ lib.optional useOpenmp openmp
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
${installExtraSrc cub}
${installExtraSrc pybind11}
# XXX hack
- export NIX_CFLAGS_COMPILE="-I ${eigen3}/include/eigen3/ $NIX_CFLAGS_COMPILE"
+ export NIX_CFLAGS_COMPILE="-I ${eigen}/include/eigen3/ $NIX_CFLAGS_COMPILE"
'';
postInstall = ''
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 000000000000..537fcb93a87e
--- /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 c89e9e4296cf..b41469c215e2 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 4a6aabb447f3..7e58a4c7c982 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/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index e6af2251b1f1..c26e9c575ab2 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -4,12 +4,9 @@
gfortran,
cmake,
python2,
- atlas ? null,
shared ? false
}:
let
- atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
- else null;
usedLibExtension = if shared then ".so" else ".a";
inherit (stdenv.lib) optional optionals;
version = "3.8.0";
@@ -22,7 +19,6 @@ stdenv.mkDerivation rec {
sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny";
};
- propagatedBuildInputs = [ atlasMaybeShared ];
buildInputs = [ gfortran cmake ];
nativeBuildInputs = [ python2 ];
@@ -30,28 +26,12 @@ stdenv.mkDerivation rec {
"-DUSE_OPTIMIZED_BLAS=ON"
"-DCMAKE_Fortran_FLAGS=-fPIC"
]
- ++ (optionals (atlas != null) [
- "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
- "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
- ])
- ++ (optional shared "-DBUILD_SHARED_LIBS=ON")
- # If we're on darwin, CMake will automatically detect impure paths. This switch
- # prevents that.
- ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''")
- ;
+ ++ (optional shared "-DBUILD_SHARED_LIBS=ON");
doCheck = ! shared;
- checkPhase = "
- ctest
- ";
-
enableParallelBuilding = true;
- passthru = {
- blas = atlas;
- };
-
meta = with stdenv.lib; {
inherit version;
description = "Linear Algebra PACKage";
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 000000000000..3cf5c3619a9e
--- /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 000000000000..37814047f975
--- /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 3f271d015027..b050a19db37b 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 000000000000..415e57e5d3cf
--- /dev/null
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitHub, cmake, google-gflags, which
+, lsb-release, glog, protobuf, cbc, zlib, python3 }:
+
+stdenv.mkDerivation rec {
+ name = "or-tools-${version}";
+ version = "v6.10";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "or-tools";
+ rev = version;
+ sha256 = "11k3671rpv968dsglc6bgarr9yi8ijaaqm2wq3m0rn4wy8fj7za2";
+ };
+
+ # 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
+ '';
+
+ makeFlags = [ "prefix=${placeholder "out"}" ];
+ buildFlags = [ "cc" ];
+
+ checkTarget = "test_cc";
+ doCheck = true;
+
+ installTargets = [ "install_cc" ];
+
+ nativeBuildInputs = [
+ cmake lsb-release which zlib python3
+ ];
+ propagatedBuildInputs = [
+ google-gflags glog protobuf cbc
+ ];
+
+ enableParallelBuilding = true;
+
+ 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 000000000000..08f76180638b
--- /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 000000000000..ca35ce2f4134
--- /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 000000000000..3f37bf49de38
--- /dev/null
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, cmake, openssh
+, gfortran, mpi, openblasCompat
+} :
+
+
+stdenv.mkDerivation rec {
+ name = "scalapack-${version}";
+ version = "2.0.2";
+
+ src = fetchurl {
+ url = "http://www.netlib.org/scalapack/scalapack-${version}.tgz";
+ sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c";
+ };
+
+ nativeBuildInputs = [ cmake openssh ];
+ buildInputs = [ mpi gfortran openblasCompat ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ preConfigure = ''
+ cmakeFlagsArray+=(
+ -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+ -DLAPACK_LIBRARIES="-lopenblas"
+ -DBLAS_LIBRARIES="-lopenblas"
+ )
+ '';
+
+ preCheck = ''
+ # make sure the test starts even if we have less than 4 cores
+ export OMPI_MCA_rmaps_base_oversubscribe=1
+
+ # Run single threaded
+ export OMP_NUM_THREADS=1
+
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib
+ '';
+
+ 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.bsd3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.costrouc ];
+ };
+
+}
diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix
index 0539083e823c..f9d1a84b1f03 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 000000000000..1ce56d1e49f7
--- /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 1ce56d1e49f7..528fe5ed0739 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, fixDarwinDylibNames
, 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,59 @@ 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
+ ${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"}
- # 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
+ runHook postBuild
'';
- nativeBuildInputs = [ gfortran ];
- buildInputs = [ openblas ];
+ 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 = [ cmake ]
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+ buildInputs = [ openblas gfortran.cc.lib ]
+ ++ stdenv.lib.optional 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 19d63d89834e..ad4d4c017376 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/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix
index 632380328db1..d5c3ca2457aa 100644
--- a/pkgs/development/libraries/science/networking/ns3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns3/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, python
+, wafHook
# for binding generation
, castxml ? null
@@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng";
};
+ nativeBuildInputs = [ wafHook ];
# ncurses is a hidden dependency of waf when checking python
buildInputs = lib.optionals generateBindings [ castxml ncurses ]
++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
@@ -58,12 +60,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gcc6 pythonEnv ];
postPatch = ''
- patchShebangs ./waf
patchShebangs doc/ns3_html_theme/get_version.sh
'';
- configureScript = "${python.interpreter} ./waf configure";
-
configureFlags = with stdenv.lib; [
"--enable-modules=${stdenv.lib.concatStringsSep "," modules}"
"--with-python=${pythonEnv.interpreter}"
@@ -74,12 +73,9 @@ stdenv.mkDerivation rec {
++ optional doCheck " --enable-tests "
;
- postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
- optional enableDoxygen "./waf doxygen"
- ++ optional withManual "./waf sphinx"
- );
- in "${flags}"
- ;
+ buildTargets = "build"
+ + lib.optionalString enableDoxygen " doxygen"
+ + lib.optionalString withManual "sphinx";
doCheck = true;
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index b305fecc3933..c9c26ca0d66c 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/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index 67e0ff31c8e5..533fefa9f194 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python }:
+{ stdenv, fetchurl, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "serd-${version}";
@@ -9,13 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf";
};
- nativeBuildInputs = [ pkgconfig python ];
-
- configurePhase = "python waf configure --prefix=$out";
-
- buildPhase = "python waf";
-
- installPhase = "python waf install";
+ nativeBuildInputs = [ pkgconfig python wafHook ];
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/serd;
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index f794c3841b93..3fd47125bcb3 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -9,28 +9,22 @@ stdenv.mkDerivation rec {
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ apr scons openssl aprutil zlib libiconv ]
+ nativeBuildInputs = [ pkgconfig scons ];
+ buildInputs = [ apr openssl aprutil zlib libiconv ]
++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
patches = [ ./scons.patch ];
- buildPhase = ''
- scons \
- -j $NIX_BUILD_CORES \
- APR="$(echo ${apr.dev}/bin/*-config)" \
- APU="$(echo ${aprutil.dev}/bin/*-config)" \
- CC=$CC \
- OPENSSL=${openssl} \
- PREFIX="$out" \
- ZLIB=${zlib} \
- ${
- if stdenv.isCygwin then "" else "GSSAPI=${kerberos.dev}"
- }
- '';
+ prefixKey = "PREFIX=";
- installPhase = ''
- scons install
+ preConfigure = ''
+ sconsFlags+=" APR=$(echo ${apr.dev}/bin/*-config)"
+ sconsFlags+=" APU=$(echo ${aprutil.dev}/bin/*-config)"
+ sconsFlags+=" CC=$CC"
+ sconsFlags+=" OPENSSL=${openssl}"
+ sconsFlags+=" ZLIB=${zlib}"
+ '' + stdenv.lib.optionalString (!stdenv.isCygwin) ''
+ sconsFlags+=" GSSAPI=${kerberos.dev}"
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 03a801a32405..37ef0ce75271 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 dc3f4a118f6d..f795dfef9e4c 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/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix
index 28b96d17aa60..196fb59bb171 100644
--- a/pkgs/development/libraries/simgear/default.nix
+++ b/pkgs/development/libraries/simgear/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
name = "simgear-${version}";
- version = "2017.3.1";
- shortVersion = "2017.3";
+ version = "2018.2.2";
+ shortVersion = "2018.2";
src = fetchurl {
url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
- sha256 = "1x71wvycs2bjgmmacswgk6091p65p46fr40mr7f4kcipnx88bq0f";
+ sha256 = "f61576bc36aae36f350154749df1cee396763604c06b8a71c4b50452d9151ce5";
};
buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto
@@ -28,4 +28,3 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2;
};
}
-
diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index c807325b155c..1c17124a2bbb 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ];
- checkPhase = "ctest";
-
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 9d5bd170e20d..0667e1265b34 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 2fce5b3368f7..66bfd601a62d 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/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 6d0ca4c1d675..6cb420d9a0bb 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig }:
stdenv.mkDerivation rec {
- name = "socket_wrapper-1.1.9";
+ name = "socket_wrapper-1.2.1";
src = fetchurl {
url = "mirror://samba/cwrap/${name}.tar.gz";
- sha256 = "1d7bbr4j1ybq2dm6q3f6ncv36qqxyjygq4z1q0hvadlcaw7pj79c";
+ sha256 = "1yi1ry3skkbrhvm6g72ripz99diqxnd09v0bx3dlb5sfgcl0wjax";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index 9fe88b771be7..ca2ff666b7a5 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 fdad4e21b0b6..9769596621b1 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/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 465ec5b8fe8b..10258e791ba6 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python, serd, pcre }:
+{ stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }:
stdenv.mkDerivation rec {
name = "sord-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ python serd pcre ];
- configurePhase = "${python.interpreter} waf configure --prefix=$out";
-
- buildPhase = "${python.interpreter} waf";
-
- installPhase = "${python.interpreter} waf install";
-
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/sord;
description = "A lightweight C library for storing RDF data in memory";
diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix
index 13f037960b08..c219d5bfb362 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 1c9e67f87675..198c61d37b5a 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";
+let
+ generic = { version, sha256 }:
+ stdenv.mkDerivation {
+ name = "spdlog-${version}";
+ inherit version;
- src = fetchFromGitHub {
- owner = "gabime";
- repo = "spdlog";
- rev = "v${version}";
- sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q";
+ src = fetchFromGitHub {
+ owner = "gabime";
+ repo = "spdlog";
+ rev = "v${version}";
+ inherit sha256;
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" ];
+
+ outputs = [ "out" "doc" ];
+
+ 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;
+ };
+ };
+in
+{
+ spdlog_1 = generic {
+ version = "1.2.1";
+ sha256 = "0gdj8arfz4r9419zbcxk9y9nv47qr7kyjjzw9m3ijgmn2pmxk88n";
};
- nativeBuildInputs = [ cmake ];
-
- # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ];
-
- outputs = [ "out" "doc" ];
-
- 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;
+ spdlog_0 = generic {
+ version = "0.17.0";
+ sha256 = "112kfh4fbpm5cvrmgbgz4d8s802db91mhyjpg7cwhlywffnzkwr9";
};
}
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 173b460a0ab2..1321a558d5ed 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }:
stdenv.mkDerivation rec {
- name = "speex-1.2rc2";
+ name = "speex-1.2.0";
src = fetchurl {
url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
- sha256 = "14g8ph39inkrif749lzjm089g7kwk0hymq1a3i9ch5gz8xr7r8na";
+ sha256 = "150047wnllz4r94whb9r73l5qf0z5z3rlhy98bawfbblmkq8mbpa";
};
postPatch = ''
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index f5258c1cd6d8..bc583f732db6 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1
-, openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
+, openssl, libpulseaudio, pixman, gobject-introspection, libjpeg_turbo, zlib
, cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup
, withPolkit ? true, polkit, acl, usbutils
, vala, gtk3, epoxy, libdrm, gst_all_1, phodav, opusfile }:
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav opusfile
] ++ optionals withPolkit [ polkit acl usbutils ] ;
- nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobject-introspection ];
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
Python bindings are available too.
'';
- homepage = http://www.spice-space.org/;
+ homepage = https://www.spice-space.org/;
license = licenses.lgpl21;
maintainers = [ maintainers.xeji ];
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index fc337f22b56f..08c92ee9ea48 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Protocol headers for the SPICE protocol";
- homepage = http://www.spice-space.org;
+ homepage = https://www.spice-space.org/;
license = licenses.bsd3;
maintainers = with maintainers; [ bluescreen303 ];
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index ba3791a8a8bd..dadbe57dccdd 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"
];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
VD-Interfaces. The VD-Interfaces (VDI) enable both ends of the solution to be easily
utilized by a third-party component.
'';
- homepage = http://www.spice-space.org/;
+ homepage = https://www.spice-space.org/;
license = licenses.lgpl21;
maintainers = [ maintainers.bluescreen303 ];
diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index 5b68b4901f9a..0a63f5e778a6 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
stdenv.mkDerivation rec {
name = "sqlite-analyzer-${version}";
- version = "3.24.0";
+ version = "3.26.0";
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
- sha256 = "19ck2sg13i6ga5vapxak42jn6050vpfid0zrmah7jh32mksh58vj";
+ sha256 = "0ysgi2jrl348amdfifsl3cx90d04bijm4pn4xnvivmi3m1dq4hp0";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 166ea39493bf..100f7fec06aa 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
stdenv.mkDerivation rec {
name = "sqlite-${version}";
- version = "3.24.0";
+ version = "3.26.0";
# NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
- sha256 = "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr";
+ sha256 = "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx";
};
outputs = [ "bin" "dev" "out" ];
@@ -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 fc9abdc24c7c..f3cfc1e56e87 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/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index 1759258e6664..c83f5b0f5ac3 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, python, fetchurl, openssl, boost }:
+{ stdenv, python, fetchurl, openssl, boost, scons }:
stdenv.mkDerivation rec {
name = "swiften-${version}";
version = "4.0.2";
+ nativeBuildInputs = [ scons];
buildInputs = [ python ];
propagatedBuildInputs = [ openssl boost ];
@@ -10,16 +11,17 @@ stdenv.mkDerivation rec {
url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
};
-
- buildPhase = ''
- patchShebangs ./scons
- ./scons openssl=${openssl.dev} \
- boost_includedir=${boost.dev}/include \
- boost_libdir=${boost.out}/lib \
- boost_bundled_enable=false \
- SWIFTEN_INSTALLDIR=$out $out
+
+ sconsFlags = [
+ "openssl=${openssl.dev}"
+ "boost_includedir=${boost.dev}/include"
+ "boost_libdir=${boost.out}/lib"
+ "boost_bundled_enable=false"
+ ];
+ preInstall = ''
+ installTargets="$out"
+ installFlags+=" SWIFT_INSTALLDIR=$out"
'';
- installPhase = "true";
meta = with stdenv.lib; {
description = "An XMPP library for C++, used by the Swift client";
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
index b74c58a2e38c..6577ebeae28e 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 8a76e886b4f6..b8e7518cd332 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 0059243890d6..b667e6047400 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 6da524c23390..86006806baa0 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 1caa8a376fb1..8992c7e75c05 100644
--- a/pkgs/development/libraries/taglib/1.9.nix
+++ b/pkgs/development/libraries/taglib/1.9.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "taglib-1.9.1";
src = fetchurl {
- url = http://taglib.github.io/releases/taglib-1.9.1.tar.gz;
+ url = https://taglib.github.io/releases/taglib-1.9.1.tar.gz;
sha256 = "06n7gnbcqa3r6c9gv00y0y1r48dyyazm6yj403i7ma0r2k6p3lvj";
};
@@ -13,11 +13,10 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ];
meta = {
- homepage = http://developer.kde.org/~wheeler/taglib.html;
+ homepage = https://taglib.org/;
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 67db6e5097d0..a2cb103a1821 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/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 77c3c6458ade..745587609352 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, python, pkgconfig, readline, libxslt
-, docbook_xsl, docbook_xml_dtd_42
+, docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames
+, buildPackages
}:
stdenv.mkDerivation rec {
@@ -10,23 +11,26 @@ stdenv.mkDerivation rec {
sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- python readline libxslt docbook_xsl docbook_xml_dtd_42
- ];
+ nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python
+ docbook_xsl docbook_xml_dtd_42 ];
+ buildInputs = [ readline libxslt ];
- preConfigure = ''
- sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
+ prePatch = ''
+ patchShebangs buildtools/bin/waf
'';
configureFlags = [
"--enable-talloc-compat1"
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
+ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+ "--cross-compile"
+ "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
];
+ configurePlatforms = [];
postInstall = ''
- ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o
+ ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix
index a92c7b74ebf7..293baa492c56 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 6ffbe5dc60c5..24b1d477b8a0 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 fae51aea477e..1247d9ffa843 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 9ca2481c3b01..7436da503190 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -1,29 +1,36 @@
{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt
-, gobjectIntrospection, valaSupport ? true, vala_0_38, glibcLocales }:
+, gobject-introspection, vala, glibcLocales }:
stdenv.mkDerivation rec {
name = "telepathy-glib-0.24.1";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy";
};
- configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";
+ configureFlags = [
+ "--enable-vala-bindings"
+ ];
LC_ALL = "en_US.UTF-8";
- propagatedBuildInputs = [dbus-glib glib gobjectIntrospection];
+ propagatedBuildInputs = [ dbus-glib glib ];
- nativeBuildInputs = [ pkgconfig libxslt ] ++ stdenv.lib.optional valaSupport vala_0_38;
+ nativeBuildInputs = [ pkgconfig libxslt gobject-introspection vala ];
buildInputs = [ glibcLocales python2 ];
+ enableParallelBuilding = true;
+
preConfigure = ''
substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
'';
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/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix
index 6ce02d588a97..2b63bab0eade 100644
--- a/pkgs/development/libraries/template-glib/default.nix
+++ b/pkgs/development/libraries/template-glib/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }:
let
- version = "3.28.0";
+ version = "3.30.0";
pname = "template-glib";
in
stdenv.mkDerivation {
@@ -10,11 +10,11 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "18bic41f9cx8h6n5bz80z4ridb8c1h1yscicln8zsn23zmp44x3c";
+ sha256 = "0j9ndswl3fc0ymbqd6kk7yw3sniij3dgczc665p06wgw3cwhssfg";
};
buildInputs = [ meson ninja pkgconfig gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ];
- nativeBuildInputs = [ glib gobjectIntrospection ];
+ nativeBuildInputs = [ glib gobject-introspection ];
mesonFlags = [
"-Denable_gtk_doc=true"
diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix
new file mode 100644
index 000000000000..469a6a4c96f9
--- /dev/null
+++ b/pkgs/development/libraries/termbox/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitHub, python3, wafHook }:
+
+stdenv.mkDerivation rec {
+ name = "termbox-${version}";
+ version = "1.1.2";
+ src = fetchFromGitHub {
+ owner = "nsf";
+ repo = "termbox";
+ rev = "v${version}";
+ sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs";
+ };
+ nativeBuildInputs = [ python3 wafHook ];
+ 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/theft/default.nix b/pkgs/development/libraries/theft/default.nix
index 2a1180533cea..881f9c033a38 100644
--- a/pkgs/development/libraries/theft/default.nix
+++ b/pkgs/development/libraries/theft/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- version = "0.4.3";
+ version = "0.4.4";
name = "theft-${version}";
src = fetchFromGitHub {
owner = "silentbicycle";
repo = "theft";
rev = "v${version}";
- sha256 = "1ibh8np12lafnrsrvjbbzlyq45zq654939x0y22vdnc6s8dpbhw4";
+ sha256 = "1csdhnb10k7vsyd44vjpg430nf6a909wj8af2zawdkbvnxn5wxc4";
};
preConfigure = "patchShebangs ./scripts/mk_bits_lut";
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 77c0b4a1a460..d67d76185745 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 ''
@@ -16,6 +18,7 @@ stdenv.mkDerivation rec {
'#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined __GLIBC__'
'';
+ KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config";
nativeBuildInputs = [ autoreconfHook ];
propagatedBuildInputs = [ libkrb5 ];
diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix
index ba95da77b72c..51dabbd2beb7 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/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index 2ec9c57e2411..d61076e569bc 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
# add pkgconfig file
./2.6.2-add-pkgconfig.patch
- # http://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
+ # https://sourceforge.net/tracker/index.php?func=detail&aid=3031828&group_id=13559&atid=313559
./2.6.2-entity.patch
# Use CC, CXX, and LD from environment
diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix
index 23ef997e5ce1..229e4cfaa6c0 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/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix
index 149b2260792f..bcc91d058f04 100644
--- a/pkgs/development/libraries/tsocks/default.nix
+++ b/pkgs/development/libraries/tsocks/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2;
maintainers = with maintainers; [ edwtjo phreedom ];
platforms = platforms.unix;
+ broken = stdenv.hostPlatform.isDarwin;
};
}
diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix
index 416cf53ab496..53e10b468ba6 100644
--- a/pkgs/development/libraries/ucommon/default.nix
+++ b/pkgs/development/libraries/ucommon/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = {
description = "C++ library to facilitate using C++ design patterns";
- homepage = http://www.gnu.org/software/commoncpp/;
+ homepage = https://www.gnu.org/software/commoncpp/;
license = stdenv.lib.licenses.lgpl3Plus;
maintainers = with stdenv.lib.maintainers; [ ];
diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix
index 377ceba59e70..6eef95309aab 100644
--- a/pkgs/development/libraries/uhttpmock/default.nix
+++ b/pkgs/development/libraries/uhttpmock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobjectIntrospection }:
+{ stdenv, lib, fetchFromGitLab, autoconf, gtk-doc, automake, libtool, pkgconfig, glib, libsoup, gobject-introspection }:
stdenv.mkDerivation rec {
version="0.5.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobjectIntrospection ];
+ buildInputs = [ autoconf gtk-doc automake libtool glib libsoup gobject-introspection ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 912bcac55cd0..0bf7fb59e321 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobjectIntrospection
+{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobject-introspection
, pkgconfig, glib, systemd, libgudev, vala }:
stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib systemd libgudev ];
- nativeBuildInputs = [ autoreconfHook pkgconfig vala gobjectIntrospection ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig vala gobject-introspection ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index c716ae7f8dbb..ac9f67e1e129 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
+{ lib, 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 doxygen graphviz ];
+ buildInputs = lib.optional doCheck gtest;
+ configureFlags = lib.optional (!doCheck) "--disable-tests";
- doCheck = true;
+ doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system;
meta = with stdenv.lib; {
homepage = https://uriparser.github.io/;
diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix
new file mode 100644
index 000000000000..859d152072fb
--- /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 adebedbf2ac1..85d0c0d91bb5 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/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix
new file mode 100644
index 000000000000..8d2276def705
--- /dev/null
+++ b/pkgs/development/libraries/v8/plv8_6_x.nix
@@ -0,0 +1,187 @@
+# NOTE: this expression is NOT exported from the top-level of all-packages.nix,
+# it is exclusively used by the 'plv8' PostgreSQL extension, which requires a
+# very exact version.
+
+{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig
+, doCheck ? false
+, snapshot ? true
+}:
+
+let
+ arch = if stdenv.isAarch32
+ then if stdenv.is64bit
+ then"arm64"
+ else "arm"
+ else if stdenv.is64bit
+ then"x64"
+ 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 = "0e9a47d74970bee1bbfc063c47215406f8918699";
+ sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c";
+ };
+ "build" = fetchgit {
+ url = "${git_url}/chromium/src/build.git";
+ rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac";
+ sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh";
+ };
+ "buildtools" = fetchgit {
+ url = "${git_url}/chromium/buildtools.git";
+ rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8";
+ sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw";
+ };
+ "test/benchmarks/data" = fetchgit {
+ 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";
+ sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";
+ };
+ "test/test262/data" = fetchgit {
+ url = "${git_url}/external/github.com/tc39/test262.git";
+ rev = "5d4c667b271a9b39d0de73aef5ffe6879c6f8811";
+ sha256 = "0q9iwb2nkybf9np95wgf5m372aw2lhx9wlsw41a2a80kbkvb2kqg";
+ };
+ "test/test262/harness" = fetchgit {
+ 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 = "a7e226a92e660a3d5413cfea4269824f513259d2";
+ sha256 = "0z3aybj3ykajwh2bv5fwd6pwqjjsq8dnwrqc2wncb6r9xcjwbgxp";
+ };
+ "testing/gtest" = fetchgit {
+ url = "${git_url}/external/github.com/google/googletest.git";
+ rev = "6f8a66431cb592dad629028a50b3dd418a408c87";
+ sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";
+ };
+ "third_party/icu" = fetchgit {
+ url = "${git_url}/chromium/deps/icu.git";
+ rev = "741688ebf328da9adc52505248bf4e2ef868722c";
+ sha256 = "02ifm18qjlrkn5nm2rxkf9yz9bdlyq7c65jfjndv63vi1drqh1r9";
+ };
+ "third_party/instrumented_libraries" = fetchgit {
+ url = "${git_url}/chromium/src/third_party/instrumented_libraries.git";
+ rev = "28417458ac4dc79f68915079d0f283f682504cc0";
+ sha256 = "1qf5c2946n37p843yriv7xawi6ss6samabghq43s49cgd4wq8dc3";
+ };
+ "third_party/jinja2" = fetchgit {
+ url = "${git_url}/chromium/src/third_party/jinja2.git";
+ rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0";
+ sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd";
+ };
+ "third_party/markupsafe" = fetchgit {
+ url = "${git_url}/chromium/src/third_party/markupsafe.git";
+ rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";
+ sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";
+ };
+ "tools/clang" = fetchgit {
+ url = "${git_url}/chromium/src/tools/clang.git";
+ rev = "8688d267571de76a56746324dcc249bf4232b85a";
+ sha256 = "0krq4zz1vnwp064bm517gwr2napy18wyccdh8w5s4qgkjwwxd63s";
+ };
+ "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 = "45a8a51fda92e123619a69e7644d9c64a320b0c1";
+ sha256 = "0r7736gqk7r0i7ig0b5ib10d9q8a8xzsmc0f0fbkm9k78v847vpj";
+ };
+ "tools/swarming_client" = fetchgit {
+ url = "${git_url}/infra/luci/client-py.git";
+ rev = "4bd9152f8a975d57c972c071dfb4ddf668e02200";
+ sha256 = "03zk91gzvqv01g1vbl8d7h8al7vs4ymrrdc8ipg9wpq52yh65smh";
+ };
+ };
+
+in
+
+stdenv.mkDerivation rec {
+ name = "v8-${version}";
+ version = "6.4.388.40";
+
+ inherit doCheck;
+
+ src = fetchFromGitHub {
+ owner = "v8";
+ repo = "v8";
+ rev = version;
+ sha256 = "1lq239cgqyidrynz8g3wbdv70ymzv6s0ppad8s219gb3jnizm16a";
+ };
+
+ postUnpack = ''
+ ${lib.concatStringsSep "\n" (
+ lib.mapAttrsToList (n: v: ''
+ mkdir -p $sourceRoot/${n}
+ cp -r ${v}/* $sourceRoot/${n}
+ '') deps)}
+ '';
+
+ prePatch = ''
+ # use our gn, not the bundled one
+ sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py
+
+ # disable tests
+ if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi
+
+ # disable sysroot usage
+ chmod u+w build/config build/config/sysroot.gni
+ sed -i build/config/sysroot.gni \
+ -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }'
+
+ # patch shebangs (/usr/bin/env)
+ patchShebangs tools/dev/v8gen.py
+ '';
+
+ 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 \
+ use_custom_libcxx=false \
+ use_custom_libcxx_for_host=false
+ '';
+
+ nativeBuildInputs = [ gn ninja pkgconfig ];
+ buildInputs = [ python glib ];
+
+ buildPhase = ''
+ ninja -C out.gn/${arch}.release/
+ '';
+
+ enableParallelBuilding = true;
+
+ installPhase = ''
+ install -vD out.gn/${arch}.release/d8 "$out/bin/d8"
+ install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot"
+ mkdir -p "$out/lib"
+ for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do
+ install -vD out.gn/${arch}.release/$f "$out/lib/$f"
+ done
+ install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat"
+ mkdir -p "$out/include"
+ cp -vr include/*.h "$out/include"
+ cp -vr include/libplatform "$out/include"
+ '';
+
+ meta = with lib; {
+ description = "Google's open source JavaScript engine";
+ maintainers = with maintainers; [ cstrahan proglodyte ];
+ platforms = platforms.linux;
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix
index ba763e334905..70ee61aecd3b 100644
--- a/pkgs/development/libraries/vaapi-intel/default.nix
+++ b/pkgs/development/libraries/vaapi-intel/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "intel-vaapi-driver-${version}";
- inherit (libva) version;
+ version = "2.2.0"; # generally try to match libva version, but not required
src = fetchFromGitHub {
owner = "intel";
repo = "intel-vaapi-driver";
rev = version;
- sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763";
+ sha256 = "1z8iqnswias2gph61yzyal53456y71ff98f21cs17hw4qjfkwa6k";
};
patchPhase = ''
diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix
index c2ab61c6bd17..ecc6b7c30fc7 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 7344f3a7e2bb..2d3af9b70c57 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 e2a2af615b88..66c8e4fbc531 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.1";
src = fetchFromGitHub {
owner = "VcDevel";
repo = "Vc";
rev = version;
- sha256 = "0y4riz2kiw6a9w2zydj6x0vhy2qc9v17wspq3n2q88nbas72yd2m";
+ sha256 = "09nf6j1hyq2yv0c1cmnv4ff5243ylsajy1xj3dz8c2qqcm14y6cm";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix
index ddecf4a96a75..480b8f7bcd7b 100644
--- a/pkgs/development/libraries/vcdimager/default.nix
+++ b/pkgs/development/libraries/vcdimager/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libcdio ];
meta = with lib; {
- homepage = http://www.gnu.org/software/vcdimager/;
+ homepage = https://www.gnu.org/software/vcdimager/;
description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs";
platforms = platforms.unix;
license = licenses.gpl2;
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 12c166beacbd..fb69d4bf63e7 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 2cd3b5a20c0c..4473100a9f20 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 ddeecce21c61..0ae5ba147cb7 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/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index b85d76640cf0..afd29aeb0063 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -41,8 +41,6 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF"
- "-DCMAKE_OSX_SYSROOT="
- "-DCMAKE_OSX_DEPLOYMENT_TARGET="
"-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 2a07eba261b7..c93ba1b12909 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 5ffdc4375373..6f720857f7cf 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 fce0dae6c731..866b1232aef5 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 7c4d275e05fe..187eed6ae83a 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 = "6.2";
name = "wcslib-${version}";
buildInputs = [ flex ];
src = fetchurl {
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
- sha256 ="160gvz9xk4hvliwb75ry770qdf899kc89ij6r0y7fh60lbjz1far";
+ sha256 ="01fqckazhbfqqhyr0wd9vcks1m2afmsh83l981alxg2r54jgwkdv";
};
prePatch = ''
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 1a17ae53313b..9030149fc8ad 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, gobject-introspection, 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 gobject-introspection pruneLibtoolFiles
];
buildInputs = [
diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/default.nix
similarity index 91%
rename from pkgs/development/libraries/webkitgtk/2.20.nix
rename to pkgs/development/libraries/webkitgtk/default.nix
index bb493d16a369..e18142eb1d02 100644
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja
-, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt
+, pkgconfig, gettext, gobject-introspection, 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
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
- version = "2.20.5";
+ version = "2.22.4";
meta = {
description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${name}.tar.xz";
- sha256 = "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m";
+ sha256 = "1f2335hjzsvjxjf6hy5cyypsn65wykpx2pbk1sp548w0hclbxdgs";
};
patches = optionals stdenv.isDarwin [
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake ninja perl python2 ruby bison gperf
- pkgconfig gettext gobjectIntrospection
+ pkgconfig gettext gobject-introspection
];
buildInputs = [
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index c4d94af850dd..56068c435d80 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 a4c2b3297145..efe7214ab6a1 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,39 +1,86 @@
-{ 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.2";
+ meson480 = meson.overrideAttrs (oldAttrs: rec {
+ name = pname + "-" + version;
+ pname = "meson";
+ version = "0.48.0";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0qawsm6px1vca3babnqwn0hmkzsxy4w0gi345apd2qk3v0cv7ipc";
+ };
+ # Remove gir-fallback-path.patch and
+ # a87496addd9160300837aa50193f4798c6f1d251.patch (already in 0.48.0):
+ patches = builtins.filter
+ (str: !(stdenv.lib.hasSuffix "gir-fallback-path.patch" str
+ || stdenv.lib.hasSuffix "a87496addd9160300837aa50193f4798c6f1d251.patch" str))
+ oldAttrs.patches;
+ });
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "swaywm";
repo = "wlroots";
- rev = "9cc875429b40e2567b219f8e9ffd23316d136204";
- sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq";
+ rev = version;
+ sha256 = "0gfxawjlb736xl90zfv3n6zzf5n1cacgzflqi1zq1wn7wd3j6ppv";
};
- # $out for the library and $bin for rootston
- outputs = [ "out" "bin" ];
+ postPatch = ''
+ substituteInPlace meson.build \
+ --replace "version: '0.1.0'" "version: '${version}.0'"
+ '';
- nativeBuildInputs = [ meson ninja pkgconfig ];
+ # $out for the library, $bin for rootston, and $examples for the example
+ # programs (in examples) AND rootston
+ outputs = [ "out" "bin" "examples" ];
+
+ 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-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 +89,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 2b69f6283d60..8f57a0bf1b71 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 59f6af7eddb2..27b95208432e 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 9c307b2d15ae..040273e28b99 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/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index d11a93254bfb..4212687a02ac 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, yasm
+{ stdenv, fetchurl, fetchpatch, cmake, yasm
, debugSupport ? false # Run-time sanity checks (debugging)
, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
, werrorSupport ? false # Warnings as errors
@@ -16,19 +16,28 @@ in
stdenv.mkDerivation rec {
name = "x265-${version}";
- version = "2.7";
+ version = "2.9";
src = fetchurl {
urls = [
- "http://get.videolan.org/x265/x265_${version}.tar.gz"
- "https://github.com/videolan/x265/archive/${version}.tar.gz"
+ "https://get.videolan.org/x265/x265_${version}.tar.gz"
+ "ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz"
];
- sha256 = "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym";
+ sha256 = "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb";
};
enableParallelBuilding = true;
- patchPhase = ''
+ patches = [
+ # Fix issue #442 (linking issue on non-x86 platforms)
+ # Applies on v2.9 only, this should be removed at next update
+ (fetchpatch {
+ url = "https://bitbucket.org/multicoreware/x265/commits/471726d3a0462739ff8e3518eb1a1e8a01de4e8d/raw";
+ sha256 = "0mj8lb8ng8lrhzjavap06vjhqf6j0r3sn76c6rhs3012f86lv928";
+ })
+ ];
+
+ postPatch = ''
sed -i 's/unknown/${version}/g' source/cmake/version.cmake
'';
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index f93f7ed87460..2d7289ca6647 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.9" "1k7m7m9jld96k16ansfw2w3c354pvd8ibhnrb6dw012g06fw7sfd";
}
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 6deae76d2aa7..000000000000
--- 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 79f75abfd91c..3dd2cb5b874c 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 000000000000..247b8ee45d0b
--- /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 e6f23a8a2703..f81461b2ac8e 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 9651f642a011..9cdada9bf3b2 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 9fa1768f4dce..8ad4e6d6a8a6 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -2,15 +2,19 @@
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";
};
+ # Disable SSE2 extensions on platforms for which they are not enabled by default
+ configureFlags = [ "--disable-sse2" ];
+ enableParallelBuilding = true;
+
meta = {
- homepage = http://xerces.apache.org/xerces-c/;
+ homepage = https://xerces.apache.org/xerces-c/;
description = "Validating XML parser written in a portable subset of C++";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
index 69b5b95e7613..d86dac050731 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 000000000000..6305b6c03a46
--- /dev/null
+++ b/pkgs/development/libraries/yojimbo/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, premake5, doxygen, libsodium, mbedtls }:
+
+stdenv.mkDerivation rec {
+ pname = "yojimbo";
+ version = "1.1";
+
+ src = fetchFromGitHub {
+ owner = "networkprotocol";
+ repo = "yojimbo";
+ rev = "e02219c102d9b440290539036992d77608eab3b0";
+ sha256 = "0jn25ddv73hwjals883a910m66kwj6glxxhnmn96bpzsvsaimnkr";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ premake5 doxygen ];
+ propagatedBuildInputs = [ libsodium mbedtls ];
+
+ postBuild = ''
+ 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
+ '';
+
+ doCheck = true;
+
+ 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/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix
index 7acbaa260a0c..b072fb1d4e93 100644
--- a/pkgs/development/libraries/zeitgeist/default.nix
+++ b/pkgs/development/libraries/zeitgeist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, glib, sqlite, vala_0_38
+{ stdenv, fetchFromGitLab, pkgconfig, glib, sqlite, gobject-introspection, vala
, autoconf, automake, libtool, gettext, dbus, telepathy-glib
, gtk3, json-glib, librdf_raptor2, dbus-glib
, pythonSupport ? true, python2Packages
@@ -8,8 +8,12 @@ stdenv.mkDerivation rec {
version = "1.0.1";
name = "zeitgeist-${version}";
- src = fetchgit {
- url = "git://anongit.freedesktop.org/git/zeitgeist/zeitgeist";
+ outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional pythonSupport "py";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "zeitgeist";
+ repo = "zeitgeist";
rev = "v${version}";
sha256 = "1lgqcqr5h9ba751b7ajp7h2w1bb5qza2w3k1f95j3ab15p7q0q44";
};
@@ -18,13 +22,17 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
- nativeBuildInputs = [ autoconf automake libtool pkgconfig gettext vala_0_38 python2Packages.python ];
+ nativeBuildInputs = [
+ autoconf automake libtool pkgconfig gettext gobject-introspection vala python2Packages.python
+ ];
buildInputs = [
glib sqlite dbus telepathy-glib dbus-glib
gtk3 json-glib librdf_raptor2 python2Packages.rdflib
];
- prePatch = "patchShebangs .";
+ postPatch = ''
+ patchShebangs data/ontology2code
+ '';
enableParallelBuilding = true;
@@ -32,11 +40,9 @@ stdenv.mkDerivation rec {
moveToOutput lib/${python2Packages.python.libPrefix} "$py"
'';
- outputs = [ "out" ] ++ stdenv.lib.optional pythonSupport "py";
-
meta = with stdenv.lib; {
description = "A service which logs the users's activities and events";
- homepage = https://launchpad.net/zeitgeist;
+ homepage = http://zeitgeist.freedesktop.org/;
maintainers = with maintainers; [ lethalman ];
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 9d0065277172..12fb076d946b 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 735a92bd370a..3a5638b22814 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -85,4 +85,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 1ba073943483..65509d766b96 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 f208b47234c6..5769ee94a1be 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 000000000000..e2c632b8ebad
--- /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 22aa818f8756..9b9486e9758c 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 c90a9e091920..9daab46784d3 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 4612e6175b91..65df45d95a50 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 f0fc5d4d0c0f..c5305587a029 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 6dbff1d6e56c..ec4e31013f92 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 ecc1634bfce0..86bdb36c8d23 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 02e6e2bf6045..f3e64cb965e4 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 c8f34e0fa17f..a9808173b626 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 a420c22054f6..531d429df244 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 42a7bd595853..a413743eb8d5 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 d72a9c69ac0f..377c8c2209bc 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 f7392b880d11..2129c7f83f7a 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 90638ed56f16..e5a2a0bc7fd3 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 b0fe8888dcfc..56ccab7b5cd5 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 995ef9bc745e..40c1ac7d6a9a 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 0321572e72a6..61a35f2b58c6 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 d4ce8531291e..1f58be6c09e9 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-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
new file mode 100644
index 000000000000..713aff0ea405
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-jpeg'';
+ version = ''20170630-git'';
+
+ description = ''A self-contained baseline JPEG codec implementation'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz'';
+ sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0'';
+ };
+
+ packageName = "cl-jpeg";
+
+ asdFilesToKeep = ["cl-jpeg.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-jpeg DESCRIPTION
+ A self-contained baseline JPEG codec implementation SHA256
+ 1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0 URL
+ http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz
+ MD5 b6eb4ca5d893f428b5bbe46cd49f76ad NAME cl-jpeg FILENAME cl-jpeg DEPS NIL
+ DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */
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 825fea4eb906..dfabda0428f0 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 1aced09d34fd..c950fa292a8b 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 67468edbb6cb..8967b0970c56 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 f546e4711acc..e8034b11c237 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-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
new file mode 100644
index 000000000000..babdf04e3ec2
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -0,0 +1,27 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-pdf'';
+ version = ''20170830-git'';
+
+ description = ''Common Lisp PDF Generation Library'';
+
+ deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz'';
+ sha256 = ''1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s'';
+ };
+
+ packageName = "cl-pdf";
+
+ asdFilesToKeep = ["cl-pdf.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256
+ 1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s URL
+ http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz
+ MD5 f865503aff50c0a4732a7a4597bdcc25 NAME cl-pdf FILENAME cl-pdf DEPS
+ ((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop)
+ (NAME zpb-ttf FILENAME zpb-ttf))
+ DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20170830-git SIBLINGS
+ (cl-pdf-parser) PARASITES NIL) */
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 60e38a7de720..a0443cb5af08 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 7853d5a279a2..e65c0a03ddc5 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 cbdf3a471461..3f56cf3dfaee 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 658ffdb51b82..15fd56107c82 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-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
new file mode 100644
index 000000000000..358666877a6d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix
@@ -0,0 +1,28 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-typesetting'';
+ version = ''20170830-git'';
+
+ description = ''Common Lisp Typesetting system'';
+
+ deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz'';
+ sha256 = ''1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3'';
+ };
+
+ packageName = "cl-typesetting";
+
+ asdFilesToKeep = ["cl-typesetting.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256
+ 1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3 URL
+ http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz
+ MD5 e12b9f249c60c220c5dc4a0939eb3343 NAME cl-typesetting FILENAME
+ cl-typesetting DEPS
+ ((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate)
+ (NAME zpb-ttf FILENAME zpb-ttf))
+ DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20170830-git SIBLINGS
+ (xml-render cl-pdf-doc) 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 4434e711d9de..6d284b7b0120 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 1b78d0d28983..750da99d5d6a 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 a757b3d4a8a0..af0e917425a1 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 000000000000..252f9794e769
--- /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 a4a66ecfa64f..d5163cabe045 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 be88069fd5d9..1d081fbef581 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 b810de3fd1c8..8b2e2c70453a 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 08e5ff71cc5c..0b2828d06dfc 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 ec7599f2bd3f..a13537d7e90f 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 29c90369244a..f55ccecadc61 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 76f50463a6ae..3f6d6ae32ac6 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 bd2b0ff19bdb..685e81283688 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 1ae6fa0f4ec4..e1fb59658528 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 bb5ab940638a..f4941aa80cd6 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 ba523ae837d7..c83b29939687 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 fbe06a179fdd..69ada2ce80a3 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 2ad018e5549c..3316f59447d7 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 6dfa61634f2b..218107e95d6a 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 bb9558fda51e..9387806255ac 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 6e8e85e72abc..808914068a35 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 e75961dd9ace..2de381f44b8e 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 d3111b18b22b..2e392928f495 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 7ee5f91a1580..541f1c6a169d 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 99792023bdd0..82c8603d4a45 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 7b37e5709e86..08b6d35a1fb9 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 2aa5c0749250..4a23cbf51ee7 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 8061f3844e0b..3d259fc5b6c5 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 f85b128652d0..f276ec72736d 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 62a3ae2bb7d1..e5cbad3e9e83 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 79f2d38ef10d..94edb06e6aee 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 c0acbc2f01fc..a98028e0c060 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 29fcd359f6b6..3478ac8488b4 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 9260b06dd830..fdcda10a275f 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 b44c0c8a9874..a3ddc2fd953e 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 62197234305a..8d21f88cbf82 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 1ca094d139db..ad335774cbb5 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 006361ed80c1..db25e6ae5347 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 c34d79f3d13d..4f6842606b45 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 c65d95d9ef7a..953dd0a58a4a 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 5647b9a92707..d72e0839d1e8 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 3c289fefa9ab..6334804c4f70 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 29460307e698..a8cfc070bf99 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 e1d6a1477a7b..82d06b1c93b2 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 67636d3f6cf3..4e7c84566a0a 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 d706bc5bad1a..ea6adac9e9f8 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 5c1f90220eb3..e636df0805e7 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 2bde901ad43e..0a1591d7c424 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 c90b252313bf..ffa2e595c26a 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 41ead034791a..25d535176a6a 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 8ed7c1a44993..d5be4be7daf4 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 d55f7700092c..9056cfbdcca8 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 07b1498f2e3f..b1e89b3eef8a 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 9cc6338c8b89..17a56c09b7e8 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 883e648a2f68..bb39c74c9625 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 6819e4b25713..9734118526c6 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 a772694b9830..9a4afce3280f 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 5efc57669552..1a562c2288bb 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 9a285fea2f18..edb01bd2fc52 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 e044f097701d..4214779af320 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 6946141f1121..f06c0d7ebf57 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 1af66736f30f..8cc04c2c64ac 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 753f21dbcb96..c925382d81d4 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 0ac190993d80..1986f7c88f7a 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 afb8b3885681..fdaa07109b49 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 3a4b05e05269..6c4564967320 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 b4b4f4543a10..6d02b9764701 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 11b9351c03ad..6a4751f799ea 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 cc5c23faf862..4a36b6563534 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 8c4afa9697d8..6db21bf9005e 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 c70c3f2e1e12..b9ab71744c3a 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 733185e2b26f..c7031f4aa3fc 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 090aa670ad9e..74e5d7e97e95 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 91493d7431e8..face797fe2a3 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-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 3b10d610d272..e78ec34a0a96 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -28,12 +28,14 @@ cl-fuse
cl-fuse-meta-fs
cl-html-parse
cl-html5-parser
+cl-jpeg
cl-json
cl-l10n
cl-libuv
cl-mysql
closer-mop
closure-html
+cl-pdf
cl-ppcre
cl-ppcre-template
cl-ppcre-unicode
@@ -50,6 +52,7 @@ cl-syntax-annot
cl-syntax-anonfun
cl-syntax-markup
cl-test-more
+cl-typesetting
cl-unicode
cl-unification
cl-utilities
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 71d974d9711b..e904f0041d13 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";
@@ -296,14 +278,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "zpb-ttf" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."zpb-ttf" or (x: {}))
- (import ./quicklisp-to-nix-output/zpb-ttf.nix {
- inherit fetchurl;
- }));
-
-
"cl-store" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-store" or (x: {}))
@@ -364,14 +338,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: {}))
@@ -385,6 +351,14 @@ let quicklisp-to-nix-packages = rec {
"cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
+ "zpb-ttf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."zpb-ttf" or (x: {}))
+ (import ./quicklisp-to-nix-output/zpb-ttf.nix {
+ inherit fetchurl;
+ }));
+
+
"puri" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."puri" 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";
@@ -1871,6 +1907,17 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-typesetting" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-typesetting" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-typesetting.nix {
+ inherit fetchurl;
+ "cl-pdf" = quicklisp-to-nix-packages."cl-pdf";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+ }));
+
+
"cl-test-more" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-test-more" or (x: {}))
@@ -2067,6 +2114,17 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-pdf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-pdf" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-pdf.nix {
+ inherit fetchurl;
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
+ }));
+
+
"closure-html" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."closure-html" or (x: {}))
@@ -2154,6 +2212,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-jpeg" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-jpeg" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-jpeg.nix {
+ inherit fetchurl;
+ }));
+
+
"cl-html5-parser" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-html5-parser" or (x: {}))
@@ -2254,6 +2320,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 +2487,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 +2505,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 +2627,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 +2637,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 +2648,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 9eba1e15b799..b3d50b2fb075 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 83ba93e63b76..000000000000
--- 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 f0ec21b7589f..000000000000
--- 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 5c9b56c99183..000000000000
--- 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 039846d5fcfb..4527a8700f6e 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";
@@ -7,32 +7,25 @@ stdenv.mkDerivation {
name = "avr-libc-${version}";
src = fetchurl {
- url = http://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
+ url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2;
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/;
+ homepage = https://savannah.nongnu.org/projects/avr-libc/;
license = licenses.bsd3;
- platforms = platforms.unix;
+ platforms = [ "avr-none" ];
maintainers = with maintainers; [ mguentner ];
};
}
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index b43deeceb867..4cb612523dc5 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 000000000000..693cfa093b08
--- /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 000000000000..0ec8664dac9e
--- /dev/null
+++ b/pkgs/development/misc/qmk_firmware/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub
+, avrgcc, avrbinutils
+, gcc-arm-embedded, gcc-armhf-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;
+ };
+ postPatch = ''
+ substituteInPlace tmk_core/arm_atsam.mk \
+ --replace arm-none-eabi arm-none-eabihf
+ rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk
+ '';
+ buildFlags = "all:default";
+ doCheck = true;
+ checkTarget = "test:all";
+ installPhase = ''
+ mkdir $out
+ '';
+ NIX_CFLAGS_COMPILE = "-Wno-error";
+ nativeBuildInputs = [
+ avrgcc
+ avrbinutils
+ gcc-arm-embedded
+ gcc-armhf-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 0c601c7773cc..fbe48803f2db 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,14 +24,17 @@ in stdenv.mkDerivation rec {
sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5";
};
- buildInputs = [
- gcc-arm-embedded
+ nativeBuildInputs = [
+ gcc-arm-embedded binutils-arm-embedded
python2
];
postPatch = ''
sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
+
+ substitutateInPlace Makefile \
+ --replace "--specs=nano.specs" ""
'';
enableParallelBuilding = true;
@@ -58,7 +61,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 cb9cc80d3252..102b1eb8048d 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
];
@@ -26,6 +26,9 @@ in stdenv.mkDerivation rec {
sed -ri "s/REVISION.*=.*shell git.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev.
sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes
sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex
+
+ substitutateInPlace Makefile \
+ --replace "--specs=nano.specs" ""
'';
enableParallelBuilding = true;
@@ -50,7 +53,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 1bc1d110db16..68792038d000 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&