diff --git a/.dir-locals.el b/.dir-locals.el deleted file mode 100644 index a53c8aa6db54f6d2c9c86f13e1d74daaccf2ddbd..0000000000000000000000000000000000000000 --- 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 76fb19529b031166e9e60753388f89a5f4bf334a..5c2096cfe4d88b934ccad403e99147eb00b7bd03 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,12 +47,15 @@ /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 /pkgs/development/interpreters/python @FRidh /pkgs/development/python-modules @FRidh -/doc/languages-frameworks/python.md @FRidh +/doc/languages-frameworks/python.section.md @FRidh # Haskell /pkgs/development/compilers/ghc @peti @ryantm @basvandijk @@ -59,13 +64,18 @@ /pkgs/development/haskell-modules/generic-builder.nix @peti @ryantm @basvandijk /pkgs/development/haskell-modules/hoogle.nix @peti @ryantm @basvandijk +# Perl +/pkgs/development/interpreters/perl @volth +/pkgs/top-level/perl-packages.nix @volth +/pkgs/development/perl-modules @volth + # R /pkgs/applications/science/math/R @peti /pkgs/development/r-modules @peti # Ruby -/pkgs/development/interpreters/ruby @zimbatm -/pkgs/development/ruby-modules @zimbatm +/pkgs/development/interpreters/ruby @alyssais @zimbatm +/pkgs/development/ruby-modules @alyssais @zimbatm # Rust /pkgs/development/compilers/rust @Mic92 @LnL7 @@ -74,6 +84,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 +115,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 576beb18de6a75c53de9286a63802a005bd8e738..07eddc80c2531e2ef7e3982395113054d4392190 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 ab1a50865f093b5e5607e1b6befaeb077417658a..22940f5ea9895802e9a0520d00bf87d9283a18d9 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/.gitignore b/.gitignore index dba957f766205f8a5729650e55d794712e4a6049..b3ae9e6ea863d213c35110b264068cf9dc8eadb0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ result-* .DS_Store /pkgs/development/libraries/qt-5/*/tmp/ -/pkgs/desktops/kde-5/*/tmp/ \ No newline at end of file +/pkgs/desktops/kde-5/*/tmp/ +/pkgs/development/mobile/androidenv/xml/* diff --git a/COPYING b/COPYING index 198597a1b410bb3fc3c4c5a3f6c7a488af220891..7c52fb76897811e118de63afdba849007abb8b36 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 004bba34530d91f84166c39571163d5597dce8c3..29c023e4dcdff0d254eb2dd526188621769c4f35 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 f4b2640ac5a0eebed6450a0d5cb36fe3bcd3f622..a74a01719c737ca50e6f226e01eec12f0eaa6ebf 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 d0ba103fa9f1f47f51071c138404c71b43690db2..cb07135e6858f2cd23d356bcd0c18aee48f359b6 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 ba77be6678c41c2ea9dc2ce05051ae9cf1b96947..cd6d7eb8d1c85fff5098c4935bb091c07b24303b 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -9,8 +9,10 @@ debug: .PHONY: format format: - find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \ - xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {} + find . -iname '*.xml' -type f | while read f; do \ + echo $$f ;\ + xmlformat --config-file "$$XMLFORMAT_CONFIG" -i $$f ;\ + done .PHONY: fix-misc-xml fix-misc-xml: @@ -19,7 +21,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 functions/library/generated rm -rf ./out/ ./highlightjs .PHONY: validate @@ -69,13 +71,23 @@ highlightjs: cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/ -manual-full.xml: ${MD_TARGETS} .version *.xml +manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml functions/library/generated *.xml **/*.xml **/**/*.xml xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml .version: nix-instantiate --eval \ -E '(import ../lib).version' > .version +function_locations := $(shell nix-build --no-out-link ./lib-function-locations.nix) + +functions/library/locations.xml: + ln -s $(function_locations) ./functions/library/locations.xml + +functions/library/generated: + nix-build ./lib-function-docs.nix \ + --arg locationsXml $(function_locations)\ + --out-link ./functions/library/generated + %.section.xml: %.section.md pandoc $^ -w docbook+smart \ -f markdown+smart \ diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index b3f7f093835cd4e3fbe54565fe2854a763ac8cb7..d2c7a1baae9c689da80f553a6a956664e81b1f92 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 @@ -791,7 +814,7 @@ args.stdenv.mkDerivation (args // { There are multiple ways to fetch a package source in nixpkgs. The general - guideline is that you should package sources with a high degree of + guideline is that you should package reproducible sources with a high degree of availability. Right now there is only one fetcher which has mirroring support and that is fetchurl. Note that you should also prefer protocols which have a corresponding proxy environment variable. @@ -842,14 +865,134 @@ 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.
+
+ Obtaining source hash + + + Preferred source hash type is sha256. There are several ways to get it. + + + + + + Prefetch URL (with nix-prefetch-XXX + URL, where + XXX is one of url, + git, hg, cvs, + bzr, svn). Hash is printed to + stdout. + + + + + Prefetch by package source (with nix-prefetch-url + '<nixpkgs>' -A PACKAGE.src, + where PACKAGE is package attribute name). Hash + is printed to stdout. + + + This works well when you've upgraded existing package version and want to + find out new hash, but is useless if package can't be accessed by + attribute or package has multiple sources (.srcs, + architecture-dependent sources, etc). + + + + + Upstream provided hash: use it when upstream provides + sha256 or sha512 (when upstream + provides md5, don't use it, compute + sha256 instead). + + + A little nuance is that nix-prefetch-* tools produce + hash encoded with base32, but upstream usually provides + hexadecimal (base16) encoding. Fetchers understand both + formats. Nixpkgs does not standardize on any one format. + + + You can convert between formats with nix-hash, for example: + +$ nix-hash --type sha256 --to-base32 HASH + + + + + + Extracting hash from local source tarball can be done with + sha256sum. Use nix-prefetch-url + file:///path/to/tarball if you want base32 hash. + + + + + Fake hash: set fake hash in package expression, perform build and extract + correct hash from error Nix prints. + + + For package updates it is enough to change one symbol to make hash fake. + For new packages, you can use lib.fakeSha256, + lib.fakeSha512 or any other fake hash. + + + This is last resort method when reconstructing source URL is non-trivial + and nix-prefetch-url -A isn't applicable (for example, + + one of kodi dependencies). The easiest way then + would be replace hash with a fake one and rebuild. Nix build will fail and + error message will contain desired hash. + + This method has security problems. Check below for details. + + + +
+ Obtaining hashes securely + + Let's say Man-in-the-Middle (MITM) sits close to your network. Then instead of fetching + source you can fetch malware, and instead of source hash you get hash of malware. Here are + security considerations for this scenario: + + + + + http:// URLs are not secure to prefetch hash from; + + + + + hashes from upstream (in method 3) should be obtained via secure protocol; + + + + + https:// URLs are secure in methods 1, 2, 3; + + + + + https:// URLs are not secure in method 5. When obtaining hashes + with fake hash method, TLS checks are disabled. So + refetch source hash from several different networks to exclude MITM scenario. + Alternatively, use fake hash method to make Nix error, but instead of extracting + hash from error, extract https:// URL and prefetch it + with method 1. + + + +
+
Patches diff --git a/doc/configuration.xml b/doc/configuration.xml index af74f3f9c01fbf07ec6bf8cf672f188290e5ebd6..8a5ff8dcb8e0a409f6b344e684880d924a2ceb07 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,16 @@ - 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 +291,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. { @@ -321,7 +326,18 @@ packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { name = "my-packages"; - paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + paths = [ + aspell + bc + coreutils + gdb + ffmpeg + nixUnstable + emscripten + jq + nox + silver-searcher + ]; }; }; } @@ -342,7 +358,18 @@ packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { name = "my-packages"; - paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + paths = [ + aspell + bc + coreutils + gdb + ffmpeg + nixUnstable + emscripten + jq + nox + silver-searcher + ]; pathsToLink = [ "/share" "/bin" ]; }; }; @@ -377,7 +404,17 @@ packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { name = "my-packages"; - paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + paths = [ + aspell + bc + coreutils + ffmpeg + nixUnstable + emscripten + jq + nox + silver-searcher + ]; pathsToLink = [ "/share/man" "/share/doc" "/bin" ]; extraOutputsToInstall = [ "man" "doc" ]; }; diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 3b90596bcc2c6f1ea030aad6d5f874de95e4298d..40cf11304eae4d782004bc32723d7fcc7b0ba8f5 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,26 +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. All three are always defined as - attributes in the standard environment, and at the top level. That means - one can get at them just like a dependency in a function that is imported - with callPackage: -{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform... - , or just off stdenv: + and targetPlatform. They are always defined as + attributes in the standard environment. That means one can access them + like: { stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform... . @@ -67,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. @@ -97,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 @@ -138,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. @@ -150,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! @@ -167,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. @@ -196,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. @@ -224,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. @@ -252,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. @@ -274,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. @@ -308,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! @@ -367,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 @@ -394,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 @@ -443,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 *Platforms 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 *Platforms + are always non-null. localSystem is always non-null.
@@ -464,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 4c04128052bc570c93b8e6e103dd21a59d627cd9..7ceaec28af38b781a1a66acbd2266cc65a9d4093 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -1,8 +1,9 @@ +{ pkgs ? (import ./.. { }), nixpkgs ? { }}: let - pkgs = import ./.. { }; lib = pkgs.lib; -in -pkgs.stdenv.mkDerivation { + locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; }; + functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs; }; +in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ]; @@ -29,6 +30,9 @@ pkgs.stdenv.mkDerivation { ]; postPatch = '' + rm -rf ./functions/library/locations.xml + ln -s ${locationsXml} ./functions/library/locations.xml + ln -s ${functionDocs} ./functions/library/generated echo ${lib.version} > .version ''; diff --git a/doc/functions.xml b/doc/functions.xml index 3cfc6884bd261e6abc09ff59bf66ee2bc8b0dd3a..0d6e2770e6e6bd017f6b6d111acee3d3fb6fc949 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -7,803 +7,14 @@ 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 0000000000000000000000000000000000000000..c6b3611eea53dc43437418d6a4c062322e15047e --- /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 0000000000000000000000000000000000000000..ff446cbfffdd813556f61a50040e19f8009c56a6 --- /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 it can be 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 images, the newly created images will be + listed like this: + + + + You can break binary reproducibility but have a sorted, meaningful + CREATED column by setting created to + now. + + + + and now the Docker CLI will display a reasonable date and sort the images + as expected: + + however, the produced images will not be binary reproducible. + + +
+ +
+ buildLayeredImage + + + Create a Docker image with many of the store paths being on their own layer + to improve sharing between images. + + + + + + name + + + + The name of the resulting image. + + + + + + tag optional + + + + Tag of the generated image. + + + Default: the output path's hash + + + + + + contents optional + + + + Top level paths in the container. Either a single derivation, or a list + of derivations. + + + Default: [] + + + + + + config optional + + + + Run-time configuration of the container. A full list of the options are + available at in the + + Docker Image Specification v1.2.0 . + + + Default: {} + + + + + + created optional + + + + Date and time the layers were created. Follows the same + now exception supported by + buildImage. + + + Default: 1970-01-01T00:00:01Z + + + + + + maxLayers optional + + + + Maximum number of layers to create. + + + Default: 24 + + + + + +
+ Behavior of <varname>contents</varname> in the final image + + + Each path directly listed in contents will have a + symlink in the root of the image. + + + + For example: + + will create symlinks for all the paths in the hello + package: + /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/bin/hello +/share/info/hello.info -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/info/hello.info +/share/locale/bg/LC_MESSAGES/hello.mo -> /nix/store/h1zb1padqbbb7jicsvkmrym3r6snphxg-hello-2.10/share/locale/bg/LC_MESSAGES/hello.mo +]]> + +
+ +
+ Automatic inclusion of <varname>config</varname> references + + + The closure of config is automatically included in the + closure of the final image. + + + + This allows you to make very simple Docker images with very little code. + This container will start up and run hello: + + +
+ +
+ Adjusting <varname>maxLayers</varname> + + + Increasing the maxLayers increases the number of layers + which have a chance to be shared between different images. + + + + Modern Docker installations support up to 128 layers, however older + versions support as few as 42. + + + + If the produced image will not be extended by other Docker builds, it is + safe to set maxLayers to 128. However + it will be impossible to extend the image further. + + + + The first (maxLayers-2) most "popular" paths will have + their own individual layers, then layer #maxLayers-1 + will contain all the remaining "unpopular" paths, and finally layer + #maxLayers will contain the Image configuration. + + + + Docker's Layers are not inherently ordered, they are content-addressable + and are not explicitly layered until they are composed in to an Image. + +
+
+ +
+ pullImage + + + This function is analogous to the docker pull command, in + that it 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 it can be 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 is necessary for shadow-utils to + manipulate users and groups. + +
+
diff --git a/doc/functions/fetchers.xml b/doc/functions/fetchers.xml new file mode 100644 index 0000000000000000000000000000000000000000..b3bd2fe0f45e257ab859cac7d515dbf3a83cfbb7 --- /dev/null +++ b/doc/functions/fetchers.xml @@ -0,0 +1,206 @@ +
+ Fetcher functions + + + When using Nix, you will frequently need to download source code + and other files from the internet. Nixpkgs comes with a few helper + functions that allow you to fetch fixed-output derivations in a + structured way. + + + + The two fetcher primitives are fetchurl and + fetchzip. Both of these have two required + arguments, a URL and a hash. The hash is typically + sha256, although many more hash algorithms are + supported. Nixpkgs contributors are currently recommended to use + sha256. This hash will be used by Nix to + identify your source. A typical usage of fetchurl is provided + below. + + + + + + The main difference between fetchurl and + fetchzip is in how they store the contents. + fetchurl will store the unaltered contents of + the URL within the Nix store. fetchzip on the + other hand will decompress the archive for you, making files and + directories directly accessible in the future. + fetchzip can only be used with archives. + Despite the name, fetchzip is not limited to + .zip files and can also be used with any tarball. + + + + fetchpatch works very similarly to + fetchurl with the same arguments expected. It + expects patch files as a source and and performs normalization on + them before computing the checksum. For example it will remove + comments or other unstable parts that are sometimes added by + version control systems and can change over time. + + + + Other fetcher functions allow you to add source code directly from + a VCS such as subversion or git. These are mostly straightforward + names based on the name of the command used with the VCS system. + Because they give you a working repository, they act most like + fetchzip. + + + + + + fetchsvn + + + + Used with Subversion. Expects url to a + Subversion directory, rev, and + sha256. + + + + + + fetchgit + + + + Used with Git. Expects url to a Git repo, + rev, and sha256. + rev in this case can be full the git commit + id (SHA1 hash) or a tag name like + refs/tags/v1.0. + + + + + + fetchfossil + + + + Used with Fossil. Expects url to a Fossil + archive, rev, and sha256. + + + + + + fetchcvs + + + + Used with CVS. Expects cvsRoot, + tag, and sha256. + + + + + + fetchhg + + + + Used with Mercurial. Expects url, + rev, and sha256. + + + + + + + A number of fetcher functions wrap part of + fetchurl and fetchzip. + They are mainly convenience functions intended for commonly used + destinations of source code in Nixpkgs. These wrapper fetchers are + listed below. + + + + + + fetchFromGitHub + + + + fetchFromGitHub expects four arguments. + owner is a string corresponding to the + GitHub user or organization that controls this repository. + repo corresponds to the name of the + software repository. These are located at the top of every + GitHub HTML page as + owner/repo. + rev corresponds to the Git commit hash or + tag (e.g v1.0) that will be downloaded from + Git. Finally, sha256 corresponds to the + hash of the extracted directory. Again, other hash algorithms + are also available but sha256 is currently + preferred. + + + + + + fetchFromGitLab + + + + This is used with GitLab repositories. The arguments expected + are very similar to fetchFromGitHub above. + + + + + + fetchFromBitbucket + + + + This is used with BitBucket repositories. The arguments expected + are very similar to fetchFromGitHub above. + + + + + + fetchFromSavannah + + + + This is used with Savannah repositories. The arguments expected + are very similar to fetchFromGitHub above. + + + + + + fetchFromRepoOrCz + + + + This is used with repo.or.cz repositories. The arguments + expected are very similar to fetchFromGitHub above. + + + + + + +
diff --git a/doc/functions/fhs-environments.xml b/doc/functions/fhs-environments.xml new file mode 100644 index 0000000000000000000000000000000000000000..79682080be314a1d545d3429af06214ee1f5740d --- /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 0000000000000000000000000000000000000000..e860b10e8979f090d5763c57b3cbd3ae7998b616 --- /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 0000000000000000000000000000000000000000..b01de3c6e41345d133952f003845547e13897b1f --- /dev/null +++ b/doc/functions/library.xml @@ -0,0 +1,24 @@ +
+ 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 0000000000000000000000000000000000000000..437850e408bc2194e96759daa5d552d7e18455c0 --- /dev/null +++ b/doc/functions/library/asserts.xml @@ -0,0 +1,117 @@ +
+ Assert functions + +
+ <function>lib.asserts.assertMsg</function> + + assertMsg :: Bool -> String -> Bool + + + + + + Print a trace message if pred is false. + + + + Intended to be used to augment asserts with helpful error messages. + + + + + + pred + + + + Condition under which the msg should + not be printed. + + + + + + msg + + + + Message to print. + + + + + + + Printing when the predicate is false + trace: foo is not bar, silly +stderr> assert failed +]]> + +
+ +
+ <function>lib.asserts.assertOneOf</function> + + assertOneOf :: String -> String -> + StringList -> Bool + + + + + + Specialized asserts.assertMsg for checking if + val is one of the elements of xs. + Useful for checking enums. + + + + + + name + + + + The name of the variable the user entered val into, + for inclusion in the error message. + + + + + + val + + + + The value of what the user provided, to be compared against the values in + xs. + + + + + + xs + + + + The list of valid values. + + + + + + + Ensuring a user provided a possible value + false +stderr> trace: sslLibrary must be one of "openssl", "libressl", but is: "bearssl" + ]]> + +
+
diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml new file mode 100644 index 0000000000000000000000000000000000000000..65d0b40e2e82728e4ec2b88abf9cfe8cdb4af779 --- /dev/null +++ b/doc/functions/library/attrsets.xml @@ -0,0 +1,1731 @@ +
+ Attribute-Set Functions + +
+ <function>lib.attrset.attrByPath</function> + + attrByPath :: [String] -> Any -> AttrSet + + + + + + Return an attribute from within nested attribute sets. + + + + + + attrPath + + + + A list of strings representing the path through the nested attribute set + set. + + + + + + default + + + + Default value if attrPath does not resolve to an + existing value. + + + + + + set + + + + The nested attributeset to select values from. + + + + + + + Extracting a value from a nested attribute set + 3 +]]> + + + + No value at the path, instead using the default + 0 +]]> + +
+ +
+ <function>lib.attrsets.hasAttrByPath</function> + + hasAttrByPath :: [String] -> AttrSet -> Bool + + + + + + Determine if an attribute exists within a nested attribute set. + + + + + + attrPath + + + + A list of strings representing the path through the nested attribute set + set. + + + + + + set + + + + The nested attributeset to check. + + + + + + + A nested value does exist inside a set + true +]]> + +
+ +
+ <function>lib.attrsets.setAttrByPath</function> + + setAttrByPath :: [String] -> Any -> AttrSet + + + + + + Create a new attribute set with value set at the nested + attribute location specified in attrPath. + + + + + + attrPath + + + + A list of strings representing the path through the nested attribute set. + + + + + + value + + + + The value to set at the location described by + attrPath. + + + + + + + Creating a new nested attribute set + { a = { b = 3; }; } +]]> + +
+ +
+ <function>lib.attrsets.getAttrFromPath</function> + + getAttrFromPath :: [String] -> AttrSet -> Value + + + + + + Like except + without a default, and it will throw if the value doesn't exist. + + + + + + attrPath + + + + A list of strings representing the path through the nested attribute set + set. + + + + + + set + + + + The nested attribute set to find the value in. + + + + + + + Succesfully getting a value from an attribute set + 3 +]]> + + + + Throwing after failing to get a value from an attribute set + error: cannot find attribute `x.y' +]]> + +
+ +
+ <function>lib.attrsets.attrVals</function> + + attrVals :: [String] -> AttrSet -> [Any] + + + + + + Return the specified attributes from a set. All values must exist. + + + + + + nameList + + + + The list of attributes to fetch from set. Each + attribute name must exist on the attrbitue set. + + + + + + set + + + + The set to get attribute values from. + + + + + + + Getting several values from an attribute set + [ 1 2 3 ] +]]> + + + + Getting missing values from an attribute set + + +
+ +
+ <function>lib.attrsets.attrValues</function> + + attrValues :: AttrSet -> [Any] + + + + + + Get all the attribute values from an attribute set. + + + + Provides a backwards-compatible interface of + builtins.attrValues for Nix version older than 1.8. + + + + + + attrs + + + + The attribute set. + + + + + + + + [ 1 2 3 ] +]]> + +
+ +
+ <function>lib.attrsets.catAttrs</function> + + catAttrs :: String -> AttrSet -> [Any] + + + + + + Collect each attribute named `attr' from the list of attribute sets, + sets. Sets that don't contain the named attribute are + ignored. + + + + Provides a backwards-compatible interface of + builtins.catAttrs for Nix version older than 1.9. + + + + + + attr + + + + Attribute name to select from each attribute set in + sets. + + + + + + sets + + + + The list of attribute sets to select attr from. + + + + + + + Collect an attribute from a list of attribute sets. + + Attribute sets which don't have the attribute are ignored. + + [ 1 2 ] + ]]> + +
+ +
+ <function>lib.attrsets.filterAttrs</function> + + filterAttrs :: (String -> Any -> Bool) -> AttrSet -> AttrSet + + + + + + Filter an attribute set by removing all attributes for which the given + predicate return false. + + + + + + pred + + + + String -> Any -> Bool + + + Predicate which returns true to include an attribute, or returns false to + exclude it. + + + + + name + + + + The attribute's name + + + + + + value + + + + The attribute's value + + + + + + Returns true to include the attribute, + false to exclude the attribute. + + + + + + set + + + + The attribute set to filter + + + + + + + Filtering an attributeset + { foo = 1; } +]]> + +
+ +
+ <function>lib.attrsets.filterAttrsRecursive</function> + + filterAttrsRecursive :: (String -> Any -> Bool) -> AttrSet -> AttrSet + + + + + + Filter an attribute set recursively by removing all attributes for which the + given predicate return false. + + + + + + pred + + + + String -> Any -> Bool + + + Predicate which returns true to include an attribute, or returns false to + exclude it. + + + + + name + + + + The attribute's name + + + + + + value + + + + The attribute's value + + + + + + Returns true to include the attribute, + false to exclude the attribute. + + + + + + set + + + + The attribute set to filter + + + + + + + Recursively filtering an attribute set + { + levelA = { + example = "hi"; + levelB = { + hello = "there"; + this-one-is-present = { }; + }; + }; + } + ]]> + +
+ +
+ <function>lib.attrsets.foldAttrs</function> + + foldAttrs :: (Any -> Any -> Any) -> Any -> [AttrSets] -> Any + + + + + + Apply fold function to values grouped by key. + + + + + + op + + + + Any -> Any -> Any + + + Given a value val and a collector + col, combine the two. + + + + + val + + + + An attribute's value + + + + + + col + + + + + The result of previous op calls with other values + and nul. + + + + + + + + + nul + + + + The null-value, the starting value. + + + + + + list_of_attrs + + + + A list of attribute sets to fold together by key. + + + + + + + Combining an attribute of lists in to one attribute set + { a = [ 2 3 ]; b = [ 7 6 ]; } +]]> + +
+ +
+ <function>lib.attrsets.collect</function> + + collect :: (Any -> Bool) -> AttrSet -> [Any] + + + + + + Recursively collect sets that verify a given predicate named + pred from the set attrs. The recursion + stops when pred returns true. + + + + + + pred + + + + Any -> Bool + + + Given an attribute's value, determine if recursion should stop. + + + + + value + + + + The attribute set value. + + + + + + + + + attrs + + + + The attribute set to recursively collect. + + + + + + + Collecting all lists from an attribute set + [["b"] [1]] +]]> + + + + Collecting all attribute-sets which contain the <literal>outPath</literal> attribute name. + [{ outPath = "a/"; } { outPath = "b/"; }] +]]> + +
+ +
+ <function>lib.attrsets.nameValuePair</function> + + nameValuePair :: String -> Any -> AttrSet + + + + + + Utility function that creates a {name, value} pair as + expected by builtins.listToAttrs. + + + + + + name + + + + The attribute name. + + + + + + value + + + + The attribute value. + + + + + + + Creating a name value pair + { name = "some"; value = 6; } +]]> + +
+ +
+ <function>lib.attrsets.mapAttrs</function> + + + + + + + + Apply a function to each element in an attribute set, creating a new + attribute set. + + + + Provides a backwards-compatible interface of + builtins.mapAttrs for Nix version older than 2.1. + + + + + + fn + + + + String -> Any -> Any + + + Given an attribute's name and value, return a new value. + + + + + name + + + + The name of the attribute. + + + + + + value + + + + The attribute's value. + + + + + + + + + + Modifying each value of an attribute set + { x = "x-foo"; y = "y-bar"; } +]]> + +
+ +
+ <function>lib.attrsets.mapAttrs'</function> + + mapAttrs' :: (String -> Any -> { name = String; value = Any }) -> AttrSet -> AttrSet + + + + + + Like mapAttrs, but allows the name of each attribute to + be changed in addition to the value. The applied function should return both + the new name and value as a nameValuePair. + + + + + + fn + + + + String -> Any -> { name = String; value = Any } + + + Given an attribute's name and value, return a new + name + value pair. + + + + + name + + + + The name of the attribute. + + + + + + value + + + + The attribute's value. + + + + + + + + + set + + + + The attribute set to map over. + + + + + + + Change the name and value of each attribute of an attribute set + { foo_x = "bar-a"; foo_y = "bar-b"; } + + ]]> + +
+ +
+ <function>lib.attrsets.mapAttrsToList</function> + + mapAttrsToList :: (String -> Any -> Any) -> + AttrSet -> Any + + + + + + Call fn for each attribute in the given + set and return the result in a list. + + + + + + fn + + + + String -> Any -> Any + + + Given an attribute's name and value, return a new value. + + + + + name + + + + The name of the attribute. + + + + + + value + + + + The attribute's value. + + + + + + + + + set + + + + The attribute set to map over. + + + + + + + Combine attribute values and names in to a list + [ "x=a" "y=b" ] +]]> + +
+ +
+ <function>lib.attrsets.mapAttrsRecursive</function> + + mapAttrsRecursive :: ([String] > Any -> Any) -> AttrSet -> AttrSet + + + + + + Like mapAttrs, except that it recursively applies + itself to attribute sets. Also, the first argument of the argument function + is a list of the names of the containing attributes. + + + + + + f + + + + [ String ] -> Any -> Any + + + Given a list of attribute names and value, return a new value. + + + + + name_path + + + + The list of attribute names to this value. + + + For example, the name_path for the + example string in the attribute set { foo + = { bar = "example"; }; } is [ "foo" "bar" + ]. + + + + + + value + + + + The attribute's value. + + + + + + + + + set + + + + The attribute set to recursively map over. + + + + + + + A contrived example of using <function>lib.attrsets.mapAttrsRecursive</function> + { + n = { + a = "n-a-A"; + m = { + b = "n-m-b-B"; + c = "n-m-c-C"; + }; + }; + d = "d-D"; + } + ]]> + +
+ +
+ <function>lib.attrsets.mapAttrsRecursiveCond</function> + + mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([ String ] -> Any -> Any) -> AttrSet -> AttrSet + + + + + + Like mapAttrsRecursive, but it takes an additional + predicate function that tells it whether to recursive into an attribute set. + If it returns false, mapAttrsRecursiveCond does not + recurse, but does apply the map function. It is returns true, it does + recurse, and does not apply the map function. + + + + + + cond + + + + (AttrSet -> Bool) + + + Determine if mapAttrsRecursive should recurse deeper + in to the attribute set. + + + + + attributeset + + + + An attribute set. + + + + + + + + + f + + + + [ String ] -> Any -> Any + + + Given a list of attribute names and value, return a new value. + + + + + name_path + + + + The list of attribute names to this value. + + + For example, the name_path for the + example string in the attribute set { foo + = { bar = "example"; }; } is [ "foo" "bar" + ]. + + + + + + value + + + + The attribute's value. + + + + + + + + + set + + + + The attribute set to recursively map over. + + + + + + + Only convert attribute values to JSON if the containing attribute set is marked for recursion + { + dorecur = { + hello = "\"there\""; + recurse = "true"; + }; + dontrecur = "{\"converted-to\":\"json\"}"; + } + ]]> + +
+ +
+ <function>lib.attrsets.genAttrs</function> + + genAttrs :: [ String ] -> (String -> Any) -> AttrSet + + + + + + Generate an attribute set by mapping a function over a list of attribute + names. + + + + + + names + + + + Names of values in the resulting attribute set. + + + + + + f + + + + String -> Any + + + Takes the name of the attribute and return the attribute's value. + + + + + name + + + + The name of the attribute to generate a value for. + + + + + + + + + + Generate an attrset based on names only + { foo = "x_foo"; bar = "x_bar"; } + ]]> + +
+ +
+ <function>lib.attrsets.isDerivation</function> + + isDerivation :: Any -> Bool + + + + + + Check whether the argument is a derivation. Any set with { type = + "derivation"; } counts as a derivation. + + + + + + value + + + + The value which is possibly a derivation. + + + + + + + A package is a derivation + {}).ruby +=> true + ]]> + + + + Anything else is not a derivation + false + ]]> + +
+ +
+ <function>lib.attrsets.toDerivation</function> + + toDerivation :: Path -> Derivation + + + + + + Converts a store path to a fake derivation. + + + + + + path + + + + A store path to convert to a derivation. + + + + +
+ +
+ <function>lib.attrsets.optionalAttrs</function> + + optionalAttrs :: Bool -> AttrSet + + + + + + Conditionally return an attribute set or an empty attribute set. + + + + + + cond + + + + Condition under which the as attribute set is + returned. + + + + + + as + + + + The attribute set to return if cond is true. + + + + + + + Return the provided attribute set when <varname>cond</varname> is true + { my = "set"; } + ]]> + + + + Return an empty attribute set when <varname>cond</varname> is false + { } + ]]> + +
+ +
+ <function>lib.attrsets.zipAttrsWithNames</function> + + zipAttrsWithNames :: [ String ] -> (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet + + + + + + Merge sets of attributes and use the function f to merge + attribute values where the attribute name is in names. + + + + + + names + + + + A list of attribute names to zip. + + + + + + f + + + + (String -> [ Any ] -> Any + + + Accepts an attribute name, all the values, and returns a combined value. + + + + + name + + + + The name of the attribute each value came from. + + + + + + vs + + + + A list of values collected from the list of attribute sets. + + + + + + + + + sets + + + + A list of attribute sets to zip together. + + + + + + + Summing a list of attribute sets of numbers + { a = "a 11"; b = "b 101"; } + ]]> + +
+ +
+ <function>lib.attrsets.zipAttrsWith</function> + + zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet + + + + + + Merge sets of attributes and use the function f to merge + attribute values. Similar to + where + all key names are passed for names. + + + + + + f + + + + (String -> [ Any ] -> Any + + + Accepts an attribute name, all the values, and returns a combined value. + + + + + name + + + + The name of the attribute each value came from. + + + + + + vs + + + + A list of values collected from the list of attribute sets. + + + + + + + + + sets + + + + A list of attribute sets to zip together. + + + + + + + Summing a list of attribute sets of numbers + { a = "a 11"; b = "b 101"; c = "c 1001"; } + ]]> + +
+ +
+ <function>lib.attrsets.zipAttrs</function> + + zipAttrsWith :: [ AttrSet ] -> AttrSet + + + + + + Merge sets of attributes and combine each attribute value in to a list. + Similar to + where the merge function returns a list of all values. + + + + + + sets + + + + A list of attribute sets to zip together. + + + + + + + Combining a list of attribute sets + { a = [ 1 10 ]; b = [ 1 100 ]; c = [ 1 1000 ]; } + ]]> + +
+ +
+ <function>lib.attrsets.recursiveUpdateUntil</function> + + recursiveUpdateUntil :: ( [ String ] -> AttrSet -> AttrSet -> Bool ) -> AttrSet -> AttrSet -> AttrSet + + + + + + Does the same as the update operator // except that + attributes are merged until the given predicate is verified. The predicate + should accept 3 arguments which are the path to reach the attribute, a part + of the first attribute set and a part of the second attribute set. When the + predicate is verified, the value of the first attribute set is replaced by + the value of the second attribute set. + + + + + + pred + + + + [ String ] -> AttrSet -> AttrSet -> Bool + + + + + path + + + + The path to the values in the left and right hand sides. + + + + + + l + + + + The left hand side value. + + + + + + r + + + + The right hand side value. + + + + + + + + + lhs + + + + The left hand attribute set of the merge. + + + + + + rhs + + + + The right hand attribute set of the merge. + + + + + + + Recursively merging two attribute sets + { + foo.bar = 1; # 'foo.*' from the second set + foo.quz = 2; # + bar = 3; # 'bar' from the first set + baz = 4; # 'baz' from the second set +} + ]]> + +
+ +
+ <function>lib.attrsets.recursiveUpdate</function> + + recursiveUpdate :: AttrSet -> AttrSet -> AttrSet + + + + + + A recursive variant of the update operator //. The + recursion stops when one of the attribute values is not an attribute set, in + which case the right hand side value takes precedence over the left hand + side value. + + + + + + lhs + + + + The left hand attribute set of the merge. + + + + + + rhs + + + + The right hand attribute set of the merge. + + + + + + + Recursively merging two attribute sets + { + boot.loader.grub.enable = true; + boot.loader.grub.device = ""; +} +]]> + +
+
diff --git a/doc/functions/overrides.xml b/doc/functions/overrides.xml new file mode 100644 index 0000000000000000000000000000000000000000..1bd90d2a0c760276a5bc1975fbefaef31de46e80 --- /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/prefer-remote-fetch.xml b/doc/functions/prefer-remote-fetch.xml new file mode 100644 index 0000000000000000000000000000000000000000..85f08f4eae146c48185b313b259b5589693203e0 --- /dev/null +++ b/doc/functions/prefer-remote-fetch.xml @@ -0,0 +1,27 @@ +
+ prefer-remote-fetch overlay + + + prefer-remote-fetch is an overlay that download sources + on remote builder. This is useful when the evaluating machine has a slow + upload while the builder can fetch faster directly from the source. + To use it, put the following snippet as a new overlay: + + self: super: + (super.prefer-remote-fetch self super) + + + A full configuration example for that sets the overlay up for your own account, + could look like this + + + $ mkdir ~/.config/nixpkgs/overlays/ + $ cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF + self: super: super.prefer-remote-fetch self super + EOF + + +
diff --git a/doc/functions/shell.xml b/doc/functions/shell.xml new file mode 100644 index 0000000000000000000000000000000000000000..e5031c9463c0676c94a1c172fecea137b1d090e4 --- /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/functions/trivial-builders.xml b/doc/functions/trivial-builders.xml new file mode 100644 index 0000000000000000000000000000000000000000..92a07aedb5b9cf08c6aacf6322268c71fbdaa18c --- /dev/null +++ b/doc/functions/trivial-builders.xml @@ -0,0 +1,124 @@ +
+ Trivial builders + + + Nixpkgs provides a couple of functions that help with building + derivations. The most important one, + stdenv.mkDerivation, has already been + documented above. The following functions wrap + stdenv.mkDerivation, making it easier to use + in certain cases. + + + + + + runCommand + + + + This takes three arguments, name, + env, and buildCommand. + name is just the name that Nix will append + to the store path in the same way that + stdenv.mkDerivation uses its + name attribute. env is an + attribute set specifying environment variables that will be set + for this derivation. These attributes are then passed to the + wrapped stdenv.mkDerivation. + buildCommand specifies the commands that + will be run to create this derivation. Note that you will need + to create $out for Nix to register the + command as successful. + + + An example of using runCommand is provided + below. + + + (import <nixpkgs> {}).runCommand "my-example" {} '' + echo My example command is running + + mkdir $out + + echo I can write data to the Nix store > $out/message + + echo I can also run basic commands like: + + echo ls + ls + + echo whoami + whoami + + echo date + date + '' + + + + + + runCommandCC + + + + This works just like runCommand. The only + difference is that it also provides a C compiler in + buildCommand’s environment. To minimize your + dependencies, you should only use this if you are sure you will + need a C compiler as part of running your command. + + + + + + writeTextFile, writeText, + writeTextDir, writeScript, + writeScriptBin + + + + These functions write text to the Nix store. + This is useful for creating scripts from Nix expressions. + writeTextFile takes an attribute set and + expects two arguments, name and + text. name corresponds to + the name used in the Nix store path. text + will be the contents of the file. You can also set + executable to true to make this file have + the executable bit set. + + + Many more commands wrap writeTextFile + including writeText, + writeTextDir, + writeScript, and + writeScriptBin. These are convenience + functions over writeTextFile. + + + + + + symlinkJoin + + + + This can be used to put many derivations into the same directory + structure. It works by creating a new derivation and adding + symlinks to each of the paths listed. It expects two arguments, + name, and paths. + name is the name used in the Nix store path + for the created derivation. paths is a list of + paths that will be symlinked. These paths can be to Nix store + derivations or any other subdirectory contained within. + + + + + +
diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md new file mode 100644 index 0000000000000000000000000000000000000000..237f3441874f02d6fb7b2920b0636d1d2dd9407b --- /dev/null +++ b/doc/languages-frameworks/android.section.md @@ -0,0 +1,240 @@ +--- +title: Android +author: Sander van der Burg +date: 2018-11-18 +--- +# Android + +The Android build environment provides three major features and a number of +supporting features. + +Deploying an Android SDK installation with plugins +-------------------------------------------------- +The first use case is deploying the SDK with a desired set of plugins or subsets +of an SDK. + +```nix +with import {}; + +let + androidComposition = androidenv.composeAndroidPackages { + toolsVersion = "25.2.5"; + platformToolsVersion = "27.0.1"; + buildToolsVersions = [ "27.0.3" ]; + includeEmulator = false; + emulatorVersion = "27.2.0"; + platformVersions = [ "24" ]; + includeSources = false; + includeDocs = false; + includeSystemImages = false; + systemImageTypes = [ "default" ]; + abiVersions = [ "armeabi-v7a" ]; + lldbVersions = [ "2.0.2558144" ]; + cmakeVersions = [ "3.6.4111459" ]; + includeNDK = false; + ndkVersion = "16.1.4479499"; + useGoogleAPIs = false; + useGoogleTVAddOns = false; + includeExtras = [ + "extras;google;gcm" + ]; + }; +in +androidComposition.androidsdk +``` + +The above function invocation states that we want an Android SDK with the above +specified plugin versions. By default, most plugins are disabled. Notable +exceptions are the tools, platform-tools and build-tools sub packages. + +The following parameters are supported: + +* `toolsVersion`, specifies the version of the tools package to use +* `platformsToolsVersion` specifies the version of the `platform-tools` plugin +* `buildToolsVersion` specifies the versions of the `build-tools` plugins to + use. +* `includeEmulator` specifies whether to deploy the emulator package (`false` + by default). When enabled, the version of the emulator to deploy can be + specified by setting the `emulatorVersion` parameter. +* `includeDocs` specifies whether the documentation catalog should be included. +* `lldbVersions` specifies what LLDB versions should be deployed. +* `cmakeVersions` specifies which CMake versions should be deployed. +* `includeNDK` specifies that the Android NDK bundle should be included. + Defaults to: `false`. +* `ndkVersion` specifies the NDK version that we want to use. +* `includeExtras` is an array of identifier strings referring to arbitrary + add-on packages that should be installed. +* `platformVersions` specifies which platform SDK versions should be included. + +For each platform version that has been specified, we can apply the following +options: + +* `includeSystemImages` specifies whether a system image for each platform SDK + should be included. +* `includeSources` specifies whether the sources for each SDK version should be + included. +* `useGoogleAPIs` specifies that for each selected platform version the + Google API should be included. +* `useGoogleTVAddOns` specifies that for each selected platform version the + Google TV add-on should be included. + +For each requested system image we can specify the following options: + +* `systemImageTypes` specifies what kind of system images should be included. + Defaults to: `default`. +* `abiVersions` specifies what kind of ABI version of each system image should + be included. Defaults to: `armeabi-v7a`. + +Most of the function arguments have reasonable default settings. + +When building the above expression with: + +```bash +$ nix-build +``` + +The Android SDK gets deployed with all desired plugin versions. + +We can also deploy subsets of the Android SDK. For example, to only the the +`platform-tools` package, you can evaluate the following expression: + +```nix +with import {}; + +let + androidComposition = androidenv.composeAndroidPackages { + # ... + }; +in +androidComposition.platform-tools +``` + +Using predefine Android package compositions +-------------------------------------------- +In addition to composing an Android package set manually, it is also possible +to use a predefined composition that contains all basic packages for a specific +Android version, such as version 9.0 (API-level 28). + +The following Nix expression can be used to deploy the entire SDK with all basic +plugins: + +```nix +with import {}; + +androidenv.androidPkgs_9_0.androidsdk +``` + +It is also possible to use one plugin only: + +```nix +with import {}; + +androidenv.androidPkgs_9_0.platform-tools +``` + +Building an Android application +------------------------------- +In addition to the SDK, it is also possible to build an Ant-based Android +project and automatically deploy all the Android plugins that a project +requires. + +```nix +with import {}; + +androidenv.buildApp { + name = "MyAndroidApp"; + src = ./myappsources; + release = true; + + # If release is set to true, you need to specify the following parameters + keyStore = ./keystore; + keyAlias = "myfirstapp"; + keyStorePassword = "mykeystore"; + keyAliasPassword = "myfirstapp"; + + # Any Android SDK parameters that install all the relevant plugins that a + # build requires + platformVersions = [ "24" ]; + + # When we include the NDK, then ndk-build is invoked before Ant gets invoked + includeNDK = true; +} +``` + +Aside from the app-specific build parameters (`name`, `src`, `release` and +keystore parameters), the `buildApp {}` function supports all the function +parameters that the SDK composition function (the function shown in the +previous section) supports. + +This build function is particularly useful when it is desired to use +[Hydra](http://nixos.org/hydra): the Nix-based continuous integration solution +to build Android apps. An Android APK gets exposed as a build product and can be +installed on any Android device with a web browser by navigating to the build +result page. + +Spawning emulator instances +--------------------------- +For testing purposes, it can also be quite convenient to automatically generate +scripts that spawn emulator instances with all desired configuration settings. + +An emulator spawn script can be configured by invoking the `emulateApp {}` +function: + +```nix +with import {}; + +androidenv.emulateApp { + name = "emulate-MyAndroidApp"; + platformVersion = "24"; + abiVersion = "armeabi-v7a"; # mips, x86 or x86_64 + systemImageType = "default"; + useGoogleAPIs = false; +} +``` + +It is also possible to specify an APK to deploy inside the emulator +and the package and activity names to launch it: + +```nix +with import {}; + +androidenv.emulateApp { + name = "emulate-MyAndroidApp"; + platformVersion = "24"; + abiVersion = "armeabi-v7a"; # mips, x86 or x86_64 + systemImageType = "default"; + useGoogleAPIs = false; + app = ./MyApp.apk; + package = "MyApp"; + activity = "MainActivity"; +} +``` + +In addition to prebuilt APKs, you can also bind the APK parameter to a +`buildApp {}` function invocation shown in the previous example. + +Querying the available versions of each plugin +---------------------------------------------- +When using any of the previously shown functions, it may be a bit inconvenient +to find out what options are supported, since the Android SDK provides many +plugins. + +A shell script in the `pkgs/development/mobile/androidenv/` sub directory can be used to retrieve all +possible options: + +```bash +sh ./querypackages.sh packages build-tools +``` + +The above command-line instruction queries all build-tools versions in the +generated `packages.nix` expression. + +Updating the generated expressions +---------------------------------- +Most of the Nix expressions are generated from XML files that the Android +package manager uses. To update the expressions run the `generate.sh` script +that is stored in the `pkgs/development/mobile/androidenv/` sub directory: + +```bash +sh ./generate.sh +``` diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml index d5f2574039f22e8b75d607e498c672d8c7dd688b..4314df5c9df29e602d4749c65e4cf2f1340a9d5f 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 7677c366191fb54ecfc9146c3a498010ef424b4f..81f662f1a17d382d6df8e49002c597107440e0f3 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -352,9 +352,9 @@ you want them to come from. Add the following to `configuration.nix`. ```nix services.hoogle = { -enable = true; -packages = (hpkgs: with hpkgs; [text cryptonite]); -haskellPackages = pkgs.haskellPackages; + enable = true; + packages = (hpkgs: with hpkgs; [text cryptonite]); + haskellPackages = pkgs.haskellPackages; }; ``` @@ -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 005ed3602851ccee3a0dba23da67976335751471..50979d76d98be98951fcee60f74ae0f2e4a52fe2 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 f22984cb56b0aba028488f843539982ba6bb1d78..4564df98fe99b34187481e98fd441927bb48e4d8 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -10,15 +10,18 @@ Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. + + + @@ -26,6 +29,7 @@ + diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md new file mode 100644 index 0000000000000000000000000000000000000000..6684b809ffe614e1318f235c8c3e0e6de4505152 --- /dev/null +++ b/doc/languages-frameworks/ios.section.md @@ -0,0 +1,219 @@ +--- +title: iOS +author: Sander van der Burg +date: 2018-11-18 +--- +# iOS + +This component is basically a wrapper/workaround that makes it possible to +expose an Xcode installation as a Nix package by means of symlinking to the +relevant executables on the host system. + +Since Xcode can't be packaged with Nix, nor we can publish it as a Nix package +(because of its license) this is basically the only integration strategy +making it possible to do iOS application builds that integrate with other +components of the Nix ecosystem + +The primary objective of this project is to use the Nix expression language to +specify how iOS apps can be built from source code, and to automatically spawn +iOS simulator instances for testing. + +This component also makes it possible to use [Hydra](http://nixos.org/hydra), +the Nix-based continuous integration server to regularly build iOS apps and to +do wireless ad-hoc installations of enterprise IPAs on iOS devices through +Hydra. + +The Xcode build environment implements a number of features. + +Deploying a proxy component wrapper exposing Xcode +-------------------------------------------------- +The first use case is deploying a Nix package that provides symlinks to the Xcode +installation on the host system. This package can be used as a build input to +any build function implemented in the Nix expression language that requires +Xcode. + +```nix +let + pkgs = import {}; + + xcodeenv = import ./xcodeenv { + inherit (pkgs) stdenv; + }; +in +xcodeenv.composeXcodeWrapper { + version = "9.2"; + xcodeBaseDir = "/Applications/Xcode.app"; +} +``` + +By deploying the above expression with `nix-build` and inspecting its content +you will notice that several Xcode-related executables are exposed as a Nix +package: + +```bash +$ ls result/bin +lrwxr-xr-x 1 sander staff 94 1 jan 1970 Simulator -> /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator +lrwxr-xr-x 1 sander staff 17 1 jan 1970 codesign -> /usr/bin/codesign +lrwxr-xr-x 1 sander staff 17 1 jan 1970 security -> /usr/bin/security +lrwxr-xr-x 1 sander staff 21 1 jan 1970 xcode-select -> /usr/bin/xcode-select +lrwxr-xr-x 1 sander staff 61 1 jan 1970 xcodebuild -> /Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild +lrwxr-xr-x 1 sander staff 14 1 jan 1970 xcrun -> /usr/bin/xcrun +``` + +Building an iOS application +--------------------------- +We can build an iOS app executable for the simulator, or an IPA/xcarchive file +for release purposes, e.g. ad-hoc, enterprise or store installations, by +executing the `xcodeenv.buildApp {}` function: + +```nix +let + pkgs = import {}; + + xcodeenv = import ./xcodeenv { + inherit (pkgs) stdenv; + }; +in +xcodeenv.buildApp { + name = "MyApp"; + src = ./myappsources; + sdkVersion = "11.2"; + + target = null; # Corresponds to the name of the app by default + configuration = null; # Release for release builds, Debug for debug builds + scheme = null; # -scheme will correspond to the app name by default + sdk = null; # null will set it to 'iphonesimulator` for simulator builds or `iphoneos` to real builds + xcodeFlags = ""; + + release = true; + certificateFile = ./mycertificate.p12; + certificatePassword = "secret"; + provisioningProfile = ./myprovisioning.profile; + signMethod = "ad-hoc"; # 'enterprise' or 'store' + generateIPA = true; + generateXCArchive = false; + + enableWirelessDistribution = true; + installURL = "/installipa.php"; + bundleId = "mycompany.myapp"; + appVersion = "1.0"; + + # Supports all xcodewrapper parameters as well + xcodeBaseDir = "/Applications/Xcode.app"; +} +``` + +The above function takes a variety of parameters: +* The `name` and `src` parameters are mandatory and specify the name of the app + and the location where the source code resides +* `sdkVersion` specifies which version of the iOS SDK to use. + +It also possile to adjust the `xcodebuild` parameters. This is only needed in +rare circumstances. In most cases the default values should suffice: + +* Specifies which `xcodebuild` target to build. By default it takes the target + that has the same name as the app. +* The `configuration` parameter can be overridden if desired. By default, it + will do a debug build for the simulator and a release build for real devices. +* The `scheme` parameter specifies which `-scheme` parameter to propagate to + `xcodebuild`. By default, it corresponds to the app name. +* The `sdk` parameter specifies which SDK to use. By default, it picks + `iphonesimulator` for simulator builds and `iphoneos` for release builds. +* The `xcodeFlags` parameter specifies arbitrary command line parameters that + should be propagated to `xcodebuild`. + +By default, builds are carried out for the iOS simulator. To do release builds +(builds for real iOS devices), you must set the `release` parameter to `true`. +In addition, you need to set the following parameters: + +* `certificateFile` refers to a P12 certificate file. +* `certificatePassword` specifies the password of the P12 certificate. +* `provisioningProfile` refers to the provision profile needed to sign the app +* `signMethod` should refer to `ad-hoc` for signing the app with an ad-hoc + certificate, `enterprise` for enterprise certificates and `app-store` for App + store certificates. +* `generateIPA` specifies that we want to produce an IPA file (this is probably + what you want) +* `generateXCArchive` specifies thet we want to produce an xcarchive file. + +When building IPA files on Hydra and when it is desired to allow iOS devices to +install IPAs by browsing to the Hydra build products page, you can enable the +`enableWirelessDistribution` parameter. + +When enabled, you need to configure the following options: + +* The `installURL` parameter refers to the URL of a PHP script that composes the + `itms-services://` URL allowing iOS devices to install the IPA file. +* `bundleId` refers to the bundle ID value of the app +* `appVersion` refers to the app's version number + +To use wireless adhoc distributions, you must also install the corresponding +PHP script on a web server (see section: 'Installing the PHP script for wireless +ad hoc installations from Hydra' for more information). + +In addition to the build parameters, you can also specify any parameters that +the `xcodeenv.composeXcodeWrapper {}` function takes. For example, the +`xcodeBaseDir` parameter can be overridden to refer to a different Xcode +version. + +Spawning simulator instances +---------------------------- +In addition to building iOS apps, we can also automatically spawn simulator +instances: + +```nix +let + pkgs = import {}; + + xcodeenv = import ./xcodeenv { + inherit (pkgs) stdenv; + }; +in +xcode.simulateApp { + name = "simulate"; + + # Supports all xcodewrapper parameters as well + xcodeBaseDir = "/Applications/Xcode.app"; +} +``` + +The above expression produces a script that starts the simulator from the +provided Xcode installation. The script can be started as follows: + +```bash +./result/bin/run-test-simulator +``` + +By default, the script will show an overview of UDID for all available simulator +instances and asks you to pick one. You can also provide a UDID as a +command-line parameter to launch an instance automatically: + +```bash +./result/bin/run-test-simulator 5C93129D-CF39-4B1A-955F-15180C3BD4B8 +``` + +You can also extend the simulator script to automatically deploy and launch an +app in the requested simulator instance: + +```nix +let + pkgs = import {}; + + xcodeenv = import ./xcodeenv { + inherit (pkgs) stdenv; + }; +in +xcode.simulateApp { + name = "simulate"; + bundleId = "mycompany.myapp"; + app = xcode.buildApp { + # ... + }; + + # Supports all xcodewrapper parameters as well + xcodeBaseDir = "/Applications/Xcode.app"; +} +``` + +By providing the result of an `xcode.buildApp {}` function and configuring the +app bundle id, the app gets deployed automatically and started. diff --git a/doc/languages-frameworks/node.section.md b/doc/languages-frameworks/node.section.md index f6701c1ab9c447f4aa438afdd974e6e904512ac3..c6dce04c7b8b00409e191b16b04c6cd679ef16d7 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 0000000000000000000000000000000000000000..ea0770616802a0fa27da7daa8106bfb126ce6f7d --- /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 5eabb866654ef54518eb00a46a1123577fd54b5a..acd2bf769b0dc18b4372a7a1d995a8852a698a33 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,18 @@ 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 aliases +`python2` and `python3` correspond to respectively `python27` and +`python37`. The default interpreter, `python`, maps to `python2`. The PyPy +interpreters compatible with Python 2.7 and 3 are available as `pypy27` and +`pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to +`pypy2`. 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 +509,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 +531,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 +539,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 +549,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 +655,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 +838,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 +1080,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 +1095,34 @@ 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: { + python37 = super.python37.override { + packageOverrides = python-self: python-super: { + numpy = python-super.numpy.override { + blas = super.pkgs.mkl; + }; + }; + }; +} +``` + +`mkl` requires an `openmp` implementation when running with multiple processors. +By default, `mkl` will use Intel's `iomp` implementation if no other is +specified, but this is a runtime-only dependency and binary compatible with the +LLVM implementation. To use that one instead, Intel recommends users set it with +`LD_PRELOAD`. + +Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms; +moreover, Hydra is not building and distributing pre-compiled binaries using it. + ## Contributing ### Contributing guidelines diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index c52a72a3df4a746757d844ce94a3385d4b8cffad..df4e5acb22cb94892a5f0dd06c5e7be8b27d170e 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 4549bbd1686b2eb6cf8f4dd52a5bdce01bd3033d..14b36f55f52f2a0402c4818fe370ea4c27943ae4 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -303,11 +303,15 @@ with import {}; stdenv.mkDerivation { name = "rust-env"; - buildInputs = [ + nativeBuildInputs = [ rustc cargo - # Example Additional Dependencies - pkgconfig openssl + # Example Build-time Additional Dependencies + pkgconfig + ]; + buildInputs = [ + # Example Run-time Additional Dependencies + openssl ]; # Set Environment Variables diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml index e42d0a81111165c335136a8ffc5f9ca2254ddcd6..5792a16963a97fe3bd78059acabce2222683c7eb 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/titanium.section.md b/doc/languages-frameworks/titanium.section.md new file mode 100644 index 0000000000000000000000000000000000000000..7a97664ec59848ec406d29d88c740136d4a4a214 --- /dev/null +++ b/doc/languages-frameworks/titanium.section.md @@ -0,0 +1,115 @@ +--- +title: Titanium +author: Sander van der Burg +date: 2018-11-18 +--- +# Titanium + +The Nixpkgs repository contains facilities to deploy a variety of versions of +the [Titanium SDK](https://www.appcelerator.com) versions, a cross-platform +mobile app development framework using JavaScript as an implementation language, +and includes a function abstraction making it possible to build Titanium +applications for Android and iOS devices from source code. + +Not all Titanium features supported -- currently, it can only be used to build +Android and iOS apps. + +Building a Titanium app +----------------------- +We can build a Titanium app from source for Android or iOS and for debugging or +release purposes by invoking the `titaniumenv.buildApp {}` function: + +```nix +titaniumenv.buildApp { + name = "myapp"; + src = ./myappsource; + + preBuild = ""; + target = "android"; # or 'iphone' + tiVersion = "7.1.0.GA"; + release = true; + + androidsdkArgs = { + platformVersions = [ "25" "26" ]; + }; + androidKeyStore = ./keystore; + androidKeyAlias = "myfirstapp"; + androidKeyStorePassword = "secret"; + + xcodeBaseDir = "/Applications/Xcode.app"; + xcodewrapperArgs = { + version = "9.3"; + }; + iosMobileProvisioningProfile = ./myprovisioning.profile; + iosCertificateName = "My Company"; + iosCertificate = ./mycertificate.p12; + iosCertificatePassword = "secret"; + iosVersion = "11.3"; + iosBuildStore = false; + + enableWirelessDistribution = true; + installURL = "/installipa.php"; +} +``` + +The `titaniumenv.buildApp {}` function takes the following parameters: + +* The `name` parameter refers to the name in the Nix store. +* The `src` parameter refers to the source code location of the app that needs + to be built. +* `preRebuild` contains optional build instructions that are carried out before + the build starts. +* `target` indicates for which device the app must be built. Currently only + 'android' and 'iphone' (for iOS) are supported. +* `tiVersion` can be used to optionally override the requested Titanium version + in `tiapp.xml`. If not specified, it will use the version in `tiapp.xml`. +* `release` should be set to true when building an app for submission to the + Google Playstore or Apple Appstore. Otherwise, it should be false. + +When the `target` has been set to `android`, we can configure the following +parameters: + +* The `androidSdkArgs` parameter refers to an attribute set that propagates all + parameters to the `androidenv.composeAndroidPackages {}` function. This can + be used to install all relevant Android plugins that may be needed to perform + the Android build. If no parameters are given, it will deploy the platform + SDKs for API-levels 25 and 26 by default. + +When the `release` parameter has been set to true, you need to provide +parameters to sign the app: + +* `androidKeyStore` is the path to the keystore file +* `androidKeyAlias` is the key alias +* `androidKeyStorePassword` refers to the password to open the keystore file. + +When the `target` has been set to `iphone`, we can configure the following +parameters: + +* The `xcodeBaseDir` parameter refers to the location where Xcode has been + installed. When none value is given, the above value is the default. +* The `xcodewrapperArgs` parameter passes arbitrary parameters to the + `xcodeenv.composeXcodeWrapper {}` function. This can, for example, be used + to adjust the default version of Xcode. + +When `release` has been set to true, you also need to provide the following +parameters: + +* `iosMobileProvisioningProfile` refers to a mobile provisioning profile needed + for signing. +* `iosCertificateName` refers to the company name in the P12 certificate. +* `iosCertificate` refers to the path to the P12 file. +* `iosCertificatePassword` contains the password to open the P12 file. +* `iosVersion` refers to the iOS SDK version to use. It defaults to the latest + version. +* `iosBuildStore` should be set to `true` when building for the Apple Appstore + submission. For enterprise or ad-hoc builds it should be set to `false`. + +When `enableWirelessDistribution` has been enabled, you must also provide the +path of the PHP script (`installURL`) (that is included with the iOS build +environment) to enable wireless ad-hoc installations. + +Emulating or simulating the app +------------------------------- +It is also possible to simulate the correspond iOS simulator build by using +`xcodeenv.simulateApp {}` and emulate an Android APK by using +`androidenv.emulateApp {}`. diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index f0a6559c3d51f3730a7d1e8bb85d62520e417d51..e4c486a0e52e57e16f0c1c794a151deaf73c4d91 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -15,6 +15,7 @@ At the moment we support three different methods for managing plugins: - Vim packages (*recommend*) - VAM (=vim-addon-manager) - Pathogen +- vim-plug ## Custom configuration @@ -22,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 = '' @@ -30,6 +32,8 @@ vim_configurable.customize { } ``` +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: ``` @@ -42,9 +46,24 @@ neovim.override { } ``` +If you want to use `neovim-qt` as a graphical editor, you can configure it by overriding neovim in an overlay +or passing it an overridden neovimn: + +``` +neovim-qt.override { + neovim = neovim.override { + configure = { + customRC = '' + # your custom configuration + ''; + }; + }; +} +``` + ## Managing plugins with Vim packages -To store you plugins in Vim packages the following example can be used: +To store you plugins in Vim packages (the native vim plugin manager, see `:help packages`) the following example can be used: ``` vim_configurable.customize { @@ -52,6 +71,8 @@ vim_configurable.customize { # loaded on launch start = [ youcompleteme fugitive ]; # manually loadable by calling `:packadd $plugin-name` + # however, if a vim plugin has a dependency that is not explicitly listed in + # opt that dependency will always be added to start to avoid confusion. opt = [ phpCompletion elm-vim ]; # To automatically load a plugin when opening a filetype, add vimrc lines like: # autocmd FileType php :packadd phpCompletion @@ -59,7 +80,8 @@ vim_configurable.customize { } ``` -For Neovim the syntax is +`myVimPackage` is an arbitrary name for the generated package. You can choose any name you like. +For Neovim the syntax is: ``` neovim.override { @@ -70,6 +92,8 @@ neovim.override { packages.myVimPackage = with pkgs.vimPlugins; { # see examples below how to use custom packages start = [ ]; + # If a vim plugin has a dependency that is not explicitly listed in + # opt that dependency will always be added to start to avoid confusion. opt = [ ]; }; }; @@ -82,6 +106,7 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n { 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 }; @@ -96,6 +121,35 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n 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 diff --git a/doc/lib-function-docs.nix b/doc/lib-function-docs.nix new file mode 100644 index 0000000000000000000000000000000000000000..421f848d25abffc5b1e782a8af117f57dbaaac43 --- /dev/null +++ b/doc/lib-function-docs.nix @@ -0,0 +1,26 @@ +# Generates the documentation for library functons via nixdoc. To add +# another library function file to this list, the include list in the +# file `doc/functions/library.xml` must also be updated. + +{ pkgs ? import ./.. {}, locationsXml }: + +with pkgs; stdenv.mkDerivation { + name = "nixpkgs-lib-docs"; + src = ./../lib; + + buildInputs = [ nixdoc ]; + installPhase = '' + function docgen { + nixdoc -c "$1" -d "$2" -f "../lib/$1.nix" > "$out/$1.xml" + } + + mkdir -p $out + ln -s ${locationsXml} $out/locations.xml + + docgen strings 'String manipulation functions' + docgen trivial 'Miscellaneous functions' + docgen lists 'List manipulation functions' + docgen debug 'Debugging functions' + docgen options 'NixOS / nixpkgs option handling' + ''; +} diff --git a/doc/lib-function-locations.nix b/doc/lib-function-locations.nix new file mode 100644 index 0000000000000000000000000000000000000000..ae7036e4626439ecf12028dff84366c86843ce61 --- /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 496b32916552b4066ce11c290e7e0d047b9bacbe..774ed2db75009a28378c74d48eb1c37f7aaec637 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 e96e84bfe72fd259d8356f6767850c08ace8820c..d18e282c5bd341291fd6cc9d699edad6c231625c 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 2decf9febe809f7b0962036e832056593aa68547..bff2339ca9338cbdf5e14d91b47cfd2b1dbeee5f 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 1f088e8aaa0ea7c2be68c02170bc14db6d4bb137..e23593107d8d72a7779e0c3fcfc64a7f471286ce 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: @@ -307,23 +307,19 @@ packageOverrides = pkgs: {
+
Elm - The Nix expressions for Elm reside in - pkgs/development/compilers/elm. They are generated - automatically by update-elm.rb script. One should specify - versions of Elm packages inside the script, clear the - packages directory and run the script from inside it. - elm-reactor is special because it also has Elm package - dependencies. The process is not automated very much for now -- you should - get the elm-reactor source tree (e.g. with - nix-shell) and run elm2nix.rb inside - it. Place the resulting package.nix file into - packages/elm-reactor-elm.nix. + To update Elm compiler, see nixpkgs/pkgs/development/compilers/elm/README.md. + + + + To package Elm applications, read about elm2nix.
+
Interactive shell helpers @@ -413,11 +409,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.
@@ -643,15 +637,15 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el required dependencies manually - but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package you can use - overrideScope. + overrideScope'.
-overrides = super: self: rec { +overrides = self: super: rec { haskell-mode = self.melpaPackages.haskell-mode; ... }; -((emacsPackagesNgGen emacs).overrideScope overrides).emacsWithPackages (p: with p; [ +((emacsPackagesNgGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [ # here both these package will use haskell-mode of our own choice ghc-mod dante @@ -671,8 +665,9 @@ overrides = super: self: rec { plugins = with availablePlugins; [ python perl ]; } } - If the configure function returns an attrset without the plugins - attribute, availablePlugins will be used automatically. + If the configure function returns an attrset without the + plugins attribute, availablePlugins + will be used automatically.
@@ -682,10 +677,10 @@ overrides = super: self: 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; [ @@ -706,9 +701,11 @@ overrides = super: self: 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 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 = '' @@ -717,12 +714,14 @@ overrides = super: self: rec { ''; }; } - Further values can be added to the list of commands when running - weechat --run-command "your-commands". + 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: + 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; [ @@ -734,11 +733,13 @@ overrides = super: self: rec { }; } + - 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: + 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 { @@ -814,4 +815,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 cde27b8a5edfc0dd99768becd29a550c6b5748aa..6050271dbf6f985836e8d66d34eb2f89578d4506 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 b9e6d789404a8e0927096dba3bd5f4782260249d..8dd673ed2733fe8eea8610659862504e720da712 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 849bb9316c608bb88071cf5539c27f5d96199e8f..f541b7f22daa6e5b3244263c5da3b79e716bafb2 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 @@ -607,11 +605,11 @@ policy. --> - In a case a contributor leaves definitively the Nix community, he should + In a case a contributor definitively leaves the Nix community, they should create an issue or post on Discourse with - references of packages and modules he maintains so the maintainership can be + references of packages and modules they maintain so the maintainership can be taken over by other contributors.
diff --git a/doc/shell.nix b/doc/shell.nix index 24fe20e81050e338c9b54688bbdd4a60aa47e873..8ac2019f9d66accc3961cdf042d5e47813c6d2d3 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 cb8832a814fcc036a881544d175430e3cf6b2587..0000000000000000000000000000000000000000 --- 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 7a0f8f270bad1ecedfeaa686aa2207ae45aa7cd3..81bd4556193f1e6e05d553584cfb8f5a0e479806 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 nativeBuildInputsinstead. 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. - - - 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 + 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 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 + as that is used by the majority of packages. + + + dontAddDisableDepTrack @@ -1148,12 +1178,11 @@ passthru = { By default, when cross compiling, the configure script has and 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 @@ -1261,7 +1279,9 @@ makeFlags = [ "PREFIX=$(out)" ]; make. You must use this instead of makeFlags if the arguments contain spaces, e.g. -makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") +preBuild = '' + makeFlagsArray+=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") +''; Note that shell arrays cannot be passed through environment variables, so you cannot set makeFlagsArray in a derivation @@ -1378,6 +1398,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 @@ -1632,6 +1664,18 @@ installTargets = "install-bin install-doc"; + + + dontPruneLibtoolFiles + + + + If set, libtool .la files associated with shared + libraries won't have their dependency_libs field + cleared. + + + forceShare @@ -1650,13 +1694,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. @@ -1770,7 +1812,7 @@ set debug-file-directory ~/.nix-profile/lib/debug A list of dependencies used by the phase. This gets included in - buildInputs when doInstallCheck is + nativeBuildInputs when doInstallCheck is set. @@ -2089,47 +2131,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 +2182,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,36 +2197,156 @@ 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. - Here are some packages that provide a setup hook. Since the mechanism is - modular, this probably isn't an exhaustive list. Then again, since the - mechanism is only to be used as a last resort, it might be. - + First, let’s cover some setup hooks that are part of Nixpkgs + default stdenv. This means that they are run for every package + built using stdenv.mkDerivation. Some of + these are platform specific, so they may run on Linux but not + Darwin or vice-versa. + + + + move-docs.sh + + + + This setup hook moves any installed documentation to the + /share subdirectory directory. This includes + the man, doc and info directories. This is needed for legacy + programs that do not know how to use the + share subdirectory. + + + + + + compress-man-pages.sh + + + + This setup hook compresses any man pages that have been + installed. The compression is done using the gzip program. This + helps to reduce the installed size of packages. + + + + + + strip.sh + + + + This runs the strip command on installed binaries and + libraries. This removes unnecessary information like debug + symbols when they are not needed. This also helps to reduce the + installed size of packages. + + + + + + patch-shebangs.sh + + + + This setup hook patches installed scripts to use the full path + to the shebang interpreter. A shebang interpreter is the first + commented line of a script telling the operating system which + program will run the script (e.g #!/bin/bash). In + Nix, we want an exact path to that interpreter to be used. This + often replaces /bin/sh with a path in the + Nix store. + + + + + + audit-tmpdir.sh + + + + This verifies that no references are left from the install + binaries to the directory used to build those binaries. This + ensures that the binaries do not need things outside the Nix + store. This is currently supported in Linux only. + + + + + + multiple-outputs.sh + + + + This setup hook adds configure flags that tell packages to + install files into any one of the proper outputs listed in + outputs. This behavior can be turned off by setting + setOutputFlags to false in the derivation + environment. See for + more information. + + + + + + move-sbin.sh + + + + This setup hook moves any binaries installed in the sbin + subdirectory into bin. In addition, a link is provided from + sbin to bin for compatibility. + + + + + + move-lib64.sh + + + + This setup hook moves any libraries installed in the lib64 + subdirectory into lib. In addition, a link is provided from + lib64 to lib for compatibility. + + + + + + set-source-date-epoch-to-latest.sh + + + + This sets SOURCE_DATE_EPOCH to the + modification time of the most recent file. + + + Bintools Wrapper - 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 +2354,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 +2383,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,33 +2406,43 @@ 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. + + + + + Here are some more packages that provide a setup hook. Since the + list of hooks is extensible, this is not an exhaustive list the + mechanism is only to be used as a last resort, it might cover most + uses. + Perl @@ -2329,9 +2499,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 +2547,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. @@ -2406,46 +2578,187 @@ addEnvHooks "$hostOffset" myBashFunction - paxctl + autoPatchelfHook - Defines the paxmark helper for setting per-executable - 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: - - postFixup = '' - paxmark m $out/bin/foo - ''; - - The m flag is the most common flag and is typically - required for applications that employ JIT compilation or otherwise need - to execute code generated at run-time. Disabling PaX protections should - be considered a last resort: if possible, problematic features should be - disabled or patched to work with PaX. + 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 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. - autoPatchelfHook + breakpointHook - 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. + 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. - + + + libiconv, libintl + + + + A few libraries automatically add to + NIX_LDFLAGS their library, making their + symbols automatically available to the linker. This includes + libiconv and libintl (gettext). This is done to provide + compatibility between GNU Linux, where libiconv and libintl + are bundled in, and other systems where that might not be the + case. Sometimes, this behavior is not desired. To disable + this behavior, set dontAddExtraLibs. + + + + + + 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/doc/style.css b/doc/style.css index 0db907815b6b77496871cd266fcc828b51ae57d9..474dd32e3fb148c0aa7000dce2967a4e4dff8533 100644 --- a/doc/style.css +++ b/doc/style.css @@ -9,6 +9,7 @@ body { font-family: "Nimbus Sans L", sans-serif; + font-size: 1em; background: white; margin: 2em 1em 2em 1em; } @@ -28,6 +29,25 @@ h2 /* chapters, appendices, subtitle */ font-size: 180%; } +div.book +{ + text-align: center; +} + +div.book > div +{ + /* + * based on https://medium.com/@zkareemz/golden-ratio-62b3b6d4282a + * we do 70 characters per line to fit code listings better + * 70 * (font-size / 1.618) + * expression for emacs: + * (* 70 (/ 1 1.618)) + */ + max-width: 43.2em; + text-align: left; + margin: auto; +} + /* Extra space between chapters, appendices. */ div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 { @@ -102,8 +122,8 @@ pre.screen, pre.programlisting { border: 1px solid #b0b0b0; padding: 3px 3px; - margin-left: 1.5em; - margin-right: 1.5em; + margin-left: 0.5em; + margin-right: 0.5em; background: #f4f4f8; font-family: monospace; diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 1e4142562fa692602f132e4945e034aac9bb861d..d374d229f5975f0eddb5b03d379fc0ce1d359c96 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/composable-derivation.nix b/lib/composable-derivation.nix deleted file mode 100644 index cb1fdc121e11b7bfbcf4a25864568fe3077df2e3..0000000000000000000000000000000000000000 --- a/lib/composable-derivation.nix +++ /dev/null @@ -1,113 +0,0 @@ -{lib, pkgs}: -let inherit (lib) nvs; in -{ - - # composableDerivation basically mixes these features: - # - fix function - # - mergeAttrBy - # - provides shortcuts for "options" such as "--enable-foo" and adding - # buildInputs, see php example - # - # It predates styles which are common today, such as - # * the config attr - # * mkDerivation.override feature - # * overrideDerivation (lib/customization.nix) - # - # Some of the most more important usage examples (which could be rewritten if it was important): - # * php - # * postgis - # * vim_configurable - # - # A minimal example illustrating most features would look like this: - # let base = composableDerivation { (fixed: let inherit (fixed.fixed) name in { - # src = fetchurl { - # } - # buildInputs = [A]; - # preConfigre = "echo ${name}"; - # # attention, "name" attr is missing, thus you cannot instantiate "base". - # } - # in { - # # These all add name attribute, thus you can instantiate those: - # v1 = base.merge ({ name = "foo-add-B"; buildInputs = [B]; }); // B gets merged into buildInputs - # v2 = base.merge ({ name = "mix-in-pre-configure-lines" preConfigre = ""; }); - # v3 = base.replace ({ name = "foo-no-A-only-B;" buildInputs = [B]; }); - # } - # - # So yes, you can think about it being something like nixos modules, and - # you'd be merging "features" in one at a time using .merge or .replace - # Thanks Shea for telling me that I rethink the documentation .. - # - # issues: - # * its complicated to understand - # * some "features" such as exact merge behaviour are buried in mergeAttrBy - # and defaultOverridableDelayableArgs assuming the default behaviour does - # the right thing in the common case - # * Eelco once said using such fix style functions are slow to evaluate - # * Too quick & dirty. Hard to understand for others. The benefit was that - # you were able to create a kernel builder like base derivation and replace - # / add patches the way you want without having to declare function arguments - # - # nice features: - # declaring "optional features" is modular. For instance: - # flags.curl = { - # configureFlags = ["--with-curl=${curl.dev}" "--with-curlwrappers"]; - # buildInputs = [curl openssl]; - # }; - # flags.other = { .. } - # (Example taken from PHP) - # - # alternative styles / related features: - # * Eg see function supporting building the kernel - # * versionedDerivation (discussion about this is still going on - or ended) - # * composedArgsAndFun - # * mkDerivation.override - # * overrideDerivation - # * using { .., *Support ? false }: like configurable options. - # To find those examples use grep - # - # To sum up: It exists for historical reasons - and for most commonly used - # tasks the alternatives should be used - # - # If you have questions about this code ping Marc Weber. - composableDerivation = { - mkDerivation ? pkgs.stdenv.mkDerivation, - - # list of functions to be applied before defaultOverridableDelayableArgs removes removeAttrs names - # prepareDerivationArgs handles derivation configurations - applyPreTidy ? [ lib.prepareDerivationArgs ], - - # consider adding addtional elements by derivation.merge { removeAttrs = ["elem"]; }; - removeAttrs ? ["cfg" "flags"] - - }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a) - { - inherit applyPreTidy removeAttrs; - }).merge; - - # some utility functions - # use this function to generate flag attrs for prepareDerivationArgs - # E nable D isable F eature - edf = {name, feat ? name, enable ? {}, disable ? {} , value ? ""}: - nvs name { - set = { - configureFlags = ["--enable-${feat}${if value == "" then "" else "="}${value}"]; - } // enable; - unset = { - configureFlags = ["--disable-${feat}"]; - } // disable; - }; - - # same for --with and --without- - # W ith or W ithout F eature - wwf = {name, feat ? name, enable ? {}, disable ? {}, value ? ""}: - nvs name { - set = enable // { - configureFlags = ["--with-${feat}${if value == "" then "" else "="}${value}"] - ++ lib.maybeAttr "configureFlags" [] enable; - }; - unset = disable // { - configureFlags = ["--without-${feat}"] - ++ lib.maybeAttr "configureFlags" [] disable; - }; - }; -} diff --git a/lib/customisation.nix b/lib/customisation.nix index 0107ed33d9e432c405d1a73492a7085dfa1096e0..1f5eb0d11e8bf7726184c8f10698d483374e1e73 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -121,7 +121,7 @@ rec { auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs; origArgs = auto // args; pkgs = f origArgs; - mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) origArgs; + mkAttrOverridable = name: _: makeOverridable (newArgs: (f newArgs).${name}) origArgs; in lib.mapAttrs mkAttrOverridable pkgs; @@ -185,7 +185,7 @@ rec { /* Make a set of packages with a common scope. All packages called with the provided `callPackage' will be evaluated with the same arguments. Any package in the set may depend on any other. The - `overrideScope' function allows subsequent modification of the package + `overrideScope'` function allows subsequent modification of the package set in a consistent way, i.e. all packages in the set will be called with the overridden packages. The package sets may be hierarchical: the packages in the set are called with the scope @@ -195,10 +195,10 @@ rec { let self = f self // { newScope = scope: newScope (self // scope); callPackage = self.newScope {}; - # TODO(@Ericson2314): Haromonize argument order of `g` with everything else - overrideScope = g: - makeScope newScope - (lib.fixedPoints.extends (lib.flip g) f); + overrideScope = g: lib.warn + "`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; }; in self; diff --git a/lib/debug.nix b/lib/debug.nix index 383eb32d75d0d8be32e4c98c3c8c1c548ff365be..2879f72ed2ba431a10692a92e5e09a1298676487 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -23,27 +23,54 @@ rec { # -- TRACING -- - /* Trace msg, but only if pred is true. + /* Conditionally trace the supplied message, based on a predicate. + + Type: traceIf :: bool -> string -> a -> a Example: traceIf true "hello" 3 trace: hello => 3 */ - traceIf = pred: msg: x: if pred then trace msg x else x; + traceIf = + # Predicate to check + pred: + # Message that should be traced + msg: + # Value to return + x: if pred then trace msg x else x; + + /* Trace the supplied value after applying a function to it, and + return the original value. - /* Trace the value and also return it. + Type: traceValFn :: (a -> b) -> a -> a Example: traceValFn (v: "mystring ${v}") "foo" trace: mystring foo => "foo" */ - traceValFn = f: x: trace (f x) x; + traceValFn = + # Function to apply + f: + # Value to trace and return + x: trace (f x) x; + + /* Trace the supplied value and return it. + + Type: traceVal :: a -> a + + Example: + traceVal 42 + # trace: 42 + => 42 + */ traceVal = traceValFn id; /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. + Type: traceSeq :: a -> b -> b + Example: trace { a.b.c = 3; } null trace: { a = ; } @@ -52,7 +79,11 @@ rec { trace: { a = { b = { c = 3; }; }; } => null */ - traceSeq = x: y: trace (builtins.deepSeq x x) y; + traceSeq = + # The value to trace + x: + # The value to return + y: trace (builtins.deepSeq x x) y; /* Like `traceSeq`, but only evaluate down to depth n. This is very useful because lots of `traceSeq` usages @@ -76,27 +107,49 @@ rec { in trace (generators.toPretty { allowPrettyValues = true; } (modify depth snip x)) y; - /* A combination of `traceVal` and `traceSeq` */ - traceValSeqFn = f: v: traceValFn f (builtins.deepSeq v v); + /* A combination of `traceVal` and `traceSeq` that applies a + provided function to the value to be traced after `deepSeq`ing + it. + */ + traceValSeqFn = + # Function to apply + f: + # Value to trace + v: traceValFn f (builtins.deepSeq v v); + + /* A combination of `traceVal` and `traceSeq`. */ traceValSeq = traceValSeqFn id; + /* A combination of `traceVal` and `traceSeqN` that applies a + provided function to the value to be traced. */ + traceValSeqNFn = + # Function to apply + f: + depth: + # Value to trace + v: traceSeqN depth (f v) v; + /* A combination of `traceVal` and `traceSeqN`. */ - traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v; traceValSeqN = traceValSeqNFn id; # -- TESTING -- - /* Evaluate a set of tests. A test is an attribute set {expr, - expected}, denoting an expression and its expected result. The - result is a list of failed tests, each represented as {name, - expected, actual}, denoting the attribute name of the failing - test and its expected and actual results. Used for regression - testing of the functions in lib; see tests.nix for an example. - Only tests having names starting with "test" are run. - Add attr { tests = ["testName"]; } to run these test only + /* Evaluate a set of tests. A test is an attribute set `{expr, + expected}`, denoting an expression and its expected result. The + result is a list of failed tests, each represented as `{name, + expected, actual}`, denoting the attribute name of the failing + test and its expected and actual results. + + Used for regression testing of the functions in lib; see + tests.nix for an example. Only tests having names starting with + "test" are run. + + Add attr { tests = ["testName"]; } to run these tests only. */ - runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: + runTests = + # Tests to run + tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: let testsToRun = if tests ? tests then tests.tests else []; in if (substring 0 4 name == "test" || elem name testsToRun) && ((testsToRun == []) || elem name tests.tests) @@ -105,8 +158,11 @@ rec { then [ { inherit name; expected = test.expected; result = test.expr; } ] else [] ) tests)); - # create a test assuming that list elements are true - # usage: { testX = allTrue [ true ]; } + /* Create a test assuming that list elements are `true`. + + Example: + { testX = allTrue [ true ]; } + */ testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; diff --git a/lib/default.nix b/lib/default.nix index d7a05fec8338e84f18b763627d70fce9ed8c2dd7..d400907ebb0cbe0c41632ac162de93e46bdec392 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -61,10 +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 @@ -80,7 +80,7 @@ let inherit (strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep concatImapStringsSep makeSearchPath makeSearchPathOutput - makeLibraryPath makeBinPath makePerlPath makeFullPerlPath optionalString + makeLibraryPath makeBinPath optionalString hasPrefix hasSuffix stringToCharacters stringAsChars escape escapeShellArg escapeShellArgs replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString @@ -94,7 +94,7 @@ let callPackageWith callPackagesWith extendDerivation hydraJob makeScope; inherit (meta) addMetaAttrs dontDistribute setName updateName - appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio + appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio hiPrioSet; inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices @@ -109,7 +109,7 @@ let mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule - mkAliasOptionModule doRename filterModules; + mkAliasOptionModule mkAliasOptionModuleWithPriority doRename filterModules; inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' @@ -125,14 +125,14 @@ let traceShowValMarked showVal traceCall traceCall2 traceCall3 traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs - defaultOverridableDelayableArgs composedArgsAndFun maybeAttrNullable maybeAttr ifEnable checkFlag getValue checkReqs uniqList uniqListExt condConcat lazyGenericClosure innerModifySumArgs modifySumArgs innerClosePropagation closePropagation mapAttrsFlatten nvs setAttr setAttrMerge mergeAttrsWithFunc mergeAttrsConcatenateValues mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults - mergeAttrsByFuncDefaultsClean mergeAttrBy prepareDerivationArgs - nixType imap overridableDelayableArgs; + mergeAttrsByFuncDefaultsClean mergeAttrBy + fakeSha256 fakeSha512 + nixType imap; }); in lib diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 34cf336d1f42c4c4c6fc3adf3d6033ee1487a547..15de50456612876a596d0ed3b71201629df53191 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -35,74 +35,6 @@ rec { withStdOverrides; - # predecessors: proposed replacement for applyAndFun (which has a bug cause it merges twice) - # the naming "overridableDelayableArgs" tries to express that you can - # - override attr values which have been supplied earlier - # - use attr values before they have been supplied by accessing the fix point - # name "fixed" - # f: the (delayed overridden) arguments are applied to this - # - # initial: initial attrs arguments and settings. see defaultOverridableDelayableArgs - # - # returns: f applied to the arguments // special attributes attrs - # a) merge: merge applied args with new args. Wether an argument is overridden depends on the merge settings - # b) replace: this let's you replace and remove names no matter which merge function has been set - # - # examples: see test cases "res" below; - overridableDelayableArgs = - f: # the function applied to the arguments - initial: # you pass attrs, the functions below are passing a function taking the fix argument - let - takeFixed = if lib.isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument - tidy = args: - let # apply all functions given in "applyPreTidy" in sequence - applyPreTidyFun = fold ( n: a: x: n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args); - in removeAttrs (applyPreTidyFun args) ( ["applyPreTidy"] ++ (maybeAttr "removeAttrs" [] args) ); # tidy up args before applying them - fun = n: x: - let newArgs = fixed: - let args = takeFixed fixed; - mergeFun = args.${n}; - in if isAttrs x then (mergeFun args x) - else assert lib.isFunction x; - mergeFun args (x ( args // { inherit fixed; })); - in overridableDelayableArgs f newArgs; - in - (f (tidy (lib.fix takeFixed))) // { - merge = fun "mergeFun"; - replace = fun "keepFun"; - }; - defaultOverridableDelayableArgs = f: - let defaults = { - mergeFun = mergeAttrByFunc; # default merge function. merge strategie (concatenate lists, strings) is given by mergeAttrBy - keepFun = a: b: { inherit (a) removeAttrs mergeFun keepFun mergeAttrBy; } // b; # even when using replace preserve these values - applyPreTidy = []; # list of functions applied to args before args are tidied up (usage case : prepareDerivationArgs) - mergeAttrBy = mergeAttrBy // { - applyPreTidy = a: b: a ++ b; - removeAttrs = a: b: a ++ b; - }; - removeAttrs = ["mergeFun" "keepFun" "mergeAttrBy" "removeAttrs" "fixed" ]; # before applying the arguments to the function make sure these names are gone - }; - in (overridableDelayableArgs f defaults).merge; - - - - # rec { # an example of how composedArgsAndFun can be used - # a = composedArgsAndFun (x: x) { a = ["2"]; meta = { d = "bar";}; }; - # # meta.d will be lost ! It's your task to preserve it (eg using a merge function) - # b = a.passthru.function { a = [ "3" ]; meta = { d2 = "bar2";}; }; - # # instead of passing/ overriding values you can use a merge function: - # c = b.passthru.function ( x: { a = x.a ++ ["4"]; }); # consider using (maybeAttr "a" [] x) - # } - # result: - # { - # a = { a = ["2"]; meta = { d = "bar"; }; passthru = { function = .. }; }; - # b = { a = ["3"]; meta = { d2 = "bar2"; }; passthru = { function = .. }; }; - # c = { a = ["3" "4"]; meta = { d2 = "bar2"; }; passthru = { function = .. }; }; - # # c2 is equal to c - # } - composedArgsAndFun = f: foldArgs defaultMerge f {}; - - # shortcut for attrByPath ["name"] default attrs maybeAttrNullable = maybeAttr; @@ -285,7 +217,7 @@ rec { # }; # will result in # { mergeAttrsBy = [...]; buildInputs = [ a b c d ]; } - # is used by prepareDerivationArgs, defaultOverridableDelayableArgs and can be used when composing using + # is used by defaultOverridableDelayableArgs and can be used when composing using # foldArgs, composedArgsAndFun or applyAndFun. Example: composableDerivation in all-packages.nix mergeAttrByFunc = x: y: let @@ -318,58 +250,6 @@ rec { // listToAttrs (map (n: nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) ; - # prepareDerivationArgs tries to make writing configurable derivations easier - # example: - # prepareDerivationArgs { - # mergeAttrBy = { - # myScript = x: y: x ++ "\n" ++ y; - # }; - # cfg = { - # readlineSupport = true; - # }; - # flags = { - # readline = { - # set = { - # configureFlags = [ "--with-compiler=${compiler}" ]; - # buildInputs = [ compiler ]; - # pass = { inherit compiler; READLINE=1; }; - # assertion = compiler.dllSupport; - # myScript = "foo"; - # }; - # unset = { configureFlags = ["--without-compiler"]; }; - # }; - # }; - # src = ... - # buildPhase = '' ... ''; - # name = ... - # myScript = "bar"; - # }; - # if you don't have need for unset you can omit the surrounding set = { .. } attr - # all attrs except flags cfg and mergeAttrBy will be merged with the - # additional data from flags depending on config settings - # It's used in composableDerivation in all-packages.nix. It's also used - # heavily in the new python and libs implementation - # - # should we check for misspelled cfg options? - # TODO use args.mergeFun here as well? - prepareDerivationArgs = args: - let args2 = { cfg = {}; flags = {}; } // args; - flagName = name: "${name}Support"; - cfgWithDefaults = (listToAttrs (map (n: nameValuePair (flagName n) false) (attrNames args2.flags))) - // args2.cfg; - opts = attrValues (mapAttrs (a: v: - let v2 = if v ? set || v ? unset then v else { set = v; }; - n = if cfgWithDefaults.${flagName a} then "set" else "unset"; - attr = maybeAttr n {} v2; in - if (maybeAttr "assertion" true attr) - then attr - else throw "assertion of flag ${a} of derivation ${args.name} failed" - ) args2.flags ); - in removeAttrs - (mergeAttrsByFuncDefaults ([args] ++ opts ++ [{ passthru = cfgWithDefaults; }])) - ["flags" "cfg" "mergeAttrBy" ]; - - nixType = x: if isAttrs x then if x ? outPath then "derivation" @@ -390,4 +270,8 @@ rec { starting at zero. */ imap = imap1; + + # Fake hashes. Can be used as hash placeholders, when computing hash ahead isn't trivial + fakeSha256 = "0000000000000000000000000000000000000000000000000000000000000000"; + fakeSha512 = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; } diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 13e053b5aa7dbffcd1db7fe576fea52efc0fa63b..2f818c88de5dbd35e8508dcb2dd7951695924bf4 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 f5faf70078605698b808210a58db7bae94b1c644..863ba847423ee0c322a3fd3abe5679b28d2414c3 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/kernel.nix b/lib/kernel.nix index 45b33aea7b87190364d4b99914b612021051a349..5923011774b153961c9ac55a419fe17fa9de5538 100644 --- a/lib/kernel.nix +++ b/lib/kernel.nix @@ -1,57 +1,21 @@ -{ lib -# we pass the kernel version here to keep a nice syntax `whenOlder "4.13"` -# kernelVersion, e.g., config.boot.kernelPackages.version -, version -, mkValuePreprocess ? null -}: +{ lib, version }: with lib; rec { - # Common patterns - when = cond: opt: if cond then opt else null; - whenAtLeast = ver: when (versionAtLeast version ver); - whenOlder = ver: when (versionOlder version ver); - whenBetween = verLow: verHigh: when (versionAtLeast version verLow && versionOlder version verHigh); + # Common patterns/legacy + whenAtLeast = ver: mkIf (versionAtLeast version ver); + whenOlder = ver: mkIf (versionOlder version ver); + # range is (inclusive, exclusive) + whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh); - # Keeping these around in case we decide to change this horrible implementation :) - option = x: if x == null then null else "?${x}"; - yes = "y"; - no = "n"; - module = "m"; - mkValue = val: - let - isNumber = c: elem c ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9"]; - in - if val == "" then "\"\"" - else if val == yes || val == module || val == no then val - else if all isNumber (stringToCharacters val) then val - else if substring 0 2 val == "0x" then val - else val; # FIXME: fix quoting one day + # Keeping these around in case we decide to change this horrible implementation :) + option = x: + x // { optional = true; }; + yes = { tristate = "y"; }; + no = { tristate = "n"; }; + module = { tristate = "m"; }; + freeform = x: { freeform = x; }; - # generate nix intermediate kernel config file of the form - # - # VIRTIO_MMIO m - # VIRTIO_BLK y - # VIRTIO_CONSOLE n - # NET_9P_VIRTIO? y - # - # Use mkValuePreprocess to preprocess option values, aka mark 'modules' as - # 'yes' or vice-versa - # Borrowed from copumpkin https://github.com/NixOS/nixpkgs/pull/12158 - # returns a string, expr should be an attribute set - generateNixKConf = exprs: mkValuePreprocess: - let - mkConfigLine = key: rawval: - let - val = if builtins.isFunction mkValuePreprocess then mkValuePreprocess rawval else rawval; - in - if val == null - then "" - else if hasPrefix "?" val - then "${key}? ${mkValue (removePrefix "?" val)}\n" - else "${key} ${mkValue val}\n"; - mkConf = cfg: concatStrings (mapAttrsToList mkConfigLine cfg); - in mkConf exprs; } diff --git a/lib/licenses.nix b/lib/licenses.nix index c4db280645a4c530dc85b83cfaaaff28c1596ec6..fc9cb42621d480e979b949575d25244415ecfa06 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"; @@ -24,13 +29,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { }; agpl3 = spdx { - spdxId = "AGPL-3.0"; - fullName = "GNU Affero General Public License v3.0"; + spdxId = "AGPL-3.0-only"; + fullName = "GNU Affero General Public License v3.0 only"; }; - agpl3Plus = { + agpl3Plus = spdx { + spdxId = "AGPL-3.0-or-later"; fullName = "GNU Affero General Public License v3.0 or later"; - inherit (agpl3) url; }; amazonsl = { @@ -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 { @@ -264,13 +266,23 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { }; fdl12 = spdx { - spdxId = "GFDL-1.2"; - fullName = "GNU Free Documentation License v1.2"; + spdxId = "GFDL-1.2-only"; + fullName = "GNU Free Documentation License v1.2 only"; + }; + + fdl12Plus = spdx { + spdxId = "GFDL-1.2-or-later"; + fullName = "GNU Free Documentation License v1.2 or later"; }; fdl13 = spdx { - spdxId = "GFDL-1.3"; - fullName = "GNU Free Documentation License v1.3"; + spdxId = "GFDL-1.3-only"; + fullName = "GNU Free Documentation License v1.3 only"; + }; + + fdl13Plus = spdx { + spdxId = "GFDL-1.3-or-later"; + fullName = "GNU Free Documentation License v1.3 or later"; }; ffsl = { @@ -295,20 +307,25 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { }; gpl1 = spdx { - spdxId = "GPL-1.0"; + spdxId = "GPL-1.0-only"; fullName = "GNU General Public License v1.0 only"; }; gpl1Plus = spdx { - spdxId = "GPL-1.0+"; + spdxId = "GPL-1.0-or-later"; fullName = "GNU General Public License v1.0 or later"; }; gpl2 = spdx { - spdxId = "GPL-2.0"; + spdxId = "GPL-2.0-only"; fullName = "GNU General Public License v2.0 only"; }; + gpl2Classpath = spdx { + spdxId = "GPL-2.0-with-classpath-exception"; + fullName = "GNU General Public License v2.0 only (with Classpath exception)"; + }; + gpl2ClasspathPlus = { fullName = "GNU General Public License v2.0 or later (with Classpath exception)"; url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; @@ -320,17 +337,17 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { }; gpl2Plus = spdx { - spdxId = "GPL-2.0+"; + spdxId = "GPL-2.0-or-later"; fullName = "GNU General Public License v2.0 or later"; }; gpl3 = spdx { - spdxId = "GPL-3.0"; + spdxId = "GPL-3.0-only"; fullName = "GNU General Public License v3.0 only"; }; gpl3Plus = spdx { - spdxId = "GPL-3.0+"; + spdxId = "GPL-3.0-or-later"; fullName = "GNU General Public License v3.0 or later"; }; @@ -387,33 +404,45 @@ 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"; + spdxId = "LGPL-2.0-only"; fullName = "GNU Library General Public License v2 only"; }; lgpl2Plus = spdx { - spdxId = "LGPL-2.0+"; + spdxId = "LGPL-2.0-or-later"; fullName = "GNU Library General Public License v2 or later"; }; lgpl21 = spdx { - spdxId = "LGPL-2.1"; + spdxId = "LGPL-2.1-only"; fullName = "GNU Library General Public License v2.1 only"; }; lgpl21Plus = spdx { - spdxId = "LGPL-2.1+"; + spdxId = "LGPL-2.1-or-later"; fullName = "GNU Library General Public License v2.1 or later"; }; lgpl3 = spdx { - spdxId = "LGPL-3.0"; + spdxId = "LGPL-3.0-only"; fullName = "GNU Lesser General Public License v3.0 only"; }; lgpl3Plus = spdx { - spdxId = "LGPL-3.0+"; + spdxId = "LGPL-3.0-or-later"; fullName = "GNU Lesser General Public License v3.0 or later"; }; @@ -485,6 +514,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"; @@ -500,6 +535,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"; @@ -571,6 +612,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"; @@ -660,7 +706,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { }; wxWindows = spdx { - spdxId = "WXwindows"; + spdxId = "wxWindows"; fullName = "wxWindows Library Licence, Version 3.1"; }; diff --git a/lib/lists.nix b/lib/lists.nix index 9ecd8f220038ee12d0b944daa79b2bc518b9d11c..be541427c2470ae1fc6c22d8f07052d70ac30409 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,6 +583,10 @@ 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 @@ -512,7 +595,11 @@ rec { 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 ] @@ -523,7 +610,7 @@ rec { 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]] @@ -534,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/meta.nix b/lib/meta.nix index 199030c103af58031ec8243193d324c0b391a8c6..2e83c4247ddfb9cb11a364087a08fb5015340292 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -41,16 +41,18 @@ rec { let x = builtins.parseDrvName name; in "${x.name}-${suffix}-${x.version}"); - /* Apply a function to each derivation and only to derivations in an attrset + /* Apply a function to each derivation and only to derivations in an attrset. */ mapDerivationAttrset = f: set: lib.mapAttrs (name: pkg: if lib.isDerivation pkg then (f pkg) else pkg) set; + /* Set the nix-env priority of the package. + */ + setPrio = priority: addMetaAttrs { inherit priority; }; /* Decrease the nix-env priority of the package, i.e., other versions/variants of the package will be preferred. */ - lowPrio = drv: addMetaAttrs { priority = 10; } drv; - + lowPrio = setPrio 10; /* Apply lowPrio to an attrset with derivations */ @@ -60,8 +62,7 @@ rec { /* Increase the nix-env priority of the package, i.e., this version/variant of the package will be preferred. */ - hiPrio = drv: addMetaAttrs { priority = -10; } drv; - + hiPrio = setPrio (-10); /* Apply hiPrio to an attrset with derivations */ diff --git a/lib/modules.nix b/lib/modules.nix index 5fb83a4a538ccd5cf08acaf02f41fbda3f8a0446..5c9d66d8f97b926e619f8bfdb2d4bf591f5f12c1 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -214,23 +214,25 @@ rec { qux = [ "module.hidden=baz,value=bar" "module.hidden=fli,value=gne" ]; } */ - byName = attr: f: modules: foldl' (acc: module: - foldl' (inner: name: - inner // { ${name} = (acc.${name} or []) ++ (f module module.${attr}.${name}); } - ) acc (attrNames module.${attr}) - ) {} modules; + byName = attr: f: modules: + foldl' (acc: module: + acc // (mapAttrs (n: v: + (acc.${n} or []) ++ f module v + ) module.${attr} + ) + ) {} modules; # an attrset 'name' => list of submodules that declare ‘name’. - declsByName = byName "options" - (module: option: [{ inherit (module) file; options = option; }]) - options; + declsByName = byName "options" (module: option: + [{ inherit (module) file; options = option; }] + ) options; # an attrset 'name' => list of submodules that define ‘name’. defnsByName = byName "config" (module: value: - map (config: { inherit (module) file; inherit config; }) (pushDownProperties value) + map (config: { inherit (module) file; inherit config; }) (pushDownProperties value) ) configs; # extract the definitions for each loc - defnsByName' = byName "config" - (module: value: [{ inherit (module) file; inherit value; }]) - configs; + defnsByName' = byName "config" (module: value: + [{ inherit (module) file; inherit value; }] + ) configs; in (flip mapAttrs declsByName (name: decls: # We're descending into attribute ‘name’. @@ -362,7 +364,6 @@ rec { values = defs'''; inherit (defs'') highestPrio; }; - defsFinal = defsFinal'.values; # Type-check the remaining definitions, and merge them. @@ -450,8 +451,7 @@ rec { filterOverrides' = defs: let - defaultPrio = 100; - getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio; + getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPriority; highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs; strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def; in { @@ -476,22 +476,8 @@ rec { optionSet to options of type submodule. FIXME: remove eventually. */ fixupOptionType = loc: opt: - let - options = opt.options or - (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); - f = tp: - let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet"); - in - if tp.name == "option set" || tp.name == "submodule" then - throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." - else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) - else if optionSetIn "loaOf" then types.loaOf (types.submodule options) - else if optionSetIn "listOf" then types.listOf (types.submodule options) - else if optionSetIn "nullOr" then types.nullOr (types.submodule options) - else tp; - in - if opt.type.getSubModules or null == null - then opt // { type = f (opt.type or types.unspecified); } + if opt.type.getSubModules or null == null + then opt // { type = opt.type or types.unspecified; } else opt // { type = opt.type.substSubModules opt.options; options = []; }; @@ -534,6 +520,8 @@ rec { mkBefore = mkOrder 500; mkAfter = mkOrder 1500; + # The default priority for things that don't have a priority specified. + defaultPriority = 100; # Convenient property used to transfer all definitions and their # properties from one option to another. This property is useful for @@ -556,8 +544,20 @@ rec { # mkAliasDefinitions = mkAliasAndWrapDefinitions id; mkAliasAndWrapDefinitions = wrap: option: - mkIf (isOption option && option.isDefined) (wrap (mkMerge option.definitions)); + mkAliasIfDef option (wrap (mkMerge option.definitions)); + + # Similar to mkAliasAndWrapDefinitions but copies over the priority from the + # option as well. + # + # If a priority is not set, it assumes a priority of defaultPriority. + mkAliasAndWrapDefsWithPriority = wrap: option: + let + prio = option.highestPrio or defaultPriority; + defsWithPrio = map (mkOverride prio) option.definitions; + in mkAliasIfDef option (wrap (mkMerge defsWithPrio)); + mkAliasIfDef = option: + mkIf (isOption option && option.isDefined); /* Compatibility. */ fixMergeModules = modules: args: evalModules { inherit modules args; check = false; }; @@ -690,7 +690,16 @@ rec { use = id; }; - doRename = { from, to, visible, warn, use }: + /* Like ‘mkAliasOptionModule’, but copy over the priority of the option as well. */ + mkAliasOptionModuleWithPriority = from: to: doRename { + inherit from to; + visible = true; + warn = false; + use = id; + withPriority = true; + }; + + doRename = { from, to, visible, warn, use, withPriority ? false }: { config, options, ... }: let fromOpt = getAttrFromPath from options; @@ -708,7 +717,9 @@ rec { warnings = optional (warn && fromOpt.isDefined) "The option `${showOption from}' defined in ${showFiles fromOpt.files} has been renamed to `${showOption to}'."; } - (mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt) + (if withPriority + then mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt + else mkAliasAndWrapDefinitions (setAttrByPath to) fromOpt) ]; }; diff --git a/lib/options.nix b/lib/options.nix index 01160b48ec01998ac665b7685cdbbecb1ba0627c..5cea99067aaba5e41d43bf7ecdc24711c17c9e07 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -8,33 +8,70 @@ 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, } @ 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 +111,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 +161,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 +176,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 704711b20cd9492b3cead39b0f73f6d86fe682cb..1a9f3f7d1f343b8a2b023f3394ecab30f1abefd3 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 0c4095bb55cdb16b3f69fc261b98664839f46a68..47c881cfbc7cc1cd32802c851029b940b5dbd69e 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -12,6 +12,8 @@ rec { /* Concatenate a list of strings. + Type: concatStrings :: [string] -> string + Example: concatStrings ["foo" "bar"] => "foobar" @@ -20,15 +22,19 @@ rec { /* Map a function over a list and concatenate the resulting strings. + Type: concatMapStrings :: (a -> string) -> [a] -> string + Example: concatMapStrings (x: "a" + x) ["foo" "bar"] => "afooabar" */ concatMapStrings = f: list: concatStrings (map f list); - /* Like `concatMapStrings' except that the f functions also gets the + /* Like `concatMapStrings` except that the f functions also gets the position as a parameter. + Type: concatImapStrings :: (int -> a -> string) -> [a] -> string + Example: concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"] => "1-foo2-bar" @@ -37,17 +43,25 @@ rec { /* Place an element between each element of a list + Type: intersperse :: a -> [a] -> [a] + Example: intersperse "/" ["usr" "local" "bin"] => ["usr" "/" "local" "/" "bin"]. */ - intersperse = separator: list: + intersperse = + # Separator to add between elements + separator: + # Input list + list: if list == [] || length list == 1 then list else tail (lib.concatMap (x: [separator x]) list); /* Concatenate a list of strings with a separator between each element + Type: concatStringsSep :: string -> [string] -> string + Example: concatStringsSep "/" ["usr" "local" "bin"] => "usr/local/bin" @@ -55,43 +69,77 @@ rec { concatStringsSep = builtins.concatStringsSep or (separator: list: concatStrings (intersperse separator list)); - /* First maps over the list and then concatenates it. + /* Maps a function over a list of strings and then concatenates the + result with the specified separator interspersed between + elements. + + Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string Example: concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"] => "FOO-BAR-BAZ" */ - concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list); + concatMapStringsSep = + # Separator to add between elements + sep: + # Function to map over the list + f: + # List of input strings + list: concatStringsSep sep (map f list); - /* First imaps over the list and then concatenates it. + /* Same as `concatMapStringsSep`, but the mapping function + additionally receives the position of its argument. - Example: + Type: concatMapStringsSep :: string -> (int -> string -> string) -> [string] -> string + Example: concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ] => "6-3-2" */ - concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap1 f list); + concatImapStringsSep = + # Separator to add between elements + sep: + # Function that receives elements and their positions + f: + # List of input strings + list: concatStringsSep sep (lib.imap1 f list); + + /* Construct a Unix-style, colon-separated search path consisting of + the given `subDir` appended to each of the given paths. - /* Construct a Unix-style search path consisting of each `subDir" - directory of the given list of packages. + 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 @@ -114,64 +162,80 @@ rec { */ makeBinPath = makeSearchPathOutput "bin" "bin"; - - /* 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" - */ - makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl"; - - /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB) - - Example: - pkgs = import { } - makeFullPerlPath [ pkgs.perlPackages.CGI ] - => "/nix/store/fddivfrdc1xql02h9q500fpnqy12c74n-perl-CGI-4.38/lib/perl5/site_perl:/nix/store/8hsvdalmsxqkjg0c5ifigpf31vc4vsy2-perl-HTML-Parser-3.72/lib/perl5/site_perl:/nix/store/zhc7wh0xl8hz3y3f71nhlw1559iyvzld-perl-HTML-Tagset-3.20/lib/perl5/site_perl" - */ - makeFullPerlPath = deps: makePerlPath (lib.misc.closePropagation deps); - /* 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 +244,8 @@ rec { Also note that Nix treats strings as a list of bytes and thus doesn't handle unicode. + Type: stringtoCharacters :: string -> [string] + Example: stringToCharacters "" => [ ] @@ -194,18 +260,25 @@ rec { /* Manipulate a string character by character and replace them by strings before concatenating the results. + Type: stringAsChars :: (string -> string) -> string -> string + Example: stringAsChars (x: if x == "a" then "i" else x) "nax" => "nix" */ - stringAsChars = f: s: - concatStrings ( + stringAsChars = + # Function to map over each individual character + f: + # Input string + s: concatStrings ( map f (stringToCharacters s) ); - /* Escape occurrence of the elements of ‘list’ in ‘string’ by + /* Escape occurrence of the elements of `list` in `string` by prefixing it with a backslash. + Type: escape :: [string] -> string -> string + Example: escape ["(" ")"] "(foo)" => "\\(foo\\)" @@ -214,6 +287,8 @@ rec { /* Quote string to be used safely within the Bourne shell. + Type: escapeShellArg :: string -> string + Example: escapeShellArg "esc'ape\nme" => "'esc'\\''ape\nme'" @@ -222,6 +297,8 @@ rec { /* Quote all arguments to be safely passed to the Bourne shell. + Type: escapeShellArgs :: [string] -> string + Example: escapeShellArgs ["one" "two three" "four'five"] => "'one' 'two three' 'four'\\''five'" @@ -230,13 +307,15 @@ rec { /* Turn a string into a Nix expression representing that string + Type: string -> string + Example: escapeNixString "hello\${}\n" => "\"hello\\\${}\\n\"" */ escapeNixString = s: escape ["$"] (builtins.toJSON s); - /* Obsolete - use replaceStrings instead. */ + # Obsolete - use replaceStrings instead. replaceChars = builtins.replaceStrings or ( del: new: s: let @@ -256,6 +335,8 @@ rec { /* Converts an ASCII string to lower-case. + Type: toLower :: string -> string + Example: toLower "HOME" => "home" @@ -264,6 +345,8 @@ rec { /* Converts an ASCII string to upper-case. + Type: toUpper :: string -> string + Example: toUpper "home" => "HOME" @@ -273,7 +356,7 @@ rec { /* Appends string context from another string. This is an implementation detail of Nix. - Strings in Nix carry an invisible `context' which is a list of strings + Strings in Nix carry an invisible `context` which is a list of strings representing store paths. If the string is later used in a derivation attribute, the derivation will properly populate the inputDrvs and inputSrcs. @@ -319,8 +402,9 @@ rec { in recurse 0 0; - /* Return the suffix of the second argument if the first argument matches - its prefix. + /* Return a string without the specified prefix, if the prefix matches. + + Type: string -> string -> string Example: removePrefix "foo." "foo.bar.baz" @@ -328,18 +412,23 @@ rec { removePrefix "xxx" "foo.bar.baz" => "foo.bar.baz" */ - removePrefix = pre: s: + removePrefix = + # Prefix to remove if it matches + prefix: + # Input string + str: let - preLen = stringLength pre; - sLen = stringLength s; + preLen = stringLength prefix; + sLen = stringLength str; in - if hasPrefix pre s then - substring preLen (sLen - preLen) s + if hasPrefix prefix str then + substring preLen (sLen - preLen) str else - s; + str; + + /* Return a string without the specified suffix, if the suffix matches. - /* Return the prefix of the second argument if the first argument matches - its suffix. + Type: string -> string -> string Example: removeSuffix "front" "homefront" @@ -347,17 +436,21 @@ rec { removeSuffix "xxx" "homefront" => "homefront" */ - removeSuffix = suf: s: + removeSuffix = + # Suffix to remove if it matches + suffix: + # Input string + str: let - sufLen = stringLength suf; - sLen = stringLength s; + sufLen = stringLength suffix; + sLen = stringLength str; in - if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then - substring 0 (sLen - sufLen) s + if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then + substring 0 (sLen - sufLen) str else - s; + str; - /* Return true iff string v1 denotes a version older than v2. + /* Return true if string v1 denotes a version older than v2. Example: versionOlder "1.1" "1.2" @@ -367,7 +460,7 @@ rec { */ versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1; - /* Return true iff string v1 denotes a version equal to or newer than v2. + /* Return true if string v1 denotes a version equal to or newer than v2. Example: versionAtLeast "1.1" "1.0" @@ -459,6 +552,11 @@ rec { /* Create a fixed width string with additional prefix to match required width. + This function will fail if the input string is longer than the + requested length. + + Type: fixedWidthString :: int -> string -> string + Example: fixedWidthString 5 "0" (toString 15) => "00015" @@ -502,12 +600,16 @@ rec { => false */ isStorePath = x: - isCoercibleToString x - && builtins.substring 0 1 (toString x) == "/" - && dirOf 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" @@ -517,17 +619,18 @@ rec { toInt "3.14" => error: floating point JSON numbers are not supported */ + # Obviously, it is a bit hacky to use fromJSON this way. toInt = str: let may_be_int = builtins.fromJSON str; in if builtins.isInt may_be_int then may_be_int else throw "Could not convert ${str} to int."; - /* Read a list of paths from `file', relative to the `rootPath'. Lines - beginning with `#' are treated as comments and ignored. Whitespace - is significant. + /* Read a list of paths from `file`, relative to the `rootPath`. + Lines beginning with `#` are treated as comments and ignored. + Whitespace is significant. - NOTE: this function is not performant and should be avoided + NOTE: This function is not performant and should be avoided. Example: readPathsFromFile /prefix @@ -549,6 +652,8 @@ rec { /* 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 5eacc9eb23e11277e7f59bd76533b005f4b5e527..77f200952958bb923b0866604c552d5c8b531c05 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,66 @@ 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"; + "wasm" = "Wasm"; + }.${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.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 a00165db171603477c96e0399402276a3ade9232..58677c0bdd90089ba0b22a0490540647e988ae50 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 3828b2f84c6491ad608ed2f3c480a646eb4492ef..ac1633a1a15f655cd7d7259a73ea6ff339e7c303 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; }; @@ -40,7 +47,7 @@ rec { armv5te-android-prebuilt = rec { config = "armv5tel-unknown-linux-androideabi"; sdkVer = "21"; - ndkVer = "10e"; + ndkVer = "18b"; platform = platforms.armv5te-android; useAndroidPrebuilt = true; }; @@ -48,7 +55,7 @@ rec { armv7a-android-prebuilt = rec { config = "armv7a-unknown-linux-androideabi"; sdkVer = "24"; - ndkVer = "17"; + ndkVer = "18b"; platform = platforms.armv7a-android; useAndroidPrebuilt = true; }; @@ -56,7 +63,7 @@ rec { aarch64-android-prebuilt = rec { config = "aarch64-unknown-linux-android"; sdkVer = "24"; - ndkVer = "17"; + ndkVer = "18b"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; }; @@ -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 65f560328af536b764142e7eb769661d49d78b7a..e35e7b4a1ec7bdbc7acbdf33c27dc1686b013590 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -9,7 +9,8 @@ let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis rec { patterns = rec { isi686 = { cpu = cpuTypes.i686; }; - isx86_64 = { cpu = cpuTypes.x86_64; }; + isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; + isx86_64 = { cpu = { family = "x86"; bits = 64; }; }; isPowerPC = { cpu = cpuTypes.powerpc; }; isPower = { cpu = { family = "power"; }; }; isx86 = { cpu = { family = "x86"; }; }; @@ -19,6 +20,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 bb26c93f3d7aa774e1664217b4fce5a14242d0c6..6947d41419e349663d9927a44a895ed5ff3d7ce6 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,20 @@ 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"; } + # MSVC ought to be the default ABI so this case isn't needed. But then it + # becomes difficult to handle the gnu* variants for Aarch32 correctly for + # minGW. So it's easier to make gnu* the default for the MinGW, but + # hack-in MSVC for the non-MinGW case right here. + else if elemAt l 1 == "windows" + then { cpu = elemAt l 0; kernel = "windows"; abi = "msvc"; } + 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" @@ -265,9 +294,11 @@ rec { else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu") then { cpu = elemAt l 0; kernel = elemAt l 1; abi = elemAt l 2; } else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window - then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; } + then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; } 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)} @@ -299,13 +330,12 @@ rec { else getKernel args.kernel; abi = /**/ if args ? abi then getAbi args.abi - else if isLinux parsed then + else if isLinux parsed || isWindows parsed then if isAarch32 parsed then if lib.versionAtLeast (parsed.cpu.version or "0") "6" then abis.gnueabihf else abis.gnueabi else abis.gnu - else if isWindows parsed then abis.gnu else abis.unknown; }; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 56783d99e3d43fc7a8b2af1200cb0849f5cdb91a..03bfce256103cac171de1ab090e5739c9c3d5f4a 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -467,10 +467,13 @@ rec { }; selectBySystem = system: { + "i486-linux" = pc32; + "i586-linux" = pc32; "i686-linux" = pc32; "x86_64-linux" = pc64; "armv5tel-linux" = sheevaplug; "armv6l-linux" = raspberrypi; + "armv7a-linux" = armv7l-hf-multiplatform; "armv7l-linux" = armv7l-hf-multiplatform; "aarch64-linux" = aarch64-multiplatform; "mipsel-linux" = fuloong2f_n32; diff --git a/lib/tests/check-eval.nix b/lib/tests/check-eval.nix new file mode 100644 index 0000000000000000000000000000000000000000..8bd7b605a39bdad6d8ad632591a571b31ae30b95 --- /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 d3bd7746d89c2fc6ddd495e87136939682e3c252..d8f412d3fc49ae4a94faca0ab59903e45d5776c0 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 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,6 +369,7 @@ runTests { testToPretty = { expr = mapAttrs (const (generators.toPretty {})) rec { int = 42; + float = 0.1337; bool = true; string = ''fno"rd''; path = /. + "/foo"; @@ -367,6 +382,7 @@ runTests { }; expected = rec { int = "42"; + float = "~0.133700"; bool = "true"; string = ''"fno\"rd"''; path = "/foo"; @@ -385,42 +401,4 @@ runTests { expected = "«foo»"; }; - -# MISC - - testOverridableDelayableArgsTest = { - expr = - let res1 = defaultOverridableDelayableArgs id {}; - res2 = defaultOverridableDelayableArgs id { a = 7; }; - res3 = let x = defaultOverridableDelayableArgs id { a = 7; }; - in (x.merge) { b = 10; }; - res4 = let x = defaultOverridableDelayableArgs id { a = 7; }; - in (x.merge) ( x: { b = 10; }); - res5 = let x = defaultOverridableDelayableArgs id { a = 7; }; - in (x.merge) ( x: { a = builtins.add x.a 3; }); - res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; }; - y = x.merge {}; - in (y.merge) { a = 10; }; - - resRem7 = res6.replace (a: removeAttrs a ["a"]); - - # fixed tests (delayed args): (when using them add some comments, please) - resFixed1 = - let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; }); - y = x.merge (x: { name = "name-${builtins.toString x.fixed.c}"; }); - in (y.merge) { b = 10; }; - strip = attrs: removeAttrs attrs ["merge" "replace"]; - in all id - [ ((strip res1) == { }) - ((strip res2) == { a = 7; }) - ((strip res3) == { a = 7; b = 10; }) - ((strip res4) == { a = 7; b = 10; }) - ((strip res5) == { a = 10; }) - ((strip res6) == { a = 17; }) - ((strip resRem7) == {}) - ((strip resFixed1) == { a = 7; b = 10; c =10; name = "name-10"; }) - ]; - expected = true; - }; - } diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index b83e1eb7d82d01bc228d9af375be0e49204ef506..a72777cbf2a685c733ae985c5442ba3b1a878b87 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -149,6 +149,12 @@ checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.ni # Check loaOf with many merges of lists. checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix +# Check mkAliasOptionModuleWithPriority. +checkConfigOutput "true" config.enable ./alias-with-priority.nix +checkConfigOutput "true" config.enableAlias ./alias-with-priority.nix +checkConfigOutput "false" config.enable ./alias-with-priority-can-override.nix +checkConfigOutput "false" config.enableAlias ./alias-with-priority-can-override.nix + cat < 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” */ @@ -53,27 +67,40 @@ rec { 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 - /* 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; - } + # 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. - 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 4e44e7521c4b63fa4b0fe334812ee2fdf281272c..7a88e1b9e36bec31e27f839277d24306f2d57cf1 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -169,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"; @@ -194,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) // { @@ -278,8 +284,7 @@ rec { (mergeDefinitions (loc ++ [name]) elemType defs).optionalValue ) # Push down position info. - (map (def: listToAttrs (mapAttrsToList (n: def': - { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs))); + (map (def: mapAttrs (n: v: { inherit (def) file; value = v; }) def.value) defs))); getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); getSubModules = elemType.getSubModules; substSubModules = m: attrsOf (elemType.substSubModules m); @@ -464,10 +469,7 @@ rec { # Obsolete alternative to configOf. It takes its option # declarations from the ‘options’ attribute of containing option # declaration. - optionSet = mkOptionType { - name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "optionSet"; - description = "option set"; - }; + optionSet = builtins.throw "types.optionSet is deprecated; use types.submodule instead" "optionSet"; # Augment the given type with an additional type check function. addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ce53b261978182a9615465d4efc907e1e3b2ffcc..eac01aee5584b0ff75c4372fdc0d9afc823d6006 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1,23 +1,48 @@ /* List of NixOS maintainers. handle = { - name = "Real name"; + # Required + name = "Your name"; email = "address@example.org"; + + # Optional github = "GithubUsername"; + keys = [{ + longkeyid = "rsa2048/0x0123456789ABCDEF"; + fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; + }]; }; - where `name` is your real name, `email` is your maintainer email - address and `github` is your GitHub handle (as it appears in the - URL of your profile page, `https://github.com/`). - address - The only required fields are `name` and `email`. + where + + - `handle` is the handle you are going to use in nixpkgs expressions, + - `name` is your, preferably real, name, + - `email` is your maintainer email address, and + - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/`), + - `keys` is a list of your PGP/GPG key IDs and fingerprints. + + `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. + + Add PGP/GPG keys only if you actually use them to sign commits and/or mail. + + To get the required PGP/GPG values for a key run + ```shell + gpg --keyid-format 0xlong --fingerprint | head -n 2 + ``` + + !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth. + More fields may be added in the future. Please keep the list alphabetically sorted. - See `../maintainers/scripts/check-maintainer-github-handles.sh` - for an example on how to work with this data. + See `./scripts/check-maintainer-github-handles.sh` 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"; @@ -43,6 +68,11 @@ github = "abbradar"; name = "Nikolay Amiantov"; }; + abhi18av = { + email = "abhi18av@gmail.com"; + github = "abhi18av"; + name = "Abhinav Sharma"; + }; abigailbuccaneer = { email = "abigailbuccaneer@gmail.com"; github = "abigailbuccaneer"; @@ -68,6 +98,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 +173,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 +193,11 @@ github = "alexanderkjeldaas"; name = "Alexander Kjeldaas"; }; + akavel = { + email = "czapkofan@gmail.com"; + github = "akavel"; + name = "Mateusz Czapliński"; + }; akaWolf = { email = "akawolf0@gmail.com"; github = "akaWolf"; @@ -196,11 +241,21 @@ email = "nix-commits@lists.science.uu.nl"; name = "Nix Committers"; }; + allonsy = { + email = "linuxbash8@gmail.com"; + github = "allonsy"; + name = "Alec Snyder"; + }; alunduil = { - email = "alunduil@alunduil.com"; + email = "alunduil@gmail.com"; 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 +271,11 @@ github = "amiloradovsky"; name = "Andrew Miloradovsky"; }; + aminb = { + email = "amin@aminb.org"; + github = "aminb"; + name = "Amin Bandali"; + }; aminechikhaoui = { email = "amine.chikhaoui91@gmail.com"; github = "AmineChikhaoui"; @@ -226,6 +286,11 @@ github = "AndrewMorsillo"; name = "Andrew Morsillo"; }; + andersk = { + email = "andersk@mit.edu"; + github = "andersk"; + name = "Anders Kaseorg"; + }; AndersonTorres = { email = "torres.anderson.85@protonmail.com"; github = "AndersonTorres"; @@ -306,6 +371,11 @@ github = "apeyroux"; name = "Alexandre Peyroux"; }; + ar1a = { + email = "aria@ar1as.space"; + github = "ar1a"; + name = "Aria Edmonds"; + }; arcadio = { email = "arc@well.ox.ac.uk"; github = "arcadio"; @@ -356,6 +426,11 @@ github = "asppsa"; name = "Alastair Pharo"; }; + astro = { + email = "astro@spaceboyz.net"; + github = "astro"; + name = "Astro"; + }; astsmtl = { email = "astsmtl@yandex.ru"; github = "astsmtl"; @@ -371,11 +446,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"; @@ -415,6 +510,11 @@ github = "bandresen"; name = "Benjamin Andresen"; }; + baracoder = { + email = "baracoder@googlemail.com"; + github = "baracoder"; + name = "Herman Fries"; + }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; @@ -470,6 +570,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 +605,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 +689,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"; @@ -594,6 +709,11 @@ github = "bstrik"; name = "Berno Strik"; }; + buffet = { + email = "niclas@countingsort.com"; + github = "buffet"; + name = "Niclas Meyer"; + }; bugworm = { email = "bugworm@zoho.com"; github = "bugworm"; @@ -633,6 +753,11 @@ github = "campadrenalin"; name = "Philip Horger"; }; + candeira = { + email = "javier@candeira.com"; + github = "candeira"; + name = "Javier Candeira"; + }; canndrew = { email = "shum@canndrew.org"; github = "canndrew"; @@ -668,6 +793,11 @@ github = "caugner"; name = "Claas Augner"; }; + cbley = { + email = "claudio.bley@gmail.com"; + github = "avdv"; + name = "Claudio Bley"; + }; cdepillabout = { email = "cdep.illabout@gmail.com"; github = "cdepillabout"; @@ -678,6 +808,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 +837,11 @@ github = "ChengCat"; name = "Yucheng Zhang"; }; + chessai = { + email = "chessai1996@gmail.com"; + github = "chessai"; + name = "Daniel Cartwright"; + }; chiiruno = { email = "okinan@protonmail.com"; github = "chiiruno"; @@ -767,6 +907,11 @@ github = "cko"; name = "Christine Koppelt"; }; + clacke = { + email = "claes.wallin@greatsinodevelopment.com"; + github = "clacke"; + name = "Claes Wallin"; + }; cleverca22 = { email = "cleverca22@gmail.com"; github = "cleverca22"; @@ -837,11 +982,6 @@ github = "couchemar"; name = "Andrey Pavlov"; }; - countingsort = { - email = "niclas@countingsort.com"; - github = "countingsort"; - name = "Niclas Meyer"; - }; cpages = { email = "page@ruiec.cat"; github = "cpages"; @@ -912,6 +1052,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 +1101,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 +1260,11 @@ github = "dtzWill"; name = "Will Dietz"; }; + dysinger = { + email = "tim@dysinger.net"; + github = "dysinger"; + name = "Tim Dysinger"; + }; dywedir = { email = "dywedir@protonmail.ch"; github = "dywedir"; @@ -1130,6 +1285,11 @@ github = "eadwu"; name = "Edmund Wu"; }; + eamsden = { + email = "edward@blackriversoft.com"; + github = "eamsden"; + name = "Edward Amsden"; + }; earldouglas = { email = "james@earldouglas.com"; github = "earldouglas"; @@ -1155,6 +1315,11 @@ github = "edef1c"; name = "edef"; }; + embr = { + email = "hi@liclac.eu"; + github = "liclac"; + name = "embr"; + }; ederoyd46 = { email = "matt@ederoyd.co.uk"; github = "ederoyd46"; @@ -1165,6 +1330,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 +1394,16 @@ github = "ellis"; name = "Ellis Whitehead"; }; + elohmeier = { + email = "elo-nixos@nerdworks.de"; + github = "elohmeier"; + name = "Enno Lohmeier"; + }; + elseym = { + email = "elseym@me.com"; + github = "elseym"; + name = "Simon Waibl"; + }; elvishjerricco = { email = "elvishjerricco@gmail.com"; github = "ElvishJerricco"; @@ -1277,6 +1457,10 @@ email = "justin.humm@posteo.de"; github = "erictapen"; name = "Justin Humm"; + keys = [{ + longkeyid = "rsa4096/0x438871E000AA178E"; + fingerprint = "984E 4BAD 9127 4D0E AE47 FF03 4388 71E0 00AA 178E"; + }]; }; erikryb = { email = "erik.rybakken@math.ntnu.no"; @@ -1306,6 +1490,15 @@ email = "elis@hirwing.se"; github = "etu"; name = "Elis Hirwing"; + keys = [{ + longkeyid = "rsa4096/0xD57EFA625C9A925F"; + fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; + }]; + }; + evck = { + email = "eric@evenchick.com"; + github = "ericevenchick"; + name = "Eric Evenchick"; }; exfalso = { email = "0slemi0@gmail.com"; @@ -1327,6 +1520,16 @@ github = "expipiplus1"; name = "Joe Hermaszewski"; }; + eyjhb = { + email = "eyjhbb@gmail.com"; + github = "eyJhb"; + name = "eyJhb"; + }; + f--t = { + email = "git@f-t.me"; + github = "f--t"; + name = "f--t"; + }; f-breidenstein = { email = "mail@felixbreidenstein.de"; github = "f-breidenstein"; @@ -1353,7 +1556,7 @@ name = "Felipe Espinoza"; }; fgaz = { - email = "francygazz@gmail.com"; + email = "fgaz@fgaz.me"; github = "fgaz"; name = "Francesco Gazzetta"; }; @@ -1442,15 +1645,30 @@ 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"; }; + fusion809 = { + email = "brentonhorne77@gmail.com"; + github = "fusion809"; + name = "Brenton Horne"; + }; fuuzetsu = { email = "fuuzetsu@fuuzetsu.co.uk"; 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"; @@ -1585,6 +1803,11 @@ github = "dguibert"; name = "David Guibert"; }; + groodt = { + email = "groodt@gmail.com"; + github = "groodt"; + name = "Greg Roodt"; + }; guibou = { email = "guillaum.bouchard@gmail.com"; github = "guibou"; @@ -1610,6 +1833,21 @@ github = "hamhut1066"; name = "Hamish Hutchings"; }; + hansjoergschurr = { + email = "commits@schurr.at"; + github = "hansjoergschurr"; + name = "Hans-Jörg Schurr"; + }; + HaoZeke = { + email = "r95g10@gmail.com"; + github = "haozeke"; + name = "Rohit Goswami"; + }; + haslersn = { + email = "haslersn@fius.informatik.uni-stuttgart.de"; + github = "haslersn"; + name = "Sebastian Hasler"; + }; havvy = { email = "ryan.havvy@gmail.com"; github = "havvy"; @@ -1664,6 +1902,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"; @@ -1724,6 +1967,11 @@ github = "ikervagyok"; name = "Balázs Lengyel"; }; + ilikeavocadoes = { + email = "ilikeavocadoes@hush.com"; + github = "ilikeavocadoes"; + name = "Lassi Haasio"; + }; illegalprime = { email = "themichaeleden@gmail.com"; github = "illegalprime"; @@ -1754,15 +2002,34 @@ github = "infinisil"; name = "Silvan Mosberger"; }; + ingenieroariel = { + email = "ariel@nunez.co"; + github = "ingenieroariel"; + name = "Ariel Nunez"; + }; ironpinguin = { email = "michele@catalano.de"; github = "ironpinguin"; name = "Michele Catalano"; }; + ivan = { + email = "ivan@ludios.org"; + github = "ivan"; + name = "Ivan Kozik"; + }; ivan-tkatchev = { email = "tkatchev@gmail.com"; name = "Ivan Tkatchev"; }; + ivegotasthma = { + email = "ivegotasthma@protonmail.com"; + github = "ivegotasthma"; + name = "John Doe"; + keys = [{ + longkeyid = "rsa4096/09AC52AEA87817A4"; + fingerprint = "4008 2A5B 56A4 79B9 83CB 95FD 09AC 52AE A878 17A4"; + }]; + }; ixmatus = { email = "parnell@digitalmentat.com"; github = "ixmatus"; @@ -1788,6 +2055,16 @@ github = "jagajaga"; name = "Arseniy Seroka"; }; + jakelogemann = { + email = "jake.logemann@gmail.com"; + github = "jakelogemann"; + name = "Jake Logemann"; + }; + jakewaksbaum = { + email = "jake.waksbaum@gmail.com"; + github = "jbaum98"; + name = "Jake Waksbaum"; + }; jammerful = { email = "jammerful@gmail.com"; github = "jammerful"; @@ -1832,6 +2109,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 +2129,11 @@ github = "jerith666"; name = "Matt McHenry"; }; + jeschli = { + email = "jeschli@gmail.com"; + github = "jeschli"; + name = "Markus Hihn"; + }; jethro = { email = "jethrokuan95@gmail.com"; github = "jethrokuan"; @@ -1892,6 +2179,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"; @@ -1907,6 +2199,11 @@ github = "jluttine"; name = "Jaakko Luttinen"; }; + jmagnusj = { + email = "jmagnusj@gmail.com"; + github = "magnusjonsson"; + name = "Johan Magnus Jonsson"; + }; jmettes = { email = "jonathan@jmettes.com"; github = "jmettes"; @@ -1990,6 +2287,11 @@ github = "joncojonathan"; name = "Jonathan Haddock"; }; + jorsn = { + name = "Johannes Rosenberger"; + email = "johannes@jorsn.eu"; + github = "jorsn"; + }; jpdoyle = { email = "joethedoyle@gmail.com"; github = "jpdoyle"; @@ -2103,6 +2405,11 @@ github = "kiloreux"; name = "Kiloreux Emperex"; }; + kimburgess = { + email = "kim@acaprojects.com"; + github = "kimburgess"; + name = "Kim Burgess"; + }; kini = { email = "keshav.kini@gmail.com"; github = "kini"; @@ -2113,11 +2420,20 @@ github = "kirelagin"; name = "Kirill Elagin"; }; + kisonecat = { + email = "kisonecat@gmail.com"; + github = "kisonecat"; + name = "Jim Fowler"; + }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; }; - + klntsky = { + email = "klntsky@gmail.com"; + name = "Vladimir Kalnitsky"; + github = "8084"; + }; kmeakin = { email = "karlwfmeakin@gmail.com"; name = "Karl Meakin"; @@ -2129,6 +2445,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"; @@ -2159,6 +2480,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"; @@ -2299,6 +2625,11 @@ github = "listx"; name = "Linus Arver"; }; + lionello = { + email = "lio@lunesu.com"; + github = "lionello"; + name = "Lionello Lunesu"; + }; lluchs = { email = "lukas.werling@gmail.com"; github = "lluchs"; @@ -2402,6 +2733,11 @@ github = "ma27"; name = "Maximilian Bosch"; }; + ma9e = { + email = "sean@lfo.team"; + github = "ma9e"; + name = "Sean Haugh"; + }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; @@ -2536,6 +2872,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"; @@ -2561,6 +2902,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"; @@ -2570,6 +2916,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"; @@ -2579,11 +2930,21 @@ email = "code@klandest.in"; github = "mguentner"; name = "Maximilian Güntner"; + }; + mhaselsteiner = { + email = "magdalena.haselsteiner@gmx.at"; + github = "mhaselsteiner"; + name = "Magdalena Haselsteiner"; }; mic92 = { email = "joerg@thalheim.io"; github = "mic92"; name = "Jörg Thalheim"; + keys = [{ + # compare with https://keybase.io/Mic92 + longkeyid = "rsa4096/0x003F2096411B5F92"; + fingerprint = "3DEE 1C55 6E1C 3DC5 54F5 875A 003F 2096 411B 5F92"; + }]; }; michaelpj = { email = "michaelpj@gmail.com"; @@ -2813,6 +3174,11 @@ github = "muflax"; name = "Stefan Dorn"; }; + mvnetbiz = { + email = "mvnetbiz@gmail.com"; + github = "mvnetbiz"; + name = "Matt Votava"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "myrl"; @@ -2823,6 +3189,11 @@ github = "nadrieril"; name = "Nadrieril Feneanar"; }; + nalbyuites = { + email = "ashijit007@gmail.com"; + github = "nalbyuites"; + name = "Ashijit Pramanik"; + }; namore = { email = "namor@hemio.de"; github = "namore"; @@ -2867,6 +3238,16 @@ github = "nequissimus"; name = "Tim Steinbach"; }; + netixx = { + email = "dev.espinetfrancois@gmail.com"; + github = "netixx"; + name = "François Espinet"; + }; + nikitavoloboev = { + email = "nikita.voloboev@gmail.com"; + github = "nikitavoloboev"; + name = "Nikita Voloboev"; + }; nfjinjing = { email = "nfjinjing@gmail.com"; github = "nfjinjing"; @@ -2976,6 +3357,11 @@ github = "nyarly"; name = "Judson Lester"; }; + nzhang-zh = { + email = "n.zhang.hp.au@gmail.com"; + github = "nzhang-zh"; + name = "Ning Zhang"; + }; obadz = { email = "obadz-nixos@obadz.com"; github = "obadz"; @@ -2992,7 +3378,7 @@ name = "Oliver Dunkl"; }; offline = { - email = "jakahudoklin@gmail.com"; + email = "jaka@x-truder.net"; github = "offlinehacker"; name = "Jaka Hudoklin"; }; @@ -3020,6 +3406,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"; @@ -3049,12 +3440,26 @@ email = "oxij@oxij.org"; github = "oxij"; name = "Jan Malakhovski"; + keys = [{ + longkeyid = "rsa2048/0x0E6CA66E5C557AA8"; + fingerprint = "514B B966 B46E 3565 0508 86E8 0E6C A66E 5C55 7AA8"; + }]; }; oyren = { email = "m.scheuren@oyra.eu"; 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"; @@ -3120,6 +3525,11 @@ github = "pesterhazy"; name = "Paulus Esterhazy"; }; + petabyteboy = { + email = "me@pbb.lc"; + github = "petabyteboy"; + name = "Milan Pässler"; + }; peterhoeg = { email = "peter@hoeg.com"; github = "peterhoeg"; @@ -3199,6 +3609,11 @@ github = "pkmx"; name = "Chih-Mao Chen"; }; + plchldr = { + email = "mail@oddco.de"; + github = "plchldr"; + name = "Jonas Beyer"; + }; plcplc = { email = "plcplc@gmail.com"; github = "plcplc"; @@ -3229,6 +3644,11 @@ github = "pmyjavec"; name = "Pauly Myjavec"; }; + pnelson = { + email = "me@pnelson.ca"; + github = "pnelson"; + name = "Philip Nelson"; + }; pneumaticat = { email = "kevin@potatofrom.space"; github = "pneumaticat"; @@ -3253,6 +3673,14 @@ email = "dev.primeos@gmail.com"; github = "primeos"; name = "Michael Weiss"; + keys = [ + { longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only + fingerprint = "86A7 4A55 07D0 58D1 322E 37FD 1308 26A6 C2A3 89FD"; + } + { longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc. + fingerprint = "AF85 991C C950 49A2 4205 1933 BCA9 943D D1DF 4C04"; + } + ]; }; Profpatsch = { email = "mail@profpatsch.de"; @@ -3264,6 +3692,11 @@ github = "proglodyte"; name = "Proglodyte"; }; + prusnak = { + email = "stick@gk2.sk"; + github = "prusnak"; + name = "Pavol Rusnak"; + }; pshendry = { email = "paul@pshendry.com"; github = "pshendry"; @@ -3285,9 +3718,14 @@ }; psyanticy = { email = "iuns@outlook.fr"; - github = "Assassinkin"; + github = "PsyanticY"; name = "Psyanticy"; }; + ptival = { + email = "valentin.robert.42@gmail.com"; + github = "Ptival"; + name = "Valentin Robert"; + }; puffnfresh = { email = "brian@brianmckenna.org"; github = "puffnfresh"; @@ -3316,6 +3754,10 @@ email = "hi@alyssa.is"; github = "alyssais"; name = "Alyssa Ross"; + keys = [{ + longkeyid = "rsa4096/736CCDF9EF51BD97"; + fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; + }]; }; ragge = { email = "r.dahlen@gmail.com"; @@ -3521,6 +3963,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"; @@ -3636,11 +4083,30 @@ github = "sauyon"; name = "Sauyon Lee"; }; + sb0 = { + email = "sb@m-labs.hk"; + github = "sbourdeauducq"; + name = "Sébastien Bourdeauducq"; + }; + 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"; name = "Fabian Schmitthenner"; }; + schmittlauch = { + email = "t.schmittlauch+nixos@orlives.de"; + github = "schmittlauch"; + }; schneefux = { email = "schneefux+nixos_pkg@schneefux.xyz"; github = "schneefux"; @@ -3660,6 +4126,11 @@ github = "scolobb"; name = "Sergiu Ivanov"; }; + screendriver = { + email = "nix@echooff.de"; + github = "screendriver"; + name = "Christian Rackerseder"; + }; Scriptkiddi = { email = "nixos@scriptkiddi.de"; github = "scriptkiddi"; @@ -3700,6 +4171,11 @@ github = "seppeljordan"; name = "Sebastian Jordan"; }; + seqizz = { + email = "seqizz@gmail.com"; + github = "seqizz"; + name = "Gurkan Gur"; + }; sfrijters = { email = "sfrijters@gmail.com"; github = "sfrijters"; @@ -3735,6 +4211,11 @@ github = "shlevy"; name = "Shea Levy"; }; + shou = { + email = "x+g@shou.io"; + github = "Shou"; + name = "Benedict Aas"; + }; siddharthist = { email = "langston.barrett@gmail.com"; github = "siddharthist"; @@ -3770,6 +4251,11 @@ github = "sjagoe"; name = "Simon Jagoe"; }; + sjau = { + email = "nixos@sjau.ch"; + github = "sjau"; + name = "Stephan Jau"; + }; sjmackenzie = { email = "setori88@gmail.com"; github = "sjmackenzie"; @@ -3797,6 +4283,10 @@ email = "sebastien.maret@icloud.com"; github = "smaret"; name = "Sébastien Maret"; + keys = [{ + longkeyid = "rsa4096/0x86E30E5A0F5FC59C"; + fingerprint = "4242 834C D401 86EF 8281 4093 86E3 0E5A 0F5F C59C"; + }]; }; smironov = { email = "grrwlf@gmail.com"; @@ -3838,6 +4328,11 @@ github = "spacefrogg"; name = "Michael Raitza"; }; + spacekookie = { + email = "kookie@spacekookie.de"; + github = "spacekookie"; + name = "Katharina Fey"; + }; spencerjanssen = { email = "spencerjanssen@gmail.com"; github = "spencerjanssen"; @@ -3973,6 +4468,20 @@ github = "sztupi"; name = "Attila Sztupak"; }; + t184256 = { + email = "monk@unboiled.info"; + github = "t184256"; + name = "Alexander Sosedkin"; + }; + tadeokondrak = { + email = "me@tadeo.ca"; + github = "tadeokondrak"; + name = "Tadeo Kondrak"; + keys = [{ + longkeyid = "ed25519/0xFBE607FCC49516D3"; + fingerprint = "0F2B C0C7 E77C 5B42 AC5B 4C18 FBE6 07FC C495 16D3"; + }]; + }; tadfisher = { email = "tadfisher@gmail.com"; github = "tadfisher"; @@ -4013,6 +4522,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"; @@ -4028,10 +4547,10 @@ github = "tazjin"; name = "Vincent Ambo"; }; - TealG = { - email = "~@Teal.Gr"; - github = "TealG"; - name = "Teal Gaure"; + tbenst = { + email = "nix@tylerbenster.com"; + github = "tbenst"; + name = "Tyler Benster"; }; teh = { email = "tehunger@gmail.com"; @@ -4058,6 +4577,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"; @@ -4169,7 +4693,7 @@ name = "Thomas Bereknyei"; }; tomsmeets = { - email = "tom@tsmeets.nl"; + email = "tom.tsmeets@gmail.com"; github = "tomsmeets"; name = "Tom Smeets"; }; @@ -4213,7 +4737,7 @@ name = "Thomas Tuegel"; }; tv = { - email = "tv@shackspace.de"; + email = "tv@krebsco.de"; github = "4z3"; name = "Tomislav Viljetić"; }; @@ -4262,6 +4786,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"; @@ -4372,6 +4901,11 @@ github = "vklquevs"; name = "vklquevs"; }; + vlaci = { + email = "laszlo.vasko@outlook.com"; + github = "vlaci"; + name = "László Vaskó"; + }; vlstill = { email = "xstill@fi.muni.cz"; github = "vlstill"; @@ -4406,6 +4940,11 @@ github = "vrthra"; name = "Rahul Gopinath"; }; + vskilet = { + email = "victor@sene.ovh"; + github = "vskilet"; + name = "Victor SENE"; + }; vyp = { email = "elisp.vim@gmail.com"; github = "vyp"; @@ -4448,11 +4987,6 @@ github = "wjlroe"; name = "William Roe"; }; - wkennington = { - email = "william@wkennington.com"; - github = "wkennington"; - name = "William A. Kennington III"; - }; wmertens = { email = "Wout.Mertens@gmail.com"; github = "wmertens"; @@ -4483,6 +5017,11 @@ github = "wucke13"; name = "Wucke"; }; + wykurz = { + email = "wykurz@gmail.com"; + github = "wykurz"; + name = "Mateusz Wykurz"; + }; wyvie = { email = "elijahrum@gmail.com"; github = "wyvie"; @@ -4544,7 +5083,7 @@ name = "Dmitry V."; }; yegortimoshenko = { - email = "yegortimoshenko@gmail.com"; + email = "yegortimoshenko@riseup.net"; github = "yegortimoshenko"; name = "Yegor Timoshenko"; }; @@ -4593,6 +5132,11 @@ github = "maggesi"; name = "Marco Maggesi"; }; + zachcoyle = { + email = "zach.coyle@gmail.com"; + github = "zachcoyle"; + name = "Zach Coyle"; + }; zagy = { email = "cz@flyingcircus.io"; github = "zagy"; @@ -4603,6 +5147,11 @@ github = "umazalakain"; name = "Unai Zalakain"; }; + zaninime = { + email = "francesco@zanini.me"; + github = "zaninime"; + name = "Francesco Zanini"; + }; zarelit = { email = "david@zarel.net"; github = "zarelit"; @@ -4657,4 +5206,14 @@ github = "zzamboni"; name = "Diego Zamboni"; }; + mredaelli = { + email = "massimo@typish.io"; + github = "mredaelli"; + name = "Massimo Redaelli"; + }; + shmish111 = { + email = "shmish111@gmail.com"; + github = "shmish111"; + name = "David Smith"; + }; } diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl index 31e6045fb64564274fbf9fce94b005547a3c83a2..59696a4432d8ba8e478971d15c61a4e88d002c2a 100755 --- a/maintainers/scripts/copy-tarballs.pl +++ b/maintainers/scripts/copy-tarballs.pl @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings +#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixUnstable nixUnstable.perl-bindings # This command uploads tarballs to tarballs.nixos.org, the # content-addressed cache used by fetchurl as a fallback for when @@ -101,8 +101,8 @@ sub uploadFile { my ($name, $dest) = @_; #print STDERR "linking $name to $dest...\n"; $bucket->add_key($name, "", { - 'x-amz-website-redirect-location' => "/" . $dest, - 'x-amz-acl' => "public-read" + 'x-amz-website-redirect-location' => "/" . $dest, + 'x-amz-acl' => "public-read" }) or die "failed to create redirect from $name to $dest\n"; $cache{$name} = 1; @@ -116,8 +116,8 @@ sub uploadFile { # Upload the file as sha512/. print STDERR "uploading $fn to $mainKey...\n"; $bucket->add_key_filename($mainKey, $fn, { - 'x-amz-meta-original-name' => $name, - 'x-amz-acl' => "public-read" + 'x-amz-meta-original-name' => $name, + 'x-amz-acl' => "public-read" }) or die "failed to upload $fn to $mainKey\n"; $cache{$mainKey} = 1; diff --git a/maintainers/scripts/eval-release.sh b/maintainers/scripts/eval-release.sh new file mode 100755 index 0000000000000000000000000000000000000000..e0dfaf1de74c1c133f4fcc9524c1b10a8475fabc --- /dev/null +++ b/maintainers/scripts/eval-release.sh @@ -0,0 +1,11 @@ +#! /bin/sh + +if [[ -z "$VERBOSE" ]]; then + echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent" +fi +unset HOME NIXPKGS_CONFIG # Force empty config + +# With the default heap size (380MB), nix-instantiate fails: +# Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS +export GC_INITIAL_HEAP_SIZE=${GC_INITIAL_HEAP_SIZE:-2000000000} # 2GB +nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index bd6afda900c812935e74f17d87ec683f324f16ae..52cce90991831522134e73ca0fc835e10647a1f2 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -31,7 +31,7 @@ let if !canEval x then [] else if isDerivation x then optional (canEval x.drvPath) x else if isList x then concatLists (map derivationsIn' x) - else if isAttrs x then concatLists (mapAttrsToList (n: v: derivationsIn' v) x) + else if isAttrs x then concatLists (mapAttrsToList (n: v: addErrorContext "while finding tarballs in '${n}':" (derivationsIn' v)) x) else [ ]; keyDrv = drv: if canEval drv.drvPath then { key = drv.drvPath; value = drv; } else { }; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv new file mode 100644 index 0000000000000000000000000000000000000000..0f3db834fc29fc595d6cfea038c1f20bf5c51235 --- /dev/null +++ b/maintainers/scripts/luarocks-packages.csv @@ -0,0 +1,32 @@ +ansicolors, +argparse, +basexx, +cqueues +dkjson +fifo +inspect +lgi +lpeg_patterns +lpty +lrexlib-gnu, +lrexlib-posix, +ltermbox, +lua-cmsgpack, +lua_cliargs, +lua-iconv, +lua-term, +luabitop, +luaevent, +luacheck +luaffi,http://luarocks.org/dev, +luuid, +penlight, +say, +luv, +luasystem, +mediator_lua,http://luarocks.org/manifests/teto +mpack,http://luarocks.org/manifests/teto +nvim-client,http://luarocks.org/manifests/teto +busted,http://luarocks.org/manifests/teto +luassert,http://luarocks.org/manifests/teto +coxpcall,https://luarocks.org/manifests/hisham,1.17.0-1 diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index ec406ac1a70334d30dc4c03b21e12bd55d243dee..5c4cf0f6c5581479df0f4dbb0605c65099914f46 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nix-generate-from-cpan-3"; buildInputs = with perlPackages; [ - makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly LogLog4perl + makeWrapper perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; phases = [ "installPhase" ]; diff --git a/maintainers/scripts/test-eval-release.sh b/maintainers/scripts/test-eval-release.sh deleted file mode 100755 index 9ef531319e4daff48a03dc33c653597d31d5cff6..0000000000000000000000000000000000000000 --- a/maintainers/scripts/test-eval-release.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh - -if [[ -z "$VERBOSE" ]]; then - echo "You may set VERBOSE=1 to see debug output or to any other non-empty string to make this script completely silent" -fi -unset HOME NIXPKGS_CONFIG # Force empty config -nix-instantiate --strict --eval-only --xml --show-trace "$(dirname "$0")"/eval-release.nix 2>&1 > /dev/null diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages new file mode 100755 index 0000000000000000000000000000000000000000..aa922c19860f1c8294df3948a5d83e6c9d45aab9 --- /dev/null +++ b/maintainers/scripts/update-luarocks-packages @@ -0,0 +1,112 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix-prefetch-scripts luarocks-nix -i bash + +# You'll likely want to use +# `` +# nixpkgs $ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix +# `` +# to update all libraries in that folder. +# to debug, redirect stderr to stdout with 2>&1 + + +# stop the script upon C-C +set -eu -o pipefail + +if [ $# -lt 1 ]; then + print_help + exit 1 +fi + +CSV_FILE="maintainers/scripts/luarocks-packages.csv" +TMP_FILE="$(mktemp)" + +exit_trap() +{ + local lc="$BASH_COMMAND" rc=$? + test $rc -eq 0 || echo -e "*** error $rc: $lc.\nGenerated temporary file in $TMP_FILE" >&2 +} +trap exit_trap EXIT + +print_help() { + echo "Usage: $0 " + echo "(most likely pkgs/development/lua-modules/generated-packages.nix)" + echo "" + echo " -c to set the list of luarocks package to generate" + exit 1 +} + + +while getopts ":hc:" opt; do + case $opt in + h) + print_help + ;; + c) + echo "Loading package list from $OPTARG !" >&2 + CSV_FILE="$OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + ;; + esac + shift $((OPTIND-1)) +done + +GENERATED_NIXFILE="$1" + +HEADER=" +/* ${GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! +Regenerate it with: +nixpkgs$ ${0} ${GENERATED_NIXFILE} + +These packages are manually refined in lua-overrides.nix +*/ +{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +self: super: +with self; +{ +" + +FOOTER=" +} +/* GENERATED */ +" + + +function convert_pkg () { + pkg="$1" + server="" + if [ ! -z "$2" ]; then + server=" --server=$2" + fi + + version="${3:-}" + + echo "looking at $pkg (version $version) from server [$server]" >&2 + cmd="luarocks nix $server $pkg $version" + drv="$($cmd)" + if [ $? -ne 0 ]; then + echo "Failed to convert $pkg" >&2 + echo "$drv" >&2 + else + echo "$drv" | tee -a "$TMP_FILE" + fi +} + +# params needed when called via callPackage +echo "$HEADER" | tee "$TMP_FILE" + +# list of packages with format +# name,server,version +while IFS=, read -r pkg_name server version +do + if [ -z "$pkg_name" ]; then + echo "Skipping empty package name" >&2 + fi + convert_pkg "$pkg_name" "$server" "$version" +done < "$CSV_FILE" + +# close the set +echo "$FOOTER" | tee -a "$TMP_FILE" + +cp "$TMP_FILE" "$GENERATED_NIXFILE" diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index d95ff4f347e87f761be71fd6f6a1f857c403bb08..4a6024c40380bcbb04f9b2b0fb9148edc8aaa1b0 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -1,361 +1,5 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git +#!/bin/sh +build=`nix-build -E "with import (fetchTarball "channel:nixpkgs-unstable") {}; python3.withPackages(ps: with ps; [ packaging requests toolz ])"` +python=${build}/bin/python +exec ${python} 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 8d1e47c6bc951d3e601cf573cf63937734ba8f93..120cd5552f4804b4741731b941b995e006b88ef9 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,27 +107,24 @@ let % nix-shell maintainers/scripts/update.nix --argstr path gnome3 to run update script for all package under an attribute path. - ''; - 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. " + 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. ''; + 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"; buildCommand = '' @@ -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 0000000000000000000000000000000000000000..eb7d0ef2647bf59687cc7a794ca5334febce49e4 --- /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 2e9adf70c3963e7fd4360dfa6dc3251174904f95..b251a1f5e2c3dfa88bff918741bcd89d85369dd9 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 4b977d1d82eb42b79d4eed281e13f5320f11225f..2ee8bfdd50f1b94ba0adb2d12335724f93d2b69d 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 2a98fb1262310275849d0451221f3fc671b04a47..d03dbc4d70556cefe5223f7d8eb496345237bb23 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 028a94275345d470ddc1e5ace68566573bccf9da..cdcfa10b8200ee6980e62b6bb6d888f8622ae5c4 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 8a1a39c98c10d3dec9e919959b24b5c7e6d5d276..c77cfe137baa2cb68340bf6d2a93a2dee778fd83 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 8d05dcd34b4d40813b5d6224af5258337e77c431..cebc4122c6c66a1271ac9c8bf0770c3cf73f7c5e 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 b66adcedce6e888ce613ede9e4db7f9a03fa85cd..47a19ac82c0fea6b9e67f84f7743507cd6da6b22 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 2f766f2b32f777af6d16e3f6681483d8c3200009..644d3a33ffd2c8208b83be9d5a4503b2f62a94c9 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 0000000000000000000000000000000000000000..92c0f6202f283a05845912a6f330b582ee68ba11 --- /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 0000000000000000000000000000000000000000..172975199474e11d94e5673647642d35f56027d8 --- /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 0000000000000000000000000000000000000000..f58a35d626ed322e67d09c2686d7309cee8a13e5 --- /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 0000000000000000000000000000000000000000..87c8b9ee31b69127ac17cbe1fb0913fd15426232 --- /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 0000000000000000000000000000000000000000..98829e4696df72ebe396bd10e994ba0cbab5b905 --- /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 0000000000000000000000000000000000000000..bf962442ccefa696c83dc41be4aa334bb0fe3219 --- /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 0000000000000000000000000000000000000000..5ded61d9763b02a119fe010b45dec41a80857559 --- /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 0000000000000000000000000000000000000000..b3b433792f5346cdae105a455fd62b736c5b9969 --- /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 0000000000000000000000000000000000000000..54dc61f236e0b348e8c232b3f52e5003cd4a5fd5 --- /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 0000000000000000000000000000000000000000..44ccfc538ad1b83107320c1019887f06c4dec407 --- /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 0000000000000000000000000000000000000000..a24af21bd7f78d5cfeaecf780c097840f7bb1b12 --- /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 0000000000000000000000000000000000000000..d08068650fbe9d4a643c141dbe86b1277a41b357 --- /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/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml index 999447234ad1f276f24c092b1969a6f02c3de411..f7e99ff0e35c2b98b64d04adb3a3fa53bec4cc7c 100644 --- a/nixos/doc/manual/configuration/wireless.xml +++ b/nixos/doc/manual/configuration/wireless.xml @@ -29,7 +29,10 @@ networks are set, it will default to using a configuration file at /etc/wpa_supplicant.conf. You should edit this file yourself to define wireless networks, WPA keys and so on (see - wpa_supplicant.conf(5)). + + wpa_supplicant.conf + 5 + ). diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 703a1b8b7f09adf0705291f683e29ef5a063af97..e7d66f391f55c9d63a6ef53de76be9b2921d7577 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -35,11 +35,11 @@ NixOS’s default display manager (the program that - provides a graphical login prompt and manages the X server) is SLiM. You can + provides a graphical login prompt and manages the X server) is LightDM. You can select an alternative one by picking one of the following lines: = true; - = true; + = true; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index aaa6e0da545f9efbda8504ebc57b294f623e173b..02b91773f5dadf9075561237ab8f8438fad63f1e 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -252,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"; @@ -265,6 +265,7 @@ in rec { xsltproc \ ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ + --stringparam id.warnings "1" \ --nonet --output $dst/ \ ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ ${manual-combined}/manual-combined.xml @@ -281,6 +282,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 eaffc0ef47c2f0af4b809ec5ce4761a3d9098788..b4791b72970f68de495cd1536fa90598d35bebbf 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/option-types.xml b/nixos/doc/manual/development/option-types.xml index e6c9eae11a728d47355d5cd59e7f329c8f0ab088..d993e47bc914bcb32e95d22f1f2bd939b68c8b4e 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 862b364a6d79b5b450d85aaed20e1aa6ad9c62b5..c15ad448317fdb60d7bdce65fe7daebdc159d49c 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 5935fbc049bde683dacf09f14bfa2a3bf1cd4c7e..4a2615c9407b0174df5938a3891306b11e9acb22 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 c59d073c61c73a1153f2e5c85d83799d7728a3d3..8f9baff44b51e3d85fe0d5fcae1b75b14114f709 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 c5934111749cf7dd75dbd9ddd181e4b2de3139b8..c0372e8ebd9bb766eed9178298657cfdba7e40e4 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 [..] @@ -24,45 +23,18 @@ $ diskutil list [..] $ diskutil unmountDisk diskN Unmount of all volumes on diskN was successful -$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN +$ sudo dd 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-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index da78b480f5aa90f07fbd0c8aab2ae7c92aa58972..766785dfe070e9862e955bbfb47e49ba9c0f5f42 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -77,18 +77,22 @@ Shared folders can be given a name and a path in the host system in the VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the - /etc/nixos/configuration.nix to auto-mount them: + /etc/nixos/configuration.nix to auto-mount them. If you + do not add "nofail", the system will no boot properly. + The same goes for disabling rngd which is normally used + to get randomness but this does not work in virtual machines. { config, pkgs, ...} : { + security.rngd.enable = false; // otherwise vm will not boot ... fileSystems."/virtualboxshare" = { fsType = "vboxsf"; device = "nameofthesharedfolder"; - options = [ "rw" ]; + options = [ "rw" "nofail" ]; }; } diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 916384559e24b61c0bcab496314a42c1086bc2a1..8e94f946c5eef2a8f35ea6575c220b1212a951fa 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -4,60 +4,46 @@ version="5.0" xml:id="sec-installation"> Installing NixOS - - NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI - installation is by and large the same as a BIOS installation. The differences - are mentioned in the steps that follow. - - - - - Boot from the CD. - - - - - UEFI systems - - - - You should boot the live CD in UEFI mode (consult your specific - hardware's documentation for instructions). You may find the - rEFInd boot - manager useful. - - - - - - - - The CD contains a basic NixOS installation. (It also contains Memtest86+, - useful if you want to test new hardware). When it’s finished booting, it - should have detected most of your hardware. - - - - - The NixOS manual is available on virtual console 8 (press Alt+F8 to access) - or by running nixos-help. - - - - - You get logged in as root (with empty password). - - - - - If you downloaded the graphical ISO image, you can run systemctl - start display-manager to start KDE. If you want to continue on - the terminal, you can use loadkeys to switch to your - preferred keyboard layout. (We even provide neo2 via loadkeys de - neo!) - - - +
+ Booting the system + + + NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI + installation is by and large the same as a BIOS installation. The + differences are mentioned in the steps that follow. + + + + The installation media can be burned to a CD, or now more commonly, "burned" + to a USB drive (see ). + + + + The installation media contains a basic NixOS installation. When it’s + finished booting, it should have detected most of your hardware. + + + + The NixOS manual is available on virtual console 8 (press Alt+F8 to access) + or by running nixos-help. + + + + You are logged-in automatically as root. (The + root user account has an empty password.) + + + + If you downloaded the graphical ISO image, you can run systemctl + start display-manager to start KDE. If you want to continue on the + terminal, you can use loadkeys to switch to your + preferred keyboard layout. (We even provide neo2 via loadkeys de + neo!) + + +
+ Networking in the installer + The boot process should have brought up networking (check ip a). Networking is necessary for the installer, since it will @@ -65,58 +51,165 @@ binaries). It’s best if you have a DHCP server on your network. Otherwise configure networking manually using ifconfig. + To manually configure the network on the graphical installer, first disable network-manager with systemctl stop network-manager. + To manually configure the wifi on the minimal installer, run wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' 'key'). - - + If you would like to continue the installation from a different machine you need to activate the SSH daemon via systemctl start sshd. In order to be able to login you also need to set a password for root using passwd. - - +
+
+
+ Partitioning and formatting + + + The NixOS installer doesn’t do any partitioning or formatting, so you need + to do that yourself. + + + + The NixOS installer ships with multiple partitioning tools. The examples + below use parted, but also provides + fdisk, gdisk, + cfdisk, and cgdisk. + + + + The recommended partition scheme differs depending if the computer uses + Legacy Boot or UEFI. + + +
+ UEFI (GPT) + - The NixOS installer doesn’t do any partitioning or formatting yet, so you - need to do that yourself. Use the following commands: - + Here's an example partition scheme for UEFI, using + /dev/sda as the device. + + + You can safely ignore parted's informational message + about needing to update /etc/fstab. + + + + + + - For partitioning: fdisk. - -# fdisk /dev/sda # (or whatever device you want to install on) --- for UEFI systems only -> n # (create a new partition for /boot) -> 3 # (make it a partition number 3) -> # (press enter to accept the default) -> +512M # (the size of the UEFI boot partition) -> t # (change the partition type ...) -> 3 # (... of the boot partition ...) -> 1 # (... to 'UEFI System') --- for BIOS or UEFI systems -> n # (create a new partition for /swap) -> 2 # (make it a partition number 2) -> # (press enter to accept the default) -> +8G # (the size of the swap partition, set to whatever you like) -> n # (create a new partition for /) -> 1 # (make it a partition number 1) -> # (press enter to accept the default) -> # (press enter to accept the default and use the rest of the remaining space) -> a # (make the partition bootable) -> x # (enter expert mode) -> f # (fix up the partition ordering) -> r # (exit expert mode) -> w # (write the partition table to disk and exit) + Create a GPT partition table. +# parted /dev/sda -- mklabel gpt + + + Add the root partition. This will fill the disk + except for the end part, where the swap will live, and the space left in + front (512MiB) which will be used by the boot partition. +# parted /dev/sda -- mkpart primary 512MiB -8GiB + + + + + Next, add a swap partition. The size required will + vary according to needs, here a 8GiB one is created. +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% + + + The swap partition size rules are no different than for other Linux + distributions. + + + + + + + Finally, the boot partition. NixOS by default uses + the ESP (EFI system partition) as its /boot + partition. It uses the initially reserved 512MiB at the start of the + disk. +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB +# parted /dev/sda -- set 3 boot on + + + + + + + Once complete, you can follow with + . + +
+ +
+ Legacy Boot (MBR) + + + Here's an example partition scheme for Legacy Boot, using + /dev/sda as the device. + + + You can safely ignore parted's informational message + about needing to update /etc/fstab. + + + + + + + + + Create a MBR partition table. +# parted /dev/sda -- mklabel msdos + + + + + Add the root partition. This will fill the the disk + except for the end part, where the swap will live. +# parted /dev/sda -- mkpart primary 1MiB -8GiB + + + + + Finally, add a swap partition. The size required + will vary according to needs, here a 8GiB one is created. +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% + + + The swap partition size rules are no different than for other Linux + distributions. + + + + + + + + + Once complete, you can follow with + . + +
+ +
+ Formatting + + + Use the following commands: + For initialising Ext4 partitions: mkfs.ext4. It is @@ -169,242 +262,249 @@ - - - - Mount the target file system on which NixOS should be installed on - /mnt, e.g. +
+
+
+ Installing + + + + + Mount the target file system on which NixOS should be installed on + /mnt, e.g. # mount /dev/disk/by-label/nixos /mnt - - - - - - - UEFI systems - - - - Mount the boot file system on /mnt/boot, e.g. + + + + + + + UEFI systems + + + + Mount the boot file system on /mnt/boot, e.g. # mkdir -p /mnt/boot # mount /dev/disk/by-label/boot /mnt/boot - - - - - - - - If your machine has a limited amount of memory, you may want to activate - swap devices now (swapon - device). The installer (or rather, the - build actions that it may spawn) may need quite a bit of RAM, depending on - your configuration. + + + + + + + + If your machine has a limited amount of memory, you may want to activate + swap devices now (swapon + device). The installer (or rather, + the build actions that it may spawn) may need quite a bit of RAM, + depending on your configuration. # swapon /dev/sda2 - - - - - You now need to create a file - /mnt/etc/nixos/configuration.nix that specifies the - intended configuration of the system. This is because NixOS has a - declarative configuration model: you create or edit a - description of the desired configuration of your system, and then NixOS - takes care of making it happen. The syntax of the NixOS configuration file - is described in , while a list of - available configuration options appears in - + + + + You now need to create a file + /mnt/etc/nixos/configuration.nix that specifies the + intended configuration of the system. This is because NixOS has a + declarative configuration model: you create or edit a + description of the desired configuration of your system, and then NixOS + takes care of making it happen. The syntax of the NixOS configuration file + is described in , while a list + of available configuration options appears in + . A minimal example is shown in - . - - - The command nixos-generate-config can generate an - initial configuration file for you: + + + The command nixos-generate-config can generate an + initial configuration file for you: # nixos-generate-config --root /mnt - You should then edit /mnt/etc/nixos/configuration.nix - to suit your needs: + You should then edit /mnt/etc/nixos/configuration.nix + to suit your needs: # nano /mnt/etc/nixos/configuration.nix - If you’re using the graphical ISO image, other editors may be available - (such as vim). If you have network access, you can also - install other editors — for instance, you can install Emacs by running - nix-env -i emacs. - - - - - BIOS systems - - - - You must set the option - to specify on which disk - the GRUB boot loader is to be installed. Without it, NixOS cannot boot. - - - - - - UEFI systems - - - - You must set the option - to - true. nixos-generate-config should - do this automatically for new configurations when booted in UEFI mode. - - - You may want to look at the options starting with - - and - - as well. - - - - - - If there are other operating systems running on the machine before - installing NixOS, the - option can be set to true to automatically add them to - the grub menu. - - - Another critical option is , specifying the - file systems that need to be mounted by NixOS. However, you typically - don’t need to set it yourself, because - nixos-generate-config sets it automatically in - /mnt/etc/nixos/hardware-configuration.nix from your - currently mounted file systems. (The configuration file - hardware-configuration.nix is included from - configuration.nix and will be overwritten by future - invocations of nixos-generate-config; thus, you - generally should not modify it.) - - + If you’re using the graphical ISO image, other editors may be available + (such as vim). If you have network access, you can also + install other editors — for instance, you can install Emacs by running + nix-env -i emacs. + + + + + BIOS systems + + + + You must set the option + to specify on which disk + the GRUB boot loader is to be installed. Without it, NixOS cannot boot. + + + + + + UEFI systems + + + + You must set the option + to + true. nixos-generate-config + should do this automatically for new configurations when booted in UEFI + mode. + + + You may want to look at the options starting with + + and + + as well. + + + + - Depending on your hardware configuration or type of file system, you may - need to set the option to - include the kernel modules that are necessary for mounting the root file - system, otherwise the installed system will not be able to boot. (If this - happens, boot from the CD again, mount the target file system on - /mnt, fix - /mnt/etc/nixos/configuration.nix and rerun - nixos-install.) In most cases, - nixos-generate-config will figure out the required - modules. + If there are other operating systems running on the machine before + installing NixOS, the + option can be set to true to automatically add them to + the grub menu. - - - - - Do the installation: + + Another critical option is , specifying the + file systems that need to be mounted by NixOS. However, you typically + don’t need to set it yourself, because + nixos-generate-config sets it automatically in + /mnt/etc/nixos/hardware-configuration.nix from your + currently mounted file systems. (The configuration file + hardware-configuration.nix is included from + configuration.nix and will be overwritten by future + invocations of nixos-generate-config; thus, you + generally should not modify it.) + + + + Depending on your hardware configuration or type of file system, you may + need to set the option to + include the kernel modules that are necessary for mounting the root file + system, otherwise the installed system will not be able to boot. (If this + happens, boot from the installation media again, mount the target file + system on /mnt, fix + /mnt/etc/nixos/configuration.nix and rerun + nixos-install.) In most cases, + nixos-generate-config will figure out the required + modules. + + + + + + Do the installation: # nixos-install - Cross fingers. If this fails due to a temporary problem (such as a network - issue while downloading binaries from the NixOS binary cache), you can just - re-run nixos-install. Otherwise, fix your - configuration.nix and then re-run - nixos-install. - - - As the last step, nixos-install will ask you to set the - password for the root user, e.g. + Cross fingers. If this fails due to a temporary problem (such as a network + issue while downloading binaries from the NixOS binary cache), you can + just re-run nixos-install. Otherwise, fix your + configuration.nix and then re-run + nixos-install. + + + As the last step, nixos-install will ask you to set the + password for the root user, e.g. setting root password... Enter new UNIX password: *** -Retype new UNIX password: *** - - - - For unattended installations, it is possible to use - nixos-install --no-root-passwd - in order to disable the password prompt entirely. - - - - - - - If everything went well: +Retype new UNIX password: *** + + + For unattended installations, it is possible to use + nixos-install --no-root-passwd in order to disable + the password prompt entirely. + + + + + + + If everything went well: - # reboot - - - - - You should now be able to boot into the installed NixOS. The GRUB boot menu - shows a list of available configurations (initially - just one). Every time you change the NixOS configuration (see - + + + + + You should now be able to boot into the installed NixOS. The GRUB boot + menu shows a list of available configurations + (initially just one). Every time you change the NixOS configuration (see + Changing Configuration - ), a new item is added to the menu. This allows you to easily roll back to - a previous configuration if something goes wrong. - - - You should log in and change the root password with - passwd. - - - You’ll probably want to create some user accounts as well, which can be - done with useradd: + ), a new item is added to the menu. This allows you to easily roll back to + a previous configuration if something goes wrong. + + + You should log in and change the root password with + passwd. + + + You’ll probably want to create some user accounts as well, which can be + done with useradd: $ useradd -c 'Eelco Dolstra' -m eelco $ passwd eelco - - - You may also want to install some software. For instance, + + + You may also want to install some software. For instance, $ nix-env -qa \* - shows what packages are available, and + shows what packages are available, and $ nix-env -i w3m - install the w3m browser. - - - - - To summarise, shows a typical sequence - of commands for installing NixOS on an empty hard drive (here - /dev/sda). w3m browser. + + + +
+
+ Installation summary + + + To summarise, shows a typical + sequence of commands for installing NixOS on an empty hard drive (here + /dev/sda). shows a - corresponding configuration Nix expression. - - - Commands for Installing NixOS on <filename>/dev/sda</filename> - -# fdisk /dev/sda # (or whatever device you want to install on) --- for UEFI systems only -> n # (create a new partition for /boot) -> 3 # (make it a partition number 3) -> # (press enter to accept the default) -> +512M # (the size of the UEFI boot partition) -> t # (change the partition type ...) -> 3 # (... of the boot partition ...) -> 1 # (... to 'UEFI System') --- for BIOS or UEFI systems -> n # (create a new partition for /swap) -> 2 # (make it a partition number 2) -> # (press enter to accept the default) -> +8G # (the size of the swap partition) -> n # (create a new partition for /) -> 1 # (make it a partition number 1) -> # (press enter to accept the default) -> # (press enter to accept the default and use the rest of the remaining space) -> a # (make the partition bootable) -> x # (enter expert mode) -> f # (fix up the partition ordering) -> r # (exit expert mode) -> w # (write the partition table to disk and exit) + corresponding configuration Nix expression. + + + + Example partition schemes for NixOS on <filename>/dev/sda</filename> (MBR) + +# parted /dev/sda -- mklabel msdos +# parted /dev/sda -- mkpart primary 1MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% + + + + Example partition schemes for NixOS on <filename>/dev/sda</filename> (UEFI) + +# parted /dev/sda -- mklabel gpt +# parted /dev/sda -- mkpart primary 512MiB -8GiB +# parted /dev/sda -- mkpart primary linux-swap -8GiB 100% +# parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB +# parted /dev/sda -- set 3 boot on + + + + Commands for Installing NixOS on <filename>/dev/sda</filename> + + With a partitioned disk. + # mkfs.ext4 -L nixos /dev/sda1 # mkswap -L swap /dev/sda2 # swapon /dev/sda2 @@ -416,9 +516,11 @@ $ nix-env -i w3m # nano /mnt/etc/nixos/configuration.nix # nixos-install # reboot - - - NixOS Configuration + + + + + NixOS Configuration { config, pkgs, ... }: { imports = [ @@ -438,10 +540,19 @@ $ nix-env -i w3m services.sshd.enable = true; } - - - - - - + +
+
+ Additional installation notes + + + + + + + + + + +
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml index 1227873f57800b34baad489ca43c58418db24b67..43d6c2696a2817e22b92ecb3582982b433f0ed7f 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 - + root - + @@ -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/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 551a65f5e96beebc770d1c9b8fd9b41e941323d1..b6a247286d4b2b7ddb7b9ddcc2019e18c80a24f4 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -13,35 +13,35 @@ - nixos-rebuild + nixos-rebuild - + - + - + - + - + - + - + @@ -50,29 +50,33 @@ - + - + - + - + + + + builder-spec + - + - + @@ -315,6 +319,27 @@ $ ./result/bin/run-*-vm
+ + + + builder-spec + + + + Allow ad-hoc remote builders for building the new system. + This requires the user executing nixos-rebuild (usually + root) to be configured as a trusted user in the Nix daemon. This can be + achieved by using the nix.trustedUsers NixOS option. + Examples values for that option are described in the + Remote builds chapter in the Nix manual, + (i.e. --builders "ssh://bigbrother x86_64-linux"). + By specifying an empty string existing builders specified in + /etc/nix/machines can be ignored: + --builders "" for example when they are not + reachable due to network connectivity. + + + diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index a5efde32885cf4c7ba9b30fc20cec6eb23c4b406..12f52e1997c8d207e0414218e2aaa1aff243daa3 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/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml index 4d93aa644c1d6fdf205237a1e41f8afeba8d395b..139f61c2a5509fe0d66e188eba3fc8e5ac253721 100644 --- a/nixos/doc/manual/release-notes/rl-1412.xml +++ b/nixos/doc/manual/release-notes/rl-1412.xml @@ -17,7 +17,7 @@ - + Nix has been updated to 1.8. diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 4eb2f9aa0a95687ec4589e31d3ed754859990a22..e500c9d634224224cbe9a376efe8a03296591ee8 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -435,11 +435,11 @@ system.autoUpgrade.enable = true; system.stateVersion = "14.12"; - The new option ensures that - certain configuration changes that could break existing systems (such as - the sshd host key setting) will maintain compatibility - with the specified NixOS release. NixOps sets the state version of - existing deployments automatically. + The new option ensures that certain + configuration changes that could break existing systems (such as the + sshd host key setting) will maintain compatibility with + the specified NixOS release. NixOps sets the state version of existing + deployments automatically. diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 9c8cd7c49c8d9b7386024e5460b9020fb3bd3739..8715a05f508b6e85c5947db0570c580d034e60a4 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. + + + + + 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.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/networking/ocserv.nix - The new services.elasticsearch-curator service - periodically curates or manages, your Elasticsearch indices and snapshots. + ./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,53 +477,51 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' - The deprecated services.cassandra module has - seen a complete rewrite. (See above.) - - - - - The minimum version of Nix required to evaluate Nixpkgs is now 2.0. - - - - - For users of NixOS 18.03, NixOS 18.03 defaulted to Nix 2.0, but - supported 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. - - - + 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.) + @@ -230,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. @@ -275,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. @@ -342,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. @@ -380,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. @@ -452,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. @@ -476,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. @@ -489,76 +847,86 @@ inherit (pkgs.nixos { - The option services.kubernetes.addons.dashboard.enableRBAC - was renamed to services.kubernetes.addons.dashboard.rbac.enable. + The option + services.kubernetes.addons.dashboard.enableRBAC was + renamed to + services.kubernetes.addons.dashboard.rbac.enable. The Kubernetes Dashboard now has only minimal RBAC permissions by default. - If dashboard cluster-admin rights are desired, - set services.kubernetes.addons.dashboard.rbac.clusterAdmin to true. - On existing clusters, in order for the revocation of privileges to take effect, - the current ClusterRoleBinding for kubernetes-dashboard must be manually removed: - kubectl delete clusterrolebinding kubernetes-dashboard + If dashboard cluster-admin rights are desired, set + services.kubernetes.addons.dashboard.rbac.clusterAdmin + to true. On existing clusters, in order for the revocation of privileges + to take effect, the current ClusterRoleBinding for kubernetes-dashboard + must be manually removed: kubectl delete clusterrolebinding + kubernetes-dashboard The programs.screen module provides allows to configure - /etc/screenrc, however the module behaved fairly counterintuitive as - the config exists, but the package wasn't available. Since 18.09 pkgs.screen - will be added to environment.systemPackages. + /etc/screenrc, however the module behaved fairly + counterintuitive as the config exists, but the package wasn't available. + Since 18.09 pkgs.screen will be added to + environment.systemPackages. - The module now uses WPA2 by default. + The module now uses WPA2 by + default. - s6Dns, s6Networking, - s6LinuxUtils and s6PortableUtils - renamed to - s6-dns, s6-networking, - s6-linux-utils and s6-portable-utils respectively. + s6Dns, s6Networking, + s6LinuxUtils and s6PortableUtils + renamed to s6-dns, s6-networking, + s6-linux-utils and s6-portable-utils + respectively. - - + + - The module option is now defaulted to true. + The module option is now defaulted to + true. - - + + - The config activation script of nixos-rebuild now - reloads - all user units for each authenticated user. + The config activation script of nixos-rebuild now + reloads + all user units for each authenticated user. - - + + - The default display manager is now LightDM. - To use SLiM set services.xserver.displayManager.slim.enable - to true. + The default display manager is now LightDM. To use SLiM set + services.xserver.displayManager.slim.enable to + true. - - + + - NixOS option descriptions are now automatically broken up into individual - paragraphs if the text contains two consecutive newlines, so it's no - longer necessary to use </para><para> to start - a new paragraph. + NixOS option descriptions are now automatically broken up into individual + paragraphs if the text contains two consecutive newlines, so it's no + longer necessary to use </para><para> to start a + new paragraph. - - + + - Top-level buildPlatform, hostPlatform, and targetPlatform in Nixpkgs are deprecated. - Please use their equivalents in stdenv instead: - stdenv.buildPlatform, stdenv.hostPlatform, and stdenv.targetPlatform. + Top-level buildPlatform, + hostPlatform, and targetPlatform in + Nixpkgs are deprecated. Please use their equivalents in + stdenv instead: + stdenv.buildPlatform, + stdenv.hostPlatform, and + stdenv.targetPlatform. - +
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 9ae34dd58ab0b270b31bf0c6b060c3f93a508fbf..0937a681d151f2816acb80f9f5a3b77a987296ea 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -19,7 +19,9 @@ - + + The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6. + @@ -37,7 +39,361 @@ - + + ./programs/nm-applet.nix + + + + + There is a new security.googleOsLogin module for using + OS Login + to manage SSH access to Google Compute Engine instances, which supersedes + the imperative and broken google-accounts-daemon used + in nixos/modules/virtualisation/google-compute-config.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 + and + can be used to select + the Python 2 or 3 version of the package. + + + + + Options + services.znc.confOptions.networks.name.userName and + services.znc.confOptions.networks.name.modulePackages + were removed. They were never used for anything and can therefore safely be removed. + + + + + Package wasm has been renamed proglodyte-wasm. The package + wasm will be pointed to ocamlPackages.wasm in 19.09, so + make sure to update your configuration if you want to keep proglodyte-wasm + + + + + 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. + + + + + The pam_unix account module is now loaded with its + control field set to required instead of + sufficient, so that later PAM account modules that + might do more extensive checks are being executed. + Previously, the whole account module verification was exited prematurely + in case a nss module provided the account name to + pam_unix. + The LDAP and SSSD NixOS modules already add their NSS modules when + enabled. In case your setup breaks due to some later PAM account module + previosuly shadowed, or failing NSS lookups, please file a bug. You can + get back the old behaviour by manually setting + .text]]>. + + + + + The pam_unix password module is now loaded with its + control field set to sufficient instead of + required, so that password managed only + by later PAM password modules are being executed. + Previously, for example, changing an LDAP account's password through PAM + was not possible: the whole password module verification + was exited prematurely by pam_unix, + preventing pam_ldap to manage the password as it should. + + + + + fish has been upgraded to 3.0. + It comes with a number of improvements and backwards incompatible changes. + See the fish release notes for more information. + + + + + The ibus-table input method has had a change in config format, which + causes all previous settings to be lost. See + this commit message + for details. + + + + + Support for NixOS module system type types.optionSet and + lib.mkOption argument options is removed. + Use types.submodule instead. + (#54637) + + + + + matrix-synapse has been updated to version 0.99. It will + no longer generate a self-signed certificate on first launch + and will be the last version to accept self-signed certificates. + As such, it is now recommended to use a proper certificate verified by a + root CA (for example Let's Encrypt). + + + + + mailutils now works by default when + sendmail is not in a setuid wrapper. As a consequence, + the sendmailPath argument, having lost its main use, has + been removed. +
@@ -51,7 +407,130 @@ - + + The module gained the option + which determines the used + Matomo version. + + + The Matomo module now also comes with the systemd service matomo-archive-processing.service + and a timer that automatically triggers archive processing every hour. + This means that you can safely + + disable browser triggers for Matomo archiving + at Administration > System > General Settings. + + + Additionally, you can enable to + + delete old visitor logs + at Administration > System > Privacy, + but make sure that you run systemctl start matomo-archive-processing.service + at least once without errors if you have already collected data before, + so that the reports get archived before the source data gets deleted. + + + + + composableDerivation along with supporting library functions + has been removed. + + + + + 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: + . + + + + + The quassel-webserver package and module was removed from nixpkgs due to the lack + of maintainers. + + + + + The astah-community package was removed from nixpkgs due to it being discontinued and the downloads not being available anymore. + + + + + The httpd service now saves log files with a .log file extension by default for + easier integration with the logrotate service. + + + + + The owncloud server packages and httpd subservice module were removed + from nixpkgs due to the lack of maintainers. + + + + + It is possible now to uze ZRAM devices as general purpose ephemeral block devices, + not only as swap. Using more than 1 device as ZRAM swap is no longer recommended, + but is still possible by setting zramSwap.swapDevices explicitly. + + + Default algorithm for ZRAM swap was changed to zstd. + + + Changes to ZRAM algorithm are applied during nixos-rebuild switch, + so make sure you have enough swap space on disk to survive ZRAM device rebuild. Alternatively, + use nixos-rebuild boot; reboot. + + + + + Flat volumes are now disabled by default in hardware.pulseaudio. + This has been done to prevent applications, which are unaware of this feature, setting + their volumes to 100% on startup causing harm to your audio hardware and potentially your ears. + + + + With this change application specific volumes are relative to the master volume which can be + adjusted independently, whereas before they were absolute; meaning that in effect, it scaled the + device-volume with the volume of the loudest application. + + + + + + The ndppd module + now supports all config options provided by the current + upstream version as service options. Additionally the ndppd package doesn't contain + the systemd unit configuration from upstream anymore, the unit is completely configured by the NixOS module now. + + + + + New installs of NixOS will default to the Redmine 4.x series unless otherwise specified in + services.redmine.package while existing installs of NixOS will default to + the Redmine 3.x series. + + + + + The Grafana module now supports declarative + datasource and dashboard + provisioning. + diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 48288cf5962c4f30f72ad727bbab1e2528738755..a5580f4712ebca824c66709ceec356ddf3e9082d 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; }; }; @@ -75,6 +83,8 @@ rec { (m': let config = (getAttr m' nodes).config; in optionalString (config.networking.primaryIPAddress != "") ("${config.networking.primaryIPAddress} " + + optionalString (config.networking.domain != null) + "${config.networking.hostName}.${config.networking.domain} " + "${config.networking.hostName}\n")); virtualisation.qemu.options = diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index f71e264c3478fa219656d5495544c46f60935d8b..5f05b037bdde39a51af48a5c697bfe0de4daf522 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -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 fd805f7f943f21a4f0febfdf1e05029ce1a52c49..9b920b989fcf36140e205be719c46d63f1d53f98 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-disk-image.nix b/nixos/lib/make-disk-image.nix index bf32a36895c5e1f837730624f3b46cdf4e034845..5e86ea479d518292fb6f7d35d99b865463254ec7 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -27,6 +27,9 @@ , # The root file system type. fsType ? "ext4" +, # Filesystem label + label ? "nixos" + , # The initial NixOS configuration file to be copied to # /etc/nixos/configuration.nix. configFile ? null @@ -84,7 +87,7 @@ let format' = format; in let # FIXME: merge with channel.nix / make-channel.nix. channelSources = pkgs.runCommand "nixos-${config.system.nixos.version}" {} '' mkdir -p $out - cp -prd ${nixpkgs} $out/nixos + cp -prd ${nixpkgs.outPath} $out/nixos chmod -R u+w $out/nixos if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs @@ -134,9 +137,9 @@ let format' = format; in let # Get start & length of the root partition in sectors to $START and $SECTORS. eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs) - mkfs.${fsType} -F -L nixos $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K + mkfs.${fsType} -F -L ${label} $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K '' else '' - mkfs.${fsType} -F -L nixos $diskImage + mkfs.${fsType} -F -L ${label} $diskImage ''} root="$PWD/root" diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 88be8b73ab37b03a66fba86f8fe23c3cfa4544e4..47c6374c81adab155a061598848cb2d37ac4247d 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -9,6 +9,7 @@ , e2fsprogs , libfaketime , perl +, lkl }: let @@ -18,16 +19,13 @@ in pkgs.stdenv.mkDerivation { name = "ext4-fs.img"; - nativeBuildInputs = [e2fsprogs.bin libfaketime perl]; + nativeBuildInputs = [e2fsprogs.bin libfaketime perl lkl]; buildCommand = '' # Add the closures of the top-level store objects. storePaths=$(cat ${sdClosureInfo}/store-paths) - # Also include a manifest of the closures in a format suitable for nix-store --load-db. - cp ${sdClosureInfo}/registration nix-path-registration - # Make a crude approximation of the size of the target image. # If the script starts failing, increase the fudge factors here. numInodes=$(find $storePaths | wc -l) @@ -38,55 +36,16 @@ pkgs.stdenv.mkDerivation { truncate -s $bytes $out faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out - # Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs. - # For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep: - # cd /nix/store/abcd...efg-coreutils-8.23/bin - # write /nix/store/abcd...efg-coreutils-8.23/bin/sleep sleep - # sif sleep mode 040555 - # sif sleep gid 30000 - # In particular, debugfs doesn't handle absolute target paths; you have to 'cd' in the virtual - # filesystem first. Likewise the intermediate directories must already exist (using `find` - # handles that for us). And when setting the file's permissions, the inode type flags (__S_IFDIR, - # __S_IFREG) need to be set as well. - ( - echo write nix-path-registration nix-path-registration - echo mkdir nix - echo cd /nix - echo mkdir store - - # XXX: This explodes in exciting ways if anything in /nix/store has a space in it. - find $storePaths -printf '%y %f %h %m\n'| while read -r type file dir perms; do - # echo "TYPE=$type DIR=$dir FILE=$file PERMS=$perms" >&2 + # Also include a manifest of the closures in a format suitable for nix-store --load-db. + cp ${sdClosureInfo}/registration nix-path-registration + cptofs -t ext4 -i $out nix-path-registration / - echo "cd $dir" - case $type in - d) - echo "mkdir $file" - echo sif $file mode $((040000 | 0$perms)) # magic constant is __S_IFDIR - ;; - f) - echo "write $dir/$file $file" - echo sif $file mode $((0100000 | 0$perms)) # magic constant is __S_IFREG - ;; - l) - echo "symlink $file $(readlink "$dir/$file")" - ;; - *) - echo "Unknown entry: $type $dir $file $perms" >&2 - exit 1 - ;; - esac + # Create nix/store before copying paths + faketime -f "1970-01-01 00:00:01" mkdir -p nix/store + cptofs -t ext4 -i $out nix / - echo sif $file gid 30000 # chgrp to nixbld - done - ) | faketime -f "1970-01-01 00:00:01" debugfs -w $out -f /dev/stdin > errorlog 2>&1 - - # The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually. - if egrep -q 'Could not allocate|File not found' errorlog; then - cat errorlog - echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---" - return 1 - fi + echo "copying store paths to image..." + cptofs -t ext4 -i $out $storePaths /nix/store/ # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. if ! fsck.ext4 -n -f $out; then @@ -94,5 +53,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-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index 45cdef1ef4df5933e4ae10d057bf341d92ad6db2..b7b1ab52a637365f03424b80d88d6725da9abc51 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -47,7 +47,8 @@ if test -n "$bootable"; then isoBootFlags="-eltorito-boot ${bootImage} -eltorito-catalog .boot.cat - -no-emul-boot -boot-load-size 4 -boot-info-table" + -no-emul-boot -boot-load-size 4 -boot-info-table + --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO fi if test -n "$usbBootable"; then @@ -112,7 +113,7 @@ xorriso="xorriso -r -path-list pathlist --sort-weight 0 / - --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO +" $xorriso -output $out/iso/$isoName diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index 7ab84e47f53b592ef70e5c598a126ece66c0a299..ee76c9c5bf240bfa2d9247722a447a79c4c57303 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -3,6 +3,9 @@ , # The root directory of the squashfs filesystem is filled with the # closures of the Nix store paths listed here. storeContents ? [] +, # Compression parameters. + # For zstd compression you can use "zstd -Xcompression-level 6". + comp ? "xz -Xdict-size 100%" }: stdenv.mkDerivation { @@ -20,6 +23,6 @@ stdenv.mkDerivation { # Generate the squashfs image. mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \ - -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100% + -keep-as-directory -all-root -b 1048576 -comp ${comp} ''; } diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix index 846013b02d149ce31b6260c29a03cc6a25d41913..dee91a6ce3f4922fcad2e6f4bef572fcb2cbdd28 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 1a52a284a2573ebffe0c9c3e160eb8fd7bc4ac1b..1a0017a1799a4f87d3efc9246eb62e793f2648b1 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/Logger.pm b/nixos/lib/test-driver/Logger.pm index 3fe5ef67c144e35cf80d225a3d5963d274134969..080310ea34e0854dd5c6efada0f44830ab78861f 100644 --- a/nixos/lib/test-driver/Logger.pm +++ b/nixos/lib/test-driver/Logger.pm @@ -4,6 +4,7 @@ use strict; use Thread::Queue; use XML::Writer; use Encode qw(decode encode); +use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); sub new { my ($class) = @_; @@ -46,10 +47,12 @@ sub nest { print STDERR maybePrefix("$msg\n", $attrs); $self->{log}->startTag("nest"); $self->{log}->dataElement("head", $msg, %{$attrs}); + my $now = clock_gettime(CLOCK_MONOTONIC); $self->drainLogQueue(); eval { &$coderef }; my $res = $@; $self->drainLogQueue(); + $self->log(sprintf("(%.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now)); $self->{log}->endTag("nest"); die $@ if $@; } diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index b18f48464ceec5917b38b71d02b9235e54368ffa..006da889671eea860b18c27266614761aff0c5ca 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -10,6 +10,7 @@ use Cwd; use File::Basename; use File::Path qw(make_path); use File::Slurp; +use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); my $showGraphics = defined $ENV{'DISPLAY'}; @@ -247,12 +248,15 @@ sub connect { $self->start; + my $now = clock_gettime(CLOCK_MONOTONIC); local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; }; - alarm 300; + alarm 600; readline $self->{socket} or die "the VM quit before connecting\n"; alarm 0; $self->log("connected to guest root shell"); + # We're interested in tracking how close we are to `alarm`. + $self->log(sprintf("(connecting took %.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now)); $self->{connected} = 1; }); diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 42a0c60c7e19c893ad57d49a9b03ddb0f6e19a6d..a13e76a695603f5d7350157710f3b06c84f66e45 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -1,6 +1,13 @@ -{ system, minimal ? false, config ? {} }: - -with import ./build-vms.nix { inherit system minimal config; }; +{ system +, pkgs ? import ../.. { inherit system config; } + # Use a minimal kernel? +, minimal ? false + # Ignored +, config ? {} + # Modules to add to each VM +, extraConfigurations ? [] }: + +with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; with pkgs; let @@ -27,14 +34,14 @@ in rec { cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver chmod u+x $out/bin/nixos-test-driver - libDir=$out/lib/perl5/site_perl + libDir=$out/${perl.libPrefix} mkdir -p $libDir cp ${./test-driver/Machine.pm} $libDir/Machine.pm cp ${./test-driver/Logger.pm} $libDir/Logger.pm wrapProgram $out/bin/nixos-test-driver \ --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ - --prefix PERL5LIB : "${with perlPackages; lib.makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/lib/perl5/site_perl" + --prefix PERL5LIB : "${with perlPackages; makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/${perl.libPrefix}" ''; }; @@ -69,7 +76,7 @@ in rec { mkdir -p $out/coverage-data mv $i $out/coverage-data/$(dirname $(dirname $i)) done - ''; # */ + ''; }; @@ -109,7 +116,7 @@ in rec { vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); - ocrProg = tesseract_4.override { enableLanguages = [ "eng" ]; }; + ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; }; imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; @@ -149,9 +156,23 @@ in rec { test = passMeta (runTests driver); report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; }); - in (if makeCoverageReport then report else test) // { - inherit nodes driver test; - }; + nodeNames = builtins.attrNames nodes; + invalidNodeNames = lib.filter + (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames; + + in + if lib.length invalidNodeNames > 0 then + throw '' + Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! + All machines are referenced as perl variables in the testing framework which will break the + script when special characters are used. + + Please stick to alphanumeric chars and underscores as separation. + '' + else + (if makeCoverageReport then report else test) // { + inherit nodes driver test; + }; runInMachine = { drv diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 1ef915d406120fcb712ed61838a67de44c3c92a2..b68e55a40b90829d06e620f9924c149b6ecfe464 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -7,9 +7,8 @@ rec { || elem fs.mountPoint [ "/" "/nix" "/nix/store" "/var" "/var/log" "/var/lib" "/etc" ]; # Check whenever `b` depends on `a` as a fileSystem - # FIXME: it's incorrect to simply use hasPrefix here: "/dev/a" is not a parent of "/dev/ab" - fsBefore = a: b: ((any (x: elem x [ "bind" "move" ]) b.options) && (a.mountPoint == b.device)) - || (hasPrefix a.mountPoint b.mountPoint); + fsBefore = a: b: a.mountPoint == b.device + || hasPrefix "${a.mountPoint}${optionalString (!(hasSuffix "/" a.mountPoint)) "/"}" b.mountPoint; # Escape a path according to the systemd rules, e.g. /dev/xyzzy # becomes dev-xyzzy. FIXME: slow. diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index 0fd26d34d07f9ff6bf8bc55eb78bb88785196ae9..48748a59d298a41ff022f7c9ae76efc507c124ca 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/maintainers/scripts/openstack/nova-image.nix b/nixos/maintainers/scripts/openstack/nova-image.nix deleted file mode 100644 index b6f3a5b152003cfa8ffd9f680c60ea5289ea40eb..0000000000000000000000000000000000000000 --- a/nixos/maintainers/scripts/openstack/nova-image.nix +++ /dev/null @@ -1,26 +0,0 @@ -# nix-build '' -A config.system.build.novaImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/nova-image.nix ]; }" - -{ config, lib, pkgs, ... }: - -with lib; - -{ - imports = - [ ../../../modules/installer/cd-dvd/channel.nix - ../../../modules/virtualisation/nova-config.nix - ]; - - system.build.novaImage = import ../../../lib/make-disk-image.nix { - inherit lib config; - pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - diskSize = 8192; - format = "qcow2"; - configFile = pkgs.writeText "configuration.nix" - '' - { - imports = [ ]; - } - ''; - }; - -} diff --git a/nixos/maintainers/scripts/openstack/openstack-image.nix b/nixos/maintainers/scripts/openstack/openstack-image.nix new file mode 100644 index 0000000000000000000000000000000000000000..4c464f43f61d8ba67d4e17d215e2e8089660a2c4 --- /dev/null +++ b/nixos/maintainers/scripts/openstack/openstack-image.nix @@ -0,0 +1,26 @@ +# nix-build '' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }" + +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = + [ ../../../modules/installer/cd-dvd/channel.nix + ../../../modules/virtualisation/openstack-config.nix + ]; + + system.build.openstackImage = import ../../../lib/make-disk-image.nix { + inherit lib config; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package + diskSize = 8192; + format = "qcow2"; + configFile = pkgs.writeText "configuration.nix" + '' + { + imports = [ ]; + } + ''; + }; + +} diff --git a/nixos/modules/config/appstream.nix b/nixos/modules/config/appstream.nix new file mode 100644 index 0000000000000000000000000000000000000000..483ac9c3cd76221d7abbd4fdccfc870bbc840523 --- /dev/null +++ b/nixos/modules/config/appstream.nix @@ -0,0 +1,25 @@ +{ config, lib, ... }: + +with lib; +{ + options = { + appstream.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install files to support the + AppStream metadata specification. + ''; + }; + }; + + config = mkIf config.appstream.enable { + environment.pathsToLink = [ + # per component metadata + "/share/metainfo" + # legacy path for above + "/share/appdata" + ]; + }; + +} diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix index fc01c15acb9b895b55ca289d2b71d4c66e9ff905..7e05e77d967a29606e168fac199a28a4ae5160dd 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 0000000000000000000000000000000000000000..9c5d993b9c592c94d85ba22cb9f5586365f7870b --- /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 6bf8c653e113a0247ee5cc1f7fefca5ba53f988b..dc7305b1ba24c7ded0dbbaaa8fc3937e30d1e3d1 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 + . + ''; + }; + 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 881ad671a627596c8b903c8bc1fb493ce96acc9d..a1d9ebcec66bf54f94a0f20b0e0fc69c18acded7 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 c22e99a0a2f182ba6f91f35f59287d0310235612..87021a27d34f240778ed65bead0470138d8c4bdf 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/ldap.nix b/nixos/modules/config/ldap.nix index 0693e896f7151601b93bb47970ac46b055095348..f65a3fc50d548101faba68bcd45b02d43622f51f 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -38,6 +38,8 @@ let bind_timelimit ${toString cfg.bind.timeLimit} ${optionalString (cfg.bind.distinguishedName != "") "binddn ${cfg.bind.distinguishedName}" } + ${optionalString (cfg.daemon.rootpwmoddn != "") + "rootpwmoddn ${cfg.daemon.rootpwmoddn}" } ${optionalString (cfg.daemon.extraConfig != "") cfg.daemon.extraConfig } ''; }; @@ -126,6 +128,26 @@ in the end of the nslcd configuration file (nslcd.conf). '' ; } ; + + rootpwmoddn = mkOption { + default = ""; + example = "cn=admin,dc=example,dc=com"; + type = types.str; + description = '' + The distinguished name to use to bind to the LDAP server + when the root user tries to modify a user's password. + ''; + }; + + rootpwmodpw = mkOption { + default = ""; + example = "/run/keys/nslcd.rootpwmodpw"; + type = types.str; + description = '' + The path to a file containing the credentials with which + to bind to the LDAP server if the root user tries to change a user's password + ''; + }; }; bind = { @@ -203,9 +225,11 @@ in system.activationScripts = mkIf insertLdapPassword { ldap = stringAfter [ "etc" "groups" "users" ] '' if test -f "${cfg.bind.password}" ; then - echo "bindpw "$(cat ${cfg.bind.password})"" | cat ${ldapConfig.source} - > /etc/ldap.conf.bindpw - mv -fT /etc/ldap.conf.bindpw /etc/ldap.conf - chmod 600 /etc/ldap.conf + umask 0077 + conf="$(mktemp)" + printf 'bindpw %s\n' "$(cat ${cfg.bind.password})" | + cat ${ldapConfig.source} - >"$conf" + mv -fT "$conf" /etc/ldap.conf fi ''; }; @@ -232,21 +256,31 @@ in wantedBy = [ "multi-user.target" ]; preStart = '' - mkdir -p /run/nslcd - rm -f /run/nslcd/nslcd.pid; - chown nslcd.nslcd /run/nslcd - ${optionalString (cfg.bind.distinguishedName != "") '' - if test -s "${cfg.bind.password}" ; then - ln -sfT "${cfg.bind.password}" /run/nslcd/bindpw - fi - ''} + umask 0077 + conf="$(mktemp)" + { + cat ${nslcdConfig.source} + test -z '${cfg.bind.distinguishedName}' -o ! -f '${cfg.bind.password}' || + printf 'bindpw %s\n' "$(cat '${cfg.bind.password}')" + test -z '${cfg.daemon.rootpwmoddn}' -o ! -f '${cfg.daemon.rootpwmodpw}' || + printf 'rootpwmodpw %s\n' "$(cat '${cfg.daemon.rootpwmodpw}')" + } >"$conf" + mv -fT "$conf" /etc/nslcd.conf ''; + # NOTE: because one cannot pass a custom config path to `nslcd` + # (which is only able to use `/etc/nslcd.conf`) + # changes in `nslcdConfig` won't change `serviceConfig`, + # and thus won't restart `nslcd`. + # Therefore `restartTriggers` is used on `/etc/nslcd.conf`. + restartTriggers = [ nslcdConfig.source ]; + serviceConfig = { ExecStart = "${nss_pam_ldapd}/sbin/nslcd"; Type = "forking"; PIDFile = "/run/nslcd/nslcd.pid"; Restart = "always"; + RuntimeDirectory = [ "nslcd" ]; }; }; diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 1ef5313d3fdd5dab4fdcf638ac249a0627190404..25253cf02e1d99e4b2e805af728d6ea66dee5620 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 d9ecaa4818ba66f101928109114e1c353b6848cf..37e66c645429410eb7b3ec660f8119c0e08ec2d9 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/nsswitch.nix b/nixos/modules/config/nsswitch.nix index a74d551f50df47240f622ffb221c6278f9eef707..b601e908e49f079d5bf3ae710f93b3b2771b51de 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -1,6 +1,6 @@ # Configuration for the Name Service Switch (/etc/nsswitch.conf). -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -15,6 +15,7 @@ let ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); sssd = canLoadExternalModules && config.services.sssd.enable; resolved = canLoadExternalModules && config.services.resolved.enable; + googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable; hostArray = [ "files" ] ++ optional mymachines "mymachines" @@ -29,6 +30,7 @@ let ++ optional sssd "sss" ++ optional ldap "ldap" ++ optional mymachines "mymachines" + ++ optional googleOsLogin "cache_oslogin oslogin" ++ [ "systemd" ]; shadowArray = [ "files" ] @@ -97,7 +99,7 @@ in { # configured IP addresses, or ::1 and 127.0.0.2 as # fallbacks. Systemd also provides nss-mymachines to return IP # addresses of local containers. - system.nssModules = optionals canLoadExternalModules [ config.systemd.package.out ]; - + system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ]) + ++ optional googleOsLogin pkgs.google-compute-engine-oslogin.out; }; } diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index e16a021ec20b86ce9a78ac88f01f5665b512bc0a..e61a3a7312018ec05249a21d40db455fa6e5d7a9 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; @@ -168,7 +180,7 @@ in { type = types.attrsOf types.unspecified; default = {}; description = ''Config of the pulse daemon. See man pulse-daemon.conf.''; - example = literalExample ''{ flat-volumes = "no"; }''; + example = literalExample ''{ realtime-scheduling = "yes"; }''; }; }; @@ -230,12 +242,27 @@ in { source = writeText "libao.conf" "default_driver=pulse"; } ]; + # Disable flat volumes to enable relative ones + hardware.pulseaudio.daemon.config.flat-volumes = mkDefault "no"; + # Allow PulseAudio to get realtime priority using rtkit. security.rtkit.enable = true; 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 555db459f57a618457a381762166c1c10d0979fa..6379b52870ea27be181069c2ad4f5a63f6467540 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,6 +157,12 @@ 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)} diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index ffb437491f6c7fff9fe55502f4a270f668c6d29f..7a65e44e828d44c812188d3fa9c86b1895219fb4 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -7,19 +7,21 @@ with lib; let - requiredPackages = + requiredPackages = map lib.lowPrio [ config.nix.package pkgs.acl 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 426e1666a814f90b6fbc1a9825ac578f4fde0a49..c3f228c9bcc4d78e0b4114397b159c8174a9be9f 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; }) @@ -534,8 +534,8 @@ in { install -m 0755 -d /home ${pkgs.perl}/bin/perl -w \ - -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \ - -I${pkgs.perlPackages.JSON}/lib/perl5/site_perl \ + -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix} \ + -I${pkgs.perlPackages.JSON}/${pkgs.perl.libPrefix} \ ${./update-users-groups.pl} ${spec} ''; diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 4323a49ea1dd0e2f834f04854e297fef8edae744..cd1064630fbcce0c671b2e3f1bbfe7a215ed8aae 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -24,11 +24,11 @@ with lib; environment.extraSetup = '' if [ -w $out/share/mime ] && [ -d $out/share/mime/packages ]; then - XDG_DATA_DIRS=$out/share ${pkgs.shared-mime-info}/bin/update-mime-database -V $out/share/mime > /dev/null + 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/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix new file mode 100644 index 0000000000000000000000000000000000000000..148240d631cf266696522da2a1fae60f38c84b10 --- /dev/null +++ b/nixos/modules/config/xdg/sounds.nix @@ -0,0 +1,22 @@ +{ config, lib, ... }: + +with lib; +{ + options = { + xdg.sounds.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install files to support the + XDG Sound Theme specification. + ''; + }; + }; + + config = mkIf config.xdg.sounds.enable { + environment.pathsToLink = [ + "/share/sounds" + ]; + }; + +} diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index c1748812821e71a86412c6a6566b708ca33244e0..925d945c081ee59bc3929d0c8fdd1385b4ceda48 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -6,10 +6,27 @@ let cfg = config.zramSwap; - devices = map (nr: "zram${toString nr}") (range 0 (cfg.numDevices - 1)); + # don't set swapDevices as mkDefault, so we can detect user had read our warning + # (see below) and made an action (or not) + devicesCount = if cfg.swapDevices != null then cfg.swapDevices else cfg.numDevices; + + devices = map (nr: "zram${toString nr}") (range 0 (devicesCount - 1)); modprobe = "${pkgs.kmod}/bin/modprobe"; + warnings = + assert cfg.swapDevices != null -> cfg.numDevices >= cfg.swapDevices; + flatten [ + (optional (cfg.numDevices > 1 && cfg.swapDevices == null) '' + Using several small zram devices as swap is no better than using one large. + Set either zramSwap.numDevices = 1 or explicitly set zramSwap.swapDevices. + + Previously multiple zram devices were used to enable multithreaded + compression. Linux supports multithreaded compression for 1 device + since 3.15. See https://lkml.org/lkml/2014/2/28/404 for details. + '') + ]; + in { @@ -24,9 +41,11 @@ in default = false; type = types.bool; description = '' - Enable in-memory compressed swap space provided by the zram kernel - module. - See https://www.kernel.org/doc/Documentation/blockdev/zram.txt + Enable in-memory compressed devices and swap space provided by the zram + kernel module. + See + https://www.kernel.org/doc/Documentation/blockdev/zram.txt + . ''; }; @@ -34,7 +53,19 @@ in default = 1; type = types.int; description = '' - Number of zram swap devices to create. + Number of zram devices to create. See also + zramSwap.swapDevices + ''; + }; + + swapDevices = mkOption { + default = null; + example = 1; + type = with types; nullOr int; + description = '' + Number of zram devices to be used as swap. Must be + <= zramSwap.numDevices. + Default is same as zramSwap.numDevices, recommended is 1. ''; }; @@ -44,7 +75,8 @@ in description = '' Maximum amount of memory that can be used by the zram swap devices (as a percentage of your total memory). Defaults to 1/2 of your total - RAM. + RAM. Run zramctl to check how good memory is + compressed. ''; }; @@ -58,12 +90,26 @@ in ''; }; + algorithm = mkOption { + default = "zstd"; + example = "lzo"; + type = with types; either (enum [ "lzo" "lz4" "zstd" ]) str; + description = '' + Compression algorithm. lzo has good compression, + but is slow. lz4 has bad compression, but is fast. + zstd is both good compression and fast. + You can check what other algorithms are supported by your zram device with + cat /sys/class/block/zram*/comp_algorithm + ''; + }; }; }; config = mkIf cfg.enable { + inherit warnings; + system.requiredKernelConfig = with config.lib.kernelConfig; [ (isModule "ZRAM") ]; @@ -85,25 +131,25 @@ in createZramInitService = dev: nameValuePair "zram-init-${dev}" { description = "Init swap on zram-based device ${dev}"; - bindsTo = [ "dev-${dev}.swap" ]; after = [ "dev-${dev}.device" "zram-reloader.service" ]; requires = [ "dev-${dev}.device" "zram-reloader.service" ]; before = [ "dev-${dev}.swap" ]; requiredBy = [ "dev-${dev}.swap" ]; + unitConfig.DefaultDependencies = false; # needed to prevent a cycle serviceConfig = { Type = "oneshot"; RemainAfterExit = true; ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/class/block/${dev}/reset'"; }; script = '' - set -u - set -o pipefail - + set -euo pipefail + # Calculate memory to use for zram - totalmem=$(${pkgs.gnugrep}/bin/grep 'MemTotal: ' /proc/meminfo | ${pkgs.gawk}/bin/awk '{print $2}') - mem=$(((totalmem * ${toString cfg.memoryPercent} / 100 / ${toString cfg.numDevices}) * 1024)) + mem=$(${pkgs.gawk}/bin/awk '/MemTotal: / { + print int($2*${toString cfg.memoryPercent}/100.0/${toString devicesCount}*1024) + }' /proc/meminfo) - echo $mem > /sys/class/block/${dev}/disksize + ${pkgs.utillinux}/sbin/zramctl --size $mem --algorithm ${cfg.algorithm} /dev/${dev} ${pkgs.utillinux}/sbin/mkswap /dev/${dev} ''; restartIfChanged = false; @@ -111,6 +157,9 @@ in in listToAttrs ((map createZramInitService devices) ++ [(nameValuePair "zram-reloader" { description = "Reload zram kernel module when number of devices changes"; + wants = [ "systemd-udevd.service" ]; + after = [ "systemd-udevd.service" ]; + unitConfig.DefaultDependencies = false; # needed to prevent a cycle serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -118,7 +167,11 @@ in ExecStart = "${modprobe} zram"; ExecStop = "${modprobe} -r zram"; }; - restartTriggers = [ cfg.numDevices ]; + restartTriggers = [ + cfg.numDevices + cfg.algorithm + cfg.memoryPercent + ]; restartIfChanged = true; })]); diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index e978ec6b40ada61d64047bfc9605d8f09d26998b..69cc22aaa34b1be6cb2dca4d6782a80c2284857c 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -38,7 +38,7 @@ in { firmwareLinuxNonfree intel2200BGFirmware rtl8192su-firmware - ] ++ optional (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) raspberrypiWirelessFirmware + ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware ]; diff --git a/nixos/modules/hardware/bladeRF.nix b/nixos/modules/hardware/bladeRF.nix new file mode 100644 index 0000000000000000000000000000000000000000..925443477143167e48c58f0b736c44f05bfe1447 --- /dev/null +++ b/nixos/modules/hardware/bladeRF.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.bladeRF; + +in + +{ + options.hardware.bladeRF = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables udev rules for BladeRF devices. By default grants access + to users in the "bladerf" group. You may want to install the + libbladeRF package. + ''; + }; + + }; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.libbladeRF ]; + users.groups.bladerf = {}; + }; +} \ No newline at end of file diff --git a/nixos/modules/hardware/ckb-next.nix b/nixos/modules/hardware/ckb-next.nix new file mode 100644 index 0000000000000000000000000000000000000000..20b2756d8b2663e8cfcfcd100d86d68fdf846f78 --- /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 8429572a8822644bbf628ee223d87bfb18cb66cc..0000000000000000000000000000000000000000 --- 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 b371af353cf9ac2b3913398c51e55221064c63d3..6b7b8069fd44a23f08ea91d113c8b955f7599435 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; @@ -124,22 +124,26 @@ in config = mkIf cfg.enable { - assertions = lib.singleton { - assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; - 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 - ''} - ''; + assertions = [ + { assertion = cfg.driSupport32Bit -> pkgs.stdenv.isx86_64; + message = "Option driSupport32Bit only makes sense on a 64-bit system."; + } + { assertion = cfg.driSupport32Bit -> (config.boot.kernelPackages.kernel.features.ia32Emulation or false); + message = "Option driSupport32Bit requires a kernel that supports 32bit emulation"; + } + ]; + + 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 +152,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 1b4b1fa1954fb0cd793557f0938ddb6094365006..3a65cb800a98a9f938ca0bdf5cadea3dbdc53a18 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 0000000000000000000000000000000000000000..378aeffe71b5ebc9b2671b5d4e5b2386d2961dd8 --- /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 50af022b93c86e54c0680afab7f1920ef6f053ef..ab9e0c92020e0c49a0b118753d548fb721085906 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 2fa37af6ca58836d8c82fb0223f8af066dedda67..6102919f0155f78202a438173a2f3cc87647e308 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 eb1952280331f6553cc21f016e9376b64b33de2c..6ba8130af71f6479f49e2e1c361f9efcbae32b0a 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; @@ -20,38 +20,154 @@ let kernelPackages.nvidia_x11_legacy304 else if elem "nvidiaLegacy340" drivers then kernelPackages.nvidia_x11_legacy340 + else if elem "nvidiaLegacy390" drivers then + kernelPackages.nvidia_x11_legacy390 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 + . This is not enabled + by default because it is not officially supported by NVIDIA and would not + work with SLI. + ''; + }; + + hardware.nvidia.optimus_prime.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME. + If enabled, the NVIDIA GPU will be always on and used for all rendering, + while enabling output to displays attached only to the integrated Intel GPU + without a multiplexer. + + Note that this option only has any effect if the "nvidia" driver is specified + in , and it should preferably + be the only driver there. + + If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be + specified ( and + ). + + If you enable this, you may want to also enable kernel modesetting for the + NVIDIA driver () in order + to prevent tearing. + + Note that this configuration will only be successful when a display manager + for which the + option is supported is used; notably, SLiM is not supported. + ''; + }; + + hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption { + type = lib.types.string; + default = ""; + example = "PCI:1:0:0"; + description = '' + Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci + shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0". + ''; + }; + + hardware.nvidia.optimus_prime.intelBusId = lib.mkOption { + type = lib.types.string; + default = ""; + example = "PCI:0:2:0"; + description = '' + Bus ID of the Intel GPU. You can find it using lspci; for example if lspci + shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0". + ''; + }; + }; config = mkIf enabled { assertions = [ { - assertion = config.services.xserver.displayManager.gdm.wayland; - message = "NVidia drivers don't support wayland"; + 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.drivers = singleton { + name = "nvidia"; + modules = [ nvidia_x11.bin ]; + libPath = [ nvidia_x11 ]; + deviceSection = optionalString optimusCfg.enable + '' + BusID "${optimusCfg.nvidiaBusId}" + ''; + screenSection = + '' + Option "RandRRotation" "on" + ${optionalString optimusCfg.enable "Option \"AllowEmptyInitialConfiguration\""} + ''; + }; - services.xserver.screenSection = + services.xserver.extraConfig = optionalString optimusCfg.enable + '' + Section "Device" + Identifier "nvidia-optimus-intel" + Driver "modesetting" + BusID "${optimusCfg.intelBusId}" + Option "AccelMethod" "none" + EndSection + ''; + services.xserver.serverLayoutSection = optionalString optimusCfg.enable '' - Option "RandRRotation" "on" + Inactive "nvidia-optimus-intel" ''; + services.xserver.displayManager.setupCommands = optionalString optimusCfg.enable '' + # Added by nvidia configuration module for Optimus/PRIME. + ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0 + ${pkgs.xorg.xrandr}/bin/xrandr --auto + ''; + environment.etc."nvidia/nvidia-application-profiles-rc" = mkIf nvidia_x11.useProfiles { source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc"; }; hardware.opengl.package = nvidia_x11.out; - hardware.opengl.package32 = nvidia_libs32.out; + hardware.opengl.package32 = nvidia_libs32; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ]; @@ -62,6 +178,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 ab918a9fb23e3fb690990cf565626af4191a5539..117482fb0d57d997797bb9e4772b5b716a3f631f 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -3,32 +3,50 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-input-methods"> - -Input Methods - -Input methods are an operating system component that allows any data, such - as keyboard strokes or mouse movements, to be received as input. In this way - users can enter characters and symbols not found on their input devices. Using - an input method is obligatory for any language that has more graphemes than - there are keys on the keyboard. - -The following input methods are available in NixOS: - - - IBus: The intelligent input bus. - Fcitx: A customizable lightweight input - method. - Nabi: A Korean input method based on XIM. - Uim: The universal input method, is a library with a XIM - bridge. - - -
IBus - -IBus is an Intelligent Input Bus. It provides full featured and user - friendly input method user interface. - -The following snippet can be used to configure IBus: + Input Methods + + Input methods are an operating system component that allows any data, such as + keyboard strokes or mouse movements, to be received as input. In this way + users can enter characters and symbols not found on their input devices. + Using an input method is obligatory for any language that has more graphemes + than there are keys on the keyboard. + + + The following input methods are available in NixOS: + + + + + IBus: The intelligent input bus. + + + + + Fcitx: A customizable lightweight input method. + + + + + Nabi: A Korean input method based on XIM. + + + + + Uim: The universal input method, is a library with a XIM bridge. + + + +
+ IBus + + + IBus is an Intelligent Input Bus. It provides full featured and user + friendly input method user interface. + + + + The following snippet can be used to configure IBus: + i18n.inputMethod = { @@ -37,57 +55,89 @@ i18n.inputMethod = { }; -i18n.inputMethod.ibus.engines is optional and can be - used to add extra IBus engines. - -Available extra IBus engines are: - - - Anthy (ibus-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji - mixed text. - Hangul (ibus-engines.hangul): Korean input - method. - m17n (ibus-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n - database. - mozc (ibus-engines.mozc): A Japanese input - method from Google. - Table (ibus-engines.table): An input method - that load tables of input methods. - table-others (ibus-engines.table-others): - Various table-based input methods. To use this, and any other table-based - input methods, it must appear in the list of engines along with - table. For example: + + i18n.inputMethod.ibus.engines is optional and can be used + to add extra IBus engines. + + + + Available extra IBus engines are: + + + + + + Anthy (ibus-engines.anthy): Anthy is a system for + Japanese input method. It converts Hiragana text to Kana Kanji mixed text. + + + + + Hangul (ibus-engines.hangul): Korean input method. + + + + + m17n (ibus-engines.m17n): m17n is an input method that + uses input methods and corresponding icons in the m17n database. + + + + + mozc (ibus-engines.mozc): A Japanese input method from + Google. + + + + + Table (ibus-engines.table): An input method that load + tables of input methods. + + + + + table-others (ibus-engines.table-others): Various + table-based input methods. To use this, and any other table-based input + methods, it must appear in the list of engines along with + table. For example: ibus.engines = with pkgs.ibus-engines; [ table table-others ]; - - - -To use any input method, the package must be added in the configuration, - as shown above, and also (after running nixos-rebuild) the - input method must be added from IBus' preference dialog. - - - Troubleshooting - If IBus works in some applications but not others, a likely cause of - this is that IBus is depending on a different version of - glib to what the applications are depending on. This can - be checked by running nix-store -q --requisites <path> | grep - glib, where <path> is the path of either - IBus or an application in the Nix store. The glib - packages must match exactly. If they do not, uninstalling and reinstalling - the application is a likely fix. - -
- -
Fcitx - -Fcitx is an input method framework with extension support. It has three - built-in Input Method Engine, Pinyin, QuWei and Table-based input - methods. -The following snippet can be used to configure Fcitx: + + + + + + To use any input method, the package must be added in the configuration, as + shown above, and also (after running nixos-rebuild) the + input method must be added from IBus' preference dialog. + + + + Troubleshooting + + If IBus works in some applications but not others, a likely cause of this + is that IBus is depending on a different version of glib + to what the applications are depending on. This can be checked by running + nix-store -q --requisites <path> | grep glib, + where <path> is the path of either IBus or an + application in the Nix store. The glib packages must + match exactly. If they do not, uninstalling and reinstalling the + application is a likely fix. + + +
+
+ Fcitx + + + Fcitx is an input method framework with extension support. It has three + built-in Input Method Engine, Pinyin, QuWei and Table-based input methods. + + + + The following snippet can be used to configure Fcitx: + i18n.inputMethod = { @@ -96,51 +146,89 @@ i18n.inputMethod = { }; -i18n.inputMethod.fcitx.engines is optional and can be - used to add extra Fcitx engines. - -Available extra Fcitx engines are: - - - Anthy (fcitx-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to Kana Kanji - mixed text. - Chewing (fcitx-engines.chewing): Chewing is - an intelligent Zhuyin input method. It is one of the most popular input - methods among Traditional Chinese Unix users. - Hangul (fcitx-engines.hangul): Korean input - method. - Unikey (fcitx-engines.unikey): Vietnamese input - method. - m17n (fcitx-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the m17n - database. - mozc (fcitx-engines.mozc): A Japanese input - method from Google. - table-others (fcitx-engines.table-others): - Various table-based input methods. - -
- -
Nabi - -Nabi is an easy to use Korean X input method. It allows you to enter - phonetic Korean characters (hangul) and pictographic Korean characters - (hanja). -The following snippet can be used to configure Nabi: + + i18n.inputMethod.fcitx.engines is optional and can be + used to add extra Fcitx engines. + + + + Available extra Fcitx engines are: + + + + + + Anthy (fcitx-engines.anthy): Anthy is a system for + Japanese input method. It converts Hiragana text to Kana Kanji mixed text. + + + + + Chewing (fcitx-engines.chewing): Chewing is an + intelligent Zhuyin input method. It is one of the most popular input + methods among Traditional Chinese Unix users. + + + + + Hangul (fcitx-engines.hangul): Korean input method. + + + + + Unikey (fcitx-engines.unikey): Vietnamese input method. + + + + + m17n (fcitx-engines.m17n): m17n is an input method that + uses input methods and corresponding icons in the m17n database. + + + + + mozc (fcitx-engines.mozc): A Japanese input method from + Google. + + + + + table-others (fcitx-engines.table-others): Various + table-based input methods. + + + +
+
+ Nabi + + + Nabi is an easy to use Korean X input method. It allows you to enter + phonetic Korean characters (hangul) and pictographic Korean characters + (hanja). + + + + The following snippet can be used to configure Nabi: + i18n.inputMethod = { enabled = "nabi"; }; -
+
+
+ Uim -
Uim + + Uim (short for "universal input method") is a multilingual input method + framework. Applications can use it through so-called bridges. + -Uim (short for "universal input method") is a multilingual input method - framework. Applications can use it through so-called bridges. -The following snippet can be used to configure uim: + + The following snippet can be used to configure uim: + i18n.inputMethod = { @@ -148,8 +236,9 @@ i18n.inputMethod = { }; -Note: The option can be - used to choose uim toolbar. - -
+ + Note: The option can be + used to choose uim toolbar. + +
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 01cfe8a02e10d248083fd135e32bfd33c8e7e222..e946c4abc57617a244972b0b3d5fff68d23aca02 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -16,7 +16,7 @@ let { } '' mkdir -p $out - cp -prd ${nixpkgs} $out/nixos + cp -prd ${nixpkgs.outPath} $out/nixos chmod -R u+w $out/nixos if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs 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 0000000000000000000000000000000000000000..228ef371d2523eb092b6cbd9b5037dea8c6b33a8 --- /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 4c4e69d60d9c701aae370a39f9def061f66fcf18..42b5ec8822726c099de9058b49db2cd824c089f9 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -6,47 +6,11 @@ with lib; { - imports = [ ./installation-cd-base.nix ]; + imports = [ ./installation-cd-graphical-base.nix ]; - services.xserver = { - enable = true; - # GDM doesn't start in virtual machines with ISO - displayManager.slim = { - enable = true; - defaultUser = "root"; - autoLogin = true; - }; - desktopManager.gnome3 = { - enable = true; - extraGSettingsOverrides = '' - [org.gnome.desktop.background] - show-desktop-icons=true - - [org.gnome.nautilus.desktop] - trash-icon-visible=false - volumes-visible=false - home-icon-visible=false - network-icon-visible=false - ''; - - extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ]; - }; - }; - - environment.systemPackages = - [ # Include gparted for partitioning disks. - pkgs.gparted + services.xserver.desktopManager.gnome3.enable = true; - # Include some editors. - pkgs.vim - pkgs.bvi # binary editor - pkgs.joe - - pkgs.glxinfo - ]; - - # Don't start the X server by default. - services.xserver.autorun = mkForce false; + services.xserver.displayManager.slim.enable = mkForce false; # Auto-login as root. services.xserver.displayManager.gdm.autoLogin = { @@ -54,25 +18,4 @@ with lib; user = "root"; }; - system.activationScripts.installerDesktop = let - # Must be executable - desktopFile = pkgs.writeScript "nixos-manual.desktop" '' - [Desktop Entry] - Version=1.0 - Type=Link - Name=NixOS Manual - URL=${config.system.build.manual.manual}/share/doc/nixos/index.html - Icon=system-help - ''; - - # use cp and chmod +x, we must be sure the apps are in the nix store though - in '' - mkdir -p /root/Desktop - ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop - cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop - chmod a+rx /root/Desktop/gnome-terminal.desktop - cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop - chmod a+rx /root/Desktop/gparted.desktop - ''; - } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 63227d5734954d643a2354c4cd4f139534837637..1c3c9cb30b41b68dd90428433e611e8f7b083afb 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 3dc0f606bf6090b7278a53485ec0eb7f98429d7c..bcdbffdc20b7d8c11a07583109f27a1f19882d1b 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 98712f0759a98c59d30383120cde777ae68b5c9f..e78e290e74387dbd1416a6f85f93bb1063137412 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -50,7 +50,7 @@ let finalCfg = { name = "NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}"; params = "init=${config.system.build.toplevel}/init ${additional} ${toString config.boot.kernelParams}"; - image = "/boot/bzImage"; + image = "/boot/${config.system.boot.loader.kernelFile}"; initrd = "/boot/initrd"; }; in @@ -163,7 +163,7 @@ let cp -v ${pkgs.refind}/share/refind/refind_x64.efi $out/EFI/boot/ '' else - "# No refind for ia32" + "# No refind for ${targetArch}" ; grubMenuCfg = '' @@ -222,18 +222,34 @@ let efiDir = pkgs.runCommand "efi-directory" {} '' mkdir -p $out/EFI/boot/ + # ALWAYS required modules. MODULES="fat iso9660 part_gpt part_msdos \ normal boot linux configfile loopback chain halt \ - efifwsetup efi_gop efi_uga \ + efifwsetup efi_gop \ ls search search_label search_fs_uuid search_fs_file \ gfxmenu gfxterm gfxterm_background gfxterm_menu test all_video loadenv \ exfat ext2 ntfs btrfs hfsplus udf \ videoinfo png \ echo serial \ " + + echo "Building GRUB with modules:" + for mod in $MODULES; do + echo " - $mod" + done + + # Modules that may or may not be available per-platform. + echo "Adding additional modules:" + for mod in efi_uga; do + if [ -f ${pkgs.grub2_efi}/lib/grub/${pkgs.grub2_efi.grubTarget}/$mod.mod ]; then + echo " - $mod" + MODULES+=" $mod" + fi + done + # 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/boot${targetArch}.efi -p /EFI/boot -O ${pkgs.grub2_efi.grubTarget} \ $MODULES cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ @@ -323,11 +339,11 @@ let # dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i) '' mkdir ./contents && cd ./contents - cp -rp "${efiDir}"/* . + cp -rp "${efiDir}"/EFI . mkdir ./boot cp -p "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}" \ "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" ./boot/ - touch --date=@0 ./* + touch --date=@0 ./EFI ./boot usage_size=$(du -sb --apparent-size . | tr -cd '[:digit:]') # Make the image 110% as big as the files need to make up for FAT overhead @@ -339,15 +355,24 @@ 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" ./EFI ./boot :: + # Verify the FAT partition. + ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out" ''; # */ - targetArch = if pkgs.stdenv.isi686 then - "ia32" - else if pkgs.stdenv.isx86_64 then - "x64" - else - throw "Unsupported architecture"; + # Name used by UEFI for architectures. + targetArch = + if pkgs.stdenv.isi686 then + "ia32" + else if pkgs.stdenv.isx86_64 then + "x64" + else if pkgs.stdenv.isAarch64 then + "aa64" + else + throw "Unsupported architecture"; + + # Syslinux (and isolinux) only supports x86-based architectures. + canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64; in @@ -481,9 +506,9 @@ in # here and it causes a cyclic dependency. boot.loader.grub.enable = false; - # !!! Hack - attributes expected by other modules. - system.boot.loader.kernelFile = "bzImage"; - environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; + environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi ] + ++ optional canx86BiosBoot pkgs.syslinux + ; # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the @@ -554,13 +579,7 @@ in # Individual files to be included on the CD, outside of the Nix # store on the CD. isoImage.contents = - [ { source = pkgs.substituteAll { - name = "isolinux.cfg"; - src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; - bootRoot = "/boot"; - }; - target = "/isolinux/isolinux.cfg"; - } + [ { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile; target = "/boot/" + config.system.boot.loader.kernelFile; } @@ -570,9 +589,6 @@ in { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; } - { source = "${pkgs.syslinux}/share/syslinux"; - target = "/isolinux"; - } { source = config.isoImage.efiSplashImage; target = "/EFI/boot/efi-background.png"; } @@ -582,6 +598,17 @@ in { source = pkgs.writeText "version" config.system.nixos.label; target = "/version.txt"; } + ] ++ optionals canx86BiosBoot [ + { source = pkgs.substituteAll { + name = "isolinux.cfg"; + src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; + bootRoot = "/boot"; + }; + target = "/isolinux/isolinux.cfg"; + } + { source = "${pkgs.syslinux}/share/syslinux"; + target = "/isolinux"; + } ] ++ optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; @@ -589,7 +616,7 @@ in { source = "${efiDir}/EFI"; target = "/EFI"; } - ] ++ optionals config.boot.loader.grub.memtest86.enable [ + ] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [ { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; } @@ -604,9 +631,10 @@ in # Create the ISO image. system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({ inherit (config.isoImage) isoName compressImage volumeID contents; - bootable = true; + bootable = canx86BiosBoot; bootImage = "/isolinux/isolinux.bin"; - } // optionalAttrs config.isoImage.makeUsbBootable { + syslinux = if canx86BiosBoot then pkgs.syslinux else null; + } // optionalAttrs (config.isoImage.makeUsbBootable && canx86BiosBoot) { usbBootable = true; isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin"; } // optionalAttrs config.isoImage.makeEfiBootable { diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix new file mode 100644 index 0000000000000000000000000000000000000000..2882fbcc7305299b1624a2fbc34a7f952c5f77d4 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + imports = [ ./sd-image-aarch64.nix ]; + + boot.kernelPackages = pkgs.linuxPackages_latest; +} diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 86e19f3da5629d9364765a79a4e41e1eccf7bc59..5f7194e92a364ba3c98bd0404a91844d3ee6b221 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { @@ -15,18 +15,10 @@ in ./sd-image.nix ]; - assertions = lib.singleton { - assertion = pkgs.stdenv.hostPlatform.system == "aarch64-linux" - && pkgs.stdenv.hostPlatform.system == pkgs.stdenv.buildPlatform.system; - message = "sd-image-aarch64.nix can be only built natively on Aarch64 / ARM64; " + - "it cannot be cross compiled"; - }; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; boot.consoleLogLevel = lib.mkDefault 7; - boot.kernelPackages = pkgs.linuxPackages_latest; # The serial ports listed here are: # - ttyS0: for Tegra (Jetson TX1) diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 695c79ca17073e8a9b1ea804d1ebd14cad50bc98..71448f74c3611096e961a34e243b601b97a7f2b1 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { @@ -15,13 +15,6 @@ in ./sd-image.nix ]; - assertions = lib.singleton { - assertion = pkgs.stdenv.hostPlatform.system == "armv7l-linux" - && pkgs.stdenv.hostPlatform.system == pkgs.stdenv.buildPlatform.system; - message = "sd-image-armv7l-multiplatform.nix can be only built natively on ARMv7; " + - "it cannot be cross compiled"; - }; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index e395b265d15e94511c29b03f4c1a2efc31709ab6..96e06670694e8e631a5480678a8da9e7361af15f 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -5,7 +5,7 @@ let extlinux-conf-builder = import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in { @@ -15,13 +15,6 @@ in ./sd-image.nix ]; - assertions = lib.singleton { - assertion = pkgs.stdenv.hostPlatform.system == "armv6l-linux" - && pkgs.stdenv.hostPlatform.system == pkgs.stdenv.buildPlatform.system; - message = "sd-image-raspberrypi.nix can be only built natively on ARMv6; " + - "it cannot be cross compiled"; - }; - boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index b6e1d11c2b547f6ae69dc66611f62a8056665aee..69746a8e9799e4067b130b5a9538c356e8607a5c 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 7ec09acd5919b1310c097814f3685257e3a84b4c..90a5128c02a5880ebab06d9e1fff455ef77bbdb8 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 cb182a08a830c5fa42d5f4d13349c010cd1ad792..5d431df4b114c5fd355777de9e285f4a034f6a98 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/h180y3n5k1ypxgm1pcvj243qix5j45zz-nix-2.1.1"; - i686-linux = "/nix/store/v2y4k4v9ml07jmfq739wyflapg3b7b5k-nix-2.1.1"; - aarch64-linux = "/nix/store/v485craglq7xm5996ci8qy5dyc17dab0-nix-2.1.1"; - x86_64-darwin = "/nix/store/lc3ymlix73kaad5srjdgaxp9ngr1sg6g-nix-2.1.1"; + x86_64-linux = "/nix/store/pid1yakjasch4pwl63nzbj22z9zf0q26-nix-2.2"; + i686-linux = "/nix/store/qpkl0cxy0xh4h432lv2qsjrmhvx5x2vy-nix-2.2"; + aarch64-linux = "/nix/store/0jg7h94x986d8cskg6gcfza9x67spdbp-nix-2.2"; + x86_64-darwin = "/nix/store/a48whqkmxnsfhwbk6nay74iyc1cf0lr2-nix-2.2"; } 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 4372d196261e969d59da8ab5604383db2bee748e..c1028a0ad7e93d830fd69b0733954fb5f1e2689b 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 359caad89a7206ed730ed2976fde7a17fb3fc37c..686204ee034253b610299e6d1fe82f6df3e3a38e 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\"; }"; + } } @@ -339,6 +340,8 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { chomp $fs; my @fields = split / /, $fs; my $mountPoint = $fields[4]; + $mountPoint =~ s/\\040/ /g; # account for mount points with spaces in the name (\040 is the escape character) + $mountPoint =~ s/\\011/\t/g; # account for mount points with tabs in the name (\011 is the escape character) next unless -d $mountPoint; my @mountOptions = split /,/, $fields[5]; @@ -354,6 +357,8 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { my $fsType = $fields[$n]; my $device = $fields[$n + 1]; my @superOptions = split /,/, $fields[$n + 2]; + $device =~ s/\\040/ /g; # account for devices with spaces in the name (\040 is the escape character) + $device =~ s/\\011/\t/g; # account for mount points with tabs in the name (\011 is the escape character) # Skip the read-only bind-mount on /nix/store. next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions) && (grep { $_ eq "ro" } @mountOptions); @@ -448,7 +453,11 @@ EOF if (-e $slave) { my $dmName = read_file("/sys/class/block/$deviceName/dm/name"); chomp $dmName; - $fileSystems .= " boot.initrd.luks.devices.\"$dmName\".device = \"${\(findStableDevPath $slave)}\";\n\n"; + # Ensure to add an entry only once + my $luksDevice = " boot.initrd.luks.devices.\"$dmName\".device"; + if ($fileSystems !~ /^\Q$luksDevice\E/m) { + $fileSystems .= "$luksDevice = \"${\(findStableDevPath $slave)}\";\n\n"; + } } } } @@ -630,9 +639,9 @@ $bootLoaderConfig # services.xserver.desktopManager.plasma5.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.guest = { + # users.users.jane = { # isNormalUser = true; - # uid = 1000; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # }; # This value determines the NixOS release with which your system is to be diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 22c1e0fe9a34b64769ebd4dc8dac65fd2a931859..defc46ad2a72359fdc5b2eb8f96a96d7dd9b4b4b 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 3f1e591b97b01ddba3eadf196a199a0fa2ed87fc..4560e9c7403aa6607b0e02b9ca8bd5ab480d621f 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 <&2 "Warning: This value is not an option." result=$(evalCfg "") - if names=$(attrNames "$result" 2> /dev/null); then + if [ ! -z "$result" ]; then + names=$(attrNames "$result" 2> /dev/null) echo 1>&2 "This attribute set contains:" escapeQuotes () { eval echo "$1"; } nixMap escapeQuotes "$names" else - echo 1>&2 "An error occurred while looking for attribute names." - echo $result + echo 1>&2 "An error occurred while looking for attribute names. Are you sure that '$option' exists?" fi fi diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 2af73519bc5243bae58703d9402fc3dc61a42789..361c2e49e05c1585f79bce9be599e47e5e24884c 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -53,11 +53,11 @@ while [ "$#" -gt 0 ]; do repair=1 extraBuildFlags+=("$i") ;; - --max-jobs|-j|--cores|-I) + --max-jobs|-j|--cores|-I|--builders) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*) + --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*) extraBuildFlags+=("$i") ;; --option) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index af0a3a2fcc882f6c81accdcececca47f66b77000..00c4d5018bf56ff1c2ef689954af418518dff1b9 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -37,7 +37,7 @@ let name = "nixos-generate-config"; src = ./nixos-generate-config.pl; path = [ pkgs.btrfs-progs ]; - perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; + perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/${pkgs.perl.libPrefix}"; inherit (config.system.nixos) release; }; diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 8ca3592f380026260417287155b719436225854f..2e1b4b3998b55c916ddfb98d867a621ec018e047 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -22,4 +22,42 @@ with lib; powerManagement.enable = false; system.stateVersion = mkDefault "18.03"; + + installer.cloneConfigExtra = '' + # Let demo build as a trusted user. + # nix.trustedUsers = [ "demo" ]; + + # Mount a VirtualBox shared folder. + # This is configurable in the VirtualBox menu at + # Machine / Settings / Shared Folders. + # fileSystems."/mnt" = { + # fsType = "vboxsf"; + # device = "nameofdevicetomount"; + # options = [ "rw" ]; + # }; + + # By default, the NixOS VirtualBox demo image includes SDDM and Plasma. + # If you prefer another desktop manager or display manager, you may want + # to disable the default. + # services.xserver.desktopManager.plasma5.enable = lib.mkForce false; + # services.xserver.displayManager.sddm.enable = lib.mkForce false; + + # Enable GDM/GNOME by uncommenting above two lines and two lines below. + # services.xserver.displayManager.gdm.enable = true; + # services.xserver.desktopManager.gnome3.enable = true; + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # List packages installed in system profile. To search, run: + # \$ nix search wget + # environment.systemPackages = with pkgs; [ + # wget vim + # ]; + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + system.stateVersion = mkDefault "18.03"; + ''; } diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index e6ccda5d7f4001baadae1ba6b19660440ccd004b..9b2e1235b7481c7588913dc7b51e6105f524034f 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -1,8 +1,72 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, baseModules, ... }: with lib; -let cfg = config.documentation; in +let + + cfg = config.documentation; + + /* For the purpose of generating docs, evaluate options with each derivation + in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}". + It isn't perfect, but it seems to cover a vast majority of use cases. + Caveat: even if the package is reached by a different means, + the path above will be shown and not e.g. `${config.services.foo.package}`. */ + manual = import ../../doc/manual rec { + inherit pkgs config; + version = config.system.nixos.release; + revision = "release-${version}"; + options = + let + scrubbedEval = evalModules { + modules = [ { nixpkgs.localSystem = config.nixpkgs.localSystem; } ] ++ baseModules; + args = (config._module.args) // { modules = [ ]; }; + specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; }; + }; + scrubDerivations = namePrefix: pkgSet: mapAttrs + (name: value: + let wholeName = "${namePrefix}.${name}"; in + if isAttrs value then + scrubDerivations wholeName value + // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; }) + else value + ) + pkgSet; + in scrubbedEval.options; + }; + + helpScript = pkgs.writeScriptBin "nixos-help" + '' + #! ${pkgs.runtimeShell} -e + # Finds first executable browser in a colon-separated list. + # (see how xdg-open defines BROWSER) + browser="$( + IFS=: ; for b in $BROWSER; do + [ -n "$(type -P "$b" || true)" ] && echo "$b" && break + done + )" + if [ -z "$browser" ]; then + browser="$(type -P xdg-open || true)" + if [ -z "$browser" ]; then + browser="$(type -P w3m || true)" + if [ -z "$browser" ]; then + echo "$0: unable to start a web browser; please set \$BROWSER" + exit 1 + fi + fi + fi + exec "$browser" ${manual.manualHTMLIndex} + ''; + + desktopItem = pkgs.makeDesktopItem { + name = "nixos-manual"; + desktopName = "NixOS Manual"; + genericName = "View NixOS documentation in a web browser"; + icon = "nix-snowflake"; + exec = "${helpScript}/bin/nixos-help"; + categories = "System"; + }; + +in { @@ -66,6 +130,22 @@ let cfg = config.documentation; in ''; }; + nixos.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install NixOS's own documentation. + + This includes man pages like + configuration.nix + 5 if is + set. + This includes the HTML manual and the nixos-help command if + is set. + + ''; + }; + }; }; @@ -76,6 +156,7 @@ let cfg = config.documentation; in environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; + environment.etc."man.conf".source = "${pkgs.man-db}/etc/man_db.conf"; }) (mkIf cfg.info.enable { @@ -86,7 +167,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 +180,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 c65291cf97e8b061cc33af6118fa98ece00a8fbc..5f134b51939c3948a81c7a765bfd7d94bc35ce3b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -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; headphones = 266; couchpotato = 267; gogs = 268; @@ -306,7 +306,7 @@ rslsync = 279; minio = 280; kanboard = 281; - pykms = 282; + # pykms = 282; # DynamicUser = true kodi = 283; restya-board = 284; mighttpd2 = 285; @@ -329,6 +329,16 @@ # 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; + zoneminder = 314; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -383,7 +393,7 @@ virtuoso = 44; #rtkit = 45; # unused dovecot2 = 46; - #dovenull = 47; # unused + dovenull2 = 47; prayer = 49; mpd = 50; clamav = 51; @@ -404,7 +414,7 @@ iodined = 66; libvirtd = 67; graphite = 68; - #statsd = 69; # unused + #statsd = 69; # removed 2018-11-14 transmission = 70; postgres = 71; vboxusers = 72; @@ -476,7 +486,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 +589,7 @@ stanchion = 262; riak-cs = 263; infinoted = 264; - # keystone = 265; # unused, removed 2017-12-13 + sickbeard = 265; headphones = 266; couchpotato = 267; gogs = 268; @@ -595,7 +605,7 @@ rslsync = 279; minio = 280; kanboard = 281; - pykms = 282; + # pykms = 282; # DynamicUser = true kodi = 283; restya-board = 284; mighttpd2 = 285; @@ -618,6 +628,16 @@ 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; + zoneminder = 314; # 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 7f9833e184ab9464f39382701bfb0eb38b0c313d..3a717fddaba2be68af2c4958e37827c03da439dc 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 ../../.. { + inherit (cfg) config overlays localSystem crossSystem; + }; + + finalPkgs = if opt.pkgs.isDefined then cfg.pkgs.appendOverlays cfg.overlays else defaultPkgs; + in { @@ -65,17 +72,21 @@ in 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 c593adcdae6e00e3b0398cc4657fbd265ccc82cf..c576cf4cb925ebdc99a0bf2ea3c0194c304e8b29 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 = trivial.revisionWithDefault "master"; description = "The Git revision from which this NixOS configuration was built."; }; nixos.codeName = mkOption { readOnly = true; type = types.str; + default = 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 = "Koi"; }; # Generate /etc/os-release. See @@ -98,6 +93,7 @@ in VERSION_CODENAME=${toLower cfg.codeName} VERSION_ID="${cfg.version}" PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})" + LOGO="nix-snowflake" HOME_URL="https://nixos.org/" SUPPORT_URL="https://nixos.org/nixos/support.html" BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues" diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index b5afb5b1553e508f013a33975a57fcfda62fb1f4..6219abda7dc18b4b04230e719bd60f5ee156a5fd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -11,6 +11,9 @@ ./config/xdg/icons.nix ./config/xdg/menus.nix ./config/xdg/mime.nix + ./config/appstream.nix + ./config/xdg/sounds.nix + ./config/gtk/gtk-icon-cache.nix ./config/gnu.nix ./config/i18n.nix ./config/iproute2.nix @@ -33,8 +36,9 @@ ./config/vpnc.nix ./config/zram.nix ./hardware/all-firmware.nix + ./hardware/bladeRF.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 +50,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 +67,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 +93,7 @@ ./programs/criu.nix ./programs/dconf.nix ./programs/digitalbitbox/default.nix + ./programs/dmrconfig.nix ./programs/environment.nix ./programs/firejail.nix ./programs/fish.nix @@ -96,18 +101,20 @@ ./programs/gnupg.nix ./programs/gphoto2.nix ./programs/iftop.nix + ./programs/iotop.nix ./programs/java.nix ./programs/kbdlight.nix ./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 +127,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 @@ -146,8 +155,10 @@ ./security/chromium-suid-sandbox.nix ./security/dhparams.nix ./security/duosec.nix + ./security/google_oslogin.nix ./security/hidepid.nix ./security/lock-kernel-modules.nix + ./security/misc.nix ./security/oath.nix ./security/pam.nix ./security/pam_usb.nix @@ -207,6 +218,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,14 +244,17 @@ ./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 ./services/desktops/gnome3/evolution-data-server.nix + ./services/desktops/gnome3/file-roller.nix ./services/desktops/gnome3/gnome-disks.nix ./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 @@ -272,15 +287,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 @@ -288,12 +306,14 @@ ./services/hardware/usbmuxd.nix ./services/hardware/thermald.nix ./services/hardware/undervolt.nix + ./services/hardware/vdr.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/fluentd.nix ./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 @@ -320,12 +340,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 @@ -364,6 +387,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 @@ -394,6 +418,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 @@ -410,7 +435,9 @@ ./services/misc/uhub.nix ./services/misc/weechat.nix ./services/misc/xmr-stak.nix + ./services/misc/zoneminder.nix ./services/misc/zookeeper.nix + ./services/monitoring/alerta.nix ./services/monitoring/apcupsd.nix ./services/monitoring/arbtt.nix ./services/monitoring/bosun.nix @@ -421,10 +448,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 @@ -439,7 +468,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 @@ -497,6 +525,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 @@ -544,6 +574,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 @@ -557,6 +588,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 @@ -605,6 +637,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 @@ -627,7 +660,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 @@ -650,6 +683,7 @@ ./services/security/hologram-server.nix ./services/security/hologram-agent.nix ./services/security/munge.nix + ./services/security/nginx-sso.nix ./services/security/oauth2_proxy.nix ./services/security/oauth2_proxy_nginx.nix ./services/security/physlock.nix @@ -666,7 +700,7 @@ ./services/system/dbus.nix ./services/system/earlyoom.nix ./services/system/localtime.nix - ./services/system/kerberos.nix + ./services/system/kerberos/default.nix ./services/system/nscd.nix ./services/system/saslauthd.nix ./services/system/uptimed.nix @@ -681,15 +715,18 @@ ./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/icingaweb2/icingaweb2.nix + ./services/web-apps/icingaweb2/module-monitoring.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 @@ -726,12 +763,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 @@ -782,6 +821,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 5aaffa4f1f2a1272ab76868c5ae27f67d02e33a6..2a2fe119d30cb36ebf7b70d23cda106479974a90 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 99d4774584f1eb527d44dad10e3bb7ae791f90ee..3f669ba7d2e1677251500c772196bb71f57426b6 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 7031d7d1d5931ef69b7828eb8ee810f7631c87f9..5d6b11498b522c06d95bdb4582ee38c9e03c0e28 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 332cf58aa538224ceb1ad1e3f84a340efcb1bb88..fba756391b11826d298e3ec3e3a21bce16b305c7 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 2af8bf1f8e30cb38fa2779aa4aea2a36c9b2367a..9ab2ee87a19e503771ad585f1e8349028440110c 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -6,23 +6,43 @@ 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.protectKernelImage = mkDefault true; + + security.allowSimultaneousMultithreading = mkDefault false; + + security.virtualization.flushL1DataCache = mkDefault "always"; + security.apparmor.enable = mkDefault true; boot.kernelParams = [ + # Slab/slub sanity checks, redzoning, and poisoning + "slub_debug=FZP" + + # Disable slab merging to make certain heap overflow attacks harder + "slab_nomerge" + # Overwrite free'd memory "page_poison=1" # Disable legacy virtual syscalls "vsyscall=none" - # Disable hibernation (allows replacing the running kernel) - "nohibernate" + # Enable PTI even if CPU claims to be safe from meltdown + "pti=on" ]; boot.blacklistedKernelModules = [ @@ -36,9 +56,6 @@ with lib; # (e.g., parent/child) boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkOverride 500 1; - # Prevent replacing the running kernel image w/o reboot - boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true; - # Restrict access to kernel ring buffer (information leaks) boot.kernel.sysctl."kernel.dmesg_restrict" = mkDefault true; @@ -55,18 +72,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/headless.nix b/nixos/modules/profiles/headless.nix index 131ee272859a914899406a6344c47c8843667988..46a9b6a7d8d5ccc78f0c8a8f1a42d48997a9827b 100644 --- a/nixos/modules/profiles/headless.nix +++ b/nixos/modules/profiles/headless.nix @@ -6,7 +6,6 @@ with lib; { - sound.enable = false; boot.vesa = false; # Don't start a tty on the serial consoles. diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index ff4a23a18d0692bb9c8316b10f4266cb7bca40a6..580ea4a58e5b48c0e61848e8c9f8e68688e8e1fb 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 ed04e46c77d1d35199c8aac45880440a923c12e2..f044e6f39ea5ae15d41e5ce4f36ffccffea8cde1 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; + documentation.nixos.enable = mkDefault false; } diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index 942572cef9d5114569a3df55b8e7bfaf0c99d0f2..250d8c252a3bcf165b3e37139360527c9abbf04c 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -16,7 +16,6 @@ with lib; To grant access to a user, it must be part of adbusers group: users.users.alice.extraGroups = ["adbusers"]; ''; - relatedPackages = [ ["androidenv" "platformTools"] ]; }; }; }; @@ -24,7 +23,7 @@ with lib; ###### implementation config = mkIf config.programs.adb.enable { services.udev.packages = [ pkgs.android-udev-rules ]; - environment.systemPackages = [ pkgs.androidenv.platformTools ]; + environment.systemPackages = [ pkgs.androidenv.androidPkgs_9_0.platform-tools ]; users.groups.adbusers = {}; }; } diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 424e1506b4c5de4f349ff8a0da7cbc6f455dfbed..d22f9dfa3199b0d6376c42e9b153bb2d9c5a5ae5 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 - for an option format description. + Set of aliases for bash shell, which overrides . + See for an option format description. ''; - type = types.attrs; # types.attrsOf types.stringOrPath; + type = with types; attrsOf (nullOr (either str path)); }; shellInit = mkOption { @@ -97,7 +98,12 @@ 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\] " + if [ -n "$INSIDE_EMACS" ]; then + # Emacs term mode doesn't support xterm title escape sequence (\e]0;) + PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " + else + PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] " + fi if test "$TERM" = "xterm"; then PS1="\[\033]2;\h:\u:\w\007\]$PS1" fi @@ -125,6 +131,8 @@ in programs.bash = { + shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + shellInit = '' if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then . ${config.system.build.setEnvironment} diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix index bbe7165c62fbdf3eac5ff63f1b6d0b7a5a7bd86e..656c255fcb18566fcb7033e62c149aacce908e30 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/nixos/modules/programs/command-not-found/command-not-found.nix @@ -16,7 +16,7 @@ let isExecutable = true; inherit (pkgs) perl; inherit (cfg) dbPath; - perlFlags = concatStrings (map (path: "-I ${path}/lib/perl5/site_perl ") + perlFlags = concatStrings (map (path: "-I ${path}/${pkgs.perl.libPrefix} ") [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite pkgs.perlPackages.StringShellQuote ]); }; diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml index a26653dda535fd83854193bfd1d18c054f7421ec..c63201628dbd7bd2da0471f4c662976224649d2e 100644 --- a/nixos/modules/programs/digitalbitbox/doc.xml +++ b/nixos/modules/programs/digitalbitbox/doc.xml @@ -3,75 +3,64 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-programs-digitalbitbox"> - - Digital Bitbox - - - Digital Bitbox is a hardware wallet and second-factor authenticator. - - - - The digitalbitbox programs module may be - installed by setting programs.digitalbitbox - to true in a manner similar to - + Digital Bitbox + + Digital Bitbox is a hardware wallet and second-factor authenticator. + + + The digitalbitbox programs module may be installed by + setting programs.digitalbitbox to true + in a manner similar to = true; - - and bundles the digitalbitbox package (see digitalbitbox package (see + ), which contains the - dbb-app and dbb-cli binaries, - along with the hardware module (see dbb-app and dbb-cli binaries, along + with the hardware module (see + ) which sets up the - necessary udev rules to access the device. - - - - Enabling the digitalbitbox module is pretty much the easiest way to - get a Digital Bitbox device working on your system. - + necessary udev rules to access the device. + + + Enabling the digitalbitbox module is pretty much the easiest way to get a + Digital Bitbox device working on your system. + + + For more information, see + . + +
+ Package - For more information, see - . - - -
- Package - - - The binaries, dbb-app (a GUI tool) and - dbb-cli (a CLI tool), are available through the - digitalbitbox package which could be installed - as follows: - + The binaries, dbb-app (a GUI tool) and + dbb-cli (a CLI tool), are available through the + digitalbitbox package which could be installed as + follows: = [ pkgs.digitalbitbox ]; - -
- - -
- Hardware - - - The digitalbitbox hardware package enables the udev rules for - Digital Bitbox devices and may be installed as follows: + +
+
+ Hardware + + The digitalbitbox hardware package enables the udev rules for Digital Bitbox + devices and may be installed as follows: = true; - - - - In order to alter the udev rules, one may provide different values for - the udevRule51 and udevRule52 - attributes by means of overriding as follows: + + + In order to alter the udev rules, one may provide different values for the + udevRule51 and udevRule52 attributes + by means of overriding as follows: programs.digitalbitbox = { enable = true; @@ -80,6 +69,6 @@ programs.digitalbitbox = { }; }; - -
+ +
diff --git a/nixos/modules/programs/dmrconfig.nix b/nixos/modules/programs/dmrconfig.nix new file mode 100644 index 0000000000000000000000000000000000000000..e48a4f318370825f2beb99b179462d7e4b3ae722 --- /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 c3f742acde2e684beb7b93fc1208daf2930f151a..b38af07b92c378913eca8fb8a066c78093839fd0 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 @@ -53,12 +54,12 @@ in }; shellAliases = mkOption { - default = config.environment.shellAliases; + default = {}; description = '' - Set of aliases for fish shell. See - for an option format description. + Set of aliases for fish shell, which overrides . + See for an option format description. ''; - type = types.attrs; + type = with types; attrsOf (nullOr (either str path)); }; shellInit = mkOption { @@ -99,6 +100,8 @@ in config = mkIf cfg.enable { + programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit; environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit; environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit; diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index addc9dcca87ede6292c4360c0f0edbbd5b902a98..b01de9efaa5eb9efa444ccd17d2ef7792c730802 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/iotop.nix b/nixos/modules/programs/iotop.nix new file mode 100644 index 0000000000000000000000000000000000000000..5512dbc62f72b65619af049743073cbdf4887f02 --- /dev/null +++ b/nixos/modules/programs/iotop.nix @@ -0,0 +1,17 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.iotop; +in { + options = { + programs.iotop.enable = mkEnableOption "iotop + setcap wrapper"; + }; + config = mkIf cfg.enable { + security.wrappers.iotop = { + source = "${pkgs.iotop}/bin/iotop"; + capabilities = "cap_net_admin+p"; + }; + }; +} diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix index 6f8c389acc97e1798789bc4467fa33883a8b26d0..9f2a03e7e7639355d2c8fa0176744645e7364cf6 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 0000000000000000000000000000000000000000..ecc924325e6b0613871fa105d5dd0c74f4d5f092 --- /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/nano.nix b/nixos/modules/programs/nano.nix index 27b6d446c75d74fbf26e606c20b47b56077fe454..6a4d46338e19bb3774ad553e0ac43d374b5c6b88 100644 --- a/nixos/modules/programs/nano.nix +++ b/nixos/modules/programs/nano.nix @@ -2,6 +2,7 @@ let cfg = config.programs.nano; + LF = "\n"; in { @@ -33,9 +34,9 @@ in ###### implementation - config = lib.mkIf (cfg.nanorc != "") { + config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) { environment.etc."nanorc".text = lib.concatStrings [ cfg.nanorc - (lib.optionalString cfg.syntaxHighlight ''include "${pkgs.nano}/share/nano/*.nanorc"'') ]; + (lib.optionalString cfg.syntaxHighlight ''${LF}include "${pkgs.nano}/share/nano/*.nanorc"'') ]; }; } diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix new file mode 100644 index 0000000000000000000000000000000000000000..e42219e9638c931b179b52ca72697d74eb4f5367 --- /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 91740ee16ec2f59d497c0cdc9cd814dfe4d9aaa6..902cd89e0c4927176f65921e69905645beb4db78 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 842d9e6cfb48f10fe5bbe447876ac3f3a7c2d3ec..0000000000000000000000000000000000000000 --- 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 944a8bdf16fc40bc7e90c72c49db0b1730fa3c50..9842e2bef643dfc58ec6f4b4ef191fea529bfeae 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/singularity.nix b/nixos/modules/programs/singularity.nix index 86153d933855d6437f5b60d03492bd5ef1c89c99..b27e122bd1d9eea7dfb997efc71fc714cbe88008 100644 --- a/nixos/modules/programs/singularity.nix +++ b/nixos/modules/programs/singularity.nix @@ -3,18 +3,27 @@ with lib; let cfg = config.programs.singularity; + singularity = pkgs.singularity.overrideAttrs (attrs : { + installPhase = attrs.installPhase + '' + mv $bin/libexec/singularity/bin/starter-suid $bin/libexec/singularity/bin/starter-suid.orig + ln -s /run/wrappers/bin/singularity-suid $bin/libexec/singularity/bin/starter-suid + ''; + }); in { options.programs.singularity = { enable = mkEnableOption "Singularity"; }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.singularity ]; - systemd.tmpfiles.rules = [ "d /var/singularity/mnt/session 0770 root root -" - "d /var/singularity/mnt/final 0770 root root -" - "d /var/singularity/mnt/overlay 0770 root root -" - "d /var/singularity/mnt/container 0770 root root -" - "d /var/singularity/mnt/source 0770 root root -"]; + environment.systemPackages = [ singularity ]; + security.wrappers.singularity-suid.source = "${singularity}/libexec/singularity/bin/starter-suid.orig"; + systemd.tmpfiles.rules = [ + "d /var/singularity/mnt/session 0770 root root -" + "d /var/singularity/mnt/final 0770 root root -" + "d /var/singularity/mnt/overlay 0770 root root -" + "d /var/singularity/mnt/container 0770 root root -" + "d /var/singularity/mnt/source 0770 root root -" + ]; }; } diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index cc398174e6ce03418cc45ffedc3b32603fc2155e..4640c1d78d20e05b580e2938a1624d85fa87649b 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -167,16 +167,16 @@ in The set of system-wide known SSH hosts. ''; example = literalExample '' - [ - { + { + myhost = { hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub; - } - { + }; + myhost2 = { hostNames = [ "myhost2" ]; publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub; - } - ] + }; + } ''; }; diff --git a/nixos/modules/programs/sway-beta.nix b/nixos/modules/programs/sway-beta.nix new file mode 100644 index 0000000000000000000000000000000000000000..3c235de0ce63fc2fb35bd611c51993d678e5bc83 --- /dev/null +++ b/nixos/modules/programs/sway-beta.nix @@ -0,0 +1,91 @@ +{ 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; [ + swaylock swayidle + xwayland rxvt_unicode dmenu + ]; + defaultText = literalExample '' + with pkgs; [ swaylock swayidle 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/sway.nix b/nixos/modules/programs/sway.nix index 0eaaf6b85b99ade2a9c308ed6c603d564d7eda4d..b3847db8cd9ccfdd2e2edbd9232bd47c87a387a3 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -7,11 +7,18 @@ let swayPackage = pkgs.sway; swayWrapped = pkgs.writeShellScriptBin "sway" '' - if [[ "$#" -ge 1 ]]; then + 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 sway-setcap "$@" else - ${cfg.extraSessionCommands} - exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap + exec ${pkgs.dbus}/bin/dbus-run-session sway-setcap "$@" fi ''; swayJoined = pkgs.symlinkJoin { diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix index f4ae52934760d75fe15a9710e74424c56d4f5137..21ed6603c1bdd283bef4ebea5f83a9b6766c81b8 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 0000000000000000000000000000000000000000..ac665fe4a02365e7dfcfe6bbbbc4b87f869537a8 --- /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/way-cooler.nix b/nixos/modules/programs/way-cooler.nix index 633e959be9f329123d51b76f5b09d258e09ca603..f27bd42bd764c89496de010bd025aeb397b77df8 100644 --- a/nixos/modules/programs/way-cooler.nix +++ b/nixos/modules/programs/way-cooler.nix @@ -8,7 +8,7 @@ let wcWrapped = pkgs.writeShellScriptBin "way-cooler" '' ${cfg.extraSessionCommands} - exec ${pkgs.dbus.dbus-launch} --exit-with-session ${way-cooler}/bin/way-cooler + exec ${pkgs.dbus}/bin/dbus-run-session ${way-cooler}/bin/way-cooler ''; wcJoined = pkgs.symlinkJoin { name = "way-cooler-wrapped"; diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix index 49d522c604f5fb1cfafa12a7efc212f005909680..c290df01b96044a066a5c892a992948c0bb37408 100644 --- a/nixos/modules/programs/xss-lock.nix +++ b/nixos/modules/programs/xss-lock.nix @@ -9,7 +9,8 @@ in options.programs.xss-lock = { enable = mkEnableOption "xss-lock"; lockerCommand = mkOption { - example = "xlock"; + default = "${pkgs.i3lock}/bin/i3lock"; + example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy''; type = types.string; description = "Locker to be used with xsslock"; }; diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix index a01083c3ace980f97eb9663362ad2476977eeee8..db085211366ee84f3aa13e5c63e033de70698a96 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 6567d4a42facd62b66bbc1d3fa897cb188a5a5dc..b26980daf067d760f8b1b47125871ae84832b9ad 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -3,105 +3,135 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-programs-zsh-ohmyzsh"> - -Oh my ZSH - -oh-my-zsh is a framework -to manage your ZSH configuration -including completion scripts for several CLI tools or custom prompt themes. - -
Basic usage -The module uses the oh-my-zsh package with all available features. The -initial setup using Nix expressions is fairly similar to the configuration format -of oh-my-zsh. - + Oh my ZSH + + oh-my-zsh is a + framework to manage your ZSH + configuration including completion scripts for several CLI tools or custom + prompt themes. + +
+ Basic usage + + + The module uses the oh-my-zsh package with all available + features. The initial setup using Nix expressions is fairly similar to the + configuration format of oh-my-zsh. { - programs.ohMyZsh = { + programs.zsh.ohMyZsh = { enable = true; plugins = [ "git" "python" "man" ]; theme = "agnoster"; }; } - -For a detailed explanation of these arguments please refer to the -oh-my-zsh docs. - -The expression generates the needed -configuration and writes it into your /etc/zshrc. -
- -
Custom additions - -Sometimes third-party or custom scripts such as a modified theme may be needed. -oh-my-zsh provides the -ZSH_CUSTOM -environment variable for this which points to a directory with additional scripts. - -The module can do this as well: - + For a detailed explanation of these arguments please refer to the + oh-my-zsh + docs. + + + + The expression generates the needed configuration and writes it into your + /etc/zshrc. + +
+
+ Custom additions + + + Sometimes third-party or custom scripts such as a modified theme may be + needed. oh-my-zsh provides the + ZSH_CUSTOM + environment variable for this which points to a directory with additional + scripts. + + + + The module can do this as well: { - programs.ohMyZsh.custom = "~/path/to/custom/scripts"; + programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; } -
- -
Custom environments - -There are several extensions for oh-my-zsh packaged in nixpkgs. -One of them is nix-zsh-completions -which bundles completion scripts and a plugin for oh-my-zsh. - -Rather than using a single mutable path for ZSH_CUSTOM, it's also possible to -generate this path from a list of Nix packages: - + +
+
+ Custom environments + + + There are several extensions for oh-my-zsh packaged in + nixpkgs. One of them is + nix-zsh-completions + which bundles completion scripts and a plugin for + oh-my-zsh. + + + + Rather than using a single mutable path for ZSH_CUSTOM, + it's also possible to generate this path from a list of Nix packages: { pkgs, ... }: { - programs.ohMyZsh.customPkgs = with pkgs; [ + programs.zsh.ohMyZsh.customPkgs = with pkgs; [ pkgs.nix-zsh-completions # and even more... ]; } - -Internally a single store path will be created using buildEnv. -Please refer to the docs of -buildEnv -for further reference. - -Please keep in mind that this is not compatible with programs.ohMyZsh.custom -as it requires an immutable store path while custom shall remain mutable! An evaluation failure -will be thrown if both custom and customPkgs are set. -
- -
Package your own customizations - -If third-party customizations (e.g. new themes) are supposed to be added to oh-my-zsh -there are several pitfalls to keep in mind: - - - - To comply with the default structure of ZSH the entire output needs to be written to - $out/share/zsh. - - - Completion scripts are supposed to be stored at $out/share/zsh/site-functions. This directory - is part of the fpath - and the package should be compatible with pure ZSH setups. The module will automatically link - the contents of site-functions to completions directory in the proper store path. - - - The plugins directory needs the structure pluginname/pluginname.plugin.zsh - as structured in the upstream repo. + Internally a single store path will be created using + buildEnv. Please refer to the docs of + buildEnv + for further reference. + + + + Please keep in mind that this is not compatible with + programs.zsh.ohMyZsh.custom as it requires an immutable store + path while custom shall remain mutable! An evaluation + failure will be thrown if both custom and + customPkgs are set. + +
+
+ Package your own customizations + + + If third-party customizations (e.g. new themes) are supposed to be added to + oh-my-zsh there are several pitfalls to keep in mind: + + + + + + To comply with the default structure of ZSH the entire + output needs to be written to $out/share/zsh. + + + + + Completion scripts are supposed to be stored at + $out/share/zsh/site-functions. This directory is part + of the + fpath + and the package should be compatible with pure ZSH + setups. The module will automatically link the contents of + site-functions to completions directory in the proper + store path. + + + + + The plugins directory needs the structure + pluginname/pluginname.plugin.zsh as structured in the + upstream + repo. - - + + - -A derivation for oh-my-zsh may look like this: + + A derivation for oh-my-zsh may look like this: { stdenv, fetchFromGitHub }: @@ -120,6 +150,6 @@ stdenv.mkDerivation rec { ''; } - -
+
+
diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix index 416f4c9c675115ca4b685a40d7c3f74257468f45..ded17f38a618eae87d69d518895b600151cffe17 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-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index e7cf17c2c00cb00a17c8aef6177bd656e6f2866e..89087a229eb7396c27bae2915b4e617d130f4f2d 100644 --- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -48,6 +48,23 @@ in https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md ''; }; + styles = mkOption { + default = {}; + type = types.attrsOf types.string; + + example = literalExample '' + { + "alias" = "fg=magenta,bold"; + } + ''; + + description = '' + Specifies custom styles to be highlighted by zsh-syntax-highlighting. + + Please refer to the docs for more information about the usage: + https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/main.md + ''; + }; }; }; @@ -73,6 +90,11 @@ in pattern: design: "ZSH_HIGHLIGHT_PATTERNS+=('${pattern}' '${design}')" ) cfg.patterns) + ++ optionals (length(attrNames cfg.styles) > 0) + (mapAttrsToList ( + styles: design: + "ZSH_HIGHLIGHT_STYLES[${styles}]='${design}'" + ) cfg.styles) ); }; } diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index b4ca8730958c22d65a55c507be96df94f185eddc..164d8db5859a80db946fd9ca2c999825c7cf2069 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -11,7 +11,8 @@ let cfg = config.programs.zsh; zshAliases = concatStringsSep "\n" ( - mapAttrsFlatten (k: v: "alias ${k}='${v}'") cfg.shellAliases + mapAttrsFlatten (k: v: "alias ${k}=${escapeShellArg v}") + (filterAttrs (k: v: !isNull v) cfg.shellAliases) ); in @@ -34,13 +35,12 @@ in }; shellAliases = mkOption { - default = config.environment.shellAliases; + default = {}; description = '' - Set of aliases for zsh shell. Overrides the default value taken from - . + Set of aliases for zsh shell, which overrides . See for an option format description. ''; - type = types.attrs; # types.attrsOf types.stringOrPath; + type = with types; attrsOf (nullOr (either str path)); }; shellInit = mkOption { @@ -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. diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 4a6bdfe83dd28495e35215bfd6ea1c973a758c37..24ab963f718a16d86c412fcccf5153a9fe71aa70 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" ]) @@ -65,6 +69,9 @@ with lib; (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") + # PAM + (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ]) + (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead") (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead") @@ -276,6 +283,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.xml b/nixos/modules/security/acme.xml index b4cd83f6632c757fded6bcf975e13faf5adf9c0b..ef71fe53d0c7e5d04e4ebc1d46bdd3cbb618d13b 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -3,23 +3,25 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-security-acme"> - -SSL/TLS Certificates with ACME - -NixOS supports automatic domain validation & certificate -retrieval and renewal using the ACME protocol. This is currently only -implemented by and for Let's Encrypt. The alternative ACME client -simp_le is used under the hood. - -
Prerequisites - -You need to have a running HTTP server for verification. The server must -have a webroot defined that can serve -.well-known/acme-challenge. This directory must be -writeable by the user that will run the ACME client. - -For instance, this generic snippet could be used for Nginx: - + SSL/TLS Certificates with ACME + + NixOS supports automatic domain validation & certificate retrieval and + renewal using the ACME protocol. This is currently only implemented by and + for Let's Encrypt. The alternative ACME client simp_le is + used under the hood. + +
+ Prerequisites + + + You need to have a running HTTP server for verification. The server must + have a webroot defined that can serve + .well-known/acme-challenge. This directory must be + writeable by the user that will run the ACME client. + + + + For instance, this generic snippet could be used for Nginx: http { server { @@ -37,43 +39,47 @@ http { } } - - -
- -
Configuring - -To enable ACME certificate retrieval & renewal for a certificate for -foo.example.com, add the following in your -configuration.nix: - + +
+
+ Configuring + + + To enable ACME certificate retrieval & renewal for a certificate for + foo.example.com, add the following in your + configuration.nix: ."foo.example.com" = { webroot = "/var/www/challenges"; email = "foo@example.com"; }; - - -The private key key.pem and certificate -fullchain.pem will be put into -/var/lib/acme/foo.example.com. The target directory can -be configured with the option . - - -Refer to for all available configuration -options for the security.acme module. - -
- -
Using ACME certificates in Nginx -NixOS supports fetching ACME certificates for you by setting - enableACME = true; in a virtualHost config. We -first create self-signed placeholder certificates in place of the -real ACME certs. The placeholder certs are overwritten when the ACME -certs arrive. For foo.example.com the config would -look like. - + + + + The private key key.pem and certificate + fullchain.pem will be put into + /var/lib/acme/foo.example.com. The target directory can + be configured with the option . + + + + Refer to for all available configuration + options for the security.acme + module. + +
+
+ Using ACME certificates in Nginx + + + NixOS supports fetching ACME certificates for you by setting + enableACME + = true; in a virtualHost config. We first create self-signed + placeholder certificates in place of the real ACME certs. The placeholder + certs are overwritten when the ACME certs arrive. For + foo.example.com the config would look like. + services.nginx = { @@ -89,5 +95,5 @@ services.nginx = { }; } -
+
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix index dfbf5d859ba9efa5df8936688b8303b21ac7ce72..498c2f25d1c0d992586cf7b9375941995acf70af 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 e2b84c3e3b38018b95aa1ea7e8e1911e31f56226..62a499ea624de92d304927c47dcef1455e35836e 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/google_oslogin.nix b/nixos/modules/security/google_oslogin.nix new file mode 100644 index 0000000000000000000000000000000000000000..246419b681af0cadcc00246353edeb4a53fb2005 --- /dev/null +++ b/nixos/modules/security/google_oslogin.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.security.googleOsLogin; + package = pkgs.google-compute-engine-oslogin; + +in + +{ + + options = { + + security.googleOsLogin.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable Google OS Login + + The OS Login package enables the following components: + AuthorizedKeysCommand to query valid SSH keys from the user's OS Login + profile during ssh authentication phase. + NSS Module to provide user and group information + PAM Module for the sshd service, providing authorization and + authentication support, allowing the system to use data stored in + Google Cloud IAM permissions to control both, the ability to log into + an instance, and to perform operations as root (sudo). + ''; + }; + + }; + + config = mkIf cfg.enable { + security.pam.services.sshd = { + makeHomeDir = true; + googleOsLoginAccountVerification = true; + # disabled for now: googleOsLoginAuthentication = true; + }; + + security.sudo.extraConfig = '' + #includedir /run/google-sudoers.d + ''; + systemd.tmpfiles.rules = [ + "d /run/google-sudoers.d 750 root root -" + "d /var/google-users.d 750 root root -" + ]; + + # enable the nss module, so user lookups etc. work + system.nssModules = [ package ]; + + # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable. + # So indirect by a symlink. + environment.etc."ssh/authorized_keys_command_google_oslogin" = { + mode = "0755"; + text = '' + #!/bin/sh + exec ${package}/bin/google_authorized_keys "$@" + ''; + }; + services.openssh.extraConfig = '' + AuthorizedKeysCommand /etc/ssh/authorized_keys_command_google_oslogin %u + AuthorizedKeysCommandUser nobody + ''; + }; + +} diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml index d69341eb3cde18697fee94f1bf153332f3298c2c..5a17cb1da412c11114c12d390ad0a0ec58ad36b7 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 c81521ed9b085c5856e897b413856dd6fadbfb3f..fc9e7939d814860f8bceec52b33916b3449ce66f 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 0000000000000000000000000000000000000000..4506a67487d411713566d54a90ccc53e95b68ed8 --- /dev/null +++ b/nixos/modules/security/misc.nix @@ -0,0 +1,125 @@ +{ 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). + ''; + }; + + security.protectKernelImage = mkOption { + type = types.bool; + default = false; + description = '' + Whether to prevent replacing the running kernel image. + ''; + }; + + security.allowSimultaneousMultithreading = mkOption { + type = types.bool; + default = true; + description = '' + Whether to allow SMT/hyperthreading. Disabling SMT means that only + physical CPU cores will be usable at runtime, potentially at + significant performance cost. + + + + The primary motivation for disabling SMT is to mitigate the risk of + leaking data between threads running on the same CPU core (due to + e.g., shared caches). This attack vector is unproven. + + + + Disabling SMT is a supplement to the L1 data cache flushing mitigation + (see ) + versus malicious VM guests (SMT could "bring back" previously flushed + data). + + + ''; + }; + + security.virtualization.flushL1DataCache = mkOption { + type = types.nullOr (types.enum [ "never" "cond" "always" ]); + default = null; + description = '' + Whether the hypervisor should flush the L1 data cache before + entering guests. + See also . + + + + + + null + uses the kernel default + + + "never" + disables L1 data cache flushing entirely. + May be appropriate if all guests are trusted. + + + "cond" + flushes L1 data cache only for pre-determined + code paths. May leak information about the host address space + layout. + + + "always" + flushes L1 data cache every time the hypervisor + enters the guest. May incur significant performance cost. + + + + ''; + }; + }; + + config = mkMerge [ + (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`."; + } + ]; + }) + + (mkIf config.security.protectKernelImage { + # Disable hibernation (allows replacing the running kernel) + boot.kernelParams = [ "nohibernate" ]; + # Prevent replacing the running kernel image w/o reboot + boot.kernel.sysctl."kernel.kexec_load_disabled" = mkDefault true; + }) + + (mkIf (!config.security.allowSimultaneousMultithreading) { + boot.kernelParams = [ "nosmt" ]; + }) + + (mkIf (config.security.virtualization.flushL1DataCache != null) { + boot.kernelParams = [ "kvm-intel.vmentry_l1d_flush=${config.security.virtualization.flushL1DataCache}" ]; + }) + ]; +} diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index bef10b4fe614c92b5ce1693347c3896e55eb6c99..206b529ed6807d76ad26f19bb80af2eaa0910484 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -37,12 +37,14 @@ let }; u2fAuth = mkOption { - default = config.security.pam.enableU2F; + default = config.security.pam.u2f.enable; type = types.bool; description = '' If set, users listed in - ~/.config/Yubico/u2f_keys are able to log in - with the associated U2F key. + $XDG_CONFIG_HOME/Yubico/u2f_keys (or + $HOME/.config/Yubico/u2f_keys if XDG variable is + not set) are able to log in with the associated U2F key. Path can be + changed using option. ''; }; @@ -77,6 +79,30 @@ let ''; }; + googleOsLoginAccountVerification = mkOption { + default = false; + type = types.bool; + description = '' + If set, will use the Google OS Login PAM modules + (pam_oslogin_login, + pam_oslogin_admin) to verify possible OS Login + users and set sudoers configuration accordingly. + This only makes sense to enable for the sshd PAM + service. + ''; + }; + + googleOsLoginAuthentication = mkOption { + default = false; + type = types.bool; + description = '' + If set, will use the pam_oslogin_login's user + authentication methods to authenticate users using 2FA. + This only makes sense to enable for the sshd PAM + service. + ''; + }; + fprintAuth = mkOption { default = config.services.fprintd.enable; type = types.bool; @@ -269,7 +295,7 @@ let text = mkDefault ('' # Account management. - account ${if cfg.sssdStrictAccess then "required" else "sufficient"} pam_unix.so + account required pam_unix.so ${optionalString use_ldap "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"} ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false) @@ -278,8 +304,14 @@ let "account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so"} ${optionalString config.krb5.enable "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"} + ${optionalString cfg.googleOsLoginAccountVerification '' + account [success=ok ignore=ignore default=die] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so + account [success=ok default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so + ''} # Authentication management. + ${optionalString cfg.googleOsLoginAuthentication + "auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so"} ${optionalString cfg.rootOK "auth sufficient pam_rootok.so"} ${optionalString cfg.requireWheel @@ -290,8 +322,8 @@ let "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"} ${optionalString cfg.fprintAuth "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} - ${optionalString cfg.u2fAuth - "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"} + ${let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth + "auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} ${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"}"} ${optionalString cfg.usbAuth "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth @@ -338,7 +370,7 @@ let auth required pam_deny.so # Password management. - password requisite pam_unix.so nullok sha512 + password sufficient pam_unix.so nullok sha512 ${optionalString config.security.pam.enableEcryptfs "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} ${optionalString cfg.pamMount @@ -497,11 +529,96 @@ in ''; }; - security.pam.enableU2F = mkOption { - default = false; - description = '' - Enable the U2F PAM module. - ''; + security.pam.u2f = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Enables U2F PAM (pam-u2f) module. + + If set, users listed in + $XDG_CONFIG_HOME/Yubico/u2f_keys (or + $HOME/.config/Yubico/u2f_keys if XDG variable is + not set) are able to log in with the associated U2F key. The path can + be changed using option. + + File format is: + username:first_keyHandle,first_public_key: second_keyHandle,second_public_key + This file can be generated using pamu2fcfg command. + + More information can be found here. + ''; + }; + + authFile = mkOption { + default = null; + type = with types; nullOr path; + description = '' + By default pam-u2f module reads the keys from + $XDG_CONFIG_HOME/Yubico/u2f_keys (or + $HOME/.config/Yubico/u2f_keys if XDG variable is + not set). + + If you want to change auth file locations or centralize database (for + example use /etc/u2f-mappings) you can set this + option. + + File format is: + username:first_keyHandle,first_public_key: second_keyHandle,second_public_key + This file can be generated using pamu2fcfg command. + + More information can be found here. + ''; + }; + + control = mkOption { + default = "sufficient"; + type = types.enum [ "required" "requisite" "sufficient" "optional" ]; + description = '' + This option sets pam "control". + If you want to have multi factor authentication, use "required". + If you want to use U2F device instead of regular password, use "sufficient". + + Read + + pam.conf + 5 + + for better understanding of this option. + ''; + }; + + debug = mkOption { + default = false; + type = types.bool; + description = '' + Debug output to stderr. + ''; + }; + + interactive = mkOption { + default = false; + type = types.bool; + description = '' + Set to prompt a message and wait before testing the presence of a U2F device. + Recommended if your device doesn’t have a tactile trigger. + ''; + }; + + cue = mkOption { + default = false; + type = types.bool; + description = '' + By default pam-u2f module does not inform user + that he needs to use the u2f device, it just waits without a prompt. + + If you set this option to true, + cue option is added to pam-u2f + module and reminder message will be displayed. + ''; + }; }; security.pam.enableEcryptfs = mkOption { @@ -533,7 +650,7 @@ in ++ optionals config.krb5.enable [pam_krb5 pam_ccreds] ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ] - ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]; + ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ]; boot.supportedFilesystems = optionals config.security.pam.enableEcryptfs [ "ecryptfs" ]; @@ -548,6 +665,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 04685f2c9ea15c4a18715528a27259caeb4f954a..7f1de81d5b70dfda49dcb3d99a93bd0145826049 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 3a1ffc55e5fe99fc098e227971821d26d9574d19..a54ef2e6fcad1bd8310cf3ee6ce585aae7630517 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 77e4b2a616d8ef404d91693c3277e48424c7f7b5..dcb9c8d4ed5f3acf73c5c7bf559c3073b913f875 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 165580b978374c4c0d5dc35cf5eff8deae365800..c6b1b0cc0bd8e3c33e15e42674704120131cd3b4 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 9ecefb32cfa8fa5713aea0a62ab0951d3b756633..c8fa9461a209472829fc8588495e0d18c653a0e4 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 bb6fc0a104dff90dcac9766b756c791e4a1c932b..7373be2a9b0bba0cfab240e662e99062ec14a368 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 a0565ca26204b6c1be1c1f69dacd8517be83821f..24cad612826069b23ca0b843144b7409e7f777dc 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 415a70ea5ad41e41dbc6f3c70df361d68f32a8ae..2ad116a7872ade8234b6993e82d6d6255b0ec3f0 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -191,10 +191,9 @@ in { options = { paths = mkOption { - type = with types; either path (nonEmptyListOf path); + type = with types; coercedTo str lib.singleton (listOf str); description = "Path(s) to back up."; example = "/home/user"; - apply = x: if isList x then x else [ x ]; }; repo = mkOption { diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 2ec78ce6f2cfa2e2ab43d81bc87289a5a35c276b..11efa47ec5b2ebe3c60512c8ba27075c627401f7 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -6,11 +6,11 @@ let cfg = config.services.postgresqlBackup; - postgresqlBackupService = db : + postgresqlBackupService = db: dumpCmd: { enable = true; - description = "Backup of database ${db}"; + description = "Backup of ${db} database(s)"; requires = [ "postgresql.service" ]; @@ -20,11 +20,13 @@ 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 - ${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db} | \ + ${dumpCmd} | \ ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz ''; @@ -40,9 +42,7 @@ let in { options = { - services.postgresqlBackup = { - enable = mkOption { default = false; description = '' @@ -59,6 +59,19 @@ in { ''; }; + backupAll = mkOption { + default = cfg.databases == []; + defaultText = "services.postgresqlBackup.databases == []"; + type = lib.types.bool; + description = '' + Backup all databases using pg_dumpall. + This option is mutual exclusive to + services.postgresqlBackup.databases. + The resulting backup dump will have the name all.sql.gz. + This option is the default if no databases are specified. + ''; + }; + databases = mkOption { default = []; description = '' @@ -77,18 +90,36 @@ in { type = types.string; default = "-Cbo"; description = '' - Command line options for pg_dump. + Command line options for pg_dump. This options is not used + if config.services.postgresqlBackup.backupAll is enabled. + Note that config.services.postgresqlBackup.backupAll is also active, + when no databases where specified. ''; }; }; }; - config = mkIf config.services.postgresqlBackup.enable { - - systemd.services = listToAttrs (map (db : { + config = mkMerge [ + { + assertions = [{ + assertion = cfg.backupAll -> cfg.databases == []; + message = "config.services.postgresqlBackup.backupAll cannot be used together with config.services.postgresqlBackup.databases"; + }]; + } + (mkIf (cfg.enable && cfg.backupAll) { + systemd.services.postgresqlBackup = + postgresqlBackupService "all" "${config.services.postgresql.package}/bin/pg_dumpall"; + }) + (mkIf (cfg.enable && !cfg.backupAll) { + systemd.services = listToAttrs (map (db: + let + cmd = "${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db}"; + in { name = "postgresqlBackup-${db}"; - value = postgresqlBackupService db; } ) cfg.databases); - }; + value = postgresqlBackupService db cmd; + }) cfg.databases); + }) + ]; } diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 6ece5a9b5ad632273ac1d4470e98842de9babea9..7e8e91e4b9c386def17bab01e36c89399311f25d 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -1,6 +1,11 @@ { config, lib, pkgs, ... }: with lib; + +let + # Type for a valid systemd unit option. Needed for correctly passing "timerConfig" to "systemd.timers" + unitOption = (import ../../system/boot/systemd-unit-options.nix { inherit config lib; }).unitOption; +in { options.services.restic.backups = mkOption { description = '' @@ -47,7 +52,7 @@ with lib; }; timerConfig = mkOption { - type = types.attrsOf types.str; + type = types.attrsOf unitOption; default = { OnCalendar = "daily"; }; diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index aeaa6bd66c99fb57648d1cd7e60610a51f81cc7f..6f3c45b29bf245e305d2a5cc1241e80dca498329 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 43bbb50a48d4de8b01a25f775634b0940f479592..5a3e281ea6948c8b35d8d196bf7ffd6c2e073a5a 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"; - }; - }; - - dnsmasq-nanny = mkOption { - description = "Docker image to seed for the kube-dns dnsmasq container."; - type = types.attrs; - default = { - imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64"; - imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8"; - finalImageTag = version; - sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1"; - }; + replicas = mkOption { + description = "Number of DNS pod replicas to deploy in the cluster."; + default = 2; + type = types.int; }; - sidecar = mkOption { - description = "Docker image to seed for the kube-dns sidecar container."; + coredns = mkOption { + description = "Docker image to seed for the CoreDNS container."; type = types.attrs; default = { - imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64"; - imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4"; + imageName = "coredns/coredns"; + imageDigest = "sha256:33c8da20b887ae12433ec5c40bfddefbbfa233d5ce11fb067122e68af30291d6"; 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}"; - resources = { - limits.memory = "170Mi"; - requests = { - cpu = "100m"; - memory = "70Mi"; - }; - }; + args = [ "-conf" "/etc/coredns/Corefile" ]; + image = with cfg.coredns; "${imageName}:${finalImageTag}"; + imagePullPolicy = "Never"; livenessProbe = { failureThreshold = 5; httpGet = { - path = "/healthcheck/kubedns"; - port = 10054; + path = "/health"; + port = ports.health; 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"; - } - ]; + name = "coredns"; ports = [ { - containerPort = 10053; - name = "dns-local"; + containerPort = ports.dns; + name = "dns"; protocol = "UDP"; } { - containerPort = 10053; - name = "dns-tcp-local"; + containerPort = ports.dns; + name = "dns-tcp"; protocol = "TCP"; } { - containerPort = 10055; + containerPort = ports.metrics; 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 = { + limits = { + memory = "170Mi"; + }; requests = { - cpu = "150m"; - memory = "20Mi"; + cpu = "100m"; + memory = "70Mi"; }; }; - volumeMounts = [ - { - mountPath = "/etc/k8s/dns/dnsmasq-nanny"; - name = "kube-dns-config"; - } - ]; - } - { - name = "sidecar"; - image = with cfg.sidecar; "${imageName}:${finalImageTag}"; - livenessProbe = { - httpGet = { - path = "/metrics"; - port = 10054; - scheme = "HTTP"; + securityContext = { + allowPrivilegeEscalation = false; + capabilities = { + drop = [ "all" ]; }; - initialDelaySeconds = 60; - timeoutSeconds = 5; - successThreshold = 1; - failureThreshold = 5; + readOnlyRootFilesystem = true; }; - 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 = [ + volumeMounts = [ { - containerPort = 10054; - name = "metrics"; - protocol = "TCP"; + mountPath = "/etc/coredns"; + name = "config-volume"; + readOnly = true; } ]; - 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 09174ed39f5e867766466a76243c9387033a5678..d1a1383e45b0b840ee81bafc63ccd792364ba886 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -6,13 +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} @@ -24,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 @@ -43,6 +55,8 @@ in ###### interface + meta.maintainers = [ maintainers.markuskowa ]; + options = { services.slurm = { @@ -60,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"; }; @@ -116,9 +151,9 @@ in }; 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" @@ -127,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. @@ -150,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. @@ -159,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; @@ -184,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. + ''; + }; + + }; }; @@ -220,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; @@ -235,6 +314,7 @@ in serviceConfig = { Type = "forking"; + KillMode = "process"; ExecStart = "${wrappedSlurm}/bin/slurmd"; PIDFile = "/run/slurmd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; @@ -261,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 8d767de37f00abeac5fa4df69d81762dc37fd4f2..0f07e6133bb5ced504bae64320e2fdc174c96c0f 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 67c541570b97c4af283ecc346b8b8e892930e0ca..4130ec918a70ab391456f75aa94f5bc7b92f9028 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 861b46a2d642fe4caa421364c3fbba8f4d02ddbb..5d1bfe4ec407e889e34e233a77409d48112c448c 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 option instead. + ''; + }; + + accessTokenFile = mkOption { + default = ""; + type = types.str; + example = "/run/keys/jenkins-job-builder-access-token"; + description = '' + File containing the API token for the + 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/aerospike.nix b/nixos/modules/services/databases/aerospike.nix index 5f33164998bebcafd944a21ae8deab4ea646280c..4b905f90529d2229dbc4dbadc003fadc5e3a9e86 100644 --- a/nixos/modules/services/databases/aerospike.nix +++ b/nixos/modules/services/databases/aerospike.nix @@ -43,6 +43,7 @@ in package = mkOption { default = pkgs.aerospike; + defaultText = "pkgs.aerospike"; type = types.package; description = "Which Aerospike derivation to use"; }; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index 86e74d5d5ab42555fd6daac062c08854563c2afc..d741ee48c48f0b78d97dc4c90ca185d3e4483c7e 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -34,11 +34,13 @@ let { name = "cassandra-etc"; cassandraYaml = builtins.toJSON cassandraConfigWithAddresses; cassandraEnvPkg = "${cfg.package}/conf/cassandra-env.sh"; + cassandraLogbackConfig = pkgs.writeText "logback.xml" cfg.logbackConfig; buildCommand = '' mkdir -p "$out" echo "$cassandraYaml" > "$out/cassandra.yaml" ln -s "$cassandraEnvPkg" "$out/cassandra-env.sh" + ln -s "$cassandraLogbackConfig" "$out/logback.xml" ''; }; in { @@ -139,7 +141,27 @@ in { correspond to a single address, IP aliasing is not supported. ''; }; + logbackConfig = mkOption { + type = types.lines; + default = '' + + + + %-5level %date{HH:mm:ss,SSS} %msg%n + + + + + + + + + ''; + description = '' + XML logback configuration for cassandra + ''; + }; extraConfig = mkOption { type = types.attrs; default = {}; diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 1b8771cec3915e037568865b27fa149b3baec6f4..21e0cee3415151b535c11f212639d973ab901622 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -70,6 +70,11 @@ with lib; }; }; + environment.systemPackages = [ pkgs.clickhouse ]; + + # startup requires a `/etc/localtime` which only if exists if `time.timeZone != null` + time.timeZone = mkDefault "UTC"; + }; } diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix new file mode 100644 index 0000000000000000000000000000000000000000..e977751b21efd5ee40f0e46edc33d4ee4aeae39b --- /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 7883680d46cc3a3b82e10d1c2afaf0654d82a5c0..bf4b644c9b86aacb0de103aea06ae2554a3aa97b 100644 --- a/nixos/modules/services/databases/foundationdb.xml +++ b/nixos/modules/services/databases/foundationdb.xml @@ -3,42 +3,50 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-foundationdb"> - -FoundationDB - -Source: modules/services/databases/foundationdb.nix - -Upstream documentation: - -Maintainer: Austin Seipp - -Available version(s): 5.1.x, 5.2.x, 6.0.x - -FoundationDB (or "FDB") is an open source, distributed, transactional -key-value store. - -
Configuring and basic setup - -To enable FoundationDB, add the following to your -configuration.nix: - + FoundationDB + + Source: + modules/services/databases/foundationdb.nix + + + Upstream documentation: + + + + Maintainer: Austin Seipp + + + Available version(s): 5.1.x, 5.2.x, 6.0.x + + + FoundationDB (or "FDB") is an open source, distributed, transactional + key-value store. + +
+ Configuring and basic setup + + + To enable FoundationDB, add the following to your + configuration.nix: services.foundationdb.enable = true; services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x - - -The option is required, -and must always be specified. Due to the fact FoundationDB network protocols and -on-disk storage formats may change between (major) versions, and upgrades must -be explicitly handled by the user, you must always manually specify this -yourself so that the NixOS module will use the proper version. Note that minor, -bugfix releases are always compatible. - -After running nixos-rebuild, you can verify whether -FoundationDB is running by executing fdbcli (which is added -to ): - + + + + The option is required, and + must always be specified. Due to the fact FoundationDB network protocols and + on-disk storage formats may change between (major) versions, and upgrades + must be explicitly handled by the user, you must always manually specify + this yourself so that the NixOS module will use the proper version. Note + that minor, bugfix releases are always compatible. + + + + After running nixos-rebuild, you can verify whether + FoundationDB is running by executing fdbcli (which is + added to ): $ sudo -u foundationdb fdbcli Using cluster file `/etc/foundationdb/fdb.cluster'. @@ -66,14 +74,14 @@ Cluster: fdb> - - -You can also write programs using the available client libraries. -For example, the following Python program can be run in order to grab the -cluster status, as a quick example. (This example uses -nix-shell shebang support to automatically supply the -necessary Python modules). - + + + + You can also write programs using the available client libraries. For + example, the following Python program can be run in order to grab the + cluster status, as a quick example. (This example uses + nix-shell shebang support to automatically supply the + necessary Python modules). a@link> cat fdb-status.py #! /usr/bin/env nix-shell @@ -100,255 +108,336 @@ a@link> ./fdb-status.py FoundationDB available: True a@link> - - -FoundationDB is run under the foundationdb user and -group by default, but this may be changed in the NixOS configuration. The -systemd unit foundationdb.service controls the -fdbmonitor process. - -By default, the NixOS module for FoundationDB creates a single -SSD-storage based database for development and basic usage. This storage engine -is designed for SSDs and will perform poorly on HDDs; however it can handle far -more data than the alternative "memory" engine and is a better default choice -for most deployments. (Note that you can change the storage backend on-the-fly -for a given FoundationDB cluster using fdbcli.) - -Furthermore, only 1 server process and 1 backup agent are started in the -default configuration. See below for more on scaling to increase this. - -FoundationDB stores all data for all server processes under -/var/lib/foundationdb. You can override this using -, e.g. - + + + + FoundationDB is run under the foundationdb user and group + by default, but this may be changed in the NixOS configuration. The systemd + unit foundationdb.service controls the + fdbmonitor process. + + + + By default, the NixOS module for FoundationDB creates a single SSD-storage + based database for development and basic usage. This storage engine is + designed for SSDs and will perform poorly on HDDs; however it can handle far + more data than the alternative "memory" engine and is a better default + choice for most deployments. (Note that you can change the storage backend + on-the-fly for a given FoundationDB cluster using + fdbcli.) + + + + Furthermore, only 1 server process and 1 backup agent are started in the + default configuration. See below for more on scaling to increase this. + + + + FoundationDB stores all data for all server processes under + /var/lib/foundationdb. You can override this using + , e.g. services.foundationdb.dataDir = "/data/fdb"; - - - -Similarly, logs are stored under -/var/log/foundationdb by default, and there is a -corresponding as well. - -
- -
Scaling processes and backup agents - -Scaling the number of server processes is quite easy; simply specify - to be the number of -FoundationDB worker processes that should be started on the machine. - -FoundationDB worker processes typically require 4GB of RAM per-process at -minimum for good performance, so this option is set to 1 by default since the -maximum amount of RAM is unknown. You're advised to abide by this restriction, -so pick a number of processes so that each has 4GB or more. - -A similar option exists in order to scale backup agent processes, -. Backup agents are not -as performance/RAM sensitive, so feel free to experiment with the number of -available backup processes. - -
- -
Clustering - -FoundationDB on NixOS works similarly to other Linux systems, so this -section will be brief. Please refer to the full FoundationDB documentation for -more on clustering. - -FoundationDB organizes clusters using a set of -coordinators, which are just specially-designated worker -processes. By default, every installation of FoundationDB on NixOS will start -as its own individual cluster, with a single coordinator: the first worker -process on localhost. - -Coordinators are specified globally using the -/etc/foundationdb/fdb.cluster file, which all servers and -client applications will use to find and join coordinators. Note that this file -can not be managed by NixOS so easily: FoundationDB is -designed so that it will rewrite the file at runtime for all clients and nodes -when cluster coordinators change, with clients transparently handling this -without intervention. It is fundamentally a mutable file, and you should not -try to manage it in any way in NixOS. - -When dealing with a cluster, there are two main things you want to -do: - - - Add a node to the cluster for storage/compute. - Promote an ordinary worker to a coordinator. - - -A node must already be a member of the cluster in order to properly be -promoted to a coordinator, so you must always add it first if you wish to -promote it. - -To add a machine to a FoundationDB cluster: - - - Choose one of the servers to start as the initial coordinator. - - Copy the /etc/foundationdb/fdb.cluster file - from this server to all the other servers. Restart FoundationDB on all of - these other servers, so they join the cluster. - All of these servers are now connected and working together - in the cluster, under the chosen coordinator. - - -At this point, you can add as many nodes as you want by just repeating -the above steps. By default there will still be a single coordinator: you can -use fdbcli to change this and add new coordinators. - -As a convenience, FoundationDB can automatically assign coordinators -based on the redundancy mode you wish to achieve for the cluster. Once all the -nodes have been joined, simply set the replication policy, and then issue the -coordinators auto command - -For example, assuming we have 3 nodes available, we can enable double -redundancy mode, then auto-select coordinators. For double redundancy, 3 -coordinators is ideal: therefore FoundationDB will make -every node a coordinator automatically: + + + + Similarly, logs are stored under /var/log/foundationdb + by default, and there is a corresponding + as well. + +
+
+ Scaling processes and backup agents + + + Scaling the number of server processes is quite easy; simply specify + to be the number of + FoundationDB worker processes that should be started on the machine. + + + + FoundationDB worker processes typically require 4GB of RAM per-process at + minimum for good performance, so this option is set to 1 by default since + the maximum amount of RAM is unknown. You're advised to abide by this + restriction, so pick a number of processes so that each has 4GB or more. + + + + A similar option exists in order to scale backup agent processes, + . Backup agents are + not as performance/RAM sensitive, so feel free to experiment with the number + of available backup processes. + +
+
+ Clustering + + + FoundationDB on NixOS works similarly to other Linux systems, so this + section will be brief. Please refer to the full FoundationDB documentation + for more on clustering. + + + + FoundationDB organizes clusters using a set of + coordinators, which are just specially-designated + worker processes. By default, every installation of FoundationDB on NixOS + will start as its own individual cluster, with a single coordinator: the + first worker process on localhost. + + + + Coordinators are specified globally using the + /etc/foundationdb/fdb.cluster file, which all servers and + client applications will use to find and join coordinators. Note that this + file can not be managed by NixOS so easily: + FoundationDB is designed so that it will rewrite the file at runtime for all + clients and nodes when cluster coordinators change, with clients + transparently handling this without intervention. It is fundamentally a + mutable file, and you should not try to manage it in any way in NixOS. + + + + When dealing with a cluster, there are two main things you want to do: + + + + + + Add a node to the cluster for storage/compute. + + + + + Promote an ordinary worker to a coordinator. + + + + + + A node must already be a member of the cluster in order to properly be + promoted to a coordinator, so you must always add it first if you wish to + promote it. + + + + To add a machine to a FoundationDB cluster: + + + + + + Choose one of the servers to start as the initial coordinator. + + + + + Copy the /etc/foundationdb/fdb.cluster file from this + server to all the other servers. Restart FoundationDB on all of these + other servers, so they join the cluster. + + + + + All of these servers are now connected and working together in the + cluster, under the chosen coordinator. + + + + + + At this point, you can add as many nodes as you want by just repeating the + above steps. By default there will still be a single coordinator: you can + use fdbcli to change this and add new coordinators. + + + + As a convenience, FoundationDB can automatically assign coordinators based + on the redundancy mode you wish to achieve for the cluster. Once all the + nodes have been joined, simply set the replication policy, and then issue + the coordinators auto command + + + + For example, assuming we have 3 nodes available, we can enable double + redundancy mode, then auto-select coordinators. For double redundancy, 3 + coordinators is ideal: therefore FoundationDB will make + every node a coordinator automatically: + fdbcli> configure double ssd fdbcli> coordinators auto -This will transparently update all the servers within seconds, and -appropriately rewrite the fdb.cluster file, as well as -informing all client processes to do the same. - -
- -
Client connectivity - -By default, all clients must use the current -fdb.cluster file to access a given FoundationDB cluster. -This file is located by default in -/etc/foundationdb/fdb.cluster on all machines with the -FoundationDB service enabled, so you may copy the active one from your cluster -to a new node in order to connect, if it is not part of the cluster. - -
- -
Client authorization and TLS - -By default, any user who can connect to a FoundationDB process with the -correct cluster configuration can access anything. FoundationDB uses a -pluggable design to transport security, and out of the box it supports a -LibreSSL-based plugin for TLS support. This plugin not only does in-flight -encryption, but also performs client authorization based on the given -endpoint's certificate chain. For example, a FoundationDB server may be -configured to only accept client connections over TLS, where the client TLS -certificate is from organization Acme Co in the -Research and Development unit. - -Configuring TLS with FoundationDB is done using the - options in order to control the peer -verification string, as well as the certificate and its private key. - -Note that the certificate and its private key must be accessible to the -FoundationDB user account that the server runs under. These files are also NOT -managed by NixOS, as putting them into the store may reveal private -information. - -After you have a key and certificate file in place, it is not enough to -simply set the NixOS module options -- you must also configure the -fdb.cluster file to specify that a given set of coordinators -use TLS. This is as simple as adding the suffix :tls to your -cluster coordinator configuration, after the port number. For example, assuming -you have a coordinator on localhost with the default configuration, simply -specifying: + + This will transparently update all the servers within seconds, and + appropriately rewrite the fdb.cluster file, as well as + informing all client processes to do the same. + +
+
+ Client connectivity + + + By default, all clients must use the current fdb.cluster + file to access a given FoundationDB cluster. This file is located by default + in /etc/foundationdb/fdb.cluster on all machines with the + FoundationDB service enabled, so you may copy the active one from your + cluster to a new node in order to connect, if it is not part of the cluster. + +
+
+ Client authorization and TLS + + + By default, any user who can connect to a FoundationDB process with the + correct cluster configuration can access anything. FoundationDB uses a + pluggable design to transport security, and out of the box it supports a + LibreSSL-based plugin for TLS support. This plugin not only does in-flight + encryption, but also performs client authorization based on the given + endpoint's certificate chain. For example, a FoundationDB server may be + configured to only accept client connections over TLS, where the client TLS + certificate is from organization Acme Co in the + Research and Development unit. + + + + Configuring TLS with FoundationDB is done using the + options in order to control the + peer verification string, as well as the certificate and its private key. + + + + Note that the certificate and its private key must be accessible to the + FoundationDB user account that the server runs under. These files are also + NOT managed by NixOS, as putting them into the store may reveal private + information. + + + + After you have a key and certificate file in place, it is not enough to + simply set the NixOS module options -- you must also configure the + fdb.cluster file to specify that a given set of + coordinators use TLS. This is as simple as adding the suffix + :tls to your cluster coordinator configuration, after the + port number. For example, assuming you have a coordinator on localhost with + the default configuration, simply specifying: + XXXXXX:XXXXXX@127.0.0.1:4500:tls -will configure all clients and server processes to use TLS from now -on. - -
- -
Backups and Disaster Recovery - -The usual rules for doing FoundationDB backups apply on NixOS as written -in the FoundationDB manual. However, one important difference is the security -profile for NixOS: by default, the foundationdb systemd unit -uses Linux namespaces to restrict write access to the -system, except for the log directory, data directory, and the -/etc/foundationdb/ directory. This is enforced by default -and cannot be disabled. - -However, a side effect of this is that the fdbbackup -command doesn't work properly for local filesystem backups: FoundationDB uses a -server process alongside the database processes to perform backups and copy the -backups to the filesystem. As a result, this process is put under the -restricted namespaces above: the backup process can only write to a limited -number of paths. - -In order to allow flexible backup locations on local disks, the -FoundationDB NixOS module supports a - option. This option -takes a list of paths, and adds them to the systemd unit, allowing the -processes inside the service to write (and read) the specified -directories. - -For example, to create backups in /opt/fdb-backups, -first set up the paths in the module options: + + will configure all clients and server processes to use TLS from now on. + +
+
+ Backups and Disaster Recovery + + + The usual rules for doing FoundationDB backups apply on NixOS as written in + the FoundationDB manual. However, one important difference is the security + profile for NixOS: by default, the foundationdb systemd + unit uses Linux namespaces to restrict write access to + the system, except for the log directory, data directory, and the + /etc/foundationdb/ directory. This is enforced by default + and cannot be disabled. + + + + However, a side effect of this is that the fdbbackup + command doesn't work properly for local filesystem backups: FoundationDB + uses a server process alongside the database processes to perform backups + and copy the backups to the filesystem. As a result, this process is put + under the restricted namespaces above: the backup process can only write to + a limited number of paths. + + + + In order to allow flexible backup locations on local disks, the FoundationDB + NixOS module supports a + option. This + option takes a list of paths, and adds them to the systemd unit, allowing + the processes inside the service to write (and read) the specified + directories. + + + + For example, to create backups in /opt/fdb-backups, first + set up the paths in the module options: + services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; -Restart the FoundationDB service, and it will now be able to write to -this directory (even if it does not yet exist.) Note: this path -must exist before restarting the unit. Otherwise, systemd -will not include it in the private FoundationDB namespace (and it will not add -it dynamically at runtime). + + Restart the FoundationDB service, and it will now be able to write to this + directory (even if it does not yet exist.) Note: this path + must exist before restarting the unit. Otherwise, + systemd will not include it in the private FoundationDB namespace (and it + will not add it dynamically at runtime). + -You can now perform a backup: + + You can now perform a backup: + $ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups $ sudo -u foundationdb fdbbackup status -t default - -
- -
Known limitations - -The FoundationDB setup for NixOS should currently be considered beta. -FoundationDB is not new software, but the NixOS compilation and integration has -only undergone fairly basic testing of all the available functionality. - - - There is no way to specify individual parameters for - individual fdbserver processes. Currently, all server - processes inherit all the global fdbmonitor settings. - - Ruby bindings are not currently installed. - Go bindings are not currently installed. - - -
- -
Options - -NixOS's FoundationDB module allows you to configure all of the most -relevant configuration options for fdbmonitor, matching it -quite closely. A complete list of options for the FoundationDB module may be -found here. You should -also read the FoundationDB documentation as well. - -
- -
Full documentation - -FoundationDB is a complex piece of software, and requires careful -administration to properly use. Full documentation for administration can be -found here: . - -
- +
+
+ Known limitations + + + The FoundationDB setup for NixOS should currently be considered beta. + FoundationDB is not new software, but the NixOS compilation and integration + has only undergone fairly basic testing of all the available functionality. + + + + + + There is no way to specify individual parameters for individual + fdbserver processes. Currently, all server processes + inherit all the global fdbmonitor settings. + + + + + Ruby bindings are not currently installed. + + + + + Go bindings are not currently installed. + + + +
+
+ Options + + + NixOS's FoundationDB module allows you to configure all of the most relevant + configuration options for fdbmonitor, matching it quite + closely. A complete list of options for the FoundationDB module may be found + here. You should + also read the FoundationDB documentation as well. + +
+
+ Full documentation + + + FoundationDB is a complex piece of software, and requires careful + administration to properly use. Full documentation for administration can be + found here: . + +
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 0dde9ee6e2e5ff8033ab17e3167927f2ba83451f..467feb09b3a35fb9f5b3125fe947e8fafd24e36f 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 { @@ -238,6 +249,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + restartTriggers = [ config.environment.etc."my.cnf".source ]; unitConfig.RequiresMountsFor = "${cfg.dataDir}"; @@ -252,7 +264,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 +275,8 @@ in serviceConfig = { Type = if hasNotify then "notify" else "simple"; RuntimeDirectory = "mysqld"; - ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; + # The last two environment variables are used for starting Galera clusters + ExecStart = "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} $_WSREP_NEW_CLUSTER $_WSREP_START_POSITION"; }; postStart = '' @@ -351,7 +364,7 @@ in ${optionalString (cfg.ensureDatabases != []) '' ( ${concatMapStrings (database: '' - echo "CREATE DATABASE IF NOT EXISTS ${database};" + echo "CREATE DATABASE IF NOT EXISTS \`${database}\`;" '') cfg.ensureDatabases} ) | ${mysql}/bin/mysql -u root -N ''} diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 9f2bf5ef8a9ccdae9a0757c1eff441026d72fad7..e996211be7da20b5d2f6ef878b1af56534d8052e 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 f59fb1c8177265b408a2d5e166396d2c0893efac..aeab445a9983131b732fbf8e0b15274e8cbda6b1 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 1aaf339632454c02cd9e8e81bcc81207eebacee2..14f4d4909bc0c038f3114c13116889cb0fcaa415 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -3,36 +3,39 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-postgresql"> - -PostgreSQL - + PostgreSQL - -Source: modules/services/databases/postgresql.nix - -Upstream documentation: - + + Source: + modules/services/databases/postgresql.nix + + + Upstream documentation: + + - -PostgreSQL is an advanced, free relational database. - -
Configuring - -To enable PostgreSQL, add the following to your -configuration.nix: - + + PostgreSQL is an advanced, free relational database. + + +
+ Configuring + + + To enable PostgreSQL, add the following to your + configuration.nix: = true; - = pkgs.postgresql94; + = pkgs.postgresql_9_4; - -Note that you are required to specify the desired version of -PostgreSQL (e.g. pkgs.postgresql94). Since -upgrading your PostgreSQL version requires a database dump and reload -(see below), NixOS cannot provide a default value for - such as the most recent -release of PostgreSQL. + Note that you are required to specify the desired version of PostgreSQL + (e.g. pkgs.postgresql_9_4). Since upgrading your + PostgreSQL version requires a database dump and reload (see below), NixOS + cannot provide a default value for + such as the most recent + release of PostgreSQL. + -By default, PostgreSQL stores its databases in -/var/db/postgresql. You can override this using -, e.g. - + + By default, PostgreSQL stores its databases in + /var/db/postgresql. You can override this using + , e.g. = "/data/postgresql"; - - - -
- - -
Upgrading - -FIXME: document dump/upgrade/load cycle. - -
- - -
Options - - A complete list of options for the PostgreSQL module may be found here. - -
- - +
+
+
+ Upgrading + + + FIXME: document dump/upgrade/load cycle. + +
+
+ Options + + + A complete list of options for the PostgreSQL module may be found + here. + +
diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index 933b9da2c83c14556555841f6eec8c13841d5daf..c48036a99e8fb5a15358845811eea68cc873e955 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 d9c8b711c450b8e16e604f2f77bf02ed3c4315f3..8045d5fa14f8b8a6de26ba757ba57b79c67a44b4 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/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index dafb0af2075670bdfc1f6adc27a82942365f362d..840aa5294ed0d66925ba7a1078d01f4b51fd64c9 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -61,6 +61,8 @@ in wantedBy = [ "default.target" ]; }; }; + + environment.etc."geoclue/geoclue.conf".source = "${package}/etc/geoclue/geoclue.conf"; }; } diff --git a/nixos/modules/services/desktops/gnome3/file-roller.nix b/nixos/modules/services/desktops/gnome3/file-roller.nix new file mode 100644 index 0000000000000000000000000000000000000000..7fb558a98953f3e2acf42a96418612e0997da708 --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/file-roller.nix @@ -0,0 +1,32 @@ +# File Roller. + +{ config, pkgs, lib, ... }: + +with lib; + +{ + + ###### interface + + options = { + + services.gnome3.file-roller = { + + enable = mkEnableOption "File Roller, an archive manager for GNOME"; + + }; + + }; + + + ###### implementation + + config = mkIf config.services.gnome3.file-roller.enable { + + environment.systemPackages = [ pkgs.gnome3.file-roller ]; + + services.dbus.packages = [ pkgs.gnome3.file-roller ]; + + }; + +} diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index aa1165ab3bba63b7987ef7c1f130f7a3a28414b0..5ea4350be5b42e2870b3af9cfe8c285f83b8b91b 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -33,7 +33,7 @@ with lib; environment.systemPackages = [ pkgs.gnome3.gnome-keyring ]; - services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gnome3.gcr ]; + services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ]; }; 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 0000000000000000000000000000000000000000..021f4f9534b42439b99ca492de9114fc7b3da489 --- /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/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix index e9ad738269e434a89c91782585c3415129c8502d..9631157934f973ee4c00a824dd002684940d59b7 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 0000000000000000000000000000000000000000..cf26e05d5c18b1a840d41ab9ae056f6e527ff512 --- /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 e3f74df3e573e4e0486f20d7733acffca3f25061..e4e47cfbd43838845e8c949fc30008e47238e416 100644 --- a/nixos/modules/services/desktops/profile-sync-daemon.nix +++ b/nixos/modules/services/desktops/profile-sync-daemon.nix @@ -4,22 +4,7 @@ with lib; let cfg = config.services.psd; - - configFile = '' - ${optionalString (cfg.users != [ ]) '' - USERS="${concatStringsSep " " cfg.users}" - ''} - - ${optionalString (cfg.browsers != [ ]) '' - BROWSERS="${concatStringsSep " " cfg.browsers}" - ''} - - ${optionalString (cfg.volatile != "") "VOLATILE=${cfg.volatile}"} - ${optionalString (cfg.daemonFile != "") "DAEMON_FILE=${cfg.daemonFile}"} - ''; - in { - options.services.psd = with types; { enable = mkOption { type = bool; @@ -28,32 +13,6 @@ in { Whether to enable the Profile Sync daemon. ''; }; - - users = mkOption { - type = listOf str; - default = [ ]; - example = [ "demo" ]; - description = '' - A list of users whose browser profiles should be sync'd to tmpfs. - ''; - }; - - browsers = mkOption { - type = listOf str; - default = [ ]; - example = [ "chromium" "firefox" ]; - description = '' - A list of browsers to sync. Available choices are: - - chromium chromium-dev conkeror.mozdev.org epiphany firefox - firefox-trunk google-chrome google-chrome-beta google-chrome-unstable - heftig-aurora icecat luakit midori opera opera-developer opera-beta - qupzilla palemoon rekonq seamonkey - - An empty list will enable all browsers. - ''; - }; - resyncTimer = mkOption { type = str; default = "1h"; @@ -66,80 +25,53 @@ in { omitted. ''; }; - - volatile = mkOption { - type = str; - default = "/run/psd-profiles"; - description = '' - The directory where browser profiles should reside(this should be - mounted as a tmpfs). Do not include a trailing backslash. - ''; - }; - - daemonFile = mkOption { - type = str; - default = "/run/psd"; - description = '' - Where the pid and backup configuration files will be stored. - ''; - }; }; config = mkIf cfg.enable { - assertions = [ - { assertion = cfg.users != []; - message = "services.psd.users must contain at least one user"; - } - ]; - systemd = { - services = { - psd = { - description = "Profile Sync daemon"; - wants = [ "psd-resync.service" "local-fs.target" ]; - wantedBy = [ "multi-user.target" ]; - preStart = "mkdir -p ${cfg.volatile}"; - - path = with pkgs; [ glibc rsync gawk ]; - - unitConfig = { - RequiresMountsFor = [ "/home/" ]; + user = { + services = { + psd = { + enable = true; + description = "Profile Sync daemon"; + wants = [ "psd-resync.service" "local-fs.target" ]; + wantedBy = [ "default.target" ]; + path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ]; + unitConfig = { + RequiresMountsFor = [ "/home/" ]; + }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon sync"; + ExecStop = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon unsync"; + }; }; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = "yes"; - ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon sync"; - ExecStop = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon unsync"; + psd-resync = { + enable = true; + description = "Timed profile resync"; + after = [ "psd.service" ]; + wants = [ "psd-resync.timer" ]; + partOf = [ "psd.service" ]; + wantedBy = [ "default.target" ]; + path = with pkgs; [ rsync kmod gawk nettools utillinux profile-sync-daemon ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync"; + }; }; }; - psd-resync = { - description = "Timed profile resync"; - after = [ "psd.service" ]; - wants = [ "psd-resync.timer" ]; - partOf = [ "psd.service" ]; - - path = with pkgs; [ glibc rsync gawk ]; + timers.psd-resync = { + description = "Timer for profile sync daemon - ${cfg.resyncTimer}"; + partOf = [ "psd-resync.service" "psd.service" ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync"; + timerConfig = { + OnUnitActiveSec = "${cfg.resyncTimer}"; }; }; }; - - timers.psd-resync = { - description = "Timer for profile sync daemon - ${cfg.resyncTimer}"; - partOf = [ "psd-resync.service" "psd.service" ]; - - timerConfig = { - OnUnitActiveSec = "${cfg.resyncTimer}"; - }; - }; }; - - environment.etc."psd.conf".text = configFile; - }; } diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index 9fcc0043186547269c5c9f8a8f2c6a40b041815b..f20860af6e12874b6462bc0e2c7a5e71cbcb8e58 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 94eb2e6a77bf51b551f1b10da274f846adf280aa..1ac53c818a7f77086ea5a350d815fb08e38a361b 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -3,150 +3,148 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="module-services-emacs"> - - Emacs - - + + Emacs is an + extensible, customizable, self-documenting real-time display editor — and + more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp + programming language with extensions to support text editing. + + + Emacs runs within a graphical desktop environment using the X Window System, + but works equally well on a text terminal. Under + macOS, a "Mac port" edition is available, which + uses Apple's native GUI frameworks. + + + Nixpkgs provides a superior environment for + running Emacs. It's simple to create custom builds + by overriding the default packages. Chaotic collections of Emacs Lisp code + and extensions can be brought under control using declarative package + management. NixOS even provides a + systemd user service for automatically starting the Emacs + daemon. + +
+ Installing <application>Emacs</application> - Emacs - is an extensible, customizable, self-documenting real-time display - editor — and more. At its core is an interpreter for Emacs Lisp, a - dialect of the Lisp programming language with extensions to - support text editing. + Emacs can be installed in the normal way for Nix (see + ). In addition, a NixOS + service can be enabled. - - Emacs runs within a graphical desktop environment using the X - Window System, but works equally well on a text terminal. Under - macOS, a "Mac port" edition is - available, which uses Apple's native GUI frameworks. - +
+ The Different Releases of Emacs + + + Nixpkgs defines several basic Emacs packages. + The following are attributes belonging to the pkgs set: + + + + emacs + + + emacs25 + + + + The latest stable version of Emacs 25 using the + GTK+ 2 + widget toolkit. + + + + + + emacs25-nox + + + + Emacs 25 built without any dependency on X11 libraries. + + + + + + emacsMacport + + + emacs25Macport + + + + Emacs 25 with the "Mac port" patches, providing a more native look and + feel under macOS. + + + + + + + + If those aren't suitable, then the following imitation Emacs editors are + also available in Nixpkgs: + Zile, + mg, + Yi. + +
- - Nixpkgs provides a superior environment - for running Emacs. It's simple to - create custom builds by overriding the default packages. Chaotic - collections of Emacs Lisp code and extensions can be brought under - control using declarative package - management. NixOS even provides a - systemd user service for automatically - starting the Emacs daemon. - +
+ Adding Packages to Emacs -
- Installing <application>Emacs</application> + + Emacs includes an entire ecosystem of functionality beyond text editing, + including a project planner, mail and news reader, debugger interface, + calendar, and more. + + + Most extensions are gotten with the Emacs packaging system + (package.el) from + Emacs Lisp Package Archive + (ELPA), + MELPA, + MELPA Stable, and + Org ELPA. Nixpkgs is + regularly updated to mirror all these archives. + + + + Under NixOS, you can continue to use + package-list-packages and + package-install to install packages. You can also + declare the set of Emacs packages you need using the derivations from + Nixpkgs. The rest of this section discusses declarative installation of + Emacs packages through nixpkgs. + + + - Emacs can be installed in the normal way for Nix (see - ). - In addition, a NixOS service - can be enabled. + This documentation describes the new Emacs packages framework in NixOS + 16.03 (emacsPackagesNg) which should not be confused + with the previous and deprecated framework + (emacs24Packages). - -
- The Different Releases of Emacs - - - Nixpkgs defines several basic Emacs - packages. The following are attributes belonging to the - pkgs set: - - - - emacs - emacs25 - - - The latest stable version of Emacs 25 using the GTK+ 2 widget - toolkit. - - - - - emacs25-nox - - - Emacs 25 built without any dependency on X11 - libraries. - - - - - emacsMacport - emacs25Macport - - - Emacs 25 with the "Mac port" patches, providing a more - native look and feel under macOS. - - - - - - - - If those aren't suitable, then the following imitation Emacs - editors are also available in Nixpkgs: - Zile, - mg, - Yi. - - -
-
- Adding Packages to Emacs - - Emacs includes an entire ecosystem of functionality beyond - text editing, including a project planner, mail and news - reader, debugger interface, calendar, and more. - - - - Most extensions are gotten with the Emacs packaging system - (package.el) from Emacs Lisp Package Archive - (ELPA), - MELPA, - MELPA Stable, - and Org ELPA. - Nixpkgs is regularly updated to mirror all these archives. - - - - Under NixOS, you can continue to use - package-list-packages and - package-install to install packages. You - can also declare the set of Emacs packages you need using the - derivations from Nixpkgs. The rest of this section discusses - declarative installation of Emacs packages through nixpkgs. - - - - - This documentation describes the new Emacs packages - framework in NixOS 16.03 - (emacsPackagesNg) which should not be - confused with the previous and deprecated framework - (emacs24Packages). - - - - - The first step to declare the list of packages you want in - your Emacs installation is to create a dedicated - derivation. This can be done in a dedicated - emacs.nix file such as: - - - Nix expression to build Emacs with packages (<filename>emacs.nix</filename>) - + + + + The first step to declare the list of packages you want in your Emacs + installation is to create a dedicated derivation. This can be done in a + dedicated emacs.nix file such as: + + Nix expression to build Emacs with packages (<filename>emacs.nix</filename>) + /* This is a nix expression to build Emacs and some Emacs packages I like from source on any distribution where Nix is installed. This will install @@ -181,119 +179,104 @@ in pkgs.notmuch # From main packages set ]) - - - - - - The first non-comment line in this file - ({ pkgs ? ... }) - indicates that the whole file represents a function. - - - - - - The let expression below defines a - myEmacs binding pointing to the current - stable version of Emacs. This binding is here to separate the - choice of the Emacs binary from the specification of the - required packages. - - - - - - This generates an emacsWithPackages - function. It takes a single argument: a function from a - package set to a list of packages (the packages that will - be available in Emacs). - - - - - - The rest of the file specifies the list of packages to - install. In the example, two packages - (magit and - zerodark-theme) are taken from MELPA - stable. - - - - - - Two packages (undo-tree and - zoom-frm) are taken from MELPA. - - - - - Three packages are taken from GNU ELPA. - - - - - notmuch is taken from a nixpkgs derivation - which contains an Emacs mode. - - - - + + + + + The first non-comment line in this file ({ pkgs ? ... + }) indicates that the whole file represents a function. - + + - The result of this configuration will be an - emacs command which launches Emacs with all - of your chosen packages in the load-path. + The let expression below defines a + myEmacs binding pointing to the current stable + version of Emacs. This binding is here to separate the choice of the + Emacs binary from the specification of the required packages. - + + - You can check that it works by executing this in a terminal: - + This generates an emacsWithPackages function. It + takes a single argument: a function from a package set to a list of + packages (the packages that will be available in Emacs). + + + + + The rest of the file specifies the list of packages to install. In the + example, two packages (magit and + zerodark-theme) are taken from MELPA stable. + + + + + Two packages (undo-tree and + zoom-frm) are taken from MELPA. + + + + + Three packages are taken from GNU ELPA. + + + + + notmuch is taken from a nixpkgs derivation which + contains an Emacs mode. + + + + + + + The result of this configuration will be an emacs + command which launches Emacs with all of your chosen packages in the + load-path. + + + + You can check that it works by executing this in a terminal: $ nix-build emacs.nix $ ./result/bin/emacs -q + and then typing M-x package-initialize. Check that you + can use all the packages you want in this Emacs instance. For example, try + switching to the zerodark theme through M-x load-theme <RET> + zerodark <RET> y. + - and then typing M-x package-initialize. - Check that you can use all the packages you want in this - Emacs instance. For example, try switching to the zerodark - theme through - M-x load-theme <RET> zerodark <RET> y. - - - - - A few popular extensions worth checking out are: auctex, - company, edit-server, flycheck, helm, iedit, magit, - multiple-cursors, projectile, and yasnippet. - - - - - The list of available packages in the various ELPA - repositories can be seen with the following commands: - - Querying Emacs packages - + + A few popular extensions worth checking out are: auctex, company, + edit-server, flycheck, helm, iedit, magit, multiple-cursors, projectile, + and yasnippet. + + + + + The list of available packages in the various ELPA repositories can be seen + with the following commands: + + Querying Emacs packages +" -qaP -A emacsPackagesNg.elpaPackages nix-env -f "" -qaP -A emacsPackagesNg.melpaPackages nix-env -f "" -qaP -A emacsPackagesNg.melpaStablePackages nix-env -f "" -qaP -A emacsPackagesNg.orgPackages ]]> - - - - - If you are on NixOS, you can install this particular Emacs for - all users by adding it to the list of system packages - (see ). Simply - modify your file configuration.nix to - make it contain: - - Custom Emacs in <filename>configuration.nix</filename> - + + + + If you are on NixOS, you can install this particular Emacs for all users by + adding it to the list of system packages (see + ). Simply modify your file + configuration.nix to make it contain: + + Custom Emacs in <filename>configuration.nix</filename> +" -qaP -A emacsPackagesNg.orgPackages ]; } ]]> - - + + - - In this case, the next nixos-rebuild switch - will take care of adding your emacs to the - PATH environment variable - (see ). - + + In this case, the next nixos-rebuild switch will take + care of adding your emacs to the PATH + environment variable (see ). + - - If you are not on NixOS or want to install this particular - Emacs only for yourself, you can do so by adding it to your - ~/.config/nixpkgs/config.nix - (see Nixpkgs manual): - - Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename> - + If you are not on NixOS or want to install this particular Emacs only for + yourself, you can do so by adding it to your + ~/.config/nixpkgs/config.nix (see + Nixpkgs + manual): + + Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename> + - - - - - In this case, the next - nix-env -f '<nixpkgs>' -iA myemacs - will take care of adding your emacs to the - PATH environment variable. - -
- -
- Advanced Emacs Configuration + + - - If you want, you can tweak the Emacs package itself from your - emacs.nix. For example, if you want to - have a GTK+3-based Emacs instead of the default GTK+2-based - binary and remove the automatically generated - emacs.desktop (useful is you only use - emacsclient), you can change your file - emacs.nix in this way: - + + In this case, the next nix-env -f '<nixpkgs>' -iA + myemacs will take care of adding your emacs to the + PATH environment variable. + +
- - Custom Emacs build - + Advanced Emacs Configuration + + + If you want, you can tweak the Emacs package itself from your + emacs.nix. For example, if you want to have a + GTK+3-based Emacs instead of the default GTK+2-based binary and remove the + automatically generated emacs.desktop (useful is you + only use emacsclient), you can change your file + emacs.nix in this way: + + + + Custom Emacs build + {} }: let myEmacs = (pkgs.emacs.override { @@ -370,161 +352,143 @@ let }); in [...] ]]> - + - - After building this file as shown in , - you will get an GTK3-based Emacs binary pre-loaded with your - favorite packages. - -
+ + After building this file as shown in , you + will get an GTK3-based Emacs binary pre-loaded with your favorite packages. +
- -
+
+
Running Emacs as a Service + - NixOS provides an optional - systemd service which launches - - Emacs daemon - - with the user's login session. + NixOS provides an optional + systemd service which launches + + Emacs daemon with the user's login session. - Source: - modules/services/editors/emacs.nix + Source: + modules/services/editors/emacs.nix
- Enabling the Service - - - To install and enable the systemd - user service for Emacs daemon, add the following to your - configuration.nix: + Enabling the Service + + To install and enable the systemd user service for Emacs + daemon, add the following to your configuration.nix: = true; = import /home/cassou/.emacs.d { pkgs = pkgs; }; - - - - The services.emacs.package option allows a - custom derivation to be used, for example, one created by - emacsWithPackages. - - - - Ensure that the Emacs server is enabled for your user's Emacs - configuration, either by customizing the - server-mode variable, or by adding - (server-start) to - ~/.emacs.d/init.el. - - - - To start the daemon, execute the following: - + + + + The services.emacs.package option allows a custom + derivation to be used, for example, one created by + emacsWithPackages. + + + + Ensure that the Emacs server is enabled for your user's Emacs + configuration, either by customizing the server-mode + variable, or by adding (server-start) to + ~/.emacs.d/init.el. + + + + To start the daemon, execute the following: $ nixos-rebuild switch # to activate the new configuration.nix $ systemctl --user daemon-reload # to force systemd reload $ systemctl --user start emacs.service # to start the Emacs daemon - - The server should now be ready to serve Emacs clients. - - + The server should now be ready to serve Emacs clients. +
- Starting the client - - Ensure that the emacs server is enabled, either by customizing - the server-mode variable, or by adding - (server-start) to - ~/.emacs. - + Starting the client - - To connect to the emacs daemon, run one of the following: - + Ensure that the emacs server is enabled, either by customizing the + server-mode variable, or by adding + (server-start) to ~/.emacs. + + + + To connect to the emacs daemon, run one of the following: + - +
- Configuring the <varname>EDITOR</varname> variable - - - - If is - true, the EDITOR variable - will be set to a wrapper script which launches - emacsclient. - - - - Any setting of EDITOR in the shell config - files will override - services.emacs.defaultEditor. - To make sure EDITOR refers to the Emacs - wrapper script, remove any existing EDITOR - assignment from .profile, - .bashrc, .zshenv or - any other shell config file. - - - - If you have formed certain bad habits when editing files, - these can be corrected with a shell alias to the wrapper - script: - alias vi=$EDITOR - + Configuring the <varname>EDITOR</varname> variable + + + + + If is + true, the EDITOR variable will be set + to a wrapper script which launches emacsclient. + + + + Any setting of EDITOR in the shell config files will + override services.emacs.defaultEditor. To make sure + EDITOR refers to the Emacs wrapper script, remove any + existing EDITOR assignment from + .profile, .bashrc, + .zshenv or any other shell config file. + + + + If you have formed certain bad habits when editing files, these can be + corrected with a shell alias to the wrapper script: +alias vi=$EDITOR +
- Per-User Enabling of the Service - - - In general, systemd user services - are globally enabled by symlinks in - /etc/systemd/user. In the case where - Emacs daemon is not wanted for all users, it is possible to - install the service but not globally enable it: + Per-User Enabling of the Service + + In general, systemd user services are globally enabled + by symlinks in /etc/systemd/user. In the case where + Emacs daemon is not wanted for all users, it is possible to install the + service but not globally enable it: = false; = true; - - - - To enable the systemd user service for just - the currently logged in user, run: - - systemctl --user enable emacs - - This will add the symlink - ~/.config/systemd/user/emacs.service. - + + + + To enable the systemd user service for just the + currently logged in user, run: +systemctl --user enable emacs + This will add the symlink + ~/.config/systemd/user/emacs.service. +
-
- -
+
+
Configuring Emacs - The Emacs init file should be changed to load the extension - packages at startup: - - - Package initialization in <filename>.emacs</filename> - + Package initialization in <filename>.emacs</filename> + - + - After the declarative emacs package configuration has been - tested, previously downloaded packages can be cleaned up by - removing ~/.emacs.d/elpa (do make a backup - first, in case you forgot a package). + After the declarative emacs package configuration has been tested, + previously downloaded packages can be cleaned up by removing + ~/.emacs.d/elpa (do make a backup first, in case you + forgot a package). -
- A Major Mode for Nix Expressions + A Major Mode for Nix Expressions - - Of interest may be melpaPackages.nix-mode, - which provides syntax highlighting for the Nix language. This is - particularly convenient if you regularly edit Nix files. - + + Of interest may be melpaPackages.nix-mode, which + provides syntax highlighting for the Nix language. This is particularly + convenient if you regularly edit Nix files. +
- Accessing man pages - - You can use woman to get completion of all - available man pages. For example, type M-x woman - <RET> nixos-rebuild <RET>. - + Accessing man pages + + + You can use woman to get completion of all available + man pages. For example, type M-x woman <RET> nixos-rebuild + <RET>. +
- Editing DocBook 5 XML Documents - - Emacs includes nXML, - a major-mode for validating and editing XML documents. - When editing DocBook 5.0 documents, such as - this one, - nXML needs to be configured with the relevant schema, which is - not included. - + Editing DocBook 5 XML Documents - - To install the DocBook 5.0 schemas, either add - pkgs.docbook5 to - ( + Emacs includes + nXML, + a major-mode for validating and editing XML documents. When editing DocBook + 5.0 documents, such as this one, + nXML needs to be configured with the relevant schema, which is not + included. + + + + To install the DocBook 5.0 schemas, either add + pkgs.docbook5 to + + (NixOS), or run - nix-env -i pkgs.docbook5 - (Nix). - - - - Then customize the variable rng-schema-locating-files to include ~/.emacs.d/schemas.xml and put the following text into that file: - - nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>) - nix-env -i pkgs.docbook5 + (Nix). + + + + Then customize the variable rng-schema-locating-files to + include ~/.emacs.d/schemas.xml and put the following + text into that file: + + nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>) + 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 2c8fe1866120c8b9b37385d32b9a1452558e81b0..efbf8561b7ff23b7f49c73ba46029f5e167c9219 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 7cd3c17936615b9c552b21a0d9fd04309d770b3f..0000000000000000000000000000000000000000 --- 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 cfee1b0d86391b0af12a616128ce69a67e52c856..f15a7624327795fc19882c66d9bb4f6deab1ebc6 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 2896c0c0913909c2417426ff9e4ca3492c8bd530..de7e3bd6a07e17726fe2b8661877730ec15cb644 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 069df52ba12dc65314fe501ace09395b194804ae..fbf85ef8042600b827704fbfa98432dc3448e6cb 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 f254e91e5c656a1b3fc726dfb660adbef32c47df..ef7ad9b32669a2095b03729f35587d3c915ee979 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 0000000000000000000000000000000000000000..f495be8a93e4b3224dff821a7a70237b554e4e66 --- /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 Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server. - postInstall = '' - echo "Updating Mono key store" - $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt - '' - # According to [1], gmcs is just mcs - # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in - + '' - ln -s $out/bin/mcs $out/bin/gmcs - ''; - - inherit enableParallelBuilding; - - meta = with stdenv.lib; { - homepage = http://mono-project.com/; - description = "Cross platform, open source .NET development framework"; - platforms = with platforms; darwin ++ linux; - maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; - license = licenses.free; # Combination of LGPL/X11/GPL ? - # 2018-08-21: mono 5.x is broken on aarch64 since at least 2017-07-06 - broken = stdenv.isAarch64 && (versionAtLeast version "5"); - }; -} diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 06dcfb8b39339bd9afba7c6d3048dc026027564c..400b040ae85be2b542da77d47f4d227090470ff9 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -1,19 +1,10 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11 -, callPackage, ncurses, zlib -, cacert, Foundation, libobjc, python - -, version, sha256 -, withLLVM ? false -, enableParallelBuilding ? true -, meta ? {} -}: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which, enableParallelBuilding ? true }: let llvm = callPackage ./llvm.nix { }; - name = "mono-${version}"; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "mono-${version}"; src = fetchurl { inherit sha256; @@ -21,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = - [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python + [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); @@ -32,8 +23,6 @@ stdenv.mkDerivation { # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 dontDisableStatic = true; - # In fact I think this line does not help at all to what I - # wanted to achieve: have mono to find libgdiplus automatically configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" @@ -41,10 +30,14 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optionals withLLVM [ "--enable-llvm" - "--enable-llvmloaded" "--with-llvm=${llvm}" ]; + configurePhase = '' + patchShebangs ./ + ./autogen.sh --prefix $out $configureFlags + ''; + # Attempt to fix this error when running "mcs --version": # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image dontStrip = true; @@ -57,19 +50,18 @@ stdenv.mkDerivation { # LLVM path to point into the Mono LLVM build, since it's private anyway. preBuild = '' makeFlagsArray=(INSTALL=`type -tp install`) - patchShebangs ./ substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share" '' + stdenv.lib.optionalString withLLVM '' substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" ''; - # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps + # Fix mono DLLMap so it can find libX11 to run winforms apps + # libgdiplus is correctly handled by the --with-libgdiplus configure flag # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive # http://www.mono-project.com/Config_DllMap postBuild = '' find . -name 'config' -type f | xargs \ - sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \ - -e "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" \ + sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" ''; # Without this, any Mono application attempting to open an SSL connection will throw with @@ -87,11 +79,11 @@ stdenv.mkDerivation { inherit enableParallelBuilding; - meta = { + meta = with stdenv.lib; { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; - platforms = stdenv.lib.platforms.x86; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ]; - license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? - } // meta; + platforms = with platforms; darwin ++ linux; + maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; + license = licenses.free; # Combination of LGPL/X11/GPL ? + }; } diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 8e9dcc1dbcb54a2807e53e4cfe44289e5ac6b8b0..616ec420d2d02138886a8017891b6ea9e7b6ac18 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -1,9 +1,10 @@ { stdenv -, fetchurl -, perl +, lib +, fetchFromGitHub , groff , cmake -, python +, python2 +, perl , libffi , libbfd , libxml2 @@ -14,22 +15,16 @@ stdenv.mkDerivation rec { name = "llvm-${version}"; - version = "3.4svn-mono-f9b1a74368"; - src = fetchurl { - # from the HEAD of the 'mono3' branch - url = "https://github.com/mono/llvm/archive/f9b1a74368ec299fc04c4cfef4b5aa0992b7b806.tar.gz"; - name = "${name}.tar.gz"; - sha256 = "1bbkx4p5zdnk3nbdd5jxvbwqx8cdq8z1n1nhf639i98mggs0zhdg"; - }; + version = "3.6-mono-2017-02-15"; - patches = [ ./build-fix-llvm.patch ]; - unpackPhase = '' - unpackFile ${src} - mv llvm-* llvm - sourceRoot=$PWD/llvm - ''; + src = fetchFromGitHub { + owner = "mono"; + repo = "llvm"; + rev = "dbb6fdffdeb780d11851a6be77c209bd7ada4bd3"; + sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7"; + }; - buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind; + buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind; propagatedBuildInputs = [ ncurses zlib ]; @@ -43,7 +38,6 @@ stdenv.mkDerivation rec { cmakeFlags = with stdenv; [ "-DLLVM_ENABLE_FFI=ON" "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch b/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch deleted file mode 100644 index 1b9c59402bff24695626bd24ce2f229996456d30..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old 2017-04-24 23:45:18.348116305 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets 2017-04-24 23:45:11.407051755 +0200 -@@ -167,8 +167,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old 2017-04-24 23:49:53.019616196 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets 2017-04-24 23:50:05.709729585 +0200 -@@ -232,8 +232,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old 2017-04-24 23:52:33.200037047 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets 2017-04-24 23:52:43.281125802 +0200 -@@ -139,8 +139,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old 2017-04-24 23:54:02.585821594 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets 2017-04-24 23:54:09.313880438 +0200 -@@ -234,8 +234,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) -diff -Naur mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets ---- mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old 2017-04-24 23:55:46.244895155 +0200 -+++ mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets 2017-04-24 23:55:51.998961342 +0200 -@@ -232,8 +232,8 @@ - $(ReferencePath); - @(AdditionalReferencePath); - {HintPathFromItem}; -- {TargetFrameworkDirectory}; - {PkgConfig}; -+ {TargetFrameworkDirectory}; - {GAC}; - {RawFileName}; - $(OutDir) diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 3ab553678b6c404717f4569a17a1f564e09a6b73..cfc1f00a80360f71672e408f3c0d2deb1a9e8d0f 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mruby-${version}"; - version = "1.4.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "0pw72acbqgs4n1qa297nnja23v9hxz9g7190yfx9kwm7mgbllmww"; + sha256 = "1r6w1asjshff43ymdwa6xmrkggza99mi2kw88k7ic6ag2j81hcj5"; }; patches = [ diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index b95f6e5ee95fdd441286d76006f2226646345805..8709c7186491a5b22623c11e4546576d251bf674 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.13.03"; + version = "2.14.02"; src = fetchurl { url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33"; + sha256 = "1g409sr1kj7v1089s9kv0i4azvddkcwcypnbakfryyi71b3jdz9l"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index 5ec3b5f59d88cfb0bef2dd419e4364d9a93f45f3..156657d61d6b491a4b23c077e8cfb70a3c9f4216 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -1,29 +1,66 @@ -{ stdenv, fetchFromGitHub, cmake -, icestorm, python3, boost, qtbase +{ stdenv, fetchFromGitHub, cmake, makeWrapper +, boost, python3 +, icestorm, trellis + +# TODO(thoughtpolice) Currently the GUI build seems broken at runtime on my +# laptop (and over a remote X server on my server...), so mark it broken for +# now, with intent to fix later. +, enableGui ? false +, qtbase }: let boostPython = boost.override { python = python3; enablePython = true; }; + + # This is a massive hack. For now, Trellis doesn't really support + # installation through an already-built package; you have to build it once to + # get the tools, then reuse the build directory to build nextpnr -- the + # 'install' phase doesn't install everything it needs. This will be fixed in + # the future but for now we can do this horrific thing. + trellisRoot = trellis.overrideAttrs (_: { + installPhase = '' + mkdir -p $out + cp *.so .. + cd ../../.. && cp -R trellis database $out/ + ''; + }); in stdenv.mkDerivation rec { name = "nextpnr-${version}"; - version = "2018.08.09"; + version = "2019.01.08"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "2e02f2d6166c75b1fcec73d268e97e407071a372"; - sha256 = "1f98mkailn75gz5fvhjhnyr0gwa0r8mm3f2sbvgl0yvys8qi08wr"; + rev = "c1d15c749c2aa105ee7b38ebe1b60a27e3743e8c"; + sha256 = "082ac03s6164s7dwz1l9phshl8m1lizn45jykabrhks5jcccchbh"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ boostPython python3 qtbase ]; + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs + = [ boostPython python3 ] + ++ (stdenv.lib.optional enableGui qtbase); enableParallelBuilding = true; cmakeFlags = - [ "-DARCH=generic;ice40" + [ "-DARCH=generic;ice40;ecp5" "-DICEBOX_ROOT=${icestorm}/share/icebox" - ]; + "-DTRELLIS_ROOT=${trellisRoot}/trellis" + ] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF"); + + # Fix the version number. This is a bit stupid (and fragile) in practice + # but works ok. We should probably make this overrideable upstream. + patchPhase = with builtins; '' + substituteInPlace ./CMakeLists.txt \ + --replace 'git log -1 --format=%h' 'echo ${substring 0 11 src.rev}' + ''; + + postInstall = stdenv.lib.optionalString enableGui '' + for x in generic ice40 ecp5; do + wrapProgram $out/bin/nextpnr-$x \ + --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtbase.qtCompatVersion}/plugins + done + ''; meta = with stdenv.lib; { description = "Place and route tool for FPGAs"; @@ -31,5 +68,7 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; + + broken = enableGui; }; } diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index a4b706d35aa527ac4a9e88f5074d73c51cd1a169..ae36041b33ebedcf1c3ff95fa381a8ff6a0b8fa6 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -1,14 +1,14 @@ # based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml -{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-8_x, openssl, pcre, readline, sqlite, boehmgc, sfml, tzdata, coreutils }: +{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-10_x, openssl, pcre, readline, boehmgc, sfml, tzdata, coreutils }: stdenv.mkDerivation rec { name = "nim-${version}"; - version = "0.18.0"; + version = "0.19.0"; src = fetchurl { url = "https://nim-lang.org/download/${name}.tar.xz"; - sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0"; + sha256 = "0biwvw1gividp5lkf0daq1wp9v6ms4xy6dkf5zj0sn9w4m3n76d1"; }; doCheck = !stdenv.isDarwin; @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { "-lcrypto" "-lpcre" "-lreadline" - "-lsqlite3" "-lgc" ]; @@ -28,12 +27,21 @@ stdenv.mkDerivation rec { # used for bootstrapping, but koch insists on moving the nim compiler around # as part of building it, so it cannot be read-only + nativeBuildInputs = [ + makeWrapper nodejs-slim-10_x tzdata coreutils + ]; + buildInputs = [ - makeWrapper nodejs-slim-8_x tzdata coreutils - openssl pcre readline sqlite boehmgc sfml + openssl pcre readline boehmgc sfml ]; + phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "checkPhase" ]; + buildPhase = '' + # use $CC to trigger the linker since calling ld in build.sh causes an error + LD=$CC + # build.sh wants to write to $HOME/.cache + HOME=$TMPDIR sh build.sh ./bin/nim c koch ./koch boot -d:release \ @@ -51,33 +59,24 @@ stdenv.mkDerivation rec { --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]} ''; - postPatch = + patchPhase = let disableTest = ''sed -i '1i discard \"\"\"\n disabled: true\n\"\"\"\n\n' ''; + disableStdLibTest = ''sed -i -e '/^when isMainModule/,/^END$/{s/^/#/}' ''; disableCompile = ''sed -i -e 's/^/#/' ''; in '' substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep" substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin" substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - # disable supposedly broken tests - ${disableTest} ./tests/errmsgs/tproper_stacktrace2.nim - ${disableTest} ./tests/vm/trgba.nim - # disable tests requiring network access (not available in the build container) ${disableTest} ./tests/stdlib/thttpclient.nim - ${disableTest} ./tests/cpp/tasync_cpp.nim - ${disableTest} ./tests/niminaction/Chapter7/Tweeter/src/tweeter.nim - - # disable tests requiring un-downloadable dependencies (using nimble, which isn't available in the fetch phase) - ${disableCompile} ./tests/manyloc/keineschweine/keineschweine.nim - ${disableTest} ./tests/manyloc/keineschweine/keineschweine.nim - ${disableCompile} ./tests/manyloc/nake/nakefile.nim - ${disableTest} ./tests/manyloc/nake/nakefile.nim - ${disableCompile} ./tests/manyloc/named_argument_bug/main.nim - ${disableTest} ./tests/manyloc/named_argument_bug/main.nim + '' + lib.optionalString stdenv.isAarch64 '' + # disable test supposedly broken on aarch64 + ${disableStdLibTest} ./lib/pure/stats.nim ''; checkPhase = '' + PATH=$PATH:$out/bin ./koch tests ''; diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix index 19b9626f4e8f55f2c348418764388d18ed371099..c1952f30ba6889d50b91fef1d6f36f659e3dace9 100644 --- a/pkgs/development/compilers/ocaml/4.07.nix +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "07"; - patch_version = "0"; - sha256 = "03wzkzv6w4rdiiva20g5amz0n4x75swpjl8d80468p6zm8hgfnzl"; + patch_version = "1"; + sha256 = "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z"; # If the executable is stripped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix deleted file mode 100644 index e6c68894036858b4ab4db2e2d1e05496e77007c1..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-104.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, fetchurl, ncurses, libX11, xproto, buildEnv }: - -let - useX11 = stdenv.isi686 || stdenv.isx86_64; - inherit (stdenv.lib) optionals; -in - -stdenv.mkDerivation rec { - - name = "ber-metaocaml-${version}"; - version = "104"; - - src = fetchurl { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04.0.tar.gz"; - sha256 = "1pi2hdm9lxhn45qvfqfss1hpa4jijm14qgmrgajsadxqdiplhqyb"; - }; - - metaocaml = fetchurl { - url = "http://okmij.org/ftp/ML/ber-metaocaml-104.tar.gz"; - sha256 = "1gmwlxairxqcmqa2r6kbf8b4dxc7pfhfbh48g1s14d3z20rj8nib"; - }; - - # Needed to avoid a SIGBUS on the final executable on mips - NIX_CFLAGS_COMPILE = if stdenv.isMips then "-fPIC" else ""; - - x11env = buildEnv { name = "x11env"; paths = [libX11 xproto];}; - x11lib = x11env + "/lib"; - x11inc = x11env + "/include"; - - prefixKey = "-prefix "; - configureFlags = optionals useX11 [ "-x11lib" x11lib - "-x11include" x11inc ]; - - dontStrip = true; - buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; - installFlags = "-i"; - installTargets = "install"; # + optionalString useNativeCompilers " installopt"; - - postConfigure = '' - tar -xvzf $metaocaml - cd ${name} - make patch - cd .. - ''; - buildPhase = '' - make world - make -i install - - make bootstrap - make opt.opt - make installopt - mkdir -p $out/include - ln -sv $out/lib/ocaml/caml $out/include/caml - cd ${name} - make all - make install - make install.opt - cd .. - ''; - installPhase = ""; - postBuild = '' - ''; - checkPhase = '' - cd ${name} - make test - make test-compile - make test-native - cd .. - ''; - - meta = with stdenv.lib; { - homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; - license = with licenses; [ - qpl /* compiler */ - lgpl2 /* library */ - ]; - description = "Conservative extension of OCaml"; - longDescription = '' - A conservative extension of OCaml with the primitive type of code values, - and three basic multi-stage expression forms: Brackets, Escape, and Run - ''; - }; -} diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix new file mode 100644 index 0000000000000000000000000000000000000000..a933151de12afbcb5e97cc42b49d36fda790a513 --- /dev/null +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -0,0 +1,96 @@ +{ stdenv, fetchurl +, ncurses +, libX11, xorgproto, buildEnv +}: + +let + useX11 = stdenv.isi686 || stdenv.isx86_64; + x11deps = [ libX11 xorgproto ]; + inherit (stdenv.lib) optionals; + + baseOcamlBranch = "4.07"; + baseOcamlVersion = "${baseOcamlBranch}.1"; + metaocamlPatch = "107"; +in + +stdenv.mkDerivation rec { + name = "ber-metaocaml-${version}"; + version = metaocamlPatch; + + src = fetchurl { + url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz"; + sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a"; + }; + + metaocaml = fetchurl { + url = "http://okmij.org/ftp/ML/ber-metaocaml-107.tar.gz"; + sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm"; + }; + + x11env = buildEnv { name = "x11env"; paths = x11deps; }; + x11lib = "${x11env}/lib"; + x11inc = "${x11env}/include"; + + prefixKey = "-prefix "; + configureFlags = optionals useX11 + [ "-x11lib" x11lib + "-x11include" x11inc + "-flambda" + ]; + + dontStrip = true; + buildInputs = [ ncurses ] ++ optionals useX11 x11deps; + + postConfigure = '' + tar -xvzf $metaocaml + cd ${name} + make patch + cd .. + ''; + + buildPhase = '' + make world + make -i install + + make bootstrap + make opt.opt + make installopt + mkdir -p $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + cd ${name} + make all + ''; + + installPhase = '' + make install + make install.opt + ''; + + checkPhase = '' + cd ${name} + make test + make test-compile + make test-native + cd .. + ''; + + passthru = { + nativeCompilers = true; + }; + + meta = with stdenv.lib; { + description = "Multi-Stage Programming extension for OCaml"; + homepage = http://okmij.org/ftp/ML/MetaOCaml.html; + license = with licenses; [ /* compiler */ qpl /* library */ lgpl2 ]; + maintainers = with maintainers; [ thoughtpolice ]; + + branch = baseOcamlBranch; + platforms = with platforms; linux ++ darwin; + broken = stdenv.isAarch64 || stdenv.isMips; + + longDescription = '' + A simple extension of OCaml with the primitive type of code values, and + three basic multi-stage expression forms: Brackets, Escape, and Run. + ''; + }; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d2295d2d79b003fedbb463c12227329b229e342e..7ada5b804e358a37f4427a060543c3b65dc167ec 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -11,7 +11,7 @@ let in { stdenv, fetchurl, ncurses, buildEnv -, libX11, xproto, useX11 ? safeX11 stdenv +, libX11, xorgproto, useX11 ? safeX11 stdenv , flambdaSupport ? false }: @@ -24,11 +24,13 @@ let name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}"; in -stdenv.mkDerivation (args // rec { - - x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; }; +let + x11env = buildEnv { name = "x11env"; paths = [libX11 xorgproto]; }; x11lib = x11env + "/lib"; x11inc = x11env + "/include"; +in + +stdenv.mkDerivation (args // rec { inherit name; inherit version; @@ -46,7 +48,7 @@ stdenv.mkDerivation (args // rec { buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses - ++ optionals useX11 [ libX11 xproto ]; + ++ optionals useX11 [ libX11 xorgproto ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) @@ -90,7 +92,7 @@ stdenv.mkDerivation (args // rec { ''; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast major_version "4.06"; + broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06"; }; }) diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 9b721312bb78cc50dd76a3d7d0c0e01d520c2d19..e11bb7251a6016ac8573965675200190c7109aa7 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { } else throw "platform ${stdenv.hostPlatform.system} not supported."; - buildInputs = [ patchelf boehmgc gnused makeWrapper ]; + nativeBuildInputs = [ patchelf boehmgc gnused makeWrapper ]; buildCommand = '' mkdir -p "$out" diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix deleted file mode 100644 index 1c125fac62f1af8c854f1c21d2c4493fca6a472b..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/10.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype -, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr -, libjpeg, giflib -, setJavaClassPath -, minimal ? false -, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf -}: - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.hostPlatform.system == "i686-linux" then - "i386" - else "amd64"; - - update = "10.0.2"; - build = "13"; - repover = "jdk-${update}+${build}"; - paxflags = if stdenv.isi686 then "msp" else "m"; - - openjdk10 = stdenv.mkDerivation { - name = "openjdk-${update}-b${build}"; - - src = fetchurl { - url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz"; - sha256 = "0y7hyzgvn6z8gyp3h9xvxwj6zda899y6i629jn6yxqzj96q56jpk"; - }; - - outputs = [ "out" "jre" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib - libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor libXrandr lndir fontconfig - ] ++ lib.optionals (!minimal && enableGnome2) [ - gtk3 gnome_vfs GConf glib - ]; - - patches = [ - ./fix-java-home-jdk10.patch - ./read-truststore-from-env-jdk10.patch - ./currency-date-range-jdk10.patch - ] ++ lib.optionals (!minimal && enableGnome2) [ - ./swing-use-gtk-jdk10.patch - ]; - - preConfigure = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" - - configureFlagsArray=( - "--with-boot-jdk=${bootjdk.home}" - "--with-update-version=${update}" - "--with-build-number=${build}" - "--with-milestone=fcs" - "--enable-unlimited-crypto" - "--disable-debug-symbols" - "--disable-freetype-bundling" - "--with-zlib=system" - "--with-giflib=system" - "--with-stdc++lib=dynamic" - - # glibc 2.24 deprecated readdir_r so we need this - # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html - "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" - '' - + lib.optionalString minimal "\"--enable-headless-only\"" - + ");" - # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 - # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 - + stdenv.lib.optionalString stdenv.cc.isGNU '' - NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" - ''; - - NIX_LDFLAGS= lib.optionals (!minimal) [ - "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" - ] ++ lib.optionals (!minimal && enableGnome2) [ - "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]; - - buildFlags = [ "all" ]; - - installPhase = '' - mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk - - cp -av build/*/images/jdk/* $out/lib/openjdk - - # Remove some broken manpages. - rm -rf $out/lib/openjdk/man/ja* - - # Mirror some stuff in top-level. - mkdir $out/include $out/share/man - ln -s $out/lib/openjdk/include/* $out/include/ - ln -s $out/lib/openjdk/man/* $out/share/man/ - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Copy the JRE to a separate output and setup fallback fonts - cp -av build/*/images/jre $jre/lib/openjdk/ - mkdir $out/lib/openjdk/jre - ${lib.optionalString (!minimal) '' - mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback - lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - ''} - - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo - ${lib.optionalString minimal '' - for d in $out/lib/openjdk/lib $jre/lib/openjdk/jre/lib; do - rm ''${d}/{libjsound,libjsoundalsa,libfontmanager}.so - done - ''} - - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre - - # Set PaX markings - exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/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 - #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi - EOF - ''; - - postFixup = '' - # Build the set of output library directories to rpath against - LIBDIRS="" - for output in $outputs; do - LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" - done - - # Add the local library paths to remove dependencies on the bootstrap - for output in $outputs; do - OUTPUTDIR=$(eval echo \$$output) - BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) - echo "$BINLIBS" | while read i; do - patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true - patchelf --shrink-rpath "$i" || true - done - done - - # Test to make sure that we don't depend on the bootstrap - for output in $outputs; do - if grep -q -r '${bootjdk}' $(eval echo \$$output); then - echo "Extraneous references to ${bootjdk} detected" - exit 1 - fi - done - ''; - - meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = ["i686-linux" "x86_64-linux"]; - }; - - passthru = { - inherit architecture; - home = "${openjdk10}/lib/openjdk"; - }; - }; -in openjdk10 diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix new file mode 100644 index 0000000000000000000000000000000000000000..a389f0f5ca1a27eeafdd4af8f4ee85e9b0858a4c --- /dev/null +++ b/pkgs/development/compilers/openjdk/11.nix @@ -0,0 +1,164 @@ +{ stdenv, lib, fetchurl, bash, cpio, autoconf, pkgconfig, file, which, unzip, zip, cups, freetype +, alsaLib, bootjdk, perl, liberation_ttf, fontconfig, zlib, lndir +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr +, libjpeg, giflib +, setJavaClassPath +, minimal ? false +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + + /** + * The JDK libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.hostPlatform.system == "i686-linux" then + "i386" + else "amd64"; + + major = "11"; + update = ".0.1"; + build = "13"; + repover = "jdk-${major}${update}+${build}"; + + openjdk = stdenv.mkDerivation { + name = "openjdk-${major}${update}-b${build}"; + + src = fetchurl { + url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/${repover}.tar.gz"; + sha256 = "1ri3fv67rvs9xxhc3ynklbprhxbdsgpwafbw6wqj950xy5crgysm"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + autoconf cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst + libXi libXinerama libXcursor libXrandr lndir fontconfig + ] ++ lib.optionals (!minimal && enableGnome2) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ] ++ lib.optionals (!minimal && enableGnome2) [ + ./swing-use-gtk-jdk10.patch + ]; + + preConfigure = '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "${bash}/bin/bash" + + configureFlagsArray=( + "--with-boot-jdk=${bootjdk.home}" + "--with-update-version=${major}${update}" + "--with-build-number=${build}" + "--with-milestone=fcs" + "--enable-unlimited-crypto" + "--disable-debug-symbols" + "--with-zlib=system" + "--with-giflib=system" + "--with-stdc++lib=dynamic" + + # glibc 2.24 deprecated readdir_r so we need this + # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html + "--with-extra-cflags=-Wno-error=deprecated-declarations -Wno-error=format-contains-nul -Wno-error=unused-result" + '' + + lib.optionalString (architecture == "amd64") " \"--with-jvm-features=zgc\"" + + lib.optionalString minimal " \"--enable-headless-only\"" + + ");" + # https://bugzilla.redhat.com/show_bug.cgi?id=1306558 + # https://github.com/JetBrains/jdk8u/commit/eaa5e0711a43d64874111254d74893fa299d5716 + + stdenv.lib.optionalString stdenv.cc.isGNU '' + NIX_CFLAGS_COMPILE+=" -fno-lifetime-dse -fno-delete-null-pointer-checks -std=gnu++98 -Wno-error" + ''; + + NIX_LDFLAGS= lib.optionals (!minimal) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!minimal && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]; + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib/openjdk $out/share + + cp -av build/*/images/jdk/* $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir $out/include $out/share/man + ln -s $out/lib/openjdk/include/* $out/include/ + ln -s $out/lib/openjdk/man/* $out/share/man/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString minimal '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # 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}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + + # Test to make sure that we don't depend on the bootstrap + for output in $outputs; do + if grep -q -r '${bootjdk}' $(eval echo \$$output); then + echo "Extraneous references to ${bootjdk} detected" + exit 1 + fi + done + ''; + + meta = with stdenv.lib; { + homepage = http://openjdk.java.net/; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = ["i686-linux" "x86_64-linux"]; + }; + + passthru = { + inherit architecture; + home = "${openjdk}/lib/openjdk"; + }; + }; +in openjdk diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 948948ebc44e473e2801434d8a29a37f2dc90bf0..35575f1052e32441a81ca69c197de043965695d9 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -21,42 +21,41 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "181"; - build = "13"; + update = "202"; + build = "ga"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; - repover = "jdk8u${update}-b${build}"; - paxflags = if stdenv.isi686 then "msp" else "m"; + repover = "jdk8u${update}-${build}"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "0rlbf3v55d45fl9gigawghd0vs0cr3k48zj48qlv3k9yxg1knq9a"; + sha256 = "0asx7qkhmrlfmhrljck5gb3yp4v0aa8k35y4xfcph41x0m0mvrdb"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "1sk5f45ndxj8ch9pqfwmis5hnb09an7nvz3n1wyd5la42jprmwaf"; + sha256 = "07q6l3slmi5fgwjnsk6bd8miv8glmw15w5f6yyvp8nlp2d54l33n"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "0pvx5hwmx61sbyi02pngfbky219raqqjw2xjms01nz18mzr77c84"; + sha256 = "01k4pwhn3nmkzdhdj1v58dgir4iwsj9mm2ml1541z31s53g037cq"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1b0r3fjv9q85j74lgzr2vv4z5gl13bb46zvh36mfks6j74z7ki1z"; + sha256 = "0v39kl2iiyh74p3cp6bjhshkwxpgbffza9abzjgp7cpdfhcc73p0"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "1a5gm4w4f79wj0ciwcv8l8m4ha8hjs2r62bvj0vls2kwr5c8znn4"; + sha256 = "0z1cy6aq09j25jyryj47rms15h5175p2h23fg5pv035zapf8nb1b"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1f92s3mpbqxzgh5pazqm8pn5swqkmdrkm7mnmga2kgshzlknh6pm"; + sha256 = "0y0mk4sra9d29kgx842m5y4bz9gczc9ypkajv6m5igjv7sizzsv7"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "0fwdqr031yyyjrpsk9fwp4y1vlfmdr1rdzgk44gyypwjdap7a11d"; + sha256 = "07ssrjhffkdncxxhsbid21hlg51y7js3x7sb4g474vmmi3qj6vmb"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0j5f98pa6746m1xq4842qq5d1ql5x8wvcrjmjk433slgma9hf8pj"; + sha256 = "0r0b8ra0ibzbdpxz6nv6i2zrzh2j5sxgprpnl6gf4d9h0i29ickj"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; @@ -176,14 +175,6 @@ let rm -rf $out/lib/openjdk/jre/lib/cmm ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm - # Set PaX markings - exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/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 diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 612f0db058215b27b91ad0cb787ad2aec989df41..e58888cc9ed854ea0d704277f0d5acf3d0dd4471 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"; @@ -36,13 +36,5 @@ let patchelf --set-interpreter $(cat "${stdenv.cc}/nix-support/dynamic-linker") "$elf" || true patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${zlib}/lib:$LIBDIRS" "$elf" || true done - - # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: - find "$out/bin" -type f -print0 | while IFS= read -r -d "" elf; do - isELF "$elf" || continue - paxmark m "$elf" - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$elf"''} - done ''; in bootstrap diff --git a/pkgs/development/compilers/openjdk/darwin/10.nix b/pkgs/development/compilers/openjdk/darwin/10.nix deleted file mode 100644 index 4969c12bff2609d767f5fc778b371ce1a5a68b8e..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/openjdk/darwin/10.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: -let - jce-policies = fetchurl { - # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; - sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; - }; - - jdk = stdenv.mkDerivation { - name = "zulu10.3+5-jdk10"; - - 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/"; - }; - - buildInputs = [ unzip freetype ]; - - installPhase = '' - mkdir -p $out - mv * $out - - unzip ${jce-policies} - mv -f ZuluJCEPolicies/*.jar $out/lib/security/ - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/darwin/*_md.h $out/include/ - - if [ -f $out/LICENSE ]; then - install -D $out/LICENSE $out/share/zulu/LICENSE - rm $out/LICENSE - fi - ''; - - preFixup = '' - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/lib/libfontmanager.dylib - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - passthru = { - jre = jdk; - home = jdk; - }; - - meta.platforms = stdenv.lib.platforms.darwin; - - }; -in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix new file mode 100644 index 0000000000000000000000000000000000000000..61c2d57423e449e2435f815696ad1c9599fbab2f --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: +let + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation rec { + name = "zulu11.2.3-jdk11.0.1"; + + src = fetchurl { + 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 ]; + + installPhase = '' + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/lib/security/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi + ''; + + preFixup = '' + # 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 + + install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/lib/libfontmanager.dylib + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + passthru = { + home = jdk; + }; + + meta.platforms = stdenv.lib.platforms.darwin; + + }; +in jdk diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..71bda3e03d96db9be38bd1e0fd9f5c6359a9a1ec --- /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/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 5d55e0554e555845f86d93c93a72b65515b2ad32..4d88f3b977299cf5740076d5c1b1c3dfa6b0a56b 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -1,15 +1,15 @@ { productVersion , patchVersion -, downloadUrl +, buildVersion , sha256 , jceName -, jceDownloadUrl +, releaseToken , sha256JCE }: { swingSupport ? true , stdenv -, requireFile +, fetchurl , makeWrapper , unzip , file @@ -17,6 +17,7 @@ , installjdk ? true , pluginSupport ? true , installjce ? false +, licenseAccepted ? false , glib , libxml2 , libav_0_8 @@ -36,6 +37,13 @@ assert swingSupport -> xorg != null; +if !licenseAccepted then throw '' + You must accept the Oracle Binary Code License Agreement for Java SE at + https://www.oracle.com/technetwork/java/javase/terms/license/index.html + by setting nixpkgs config option 'oraclejdk.accept_license = true;' + '' +else assert licenseAccepted; + let /** @@ -50,10 +58,10 @@ let jce = if installjce then - requireFile { - name = jceName; - url = jceDownloadUrl; + fetchurl { + url = "http://download.oracle.com/otn-pub/java/jce/${productVersion}/${jceName}"; sha256 = sha256JCE; + curlOpts = "-b oraclelicense=a"; } else ""; @@ -67,19 +75,23 @@ let in +assert sha256 ? ${stdenv.hostPlatform.system}; + let result = stdenv.mkDerivation rec { name = if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}"; - src = requireFile { - name = { - i686-linux = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz"; - x86_64-linux = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz"; - armv7l-linux = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz"; - aarch64-linux = "jdk-${productVersion}u${patchVersion}-linux-arm64-vfp-hflt.tar.gz"; + src = let + platformName = { + i686-linux = "linux-i586"; + x86_64-linux = "linux-x64"; + armv7l-linux = "linux-arm32-vfp-hflt"; + aarch64-linux = "linux-arm64-vfp-hflt"; }.${stdenv.hostPlatform.system}; - url = downloadUrl; - sha256 = sha256.${stdenv.hostPlatform.system}; + in fetchurl { + url = "http://download.oracle.com/otn-pub/java/jdk/${productVersion}u${patchVersion}-b${buildVersion}/${releaseToken}/jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; + curlOpts = "-b oraclelicense=a"; + sha256 = sha256.${stdenv.hostPlatform.system}; }; nativeBuildInputs = [ file ] @@ -93,14 +105,6 @@ let result = stdenv.mkDerivation rec { installPhase = '' cd .. - # Set PaX markings - exes=$(file $sourceRoot/bin/* $sourceRoot/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - for file in $exes; do - paxmark m "$file" || true - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} - done - if test -z "$installjdk"; then mv $sourceRoot/jre $out else @@ -195,4 +199,4 @@ let result = stdenv.mkDerivation rec { platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms }; -}; in result +}; in stdenv.lib.trivial.warn "Public updates for Oracle Java SE 8 released after January 2019 will not be available for business, commercial or production use without a commercial license. See https://java.com/en/download/release_notice.jsp for more information." result diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix deleted file mode 100644 index de063500b709672c043ff8ff23ee65851c7aec32..0000000000000000000000000000000000000000 --- 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 55faf277b159543f19c18077a38228df25cd2e87..81f4ef3c7dba645866f71356854b0b184fbfd70c 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -1,12 +1,14 @@ +# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; +# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "181"; - 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"; + patchVersion = "201"; + buildVersion = "09"; + sha256.i686-linux = "1f9n93zmkggchaxkchp4bqasvxznn96zjci34f52h7v392jkzqac"; + sha256.x86_64-linux = "0w730v2q0iaxf2lprabwmy7129byrs0hhdbwas575p1xmk00qw6b"; + sha256.armv7l-linux = "0y6bvq93lsf21v6ca536dpfhkk5ljsj7c6di0qzkban37bivj0si"; + sha256.aarch64-linux = "1bybysgg9llqzllsmdszmmb73v5az2l1shxn6lxwv3wwiazpf47q"; + releaseToken = "42970487e3af4f5aa5bca3f542482c60"; 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 55faf277b159543f19c18077a38228df25cd2e87..0263bdde8d280b2f34f946d1562c3b8983ba6db8 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -1,12 +1,14 @@ +# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; +# jce download url: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "181"; - 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"; + patchVersion = "202"; + buildVersion = "09"; + sha256.i686-linux = "19np392dwdqdq39lmm10607w2h042lrm5953fnsfh1bb9jli1pgj"; + sha256.x86_64-linux = "1q4l8pymjvsvxfwaw0rdcnhryh1la2bvg5f4d4my41ka390k4p4s"; + sha256.armv7l-linux = "06aljl7dqmmhmp7xswgvkcgh9mam71wnqydg9yb3hkcc443cm581"; + sha256.aarch64-linux = "12v9ndv7a2c9zqq6ai2vsgwad0lzmf4c6jxy4p9miapmhjzx5vii"; + releaseToken = "42970487e3af4f5aa5bca3f542482c60"; 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 65d8110646f8a7d362ae884bcc28b6cbdba75aff..ddfd5d0a3fdfbfe1ac410e2f329ef26fd9e45eab 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.10.2"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenShadingLanguage"; - rev = "Release-1.9.9"; - sha256 = "1w6wbz013nirzsiw11c9dpdkcwlfncs5va8q583pdw0q2pfkj5dn"; + rev = "Release-1.10.2"; + sha256 = "1549hav5nd67a3cmhbalyaqhs39dh7w0nilf91pypnadrl1g03k7"; }; cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 412864cd16002f6a6181e5d759017460c32a91b5..ef53280b679c339c52c6d8fcb8e2305d0eab7b0d 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 09677a47ab2a88404dc6431fa7f61cf0601ed412..fbb4db72bd4548d0242dbffe5a5c231a7dc4f8e4 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.26.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6"; + sha256 = "1k1ysqk7j8kpysndps2ic9hprvp0z0d32d6jvqlapjrfccghy7dh"; }; 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 dac8b0279ad9309170e9ab39da7f3df278e83e43..68b676d5a3ef17b62e8afd36f8925aeb0ccab186 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.5.1"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "1pbgijglyqrm998a6z5ahp4phd72crzr3s8vq17a9dz3i0a9hcj5"; + sha256 = "1zadbph1vha3b5hvmjvs138dcwbab49f3v63air1l6r4cvpb6831"; }; isLibrary = false; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 81c935fc421f8be1bd7352252e3999022f4d499f..1b84b9348520d50b8b068c0ca30ec1828a705328 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -4,27 +4,26 @@ 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 dune 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 - ${dune.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/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix index 488d43a6fea4f8c2df3184b0ff40d94d62c8a973..77dba7f9e620e0234213ec0ce95b6e77457eff9b 100644 --- a/pkgs/development/compilers/rust/binaryBuild.nix +++ b/pkgs/development/compilers/rust/binaryBuild.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, bash, buildRustPackage, curl, darwin +{ stdenv, makeWrapper, bash, curl, darwin , version , src , platform @@ -18,8 +18,6 @@ let in rec { - inherit buildRustPackage; - rustc = stdenv.mkDerivation rec { name = "rustc-${versionType}-${version}"; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 901675ff31b46c7edda064e33d7bc34e4ac67ec9..9528d798618f63e9053f6699948a838a17716b3e 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.1"; - # 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 = "c61655977fb16decf0ceb76043b9ae2190927aa9cc24f013d444384dcab99bbf"; + x86_64-unknown-linux-gnu = "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e"; + armv7-unknown-linux-gnueabihf = "9b3b6df02a2a92757e4993a7357fdd02e07b60101a748b4618e6ae1b90bc1b6b"; + aarch64-unknown-linux-gnu = "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874"; + i686-apple-darwin = "a7c14b18e96406d9f43d69d0f984b2fa6f92cc7b7b37e2bb7b70b6f44b02b083"; + x86_64-apple-darwin = "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94"; }; platform = @@ -37,6 +37,5 @@ let in callPackage ./binaryBuild.nix { inherit version src platform; - buildRustPackage = null; versionType = "bootstrap"; } diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 34932c911ebc78ad8e10e32d8f4a4ed13ea00ba0..02ea7ebbbfbfe020b6bda6e97d2f5df3ccb1d8fd 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 d368c977f8f851c16074d8679c1cfc01859ec5ae..1f24157eea426a14269e72e8244c36738659c90c 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.31.0"; + cargoVersion = "1.31.0"; src = fetchurl { url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"; - sha256 = "089d7rhw55zpvnw71dj8vil6qrylvl4xjr4m8bywjj83d4zq1f9c"; + sha256 = "01pg2619bwjnhjbphryrbkwaz0lw8cfffm4xlz35znzipb04vmcs"; }; 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 9c9788ff4834509c8e19bf23874cf6c4ef5161cc..c6350e42bc23421a71d41fe20833cb927ca8122b 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,16 +154,24 @@ 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 # https://github.com/rust-lang/rust/issues/30181 # enableParallelBuilding = false; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with stdenv.lib; { homepage = https://www.rust-lang.org/; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ]; + maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy ]; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; broken = broken; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 34855838fe8bf14b3fe3625e3456a380b2a8d287..80ca6ade84532bdccc0ae6902505e7f01d46fc4b 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.10"; + version = "1.4.16"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1j9wb608pkihpwgzl4qvnr4jl6mb7ngfqy559pxnvmnn1zlyfklh"; + sha256 = "1myg4wkxnbfn5nz38xy62r1jhjy07x3h0b04vg858n41chdsv4wd"; }; + 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 @@ -70,7 +68,8 @@ stdenv.mkDerivation rec { else # Fix software version retrieval '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp + sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ + src/code/run-program.lisp '' ); @@ -83,19 +82,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 = [ "-DBoost_USE_STATIC_LIBS=OFF" "-DBUILD_SHARED_LIBS=ON" - "-DINSTALL_LLLC=ON" ]; 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:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " + "./test/soltest -p -- --no-ipc --no-smt --testpath ../test"; nativeBuildInputs = [ cmake ]; @@ -52,11 +46,10 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compiler for Ethereum smart contract language Solidity"; - longDescription = "This package also includes `lllc', the LLL compiler."; 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 70162bfbcb6a14b73023e6ab68121572eb63904a..e106c9bbb742c47571b9c7a5f70387210ab3c890 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,22 @@ add_subdirectory(libevmasm) add_subdirectory(libsolidity) add_subdirectory(libsolc) -+ +install(DIRECTORY libdevcore/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore + FILES_MATCHING PATTERN "*.h") @@ -16,8 +15,11 @@ index 0c05208f..8893648e 100644 +install(DIRECTORY libsolidity/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity + FILES_MATCHING PATTERN "*.h") -+install(DIRECTORY liblll/ -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll ++install(DIRECTORY libyul/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyul ++ FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY liblangutil/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil + FILES_MATCHING PATTERN "*.h") + if (NOT EMSCRIPTEN) @@ -41,15 +43,6 @@ index 86192c1b..e7f15e93 100644 add_library(evmasm ${sources} ${headers}) target_link_libraries(evmasm PUBLIC devcore) +install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt -index 4cdc073a..b61f03c7 100644 ---- a/liblll/CMakeLists.txt -+++ b/liblll/CMakeLists.txt -@@ -3,3 +3,4 @@ file(GLOB headers "*.h") - - add_library(lll ${sources} ${headers}) - target_link_libraries(lll PUBLIC evmasm devcore) -+install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index 0bdec4b4..e876177e 100644 --- a/libsolidity/CMakeLists.txt @@ -57,8 +50,22 @@ 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 +@@ -43,3 +43,4 @@ endif() + optimiser/VarDeclPropagator.cpp + ) + 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 233eb6647c09a8fc4f5d99f27f0a283058af9196..468c04b5c96c63292f7522c8590871e9e01e40c0 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -27,16 +27,14 @@ , git , libgit2 , fetchFromGitHub -, paxctl , findutils , makeWrapper , gnumake , file -#, systemtap }: let - v_base = "4.1.3"; + v_base = "4.2.2"; version = "${v_base}-RELEASE"; version_friendly = "${v_base}"; @@ -54,15 +52,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 = "0q5cv4iydm8c1kcax32573y3q2cbpihwgj5aa8ws1fnpy4jvq934"; + sha256 = "1664zwxbq0a1cmxr9n5a0vw6vdk6ygr7rpglpdsfc7ki857vpsyv"; }; compilerrt = fetch { repo = "swift-compiler-rt"; - sha256 = "1wkymmxi2v759xkwlzfrq9rivndjfvp6ikrzz10mvvrvyvrgwqnl"; + sha256 = "19s6qxn4i0kxpf39xjp2i7zg427iinbmaxqkbb1p91g616y367sf"; }; cmark = fetch { repo = "swift-cmark"; @@ -70,32 +68,32 @@ let }; lldb = fetch { repo = "swift-lldb"; - sha256 = "1d0pa7xm289bjb6r52hkkmlngkqkwbwgixnmm30bin2q18mkxk7s"; + 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 = "1bhrag63rmz41bg2g6ap01qrdpq37hislgf5hg6myy2v69q7mahx"; + sha256 = "1ki9vc723r13zgm6bcmif43aypavb2hz299gbhp93qkndz8hqkx5"; }; libdispatch = fetch { repo = "swift-corelibs-libdispatch"; - sha256 = "198vskbajch8s168a649qz5an92i2mxmmmzcjlgxlzh38fgxri0n"; + sha256 = "0fibrx54nbaawhsgd7cbr356ji9qvf8y8ahd5bdx28fpj6q0cnwc"; fetchSubmodules = true; }; swift = fetch { repo = "swift"; - sha256 = "1ydx11pkvaasgjbr29lnha0lpnak758gd5l0aqzmp3q6mcyvfm7a"; + sha256 = "1hwi6hi9ss1kj1s65v5q8v8d872c0914qfy1018xijd029lwq694"; }; }; @@ -111,7 +109,6 @@ let ncurses sqlite swig - # systemtap? ]; cmakeFlags = [ @@ -152,7 +149,7 @@ stdenv.mkDerivation rec { findutils makeWrapper gnumake - ] ++ stdenv.lib.optional stdenv.needsPax paxctl; + ]; # TODO: Revisit what's propagated and how propagatedBuildInputs = [ @@ -215,11 +212,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++" - '' + stdenv.lib.optionalString stdenv.needsPax '' - patch -p1 -d swift -i ${./patches/build-script-pax.patch} - '' + '' + patch -p1 -d swift -i ${./patches/glibc-arch-headers.patch} patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} @@ -228,24 +225,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,9 +260,7 @@ stdenv.mkDerivation rec { # Extract the generated tarball into the store PREFIX=''${out/#\/} tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX - - paxmark pmr $out/bin/swift - paxmark pmr $out/bin/* + find $out -type d -empty -delete # TODO: Use wrappers to get these on the PATH for swift tools, instead ln -s ${clang}/bin/* $out/bin/ @@ -290,4 +285,3 @@ stdenv.mkDerivation rec { 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 6ef83754a674a17053c2cf890bbe0f0f2bf7962b..f2b30e5dcdb6e95eabc4455b515fb1f217ee9597 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 66723f1cdf3910798c5d9fec4c7e19e25bb18322..612b33cdb48376beae11caaf985a172ea1dd95a9 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 5493196303cd287ff10785f000478a653f7ef8ab..e84c7eb2a08ad05467155e8113b1b1681e4f285c 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 deleted file mode 100644 index fa2ccdf9d5c6a8a51bc23ff58f215c8e6bd8a296..0000000000000000000000000000000000000000 --- a/pkgs/development/compilers/swift/patches/build-script-pax.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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() { - fi - } - -+## XXX: Taken from nixpkgs /pkgs/stdenv/generic/setup.sh -+isELF() { -+ local fn="$1" -+ local fd -+ local magic -+ exec {fd}< "$fn" -+ read -n 4 -u $fd magic -+ exec {fd}<&- -+ if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi -+} -+ - # - # Configure and build each product - # -@@ -2624,6 +2634,12 @@ for host in "${ALL_HOSTS[@]}"; do - fi - - call "${CMAKE_BUILD[@]}" "${build_dir}" $(cmake_config_opt ${product}) -- "${BUILD_ARGS[@]}" ${build_targets[@]} -+ -+ while IFS= read -r -d $'\0' i; do -+ if ! isELF "$i"; then continue; fi -+ echo "setting pax flags on $i" -+ paxctl -czexm "$i" || true -+ done < <(find "${build_dir}" -executable -type f -wholename "*/bin/*" -print0) - fi - done - done 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 0000000000000000000000000000000000000000..650e1a2429d46bb726226138a79dff81422fe249 --- /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 0000000000000000000000000000000000000000..9523943c48014b0a38df215601d8d66a1be27a7e --- /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 b30d0d0b5d5b51aeef7062a1152fc378948e009b..d10e407260a51bf1cd9904479f795590cf9520d0 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/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 98795f96ffa5cac61784d06d7f455097746d0e83..80d04080aac3c0f1a9bb3e35a678025847ffafba 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -51,10 +51,6 @@ stdenv.mkDerivation rec { '' ; - postFixup = '' - paxmark m $bin/bin/terra - ''; - buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ]; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index da706d502e6ffd1becbe3180e20158af4f774fc9..a5c3db65857f6e80564545051d9183adbe0619ec 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -33,10 +33,6 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - postFixup = '' - paxmark m $out/bin/tcc - ''; - meta = { description = "Small, fast, and embeddable C compiler and interpreter"; diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index 5add2ae4cc5508ee46007c7a25771b5950527d1f..d5f0dcbec29f5628d9358e29734f3b8acad26efd 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.7.1"; + version = "0.7.2"; # Build a sort of "union package" with all the native dependencies we # have: Lua (or LuaJIT), readline, etc. Then, we can depend on this # and refer to ${urn-rt} instead of ${lua}, ${readline}, etc. @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "urn"; repo = "urn"; rev = "v${version}"; - sha256 = "1vw0sljrczbwl7fl5d3frbpklb0larzyp7s7mwwprkb07b027sd5"; + sha256 = "0nclr3d8ap0y5cg36i7g4ggdqci6m5q27y9f26b57km8p266kcpy"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 68fa3d3613fdd3856c1ca4a5b12052f6fa047b3f..d81ddd9b58f737798ef973d4a6dcf4106b505c90 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 a4a8aa980b62f3fe10b4578522fbf4a671a48e86..5f21399229a5e459df39cdf2e9ac34950d4005ac 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,11 +1,46 @@ -{ stdenv, lib, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, automake, graphviz -, glib, libiconv, libintl, libtool, expat +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook +, graphviz, glib, libiconv, libintl, libtool, expat }: let - generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }: + generic = lib.makeOverridable ({ + major, minor, sha256, + extraNativeBuildInputs ? [], + extraBuildInputs ? [], + withGraphviz ? false + }: let atLeast = lib.versionAtLeast "${major}.${minor}"; + + # Patches from the openembedded-core project to build vala without graphviz + # support. We need to apply an additional patch to allow building when the + # header file isn't available at all, but that patch (./gvc-compat.patch) + # can be shared between all versions of Vala so far. + graphvizPatch = + let + fp = { commit, sha256 }: fetchpatch { + url = "https://github.com/openembedded/openembedded-core/raw/${commit}/meta/recipes-devtools/vala/vala/disable-graphviz.patch"; + inherit sha256; + }; + + in { + "0.38" = fp { + commit = "2c290f7253bba5ceb0d32e7d0b0ec0d0e81cc263"; + sha256 = "056ybapfx18d7xw1k8k85nsjrc26qk2q2d9v9nz2zrcwbq5brhkp"; + }; + + # NOTE: the openembedded-core project doesn't have a patch for 0.40.12 + # or 0.42.4 just yet; we've fixed the single merge conflict in the + # patches below and checked them in here. + # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch + # 0.42.4: https://github.com/openembedded/openembedded-core/raw/dfbbff39cfd413510abbd60930232a9c6b35d765/meta/recipes-devtools/vala/vala/disable-graphviz.patch + "0.40" = ./disable-graphviz-0.40.12.patch; + "0.42" = ./disable-graphviz-0.42.4.patch; + + }.${major} or (throw "no graphviz patch for this version of vala"); + + disableGraphviz = atLeast "0.38" && !withGraphviz; + in stdenv.mkDerivation rec { name = "vala-${version}"; version = "${major}.${minor}"; @@ -19,18 +54,28 @@ let patchShebangs tests ''; + # If we're disabling graphviz, apply the patches and corresponding + # configure flag. We also need to override the path to the valac compiler + # so that it can be used to regenerate documentation. + patches = lib.optionals disableGraphviz [ graphvizPatch ./gvc-compat.patch ]; + configureFlags = lib.optional disableGraphviz "--disable-graphviz"; + preBuild = lib.optional disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")"; + outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ lib.optional (stdenv.isDarwin && (atLeast "0.38")) expat + ++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure ++ extraNativeBuildInputs; buildInputs = [ glib libiconv libintl - ] ++ lib.optional (atLeast "0.38") graphviz + ] ++ lib.optional (atLeast "0.38" && withGraphviz) graphviz ++ extraBuildInputs; + enableParallelBuilding = true; + doCheck = false; # fails, requires dbus daemon meta = with stdenv.lib; { @@ -40,33 +85,33 @@ let platforms = platforms.unix; maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ]; }; - }; + }); in rec { - vala_0_34 = generic { - major = "0.34"; - minor = "17"; - sha256 = "0wd2zxww4z1ys4iqz218lvzjqjjqwsaad4x2by8pcyy43sbr7qp2"; - }; - vala_0_36 = generic { major = "0.36"; - minor = "13"; - sha256 = "0gxz7yisd9vh5d2889p60knaifz5zndgj98zkdfkkaykdfdq4m9k"; + minor = "17"; + sha256 = "1f6qg40zd6jzhbwr3dy4fb66k4qs1xlk2whdyqh64zxxjw0k9pv7"; }; 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 = "12"; + sha256 = "1nhk45w5iwg97q3cfybn0i4qz5w9qvk423ndpg6mq6cnna076snx"; + }; + + vala_0_42 = generic { + major = "0.42"; + minor = "4"; + sha256 = "07jgkx812y7wq4cswwfsf1f4k3lq9hcjra45682bdi8a11nr0a5m"; }; - vala = vala_0_38; + vala = vala_0_42; } diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch b/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch new file mode 100644 index 0000000000000000000000000000000000000000..fdc1eabf513e15ed9cc057a21877d980fef5b857 --- /dev/null +++ b/pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch @@ -0,0 +1,208 @@ +diff --git i/configure.ac w/configure.ac +index 694ffd200..915062053 100644 +--- i/configure.ac ++++ w/configure.ac +@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) + AC_SUBST(GMODULE_CFLAGS) + AC_SUBST(GMODULE_LIBS) + +-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) +-AC_MSG_CHECKING([for CGRAPH]) +-cgraph_tmp_LIBADD="$LIBADD" +-cgraph_tmp_CFLAGS="$CFLAGS" +-LIBADD="$LIBADD $LIBGVC_LIBS" +-CFLAGS="$CFLAGS $LIBGVC_CFLAGS" +-AC_RUN_IFELSE( +- [AC_LANG_SOURCE([ +- #include +- +- int main(void) { +- #ifdef WITH_CGRAPH +- return 0; +- #else +- return -1; +- #endif +- } +- ])], [ +- AC_MSG_RESULT([yes]) +- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" +- have_cgraph=yes +- ], [ +- AC_MSG_RESULT([no]) +- have_cgraph=no +- ] +-) +-LIBADD="$cgraph_tmp_LIBADD" +-CFLAGS="$cgraph_tmp_CFLAGS" ++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) ++if test x$enable_graphviz = xyes; then ++ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) ++ AC_MSG_CHECKING([for CGRAPH]) ++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" ++ cgraph_tmp_LIBADD="$LIBADD" ++ cgraph_tmp_CFLAGS="$CFLAGS" ++ LIBADD="$LIBADD $LIBGVC_LIBS" ++ CFLAGS="$CFLAGS $LIBGVC_CFLAGS" ++ AC_RUN_IFELSE( ++ [AC_LANG_SOURCE([ ++ #include ++ int main(void) { ++ #ifdef WITH_CGRAPH ++ return 0; ++ #else ++ return -1; ++ #endif ++ } ++ ])], [ ++ AC_MSG_RESULT([yes]) ++ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" ++ have_cgraph=yes ++ ], [ ++ AC_MSG_RESULT([no]) ++ have_cgraph=no ++ ] ++ ) ++ LIBADD="$cgraph_tmp_LIBADD" ++ CFLAGS="$cgraph_tmp_CFLAGS" ++fi ++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") + + AC_PATH_PROG([XSLTPROC], [xsltproc], :) +diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am +index f3f790e76..3c5dc4c80 100644 +--- i/libvaladoc/Makefile.am ++++ w/libvaladoc/Makefile.am +@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ + content/tablerow.vala \ + content/taglet.vala \ + content/text.vala \ +- charts/chart.vala \ +- charts/chartfactory.vala \ +- charts/hierarchychart.vala \ +- charts/simplechartfactory.vala \ + parser/manyrule.vala \ + parser/oneofrule.vala \ + parser/optionalrule.vala \ +@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ + highlighter/codetoken.vala \ + highlighter/highlighter.vala \ + html/basicdoclet.vala \ +- html/htmlchartfactory.vala \ + html/linkhelper.vala \ + html/cssclassresolver.vala \ + html/htmlmarkupwriter.vala \ + html/htmlrenderer.vala \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc_la_VALASOURCES += \ ++ charts/chart.vala \ ++ charts/chartfactory.vala \ ++ charts/hierarchychart.vala \ ++ charts/simplechartfactory.vala \ ++ html/htmlchartfactory.vala \ ++ $(NULL) ++ ++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc ++endif ++ + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + --library valadoc \ + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ +- --vapidir $(top_srcdir)/vapi --pkg libgvc \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ + --vapidir $(top_srcdir)/codegen --pkg codegen \ ++ $(LIBGVC_PKG) \ + --pkg config \ + $(filter %.vala %.c,$^) + touch $@ +@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc + + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc //g" $@ ++endif + + vapidir = $(datadir)/vala/vapi + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi +@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps + + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc//g" $@ ++endif + + EXTRA_DIST = \ + $(libvaladoc_la_VALASOURCES) \ +diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala +index 192e488cd..ec0960222 100644 +--- i/libvaladoc/html/basicdoclet.vala ++++ w/libvaladoc/html/basicdoclet.vala +@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + protected HtmlRenderer _renderer; + protected Html.MarkupWriter writer; + protected Html.CssClassResolver cssresolver; ++#if HAVE_GRAPHVIZ + protected Charts.Factory image_factory; ++#else ++ protected void* image_factory; ++#endif + protected ErrorReporter reporter; + protected string package_list_link = "../index.html"; + +@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.linker = new LinkHelper (); + + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); ++#if HAVE_GRAPHVIZ + this.image_factory = new SimpleChartFactory (settings, linker); ++#endif + } + + +@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + } + + protected void write_image_block (Api.Node element) { ++#if HAVE_GRAPHVIZ + if (element is Class || element is Interface || element is Struct) { + unowned string format = (settings.use_svg_images ? "svg" : "png"); + var chart = new Charts.Hierarchy (image_factory, element); +@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.get_img_path_html (element, format)}); + writer.add_usemap (chart); + } ++#endif + } + + public void write_namespace_content (Namespace node, Api.Node? parent) { +diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala +index dcc4dad76..cf9c860b8 100644 +--- i/libvaladoc/html/htmlmarkupwriter.vala ++++ w/libvaladoc/html/htmlmarkupwriter.vala +@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { + } + } + ++#if HAVE_GRAPHVIZ + public MarkupWriter add_usemap (Charts.Chart chart) { + string? buf = (string?) chart.write_buffer ("cmapx"); + if (buf != null) { + raw_text ("\n"); + raw_text ((!) buf); + } ++#else ++ public MarkupWriter add_usemap (void* chart) { ++#endif + + return this; + } diff --git a/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch b/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch new file mode 100644 index 0000000000000000000000000000000000000000..77e7d6272afd1da63eb413465ea7814b3cce6e61 --- /dev/null +++ b/pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch @@ -0,0 +1,208 @@ +diff --git i/configure.ac w/configure.ac +index 730c72d7b..af8198637 100644 +--- i/configure.ac ++++ w/configure.ac +@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) + AC_SUBST(GMODULE_CFLAGS) + AC_SUBST(GMODULE_LIBS) + +-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) +-AC_MSG_CHECKING([for CGRAPH]) +-cgraph_tmp_LIBADD="$LIBADD" +-cgraph_tmp_CFLAGS="$CFLAGS" +-LIBADD="$LIBADD $LIBGVC_LIBS" +-CFLAGS="$CFLAGS $LIBGVC_CFLAGS" +-AC_RUN_IFELSE( +- [AC_LANG_SOURCE([ +- #include +- +- int main(void) { +- #ifdef WITH_CGRAPH +- return 0; +- #else +- return -1; +- #endif +- } +- ])], [ +- AC_MSG_RESULT([yes]) +- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" +- have_cgraph=yes +- ], [ +- AC_MSG_RESULT([no]) +- have_cgraph=no +- ] +-) +-LIBADD="$cgraph_tmp_LIBADD" +-CFLAGS="$cgraph_tmp_CFLAGS" ++AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes) ++if test x$enable_graphviz = xyes; then ++ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) ++ AC_MSG_CHECKING([for CGRAPH]) ++ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ" ++ cgraph_tmp_LIBADD="$LIBADD" ++ cgraph_tmp_CFLAGS="$CFLAGS" ++ LIBADD="$LIBADD $LIBGVC_LIBS" ++ CFLAGS="$CFLAGS $LIBGVC_CFLAGS" ++ AC_RUN_IFELSE( ++ [AC_LANG_SOURCE([ ++ #include ++ int main(void) { ++ #ifdef WITH_CGRAPH ++ return 0; ++ #else ++ return -1; ++ #endif ++ } ++ ])], [ ++ AC_MSG_RESULT([yes]) ++ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" ++ have_cgraph=yes ++ ], [ ++ AC_MSG_RESULT([no]) ++ have_cgraph=no ++ ] ++ ) ++ LIBADD="$cgraph_tmp_LIBADD" ++ CFLAGS="$cgraph_tmp_CFLAGS" ++fi ++AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes) + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") + + AC_PATH_PROG([XSLTPROC], [xsltproc], :) +diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am +index f3f790e76..3c5dc4c80 100644 +--- i/libvaladoc/Makefile.am ++++ w/libvaladoc/Makefile.am +@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \ + content/tablerow.vala \ + content/taglet.vala \ + content/text.vala \ +- charts/chart.vala \ +- charts/chartfactory.vala \ +- charts/hierarchychart.vala \ +- charts/simplechartfactory.vala \ + parser/manyrule.vala \ + parser/oneofrule.vala \ + parser/optionalrule.vala \ +@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \ + highlighter/codetoken.vala \ + highlighter/highlighter.vala \ + html/basicdoclet.vala \ +- html/htmlchartfactory.vala \ + html/linkhelper.vala \ + html/cssclassresolver.vala \ + html/htmlmarkupwriter.vala \ + html/htmlrenderer.vala \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc_la_VALASOURCES += \ ++ charts/chart.vala \ ++ charts/chartfactory.vala \ ++ charts/hierarchychart.vala \ ++ charts/simplechartfactory.vala \ ++ html/htmlchartfactory.vala \ ++ $(NULL) ++ ++LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc ++endif ++ + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + --library valadoc \ + --vapi valadoc@PACKAGE_SUFFIX@.vapi \ + --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \ +- --vapidir $(top_srcdir)/vapi --pkg libgvc \ + --vapidir $(top_srcdir)/gee --pkg gee \ + --vapidir $(top_srcdir)/vala --pkg vala \ + --vapidir $(top_srcdir)/ccode --pkg ccode \ + --vapidir $(top_srcdir)/codegen --pkg codegen \ ++ $(LIBGVC_PKG) \ + --pkg config \ + $(filter %.vala %.c,$^) + touch $@ +@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc + + valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc //g" $@ ++endif + + vapidir = $(datadir)/vala/vapi + dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi +@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps + + valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps + cp $< $@ ++if !ENABLE_GRAPHVIZ ++ sed -i "s/libgvc//g" $@ ++endif + + EXTRA_DIST = \ + $(libvaladoc_la_VALASOURCES) \ +diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala +index 192e488cd..ec0960222 100644 +--- i/libvaladoc/html/basicdoclet.vala ++++ w/libvaladoc/html/basicdoclet.vala +@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + protected HtmlRenderer _renderer; + protected Html.MarkupWriter writer; + protected Html.CssClassResolver cssresolver; ++#if HAVE_GRAPHVIZ + protected Charts.Factory image_factory; ++#else ++ protected void* image_factory; ++#endif + protected ErrorReporter reporter; + protected string package_list_link = "../index.html"; + +@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.linker = new LinkHelper (); + + _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver); ++#if HAVE_GRAPHVIZ + this.image_factory = new SimpleChartFactory (settings, linker); ++#endif + } + + +@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + } + + protected void write_image_block (Api.Node element) { ++#if HAVE_GRAPHVIZ + if (element is Class || element is Interface || element is Struct) { + unowned string format = (settings.use_svg_images ? "svg" : "png"); + var chart = new Charts.Hierarchy (image_factory, element); +@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet { + this.get_img_path_html (element, format)}); + writer.add_usemap (chart); + } ++#endif + } + + public void write_namespace_content (Namespace node, Api.Node? parent) { +diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala +index 5aa4afdea..e79b0b8f5 100644 +--- i/libvaladoc/html/htmlmarkupwriter.vala ++++ w/libvaladoc/html/htmlmarkupwriter.vala +@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter { + } + } + ++#if HAVE_GRAPHVIZ + public unowned MarkupWriter add_usemap (Charts.Chart chart) { + string? buf = (string?) chart.write_buffer ("cmapx"); + if (buf != null) { + raw_text ("\n"); + raw_text ((!) buf); + } ++#else ++ public unowned MarkupWriter add_usemap (void* chart) { ++#endif + + return this; + } diff --git a/pkgs/development/compilers/vala/gvc-compat.patch b/pkgs/development/compilers/vala/gvc-compat.patch new file mode 100644 index 0000000000000000000000000000000000000000..8c0d25098f14e5b6c9336ee3cb304d8c484d9e3b --- /dev/null +++ b/pkgs/development/compilers/vala/gvc-compat.patch @@ -0,0 +1,19 @@ +diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am +index 8dc398cf1..a5d8a45b4 100644 +--- i/libvaladoc/Makefile.am ++++ w/libvaladoc/Makefile.am +@@ -176,9 +176,13 @@ endif + libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \ + libvaladoc.vala.stamp \ + $(libvaladoc_la_VALASOURCES:.vala=.c) \ +- gvc-compat.c \ + $(NULL) + ++if ENABLE_GRAPHVIZ ++libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \ ++ gvc-compat.c ++endif ++ + valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp + libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES) + $(VALA_V)$(VALAC) \ diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a26bc41c5945d4f30c131c2331a340f00acbd7a2 --- /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 532fc04a447f08f54a7fca042795da4597abe360..1afeae73f2f1fef6df7a2372864cee39033b8079 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 = "2019.01.08"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "93efbd5d158e374a0abe2afb06484ccc14aa2c88"; - sha256 = "13y7rzpykihal789hyibg629gwj5bh1s0782y5xxj6jlg0bc9ly8"; + rev = "2a2e0a4722ded7628b71f436b94a06aebd57bb62"; + sha256 = "19wzh7yssk90s58l2f89m0q5bjjrjpkhvikf5zc0563wccvl712c"; name = "yosys"; }) @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "berkeley-abc"; repo = "abc"; - rev = "ae6716b064c842f45109a88e84dca71fe4cc311f"; - sha256 = "0g39k16dmrl6q73q39yr5yd9r4rcliz5zxzbnwzh29z9xwi6ipw8"; + rev = "2ddc57d8760d94e86699be39a628178cff8154f8"; + sha256 = "0da7nnnnl9cq2r7s301xgdc8nlr6hqmqpvd9zn4b58m125sp0scl"; name = "yosys-abc"; }) ]; diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 44d1f7bfe4a2e5e07c277cd7126d80b8e15971bb..fd95635616fcad2085ed9a93cff6de0fc02af9e4 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 0000000000000000000000000000000000000000..2429ccf3cf60028d1317a6b63e49f954e0a94d8f --- /dev/null +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, coq, StructTact }: + +let param = + { + version = "20181102"; + rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2"; + sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q"; + }; +in + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-Cheerios-${param.version}"; + + src = fetchFromGitHub { + owner = "uwplse"; + repo = "cheerios"; + inherit (param) rev sha256; + }; + + buildInputs = [ coq ]; + + propagatedBuildInputs = [ StructTact ]; + enableParallelBuilding = true; + + preConfigure = "patchShebangs ./configure"; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; +} diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..6b908f5a09a36263be69fe152b02e2b83c6dcf1a --- /dev/null +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, coq }: + +let param = + { + version = "20180918"; + rev = "243d6be45666da73a9da6c37d451327165275798"; + sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn"; + }; +in + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-InfSeqExt-${param.version}"; + + src = fetchFromGitHub { + owner = "DistributedComponents"; + repo = "InfSeqExt"; + inherit (param) rev sha256; + }; + + buildInputs = [ coq ]; + + enableParallelBuilding = true; + + preConfigure = "patchShebangs ./configure"; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; + }; +} diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index fc88a1c33eed0f7e93f4850c187bd0ff0237fcac..96954eb43ace069d93a2e17474f3d41e12a8851e 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coq, ssreflect }: +{ stdenv, fetchFromGitHub, coq, ssreflect, coq-ext-lib, simple-io }: let params = { @@ -19,6 +19,14 @@ let params = rev = "195e550a1cf0810497734356437a1720ebb6d744"; sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1"; }; + "8.8" = rec { + preConfigure = "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; + version = "1.0.2"; + rev = "v${version}"; + sha256 = "1mcbsp07ra3gdcmir36pf27ig3xv8nagyfp7w5pwqi4gj9w81ffn"; + buildInputs = with coq.ocamlPackages; [ ocamlbuild num ]; + propagatedBuildInputs = [ coq-ext-lib simple-io ]; + }; }; param = params."${coq.coq-version}"; in @@ -33,11 +41,16 @@ 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 ]) + ++ (param.buildInputs or []) + ; + propagatedBuildInputs = [ ssreflect ] ++ (param.propagatedBuildInputs or []); enableParallelBuilding = false; + preConfigure = param.preConfigure or null; + installPhase = '' make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install ''; diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..55d59b931404a2bcf0199f019445aa2125ff8d84 --- /dev/null +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +let param = + { + version = "20181102"; + rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510"; + sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v"; + }; +in + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-StructTact-${param.version}"; + + src = fetchFromGitHub { + owner = "uwplse"; + repo = "StructTact"; + inherit (param) rev sha256; + }; + + buildInputs = [ coq ]; + + enableParallelBuilding = true; + + preConfigure = "patchShebangs ./configure"; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; + }; +} diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cd7ddfefb84a4840e33421ab4362bb70d44abfb5 --- /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 0000000000000000000000000000000000000000..8eaa2bdfae70a7e7b53d270d5dc7c0022e69777b --- /dev/null +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, coq, Cheerios, InfSeqExt, ssreflect }: + +let param = + { + version = "20181102"; + rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564"; + sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z"; + }; +in + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-verdi-${param.version}"; + + src = fetchFromGitHub { + owner = "uwplse"; + repo = "verdi"; + inherit (param) rev sha256; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ Cheerios InfSeqExt ssreflect ]; + + enableParallelBuilding = true; + + preConfigure = "patchShebangs ./configure"; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + passthru = { + compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + }; +} diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index 9c24e77e0f782c8d1549573c8639be58f94adbb0..bffa5172b0e4786e87fdc30960b81f1a909d45ef 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 474ce05c1d4786eab3a1d9331d6d0e8d50791247..0d5a892e2e96345c76fcc1df2e452e9767506418 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 c707fcdbd6be7730202c71d82802b4612322f536..59f2295e215315c2f0d04cc693defaf2ed4b2bbc 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,10 +30,10 @@ 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; + buildFlags = [ "JOBS=$(NIX_BUILD_CORES)" ]; installPhase = '' make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install @@ -43,7 +47,7 @@ stdenv.mkDerivation rec { }; 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 1b310d74b82ae85ad98b925023772096f52b38ec..a1ecdd610a3e53532b777fe9c0eea09ca54fc4db 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 5e6ee7fac6f12868bbbe72f4b6366593740e3084..28a7c1ec1f6f89f8ac6a72aa494821e3703e5085 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-extensible-records/default.nix b/pkgs/development/coq-modules/coq-extensible-records/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..513b046c0fee2f7247f0ea0ae409922708af4ae6 --- /dev/null +++ b/pkgs/development/coq-modules/coq-extensible-records/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, coq }: + +stdenv.mkDerivation { + name = "coq${coq.coq-version}-coq-extensible-records-1.2.0"; + + src = fetchFromGitHub { + owner = "gmalecha"; + repo = "coq-extensible-records"; + rev = "1.2.0"; + sha256 = "0h5m04flqfk0v577syw0v1dw2wf7xrx6jaxv5gpmqzssf5hxafy4"; + }; + + buildInputs = [ coq ]; + + enableParallelBuilding = true; + + installPhase = '' + make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/gmalecha/coq-extensible-records; + description = "Implementation of extensible records in Coq"; + license = licenses.mit; + maintainers = with maintainers; [ ptival ]; + 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/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 9d9a4cb5f1a10f361937718db4fe41ec1e72fcf1..57f31e1847c1aab1076608d689662aad1911693b 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; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..191812b3f2ebc06fd39bda29deed93d4e5b3365e --- /dev/null +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, coq, bignums }: + +let params = + let v_8_8 = { + version = "8.8"; + sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; + }; + in + { + "8.7" = { + version = "8.7.2"; + sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; + }; + "8.8" = v_8_8; + "8.9" = v_8_8; + }; + 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/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index baad637cbb735ccfeef3dfaff8705b2458bcec61..e316a8b792da2a3aae809abf6710f9a2b0ec329d 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, which, coq, ssreflect }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-coquelicot-3.0.1"; + name = "coq${coq.coq-version}-coquelicot-3.0.2"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37045/coquelicot-3.0.1.tar.gz"; - sha256 = "0hsyhsy2lwqxxx2r8xgi5csmirss42lp9bkb9yy35mnya0w78c8r"; + url = "https://gforge.inria.fr/frs/download.php/file/37523/coquelicot-3.0.2.tar.gz"; + sha256 = "1biia7nfqf7vaqq5gmykl4rwjyvrcwss6r2jdf0in5pvp2rnrj2w"; }; nativeBuildInputs = [ which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; }; } diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dc0f0873d07e33908d6b9044c89de2f02e44e855 --- /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 5b9437e7c27990c271c49c7ab396ad4d38347666..e403f7d4fb5ce64377f76f1990d389f04d939f4e 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 fa17d37b4bd37ad3f652d39a4cab507df670050b..86e5687321b407376e19893f9892ba3e8ea4582f 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -19,6 +19,12 @@ let rev = "v1.0-8.8"; sha256 = "0dd7zd5j2sv5cw3mfwg33ss2vcj634q3qykakc41sv7f3rfgqfnn"; }; + + "8.9" = { + version = "1.2beta"; + rev = "v1.2-beta-8.9"; + sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz"; + }; }; param = params."${coq.coq-version}"; in @@ -35,7 +41,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 bc5c0fdd6bb7413afc2e87403a1b7a7c8546b2e4..4abaec6528a974ed1bd05b7620d72ee450d00e59 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 092337125a4d0ae324b3cb8bb1de50a4015e0ab9..09fbd580845975d62a9102319d64dfdde969370c 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -1,17 +1,31 @@ -{stdenv, bash, which, autoconf, automake, fetchurl, coq}: +{ stdenv, bash, which, autoconf, automake, fetchurl, coq }: + +let params = + if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { + version = "3.1.0"; + uid = "37901"; + sha256 = "02szrgz9m0ac51la1lqpiv6i2g0zbgx9gz5rp0q1g00ajldyna5c"; + } else { + version = "2.6.1"; + uid = "37454"; + sha256 = "06msp1fwpqv6p98a3i1nnkj7ch9rcq3rm916yxq8dxf51lkghrin"; + } +; in stdenv.mkDerivation rec { name = "coq${coq.coq-version}-flocq-${version}"; - version = "2.6.0"; + inherit (params) version; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37054/flocq-2.6.0.tar.gz; - sha256 = "13fv150dcwnjrk00d7zj2c5x9jwmxgrq0ay440gkr730l8mvk3l3"; + url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/flocq-${version}.tar.gz"; + inherit (params) sha256; }; - buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; - propagatedBuildInputs = [ coq ]; + nativeBuildInputs = [ bash which autoconf automake ]; + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ + ocaml camlp5 + ]); buildPhase = '' ${bash}/bin/bash autogen.sh @@ -31,4 +45,7 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; + }; } diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index bf441562b14e344f864612a477d723c4b2f5a7a7..03149bab58b1dd5ba496d05f27e4165bc3a70740 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/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 6797a71703b417c22f8f127783b59692fcac6da5..0b97358d8639564de0b92bd3e8e3bf67ffed16a5 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,12 +1,24 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp , bignums ? null }: +let params = + if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { + version = "3.4.0"; + uid = "37524"; + sha256 = "023j9sd64brqvjdidqkn5m8d7a93zd9r86ggh573z9nkjm2m7vvg"; + } else { + version = "3.3.0"; + uid = "37077"; + sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; + } +; in + stdenv.mkDerivation { - name = "coq${coq.coq-version}-interval-3.3.0"; + name = "coq${coq.coq-version}-interval-${params.version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37077/interval-3.3.0.tar.gz"; - sha256 = "08fdcf3hbwqphglvwprvqzgkg0qbimpyhnqsgv3gac4y1ap0f903"; + url = "https://gforge.inria.fr/frs/download.php/file/${params.uid}/interval-${params.version}.tar.gz"; + inherit (params) sha256; }; nativeBuildInputs = [ which ]; @@ -26,7 +38,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; }; diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 134ea45493df6639b548b3d0be6b9fd0342fb8aa..ea26f3e1ca9d71dd54b21b3af1895ec27dff2d45 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 1831cd0c5714c7fe773d40f63596f7130f6ed1db..364366ced497fc3e080239ca33a74b301981f3d5 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-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f90be596fef1da4030c29e699f47d488b70fc275 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp-bigenough, mathcomp-finmap }: + +stdenv.mkDerivation rec { + version = "0.1.0"; + name = "coq${coq.coq-version}-mathcomp-analysis-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "analysis"; + rev = version; + sha256 = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp-bigenough mathcomp-finmap ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "Analysis library compatible with Mathematical Components"; + inherit (src.meta) homepage; + inherit (coq.meta) platforms; + license = stdenv.lib.licenses.cecill-c; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.8" ]; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fa4a2aaeddbac808b715965fc157065b596101e9 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + name = "coq${coq.coq-version}-mathcomp-bigenough-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "bigenough"; + rev = version; + sha256 = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A small library to do epsilon - N reasonning"; + inherit (src.meta) homepage; + inherit (mathcomp.meta) platforms license; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ]; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a5d0d006a38ce14629f102e30b95fd25e697a3c8 --- /dev/null +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, coq, mathcomp }: + +stdenv.mkDerivation rec { + version = "1.1.0"; + name = "coq${coq.coq-version}-mathcomp-finmap-${version}"; + + src = fetchFromGitHub { + owner = "math-comp"; + repo = "finmap"; + rev = version; + sha256 = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + }; + + buildInputs = [ coq ]; + propagatedBuildInputs = [ mathcomp ]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A finset and finmap library"; + inherit (src.meta) homepage; + inherit (mathcomp.meta) platforms license; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + }; +} diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 92c3c87774ab79e47bdb38471787a7d82278bfcd..1e5b6b7bf6668effcb487c668ae06c98d10d1552 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 + { + version = "1.7.0"; + sha256 = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; + } + else if stdenv.lib.versionAtLeast coq.coq-version "8.5" then { - "8.5" = { - version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - - "8.6" = param_1_7; - "8.7" = param_1_7; - "8.8" = param_1_7; - - }."${coq.coq-version}" -; in - -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"; + version = "1.6.1"; + sha256 = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; + } + else throw "No version of math-comp is available for Coq ${coq.coq-version}"; + +in + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-mathcomp-${version}"; + + # 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 22721ca98bc2f5901bbabb0caba2cdffc084cc09..0000000000000000000000000000000000000000 --- 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 f6316f77a1fa72e4169e1e856c1d6581f901f453..c196bdbcd7661de30d5cee452faa181d9e2df3c2 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; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; }; } diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 94a24eb70858487466768e47d8ca6368910ac64a..86a1301d3c760e7c89153cc4d031ee14d184f30a 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/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..472d3aeb2d08d7e9192dc50641ef2dccc7b49d6f --- /dev/null +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, coq }: + +let params = + { + "8.7" = { + version = "1.1.1+coq8.7"; + sha256 = "1i7b5pkx46zf9il2xikbp3rhpnh3wdfbhw5yxcf9yk28ky9s0a0l"; + }; + "8.8" = { + version = "1.1.1"; + sha256 = "0b07zvgm9cx6j2d9631zmqjs6sf30kiqg6k15xk3km7n80d53wfh"; + }; + "8.9" = { + version = "1.1.1+coq8.9"; + sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll"; + }; + }; + param = params."${coq.coq-version}"; +in + +stdenv.mkDerivation rec { + inherit (param) version; + name = "coq${coq.coq-version}-paramcoq-${version}"; + src = fetchFromGitHub { + owner = "coq-community"; + repo = "paramcoq"; + rev = "v${version}"; + inherit (param) sha256; + }; + + buildInputs = [ coq ] + ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]) + ; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; + + meta = { + description = "Coq plugin for parametricity"; + inherit (src.meta) homepage; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (coq.meta) platforms; + }; +} 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 0000000000000000000000000000000000000000..b945e7c9a866377e336380b4c306c850841103eb --- /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 9e9c3c7957aa20535b26c933a11f4cf6b166fac9..1fcb7e2da8ae5c4069a69ed6a225b6879067a63f 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,29 +1,32 @@ -{ callPackage, fetchurl, coq }: - -let param = - - let param_1_7 = { - version = "1.7.0"; - sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39"; - }; in - - { - "8.5" = { - version = "1.6.1"; - sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; - }; - - "8.6" = param_1_7; - "8.7" = param_1_7; - "8.8" = param_1_7; - - }."${coq.coq-version}" -; in - -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; - }; +{ stdenv, fetchFromGitHub, coq, ncurses, which +, graphviz, mathcomp, withDoc ? false +}: + +stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-ssreflect-${version}"; + + inherit (mathcomp) src version meta; + + nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; + buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); + + enableParallelBuilding = true; + + COQBIN = "${coq}/bin/"; + + 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 d09e47a7f8456f3738e06f6a53f36c3d6ff4f47b..0000000000000000000000000000000000000000 --- 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/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 91801850ebfbfaf331163001374a4240fec212f9..883ed971b083dfe510a880c43f443be20f3a36d6 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "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 0000000000000000000000000000000000000000..b6632a86f31fcbd6c4e2bba8cbf1e01e100c6b81 --- /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 0000000000000000000000000000000000000000..ef673310ceb0592f83f3fae321fa84fcfaefc89e --- /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 9b6f80e0f8374e5c7752a82763117fe0ab2e8739..b282a49e8afd61f6f2b0603a1d754dae2dcd2a8c 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,7 +1,10 @@ -{ 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 ? "" +{ buildInputs ? [] +, nativeBuildInputs ? [] +, passthru ? {} +, preFixup ? "" , shellHook ? "" # We want parallel builds by default @@ -34,7 +37,6 @@ , meta ? {}, ... } @ args': -if disabled then throw "${name} not supported for go ${go.meta.branch}" else with builtins; @@ -72,158 +74,171 @@ let goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs else extraSrcs; -in - -go.stdenv.mkDerivation ( - (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { - - inherit name; - nativeBuildInputs = [ removeReferencesTo go parallel ] - ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; - buildInputs = [ go ] ++ buildInputs; - - configurePhase = args.configurePhase or '' - runHook preConfigure - - # Extract the source - cd "$NIX_BUILD_TOP" - mkdir -p "go/src/$(dirname "$goPackagePath")" - mv "$sourceRoot" "go/src/$goPackagePath" - - '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: '' - mkdir goPath - (cd goPath; unpackFile "${src}") - mkdir -p "go/src/$(dirname "${goPackagePath}")" - chmod -R u+w goPath/* - mv goPath/* "go/src/${goPackagePath}" - rmdir goPath - - '') + (lib.optionalString (extraSrcPaths != []) '' - ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go - - '') + '' - export GOPATH=$NIX_BUILD_TOP/go:$GOPATH - - runHook postConfigure - ''; - - renameImports = args.renameImports or ( - let - inputsWithAliases = lib.filter (x: x ? goPackageAliases) - (buildInputs ++ (args.propagatedBuildInputs or [ ])); - rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}"; - renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases; - in lib.concatMapStringsSep "\n" renames inputsWithAliases); - - buildPhase = args.buildPhase or '' - runHook preBuild - - runHook renameImports - - buildGoDir() { - local d; local cmd; - cmd="$1" - d="$2" - . $TMPDIR/buildFlagsArray - echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 - [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 - local OUT - if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then - if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then + package = go.stdenv.mkDerivation ( + (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { + + nativeBuildInputs = [ removeReferencesTo go ] + ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; + buildInputs = buildInputs; + + inherit (go) GOOS GOARCH; + + configurePhase = args.configurePhase or '' + runHook preConfigure + + # Extract the source + cd "$NIX_BUILD_TOP" + mkdir -p "go/src/$(dirname "$goPackagePath")" + mv "$sourceRoot" "go/src/$goPackagePath" + + '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: '' + mkdir goPath + (cd goPath; unpackFile "${src}") + mkdir -p "go/src/$(dirname "${goPackagePath}")" + chmod -R u+w goPath/* + mv goPath/* "go/src/${goPackagePath}" + rmdir goPath + + '') + (lib.optionalString (extraSrcPaths != []) '' + ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go + + '') + '' + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOCACHE=$TMPDIR/go-cache + + runHook postConfigure + ''; + + renameImports = args.renameImports or ( + let + inputsWithAliases = lib.filter (x: x ? goPackageAliases) + (buildInputs ++ (args.propagatedBuildInputs or [ ])); + rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}"; + renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases; + in lib.concatMapStringsSep "\n" renames inputsWithAliases); + + buildPhase = args.buildPhase or '' + runHook preBuild + + runHook renameImports + + buildGoDir() { + local d; local cmd; + cmd="$1" + d="$2" + . $TMPDIR/buildFlagsArray + echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 + [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 + local OUT + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then + if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then + echo "$OUT" >&2 + return 1 + fi + fi + if [ -n "$OUT" ]; then echo "$OUT" >&2 - return 1 fi + return 0 + } + + getGoDirs() { + local type; + type="$1" + if [ -n "$subPackages" ]; then + echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" + else + pushd "$NIX_BUILD_TOP/go/src" >/dev/null + find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq + popd >/dev/null + fi + } + + if (( "''${NIX_DEBUG:-0}" >= 1 )); then + buildFlagsArray+=(-x) fi - if [ -n "$OUT" ]; then - echo "$OUT" >&2 - fi - return 0 - } - - getGoDirs() { - local type; - type="$1" - if [ -n "$subPackages" ]; then - echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" + + if [ ''${#buildFlagsArray[@]} -ne 0 ]; then + declare -p buildFlagsArray > $TMPDIR/buildFlagsArray else - pushd "$NIX_BUILD_TOP/go/src" >/dev/null - find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq - popd >/dev/null + touch $TMPDIR/buildFlagsArray fi - } - - if (( "''${NIX_DEBUG:-0}" >= 1 )); then - buildFlagsArray+=(-x) - fi - - if [ ''${#buildFlagsArray[@]} -ne 0 ]; then - declare -p buildFlagsArray > $TMPDIR/buildFlagsArray - else - touch $TMPDIR/buildFlagsArray - fi - export -f buildGoDir # parallel needs to see the function - if [ -z "$enableParallelBuilding" ]; then - export NIX_BUILD_CORES=1 - fi - getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install - - runHook postBuild - ''; - - checkPhase = args.checkPhase or '' - runHook preCheck - - getGoDirs test | parallel -j $NIX_BUILD_CORES buildGoDir test - - runHook postCheck - ''; - - installPhase = args.installPhase or '' - runHook preInstall - - mkdir -p $bin - dir="$NIX_BUILD_TOP/go/bin" - [ -e "$dir" ] && cp -r $dir $bin - - runHook postInstall - ''; - - preFixup = preFixup + '' - 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: '' - mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" - ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" - '' - ) goPath) + '' - export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)} - '' + shellHook; - - disallowedReferences = lib.optional (!allowGoReference) go - ++ lib.optional (!dontRenameImports) govers; - - passthru = passthru // - { inherit go; } // - lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; - - enableParallelBuilding = enableParallelBuilding; - - # I prefer to call this dev but propagatedBuildInputs expects $out to exist - outputs = args.outputs or [ "bin" "out" ]; - - meta = { - # Add default meta information - homepage = "https://${goPackagePath}"; - platforms = go.meta.platforms or lib.platforms.all; - } // meta // { - # add an extra maintainer to every package - maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.ehmry lib.maintainers.lethalman ]; - }; -}) + export -f buildGoDir # xargs needs to see the function + if [ -z "$enableParallelBuilding" ]; then + export NIX_BUILD_CORES=1 + fi + 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 | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' -- + + runHook postCheck + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + mkdir -p $bin + dir="$NIX_BUILD_TOP/go/bin" + [ -e "$dir" ] && cp -r $dir $bin + + runHook postInstall + ''; + + preFixup = preFixup + '' + find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + ''; + + shellHook = '' + d=$(mktemp -d "--suffix=-$name") + '' + toString (map (dep: '' + mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" + ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" + '' + ) goPath) + '' + export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)} + '' + shellHook; + + disallowedReferences = lib.optional (!allowGoReference) go + ++ lib.optional (!dontRenameImports) govers; + + passthru = passthru // + { inherit go; } // + lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; + + enableParallelBuilding = enableParallelBuilding; + + # I prefer to call this dev but propagatedBuildInputs expects $out to exist + outputs = args.outputs or [ "bin" "out" ]; + + meta = { + # Add default meta information + homepage = "https://${goPackagePath}"; + platforms = go.meta.platforms or lib.platforms.all; + } // meta // { + # add an extra maintainer to every package + maintainers = (meta.maintainers or []) ++ + [ lib.maintainers.ehmry lib.maintainers.lethalman ]; + }; + }); +in if disabled then + throw "${package.name} not supported for go ${go.meta.branch}" +else + package diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 32a22566bdb11d1f875a4e3f5e327aee118eb14d..4bd49b06796dc7a7e8f5b92ded73ffd652465a07 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 12648cab7dc3dee695827d4d6b0c01d55e12c944..26fffac0a131d0ea500b2ef4d4bb94f5c2aaa514 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 35eb4667bd6b464b41fa346983fa8cfe27085871..c3aa8400791742c1505f52d62055a8733b9808f6 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 f854c71c240f8785b4aab4c83131a8a7d1e07b96..e1e04ecfe6993a282ef86918f1c7adbc4b8049b3 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 010c523507fd9c31cdf7d2b4cc69815421ee9063..35bcd7bfc2f3ed124fce99868770db0460f424dd 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 5f887c3a7be69285951eb52c5c39032543ab7fbe..a606b3ecf2881dda2d3ad530bb53a99176cbdffa 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 b20fc162ef3b24d151a5c1d611c8ba71e5e582aa..e4a548ae376bb09c93f8a3fb43cfdde4875e08bb 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 2f89623ecdebbdd46ffd56a82921562555200472..e13f87ed6d625f272214c1cee625f7fef10ae075 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; @@ -51,7 +51,6 @@ self: super: { clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; - hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; }; hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; }; hspec-expectations = dontCheck super.hspec-expectations; HTTP = dontCheck super.HTTP; @@ -86,35 +85,21 @@ 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 = "06385r9rlncrrmzdfl8q600bw6plbvkmkwgl3llg595xrm711a97"; }; }).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"; - }; - }; # 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 @@ -166,6 +151,10 @@ self: super: { # dontCheck due to https://github.com/haskell/vector/issues/138 vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); + conduit-extra = if pkgs.stdenv.isDarwin + then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }) + else super.conduit-extra; + # Fix Darwin build. halive = if pkgs.stdenv.isDarwin then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit @@ -185,12 +174,14 @@ self: super: { inline-c-cpp = if !pkgs.stdenv.isDarwin then super.inline-c-cpp - else addExtraLibrary (overrideCabal super.inline-c-cpp (drv: - { - postPatch = '' - substituteInPlace inline-c-cpp.cabal --replace stdc++ c++ - ''; - })) pkgs.libcxx; + else + let drv = addExtraLibrary (overrideCabal super.inline-c-cpp (drv: { + postPatch = '' + substituteInPlace inline-c-cpp.cabal --replace stdc++ c++ + ''; + })) pkgs.libcxx; + in # https://github.com/fpco/inline-c/issues/75 + dontCheck drv; inline-java = addBuildDepend super.inline-java pkgs.jdk; @@ -248,13 +239,19 @@ self: super: { # This is due to GenList having been removed from generic-random in 1.2.0.0 # doJailbreak: Can be removed once https://github.com/haskell-nix/hnix/pull/329 is in (5.2 probably) # This is due to hnix currently having an upper bound of <0.5 on deriving-compat, works just fine with our current version 0.5.1 though - hnix = dontCheck (doJailbreak (overrideCabal super.hnix (old: { - testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; - }))); + hnix = + generateOptparseApplicativeCompletion "hnix" ( + dontCheck (doJailbreak (overrideCabal super.hnix (old: { + testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ]; + })))); # 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; @@ -338,7 +335,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 @@ -347,6 +344,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; @@ -360,9 +358,11 @@ 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; + posix-pty = dontCheck super.posix-pty; # https://github.com/merijn/posix-pty/issues/12 postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server postgresql-simple-migration = dontCheck super.postgresql-simple-migration; process-streaming = dontCheck super.process-streaming; @@ -375,6 +375,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; @@ -488,6 +489,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; @@ -520,6 +522,10 @@ self: super: { # generic-deriving bound is too tight aeson = doJailbreak super.aeson; + # containers >=0.4 && <0.6 is too tight + # https://github.com/RaphaelJ/friday/issues/34 + friday = doJailbreak super.friday; + # Won't compile with recent versions of QuickCheck. inilist = dontCheck super.inilist; MissingH = dontCheck super.MissingH; @@ -681,17 +687,25 @@ 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"; + }); + + # Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal + # https://github.com/augustss/djinn/pull/8 + djinn = appendPatch super.djinn (pkgs.fetchpatch { + url = https://github.com/augustss/djinn/commit/6cb9433a137fb6b5194afe41d616bd8b62b95630.patch; + sha256 = "0s021y5nzrh74gfp8xpxpxm11ivzfs3jwg6mkrlyry3iy584xqil"; + }); # 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; @@ -703,9 +717,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: { @@ -714,8 +725,16 @@ self: super: { ''; }); + # A simple MonadFail patch would do too, but not doing the tests is easier + megaparsec_6_5_0 = dontCheck super.megaparsec_6_5_0; + # The standard libraries are compiled separately - idris = doJailbreak (dontCheck super.idris); + idris = generateOptparseApplicativeCompletion "idris" ( + doJailbreak (dontCheck (super.idris.override { + # Needed for versions <= 1.3.1 https://github.com/idris-lang/Idris-dev/pull/4610 + megaparsec = self.megaparsec_6_5_0; + })) + ); # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; @@ -732,7 +751,11 @@ self: super: { rev = "v${ver}"; sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l"; }}/doc"; - buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; + # Needed after sphinx 1.7.9 -> 1.8.3 + postPatch = '' + substituteInPlace conf.py --replace "'.md': CommonMarkParser," "" + ''; + nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; installPhase = '' mv _build/html $out @@ -870,10 +893,6 @@ self: super: { testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; }); - # These packages depend on each other, forming an infinite loop. - scalendar = markBroken (super.scalendar.override { SCalendar = null; }); - SCalendar = markBroken (super.SCalendar.override { scalendar = null; }); - # Needs QuickCheck <2.10, which we don't have. edit-distance = doJailbreak super.edit-distance; blaze-markup = doJailbreak super.blaze-markup; @@ -891,6 +910,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; @@ -910,36 +930,21 @@ self: super: { language-puppet = dontHaddock super.language-puppet; filecache = overrideCabal super.filecache (drv: { doCheck = !pkgs.stdenv.isDarwin; }); - # Missing FlexibleContexts in testsuite - # https://github.com/EduardSergeev/monad-memo/pull/4 - monad-memo = - let patch = pkgs.fetchpatch - { url = https://github.com/EduardSergeev/monad-memo/pull/4.patch; - sha256 = "14mf9940arilg6v54w9bc4z567rfbmm7gknsklv965fr7jpinxxj"; - }; - in appendPatch super.monad-memo patch; - # https://github.com/alphaHeavy/protobuf/issues/34 protobuf = dontCheck super.protobuf; # https://github.com/bos/text-icu/issues/32 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; }; - - # 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 - servant-docs = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs; + servant-docs = + let + f = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) + then dontCheck + else pkgs.lib.id; + in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; # requires a release including https://github.com/haskell-servant/servant-swagger/commit/249530d9f85fe76dfb18b100542f75a27e6a3079 @@ -948,17 +953,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 @@ -986,7 +985,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 @@ -1000,6 +1004,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; @@ -1058,7 +1065,20 @@ self: super: { vector-algorithms = dontCheck super.vector-algorithms; # The test suite attempts to use the network. - dhall = dontCheck super.dhall; + dhall = + generateOptparseApplicativeCompletion "dhall" ( + dontCheck super.dhall + ); + + dhall-json = + generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] ( + super.dhall-json + ); + + dhall-nix = + generateOptparseApplicativeCompletion "dhall-to-nix" ( + super.dhall-nix + ); # https://github.com/well-typed/cborg/issues/174 cborg = doJailbreak super.cborg; @@ -1072,20 +1092,17 @@ self: super: { # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5". haddock-library = doJailbreak (dontCheck super.haddock-library); - haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); + # haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0); - # The tool needs a newer hpack version than the one mandated by LTS-12.x. - cabal2nix = super.cabal2nix.overrideScope (self: super: { - hpack = self.hpack_0_31_0; - yaml = self.yaml_0_10_1_1; - }); + # Break out of tasty >=0.10 && <1.2. + aeson-compat = doJailbreak super.aeson-compat; - # Break out of "aeson <1.3, temporary <1.3". - stack = doJailbreak super.stack; + # Break out of pretty-show >=1.6 && <1.9 + hedgehog = doJailbreak super.hedgehog; - # https://github.com/pikajude/stylish-cabal/issues/11 - stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; }; - hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; }; + # Generate shell completion. + cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; + stack = generateOptparseApplicativeCompletion "stack" super.stack; # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test @@ -1113,23 +1130,97 @@ self: super: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [self.QuickCheck]; })) ./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; - # https://github.com/haskell/hoopl/issues/50 hoopl = dontCheck super.hoopl; # https://github.com/snapframework/xmlhtml/pull/37 xmlhtml = doJailbreak super.xmlhtml; - # https://github.com/NixOS/nixpkgs/issues/46467 - safe-money-aeson = super.safe-money-aeson.override { safe-money = self.safe-money_0_7; }; - safe-money-store = super.safe-money-store.override { safe-money = self.safe-money_0_7; }; - safe-money-cereal = super.safe-money-cereal.override { safe-money = self.safe-money_0_7; }; - safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; }; - safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; }; + # Generate shell completions + purescript = generateOptparseApplicativeCompletion "purs" super.purescript; + + # https://github.com/adinapoli/mandrill/pull/52 + mandrill = appendPatch super.mandrill (pkgs.fetchpatch { + url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch; + sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv"; + }); + + # 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/65 + generic-lens = dontCheck super.generic-lens; + + 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; + + # 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; }); + + # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 + tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 + these = doJailbreak super.these; # until these >= 0.7.6 + insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch; + + uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch { + url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch"; + sha256 = "1qwy8bj6vywhp0075dza8j90zrzsm3144qz3c703s9c4n6pg3gw4"; + }); + + # These patches contain fixes for 8.6 that should be safe for + # earlier versions, but we need the relaxed version bounds in GHC + # 8.4 builds. beam needs to release a round of updates that relax + # bounds and include the 8.6 fixes: + # https://github.com/tathougies/beam/issues/315 + beam-core = appendPatch super.beam-core ./patches/beam-core-fix-ghc-8.6.x-build.patch; + beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch; + beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch; + beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch; + + # https://github.com/sighingnow/computations/pull/1 + primesieve = appendPatch super.primesieve (pkgs.fetchpatch { + url = "https://github.com/sighingnow/computations/commit/1f96788367c879b999afe733e2fe28d919d17702.patch"; + sha256 = "0lrcmcrxp9imj9rfaq7mb0fn9mxms4gq4sz95n4san3dpd0qmj9x"; + stripLen = 1; + }); + + # Fix for base >= 4.11 + scat = overrideCabal super.scat (drv: { + patches = [(pkgs.fetchpatch { + url = "https://github.com/redelmann/scat/pull/6.diff"; + sha256 = "07nj2p0kg05livhgp1hkkdph0j0a6lb216f8x348qjasy0lzbfhl"; + })]; + }); } // 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 5684d14caddf8b3d4fd0e0d8894f0a484225c385..0000000000000000000000000000000000000000 --- 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_1; - 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 eca2d111b5423eb2a87834a0ddcfe8bd068136a0..0000000000000000000000000000000000000000 --- 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_1; - 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 5d499c803daeab07cf692fa4d25e17e0ec111423..cad8541701158bff4e884dfbbd343f18d50f50cb 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_1; - 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: { @@ -91,9 +91,11 @@ self: super: { distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: { - Cabal = self.Cabal_2_2_0_1; - 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; + + # https://github.com/pikajude/stylish-cabal/issues/11 + stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal; } 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 49c3623d5d6b507506eb8ea9300755ba708c7031..bd51e4f6c85f619453c3d340e38b909c62088aa0 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,27 @@ 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; + }; + + # https://github.com/pikajude/stylish-cabal/issues/11 + stylish-cabal = generateOptparseApplicativeCompletion "stylish-cabal" (super.stylish-cabal.overrideScope (self: super: { + haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1); + })); + + # cabal2nix doesn't list this because of a conditional on the GHC version. + aeson = addBuildDepend super.aeson self.contravariant; + } 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 42712df3295b825824f98c07c00a1534040635b1..b5d325e42b39c9dac327222513e064ec47c40c9c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -41,20 +41,35 @@ self: super: { unix = null; xhtml = null; - # 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. - primitive = self.primitive_0_6_4_0; - tagged = self.tagged_0_8_6; - - # 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 + dates = doJailbreak super.dates; # base >=4.9 && <4.12 + Diff = dontCheck super.Diff; + equivalence = dontCheck super.equivalence; # test suite doesn't compile https://github.com/pa-ba/equivalence/issues/5 + HaTeX = doJailbreak super.HaTeX; # containers >=0.4 && <0.6 is too tight; https://github.com/Daniel-Diaz/HaTeX/issues/126 + hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 + 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; + wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 + RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14 + monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66 + github = dontCheck super.github; # hspec upper bound exceeded; https://github.com/phadej/github/pull/341 + binary-orphans = dontCheck super.binary-orphans; # tasty upper bound exceeded; https://github.com/phadej/binary-orphans/commit/8ce857226595dd520236ff4c51fa1a45d8387b33 + + # https://github.com/jgm/skylighting/issues/55 + skylighting-core = dontCheck super.skylighting-core; + + # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 + stack = doJailbreak super.stack; + + # https://github.com/pikajude/stylish-cabal/issues/11 + stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 99f4cd87ce56de34b4b58bca4fbbdf842471f85c..1e7450a6bd111324141054fe439415147933f313 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -1,11 +1,18 @@ +## +## Caveat: a copy of configuration-ghc-8.6.x.nix with minor changes: +## +## 1. "8.7" strings +## 2. llvm 6 +## 3. disabled library update: parallel +## { pkgs, haskellLib }: with haskellLib; self: super: { - # This compiler version needs llvm 5.x. - llvmPackages = pkgs.llvmPackages_5; + # This compiler version needs llvm 6.x. + llvmPackages = pkgs.llvmPackages_6; # Disable GHC 8.7.x core libraries. array = null; @@ -20,11 +27,13 @@ self: super: { ghc-boot = null; ghc-boot-th = null; ghc-compact = null; - ghc-prim = null; + ghc-heap = null; ghci = null; + ghc-prim = null; haskeline = null; hpc = null; integer-gmp = null; + libiserv = null; mtl = null; parsec = null; pretty = null; @@ -39,60 +48,37 @@ self: super: { unix = null; xhtml = null; - # jailbreak-cabal can use the native Cabal library. - jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal; - - # haddock: No input file(s). - nats = dontHaddock super.nats; - bytestring-builder = dontHaddock super.bytestring-builder; - - # We have time 1.5 - aeson = disableCabalFlag super.aeson "old-locale"; - - # 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 >= 4.3 && < 4.10|base|' utf8-string.cabal"; - }); - - # bos/attoparsec#92 - attoparsec = dontCheck super.attoparsec; - - # test suite hangs silently for at least 10 minutes - split = dontCheck super.split; - - # 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 suite fails with time >= 1.5 - http-date = dontCheck super.http-date; - - # Version 1.19.5 fails its test suite. - happy = dontCheck super.happy; - - # 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 ]; - - # The compat library is empty in the presence of mtl 2.2.x. - mtl-compat = dontHaddock super.mtl-compat; - - # Won't work with LLVM 3.5. - llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; - - # A bunch of jailbreaks due to 'base' bump - old-time = doJailbreak super.old-time; - old-locale = doJailbreak super.old-locale; - primitive = doJailbreak super.primitive; - test-framework = doJailbreak super.test-framework; - atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch); - hashable = doJailbreak super.hashable; + # 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 + dates = doJailbreak super.dates; # base >=4.9 && <4.12 + Diff = dontCheck super.Diff; + HaTeX = doJailbreak super.HaTeX; # containers >=0.4 && <0.6 is too tight; https://github.com/Daniel-Diaz/HaTeX/issues/126 + hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82 + 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; + wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17 + RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14 + monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66 + github = dontCheck super.github; # hspec upper bound exceeded; https://github.com/phadej/github/pull/341 + binary-orphans = dontCheck super.binary-orphans; # tasty upper bound exceeded; https://github.com/phadej/binary-orphans/commit/8ce857226595dd520236ff4c51fa1a45d8387b33 + + # https://github.com/jgm/skylighting/issues/55 + skylighting-core = dontCheck super.skylighting-core; + + # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 + stack = doJailbreak super.stack; + + # Fix build with ghc 8.6.x. + git-annex = appendPatch super.git-annex ./patches/git-annex-fix-ghc-8.6.x-build.patch; + + # https://github.com/pikajude/stylish-cabal/issues/11 + stylish-cabal = markBrokenVersion "0.4.1.0" super.stylish-cabal; } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 7e8bc1a1e8e319e4cb440683826e20debf19cc49..489f363db6a0460c8183c1db5d21a3deacf75d0c 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_1; + 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 467234b8a25dbbae81623fc0ad22df015d8bca7a..64262b12d65c1363716109bd232d2d48bcfedfe4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,35 +1,37 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.4.3 +compiler: ghc-8.6.3 core-packages: - - array-0.5.2.0 - - base-4.11.1.0 - - binary-0.8.5.1 + - array-0.5.3.0 + - base-4.12.0.0 + - binary-0.8.6.0 - bytestring-0.10.8.2 - - Cabal-2.2.0.1 - - containers-0.5.11.0 - - 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 + - Cabal-2.4.0.1 + - containers-0.6.0.1 + - deepseq-1.4.4.0 + - directory-1.3.3.0 + - filepath-1.4.2.1 + - ghc-8.6.3 + - ghc-boot-8.6.3 + - ghc-boot-th-8.6.3 - ghc-compact-0.1.0.0 - - ghc-prim-0.5.2.0 - - ghci-8.4.3 - - haskeline-0.7.4.2 + - ghc-heap-8.6.3 + - ghc-prim-0.5.3 + - ghci-8.6.3 + - haskeline-0.7.4.3 - hpc-0.6.0.3 - integer-gmp-1.0.2.0 + - libiserv-8.6.3 - mtl-2.2.2 - parsec-3.1.13.0 - pretty-1.1.3.6 - process-1.6.3.0 - rts-1.0 - - stm-2.4.5.0 - - template-haskell-2.13.0.0 - - terminfo-0.4.1.1 - - text-1.2.3.0 + - stm-2.5.0.0 + - template-haskell-2.14.0.0 + - terminfo-0.4.1.2 + - text-1.2.3.1 - time-1.8.0.2 - transformers-0.5.5.0 - unix-2.7.2.2 @@ -37,13 +39,14 @@ core-packages: # Hack: The following package is a core package of GHCJS. If we don't declare # it, then hackage2nix will generate a Hackage database where all dependants - # of this library are maked as "broken". + # of this library are marked as "broken". - 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.9 + # Newer versions don't work in LTS-12.x + - alsa-mixer < 0.3 + - cassava-megaparsec < 2 + # LTS Haskell 13.6 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -54,13 +57,13 @@ default-package-overrides: - ad ==4.3.5 - adjunctions ==4.4 - adler32 ==0.1.2.0 - - aern2-mp ==0.1.2.0 - - aern2-real ==0.1.1.0 - - aeson ==1.3.1.1 + - advent-of-code-api ==0.1.2.3 + - aern2-mp ==0.1.3.1 + - aeson ==1.4.2.0 - 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.3 @@ -71,16 +74,15 @@ 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 - al ==0.1.4.2 - - alarmclock ==0.5.0.2 + - alarmclock ==0.6.0.2 - alerts ==0.1.0.0 - alex ==3.2.4 - - alg ==0.2.6.0 - - algebra ==4.3.1 - - Allure ==0.8.3.0 + - alg ==0.2.9.0 + - algebraic-graphs ==0.3 - almost-fix ==0.0.2 - alsa-core ==0.5.0.1 + - alsa-mixer ==0.3.0 - alsa-pcm ==0.6.1.1 - alsa-seq ==0.6.0.7 - alternative-vector ==0.0.0 @@ -90,6 +92,7 @@ default-package-overrides: - amazonka-apigateway ==1.6.0 - amazonka-application-autoscaling ==1.6.0 - amazonka-appstream ==1.6.0 + - amazonka-athena ==1.6.0 - amazonka-autoscaling ==1.6.0 - amazonka-budgets ==1.6.0 - amazonka-certificatemanager ==1.6.0 @@ -177,20 +180,34 @@ 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 + - antiope-athena ==6.2.0 + - antiope-core ==6.2.0 + - antiope-dynamodb ==6.2.0 + - antiope-messages ==6.2.0 + - antiope-s3 ==6.2.0 + - antiope-sns ==6.2.0 + - antiope-sqs ==6.2.0 - ANum ==0.2.0.2 + - aos-signature ==0.1.1 + - apecs ==0.7.1 + - apecs-gloss ==0.2.0 + - apecs-physics ==0.3.1 - api-field-json-th ==0.1.0.2 - - appar ==0.1.4 - - apply-refact ==0.5.0.0 + - appar ==0.1.7 + - appendmap ==0.1.5 + - apply-refact ==0.6.0.0 - apportionment ==0.0.0.3 - approximate ==0.3.1 - - app-settings ==0.2.0.11 - - arithmoi ==0.7.0.0 + - app-settings ==0.2.0.12 + - arbor-lru-cache ==0.1.1.0 + - arithmoi ==0.8.0.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - - arrow-list ==0.7 + - asciidiagram ==1.3.3.2 - ascii-progress ==0.3.3.0 + - asif ==3.2.0 - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 @@ -202,55 +219,59 @@ default-package-overrides: - async-refresh-tokens ==0.4.0.0 - async-timer ==0.2.0.0 - 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-ip ==0.0.5 + - attoparsec-iso8601 ==1.0.1.0 - attoparsec-path ==0.0.0.1 - - attoparsec-uri ==0.0.4 + - attoparsec-uri ==0.0.7 - 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 + - avers ==0.0.17.1 + - avers-api ==0.1.0 + - avers-server ==0.1.0.1 + - avro ==0.4.1.2 - avwx ==0.3.0.2 - - backprop ==0.2.5.0 - - bank-holidays-england ==0.1.0.7 + - axel ==0.0.9 + - backprop ==0.2.6.1 + - bank-holidays-england ==0.1.0.8 + - barbies ==1.1.0.0 - 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-batteries ==0.10.1 + - base-compat ==0.10.5 + - base-compat-batteries ==0.10.5 - basement ==0.0.8 - - base-orphans ==0.7 + - base-noprelude ==4.12.0.0 + - base-orphans ==0.8 - base-prelude ==1.3 - - base-unicode-symbols ==0.2.2.4 + - base-unicode-symbols ==0.2.3 - basic-prelude ==0.7.0 + - bazel-runfiles ==0.7.0.1 - bbdb ==0.8 - bcrypt ==0.0.11 - - beam-core ==0.7.2.2 - - beam-migrate ==0.3.2.1 - bench ==1.0.12 + - benchpress ==0.2.2.12 - bencode ==0.6.0.0 - between ==0.11.0.0 - - bhoogle ==0.1.3.5 - bibtex ==0.1.0.6 - bifunctors ==5.5.3 - 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,34 +280,30 @@ 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 - bindings-uname ==0.1 - - BiobaseNewick ==0.0.0.2 + - bins ==0.1.1.1 - bitarray ==0.0.1.1 - - bitcoin-api ==0.12.1 - - bitcoin-api-extra ==0.9.1 - bitcoin-block ==0.13.1 - bitcoin-script ==0.11.1 - bitcoin-tx ==0.13.1 - bitcoin-types ==0.9.2 - bits ==0.5.1 - - bitset-word8 ==0.1.1.0 + - bitset-word8 ==0.1.1.1 - bits-extra ==0.0.1.3 - bit-stream ==0.1.0.2 - bitx-bitcoin ==0.12.0.0 - blake2 ==0.2.0 - - blank-canvas ==0.6.3 - - blas-carray ==0.0.1.1 - - blas-ffi ==0.0.1.1 + - blas-ffi ==0.1 - blas-hs ==0.1.1.0 - blaze-bootstrap ==0.1.0.1 - 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 @@ -294,6 +311,7 @@ default-package-overrides: - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 + - boolean-normal-forms ==0.0.1 - boolsimplifier ==0.1.8 - bordacount ==0.1.0.0 - boring ==0.1 @@ -303,69 +321,66 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.37.2 - - brittany ==0.11.0.0 - - broadcast-chan ==0.1.1 - - bsb-http-chunked ==0.0.0.3 - - bson ==0.3.2.6 + - bsb-http-chunked ==0.0.0.4 + - bson ==0.3.2.7 - bson-lens ==0.1.1 - - btrfs ==0.1.2.3 - - buffer-builder ==0.2.4.6 + - btrfs ==0.2.0.0 + - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 - - butcher ==1.3.1.1 + - bugsnag-haskell ==0.0.3.0 + - bulletproofs ==0.4.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 - - Cabal ==2.2.0.1 - - cabal2spec ==2.1.1 + - c2hs ==0.28.6 + - Cabal ==2.4.1.0 + - cabal2spec ==2.2.2.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 - - cairo ==0.13.5.0 + - cachix-api ==0.1.0.3 + - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - call-stack ==0.1.0 - - capataz ==0.2.0.0 - carray ==0.1.6.8 - cased ==0.1.0.0 - case-insensitive ==1.2.0.11 - cases ==0.1.3.2 - casing ==0.1.4.0 - cassava ==0.5.1.0 - - cassava-conduit ==0.5.0 + - cassava-conduit ==0.5.1 + - cassava-megaparsec ==2.0.0 - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - - category ==0.2.0.1 - - cborg ==0.2.0.0 - - cereal ==0.5.7.0 + - category ==0.2.2.0 + - cayley-client ==0.4.8 + - cborg ==0.2.1.0 + - cborg-json ==0.2.1.0 + - cereal ==0.5.8.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 + - cgi ==3001.3.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 - - 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,89 +390,82 @@ 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 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - - cisco-spark-api ==0.1.0.3 - - clang-compilation-database ==0.1.0.1 - - clash-ghc ==0.99.3 - - clash-lib ==0.99.3 - - clash-prelude ==0.99.3 - - classyplate ==0.3.1.0 - - classy-prelude ==1.4.0 - - classy-prelude-conduit ==1.4.0 - - classy-prelude-yesod ==1.4.0 + - cisco-spark-api ==0.1.0.4 + - classyplate ==0.3.2.0 + - classy-prelude ==1.5.0 + - classy-prelude-conduit ==1.5.0 + - classy-prelude-yesod ==1.5.0 - clay ==0.13.1 - clientsession ==0.9.1.2 - Clipboard ==2.3.2.0 - 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.5 + - clumpiness ==0.17.0.2 + - cmark ==0.5.6 + - cmark-gfm ==0.1.6 - cmdargs ==0.10.20 - - code-builder ==0.1.3 - codec ==0.2.1 - codec-beam ==0.2.0 - codec-rpm ==0.2.2 - - code-page ==0.1.3 + - code-page ==0.2 - codo-notation ==0.5.2 - coercible-utils ==0.0.0 + - co-log ==0.2.0 + - co-log-core ==0.1.1 - colonnade ==1.2.0.1 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.4 - combinatorial ==0.1.0.1 - comfort-graph ==0.0.3.1 - - commutative ==0.0.1.4 + - commutative ==0.0.2 - comonad ==5.0.4 - compactmap ==0.1.4.2.1 - compensated ==0.7.2 - compiler-warnings ==0.1.0 - - componentm ==0.0.0.2 - - componentm-devel ==0.0.0.2 - composable-associations ==0.1.0.0 - composable-associations-aeson ==0.1.0.0 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - 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.9.0 - conduit-combinators ==1.3.0 + - conduit-concurrent-map ==0.1.1 - conduit-connection ==0.1.0.4 - conduit-extra ==1.3.0 - conduit-iconv ==0.1.1.3 - conduit-parse ==0.2.1.0 - conduit-throttle ==0.3.1.0 - - config-ini ==0.2.2.0 - - configuration-tools ==0.3.1 + - conduit-zstd ==0.0.1.1 + - confcrypt ==0.1.0.4 + - configuration-tools ==0.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - connection ==0.2.8 - connection-pool ==0.2.2 - console-style ==0.0.2.1 - - constraint ==0.1.1.1 + - constraint ==0.1.3.0 - constraints ==0.10.1 - - consul-haskell ==0.4.2 - - containers-unicode-symbols ==0.3.1.1 - - contravariant ==1.4.1 + - contravariant ==1.5 - 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 @@ -471,8 +479,9 @@ default-package-overrides: - cpuinfo ==0.1.0.1 - cql ==4.0.1 - cql-io ==1.0.1.1 + - crackNum ==2.3 - credential-store ==0.1.2 - - criterion ==1.4.1.0 + - criterion ==1.5.3.0 - criterion-measurement ==0.1.1.0 - cron ==0.6.1 - crypto-api ==0.13.3 @@ -481,7 +490,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.1.1.5 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -491,29 +500,29 @@ default-package-overrides: - cryptonite ==0.25 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 + - crypto-pubkey-openssh ==0.2.7 - crypto-pubkey-types ==0.4.3 - crypto-random ==0.0.9 - crypto-random-api ==0.2.0 - crypt-sha512 ==0 - - csg ==0.1.0.5 - csp ==1.4.0 - - css-syntax ==0.0.8 + - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 - csv ==0.1.2 - ctrie ==0.2 - cubicbezier ==0.6.0.5 - cubicspline ==0.1.2 - - cue-sheet ==1.0.1 + - cublas ==0.5.0.0 + - cuckoo-filter ==0.2.0.2 + - cuda ==0.10.0.0 + - cue-sheet ==2.0.1 + - cufft ==0.9.0.1 - curl ==1.3.8 - - curl-runnings ==0.6.0 - currencies ==0.2.0.0 - currency ==0.2.0.0 + - cusparse ==0.2.0.0 - cutter ==0.0 - - cyclotomic ==0.5.1 - - czipwith ==1.0.1.0 - - darcs ==2.14.1 + - czipwith ==1.0.1.1 - data-accessor ==0.2.2.8 - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.16 @@ -521,7 +530,6 @@ default-package-overrides: - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 - - data-clist ==0.1.2.1 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 - data-default-instances-containers ==0.0.1 @@ -529,12 +537,11 @@ 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 - data-has ==0.3.0.0 - - data-hash ==0.2.0.1 - data-inttrie ==0.1.4 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 @@ -542,183 +549,163 @@ 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.2 - data-reify ==0.6.1 - data-serializer ==0.3.4 - - datasets ==0.2.5 - data-textual ==0.3.0.2 - - data-tree-print ==0.1.0.1 + - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 - - DAV ==1.3.2 - - dawg-ord ==0.5.1.0 + - DAV ==1.3.3 - dbcleaner ==0.1.3 - - dbus ==1.0.1 + - DBFunctor ==0.1.0.0 + - dbus ==1.2.3 - debian-build ==0.10.1.2 - debug ==0.1.1 - debug-trace-var ==0.2.0 + - decidable ==0.1.4.0 - Decimal ==0.5.1 - declarative ==0.5.2 - deepseq-generics ==0.2.0.0 - - dejafu ==1.11.0.3 + - deferred-folds ==0.9.10 + - dejafu ==1.11.0.5 + - dense-linear-algebra ==0.1.0.0 - 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 + - deque ==0.2.7 + - deriveJsonNoPrefix ==0.1.0.1 + - deriving-compat ==0.5.4 + - derulo ==1.0.5 - detour-via-sci ==1.0.0 - - df1 ==0.1.1 - - dhall ==1.15.1 - - dhall-bash ==1.0.15 - - dhall-json ==1.2.3 - - dhall-text ==1.0.12 - - di ==1.0.1 + - dhall ==1.19.1 + - dhall-bash ==1.0.18 + - dhall-json ==1.2.6 + - dhall-text ==1.0.15 - diagrams ==1.4 - - diagrams-builder ==0.8.0.3 - - diagrams-cairo ==1.4.1 - - diagrams-canvas ==1.4.1 - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.1.1 - - diagrams-gtk ==1.4 - - 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 - dictionary-sharing ==0.1.0.0 - - di-df1 ==1.0.2 - Diff ==0.3.4 - digest ==0.0.1.2 - digits ==0.3.1 - - di-handle ==1.0 - - dimensional ==1.1 - - di-monad ==1.0.2 + - di-monad ==1.3 - directory-tree ==0.12.1 - direct-sqlite ==2.3.23 - discount ==0.1.1 - - discrimination ==0.3 - disk-free-space ==0.1.0.1 - - distributed-closure ==0.4.0 - - distributed-static ==0.3.8 - - distributive ==0.5.3 - - dlist ==0.8.0.4 + - distributed-closure ==0.4.1 + - distribution-opensuse ==1.1.1 + - distributive ==0.6 + - dlist ==0.8.0.5 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==3.0.4 - - docker ==0.6.0.0 - - dockerfile ==0.1.0.1 + - dockerfile ==0.2.0 - docopt ==0.7.0.5 - doctemplates ==0.2.2.1 - - doctest ==0.16.0 - - doctest-discover ==0.1.0.9 - - doctest-driver-gen ==0.2.0.3 + - doctest ==0.16.0.1 + - doctest-discover ==0.2.0.0 + - doctest-driver-gen ==0.3.0.0 - do-list ==1.0.1 - dom-parser ==3.1.0 - - dotenv ==0.5.2.5 + - dotenv ==0.8.0.0 + - dotgen ==0.4.2 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.6 - - drawille ==0.1.2.0 - - DRBG ==0.5.5 - - drifter ==0.2.3 - - drifter-postgresql ==0.2.1 + - drinkery ==0.4 - dsp ==0.2.4.1 - dual-tree ==0.2.2 - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.4.0.0 + - dunai ==0.5.1 + - dunai-core ==0.5.1.0 + - duration ==0.1.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 - dyre ==0.8.12 - - Earley ==0.12.1.0 + - Earley ==0.13.0.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 - - EdisonAPI ==1.3.1 - - EdisonCore ==1.3.2.1 - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - either ==5.0.1 - - either-unwrap ==1.1 - - ekg ==0.4.0.15 - - ekg-core ==0.1.1.4 - - ekg-json ==0.1.0.6 + - either-both ==0.1.0.0 + - ekg-core ==0.1.1.6 - ekg-statsd ==0.2.4.0 - - ekg-wai ==0.1.0.3 - elerea ==2.9.0 - elf ==0.29 - - eliminators ==0.4.1 + - eliminators ==0.5 + - elm2nix ==0.1.0 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - email-validate ==2.3.2.6 + - emacs-module ==0.1.1 + - email-validate ==2.3.2.10 + - emd ==0.1.4.0 - enclosed-exceptions ==1.0.3 - - entropy ==0.4.1.1 - - enummapset ==0.5.2.2 + - entropy ==0.4.1.4 - 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 - 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.1.0 - - event ==0.1.4 - eventful-core ==0.2.0 - eventful-memory ==0.2.0 - eventful-sql-common ==0.2.0 - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.1.5 + - eventstore ==1.2.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - - exact-pi ==0.4.1.4 + - exact-pi ==0.5.0.1 - exceptional ==0.3.0.0 - - exception-hierarchy ==0.1.0.1 - exception-mtl ==0.4.0.1 - exceptions ==0.10.0 - exception-transformers ==0.4.0.7 - executable-hash ==0.2.0.4 - executable-path ==0.0.3.1 - - exinst ==0.6 + - exit-codes ==1.0.0 - exomizer ==1.0.0 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9.2 - - exp-pairs ==0.1.6.0 - - extensible ==0.4.9 + - exp-pairs ==0.2.0.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.9 + - extra ==1.6.14 - extractable-singleton ==0.0.1 - extrapolate ==0.3.3 - - facts ==0.0.1.0 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.11 + - fast-logger ==2.4.13 - fast-math ==1.0.2 - - fay ==0.24.0.1 - - fay-base ==0.21.1.0 - - fay-dom ==0.5.0.1 - fb ==1.2.1 - fclabels ==2.0.3.3 - feature-flags ==0.1.0.1 - - fedora-haskell-tools ==0.5.1 - - feed ==1.0.0.0 + - fedora-dists ==1.0.0.2 + - fedora-haskell-tools ==0.6 + - feed ==1.0.1.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - - fgl ==5.6.0.0 - - filecache ==0.4.0 - - file-embed ==0.0.10.1 + - fgl ==5.7.0.1 + - filecache ==0.4.1 + - file-embed ==0.0.11 - file-embed-lzma ==0 - filelock ==0.1.1.2 - filemanip ==0.3.6.3 @@ -726,214 +713,203 @@ default-package-overrides: - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 - - Fin ==0.2.5.0 - fin ==0.0.1 - 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-families ==0.3.0.1 - first-class-patterns ==0.3.2.4 + - fitspec ==0.4.7 - fixed ==0.2.1.1 - - fixed-length ==0.2 - - fixed-vector ==1.1.0.0 + - fixed-length ==0.2.1 + - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.5.0.0 - flac ==0.1.2 - - flac-picture ==0.1.1 + - flac-picture ==0.1.2 - 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 + - fmt ==0.6.1.1 - fn ==0.3.0.2 - - focus ==0.1.5.2 + - focus ==1.0.1.2 + - focuslist ==0.1.0.1 - foldable1 ==0.1.0.0 - - fold-debounce ==0.2.0.7 - - fold-debounce-conduit ==0.2.0.1 - - foldl ==1.4.3 + - 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 - forkable-monad ==0.2.0.3 - - forma ==1.1.0 + - forma ==1.1.1 - format-numbers ==0.1.0.0 - - formatting ==6.3.6 + - formatting ==6.3.7 - foundation ==0.0.21 - - free ==5.0.2 + - free ==5.1 - freenect ==1.2.1 - - freer-simple ==1.1.0.0 + - freer-simple ==1.2.1.0 - freetype2 ==0.1.2 - free-vl ==0.1.4 - - friday ==0.2.3.1 - - friday-juicypixels ==0.1.2.4 - friendly-time ==0.4.1 - frisby ==0.2.2 - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.3.0.1 - fsnotify-conduit ==0.1.1.1 + - ftp-client ==0.5.1.1 + - ftp-client-conduit ==0.5.0.4 - funcmp ==1.9 - functor-classes-compat ==1 + - fused-effects ==0.1.2.1 - fuzzcheck ==0.1.1 - fuzzy-dates ==0.1.1.1 - - fuzzyset ==0.1.0.6 - - gauge ==0.2.3 + - fuzzyset ==0.1.0.8 + - gauge ==0.2.4 - gc ==0.0.2 - gd ==3000.7.3 - - gdax ==0.6.0.0 - gdp ==0.0.0.2 - general-games ==1.1.1 - - generic-aeson ==0.2.0.9 - generic-arbitrary ==0.1.0 + - generic-data ==0.3.0.0 - generic-deriving ==1.12.2 - - generic-lens ==1.0.0.2 + - generic-lens ==1.1.0.0 - GenericPretty ==1.2.2 - generic-random ==1.2.0.0 - generics-eot ==0.4 - - generics-sop ==0.3.2.0 + - generics-mrsop ==1.2.2 + - generics-sop ==0.4.0.1 - generics-sop-lens ==0.1.2.1 - - generic-xmlpickler ==0.1.0.5 - - geniplate-mirror ==0.7.6 - - genvalidity ==0.5.1.0 + - genvalidity ==0.7.0.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-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-bytestring ==0.3.0.1 + - genvalidity-containers ==0.5.1.1 + - genvalidity-hspec ==0.6.2.2 + - genvalidity-hspec-aeson ==0.3.0.1 + - genvalidity-hspec-binary ==0.2.0.3 + - genvalidity-hspec-cereal ==0.2.0.3 + - genvalidity-hspec-hashable ==0.2.0.3 + - genvalidity-hspec-optics ==0.1.1.1 - genvalidity-path ==0.3.0.2 - - genvalidity-property ==0.2.1.0 - - genvalidity-scientific ==0.2.0.1 + - genvalidity-property ==0.3.0.0 + - genvalidity-scientific ==0.2.1.0 - genvalidity-text ==0.5.1.0 - - genvalidity-time ==0.2.1.0 - - genvalidity-unordered-containers ==0.2.0.3 + - genvalidity-time ==0.2.1.1 + - genvalidity-unordered-containers ==0.2.0.4 - genvalidity-uuid ==0.1.0.2 - - genvalidity-vector ==0.2.0.2 - - geodetics ==0.0.6 - - getopt-generics ==0.13.0.2 + - genvalidity-vector ==0.2.0.3 + - geojson ==3.0.4 + - getopt-generics ==0.13.0.3 - ghc-core ==0.5.6 - - ghc-exactprint ==0.5.6.1 - - ghcid ==0.7 - - ghcjs-base-stub ==0.2.0.0 + - ghc-exactprint ==0.5.8.2 + - ghcid ==0.7.1 + - ghci-hexcalc ==0.1.0.1 - 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.5 + - ghc-syntax-highlighter ==0.0.3.0 - ghc-tcplugins-extra ==0.3 - - ghc-typelits-extra ==0.2.6 - - ghc-typelits-knownnat ==0.5.1 + - ghc-typelits-extra ==0.3 + - ghc-typelits-knownnat ==0.6 - ghc-typelits-natnormalise ==0.6.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.15 - gi-cairo ==1.0.17 - gi-gdk ==3.0.16 - - gi-gdkpixbuf ==2.0.16 + - gi-gdkpixbuf ==2.0.18 - 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.27 + - gi-gtk-hs ==0.3.6.3 - gi-gtksource ==3.0.16 - - gi-javascriptcore ==4.0.15 - - gio ==0.13.5.0 + - gi-javascriptcore ==4.0.16 + - gingersnap ==0.3.1.0 - gi-pango ==1.0.16 - giphy-api ==0.6.0.1 - - github ==0.19 - - github-release ==1.2.2 + - githash ==0.1.3.1 + - github-release ==1.2.4 - github-types ==0.2.1 - - github-webhooks ==0.10.0 + - github-webhooks ==0.10.1 - gitrev ==1.3.1 - - git-vogue ==0.3.0.2 + - gi-vte ==2.91.19 - gl ==0.8.0 - - glabrous ==0.3.6 + - glabrous ==1.0.1 - 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 - - gloss ==1.12.0.0 - - gloss-raster ==1.12.0.0 - - gloss-rendering ==1.12.0.0 + - Glob ==0.9.3 + - gloss ==1.13.0.1 + - gloss-algorithms ==1.13.0.1 + - gloss-examples ==1.13.0.2 + - gloss-raster ==1.13.0.2 + - gloss-rendering ==1.13.0.2 - GLURaw ==2.0.0.4 - GLUT ==2.7.0.14 - gnuplot ==0.5.5.3 - goggles ==0.3.2 - - google-oauth2-jwt ==0.3.0 + - google-isbn ==1.0.3 + - google-oauth2-jwt ==0.3.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graphs ==0.7.1 - - graphviz ==2999.20.0.2 - - graph-wrapper ==0.2.5.1 + - graph-wrapper ==0.2.6.0 - 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.3.0 + - greskell-core ==0.1.2.4 + - greskell-websocket ==0.1.1.2 - groom ==0.1.2.1 + - groundhog ==0.10.0 + - groundhog-mysql ==0.10 + - groundhog-postgresql ==0.10 + - groundhog-sqlite ==0.10.0 - groups ==0.4.1.0 - - gtk ==0.14.10 - - gtk2hs-buildtools ==0.13.4.0 - - gtk3 ==0.14.9 + - guarded-allocation ==0.0.1 - gym-http-api ==0.1.0.1 - h2c ==1.0.0 - hackage-db ==2.0.1 - hackage-security ==0.5.3.0 - - haddock-library ==1.5.0.1 + - haddock-library ==1.7.0 - hailgun ==0.4.1.8 - - hakyll ==4.12.3.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.10 - - happstack-server ==7.5.1.1 + - hapistrano ==0.3.9.1 - happy ==1.19.9 - - hasbolt ==0.1.3.0 + - hasbolt ==0.1.3.2 - hashable ==1.2.7.0 + - hashable-time ==0.2.0.2 - 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 + - haskeline ==0.7.5.0 + - haskell-gi ==0.21.5 + - haskell-gi-base ==0.21.5 - haskell-gi-overloading ==1.0 - - haskell-lexer ==1.0.1 - - haskell-lsp ==0.2.2.0 - - haskell-lsp-types ==0.2.2.0 + - haskell-lexer ==1.0.2 + - haskell-lsp ==0.8.0.1 + - haskell-lsp-types ==0.8.0.1 + - haskell-names ==0.9.4 - 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-simple ==1.20.0.0 - - haskell-src-exts-util ==0.2.3 + - haskell-src-exts ==1.20.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 - - haskell-tools-builtin-refactorings ==1.1.0.2 - - haskell-tools-debug ==1.1.0.2 - - haskell-tools-demo ==1.1.0.2 - - haskell-tools-prettyprint ==1.1.0.2 - - haskell-tools-refactor ==1.1.0.2 - - haskell-tools-rewrite ==1.1.0.2 - - haskey ==0.3.0.2 - haskey-btree ==0.3.0.0 - - haskey-mtl ==0.3.1.0 - - haskintex ==0.8.0.0 + - haskoin-core ==0.8.4 - hasql ==1.3.0.3 - hasql-optparse-applicative ==0.3.0.3 - - hasql-pool ==0.5 + - hasql-pool ==0.5.0.1 - 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 @@ -943,325 +919,321 @@ 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.4 + - hedis ==0.10.10 + - hedn ==0.2.0.0 - here ==1.2.13 - heredoc ==0.2.0.0 - - heterocephalus ==1.0.5.2 + - heterocephalus ==1.0.5.3 - 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 + - hformat ==0.3.3.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 + - hinfo ==0.0.3.0 + - hinotify ==0.4 + - hint ==0.9.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-backprop ==0.1.2.5 - 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 + - hoauth2 ==1.8.3 - Hoed ==0.5.1 - - hoopl ==3.10.2.2 - - hOpenPGP ==2.7.2 - - hopenpgp-tools ==0.21.2 + - hOpenPGP ==2.7.4.1 - hopfli ==0.2.2.1 + - hosc ==0.17 - hostname ==1.0 - hostname-validate ==1.0.0 - 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 + - hp2pretty ==0.9 + - hpack ==0.31.1 + - hpack-dhall ==0.5.1 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - - hruby ==0.3.5.4 - - hsass ==0.7.0 - - hs-bibutils ==6.6.0.0 + - hruby ==0.3.6 + - hsass ==0.8.0 + - hs-bibutils ==6.7.0.0 + - hschema ==0.0.1.1 + - hschema-aeson ==0.0.1.1 + - hschema-prettyprinter ==0.0.1.1 + - hschema-quickcheck ==0.0.1.1 - hscolour ==1.24.4 + - hsdev ==0.3.2.3 - hsdns ==1.7.1 - hsebaysdk ==0.4.0.0 - hsemail ==2 - - HSet ==0.0.1 - hset ==2.2.0 - - hsexif ==0.6.1.5 + - 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 + - hsinstall ==2.2 - HSlippyMap ==3.0.1 - - hslogger ==1.2.10 - - hslua ==0.9.5.2 - - hslua-aeson ==0.3.0.2 - - hslua-module-text ==0.1.2.1 - - HsOpenSSL ==0.11.4.14 + - hslogger ==1.2.12 + - hslua ==1.0.2 + - hslua-aeson ==1.0.0 + - hslua-module-text ==0.2.0 + - HsOpenSSL ==0.11.4.16 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.5.5 + - hspec ==2.6.1 - hspec-attoparsec ==0.1.0.2 - hspec-checkers ==0.1.0.2 - - hspec-contrib ==0.5.0 - - hspec-core ==2.5.5 - - hspec-discover ==2.5.5 + - hspec-contrib ==0.5.1 + - hspec-core ==2.6.1 + - hspec-discover ==2.6.1 - hspec-expectations ==0.8.2 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.7.0.0 - - hspec-megaparsec ==1.0.0 - - hspec-meta ==2.4.6 + - hspec-leancheck ==0.0.3 + - hspec-megaparsec ==2.0.0 + - hspec-meta ==2.6.0 + - hspec-need-env ==0.1.0.3 - hspec-pg-transact ==0.1.0.2 - hspec-smallcheck ==0.5.2 - - hspec-wai ==0.9.0 - - hspec-wai-json ==0.9.0 + - hspec-wai ==0.9.2 + - hspec-wai-json ==0.9.2 + - hs-php-session ==0.0.9.3 - hstatsd ==0.1 - HStringTemplate ==0.8.7 - HSvm ==0.1.0.3.22 - - hsx-jmacro ==7.3.8.1 - - hsyslog ==5.0.1 - - hsyslog-udp ==0.2.3 + - HsYAML ==0.1.1.3 + - hsyslog ==5.0.2 - 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 - - http-api-data ==0.3.8.1 - - http-client ==0.5.13.1 - - http-client-openssl ==0.2.2.0 + - http2 ==1.6.4 + - http-api-data ==0.4 + - http-client ==0.5.14 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.0 - - http-conduit ==2.3.2 + - http-conduit ==2.3.5 - 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 - - human-readable-duration ==0.2.0.3 + - http-types ==0.12.2 + - human-readable-duration ==0.2.1.3 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==1.2.0.6 + - hunit-dejafu ==1.2.1.0 - 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-conduit-merges ==0.2.0.0 - hw-diagnostics ==0.0.0.5 - hweblib ==0.6.3 + - hw-eliasfano ==0.1.0.1 - hw-excess ==0.2.0.2 - hw-fingertree-strict ==0.1.1.1 - - hw-hedgehog ==0.1.0.2 - - hw-hspec-hedgehog ==0.1.0.5 + - hw-hspec-hedgehog ==0.1.0.4 - hw-int ==0.0.0.3 - - hw-ip ==0.1.0.0 - - hw-json ==0.6.0.0 - - hw-mquery ==0.1.0.1 - - hworker ==0.1.0.1 - - hw-parser ==0.0.0.3 - - hw-prim ==0.6.2.14 - - hw-rankselect ==0.10.0.3 + - hw-ip ==2.0.1.0 + - hw-json ==0.9.0.1 + - hw-mquery ==0.1.0.3 + - hw-packed-vector ==0.0.0.1 + - hw-parser ==0.1.0.0 + - hw-prim ==0.6.2.22 + - hw-rankselect ==0.12.0.4 - hw-rankselect-base ==0.3.2.1 + - hw-streams ==0.0.0.10 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - - hw-xml ==0.1.0.3 - hxt ==9.3.1.16 - hxt-charproperties ==9.2.0.1 - hxt-css ==0.1.0.3 - hxt-curl ==9.1.1.1 - hxt-expat ==9.1.1 - hxt-http ==9.1.5.2 - - hxt-pickle-utils ==0.1.0.3 - hxt-regex-xmlschema ==9.2.0.3 - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - hyperloglog ==0.4.2 - hyphenation ==0.7.1 - - hyraxAbif ==0.2.3.10 + - hyraxAbif ==0.2.3.15 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 - - ihaskell ==0.9.1.0 - - ihaskell-hvega ==0.1.0.3 - - ihs ==0.1.0.2 + - ihs ==0.1.0.3 - ilist ==0.3.1.0 - imagesize-conduit ==1.1 - 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 - - inflections ==0.4.0.3 - - influxdb ==1.6.0.7 + - indexed-list-literals ==0.2.1.2 + - infer-license ==0.2.0 + - inflections ==0.4.0.4 + - influxdb ==1.6.1.2 - ini ==0.3.6 - - inline-c ==0.6.1.0 - - inline-java ==0.8.4 + - inline-c ==0.7.0.1 + - inline-c-cpp ==0.3.0.1 - inliterate ==0.1.0 - insert-ordered-containers ==0.2.1.0 - - inspection-testing ==0.2.0.1 + - inspection-testing ==0.4.1.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 + - interpolatedstring-perl6 ==1.0.1 - interpolation ==0.1.0.3 - - IntervalMap ==0.6.0.0 + - interpolator ==0.1.1 + - IntervalMap ==0.6.1.0 - intervals ==0.8.1 - - intro ==0.3.2.0 + - intro ==0.5.2.1 + - intset-imperative ==0.1.0.0 - invariant ==0.5.1 - invertible ==0.2.0.5 - - invertible-grammar ==0.1.1 - - io-choice ==0.0.6 + - io-choice ==0.0.7 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.5.0.1 - - io-streams-haproxy ==1.0.0.2 - - ip ==1.3.0 + - io-streams ==1.5.1.0 + - io-streams-haproxy ==1.0.1.0 + - ip ==1.4.1 - ip6addr ==1.0.0 - - iproute ==1.7.5 - - IPv6Addr ==1.1.0 + - iproute ==1.7.7 + - IPv6Addr ==1.1.2 - 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 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - 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.4 - - jmacro ==0.6.15 - - jmacro-rpc ==0.3.3 - - jmacro-rpc-snap ==0.3 - - jni ==0.6.1 - - jose ==0.7.0.0 - - jose-jwt ==0.7.8 + - jose ==0.8.0.0 + - jose-jwt ==0.8.0 - js-flot ==0.8.3 - js-jquery ==3.3.1 - - json ==0.9.2 - - json-feed ==1.0.3 + - json ==0.9.3 + - json-alt ==1.0.0 + - json-feed ==1.0.6 + - json-rpc ==1.0.0 - json-rpc-client ==0.2.5.0 - 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-extra ==0.3.0 + - JuicyPixels ==3.3.3 + - JuicyPixels-extra ==0.4.0 - JuicyPixels-scale-dct ==0.1.2 - justified-containers ==0.3.0.0 - - jvm ==0.4.2 - - jvm-batching ==0.1.1 - - jvm-streaming ==0.3.1 - - jwt ==0.7.2 - kan-extensions ==5.2 - kanji ==3.4.0 - - kansas-comet ==0.4 + - katip ==0.7.0.0 - kawhi ==0.3.0 + - kazura-queue ==0.1.0.4 - kdt ==0.2.4 - keycode ==0.2.2 - keys ==3.12.1 + - kind-apply ==0.3.0.0 + - kind-generics ==0.3.0.0 + - kind-generics-th ==0.1.0.0 - kleene ==0 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.5 - - LambdaHack ==0.8.3.0 + - lackey ==1.0.8 - 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-docker ==8.0.0 - 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.1 - - lapack-carray ==0.0.2 + - language-puppet ==1.4.2 - lapack-ffi ==0.0.2 - - lapack-ffi-tools ==0.1.1 - - large-hashable ==0.1.0.4 + - lapack-ffi-tools ==0.1.2 - largeword ==1.2.5 - 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.3 + - leancheck ==0.8.0 + - leancheck-instances ==0.0.3 - leapseconds-announced ==2017.1.0.1 - - learn-physics ==0.6.2 - - lens ==4.16.1 + - lens ==4.17 - 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.3.0.1 - lens-misc ==0.0.2.0 - lens-properties ==4.11.1 - - lens-regex ==0.1.0 + - lens-regex ==0.1.1 - lens-simple ==0.1.0.9 + - lens-typelevel ==0.1.1.0 - lenz ==0.3.0.0 - leveldb-haskell ==0.6.5 - libffi ==0.1 - libgit ==0.3.1 - libgraph ==1.14 - - libmpd ==0.9.0.8 - - libxml-sax ==0.7.5 + - libmpd ==0.9.0.9 + - libraft ==0.1.1.0 + - libyaml ==0.1.0.0 - 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 - linear ==1.20.8 - - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - ListLike ==4.6 - listsafe ==0.1.0.1 - - list-t ==1.0.1 - - llvm-hs ==6.3.0 - - llvm-hs-pretty ==0.5.0.0 - - llvm-hs-pure ==6.2.1 + - list-t ==1.0.3.1 + - ListTree ==0.2.3 + - llvm-hs-pure ==7.0.0 - lmdb ==0.2.5 - - load-env ==0.2.0.1 + - load-env ==0.2.0.2 + - loc ==0.1.3.4 - locators ==0.2.4.4 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 @@ -1269,108 +1241,104 @@ 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 - lrucaching ==0.3.3 - - lucid ==2.9.10 + - lsp-test ==0.5.0.2 + - lucid ==2.9.11 - lucid-extras ==0.1.0.1 - lxd-client-config ==0.1.0.1 - - lz4 ==0.2.3.1 - lzma ==0.0.0.3 - lzma-conduit ==1.2.1 - machines ==0.6.4 - machines-binary ==0.3.0.3 - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - - magicbane ==0.3.0 - mainland-pretty ==0.7 - - main-tester ==0.1.0.0 + - main-tester ==0.2.0.0 - 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-io ==0.1.4.0 + - massiv ==0.2.7.0 + - massiv-io ==0.1.5.0 - mathexpr ==0.3.0.0 - - math-functions ==0.2.1.0 + - math-functions ==0.3.1.0 - matrices ==0.4.5 - matrix ==0.3.6.1 - matrix-market-attoparsec ==0.1.0.8 + - matrix-static ==0.2 - maximal-cliques ==0.1.1 - mbox ==0.3.4 - mbox-utility ==0.0.1 - mbtiles ==0.6.0.0 - - mbug ==1.3 + - mbug ==1.3.2 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - - med-module ==0.1.1 - - megaparsec ==6.5.0 - - mega-sdist ==0.3.3.1 - - memory ==0.14.16 + - megaparsec ==7.0.4 + - mega-sdist ==0.3.3.2 + - memory ==0.14.18 - MemoTrie ==0.6.9 - - mercury-api ==0.1.0.1 + - menshen ==0.0.1 + - mercury-api ==0.1.0.2 + - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 - - messagepack ==0.5.4 - - messagepack-rpc ==0.5.1 - metrics ==0.4.1.1 - mfsolve ==0.3.2.0 + - microbench ==0.1 - 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.1 + - microlens ==0.4.10 + - microlens-aeson ==2.3.0.1 + - microlens-contra ==0.1.0.2 + - microlens-ghc ==0.4.10 - microlens-mtl ==0.1.11.1 - - microlens-platform ==0.3.10 - - microlens-th ==0.4.2.2 - - microspec ==0.1.0.0 + - microlens-platform ==0.3.11 + - microlens-th ==0.4.2.3 + - microspec ==0.2.1.3 - microstache ==1.0.1.1 + - midair ==0.2.0.1 - midi ==0.2.2.2 - mighty-metropolis ==1.2.0 - - milena ==0.5.2.2 - mime-mail ==0.4.14 - mime-mail-ses ==0.4.1 - - mime-types ==0.1.0.8 - - minimorph ==0.1.6.1 + - mime-types ==0.1.0.9 + - minimorph ==0.2.1.0 - minio-hs ==1.2.0 - - minisat-solver ==0.1 - - miniutter ==0.4.7.0 + - miniutter ==0.5.0.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 + - mixpanel-client ==0.1.1 - 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 ==0.0.6.1 + - mmark-cli ==0.0.5.0 + - mmark-ext ==0.2.1.1 - mmorph ==1.1.2 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - - modern-uri ==0.2.2.0 - - moesocks ==1.0.0.44 + - modern-uri ==0.3.0.1 + - modular ==0.1.0.8 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 - 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 - monad-loops ==0.4.3 - - monad-memo ==0.4.1 - - monad-metrics ==0.2.1.2 + - monad-memo ==0.5.1 - monad-par ==0.3.4.8 - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 @@ -1378,7 +1346,6 @@ default-package-overrides: - monad-products ==4.0.1 - MonadPrompt ==1.0.0.5 - MonadRandom ==0.5.1.1 - - monad-recorder ==0.1.1 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 - monads-tf ==0.1.0.3 @@ -1386,36 +1353,35 @@ default-package-overrides: - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - mongoDB ==2.4.0.0 - - monoidal-containers ==0.3.1.0 + - monoidal-containers ==0.4.0.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 ==1.0.11.0 - mono-traversable-instances ==0.1.0.0 - - morte ==1.6.20 - mountpoints ==1.0.2 - - mstate ==0.2.7 - mtl ==2.2.2 - mtl-compat ==0.2.1.3 - mtl-prelude ==2.0.3.1 - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.1.3 - - multistate ==0.8.0.0 + - multiset ==0.3.4.1 + - murmur3 ==1.0.3 - 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-haskell ==0.8.3.0 + - mwc-random ==0.14.0.0 + - mysql ==0.1.7 + - mysql-haskell ==0.8.4.2 - mysql-haskell-nem ==0.1.0.0 - - mysql-haskell-openssl ==0.8.3.0 - mysql-simple ==0.4.5 + - n2o ==0.11.1 - nagios-check ==0.3.2 - - named ==0.1.0.0 + - named ==0.2.0.0 - names-th ==0.3.0.0 - nano-erl ==0.1.0.1 - nanospec ==0.2.2 @@ -1424,116 +1390,113 @@ default-package-overrides: - natural-sort ==0.1.2 - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - - neat-interpolation ==0.3.2.2 - - netlib-carray ==0.0.1.1 - - netlib-ffi ==0.1 + - neat-interpolation ==0.3.2.4 + - netlib-ffi ==0.1.1 - netpbm ==1.0.2 - nettle ==0.3.0 - netwire ==5.0.3 - netwire-input ==0.0.7 - netwire-input-glfw ==0.0.10 - - network ==2.6.3.6 + - network ==2.8.0.0 - 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-messagepack-rpc ==0.1.1.0 - 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 - - network-transport-tests ==0.2.4.2 - network-uri ==2.6.1.0 - newtype ==0.2 - newtype-generics ==0.5.3 - - next-ref ==0.1.0.2 - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 - NoHoed ==0.1.1 - nonce ==1.0.7 - nondeterminism ==1.4 - - non-empty ==0.3.0.1 + - non-empty ==0.3.1 + - nonempty-containers ==0.1.1.0 + - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.2 - non-negative ==0.1.2 + - nowdoc ==0.1.1.0 + - nqe ==0.6.1 - nsis ==0.3.2 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - 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-contrib ==1.0.0.0 + - nuxeo ==0.3.2 + - nvvm ==0.9.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 + - oblivious-transfer ==0.1.0 + - odbc ==0.2.2 - oeis ==0.3.9 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 - - om-elm ==1.0.0.3 - - once ==0.2 + - once ==0.4 - one-liner ==1.0 - one-liner-instances ==0.1.2.1 - OneTuple ==0.2.2 - - online ==0.3.0.0 - Only ==0.1 - oo-prototypes ==0.1.0.0 + - opaleye ==0.6.7003.1 - OpenAL ==1.7.0.4 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.2.2 - - OpenGLRaw ==3.3.1.0 + - OpenGLRaw ==3.3.2.0 - openpgp-asciiarmor ==0.1.1 - - opensource ==0.1.0.0 - - openssl-streams ==1.2.1.3 + - opensource ==0.1.1.0 + - openssl-streams ==1.2.2.0 - open-witness ==0.4.0.1 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - 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-simple ==0.1.1.1 - optparse-text ==0.1.1.0 - overhang ==1.0.0 - - packcheck ==0.3.1 - - packdeps ==0.4.5 + - packcheck ==0.4.1 - pager ==0.1.1.0 - 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 - - pango ==0.13.5.0 - - papillon ==0.1.0.6 + - pairing ==0.1.4 + - pandoc ==2.5 + - pandoc-citeproc ==0.15.0.1 + - pandoc-pyplot ==1.0.3.0 + - pandoc-types ==1.17.5.4 - parallel ==3.2.2.0 - parallel-io ==0.3.3 + - paripari ==0.6.0.0 - parseargs ==0.2.0.8 - parsec ==3.1.13.0 + - parsec-class ==1.0.0.0 + - parsec-numbers ==0.1.0 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parser-combinators ==1.0.0 + - parser-combinators ==1.0.1 - parsers ==0.12.9 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - partial-order ==0.1.2.1 + - partial-semigroup ==0.5.0.0 - path ==0.6.1 - path-extra ==0.2.0 - - path-io ==1.3.3 + - path-io ==1.4.1 - path-pieces ==0.2.1 + - path-text-utf8 ==0.0.1.2 - pathtype ==0.8.1 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 @@ -1545,32 +1508,31 @@ default-package-overrides: - pcre-utils ==0.1.8.1.1 - pdfinfo ==1.5.4 - peano ==0.1.0.1 + - pedersen-commitment ==0.2.0 - pem ==0.2.4 - - perf ==0.4.1.0 + - percent-format ==0.0.1 - perfect-hash-generator ==0.2.0.6 + - persist ==0.1.1.1 - persistable-record ==0.6.0.4 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.8.2 + - persistent ==2.9.1 - persistent-iproute ==0.2.3 - - persistent-mysql ==2.8.1 - - persistent-mysql-haskell ==0.4.2 - - persistent-postgresql ==2.8.2.0 - - persistent-refs ==0.4 - - persistent-sqlite ==2.8.2 + - persistent-mysql ==2.9.0 + - persistent-mysql-haskell ==0.5.2 + - persistent-postgresql ==2.9.0 + - persistent-sqlite ==2.9.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 - pid1 ==0.1.2.0 - - pinboard ==0.9.12.10 - 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 @@ -1581,37 +1543,34 @@ default-package-overrides: - pipes-network ==0.6.5 - pipes-network-tls ==0.3 - pipes-parse ==3.0.8 - - pipes-random ==1.0.0.4 - - pipes-safe ==2.2.9 + - pipes-safe ==2.3.1 - pipes-wai ==3.2.0 - 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 - poll ==0.0.0.1 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - - polyparse ==1.12 + - polyparse ==1.12.1 - pooled-io ==0.0.2.2 - - portable-lines ==0.1 - - postgresql-binary ==0.12.1.1 - - postgresql-libpq ==0.9.4.1 + - port-utils ==0.2.0.0 + - posix-paths ==0.2.1.6 + - 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 ==0.6 + - postgresql-simple-migration ==0.1.14.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 - prelude-safeenum ==0.1.1.2 - present ==4.1.0 - prettyclass ==1.0.0.0 @@ -1622,98 +1581,101 @@ default-package-overrides: - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - - prettyprinter-convert-ansi-wl-pprint ==1.1 - - pretty-show ==1.7 - - pretty-simple ==2.1.0.1 + - pretty-show ==1.9.5 + - pretty-simple ==2.2.0.1 + - pretty-sop ==0.2.0.2 - pretty-types ==0.2.3.1 - primes ==0.2.1.0 - - primitive ==0.6.3.0 + - primitive ==0.6.4.0 - prim-uniq ==0.1.0.1 - probability ==0.2.5.2 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - product-profunctors ==0.10.0.0 - profiterole ==0.1 - - profunctors ==5.2.2 + - profunctors ==5.3 - projectroot ==0.2.0.1 - project-template ==0.2.0.1 - - prometheus-client ==0.3.0 + - prometheus-client ==1.0.0 - promises ==0.3 - prompt ==0.1.1.2 - protobuf ==0.2.1.2 - - protobuf-simple ==0.1.0.5 - - protocol-buffers ==2.4.11 - - protocol-buffers-descriptor ==2.4.11 + - protobuf-simple ==0.1.1.0 + - protocol-buffers ==2.4.12 + - protocol-buffers-descriptor ==2.4.12 - 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.2 - - proto-lens-combinators ==0.1.0.11 - - proto-lens-optparse ==0.1.1.2 - - proto-lens-protobuf-types ==0.3.0.1 - - proto-lens-protoc ==0.3.1.2 - - protolude ==0.2.2 + - proto-lens ==0.4.0.1 + - proto-lens-arbitrary ==0.1.2.5 + - proto-lens-combinators ==0.4.0.1 + - proto-lens-optparse ==0.1.1.4 + - proto-lens-protobuf-types ==0.4.0.1 + - proto-lens-protoc ==0.4.0.2 + - proto-lens-runtime ==0.4.0.2 + - proto-lens-setup ==0.4.0.1 + - protolude ==0.2.3 - proxied ==0.3 - psql-helpers ==0.1.0.0 - - psqueues ==0.2.7.0 - - publicsuffix ==0.20180513 + - psqueues ==0.2.7.1 - pureMD5 ==2.1.3 - purescript-bridge ==0.13.0.0 - pure-zlib ==0.6.4 - pushbullet-types ==0.4.1.0 + - pusher-http-haskell ==1.5.1.7 + - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - - qnap-decrypt ==0.3.2 + - qnap-decrypt ==0.3.4 + - quadratic-irrational ==0.0.6 - QuasiText ==0.1.2.6 - quickbench ==1.0 - - QuickCheck ==2.11.3 + - QuickCheck ==2.12.6.1 - 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 + - quickcheck-state-machine ==0.4.3 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.1.0 - - quicklz ==1.5.0.11 - rainbow ==0.30.0.2 - rainbox ==0.20.0.0 - - rakuten ==0.1.1.5 - ramus ==0.1.2 + - rando ==0.0.0.4 - random ==1.1 - random-bytestring ==0.1.3.1 - random-fu ==0.2.7.0 - random-shuffle ==0.0.4 - random-source ==0.3.0.6 - random-tree ==0.6.0.5 + - range ==0.2.1.1 - range-set-list ==0.1.3 - 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 - - ratio-int ==0.1.2 - - rattletrap ==4.1.2 + - rank2classes ==1.2.1 + - Rasterific ==0.7.4.2 + - rasterific-svg ==0.3.3.2 + - ratel ==1.0.8 + - ratel-wai ==1.0.5 + - rattletrap ==6.0.2 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 - rcu ==0.2.3 - - rdf ==0.1.0.2 - - rdtsc ==1.3.0.1 - - re2 ==0.2 + - re2 ==0.3 - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - rebase ==1.2.4 - - record-dot-preprocessor ==0.1.3 - - recursion-schemes ==5.0.3 + - rebase ==1.3 + - record-dot-preprocessor ==0.1.4 + - records-sop ==0.1.0.2 + - recursion-schemes ==5.1.1 - reducers ==3.12.3 - refact ==0.3.0.2 - references ==0.3.3.1 - - ref-fd ==0.4.0.1 - - refined ==0.2.3.0 + - refined ==0.3.0.0 - reflection ==2.1.4 - RefSerialize ==0.4.0 + - regex ==1.0.2.0 - regex-applicative ==0.3.3 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 @@ -1725,182 +1687,186 @@ default-package-overrides: - regex-posix ==0.95.2 - regex-tdfa ==1.2.3.1 - regex-tdfa-text ==1.0.0.3 + - regex-with-pcre ==1.0.2.0 + - registry ==0.1.2.6 - reinterpret-cast ==0.1.0 + - relapse ==1.0.0.0 - relational-query ==0.12.1.0 - relational-query-HDBC ==0.7.1.1 - relational-record ==0.2.2.0 - relational-schemas ==0.1.6.2 - - relude ==0.1.1 + - relude ==0.4.0 - renderable ==0.2.0.1 - - repa ==3.4.1.3 - - repline ==0.1.7.0 - - req ==1.1.0 + - repa ==3.4.1.4 + - repa-algorithms ==3.4.1.3 + - repa-io ==3.4.1.1 + - repline ==0.2.0.0 + - req ==1.2.1 - req-conduit ==1.0.0 - - require ==0.2.1 - req-url-extra ==0.1.0.0 - - resolv ==0.1.1.1 + - rerebase ==1.3 - resource-pool ==0.2.3.2 - - resourcet ==1.2.1 - - rest-stringmap ==0.2.0.7 + - resourcet ==1.2.2 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - retry ==0.7.7.0 - rev-state ==0.1.2 - - rfc5051 ==0.1.0.3 - - rhine ==0.4.0.1 - - riak ==1.1.2.5 - - riak-protobuf ==0.23.0.0 - - rio ==0.1.5.0 + - rfc1751 ==0.1.2 + - rfc5051 ==0.1.0.4 + - rio ==0.1.8.0 - rio-orphans ==0.1.1.0 - rng-utils ==0.3.0 + - roc-id ==0.1.0.0 + - rocksdb-haskell ==1.0.1 + - rocksdb-query ==0.2.0 - roles ==0.2.0.0 + - rosezipper ==0.2 - rot13 ==0.2.0.1 - - RSA ==2.3.0 - - rss-conduit ==0.4.2.2 + - rounded ==0.1.0.1 + - rpmbuild-order ==0.2.1 + - RSA ==2.3.1 - 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.3 - 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 + - salak ==0.1.8 + - 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 - sandman ==0.2.0.1 - say ==0.1.0.1 - - sbp ==2.3.17 - - SCalendar ==1.1.0 - - scalendar ==1.2.0 + - sbp ==2.4.7 + - sbv ==7.13 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - - scanner ==0.2 + - scanf ==0.1.0.0 + - scanner ==0.3 - scientific ==0.3.6.2 - - scotty ==0.11.2 + - scotty ==0.11.3 - scrypt ==0.5.0 - sdl2 ==2.4.1.0 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==1.1.0 - sdl2-ttf ==2.1.0 - - search-algorithms ==0.3.0 + - secp256k1-haskell ==0.1.4 - securemem ==0.1.10 - - SegmentTree ==0.3 - - selda ==0.2.0.0 - - selda-postgresql ==0.1.7.2 - - selda-sqlite ==0.1.6.0 + - selda ==0.3.4.0 + - selda-postgresql ==0.1.7.3 + - selda-sqlite ==0.1.6.1 - semigroupoid-extras ==5 - - semigroupoids ==5.2.2 + - semigroupoids ==5.3.2 - semigroups ==0.18.5 + - semirings ==0.2.1.1 - semiring-simple ==1.0.0.1 - semver ==0.3.3.1 - - sendfile ==0.7.9 + - sendfile ==0.7.10 - seqalign ==0.2.0.4 - serf ==0.1.1.0 - - servant ==0.14.1 + - serialise ==0.2.1.0 + - servant ==0.15 - 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.3.0 - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.8 - servant-cassava ==0.10 - servant-checked-exceptions ==2.0.0.0 - servant-checked-exceptions-core ==2.0.0.0 - - servant-client ==0.14 - - servant-client-core ==0.14.1 - - servant-dhall ==0.1.0.1 - - servant-docs ==0.11.2 + - servant-client ==0.15 + - servant-client-core ==0.15 + - servant-docs ==0.11.3 - servant-elm ==0.5.0.0 - servant-exceptions ==0.1.1 - - servant-foreign ==0.11.1 - - servant-github-webhook ==0.4.1.0 - - servant-js ==0.9.3.2 + - servant-foreign ==0.15 + - servant-js ==0.9.4 - servant-JuicyPixels ==0.3.0.4 + - servant-kotlin ==0.1.1.6 - servant-lucid ==0.8.1 - - servant-mock ==0.8.4 + - servant-mock ==0.8.5 - servant-pandoc ==0.5.0.0 - - servant-ruby ==0.8.0.2 - - servant-server ==0.14.1 + - servant-rawm ==0.3.0.0 + - servant-ruby ==0.9.0.0 + - servant-server ==0.15 - 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-ui ==0.3.0.3.13.2 - - servant-swagger-ui-core ==0.3.1 + - servant-swagger ==1.1.7 + - servant-swagger-ui ==0.3.2.3.19.3 + - servant-swagger-ui-core ==0.3.2 + - servant-swagger-ui-redoc ==0.3.2.1.22.2 - servant-tracing ==0.1.0.2 - servant-websockets ==1.1.0 - - servant-yaml ==0.1.0.0 - - serverless-haskell ==0.6.7 + - servant-yaml ==0.1.0.1 + - serverless-haskell ==0.8.5 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - servius ==1.2.3.0 - ses-html ==0.4.0.0 - - set-cover ==0.0.9 - setenv ==0.1.1.3 - 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 + - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - shelltestrunner ==1.9 - - shelly ==1.8.1 - - shortcut-links ==0.4.2.0 + - shelly ==1.8.0 + - shikensu ==0.3.11 + - shortcut-links ==0.4.2.1 - should-not-typecheck ==2.1.0 - - show-combinators ==0.1.0.0 + - show-combinators ==0.1.1.0 - show-prettyprint ==0.2.2 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 + - simple-cmd ==0.1.2 + - simple-log ==0.9.11 - simple-reflect ==0.3.3 - - simple-sendfile ==0.2.27 - - simplest-sqlite ==0.1.0.0 - - simple-vec3 ==0.4.0.8 + - simple-sendfile ==0.2.28 + - simple-vec3 ==0.4.0.10 - since ==0.0.0 - singleton-bool ==0.1.4 - - singleton-nats ==0.4.1 - - singletons ==2.4.1 + - singleton-nats ==0.4.2 + - singletons ==2.5.1 - siphash ==1.0.3 - - size-based ==0.1.1.0 + - size-based ==0.1.2.0 + - sized-grid ==0.1.1.6 - skein ==1.0.9.4 - - skylighting ==0.7.3 - - skylighting-core ==0.7.3 - - slack-web ==0.2.0.6 - - slave-thread ==1.0.2 + - skews ==0.1.0.1 + - skip-var ==0.1.1.0 + - skylighting ==0.7.5 + - skylighting-core ==0.7.5 + - slack-web ==0.2.0.9 - smallcheck ==1.1.5 - smoothie ==0.4.2.9 - smtp-mail ==0.1.4.6 - snap-blaze ==0.2.1.5 - - snap-core ==1.0.3.2 - - snappy ==0.2.0.2 + - snap-core ==1.0.4.0 - snap-server ==1.1.0.0 - snowflake ==0.1.1.1 - soap ==0.2.3.6 - - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.4 - socket-activation ==0.1.0.2 - socks ==0.5.6 + - sop-core ==0.4.0.0 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - sourcemap ==0.1.6 - - sox ==0.2.3 - - soxlib ==0.0.3 - - sparkle ==0.7.4 + - sox ==0.2.3.1 + - soxlib ==0.0.3.1 - sparse-linear-algebra ==0.3.1 - special-values ==0.1.0.0 - speculate ==0.3.5 - - speculation ==1.5.0.3 - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 - Spintax ==0.3.3 @@ -1908,53 +1874,48 @@ default-package-overrides: - split ==0.2.3.3 - splitmix ==0.0.1 - 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 - - squeal-postgresql ==0.3.2.0 - srcloc ==0.5.1.2 - - stache ==1.2.1 + - stache ==2.0.1 + - stack2nix ==0.2.2 - starter ==0.3.0 - state-codes ==0.1.3 - stateref ==0.3 - statestack ==0.2.0.5 - StateVar ==1.1.1.1 - - static-canvas ==0.2.0.3 - - static-text ==0.2.0.2 - - statistics ==0.14.0.2 + - static-text ==0.2.0.4 + - statistics ==0.15.0.0 - stb-image-redux ==0.2.1.2 - step-function ==0.2 - - stm ==2.4.5.0 + - stm ==2.5.0.0 - stm-chans ==3.0.0.4 - - stm-conduit ==4.0.0 - - stm-containers ==0.2.16 + - stm-conduit ==4.0.1 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - STMonadTrans ==0.4.3 - - stm-split ==0.0.2 - - stm-stats ==0.2.0.0 + - stm-split ==0.0.2.1 - stopwatch ==0.1.0.5 - - storable-complex ==0.2.2 - - storable-endian ==0.2.6 + - storable-complex ==0.2.3.0 - 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 + - stratosphere ==0.29.1 + - streaming ==0.2.2.0 - streaming-attoparsec ==1.0.0 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.0 - streaming-wai ==0.1.1 - - streamly ==0.3.0 + - streamly ==0.5.2 - streamproc ==1.6.2 - 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 @@ -1963,79 +1924,86 @@ 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.8 - structs ==0.1.1 - - stylish-haskell ==0.9.2.0 - - summoner ==1.0.6 + - stylish-haskell ==0.9.2.1 + - summoner ==1.2.0 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 + - sv-cassava ==0.3 + - sv-core ==0.3.1 - svg-builder ==0.1.1 - - SVGFonts ==1.7 - - svg-tree ==0.6.2.2 + - SVGFonts ==1.7.0.1 + - svg-tree ==0.6.2.3 - swagger ==0.3.0 - - swagger2 ==2.2.2 - - swish ==0.9.2.1 + - swagger2 ==2.3.1.1 + - swish ==0.10.0.1 - syb ==0.7 - symbol ==0.2.4 - symengine ==0.1.2.0 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - - system-fileio ==0.3.16.3 + - systemd ==1.1.2 + - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - tabular ==0.2.2.7 - - tagchup ==0.4.1 - - tagged ==0.8.5 + - tagchup ==0.4.1.1 + - tagged ==0.8.6 - 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.5 + - tar-conduit ==0.3.2 - tardis ==0.4.1.0 - - tasty ==1.1.0.3 - - tasty-ant-xml ==1.1.4 - - tasty-dejafu ==1.2.0.7 + - tasty ==1.2 + - tasty-ant-xml ==1.1.5 + - tasty-dejafu ==1.2.1.0 - 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-leancheck ==0.0.1 - 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 - TCache ==0.12.1 - tce-conf ==1.3 - - tcp-streams ==1.0.1.0 + - tcp-streams ==1.0.1.1 - tcp-streams-openssl ==1.0.1.0 - tdigest ==0.2.1 - - teardown ==0.5.0.0 - telegram-bot-simple ==0.2.0 + - template-toolkit ==0.1.1.0 - temporary ==1.3 - temporary-rc ==1.2.0.3 + - temporary-resourcet ==0.1.0.1 - tensorflow-test ==0.1.0.0 + - tensors ==0.1.2 + - termbox ==0.1.0 - 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-leancheck ==0.0.1 + - 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.2 + - text ==1.2.3.1 - text-binary ==0.2.1.1 - - text-builder ==0.5.4.3 + - text-builder ==0.6.5 - text-conversions ==0.3.0 + - text-format ==0.3.2 - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 @@ -2044,36 +2012,32 @@ default-package-overrides: - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 - text-printer ==0.5 + - text-region ==0.3.1.0 - text-short ==0.1.2 - - text-show ==3.7.4 - - text-show-instances ==3.6.5 - - text-zipper ==0.10.1 - - tfp ==1.0.0.2 + - text-show ==3.7.5 + - tfp ==1.0.1.1 - tf-random ==0.5 - - th-abstraction ==0.2.8.0 + - th-abstraction ==0.2.10.0 - th-data-compat ==0.0.2.7 - - th-desugar ==1.8 - - these ==0.7.4 + - th-desugar ==1.9 + - these ==0.7.6 - th-expand-syns ==0.4.4.0 - th-extras ==0.0.0.4 - th-lift ==0.7.11 - th-lift-instances ==0.1.11 - - th-nowq ==0.1.0.2 - th-orphans ==0.13.6 - - th-printf ==0.5.1 - - thread-hierarchy ==0.3.0.0 + - th-printf ==0.6.0 + - thread-hierarchy ==0.3.0.1 - thread-local-storage ==0.2 - threads ==0.5.1.6 - - threads-extras ==0.1.0.2 - - threepenny-gui ==0.8.2.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 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - - th-utilities ==0.2.0.1 - - tibetan-utils ==0.1.1.5 + - th-utilities ==0.2.1.0 + - thyme ==0.3.5.5 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2082,20 +2046,24 @@ default-package-overrides: - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-parsers ==0.1.2.0 + - time-qq ==0.0.1.0 - timerep ==2.0.0.2 + - timer-wheel ==0.1.0 - timezone-olson ==0.1.9 - timezone-series ==0.1.9 - - tintin ==1.9.2 - tinylog ==0.14.1 - titlecase ==1.0.1 + - tldr ==0.4.0.1 - tls ==1.4.1 - tls-debug ==0.4.5 - tls-session-manager ==0.0.0.2 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==0.1.1.1 - - tomland ==0.3.1 + - token-bucket ==0.1.0.1 + - tomland ==0.5.0 - tostring ==0.2.1.1 + - TotalMap ==0.1.0.0 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 @@ -2103,71 +2071,72 @@ 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 + - triplesec ==0.2.2.0 - tsv2csv ==0.1.0.2 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.10 - - typed-process ==0.2.3.0 + - turtle ==1.5.13 + - typed-process ==0.2.4.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.5.0.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.1.0.4 + - typerep-map ==0.3.1 - 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 + - ua-parser ==0.7.5.1 + - ucam-webauth ==0.1.0.0 + - ucam-webauth-types ==0.1.0.0 - uglymemo ==0.1.0.1 - unbounded-delays ==0.1.1.0 - - unbound-generics ==0.3.3 + - unbound-generics ==0.4.0 - 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 - uniq-deep ==1.1.0.0 - unique ==0 - unit-constraint ==0.0.0 - - universe ==1.0 - universe-base ==1.0.2.1 - universe-instances-base ==1.0 - - universe-instances-extended ==1.0.0.1 - universe-instances-trans ==1.0.0.1 - universe-reverse-instances ==1.0 - - universum ==1.2.0 + - universum ==1.5.0 - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.1 - - unix-time ==0.3.8 - - unliftio ==0.2.7.1 + - unix-time ==0.4.5 + - unliftio ==0.2.10 - 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-bytestring-aeson ==0.1.0.7 - uri-encode ==1.5.0.5 - uri-templater ==0.3.1.0 - - urlpath ==9.0.0 + - url ==2.1.3 + - urlpath ==9.0.1 - users ==0.5.0.0 - users-postgresql-simple ==0.5.0.2 - users-test ==0.5.0.1 @@ -2178,9 +2147,9 @@ default-package-overrides: - uuid ==1.3.13 - uuid-types ==1.0.3 - validation ==1 - - validity ==0.7.0.0 + - validity ==0.9.0.0 - validity-aeson ==0.2.0.2 - - validity-bytestring ==0.3.0.2 + - validity-bytestring ==0.4.0.0 - validity-containers ==0.3.1.0 - validity-path ==0.3.0.2 - validity-scientific ==0.2.0.2 @@ -2192,44 +2161,41 @@ default-package-overrides: - valor ==0.1.0.0 - vault ==0.3.1.2 - vec ==0.1 - - vector ==0.12.0.1 - - vector-algorithms ==0.7.0.4 - - vector-binary-instances ==0.2.4 + - vector ==0.12.0.2 + - vector-algorithms ==0.8.0.1 + - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - vector-builder ==0.3.6 - vector-bytes-instances ==0.1.1 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-sized ==1.0.4.0 - - vector-space ==0.13 + - vector-sized ==1.2.0.0 + - vector-space ==0.15 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - - vectortiles ==1.4.0 - verbosity ==0.2.3.0 - - versions ==3.4.0.1 + - versions ==3.5.0 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.22 - - vinyl ==0.8.1.1 - - vivid ==0.3.0.2 - - vivid-osc ==0.3.0.0 - - vivid-supercollider ==0.3.0.0 + - vinyl ==0.10.0.1 + - vivid ==0.4.2.3 + - vivid-osc ==0.5.0.0 + - vivid-supercollider ==0.4.1.2 - void ==0.7.2 - - vty ==5.21 - - wai ==3.2.1.2 + - vty ==5.25.1 + - wai ==3.2.2 - wai-app-static ==3.1.6.2 - wai-cli ==0.1.1 - wai-conduit ==3.0.0.4 - wai-cors ==0.2.6 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.24.2 + - wai-extra ==3.0.25 - wai-handler-launch ==3.0.2.4 - - wai-logger ==2.3.2 + - wai-logger ==2.3.4 + - wai-middleware-auth ==0.1.2.1 - wai-middleware-caching ==0.1.0.2 - - wai-middleware-caching-lru ==0.1.0.0 - - wai-middleware-consul ==0.1.0.2 - wai-middleware-crowd ==0.1.4.2 - - wai-middleware-metrics ==0.2.4 - wai-middleware-static ==0.8.2 + - wai-middleware-throttle ==0.3.0.0 - wai-middleware-travisci ==0.1.0 - wai-predicates ==0.10.0 - wai-session ==0.3.3 @@ -2237,74 +2203,72 @@ 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.26 - warp-tls ==3.2.4.3 - warp-tls-uid ==0.2.0.5 - wave ==0.1.5 - wcwidth ==0.0.2 - - web3 ==0.7.3.0 + - web3 ==0.8.3.1 - webdriver ==0.8.5 - webex-teams-api ==0.2.0.0 - webex-teams-conduit ==0.2.0.0 - webex-teams-pipes ==0.2.0.0 - - web-plugins ==0.2.9 - web-routes ==0.27.14.2 - 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.3 - websockets-snap ==0.10.3.0 - - weigh ==0.0.12 - - wide-word ==0.1.0.6 + - weigh ==0.0.13 + - wide-word ==0.1.0.8 - 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 + - windns ==0.1.0.1 + - winery ==0.3.1 - wire-streams ==0.1.1.0 - - withdependencies ==0.2.4.2 - - witherable ==0.2 + - witherable ==0.3 - 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 - - wl-pprint-terminfo ==3.7.1.4 - wl-pprint-text ==1.2.0.0 - word24 ==2.0.1 - word8 ==0.1.3 - word-trie ==0.3.0 - - word-wrap ==0.4.1 - world-peace ==0.1.0.0 - wrap ==0.0.0 - - wreq ==0.5.2.1 - - wreq-stringless ==0.5.9.1 + - wreq ==0.5.3.1 + - writer-cps-exceptions ==0.1.0.0 - writer-cps-full ==0.1.0.0 - writer-cps-lens ==0.1.0.1 - writer-cps-morph ==0.1.0.2 - writer-cps-mtl ==0.1.1.5 - writer-cps-transformers ==0.1.1.4 - - ws ==0.0.4 - - wuss ==1.1.10 + - ws ==0.0.5 + - wuss ==1.1.12 - 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 + - xlsx-tabular ==0.2.2.1 - 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 @@ -2317,49 +2281,55 @@ default-package-overrides: - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.6 + - xmonad ==0.15 + - xmonad-contrib ==0.15 + - xmonad-extras ==0.15.1 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yaml ==0.8.32 + - yam ==0.5.11 + - yam-datasource ==0.5.11 + - yaml ==0.11.0.0 - 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-hashdb ==1.7.1 + - yesod-auth-oauth2 ==0.6.1.0 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.6 + - yesod-core ==1.6.11 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 - - yesod-form ==1.6.2 - - yesod-form-bootstrap4 ==1.0.2 + - yesod-form ==1.6.4 + - yesod-form-bootstrap4 ==2.1.0 - yesod-gitrepo ==0.3.0 - yesod-gitrev ==0.2.0.0 + - yesod-markdown ==0.12.6.0 - yesod-newsfeed ==1.6.1.0 - - yesod-paginator ==1.1.0.0 - - yesod-persistent ==1.6.0 - - yesod-recaptcha2 ==0.2.4 + - yesod-paginator ==1.1.0.1 + - yesod-persistent ==1.6.0.1 + - yesod-recaptcha2 ==0.3.0 - 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.6 - yesod-text-markdown ==0.1.10 - yesod-websockets ==0.3.0.1 - yes-precure5-command ==5.5.3 - - yi-language ==0.17.1 + - yi-language ==0.18.0 - 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 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - - zip ==1.1.0 - - zip-archive ==0.3.3 + - zip ==1.2.0 + - zip-archive ==0.4 - zippers ==0.2.5 - - zip-stream ==0.1.1 + - zip-stream ==0.2.0.1 - zlib ==0.6.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 @@ -2375,9 +2345,6 @@ 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 @@ -2395,22 +2362,19 @@ 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 - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hoogle == 5.0.14 # required by hie-hoogle - - hspec < 2.5 # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11 - - hspec-core < 2.5 # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11 - - hspec-discover < 2.5 # stylish-cabal-0.4.0.1: https://github.com/pikajude/stylish-cabal/issues/11 - html-conduit ^>= 1.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x - lens-labels == 0.1.* # required for proto-lens-descriptors - mainland-pretty == 0.6.2.* # required for tensorflow-opgen-0.1.0.0 + - megaparsec < 7.0 # required for idris <= 1.3.1: https://github.com/idris-lang/Idris-dev/pull/4610 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below @@ -2436,6 +2400,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: @@ -2470,7 +2435,6 @@ package-maintainers: - xmonad - xmonad-contrib gridaphobe: - - ghc-srcspan-plugin - located-base jb55: - bson-lens @@ -2548,6 +2512,7 @@ dont-distribute-packages: bindings-yices: [ i686-linux, x86_64-linux, x86_64-darwin ] boolector: [ i686-linux, x86_64-linux, x86_64-darwin ] ccelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] + cplex-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] cufft: [ i686-linux, x86_64-linux, x86_64-darwin ] cusolver: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2569,6 +2534,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 ] @@ -2614,13 +2580,13 @@ dont-distribute-packages: webkitgtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] webkitgtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] + XML: [ i686-linux, x86_64-linux, x86_64-darwin ] # soft restrictions because of build errors 3dmodels: [ i686-linux, x86_64-linux, x86_64-darwin ] 4Blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] a50: [ i686-linux, x86_64-linux, x86_64-darwin ] AAI: [ i686-linux, x86_64-linux, x86_64-darwin ] - abacate: [ i686-linux, x86_64-linux, x86_64-darwin ] abcBridge: [ i686-linux, x86_64-linux, x86_64-darwin ] abcnotation: [ i686-linux, x86_64-linux, x86_64-darwin ] abeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2643,11 +2609,13 @@ dont-distribute-packages: accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-llvm-native: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-random: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] access-token-provider: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2659,7 +2627,6 @@ dont-distribute-packages: acme-hq9plus: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-http: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-inator: [ i686-linux, x86_64-linux, x86_64-darwin ] - acme-io: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-kitchen-sink: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-left-pad: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-miscorder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2677,6 +2644,7 @@ dont-distribute-packages: ActionKid: [ i686-linux, x86_64-linux, x86_64-darwin ] activehs-base: [ i686-linux, x86_64-linux, x86_64-darwin ] activehs: [ i686-linux, x86_64-linux, x86_64-darwin ] + activitypub: [ i686-linux, x86_64-linux, x86_64-darwin ] activitystreams-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] actor: [ i686-linux, x86_64-linux, x86_64-darwin ] Adaptive-Blaisorblade: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2684,13 +2652,14 @@ dont-distribute-packages: adaptive-tuple: [ i686-linux, x86_64-linux, x86_64-darwin ] Adaptive: [ i686-linux, x86_64-linux, x86_64-darwin ] adb: [ i686-linux, x86_64-linux, x86_64-darwin ] - adblock2privoxy: [ i686-linux, x86_64-linux, x86_64-darwin ] adhoc-network: [ i686-linux, x86_64-linux, x86_64-darwin ] adict: [ i686-linux, x86_64-linux, x86_64-darwin ] adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] + ADPfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] ADPfusionForest: [ i686-linux, x86_64-linux, x86_64-darwin ] + ADPfusionSet: [ i686-linux, x86_64-linux, x86_64-darwin ] Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Basics: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-Net: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2699,13 +2668,16 @@ dont-distribute-packages: AERN-Real: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-RnToRm-Plot: [ i686-linux, x86_64-linux, x86_64-darwin ] AERN-RnToRm: [ i686-linux, x86_64-linux, x86_64-darwin ] + aern2-mp: [ i686-linux, x86_64-linux, x86_64-darwin ] + aern2-real: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] - aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-decode: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-diff-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-flowtyped: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-injector: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-native: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-options: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-prefix: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2714,24 +2686,26 @@ dont-distribute-packages: aeson-tiled: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-value-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] affection: [ i686-linux, x86_64-linux, x86_64-darwin ] affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] afv: [ i686-linux, x86_64-linux, x86_64-darwin ] ag-pictgen: [ i686-linux, x86_64-linux, x86_64-darwin ] Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] - Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ] agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ] agda-snippets-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] agda-snippets: [ i686-linux, x86_64-linux, x86_64-darwin ] agentx: [ i686-linux, x86_64-linux, x86_64-darwin ] AGI: [ i686-linux, x86_64-linux, x86_64-darwin ] AhoCorasick: [ i686-linux, x86_64-linux, x86_64-darwin ] + aig: [ i686-linux, x86_64-linux, x86_64-darwin ] aip: [ i686-linux, x86_64-linux, x86_64-darwin ] air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] airship: [ i686-linux, x86_64-linux, x86_64-darwin ] airtable-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-experiment-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-experiment-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] aivika-experiment-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2741,7 +2715,7 @@ dont-distribute-packages: alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] alga: [ i686-linux, x86_64-linux, x86_64-darwin ] algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] - algebraic-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] + algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2750,11 +2724,9 @@ dont-distribute-packages: AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] align-text: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] - Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] alphachar: [ i686-linux, x86_64-linux, x86_64-darwin ] - alpino-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2763,7 +2735,6 @@ dont-distribute-packages: altcomposition: [ i686-linux, x86_64-linux, x86_64-darwin ] alternative-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] alternative-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] alto: [ i686-linux, x86_64-linux, x86_64-darwin ] alure: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-emailer-client-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2774,7 +2745,6 @@ dont-distribute-packages: AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - amqp-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] analyze-client: [ i686-linux, x86_64-linux, x86_64-darwin ] analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2796,12 +2766,14 @@ dont-distribute-packages: Annotations: [ i686-linux, x86_64-linux, x86_64-darwin ] anonymous-sums-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] anonymous-sums: [ i686-linux, x86_64-linux, x86_64-darwin ] + ansi-terminal-game: [ i686-linux, x86_64-linux, x86_64-darwin ] ansigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] antagonist: [ i686-linux, x86_64-linux, x86_64-darwin ] antfarm: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -2809,6 +2781,7 @@ dont-distribute-packages: antiope-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] antiope-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] antisplice: [ i686-linux, x86_64-linux, x86_64-darwin ] + antlr-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] antlrc: [ i686-linux, x86_64-linux, x86_64-darwin ] anydbm: [ i686-linux, x86_64-linux, x86_64-darwin ] aosd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2842,10 +2815,15 @@ dont-distribute-packages: applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-quoters: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-splice: [ i686-linux, x86_64-linux, x86_64-darwin ] - approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] + arbor-lru-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + arbor-monad-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] + arbor-monad-metric-datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] + arbor-monad-metric: [ 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 ] @@ -2861,25 +2839,28 @@ dont-distribute-packages: ariadne: [ i686-linux, x86_64-linux, x86_64-darwin ] arion: [ i686-linux, x86_64-linux, x86_64-darwin ] arith-encode: [ i686-linux, x86_64-linux, x86_64-darwin ] + arithmoi: [ i686-linux, x86_64-linux, x86_64-darwin ] armada: [ i686-linux, x86_64-linux, x86_64-darwin ] armor: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + array-primops: [ 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 ] + arrow-list: [ i686-linux, x86_64-linux, x86_64-darwin ] arrowapply-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] arrowp-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] arrowp: [ i686-linux, x86_64-linux, x86_64-darwin ] ArrowVHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] artery: [ i686-linux, x86_64-linux, x86_64-darwin ] + artifact: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii-flatten: [ 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 ] @@ -2892,13 +2873,18 @@ 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 ] + async-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] + async-timer: [ i686-linux, x86_64-linux, x86_64-darwin ] asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] aterm: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-core: [ i686-linux, x86_64-linux, x86_64-darwin ] atmos-dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + atmos-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] + atmos: [ i686-linux, x86_64-linux, x86_64-darwin ] atndapi: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2907,21 +2893,20 @@ dont-distribute-packages: atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] ats-format: [ i686-linux, x86_64-linux, x86_64-darwin ] - ats-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] ats-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] ats-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] attic-schedule: [ i686-linux, x86_64-linux, x86_64-darwin ] - atto-lisp: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoBencode: [ i686-linux, x86_64-linux, x86_64-darwin ] AttoJson: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] @@ -2931,14 +2916,15 @@ 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 ] AutoForms: [ i686-linux, x86_64-linux, x86_64-darwin ] autom: [ i686-linux, x86_64-linux, x86_64-darwin ] + automata: [ i686-linux, x86_64-linux, x86_64-darwin ] autonix-deps-kf5: [ i686-linux, x86_64-linux, x86_64-darwin ] autonix-deps: [ i686-linux, x86_64-linux, x86_64-darwin ] - avahi: [ i686-linux, x86_64-linux, x86_64-darwin ] avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-api-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2954,7 +2940,6 @@ dont-distribute-packages: aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - aws-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2-knownhosts: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2977,7 +2962,7 @@ dont-distribute-packages: 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 ] @@ -3000,17 +2985,17 @@ dont-distribute-packages: barchart: [ i686-linux, x86_64-linux, x86_64-darwin ] barcodes-code128: [ i686-linux, x86_64-linux, x86_64-darwin ] barecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] - barley: [ i686-linux, x86_64-linux, x86_64-darwin ] Barracuda: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + base64-bytestring-type: [ 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 ] BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] baskell: [ i686-linux, x86_64-linux, x86_64-darwin ] batch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3024,19 +3009,23 @@ dont-distribute-packages: BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] bdcs-api: [ i686-linux, x86_64-linux, x86_64-darwin ] bdcs: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-newtype-field: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] Befunge93: [ i686-linux, x86_64-linux, x86_64-darwin ] bein: [ i686-linux, x86_64-linux, x86_64-darwin ] belka: [ i686-linux, x86_64-linux, x86_64-darwin ] bench-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + bench-show: [ i686-linux, x86_64-linux, x86_64-darwin ] BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ] - benchpress: [ i686-linux, x86_64-linux, x86_64-darwin ] - bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ] + bencodex: [ 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 ] BerlekampAlgorithm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3044,12 +3033,16 @@ dont-distribute-packages: besout: [ i686-linux, x86_64-linux, x86_64-darwin ] bet: [ i686-linux, x86_64-linux, x86_64-darwin ] betacode: [ i686-linux, x86_64-linux, x86_64-darwin ] + betris: [ i686-linux, x86_64-linux, x86_64-darwin ] bff: [ i686-linux, x86_64-linux, x86_64-darwin ] + bgmax: [ i686-linux, x86_64-linux, x86_64-darwin ] bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] + bhoogle: [ i686-linux, x86_64-linux, x86_64-darwin ] bibdb: [ i686-linux, x86_64-linux, x86_64-darwin ] bidirectionalization-combined: [ i686-linux, x86_64-linux, x86_64-darwin ] bidispec-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] bidispec: [ i686-linux, x86_64-linux, x86_64-darwin ] + bifunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] BiGUL: [ i686-linux, x86_64-linux, x86_64-darwin ] billboard-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3058,13 +3051,15 @@ dont-distribute-packages: billeksah-services: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-communicator: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-file: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-indexed-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - binary-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-protocol-zmq: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-strict: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-tagged: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] binding-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3073,7 +3068,6 @@ dont-distribute-packages: bindings-apr: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-bfd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-cctools: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-codec2: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-common: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-dc1394: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-eskit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3086,21 +3080,21 @@ dont-distribute-packages: bindings-hamlib: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libg15: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libv4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] - bindings-lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-monetdb-mapi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-mpdecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-portaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-wlc: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] binembed-example: [ i686-linux, x86_64-linux, x86_64-darwin ] binembed: [ i686-linux, x86_64-linux, x86_64-darwin ] + bins: [ i686-linux, x86_64-linux, x86_64-darwin ] bio-sequence: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] bioace: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3108,29 +3102,33 @@ dont-distribute-packages: Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseDotP: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseFasta: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseEnsembl: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseFR3D: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseHTTPTools: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseInfernal: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseNewick: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] - BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] biocore: [ i686-linux, x86_64-linux, x86_64-darwin ] biofasta: [ i686-linux, x86_64-linux, x86_64-darwin ] biofastq: [ i686-linux, x86_64-linux, x86_64-darwin ] biohazard: [ i686-linux, x86_64-linux, x86_64-darwin ] + BioHMM: [ i686-linux, x86_64-linux, x86_64-darwin ] bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biophd: [ i686-linux, x86_64-linux, x86_64-darwin ] biopsl: [ i686-linux, x86_64-linux, x86_64-darwin ] biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] biostockholm: [ i686-linux, x86_64-linux, x86_64-darwin ] + birch-beer: [ i686-linux, x86_64-linux, x86_64-darwin ] bird: [ i686-linux, x86_64-linux, x86_64-darwin ] BirdPP: [ i686-linux, x86_64-linux, x86_64-darwin ] bisect-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - bishbosh: [ i686-linux, x86_64-linux, x86_64-darwin ] bit-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + bit-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] bitcoin-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] bitcoin-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] bitly-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3143,12 +3141,15 @@ dont-distribute-packages: BitStringRandomMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] bitvec: [ i686-linux, x86_64-linux, x86_64-darwin ] + bizzlelude-js: [ i686-linux, x86_64-linux, x86_64-darwin ] bizzlelude: [ i686-linux, x86_64-linux, x86_64-darwin ] bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] bla: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] blakesum: [ i686-linux, x86_64-linux, x86_64-darwin ] + blank-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] blas-carray: [ i686-linux, x86_64-linux, x86_64-darwin ] + blas-comfort-array: [ i686-linux, x86_64-linux, x86_64-darwin ] blas-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] blas-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] blas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3173,6 +3174,8 @@ dont-distribute-packages: blogination: [ i686-linux, x86_64-linux, x86_64-darwin ] BlogLiterately-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] BlogLiterately: [ i686-linux, x86_64-linux, x86_64-darwin ] + bloodhound-amazonka-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] + bloodhound: [ i686-linux, x86_64-linux, x86_64-darwin ] bloomfilter-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] blosum: [ i686-linux, x86_64-linux, x86_64-darwin ] blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3180,11 +3183,10 @@ 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 ] bno055-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] bolt: [ i686-linux, x86_64-linux, x86_64-darwin ] boltzmann-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3194,13 +3196,15 @@ dont-distribute-packages: bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] - boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] boolexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] boombox: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] boring-window-switcher: [ i686-linux, x86_64-linux, x86_64-darwin ] + boring: [ i686-linux, x86_64-linux, x86_64-darwin ] bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + bound-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + bounded-array: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -3208,6 +3212,7 @@ dont-distribute-packages: breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] breve: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] + brick-dropdownmenu: [ 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 ] @@ -3215,6 +3220,11 @@ 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 ] + broadcast-chan: [ 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 ] @@ -3222,10 +3232,10 @@ dont-distribute-packages: bson-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - btree: [ i686-linux, x86_64-linux, x86_64-darwin ] buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] + BufferedSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] buffon: [ 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 ] @@ -3233,6 +3243,7 @@ dont-distribute-packages: buildbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] buildwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] + bulletproofs: [ i686-linux, x86_64-linux, x86_64-darwin ] bumper: [ i686-linux, x86_64-linux, x86_64-darwin ] bunz: [ i686-linux, x86_64-linux, x86_64-darwin ] burnt-explorer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3240,19 +3251,22 @@ dont-distribute-packages: bus-pirate: [ i686-linux, x86_64-linux, x86_64-darwin ] buster-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] - Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] buster: [ i686-linux, x86_64-linux, x86_64-darwin ] - bustle: [ i686-linux, x86_64-linux, x86_64-darwin ] + Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] + butcher: [ i686-linux, x86_64-linux, x86_64-darwin ] + butter: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] bv-sized: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-builder-varword: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] - bytestring-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-handle: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-plain: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-show: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-time: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3260,9 +3274,12 @@ dont-distribute-packages: bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + c0check: [ i686-linux, x86_64-linux, x86_64-darwin ] + c0parser: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -3279,11 +3296,9 @@ dont-distribute-packages: cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-macosx: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-mon: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-nirvana: [ i686-linux, x86_64-linux, x86_64-darwin ] - cabal-plan: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-progdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-query: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3305,11 +3320,16 @@ dont-distribute-packages: cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] cabin: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] + cachix-api: [ i686-linux, x86_64-linux, x86_64-darwin ] cachix: [ i686-linux, x86_64-linux, x86_64-darwin ] - cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + cairo-appbase: [ i686-linux, x86_64-linux, x86_64-darwin ] + cairo-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] + cake: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] + cal-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3323,19 +3343,27 @@ 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 ] canteven-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] + cantor-pairing: [ i686-linux, x86_64-linux, x86_64-darwin ] cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + capataz: [ 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 ] + carbonara: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] + CarneadesDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] + CarneadesIntoDung: [ i686-linux, x86_64-linux, x86_64-darwin ] carte: [ i686-linux, x86_64-linux, x86_64-darwin ] cartel: [ i686-linux, x86_64-linux, x86_64-darwin ] Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3349,23 +3377,14 @@ dont-distribute-packages: Cascade: [ i686-linux, x86_64-linux, x86_64-darwin ] cascading: [ i686-linux, x86_64-linux, x86_64-darwin ] cash: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook-meta-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook-reports-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook-reports-meta-html: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook-reports-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook-reports: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - casr-logbook: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-cql: [ i686-linux, x86_64-linux, x86_64-darwin ] - cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] cassava-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] Cassava: [ i686-linux, x86_64-linux, x86_64-darwin ] cassette: [ i686-linux, x86_64-linux, x86_64-darwin ] cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] castle: [ i686-linux, x86_64-linux, x86_64-darwin ] casui: [ i686-linux, x86_64-linux, x86_64-darwin ] + catamorphism: [ i686-linux, x86_64-linux, x86_64-darwin ] Catana: [ i686-linux, x86_64-linux, x86_64-darwin ] catch-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3373,9 +3392,8 @@ dont-distribute-packages: category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] category: [ i686-linux, x86_64-linux, x86_64-darwin ] catnplus: [ i686-linux, x86_64-linux, x86_64-darwin ] - cayene-lpp: [ i686-linux, x86_64-linux, x86_64-darwin ] + cautious-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ] CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-alt: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-cxe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3399,6 +3417,7 @@ dont-distribute-packages: cereal-ieee754: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + cereal-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] certificate: [ i686-linux, x86_64-linux, x86_64-darwin ] cf: [ i686-linux, x86_64-linux, x86_64-darwin ] cfipu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3406,29 +3425,35 @@ dont-distribute-packages: cfopu: [ i686-linux, x86_64-linux, x86_64-darwin ] cg: [ i686-linux, x86_64-linux, x86_64-darwin ] cgen: [ i686-linux, x86_64-linux, x86_64-darwin ] - cgi-undecidable: [ i686-linux, x86_64-linux, x86_64-darwin ] cgi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] cgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] + Chart-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-unit: [ i686-linux, x86_64-linux, x86_64-darwin ] + Chart: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] chatty-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + chatwork: [ i686-linux, x86_64-linux, x86_64-darwin ] cheapskate-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] - Checked: [ i686-linux, x86_64-linux, x86_64-darwin ] checked: [ i686-linux, x86_64-linux, x86_64-darwin ] + Checked: [ i686-linux, x86_64-linux, x86_64-darwin ] checkmate: [ i686-linux, x86_64-linux, x86_64-darwin ] chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] chell-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + chell: [ i686-linux, x86_64-linux, x86_64-darwin ] chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + chiasma: [ i686-linux, x86_64-linux, x86_64-darwin ] chitauri: [ i686-linux, x86_64-linux, x86_64-darwin ] Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ] + choose-exe: [ i686-linux, x86_64-linux, x86_64-darwin ] + choose: [ i686-linux, x86_64-linux, x86_64-darwin ] chorale-geo: [ i686-linux, x86_64-linux, x86_64-darwin ] chorale: [ i686-linux, x86_64-linux, x86_64-darwin ] chp-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3437,13 +3462,12 @@ dont-distribute-packages: chp-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] chp: [ i686-linux, x86_64-linux, x86_64-darwin ] chr-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - chr-data: [ i686-linux, x86_64-linux, x86_64-darwin ] chr-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] chr-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] ChristmasTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + chromatin: [ i686-linux, x86_64-linux, x86_64-darwin ] chronograph: [ i686-linux, x86_64-linux, x86_64-darwin ] chu2: [ i686-linux, x86_64-linux, x86_64-darwin ] - chuchu: [ i686-linux, x86_64-linux, x86_64-darwin ] chunks: [ i686-linux, x86_64-linux, x86_64-darwin ] chunky: [ i686-linux, x86_64-linux, x86_64-darwin ] cielo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3460,6 +3484,7 @@ dont-distribute-packages: clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + clang-compilation-database: [ i686-linux, x86_64-linux, x86_64-darwin ] clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3467,18 +3492,19 @@ dont-distribute-packages: clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-multisignal: [ i686-linux, x86_64-linux, x86_64-darwin ] - clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] Clash-Royale-Hack-Cheats: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] classy-prelude-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + clay: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3498,16 +3524,14 @@ dont-distribute-packages: cli-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] CLI: [ i686-linux, x86_64-linux, x86_64-darwin ] cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - click-clack: [ i686-linux, x86_64-linux, x86_64-darwin ] clif: [ i686-linux, x86_64-linux, x86_64-darwin ] clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] + clifm: [ i686-linux, x86_64-linux, x86_64-darwin ] clingo: [ i686-linux, x86_64-linux, x86_64-darwin ] clippard: [ i686-linux, x86_64-linux, x86_64-darwin ] clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] clippings: [ i686-linux, x86_64-linux, x86_64-darwin ] - clist: [ i686-linux, x86_64-linux, x86_64-darwin ] clit: [ i686-linux, x86_64-linux, x86_64-darwin ] - cloben: [ i686-linux, x86_64-linux, x86_64-darwin ] clocked: [ i686-linux, x86_64-linux, x86_64-darwin ] clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] clone-all: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3515,11 +3539,10 @@ dont-distribute-packages: cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] cloud-seeder: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] - cloudi: [ i686-linux, x86_64-linux, x86_64-darwin ] - cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ] clr-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] clua: [ i686-linux, x86_64-linux, x86_64-darwin ] cluss: [ i686-linux, x86_64-linux, x86_64-darwin ] + ClustalParser: [ i686-linux, x86_64-linux, x86_64-darwin ] clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] clustertools: [ i686-linux, x86_64-linux, x86_64-darwin ] clutterhs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3529,22 +3552,25 @@ dont-distribute-packages: CMCompare: [ i686-linux, x86_64-linux, x86_64-darwin ] cmd-item: [ i686-linux, x86_64-linux, x86_64-darwin ] cmdargs-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmdlib: [ i686-linux, x86_64-linux, x86_64-darwin ] cmdtheline: [ i686-linux, x86_64-linux, x86_64-darwin ] cmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] cmph: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ] + code-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-beam: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] codemonitor: [ i686-linux, x86_64-linux, x86_64-darwin ] codepad: [ i686-linux, x86_64-linux, x86_64-darwin ] + codeworld-api: [ i686-linux, x86_64-linux, x86_64-darwin ] codex: [ i686-linux, x86_64-linux, x86_64-darwin ] - cognimeta-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] coin: [ i686-linux, x86_64-linux, x86_64-darwin ] coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] coincident-root-loci: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3552,8 +3578,8 @@ dont-distribute-packages: colchis: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + collapse-duplication: [ i686-linux, x86_64-linux, x86_64-darwin ] collapse-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - collection-json: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] collections: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3561,6 +3587,7 @@ dont-distribute-packages: colorless-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] colorless-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] colorless: [ i686-linux, x86_64-linux, x86_64-darwin ] + colour-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] columbia: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3579,9 +3606,7 @@ dont-distribute-packages: commodities: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - commutative: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] ComonadSheet: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-mutable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3589,13 +3614,13 @@ dont-distribute-packages: compact-string-fix: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] Compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] - compdata-automata: [ i686-linux, x86_64-linux, x86_64-darwin ] + compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-dags: [ i686-linux, x86_64-linux, x86_64-darwin ] - compdata-param: [ i686-linux, x86_64-linux, x86_64-darwin ] - compdata: [ i686-linux, x86_64-linux, x86_64-darwin ] competition: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] + componentm-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] + componentm: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] composite-aeson-refined: [ i686-linux, x86_64-linux, x86_64-darwin ] composite-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3604,7 +3629,8 @@ dont-distribute-packages: composite-opaleye: [ i686-linux, x86_64-linux, x86_64-darwin ] composite-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] - compression: [ i686-linux, x86_64-linux, x86_64-darwin ] + compound-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + compressed: [ i686-linux, x86_64-linux, x86_64-darwin ] compstrat: [ i686-linux, x86_64-linux, x86_64-darwin ] comptrans: [ i686-linux, x86_64-linux, x86_64-darwin ] computational-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3614,11 +3640,14 @@ dont-distribute-packages: concraft: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-haskell-autogen: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + concrete-relaxng-parser: [ 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 ] + concurrent-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + concurrent-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] Concurrential: [ i686-linux, x86_64-linux, x86_64-darwin ] ConcurrentUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3627,6 +3656,7 @@ dont-distribute-packages: conductive-base: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] conductive-song: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-find: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3641,11 +3671,11 @@ dont-distribute-packages: confide: [ i686-linux, x86_64-linux, x86_64-darwin ] config-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] - config-value-getopt: [ i686-linux, x86_64-linux, x86_64-darwin ] ConfigFileTH: [ i686-linux, x86_64-linux, x86_64-darwin ] Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] configifier: [ i686-linux, x86_64-linux, x86_64-darwin ] Configurable: [ i686-linux, x86_64-linux, x86_64-darwin ] + configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] configurator-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] congruence-relation: [ i686-linux, x86_64-linux, x86_64-darwin ] conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3656,7 +3686,7 @@ dont-distribute-packages: consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] console-program: [ i686-linux, x86_64-linux, x86_64-darwin ] const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] - constrained-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] + constrained-category: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-monads: [ i686-linux, x86_64-linux, x86_64-darwin ] constraint-manip: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3664,24 +3694,26 @@ dont-distribute-packages: constraint: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] constraints-emerge: [ i686-linux, x86_64-linux, x86_64-darwin ] + constraints-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + constructible: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Consumer: [ i686-linux, x86_64-linux, x86_64-darwin ] consumers: [ i686-linux, x86_64-linux, x86_64-darwin ] containers-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] - containers-verified: [ i686-linux, x86_64-linux, x86_64-darwin ] + containers-unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] ContArrow: [ i686-linux, x86_64-linux, x86_64-darwin ] content-store: [ i686-linux, x86_64-linux, x86_64-darwin ] context-free-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] 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: [ i686-linux, x86_64-linux, x86_64-darwin ] + contiguous-fft: [ 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 ] continuum: [ i686-linux, x86_64-linux, x86_64-darwin ] Contract: [ i686-linux, x86_64-linux, x86_64-darwin ] control-event: [ i686-linux, x86_64-linux, x86_64-darwin ] + control-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-attempt: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-exception-monadsfd: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-exception-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3722,16 +3754,18 @@ dont-distribute-packages: couchdb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] CouchDB: [ i686-linux, x86_64-linux, x86_64-darwin ] countable-inflections: [ i686-linux, x86_64-linux, x86_64-darwin ] + counter: [ i686-linux, x86_64-linux, x86_64-darwin ] courier: [ i686-linux, x86_64-linux, x86_64-darwin ] court: [ i686-linux, x86_64-linux, x86_64-darwin ] coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] cparsing: [ i686-linux, x86_64-linux, x86_64-darwin ] CPBrainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] cpio-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - cplex-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-tinylog: [ 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 ] @@ -3751,10 +3785,9 @@ dont-distribute-packages: craze: [ i686-linux, x86_64-linux, x86_64-darwin ] crc16: [ i686-linux, x86_64-linux, x86_64-darwin ] crc: [ i686-linux, x86_64-linux, x86_64-darwin ] + crdt: [ i686-linux, x86_64-linux, x86_64-darwin ] creatur: [ i686-linux, x86_64-linux, x86_64-darwin ] credential-store: [ i686-linux, x86_64-linux, x86_64-darwin ] - credentials-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] - credentials: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain1-constrained: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain1: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain2-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3767,11 +3800,13 @@ dont-distribute-packages: crjdt-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] crocodile: [ i686-linux, x86_64-linux, x86_64-darwin ] cron-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] + cron: [ i686-linux, x86_64-linux, x86_64-darwin ] cruncher-types: [ i686-linux, x86_64-linux, x86_64-darwin ] crunghc: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-cipher-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-classical: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptocompare: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3781,7 +3816,9 @@ dont-distribute-packages: crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] csg: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] + CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3789,31 +3826,33 @@ dont-distribute-packages: cspretty: [ i686-linux, x86_64-linux, x86_64-darwin ] css: [ i686-linux, x86_64-linux, x86_64-darwin ] csv-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + csv-nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + curl-runnings: [ i686-linux, x86_64-linux, x86_64-darwin ] currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] CV: [ i686-linux, x86_64-linux, x86_64-darwin ] + cyclotomic: [ i686-linux, x86_64-linux, x86_64-darwin ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] d-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] - danibot: [ i686-linux, x86_64-linux, x86_64-darwin ] - Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] dapi: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] darcs-beta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3831,11 +3870,12 @@ dont-distribute-packages: darkplaces-rcon: [ i686-linux, x86_64-linux, x86_64-darwin ] darkplaces-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dash-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - data-accessor-monadLib: [ i686-linux, x86_64-linux, x86_64-darwin ] data-accessor-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] data-accessor-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] data-base: [ i686-linux, x86_64-linux, x86_64-darwin ] data-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-category: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-check: [ i686-linux, x86_64-linux, x86_64-darwin ] data-concurrent-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] data-construction: [ i686-linux, x86_64-linux, x86_64-darwin ] data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3848,12 +3888,14 @@ dont-distribute-packages: data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] data-flagset: [ i686-linux, x86_64-linux, x86_64-darwin ] data-forest: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] data-kiln: [ i686-linux, x86_64-linux, x86_64-darwin ] data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] data-map-multikey: [ i686-linux, x86_64-linux, x86_64-darwin ] data-named: [ i686-linux, x86_64-linux, x86_64-darwin ] data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3863,6 +3905,7 @@ dont-distribute-packages: data-pprint: [ i686-linux, x86_64-linux, x86_64-darwin ] data-quotientref: [ i686-linux, x86_64-linux, x86_64-darwin ] data-r-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-reify-cse: [ i686-linux, x86_64-linux, x86_64-darwin ] data-repr: [ i686-linux, x86_64-linux, x86_64-darwin ] data-result: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rev: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3871,10 +3914,12 @@ dont-distribute-packages: data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-size: [ i686-linux, x86_64-linux, x86_64-darwin ] data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-standards: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] data-stringmap: [ i686-linux, x86_64-linux, x86_64-darwin ] data-structure-inferrer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-util: [ i686-linux, x86_64-linux, x86_64-darwin ] data-variant: [ i686-linux, x86_64-linux, x86_64-darwin ] database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3887,7 +3932,10 @@ dont-distribute-packages: datetime-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] datetime: [ i686-linux, x86_64-linux, x86_64-darwin ] dawdle: [ i686-linux, x86_64-linux, x86_64-darwin ] + dawg-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] + dawg: [ 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 ] @@ -3926,31 +3974,29 @@ dont-distribute-packages: debian: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-trace-var: [ i686-linux, x86_64-linux, x86_64-darwin ] - debug: [ i686-linux, x86_64-linux, x86_64-darwin ] + debug-tracy: [ i686-linux, x86_64-linux, x86_64-darwin ] + debug: [ i686-linux, x86_64-linux, x86_64-darwin ] decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ] decimal-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] decimal-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] + DecisionTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + declarative: [ i686-linux, x86_64-linux, x86_64-darwin ] decoder-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dedukti: [ i686-linux, x86_64-linux, x86_64-darwin ] - DeepArrow: [ i686-linux, x86_64-linux, x86_64-darwin ] deepcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] deeplearning-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] deepseq-bounded: [ i686-linux, x86_64-linux, x86_64-darwin ] + deepseq-magic: [ i686-linux, x86_64-linux, x86_64-darwin ] deepseq-th: [ i686-linux, x86_64-linux, x86_64-darwin ] deepzoom: [ i686-linux, x86_64-linux, x86_64-darwin ] defargs: [ i686-linux, x86_64-linux, x86_64-darwin ] DefendTheKing: [ i686-linux, x86_64-linux, x86_64-darwin ] - deferred-folds: [ i686-linux, x86_64-linux, x86_64-darwin ] - definitive-base: [ i686-linux, x86_64-linux, x86_64-darwin ] - definitive-filesystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - definitive-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] - definitive-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - definitive-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] - definitive-sound: [ i686-linux, x86_64-linux, x86_64-darwin ] deka-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] deka: [ i686-linux, x86_64-linux, x86_64-darwin ] delaunay: [ i686-linux, x86_64-linux, x86_64-darwin ] + delay: [ i686-linux, x86_64-linux, x86_64-darwin ] delicious: [ i686-linux, x86_64-linux, x86_64-darwin ] + delimited-text: [ i686-linux, x86_64-linux, x86_64-darwin ] delimiter-separated: [ i686-linux, x86_64-linux, x86_64-darwin ] delta-h: [ i686-linux, x86_64-linux, x86_64-darwin ] Delta-Lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3958,11 +4004,15 @@ 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 ] depends: [ i686-linux, x86_64-linux, x86_64-darwin ] dephd: [ i686-linux, x86_64-linux, x86_64-darwin ] + deptrack-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + deptrack-devops: [ i686-linux, x86_64-linux, x86_64-darwin ] + deptrack-dot: [ i686-linux, x86_64-linux, x86_64-darwin ] derangement: [ i686-linux, x86_64-linux, x86_64-darwin ] derivation-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-enumerable: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3971,19 +4021,22 @@ dont-distribute-packages: derive-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive: [ i686-linux, x86_64-linux, x86_64-darwin ] derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] descript-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] - DescriptiveKeys: [ i686-linux, x86_64-linux, x86_64-darwin ] deterministic-game-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] detour-via-uom: [ i686-linux, x86_64-linux, x86_64-darwin ] deunicode: [ i686-linux, x86_64-linux, x86_64-darwin ] devil: [ i686-linux, x86_64-linux, x86_64-darwin ] dewdrop: [ i686-linux, x86_64-linux, x86_64-darwin ] + df1: [ i686-linux, x86_64-linux, x86_64-darwin ] + dfinity-radix-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] Dflow: [ i686-linux, x86_64-linux, x86_64-darwin ] dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-nix: [ 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 ] @@ -3992,34 +4045,45 @@ dont-distribute-packages: dia-base: [ i686-linux, x86_64-linux, x86_64-darwin ] dia-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-braille: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-html5: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] - diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-postscript: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] dib: [ i686-linux, x86_64-linux, x86_64-darwin ] dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] dice2tex: [ i686-linux, x86_64-linux, x86_64-darwin ] dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] dictionaries: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - diet: [ i686-linux, x86_64-linux, x86_64-darwin ] + diet: [ i686-linux, x86_64-linux, x86_64-darwin ] diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] difference-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] + differential: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] digitalocean-kzs: [ i686-linux, x86_64-linux, x86_64-darwin ] DigitalOcean: [ i686-linux, x86_64-linux, x86_64-darwin ] dimensional-codata: [ i686-linux, x86_64-linux, x86_64-darwin ] dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] DimensionalHash: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-core: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-example: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4036,6 +4100,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 ] @@ -4046,31 +4111,40 @@ dont-distribute-packages: disjoint-set-stateful: [ i686-linux, x86_64-linux, x86_64-darwin ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] diskhash: [ i686-linux, x86_64-linux, x86_64-darwin ] + disposable: [ i686-linux, x86_64-linux, x86_64-darwin ] dist-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] distance: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-closure: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-fork-aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-execution: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-fsm: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-p2p: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-simplelocalnet: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-systest: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-static: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] diversity: [ i686-linux, x86_64-linux, x86_64-darwin ] dixi: [ i686-linux, x86_64-linux, x86_64-darwin ] djembe: [ i686-linux, x86_64-linux, x86_64-darwin ] djinn-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - djinn: [ i686-linux, x86_64-linux, x86_64-darwin ] - dmcc: [ i686-linux, x86_64-linux, x86_64-darwin ] dmenu-pkill: [ i686-linux, x86_64-linux, x86_64-darwin ] dmenu-pmount: [ i686-linux, x86_64-linux, x86_64-darwin ] dmenu-search: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4083,11 +4157,20 @@ 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 ] + docker: [ i686-linux, x86_64-linux, x86_64-darwin ] + dockercook: [ 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-prop: [ i686-linux, x86_64-linux, x86_64-darwin ] DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] + docusign-base-minimal: [ 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-lt: [ i686-linux, x86_64-linux, x86_64-darwin ] DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] domain-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4110,12 +4193,17 @@ dont-distribute-packages: dph-prim-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] dpkg: [ i686-linux, x86_64-linux, x86_64-darwin ] DPM: [ i686-linux, x86_64-linux, x86_64-darwin ] + dpor: [ i686-linux, x86_64-linux, x86_64-darwin ] + dragen: [ i686-linux, x86_64-linux, x86_64-darwin ] + drawille: [ i686-linux, x86_64-linux, x86_64-darwin ] drClickOn: [ i686-linux, x86_64-linux, x86_64-darwin ] dresdner-verkehrsbetriebe: [ i686-linux, x86_64-linux, x86_64-darwin ] DrHylo: [ i686-linux, x86_64-linux, x86_64-darwin ] DrIFT-cabalized: [ i686-linux, x86_64-linux, x86_64-darwin ] DrIFT: [ i686-linux, x86_64-linux, x86_64-darwin ] drifter-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + drifter-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + drifter: [ i686-linux, x86_64-linux, x86_64-darwin ] drmaa: [ i686-linux, x86_64-linux, x86_64-darwin ] dropbox-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] dropsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4129,16 +4217,16 @@ dont-distribute-packages: dson: [ i686-linux, x86_64-linux, x86_64-darwin ] DSTM: [ i686-linux, x86_64-linux, x86_64-darwin ] dstring: [ i686-linux, x86_64-linux, x86_64-darwin ] + dtab: [ i686-linux, x86_64-linux, x86_64-darwin ] DTC: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] + dual-game: [ i686-linux, x86_64-linux, x86_64-darwin ] dual: [ i686-linux, x86_64-linux, x86_64-darwin ] dublincore-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - duckling: [ i686-linux, x86_64-linux, x86_64-darwin ] dumb-cas: [ i686-linux, x86_64-linux, x86_64-darwin ] - dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dung: [ i686-linux, x86_64-linux, x86_64-darwin ] duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4162,17 +4250,17 @@ dont-distribute-packages: DysFRP: [ i686-linux, x86_64-linux, x86_64-darwin ] dywapitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] dzen-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - eager-sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] earclipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + Earley: [ i686-linux, x86_64-linux, x86_64-darwin ] + ease: [ i686-linux, x86_64-linux, x86_64-darwin ] easy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] easyjson: [ i686-linux, x86_64-linux, x86_64-darwin ] easyplot: [ i686-linux, x86_64-linux, x86_64-darwin ] - easyrender: [ i686-linux, x86_64-linux, x86_64-darwin ] + easytensor-vulkan: [ i686-linux, x86_64-linux, x86_64-darwin ] + easytensor: [ i686-linux, x86_64-linux, x86_64-darwin ] ebeats: [ i686-linux, x86_64-linux, x86_64-darwin ] ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ] - ec2-unikernel: [ i686-linux, x86_64-linux, x86_64-darwin ] eccrypto: [ i686-linux, x86_64-linux, x86_64-darwin ] - ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] eddie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4182,23 +4270,24 @@ dont-distribute-packages: edge: [ i686-linux, x86_64-linux, x86_64-darwin ] edges: [ i686-linux, x86_64-linux, x86_64-darwin ] edit-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] + edit: [ i686-linux, x86_64-linux, x86_64-darwin ] editable: [ i686-linux, x86_64-linux, x86_64-darwin ] editline: [ i686-linux, x86_64-linux, x86_64-darwin ] EditTimeReport: [ i686-linux, x86_64-linux, x86_64-darwin ] effect-handlers: [ i686-linux, x86_64-linux, x86_64-darwin ] - effect-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - effective-aspects-mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] - effective-aspects: [ i686-linux, x86_64-linux, x86_64-darwin ] effects-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + ekg-bosun: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-elastic: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-influxdb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4209,9 +4298,9 @@ dont-distribute-packages: elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] elm-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] - elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] elsa: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] + email-header: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -4219,22 +4308,23 @@ dont-distribute-packages: embeddock-example: [ i686-linux, x86_64-linux, x86_64-darwin ] embeddock: [ i686-linux, x86_64-linux, x86_64-darwin ] embroidery: [ i686-linux, x86_64-linux, x86_64-darwin ] + emd: [ i686-linux, x86_64-linux, x86_64-darwin ] emgm: [ i686-linux, x86_64-linux, x86_64-darwin ] Emping: [ i686-linux, x86_64-linux, x86_64-darwin ] empty-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] Empty: [ i686-linux, x86_64-linux, x86_64-darwin ] - enchant: [ i686-linux, x86_64-linux, x86_64-darwin ] encoding-io: [ i686-linux, x86_64-linux, x86_64-darwin ] encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-growler: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] + enumerate: [ i686-linux, x86_64-linux, x86_64-darwin ] enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerator-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerator-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4243,7 +4333,9 @@ dont-distribute-packages: EnumMap: [ i686-linux, x86_64-linux, x86_64-darwin ] enummapmap: [ i686-linux, x86_64-linux, x86_64-darwin ] enummapset-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + enummapset: [ 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 ] @@ -4252,6 +4344,8 @@ dont-distribute-packages: epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] EqualitySolver: [ i686-linux, x86_64-linux, x86_64-darwin ] + equeue: [ i686-linux, x86_64-linux, x86_64-darwin ] + equivalence: [ i686-linux, x86_64-linux, x86_64-darwin ] erd: [ i686-linux, x86_64-linux, x86_64-darwin ] erf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4262,6 +4356,7 @@ dont-distribute-packages: error-list: [ i686-linux, x86_64-linux, x86_64-darwin ] error-loc: [ i686-linux, x86_64-linux, x86_64-darwin ] error-message: [ i686-linux, x86_64-linux, x86_64-darwin ] + errors-ext: [ i686-linux, x86_64-linux, x86_64-darwin ] ersaconcat: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4271,6 +4366,7 @@ dont-distribute-packages: esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ] EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] espial: [ i686-linux, x86_64-linux, x86_64-darwin ] + esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ] ess: [ i686-linux, x86_64-linux, x86_64-darwin ] estimators: [ i686-linux, x86_64-linux, x86_64-darwin ] EstProgress: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4278,12 +4374,10 @@ dont-distribute-packages: Etage-Graph: [ i686-linux, x86_64-linux, x86_64-darwin ] Etage: [ i686-linux, x86_64-linux, x86_64-darwin ] EtaMOO: [ i686-linux, x86_64-linux, x86_64-darwin ] - etcd: [ i686-linux, x86_64-linux, x86_64-darwin ] Eternal10Seconds: [ i686-linux, x86_64-linux, x86_64-darwin ] eternal: [ i686-linux, x86_64-linux, x86_64-darwin ] eternity-timestamped: [ i686-linux, x86_64-linux, x86_64-darwin ] eternity: [ i686-linux, x86_64-linux, x86_64-darwin ] - ether: [ i686-linux, x86_64-linux, x86_64-darwin ] Etherbunny: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-analyzer-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] ethereum-analyzer-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4299,6 +4393,7 @@ dont-distribute-packages: eve: [ i686-linux, x86_64-linux, x86_64-darwin ] event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + event: [ i686-linux, x86_64-linux, x86_64-darwin ] eventful-dynamodb: [ i686-linux, x86_64-linux, x86_64-darwin ] eventful-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] eventloop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4308,8 +4403,11 @@ dont-distribute-packages: every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-cover: [ i686-linux, x86_64-linux, x86_64-darwin ] + exact-pi: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-real-positional: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] + except-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + exception-hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] exchangerates: [ i686-linux, x86_64-linux, x86_64-darwin ] execs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4317,8 +4415,6 @@ dont-distribute-packages: exference: [ 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-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4335,17 +4431,20 @@ 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 ] Facts: [ i686-linux, x86_64-linux, x86_64-darwin ] factual-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fadno-braids: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4356,16 +4455,16 @@ dont-distribute-packages: FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] fake-type: [ i686-linux, x86_64-linux, x86_64-darwin ] fake: [ i686-linux, x86_64-linux, x86_64-darwin ] + faktory: [ i686-linux, x86_64-linux, x86_64-darwin ] falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - fast-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-combinatorics: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-downward: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-nats: [ i686-linux, x86_64-linux, x86_64-darwin ] fasta: [ i686-linux, x86_64-linux, x86_64-darwin ] fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] - fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] fastedit: [ i686-linux, x86_64-linux, x86_64-darwin ] fastirc: [ i686-linux, x86_64-linux, x86_64-darwin ] fastly: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4384,6 +4483,7 @@ dont-distribute-packages: fay-simplejson: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-text: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] fay: [ i686-linux, x86_64-linux, x86_64-darwin ] fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4414,9 +4514,8 @@ dont-distribute-packages: festung: [ i686-linux, x86_64-linux, x86_64-darwin ] Feval: [ i686-linux, x86_64-linux, x86_64-darwin ] ffeed: [ i686-linux, x86_64-linux, x86_64-darwin ] - fficxx: [ i686-linux, x86_64-linux, x86_64-darwin ] + ffmpeg-light: [ i686-linux, x86_64-linux, x86_64-darwin ] ffmpeg-tutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] - fftwRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] fgl-extras-decompositions: [ i686-linux, x86_64-linux, x86_64-darwin ] fibon: [ i686-linux, x86_64-linux, x86_64-darwin ] ficketed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4432,15 +4531,20 @@ dont-distribute-packages: FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] fileneglect: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + FilePather: [ i686-linux, x86_64-linux, x86_64-darwin ] + filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] Files: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] fillit: [ i686-linux, x86_64-linux, x86_64-darwin ] + filter-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] + fin: [ i686-linux, x86_64-linux, x86_64-darwin ] final-pretty-printer: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] + find-clumpiness: [ i686-linux, x86_64-linux, x86_64-darwin ] find-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] find-source-files: [ i686-linux, x86_64-linux, x86_64-darwin ] fingertree-psqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4450,7 +4554,6 @@ dont-distribute-packages: first-and-last: [ i686-linux, x86_64-linux, x86_64-darwin ] firstify: [ i686-linux, x86_64-linux, x86_64-darwin ] FirstOrderTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] - fishfood: [ i686-linux, x86_64-linux, x86_64-darwin ] fit: [ i686-linux, x86_64-linux, x86_64-darwin ] fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4460,6 +4563,9 @@ dont-distribute-packages: fixed-point: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-vector-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-vector-cborg: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-vector-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-width: [ i686-linux, x86_64-linux, x86_64-darwin ] fixer: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4472,13 +4578,10 @@ dont-distribute-packages: flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] flamingra: [ i686-linux, x86_64-linux, x86_64-darwin ] flat-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] - flat: [ i686-linux, x86_64-linux, x86_64-darwin ] flexible-time: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap-smallcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] flickr: [ i686-linux, x86_64-linux, x86_64-darwin ] - flight-igc: [ i686-linux, x86_64-linux, x86_64-darwin ] - flight-kml: [ i686-linux, x86_64-linux, x86_64-darwin ] Flippi: [ i686-linux, x86_64-linux, x86_64-darwin ] flite: [ i686-linux, x86_64-linux, x86_64-darwin ] float-binstring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4491,20 +4594,20 @@ 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 ] - fluent-logger-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + fltkhs-fluid-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] fluent-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] + fluffy-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] flux-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] fmark: [ i686-linux, x86_64-linux, x86_64-darwin ] FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + focuslist: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] - foldl-transduce-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] @@ -4527,29 +4630,31 @@ dont-distribute-packages: formlets-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] formlets: [ i686-linux, x86_64-linux, x86_64-darwin ] formura: [ i686-linux, x86_64-linux, x86_64-darwin ] + forsyde-deep: [ i686-linux, x86_64-linux, x86_64-darwin ] ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] Fortnite-Hack-Cheats-Free-V-Bucks-Generator: [ i686-linux, x86_64-linux, x86_64-darwin ] + fortran-src: [ i686-linux, x86_64-linux, x86_64-darwin ] fortytwo: [ i686-linux, x86_64-linux, x86_64-darwin ] foscam-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] foscam-filename: [ i686-linux, x86_64-linux, x86_64-darwin ] foscam-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - FpMLv53: [ i686-linux, x86_64-linux, x86_64-darwin ] fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] FPretty: [ i686-linux, x86_64-linux, x86_64-darwin ] fptest: [ i686-linux, x86_64-linux, x86_64-darwin ] - fquery: [ i686-linux, x86_64-linux, x86_64-darwin ] 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: [ 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 ] franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-algebras: [ i686-linux, x86_64-linux, x86_64-darwin ] + fraxl: [ i686-linux, x86_64-linux, x86_64-darwin ] + freddy: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-category: [ i686-linux, x86_64-linux, x86_64-darwin ] free-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] - free-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] free-http: [ i686-linux, x86_64-linux, x86_64-darwin ] free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4558,11 +4663,18 @@ 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 ] freer-converse: [ i686-linux, x86_64-linux, x86_64-darwin ] freer-effects: [ i686-linux, x86_64-linux, x86_64-darwin ] + freer-simple-catching: [ i686-linux, x86_64-linux, x86_64-darwin ] + freer-simple-http: [ i686-linux, x86_64-linux, x86_64-darwin ] + freer-simple-profiling: [ i686-linux, x86_64-linux, x86_64-darwin ] + freer-simple-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + freer-simple-time: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4570,8 +4682,12 @@ dont-distribute-packages: freq: [ i686-linux, x86_64-linux, x86_64-darwin ] fresh: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] + friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] + friday: [ i686-linux, x86_64-linux, x86_64-darwin ] + friendly: [ i686-linux, x86_64-linux, x86_64-darwin ] frown: [ i686-linux, x86_64-linux, x86_64-darwin ] + frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] frpnow-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4582,7 +4698,6 @@ dont-distribute-packages: fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] fswait: [ i686-linux, x86_64-linux, x86_64-darwin ] - fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] FTGL-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] ftp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4590,6 +4705,7 @@ dont-distribute-packages: ftree: [ i686-linux, x86_64-linux, x86_64-darwin ] ftshell: [ i686-linux, x86_64-linux, x86_64-darwin ] full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] + full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] fullstop: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot-client: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot-git-hook: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4597,44 +4713,45 @@ dont-distribute-packages: funcons-lambda-cbv-mp: [ i686-linux, x86_64-linux, x86_64-darwin ] funcons-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] funcons-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + funcons-values: [ i686-linux, x86_64-linux, x86_64-darwin ] function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] function-instances-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] - functor-combo: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] + FunGEn: [ 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 ] funpat: [ i686-linux, x86_64-linux, x86_64-darwin ] funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + futhark: [ i686-linux, x86_64-linux, x86_64-darwin ] futun: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] - fuzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ] - g4ip-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] g4ip: [ i686-linux, x86_64-linux, x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] + Gamgine: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] garepinoh: [ i686-linux, x86_64-linux, x86_64-darwin ] gargoyle-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] gargoyle: [ i686-linux, x86_64-linux, x86_64-darwin ] - gasp: [ i686-linux, x86_64-linux, x86_64-darwin ] + gas: [ i686-linux, x86_64-linux, x86_64-darwin ] gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] gc-monitoring-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gcodehs: [ i686-linux, x86_64-linux, x86_64-darwin ] + gconf: [ i686-linux, x86_64-linux, x86_64-darwin ] gdax: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - gearbox: [ i686-linux, x86_64-linux, x86_64-darwin ] GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] gedcom: [ i686-linux, x86_64-linux, x86_64-darwin ] geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4658,6 +4775,7 @@ dont-distribute-packages: GeneralTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] generators: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-accessors: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-aeson: [ 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-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4669,7 +4787,7 @@ dont-distribute-packages: generic-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] - generics-mrsop: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-xmlpickler: [ i686-linux, x86_64-linux, x86_64-darwin ] genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ] genesis-test: [ i686-linux, x86_64-linux, x86_64-darwin ] genesis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4684,12 +4802,28 @@ 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-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec-optics: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-path: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-scientific: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-time: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-unordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] + genvalidity-vector: [ 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-types: [ i686-linux, x86_64-linux, x86_64-darwin ] geodetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] + geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geojson-types: [ i686-linux, x86_64-linux, x86_64-darwin ] - geojson: [ i686-linux, x86_64-linux, x86_64-darwin ] geolite-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] geom2d: [ i686-linux, x86_64-linux, x86_64-darwin ] GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4697,9 +4831,10 @@ dont-distribute-packages: Get: [ i686-linux, x86_64-linux, x86_64-darwin ] getemx: [ i686-linux, x86_64-linux, x86_64-darwin ] getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] - gf: [ i686-linux, x86_64-linux, x86_64-darwin ] GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] + gh-labeler: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-core-smallstep: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-datasize: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4711,17 +4846,21 @@ dont-distribute-packages: ghc-heap-view: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghc-justdoit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-mod: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-parmake: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-proofs: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-srcspan-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-time-alloc-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-trace-events: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-typelits-presburger: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-usage: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4729,12 +4868,12 @@ dont-distribute-packages: ghci-history-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-base-stub: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom-jsaddle: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom-jsffi: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-fetch: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-hplay: [ i686-linux, x86_64-linux, x86_64-darwin ] - ghcjs-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4747,8 +4886,8 @@ dont-distribute-packages: gi-wnck: [ i686-linux, x86_64-linux, x86_64-darwin ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] Gifcurry: [ i686-linux, x86_64-linux, x86_64-darwin ] - ginger: [ i686-linux, x86_64-linux, x86_64-darwin ] ginsu: [ i686-linux, x86_64-linux, x86_64-darwin ] + gio: [ i686-linux, x86_64-linux, x86_64-darwin ] gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] giphy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4763,14 +4902,16 @@ dont-distribute-packages: git-object: [ i686-linux, x86_64-linux, x86_64-darwin ] git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] git-sanity: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] git: [ i686-linux, x86_64-linux, x86_64-darwin ] gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] - githash: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] github-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] github-webhook-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] github-webhook-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] - githud: [ i686-linux, x86_64-linux, x86_64-darwin ] + github: [ i686-linux, x86_64-linux, x86_64-darwin ] gitignore: [ i686-linux, x86_64-linux, x86_64-darwin ] gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlab-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4787,13 +4928,14 @@ dont-distribute-packages: glapp: [ i686-linux, x86_64-linux, x86_64-darwin ] glazier-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ] glazier-react-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react-widget: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-b-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] gli: [ i686-linux, x86_64-linux, x86_64-darwin ] + glib: [ i686-linux, x86_64-linux, x86_64-darwin ] glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] - glirc: [ i686-linux, x86_64-linux, x86_64-darwin ] - gll: [ i686-linux, x86_64-linux, x86_64-darwin ] GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] glob-posix: [ i686-linux, x86_64-linux, x86_64-darwin ] global-config: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4802,8 +4944,11 @@ 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-accelerate: [ 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-export: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-game: [ 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 ] @@ -4811,133 +4956,20 @@ dont-distribute-packages: glue-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-example: [ i686-linux, x86_64-linux, x86_64-darwin ] glue: [ i686-linux, x86_64-linux, x86_64-darwin ] - GLUtil: [ i686-linux, x86_64-linux, x86_64-darwin ] - gluturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] gmndl: [ i686-linux, x86_64-linux, x86_64-darwin ] gnome-desktop: [ i686-linux, x86_64-linux, x86_64-darwin ] - gnome-keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gnss-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] gnuidn: [ i686-linux, x86_64-linux, x86_64-darwin ] - goa: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-core: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] goal-simulation: [ i686-linux, x86_64-linux, x86_64-darwin ] - goat: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] - gogol-admin-datatransfer: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-admin-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-admin-emailmigration: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-admin-reports: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-adsense-host: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-adsense: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-affiliates: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-android-enterprise: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-android-publisher: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-appengine: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-apps-activity: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-apps-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-apps-licensing: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-apps-reseller: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-apps-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-appstate: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-autoscaler: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-bigquery: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-billing: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-blogger: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-books: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-civicinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-classroom: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-cloudmonitoring: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-cloudtrace: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-compute: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-container: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-containerbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-customsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-dataflow: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-dataproc: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-datastore: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-deploymentmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-dfareporting: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-doubleclick-bids: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-doubleclick-search: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-firebase-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-fitness: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-fonts: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-freebasesearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-fusiontables: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-games-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-games-management: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-games: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-genomics: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-gmail: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-groups-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-groups-settings: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-iam: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-identity-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-kgsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-language: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-latencytest: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-manufacturers: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-maps-coordinate: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-maps-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-mirror: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-ml: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-monitoring: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-pagespeed: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-partners: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-people: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-play-moviespartner: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-plus-domains: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-prediction: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-proximitybeacon: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-qpxexpress: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-replicapool-updater: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-replicapool: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-resourcemanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-resourceviews: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-runtimeconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-safebrowsing: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-script: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-servicecontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-sheets: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-shopping-content: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-siteverification: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-slides: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-spectrum: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-sqladmin: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-storage-transfer: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-tagmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-taskqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-urlshortener: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-useraccounts: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-vision: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-webmaster-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-youtube-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-youtube-reporting: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol-youtube: [ i686-linux, x86_64-linux, x86_64-darwin ] - gogol: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] google-cloud: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5002,10 +5034,10 @@ dont-distribute-packages: graph-rewriting-trs: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-rewriting-ww: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-serialize: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-visit: [ i686-linux, x86_64-linux, x86_64-darwin ] Graph500: [ i686-linux, x86_64-linux, x86_64-darwin ] - Graphalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] graphbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] graphene: [ i686-linux, x86_64-linux, x86_64-darwin ] GraphHammer-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5014,12 +5046,11 @@ 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 ] + graphql-w-persistent: [ 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 ] gray-code: [ i686-linux, x86_64-linux, x86_64-darwin ] - gray-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] - graylog: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard: [ i686-linux, x86_64-linux, x86_64-darwin ] greenclip: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5027,51 +5058,52 @@ dont-distribute-packages: gremlin-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Grempa: [ i686-linux, x86_64-linux, x86_64-darwin ] grenade: [ i686-linux, x86_64-linux, x86_64-darwin ] - greplicate: [ i686-linux, x86_64-linux, x86_64-darwin ] - grid: [ i686-linux, x86_64-linux, x86_64-darwin ] gridbounds: [ i686-linux, x86_64-linux, x86_64-darwin ] - gridfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] + grids: [ i686-linux, x86_64-linux, x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] groot: [ i686-linux, x86_64-linux, x86_64-darwin ] gross: [ i686-linux, x86_64-linux, x86_64-darwin ] GroteTrap: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-inspector: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - groundhog: [ i686-linux, x86_64-linux, x86_64-darwin ] group-with: [ i686-linux, x86_64-linux, x86_64-darwin ] grouped-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-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 ] + gsc-weighting: [ 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 ] + gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-jsinput: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-largeTreeStore: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-simple-list-view: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-sni-tray: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-toggle-button-list: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-cast-gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-cast-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-cast-gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-cast-gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] - gtk2hs-cast-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-traymanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk2hs-buildtools: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-rpn: [ i686-linux, x86_64-linux, x86_64-darwin ] Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk3-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtksourceview3: [ i686-linux, x86_64-linux, x86_64-darwin ] GtkTV: [ i686-linux, x86_64-linux, x86_64-darwin ] guarded-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5095,7 +5127,6 @@ dont-distribute-packages: hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-frontend-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack-frontend-monadcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-evhttp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5107,7 +5138,6 @@ dont-distribute-packages: hack-middleware-cleanpath: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-middleware-jsonp: [ i686-linux, x86_64-linux, x86_64-darwin ] - hack2-contrib-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-mongrel2-http: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5116,14 +5146,16 @@ dont-distribute-packages: hackage-mirror: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-processing: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-repo-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-security-HTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hackage-whatsnew: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] hackager: [ i686-linux, x86_64-linux, x86_64-darwin ] hackernews: [ i686-linux, x86_64-linux, x86_64-darwin ] HackMail: [ i686-linux, x86_64-linux, x86_64-darwin ] hackmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackport: [ i686-linux, x86_64-linux, x86_64-darwin ] hactor: [ i686-linux, x86_64-linux, x86_64-darwin ] hactors: [ i686-linux, x86_64-linux, x86_64-darwin ] haddock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5154,9 +5186,19 @@ 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-dir-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-favicon: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-filestore: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-images: [ 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-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-series: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-shortcode: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] + hal: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5164,7 +5206,6 @@ dont-distribute-packages: hall-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] halma-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5172,12 +5213,14 @@ dont-distribute-packages: hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] handa-gdata: [ i686-linux, x86_64-linux, x86_64-darwin ] + handle-like: [ i686-linux, x86_64-linux, x86_64-darwin ] handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] Hangman: [ i686-linux, x86_64-linux, x86_64-darwin ] hannahci: [ i686-linux, x86_64-linux, x86_64-darwin ] hans-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] hans: [ i686-linux, x86_64-linux, x86_64-darwin ] haphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] + hapistrano: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator3: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] happlets-lib-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5198,7 +5241,6 @@ dont-distribute-packages: happstack-data: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-dlg: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] - happstack-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-fay-ajax: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-hamlet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5206,6 +5248,7 @@ dont-distribute-packages: happstack-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-hstringtemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-jmacro: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-monad-peel: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5224,10 +5267,10 @@ dont-distribute-packages: haquery: [ i686-linux, x86_64-linux, x86_64-darwin ] haquil: [ i686-linux, x86_64-linux, x86_64-darwin ] harchive: [ i686-linux, x86_64-linux, x86_64-darwin ] + hArduino: [ i686-linux, x86_64-linux, x86_64-darwin ] hardware-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] hark: [ i686-linux, x86_64-linux, x86_64-darwin ] - HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5236,13 +5279,9 @@ dont-distribute-packages: harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] - HasBigDecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasbolt-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] HasCacBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] hascas: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascat-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascat-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascat-system: [ i686-linux, x86_64-linux, x86_64-darwin ] - hascat: [ i686-linux, x86_64-linux, x86_64-darwin ] Haschoo: [ i686-linux, x86_64-linux, x86_64-darwin ] HasGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hash: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5252,38 +5291,40 @@ dont-distribute-packages: hashabler: [ i686-linux, x86_64-linux, x86_64-darwin ] hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashflare: [ i686-linux, x86_64-linux, x86_64-darwin ] hashring: [ i686-linux, x86_64-linux, x86_64-darwin ] hashtables-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] hask-home: [ i686-linux, x86_64-linux, x86_64-darwin ] hask: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskades: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskanoid: [ i686-linux, x86_64-linux, x86_64-darwin ] haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskbot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] haskdeep: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskdogs: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelisp: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-ci: [ 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 ] haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-conll: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-dap: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-disque: [ 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 ] haskell-gettext: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-holes-th: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-in-space: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-lsp-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5292,23 +5333,37 @@ 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 ] - haskell-snake: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-observe: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-prisms: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-src-exts-sc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-meta-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-stack-trace-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-token-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-ast: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-backend-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-builtin-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-debug: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-experimental-refactorings: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5350,12 +5405,14 @@ dont-distribute-packages: haskgame: [ i686-linux, x86_64-linux, x86_64-darwin ] haskheap: [ i686-linux, x86_64-linux, x86_64-darwin ] haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskintex: [ i686-linux, x86_64-linux, x86_64-darwin ] haskmon: [ i686-linux, x86_64-linux, x86_64-darwin ] - haskoin-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin-bitcoind: [ 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 ] @@ -5367,18 +5424,25 @@ dont-distribute-packages: haskore-synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-data: [ 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 ] - hasmin: [ i686-linux, x86_64-linux, x86_64-darwin ] hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-class: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-cursor-query: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-cursor-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-optparse-applicative: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5386,8 +5450,6 @@ dont-distribute-packages: hasql-postgres-options: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] hasql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql-transaction: [ i686-linux, x86_64-linux, x86_64-darwin ] - hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] hastache-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-app: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5395,12 +5457,13 @@ dont-distribute-packages: haste-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-prim: [ i686-linux, x86_64-linux, x86_64-darwin ] haste: [ i686-linux, x86_64-linux, x86_64-darwin ] - hat: [ i686-linux, x86_64-linux, x86_64-darwin ] Hate: [ i686-linux, x86_64-linux, x86_64-darwin ] hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + haven: [ 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 ] @@ -5408,7 +5471,6 @@ dont-distribute-packages: hax: [ i686-linux, x86_64-linux, x86_64-darwin ] haxl-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] haxl-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] - HaXml: [ i686-linux, x86_64-linux, x86_64-darwin ] haxparse: [ i686-linux, x86_64-linux, x86_64-darwin ] haxr-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haxr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5432,7 +5494,6 @@ dont-distribute-packages: hcg-minus: [ i686-linux, x86_64-linux, x86_64-darwin ] hcheat: [ i686-linux, x86_64-linux, x86_64-darwin ] hchesslib: [ i686-linux, x86_64-linux, x86_64-darwin ] - HCL: [ i686-linux, x86_64-linux, x86_64-darwin ] hcltest: [ i686-linux, x86_64-linux, x86_64-darwin ] hcoap: [ i686-linux, x86_64-linux, x86_64-darwin ] hcom: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5465,26 +5526,24 @@ 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 ] - 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 ] + heap: [ i686-linux, x86_64-linux, x86_64-darwin ] + heartbeat-streams: [ 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 ] hecc: [ i686-linux, x86_64-linux, x86_64-darwin ] heckle: [ i686-linux, x86_64-linux, x86_64-darwin ] hedgehog-checkers-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hedgehog-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] hedgehog-gen-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedgehog-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-config: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-pile: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] hedis-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] - hedn: [ i686-linux, x86_64-linux, x86_64-darwin ] hein: [ i686-linux, x86_64-linux, x86_64-darwin ] heist-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] heist-async: [ i686-linux, x86_64-linux, x86_64-darwin ] heist: [ i686-linux, x86_64-linux, x86_64-darwin ] - helf: [ i686-linux, x86_64-linux, x86_64-darwin ] helics-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] helics: [ i686-linux, x86_64-linux, x86_64-darwin ] helisp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5506,19 +5565,21 @@ dont-distribute-packages: herbalizer: [ i686-linux, x86_64-linux, x86_64-darwin ] HerbiePlugin: [ i686-linux, x86_64-linux, x86_64-darwin ] heredocs: [ i686-linux, x86_64-linux, x86_64-darwin ] - herf-time: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] hesh: [ i686-linux, x86_64-linux, x86_64-darwin ] hesql: [ i686-linux, x86_64-linux, x86_64-darwin ] hetero-dict: [ i686-linux, x86_64-linux, x86_64-darwin ] + heterogeneous-list-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -5526,12 +5587,14 @@ dont-distribute-packages: hexmino: [ i686-linux, x86_64-linux, x86_64-darwin ] hexml-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpress: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -5545,31 +5608,14 @@ dont-distribute-packages: hfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hg-buildpackage: [ i686-linux, x86_64-linux, x86_64-darwin ] hgalib: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-API: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-Audio: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-Bullet-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-CAudio-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-CEGUI-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-Common: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-Data: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-Enet-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-Graphics3D: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-GUI: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-InputSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-Network: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-Ogre-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-OIS-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-SDL2-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-SFML-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-WinEvent: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D-Wire: [ i686-linux, x86_64-linux, x86_64-darwin ] - HGamer3D: [ i686-linux, x86_64-linux, x86_64-darwin ] hgdbmi: [ i686-linux, x86_64-linux, x86_64-darwin ] HGE2D: [ i686-linux, x86_64-linux, x86_64-darwin ] hgearman: [ i686-linux, x86_64-linux, x86_64-darwin ] hgen: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgeometry: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeos: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgettext: [ i686-linux, x86_64-linux, x86_64-darwin ] hgis: [ i686-linux, x86_64-linux, x86_64-darwin ] hgithub: [ i686-linux, x86_64-linux, x86_64-darwin ] HGL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5577,6 +5623,7 @@ dont-distribute-packages: hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] HGraphStorage: [ i686-linux, x86_64-linux, x86_64-darwin ] hgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgrev: [ i686-linux, x86_64-linux, x86_64-darwin ] hgrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hharp: [ i686-linux, x86_64-linux, x86_64-darwin ] HHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5586,7 +5633,10 @@ dont-distribute-packages: hid-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + hierarchical-clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hierarchical-spectral-clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] + hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5594,7 +5644,7 @@ dont-distribute-packages: highjson-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] highjson-th: [ i686-linux, x86_64-linux, x86_64-darwin ] highjson: [ i686-linux, x86_64-linux, x86_64-darwin ] - highlight: [ i686-linux, x86_64-linux, x86_64-darwin ] + highlight-versions: [ i686-linux, x86_64-linux, x86_64-darwin ] highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] himg: [ i686-linux, x86_64-linux, x86_64-darwin ] himpy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5605,6 +5655,7 @@ dont-distribute-packages: hinquire: [ i686-linux, x86_64-linux, x86_64-darwin ] hinstaller: [ i686-linux, x86_64-linux, x86_64-darwin ] hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinter: [ i686-linux, x86_64-linux, x86_64-darwin ] hinterface: [ i686-linux, x86_64-linux, x86_64-darwin ] hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5612,11 +5663,11 @@ dont-distribute-packages: hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ] hipchat-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] hipe: [ i686-linux, x86_64-linux, x86_64-darwin ] - HipmunkPlayground: [ i686-linux, x86_64-linux, x86_64-darwin ] hircules: [ i686-linux, x86_64-linux, x86_64-darwin ] hirt: [ i686-linux, x86_64-linux, x86_64-darwin ] Hish: [ i686-linux, x86_64-linux, x86_64-darwin ] hissmetrics: [ i686-linux, x86_64-linux, x86_64-darwin ] + hist-pl-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl-lmf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5642,15 +5693,20 @@ dont-distribute-packages: HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-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 ] hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] HList: [ i686-linux, x86_64-linux, x86_64-darwin ] HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] - HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlongurl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlrdb-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlrdb: [ i686-linux, x86_64-linux, x86_64-darwin ] hls: [ i686-linux, x86_64-linux, x86_64-darwin ] hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ] hly: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5661,17 +5717,17 @@ dont-distribute-packages: hmatrix-mmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-morpheus: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-nipals: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-nlopt: [ i686-linux, x86_64-linux, x86_64-darwin ] - hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] hmatrix-sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] hmk: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmm-lapack: [ i686-linux, x86_64-linux, x86_64-darwin ] HMM: [ i686-linux, x86_64-linux, x86_64-darwin ] hmm: [ i686-linux, x86_64-linux, x86_64-darwin ] hMollom: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5681,6 +5737,7 @@ dont-distribute-packages: hmt: [ i686-linux, x86_64-linux, x86_64-darwin ] hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ] hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ] + hnix: [ i686-linux, x86_64-linux, x86_64-darwin ] HNM: [ i686-linux, x86_64-linux, x86_64-darwin ] hnormalise: [ i686-linux, x86_64-linux, x86_64-darwin ] ho-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5694,7 +5751,6 @@ dont-distribute-packages: hodatime: [ i686-linux, x86_64-linux, x86_64-darwin ] HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] Hoed: [ i686-linux, x86_64-linux, x86_64-darwin ] - hofix-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] hog: [ i686-linux, x86_64-linux, x86_64-darwin ] hogg: [ i686-linux, x86_64-linux, x86_64-darwin ] hoggl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5704,10 +5760,7 @@ dont-distribute-packages: hol: [ i686-linux, x86_64-linux, x86_64-darwin ] hold-em: [ i686-linux, x86_64-linux, x86_64-darwin ] hole: [ i686-linux, x86_64-linux, x86_64-darwin ] - Holumbus-Distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] - Holumbus-MapReduce: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-Searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] - Holumbus-Storage: [ i686-linux, x86_64-linux, x86_64-darwin ] holy-project: [ i686-linux, x86_64-linux, x86_64-darwin ] homeomorphic: [ i686-linux, x86_64-linux, x86_64-darwin ] hommage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5734,8 +5787,6 @@ dont-distribute-packages: hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] - hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] - hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] hoppy-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] hoppy-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5743,8 +5794,10 @@ dont-distribute-packages: hoppy-std: [ i686-linux, x86_64-linux, x86_64-darwin ] hops: [ i686-linux, x86_64-linux, x86_64-darwin ] hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] + hora: [ i686-linux, x86_64-linux, x86_64-darwin ] horizon: [ i686-linux, x86_64-linux, x86_64-darwin ] horname: [ i686-linux, x86_64-linux, x86_64-darwin ] + hosc-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hothasktags: [ i686-linux, x86_64-linux, x86_64-darwin ] hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5754,7 +5807,6 @@ dont-distribute-packages: hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] hpack-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpack-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hpaco: [ i686-linux, x86_64-linux, x86_64-darwin ] hpage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5762,18 +5814,19 @@ dont-distribute-packages: hpaste: [ i686-linux, x86_64-linux, x86_64-darwin ] hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hPDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + HPDF: [ i686-linux, x86_64-linux, x86_64-darwin ] hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] hpg: [ i686-linux, x86_64-linux, x86_64-darwin ] - HPhone: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpio: [ i686-linux, x86_64-linux, x86_64-darwin ] hplaylist: [ i686-linux, x86_64-linux, x86_64-darwin ] HPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] hpodder: [ i686-linux, x86_64-linux, x86_64-darwin ] HPong: [ i686-linux, x86_64-linux, x86_64-darwin ] - hpp: [ i686-linux, x86_64-linux, x86_64-darwin ] hpqtypes-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] hpqtypes: [ i686-linux, x86_64-linux, x86_64-darwin ] hprotoc-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5784,13 +5837,14 @@ dont-distribute-packages: hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] hpyrg: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpython: [ i686-linux, x86_64-linux, x86_64-darwin ] hquantlib: [ i686-linux, x86_64-linux, x86_64-darwin ] - hquery: [ i686-linux, x86_64-linux, x86_64-darwin ] hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -5801,6 +5855,7 @@ dont-distribute-packages: hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-conllu: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-di: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-excelx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5820,14 +5875,13 @@ dont-distribute-packages: hs-re: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-rs-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-scrape: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-server-starter: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-snowtify: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-twitterarchiver: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-watchman: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs2ats: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] - hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] hsaml2: [ i686-linux, x86_64-linux, x86_64-darwin ] hsay: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5840,11 +5894,13 @@ dont-distribute-packages: hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-dot: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-lisp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-process: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-rw: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5859,6 +5915,7 @@ dont-distribute-packages: hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] hscope: [ i686-linux, x86_64-linux, x86_64-darwin ] hScraper: [ i686-linux, x86_64-linux, x86_64-darwin ] + hscuid: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdif: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5880,6 +5937,7 @@ dont-distribute-packages: hsI2C: [ i686-linux, x86_64-linux, x86_64-darwin ] hsignal: [ i686-linux, x86_64-linux, x86_64-darwin ] hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] hskeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] hslackbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5917,6 +5975,7 @@ dont-distribute-packages: hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-structured-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec2: [ i686-linux, x86_64-linux, x86_64-darwin ] hspecVariant: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hspkcs11: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5955,11 +6014,13 @@ dont-distribute-packages: hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] hsudoku: [ i686-linux, x86_64-linux, x86_64-darwin ] hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsx-jmacro: [ i686-linux, x86_64-linux, x86_64-darwin ] hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] hsXenCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsyscall: [ i686-linux, x86_64-linux, x86_64-darwin ] hsyslog-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsyslog-udp: [ i686-linux, x86_64-linux, x86_64-darwin ] hszephyr: [ i686-linux, x86_64-linux, x86_64-darwin ] HTab: [ i686-linux, x86_64-linux, x86_64-darwin ] hTalos: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5967,6 +6028,7 @@ dont-distribute-packages: hTensor: [ i686-linux, x86_64-linux, x86_64-darwin ] htestu: [ i686-linux, x86_64-linux, x86_64-darwin ] HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] + htiled: [ i686-linux, x86_64-linux, x86_64-darwin ] htlset: [ i686-linux, x86_64-linux, x86_64-darwin ] html-charset: [ i686-linux, x86_64-linux, x86_64-darwin ] html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5983,11 +6045,12 @@ dont-distribute-packages: http-client-session: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-conduit-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] - http-conduit-downloader: [ i686-linux, x86_64-linux, x86_64-darwin ] http-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] http-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-io-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] http-pony-serve-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] http-querystring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5999,9 +6062,9 @@ dont-distribute-packages: https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] htune: [ i686-linux, x86_64-linux, x86_64-darwin ] + htvm: [ i686-linux, x86_64-linux, x86_64-darwin ] htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] hubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - hubris: [ i686-linux, x86_64-linux, x86_64-darwin ] huck: [ i686-linux, x86_64-linux, x86_64-darwin ] HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ] huff: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6022,30 +6085,49 @@ dont-distribute-packages: hup: [ i686-linux, x86_64-linux, x86_64-darwin ] hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] hurriyet: [ i686-linux, x86_64-linux, x86_64-darwin ] + husk-scheme-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] + husk-scheme: [ i686-linux, x86_64-linux, x86_64-darwin ] husky: [ i686-linux, x86_64-linux, x86_64-darwin ] hutton: [ i686-linux, x86_64-linux, x86_64-darwin ] huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-balancedparens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-dsv: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-dump: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-eliasfano: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-prim: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-rankselect-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-xml: [ 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 ] hwhile: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] + hwormhole: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2: [ i686-linux, x86_64-linux, x86_64-darwin ] + hXmixer: [ i686-linux, x86_64-linux, x86_64-darwin ] HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] HXQ: [ i686-linux, x86_64-linux, x86_64-darwin ] - hxt-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - hxt-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] - hxt-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] + hxt-pickle-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] hxthelper: [ i686-linux, x86_64-linux, x86_64-darwin ] hxweb: [ i686-linux, x86_64-linux, x86_64-darwin ] hyahtzee: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6062,29 +6144,27 @@ dont-distribute-packages: hydrogen-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] - Hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] hylide: [ i686-linux, x86_64-linux, x86_64-darwin ] hylolib: [ i686-linux, x86_64-linux, x86_64-darwin ] hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyper-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] hyper-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - hyper: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperion: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperloglogplus: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperpublic: [ i686-linux, x86_64-linux, x86_64-darwin ] hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] - hzenity: [ i686-linux, x86_64-linux, x86_64-darwin ] hzulip: [ i686-linux, x86_64-linux, x86_64-darwin ] i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] iap-verifier: [ i686-linux, x86_64-linux, x86_64-darwin ] ib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] iban: [ i686-linux, x86_64-linux, x86_64-darwin ] ical: [ i686-linux, x86_64-linux, x86_64-darwin ] + iCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] IcoGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] iconv-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend-common: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6096,9 +6176,9 @@ dont-distribute-packages: identifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] idna2008: [ i686-linux, x86_64-linux, x86_64-darwin ] + idris: [ i686-linux, x86_64-linux, x86_64-darwin ] IDynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] ieee-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - iException: [ i686-linux, x86_64-linux, x86_64-darwin ] ifcxt: [ i686-linux, x86_64-linux, x86_64-darwin ] IFS: [ i686-linux, x86_64-linux, x86_64-darwin ] ig: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6126,7 +6206,6 @@ dont-distribute-packages: ihaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] illuminate: [ i686-linux, x86_64-linux, x86_64-darwin ] - imagemagick: [ i686-linux, x86_64-linux, x86_64-darwin ] imagepaste: [ i686-linux, x86_64-linux, x86_64-darwin ] imap: [ i686-linux, x86_64-linux, x86_64-darwin ] imapget: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6150,18 +6229,16 @@ dont-distribute-packages: impure-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ] inch: [ i686-linux, x86_64-linux, x86_64-darwin ] + inchworm: [ i686-linux, x86_64-linux, x86_64-darwin ] include-file: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] - incremental-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] increments: [ i686-linux, x86_64-linux, x86_64-darwin ] - indentation-trifecta: [ i686-linux, x86_64-linux, x86_64-darwin ] - indentation: [ i686-linux, x86_64-linux, x86_64-darwin ] indents: [ i686-linux, x86_64-linux, x86_64-darwin ] indexation: [ i686-linux, x86_64-linux, x86_64-darwin ] - indexed-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] IndexedList: [ i686-linux, x86_64-linux, x86_64-darwin ] indextype: [ i686-linux, x86_64-linux, x86_64-darwin ] + indian-language-font-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] indices: [ i686-linux, x86_64-linux, x86_64-darwin ] indieweb-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] inf-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6174,7 +6251,9 @@ dont-distribute-packages: informative: [ i686-linux, x86_64-linux, x86_64-darwin ] inilist: [ i686-linux, x86_64-linux, x86_64-darwin ] inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ] + inline-java: [ i686-linux, x86_64-linux, x86_64-darwin ] inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] + insert-ordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] inserts: [ i686-linux, x86_64-linux, x86_64-darwin ] inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6189,9 +6268,6 @@ dont-distribute-packages: integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] integreat: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] - interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] - interleavableIO: [ i686-linux, x86_64-linux, x86_64-darwin ] - interlude-l: [ i686-linux, x86_64-linux, x86_64-darwin ] internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] intero: [ i686-linux, x86_64-linux, x86_64-darwin ] interpol: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6204,15 +6280,19 @@ dont-distribute-packages: introduction-test: [ i686-linux, x86_64-linux, x86_64-darwin ] introduction: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] + invertible-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-hlist: [ 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 ] + ion: [ i686-linux, x86_64-linux, x86_64-darwin ] IOR: [ i686-linux, x86_64-linux, x86_64-darwin ] IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] iostring: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + ip2proxy: [ 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 ] @@ -6220,25 +6300,29 @@ dont-distribute-packages: iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] IPv6DB: [ i686-linux, x86_64-linux, x86_64-darwin ] ipython-kernel: [ i686-linux, x86_64-linux, x86_64-darwin ] + irc-dcc: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-client: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-messages: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-types: [ i686-linux, x86_64-linux, x86_64-darwin ] Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] + ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] iri: [ i686-linux, x86_64-linux, x86_64-darwin ] iridium: [ i686-linux, x86_64-linux, x86_64-darwin ] iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ] irt: [ i686-linux, x86_64-linux, x86_64-darwin ] - is: [ i686-linux, x86_64-linux, x86_64-darwin ] isdicom: [ i686-linux, x86_64-linux, x86_64-darwin ] isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] + isiz: [ i686-linux, x86_64-linux, x86_64-darwin ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ] + iso8601-duration: [ i686-linux, x86_64-linux, x86_64-darwin ] isobmff-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ] isotope: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] @@ -6249,7 +6333,16 @@ dont-distribute-packages: iterio-server: [ i686-linux, x86_64-linux, x86_64-darwin ] iterIO: [ i686-linux, x86_64-linux, x86_64-darwin ] ivor: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-backend-c: [ i686-linux, x86_64-linux, x86_64-darwin ] ivory-bitdata: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-hw: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-serialize: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-stdlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory: [ i686-linux, x86_64-linux, x86_64-darwin ] ivy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] ixdopp: [ i686-linux, x86_64-linux, x86_64-darwin ] ixmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6260,6 +6353,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 ] @@ -6267,16 +6361,15 @@ dont-distribute-packages: jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ] jarify: [ i686-linux, x86_64-linux, x86_64-darwin ] jason: [ i686-linux, x86_64-linux, x86_64-darwin ] - java-adt: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] java-character: [ i686-linux, x86_64-linux, x86_64-darwin ] java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] - javaclass: [ i686-linux, x86_64-linux, x86_64-darwin ] + javascript-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] Javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] - Javav: [ i686-linux, x86_64-linux, x86_64-darwin ] javav: [ i686-linux, x86_64-linux, x86_64-darwin ] + Javav: [ i686-linux, x86_64-linux, x86_64-darwin ] jbi: [ i686-linux, x86_64-linux, x86_64-darwin ] jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] Jdh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6284,13 +6377,20 @@ 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 ] + jmacro-rpc-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + jmacro-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + jmacro-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + jmacro: [ i686-linux, x86_64-linux, x86_64-darwin ] jml-web-service: [ i686-linux, x86_64-linux, x86_64-darwin ] + jmonkey: [ i686-linux, x86_64-linux, x86_64-darwin ] + jni: [ 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 ] join: [ i686-linux, x86_64-linux, x86_64-darwin ] joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] - jort: [ i686-linux, x86_64-linux, x86_64-darwin ] + jpeg: [ i686-linux, x86_64-linux, x86_64-darwin ] js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-clib: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6301,6 +6401,7 @@ dont-distribute-packages: JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsmw: [ i686-linux, x86_64-linux, x86_64-darwin ] json-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-ast-json-encoder: [ i686-linux, x86_64-linux, x86_64-darwin ] json-ast-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] json-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6316,11 +6417,10 @@ dont-distribute-packages: json-pointer-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] json-pointer: [ i686-linux, x86_64-linux, x86_64-darwin ] json-python: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - json-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] json2-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] json2: [ i686-linux, x86_64-linux, x86_64-darwin ] JSONb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6335,6 +6435,7 @@ dont-distribute-packages: jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] + juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ] judge: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6349,7 +6450,9 @@ dont-distribute-packages: jvm-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] jvm-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] jvm-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + kademlia: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-device-joystick: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6361,6 +6464,8 @@ dont-distribute-packages: Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] + kanji: [ i686-linux, x86_64-linux, x86_64-darwin ] + kansas-comet: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6373,13 +6478,18 @@ 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 ] + kdt: [ i686-linux, x86_64-linux, x86_64-darwin ] keccak: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-environment-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-protectedmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-mvc-solutions-config: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-solutions-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-mvc-view-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-fs: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactive-network: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6388,8 +6498,6 @@ dont-distribute-packages: keera-hails-reactive-yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactivelenses: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-reactivevalues: [ i686-linux, x86_64-linux, x86_64-darwin ] - keera-posture: [ i686-linux, x86_64-linux, x86_64-darwin ] - keiretsu: [ i686-linux, x86_64-linux, x86_64-darwin ] Ketchup: [ i686-linux, x86_64-linux, x86_64-darwin ] keter: [ i686-linux, x86_64-linux, x86_64-darwin ] kevin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6397,15 +6505,15 @@ dont-distribute-packages: keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] keysafe: [ i686-linux, x86_64-linux, x86_64-darwin ] keystore: [ i686-linux, x86_64-linux, x86_64-darwin ] + keyvaluehash: [ i686-linux, x86_64-linux, x86_64-darwin ] keyword-args: [ i686-linux, x86_64-linux, x86_64-darwin ] khph: [ i686-linux, x86_64-linux, x86_64-darwin ] kicad-data: [ i686-linux, x86_64-linux, x86_64-darwin ] kickass-torrents-dump-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] - KiCS-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] - KiCS-prophecy: [ i686-linux, x86_64-linux, x86_64-darwin ] - KiCS: [ i686-linux, x86_64-linux, x86_64-darwin ] + kickchan: [ i686-linux, x86_64-linux, x86_64-darwin ] kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] kit: [ i686-linux, x86_64-linux, x86_64-darwin ] + kleene: [ 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 ] kmp-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6413,7 +6521,6 @@ dont-distribute-packages: knead: [ i686-linux, x86_64-linux, x86_64-darwin ] knots: [ i686-linux, x86_64-linux, x86_64-darwin ] koellner-phonetic: [ i686-linux, x86_64-linux, x86_64-darwin ] - Konf: [ i686-linux, x86_64-linux, x86_64-darwin ] korfu: [ i686-linux, x86_64-linux, x86_64-darwin ] kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] krapsh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6437,10 +6544,14 @@ dont-distribute-packages: lambda-calculator: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-options: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-zulip: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot: [ 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 ] @@ -6469,7 +6580,6 @@ dont-distribute-packages: lame-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] lame: [ i686-linux, x86_64-linux, x86_64-darwin ] lang: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-ats: [ i686-linux, x86_64-linux, x86_64-darwin ] language-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] language-boogie: [ i686-linux, x86_64-linux, x86_64-darwin ] language-c-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6480,11 +6590,9 @@ dont-distribute-packages: language-dockerfile: [ i686-linux, x86_64-linux, x86_64-darwin ] language-dot: [ i686-linux, x86_64-linux, x86_64-darwin ] language-ecmascript-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-ecmascript: [ i686-linux, x86_64-linux, x86_64-darwin ] language-eiffel: [ i686-linux, x86_64-linux, x86_64-darwin ] language-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] language-gcl: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-glsl: [ i686-linux, x86_64-linux, x86_64-darwin ] language-go: [ i686-linux, x86_64-linux, x86_64-darwin ] language-guess: [ i686-linux, x86_64-linux, x86_64-darwin ] language-hcl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6492,10 +6600,12 @@ dont-distribute-packages: language-kort: [ i686-linux, x86_64-linux, x86_64-darwin ] language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] language-lua2: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-lua: [ i686-linux, x86_64-linux, x86_64-darwin ] language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -6510,14 +6620,16 @@ dont-distribute-packages: language-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] language-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] language-webidl: [ i686-linux, x86_64-linux, x86_64-darwin ] - lapack-carray: [ i686-linux, x86_64-linux, x86_64-darwin ] - lapack-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] lapack: [ i686-linux, x86_64-linux, x86_64-darwin ] - LargeCardinalHierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] Lastik: [ i686-linux, x86_64-linux, x86_64-darwin ] lat: [ i686-linux, x86_64-linux, x86_64-darwin ] latest-npm-version: [ i686-linux, x86_64-linux, x86_64-darwin ] + latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] + latex-formulae-image: [ i686-linux, x86_64-linux, x86_64-darwin ] + latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + latex-function-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] + lattices: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] lawless-concurrent-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] layers-game: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6533,14 +6645,17 @@ dont-distribute-packages: lazyset: [ i686-linux, x86_64-linux, x86_64-darwin ] lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] LazyVault: [ i686-linux, x86_64-linux, x86_64-darwin ] - lcs: [ i686-linux, x86_64-linux, x86_64-darwin ] ld-intervals: [ i686-linux, x86_64-linux, x86_64-darwin ] + lda: [ i686-linux, x86_64-linux, x86_64-darwin ] + ldap-client: [ i686-linux, x86_64-linux, x86_64-darwin ] ldapply: [ i686-linux, x86_64-linux, x86_64-darwin ] ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] leapseconds: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] + learn: [ i686-linux, x86_64-linux, x86_64-darwin ] Learning: [ i686-linux, x86_64-linux, x86_64-darwin ] leetify: [ i686-linux, x86_64-linux, x86_64-darwin ] legion-discovery-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6549,12 +6664,13 @@ dont-distribute-packages: legion: [ i686-linux, x86_64-linux, x86_64-darwin ] leksah-server: [ i686-linux, x86_64-linux, x86_64-darwin ] lendingclub: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] + lentil: [ 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 ] levmar-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6580,18 +6696,23 @@ 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 ] + libnotify: [ 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 ] libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] librandomorg: [ i686-linux, x86_64-linux, x86_64-darwin ] librato: [ i686-linux, x86_64-linux, x86_64-darwin ] + libravatar: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] + libsystemd-journal: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] licensor: [ i686-linux, x86_64-linux, x86_64-darwin ] + life-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] + lifted-base-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] lifted-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] ligature: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6601,24 +6722,28 @@ dont-distribute-packages: lilypond: [ i686-linux, x86_64-linux, x86_64-darwin ] Limit: [ i686-linux, x86_64-linux, x86_64-darwin ] limp-cbc: [ i686-linux, x86_64-linux, x86_64-darwin ] - limp: [ i686-linux, x86_64-linux, x86_64-darwin ] linda: [ i686-linux, x86_64-linux, x86_64-darwin ] linden: [ i686-linux, x86_64-linux, x86_64-darwin ] + line: [ i686-linux, x86_64-linux, x86_64-darwin ] + linear-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-code: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] - linear-socket: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] + lines-of-action: [ i686-linux, x86_64-linux, x86_64-darwin ] + link-relations: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + linked-list-with-iterator: [ i686-linux, x86_64-linux, x86_64-darwin ] linkedhashmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + linklater: [ i686-linux, x86_64-linux, x86_64-darwin ] linode-v4: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-cgroup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6645,7 +6770,7 @@ dont-distribute-packages: list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-text: [ i686-linux, x86_64-linux, x86_64-darwin ] - list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] listenbrainz-client: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] ListT: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6677,17 +6802,15 @@ dont-distribute-packages: lmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] load-balancing: [ i686-linux, x86_64-linux, x86_64-darwin ] load-font: [ i686-linux, x86_64-linux, x86_64-darwin ] - loc-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - loc: [ i686-linux, x86_64-linux, x86_64-darwin ] local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] localize: [ i686-linux, x86_64-linux, x86_64-darwin ] located-monad-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] located: [ i686-linux, x86_64-linux, x86_64-darwin ] loch: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] - lockpool: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] log-warper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6698,7 +6821,9 @@ dont-distribute-packages: logging-effect-extra-file: [ i686-linux, x86_64-linux, x86_64-darwin ] logging-effect-extra-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] logging-effect-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + logging-facade-journald: [ i686-linux, x86_64-linux, x86_64-darwin ] logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] + logic-TPTP: [ i686-linux, x86_64-linux, x86_64-darwin ] Logic: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-MPI: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-network: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6718,6 +6843,7 @@ dont-distribute-packages: lol-typing: [ i686-linux, x86_64-linux, x86_64-darwin ] lol: [ i686-linux, x86_64-linux, x86_64-darwin ] loli: [ i686-linux, x86_64-linux, x86_64-darwin ] + longboi: [ i686-linux, x86_64-linux, x86_64-darwin ] lookup-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-while: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6735,8 +6861,8 @@ 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 ] lua-bc: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6762,13 +6888,17 @@ dont-distribute-packages: lzma-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] macbeth-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + machinecell: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-amazonka: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-process: [ i686-linux, x86_64-linux, x86_64-darwin ] machines-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + maclight: [ i686-linux, x86_64-linux, x86_64-darwin ] + macos-corelibs: [ i686-linux, x86_64-linux, x86_64-darwin ] macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] madlang: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] magic-wormhole: [ i686-linux, x86_64-linux, x86_64-darwin ] + magicbane: [ i686-linux, x86_64-linux, x86_64-darwin ] MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] magico: [ i686-linux, x86_64-linux, x86_64-darwin ] magma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6779,7 +6909,6 @@ dont-distribute-packages: mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ] MailchimpSimple: [ i686-linux, x86_64-linux, x86_64-darwin ] mailgun: [ i686-linux, x86_64-linux, x86_64-darwin ] - main-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ] majority: [ i686-linux, x86_64-linux, x86_64-darwin ] make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6802,21 +6931,27 @@ dont-distribute-packages: manatee-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee-welcome: [ i686-linux, x86_64-linux, x86_64-darwin ] manatee: [ i686-linux, x86_64-linux, x86_64-darwin ] + mandrill: [ i686-linux, x86_64-linux, x86_64-darwin ] mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds-core: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] - mapalgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] + map-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] + map-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] Mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] + mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] + markdown-pap: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + marvin-interpolate: [ i686-linux, x86_64-linux, x86_64-darwin ] marvin: [ i686-linux, x86_64-linux, x86_64-darwin ] marxup: [ i686-linux, x86_64-linux, x86_64-darwin ] masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6830,8 +6965,6 @@ dont-distribute-packages: matrix-as-xyz: [ i686-linux, x86_64-linux, x86_64-darwin ] matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ] matterhorn: [ i686-linux, x86_64-linux, x86_64-darwin ] - mattermost-api-qc: [ i686-linux, x86_64-linux, x86_64-darwin ] - mattermost-api: [ i686-linux, x86_64-linux, x86_64-darwin ] maude: [ i686-linux, x86_64-linux, x86_64-darwin ] maxent-learner-hw-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] maxent-learner-hw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6842,6 +6975,7 @@ dont-distribute-packages: MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT: [ i686-linux, x86_64-linux, x86_64-darwin ] MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] + MBot: [ i686-linux, x86_64-linux, x86_64-darwin ] mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ] mcl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6862,9 +6996,11 @@ dont-distribute-packages: Mecha: [ i686-linux, x86_64-linux, x86_64-darwin ] Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] + med-module: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus-fdk-aac: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus-rtp: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus: [ i686-linux, x86_64-linux, x86_64-darwin ] + median-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6875,7 +7011,7 @@ dont-distribute-packages: memcache-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] memcache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] memcached-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] - memcached: [ i686-linux, x86_64-linux, x86_64-darwin ] + meminfo: [ i686-linux, x86_64-linux, x86_64-darwin ] memis: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] memoization-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6884,6 +7020,8 @@ dont-distribute-packages: menoh: [ i686-linux, x86_64-linux, x86_64-darwin ] mercury-api: [ i686-linux, x86_64-linux, x86_64-darwin ] merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + messagepack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + messagepack: [ i686-linux, x86_64-linux, x86_64-darwin ] messente: [ i686-linux, x86_64-linux, x86_64-darwin ] meta-misc: [ i686-linux, x86_64-linux, x86_64-darwin ] meta-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6892,6 +7030,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 ] @@ -6904,7 +7044,10 @@ 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 ] + micro-recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ] microaeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + microformats2-parser: [ 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 ] microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6912,18 +7055,19 @@ dont-distribute-packages: microsoft-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] mida: [ i686-linux, x86_64-linux, x86_64-darwin ] - midair: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] midimory: [ i686-linux, x86_64-linux, x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] + mighty-metropolis: [ i686-linux, x86_64-linux, x86_64-darwin ] mikmod: [ i686-linux, x86_64-linux, x86_64-darwin ] mikrokosmos: [ i686-linux, x86_64-linux, x86_64-darwin ] miku: [ i686-linux, x86_64-linux, x86_64-darwin ] + milena: [ i686-linux, x86_64-linux, x86_64-darwin ] mime-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] minecraft-data: [ i686-linux, x86_64-linux, x86_64-darwin ] minesweeper: [ i686-linux, x86_64-linux, x86_64-darwin ] - MiniAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] miniforth: [ i686-linux, x86_64-linux, x86_64-darwin ] minilens: [ i686-linux, x86_64-linux, x86_64-darwin ] minimung: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6934,10 +7078,15 @@ 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 ] + miss-porcelain: [ i686-linux, x86_64-linux, x86_64-darwin ] + miss: [ i686-linux, x86_64-linux, x86_64-darwin ] missing-py2: [ i686-linux, x86_64-linux, x86_64-darwin ] + MissingK: [ 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 ] @@ -6955,6 +7104,8 @@ dont-distribute-packages: modular-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + modular: [ i686-linux, x86_64-linux, x86_64-darwin ] + modularity: [ i686-linux, x86_64-linux, x86_64-darwin ] module-management: [ i686-linux, x86_64-linux, x86_64-darwin ] modulespection: [ i686-linux, x86_64-linux, x86_64-darwin ] modulo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6963,8 +7114,10 @@ dont-distribute-packages: MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ] mohws: [ i686-linux, x86_64-linux, x86_64-darwin ] mole: [ i686-linux, x86_64-linux, x86_64-darwin ] + mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-dijkstra: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6972,22 +7125,25 @@ dont-distribute-packages: monad-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-levels: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-lgbt: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-log: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-lrs: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-mersenne-random: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-open: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-parallel-progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] - monad-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ran: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-recorder: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-resumption: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ste: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-supply: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-timing: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-tx: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-unify: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-var: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-wrap: [ i686-linux, x86_64-linux, x86_64-darwin ] monadacme: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-mtl-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6996,12 +7152,12 @@ 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 ] + monadiccp: [ 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 ] monadloc-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] monadlog: [ i686-linux, x86_64-linux, x86_64-darwin ] - monadoid: [ i686-linux, x86_64-linux, x86_64-darwin ] monadplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadStack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7021,9 +7177,9 @@ dont-distribute-packages: monoid-absorbing: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] @@ -7032,21 +7188,25 @@ dont-distribute-packages: morfette: [ i686-linux, x86_64-linux, x86_64-darwin ] morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] morph: [ i686-linux, x86_64-linux, x86_64-darwin ] + morphisms-functors-inventory: [ i686-linux, x86_64-linux, x86_64-darwin ] + morphisms-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] + morphisms-objects: [ i686-linux, x86_64-linux, x86_64-darwin ] + morte: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ 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 ] + moto-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + moto: [ i686-linux, x86_64-linux, x86_64-darwin ] mount: [ i686-linux, x86_64-linux, x86_64-darwin ] movie-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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 ] mprover: [ i686-linux, x86_64-linux, x86_64-darwin ] mps: [ i686-linux, x86_64-linux, x86_64-darwin ] mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mqtt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] mqtt: [ i686-linux, x86_64-linux, x86_64-darwin ] mrifk: [ i686-linux, x86_64-linux, x86_64-darwin ] mrm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7062,6 +7222,7 @@ dont-distribute-packages: mtgoxapi: [ i686-linux, x86_64-linux, x86_64-darwin ] mtl-evil-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] mtl-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + mtl-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] mtlx: [ i686-linux, x86_64-linux, x86_64-darwin ] mtp: [ i686-linux, x86_64-linux, x86_64-darwin ] MuCheck-Hspec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7070,22 +7231,25 @@ dont-distribute-packages: MuCheck-SmallCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] MuCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] mud: [ i686-linux, x86_64-linux, x86_64-darwin ] - mudbath: [ i686-linux, x86_64-linux, x86_64-darwin ] mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-instance: [ i686-linux, x86_64-linux, x86_64-darwin ] multiaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] + multiarg: [ i686-linux, x86_64-linux, x86_64-darwin ] multifile: [ i686-linux, x86_64-linux, x86_64-darwin ] multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] + multilinear-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + multilinear: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] + multiset-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + multistate: [ i686-linux, x86_64-linux, x86_64-darwin ] multivariant: [ i686-linux, x86_64-linux, x86_64-darwin ] Munkres-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] muon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7102,9 +7266,9 @@ dont-distribute-packages: music-suite: [ i686-linux, x86_64-linux, x86_64-darwin ] music-util: [ i686-linux, x86_64-linux, x86_64-darwin ] musicbrainz-email: [ i686-linux, x86_64-linux, x86_64-darwin ] + musicxml2: [ i686-linux, x86_64-linux, x86_64-darwin ] musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] - mustache2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] MutationOrder: [ i686-linux, x86_64-linux, x86_64-darwin ] mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7112,6 +7276,7 @@ dont-distribute-packages: mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + mwc-random-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-dataiter: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] mxnet-nn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7119,47 +7284,44 @@ dont-distribute-packages: mxnet: [ i686-linux, x86_64-linux, x86_64-darwin ] my-package-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] my-test-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] - mybitcoin-sci: [ i686-linux, x86_64-linux, x86_64-darwin ] + myanimelist-export: [ i686-linux, x86_64-linux, x86_64-darwin ] myo: [ i686-linux, x86_64-linux, x86_64-darwin ] MyPrimes: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-haskell-nem: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-haskell-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] - mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] mystem: [ i686-linux, x86_64-linux, x86_64-darwin ] myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] + mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ] mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] n-ary-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] n-tuple: [ i686-linux, x86_64-linux, x86_64-darwin ] nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] nakadi-client: [ i686-linux, x86_64-linux, x86_64-darwin ] named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] - NameGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] namelist: [ i686-linux, x86_64-linux, x86_64-darwin ] namespace: [ i686-linux, x86_64-linux, x86_64-darwin ] - nano-cryptr: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-md5: [ i686-linux, x86_64-linux, x86_64-darwin ] - nanoAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] nanocurses: [ i686-linux, x86_64-linux, x86_64-darwin ] nanomsg-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - naperian: [ i686-linux, x86_64-linux, x86_64-darwin ] naqsha: [ i686-linux, x86_64-linux, x86_64-darwin ] narc: [ i686-linux, x86_64-linux, x86_64-darwin ] nat-sized-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] nationstates: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] + natural: [ i686-linux, x86_64-linux, x86_64-darwin ] naver-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] + nc-indicators: [ i686-linux, x86_64-linux, x86_64-darwin ] NearContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] neat: [ i686-linux, x86_64-linux, x86_64-darwin ] needle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7179,6 +7341,7 @@ dont-distribute-packages: nested-sequence: [ i686-linux, x86_64-linux, x86_64-darwin ] NestedFunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] nestedmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + net-spider: [ i686-linux, x86_64-linux, x86_64-darwin ] netclock: [ i686-linux, x86_64-linux, x86_64-darwin ] netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] netease-fm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7196,19 +7359,17 @@ dont-distribute-packages: network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] network-api-support: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-bitcoin: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-bsd: [ i686-linux, x86_64-linux, x86_64-darwin ] network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-dbus: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - network-pgi: [ i686-linux, x86_64-linux, x86_64-darwin ] network-protocol-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-rpca: [ i686-linux, x86_64-linux, x86_64-darwin ] network-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7217,9 +7378,10 @@ dont-distribute-packages: network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] network-topic-models: [ i686-linux, x86_64-linux, x86_64-darwin ] network-transport-amqp: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-transport-inmemory: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-transport-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-transport-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] network-transport-zeromq: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-uri-json: [ i686-linux, x86_64-linux, x86_64-darwin ] - network-uri-static: [ i686-linux, x86_64-linux, x86_64-darwin ] network-voicetext: [ i686-linux, x86_64-linux, x86_64-darwin ] network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7228,7 +7390,6 @@ dont-distribute-packages: neural-network-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] neural: [ i686-linux, x86_64-linux, x86_64-darwin ] newports: [ i686-linux, x86_64-linux, x86_64-darwin ] - newsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] newt: [ i686-linux, x86_64-linux, x86_64-darwin ] newtype-deriving: [ i686-linux, x86_64-linux, x86_64-darwin ] newtype-th: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7246,20 +7407,18 @@ dont-distribute-packages: Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] nirum: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] - nix-delegate: [ i686-linux, x86_64-linux, x86_64-darwin ] - nix-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] nix-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ] + nixpkgs-update: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] - nlopt-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] nlp-scores-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ] nlp-scores: [ i686-linux, x86_64-linux, x86_64-darwin ] nm: [ i686-linux, x86_64-linux, x86_64-darwin ] NMap: [ i686-linux, x86_64-linux, x86_64-darwin ] - nme: [ i686-linux, x86_64-linux, x86_64-darwin ] nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] no-role-annots: [ i686-linux, x86_64-linux, x86_64-darwin ] noether: [ i686-linux, x86_64-linux, x86_64-darwin ] + nofib-analyse: [ i686-linux, x86_64-linux, x86_64-darwin ] nofib-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] noise: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7267,21 +7426,22 @@ dont-distribute-packages: Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] + non-empty-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + nonempty-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + NonEmpty: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] nonlinear-optimization-ad: [ i686-linux, x86_64-linux, x86_64-darwin ] nonlinear-optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] - noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] normalization-insensitive: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - not-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] NoTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] + np-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] - nqe: [ i686-linux, x86_64-linux, x86_64-darwin ] ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ] null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7291,22 +7451,30 @@ dont-distribute-packages: NumberSieves: [ i686-linux, x86_64-linux, x86_64-darwin ] NumberTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + numerals: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ode: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] + numerical: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-array: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-range: [ i686-linux, x86_64-linux, x86_64-darwin ] numhask-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + numhask: [ i686-linux, x86_64-linux, x86_64-darwin ] Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] Nutri: [ i686-linux, x86_64-linux, x86_64-darwin ] + nvim-hs-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + nvim-hs-ghcid: [ i686-linux, x86_64-linux, x86_64-darwin ] + nvim-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] NXT: [ i686-linux, x86_64-linux, x86_64-darwin ] NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] nylas: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + oasis-xrd: [ 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 ] @@ -7315,6 +7483,7 @@ dont-distribute-packages: Object: [ i686-linux, x86_64-linux, x86_64-darwin ] objectid: [ i686-linux, x86_64-linux, x86_64-darwin ] ObjectIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + objective: [ i686-linux, x86_64-linux, x86_64-darwin ] ocaml-export: [ i686-linux, x86_64-linux, x86_64-darwin ] octane: [ i686-linux, x86_64-linux, x86_64-darwin ] octohat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7322,20 +7491,22 @@ dont-distribute-packages: Octree: [ i686-linux, x86_64-linux, x86_64-darwin ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + OddWord: [ i686-linux, x86_64-linux, x86_64-darwin ] oden-go-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] + oeis2: [ i686-linux, x86_64-linux, x86_64-darwin ] off-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] oi: [ i686-linux, x86_64-linux, x86_64-darwin ] oidc-client: [ i686-linux, x86_64-linux, x86_64-darwin ] ois-input-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] - old-version: [ i686-linux, x86_64-linux, x86_64-darwin ] olwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] + om-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] omaketex: [ i686-linux, x86_64-linux, x86_64-darwin ] ombra: [ i686-linux, x86_64-linux, x86_64-darwin ] Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] omega: [ i686-linux, x86_64-linux, x86_64-darwin ] - omnicodec: [ i686-linux, x86_64-linux, x86_64-darwin ] omnifmt: [ i686-linux, x86_64-linux, x86_64-darwin ] on-a-horse: [ i686-linux, x86_64-linux, x86_64-darwin ] onama: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7353,27 +7524,20 @@ dont-distribute-packages: 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 ] OpenCLWrappers: [ i686-linux, x86_64-linux, x86_64-darwin ] - opencog-atomspace: [ i686-linux, x86_64-linux, x86_64-darwin ] - opencv-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] opencv-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] - opencv: [ i686-linux, x86_64-linux, x86_64-darwin ] opendatatable: [ i686-linux, x86_64-linux, x86_64-darwin ] - openexchangerates: [ i686-linux, x86_64-linux, x86_64-darwin ] - openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenGLCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] opengles: [ i686-linux, x86_64-linux, x86_64-darwin ] - OpenGLRaw21: [ i686-linux, x86_64-linux, x86_64-darwin ] - openpgp-crypto-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - openpgp-Crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] - openpgp: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenSCAD: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -7381,19 +7545,20 @@ 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 ] + optimization: [ 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 ] + options-time: [ 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 ] orchid: [ i686-linux, x86_64-linux, x86_64-darwin ] order-maintenance: [ i686-linux, x86_64-linux, x86_64-darwin ] - order-statistic-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] order-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] - ordered: [ i686-linux, x86_64-linux, x86_64-darwin ] orders: [ i686-linux, x86_64-linux, x86_64-darwin ] Ordinary: [ i686-linux, x86_64-linux, x86_64-darwin ] ordrea: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7406,18 +7571,23 @@ 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 ] + osdkeys: [ 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 ] oso2pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] otp-authenticator: [ i686-linux, x86_64-linux, x86_64-darwin ] + OTP: [ i686-linux, x86_64-linux, x86_64-darwin ] + ottparse-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] overloaded-records: [ i686-linux, x86_64-linux, x86_64-darwin ] overture: [ i686-linux, x86_64-linux, x86_64-darwin ] pack: [ i686-linux, x86_64-linux, x86_64-darwin ] package-description-remote: [ i686-linux, x86_64-linux, x86_64-darwin ] package-o-tron: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] + packdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] packed-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] packed-multikey-map: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7428,21 +7598,29 @@ dont-distribute-packages: pads-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] pagarme: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] - pagerduty: [ i686-linux, x86_64-linux, x86_64-darwin ] + pagure-hook-receiver: [ i686-linux, x86_64-linux, x86_64-darwin ] Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ] + palette: [ i686-linux, x86_64-linux, x86_64-darwin ] pam: [ i686-linux, x86_64-linux, x86_64-darwin ] panda: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-crossref: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-filter-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-include-code: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-include: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-sidenote: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-stylefrommeta: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] pang-a-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] + pango: [ i686-linux, x86_64-linux, x86_64-darwin ] pangraph: [ i686-linux, x86_64-linux, x86_64-darwin ] panpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + pansite: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-export: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-implement: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-include: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7452,6 +7630,7 @@ dont-distribute-packages: papa-prelude-semigroups: [ i686-linux, x86_64-linux, x86_64-darwin ] papa-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] paphragen: [ i686-linux, x86_64-linux, x86_64-darwin ] + papillon: [ i686-linux, x86_64-linux, x86_64-darwin ] pappy: [ i686-linux, x86_64-linux, x86_64-darwin ] paprika: [ i686-linux, x86_64-linux, x86_64-darwin ] paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7471,26 +7650,26 @@ dont-distribute-packages: parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-free: [ i686-linux, x86_64-linux, x86_64-darwin ] parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] + parsec-pratt: [ i686-linux, x86_64-linux, x86_64-darwin ] parseerror-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] parsely: [ i686-linux, x86_64-linux, x86_64-darwin ] parser-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] parser241: [ i686-linux, x86_64-linux, x86_64-darwin ] parsergen: [ i686-linux, x86_64-linux, x86_64-darwin ] parsestar: [ i686-linux, x86_64-linux, x86_64-darwin ] + parsix: [ i686-linux, x86_64-linux, x86_64-darwin ] partage: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-order: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial-semigroup-hedgehog: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial-semigroup-test: [ i686-linux, x86_64-linux, x86_64-darwin ] - partial-semigroup: [ i686-linux, x86_64-linux, x86_64-darwin ] partly: [ i686-linux, x86_64-linux, x86_64-darwin ] passage: [ i686-linux, x86_64-linux, x86_64-darwin ] PasswordGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + passwords: [ i686-linux, x86_64-linux, x86_64-darwin ] pasta: [ i686-linux, x86_64-linux, x86_64-darwin ] pastis: [ i686-linux, x86_64-linux, x86_64-darwin ] pasty: [ i686-linux, x86_64-linux, x86_64-darwin ] + patat: [ i686-linux, x86_64-linux, x86_64-darwin ] patches-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] - path-text-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ] Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] PathTree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7504,6 +7683,7 @@ dont-distribute-packages: pbc4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] PBKDF2: [ i686-linux, x86_64-linux, x86_64-darwin ] pcap-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + pcd-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] pcf: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7520,8 +7700,10 @@ dont-distribute-packages: peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] PeanoWitnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] pec: [ i686-linux, x86_64-linux, x86_64-darwin ] + pedestrian-dag: [ i686-linux, x86_64-linux, x86_64-darwin ] peg: [ i686-linux, x86_64-linux, x86_64-darwin ] peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] + pell: [ i686-linux, x86_64-linux, x86_64-darwin ] pencil: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7529,7 +7711,6 @@ dont-distribute-packages: penrose: [ i686-linux, x86_64-linux, x86_64-darwin ] peparser: [ i686-linux, x86_64-linux, x86_64-darwin ] perceptron: [ i686-linux, x86_64-linux, x86_64-darwin ] - perdure: [ i686-linux, x86_64-linux, x86_64-darwin ] peregrin: [ i686-linux, x86_64-linux, x86_64-darwin ] perf-analysis: [ i686-linux, x86_64-linux, x86_64-darwin ] perf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7538,20 +7719,26 @@ 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 ] + Persistence: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-database-url: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-equivalence: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] - persistent-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-mongoDB: [ 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-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-refs: [ 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-test: [ 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 ] @@ -7569,9 +7756,7 @@ dont-distribute-packages: pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] - phaser: [ i686-linux, x86_64-linux, x86_64-darwin ] phoityne: [ i686-linux, x86_64-linux, x86_64-darwin ] - phone-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-push: [ i686-linux, x86_64-linux, x86_64-darwin ] phooey: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7589,12 +7774,18 @@ 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 ] + pidfile: [ 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 ] + pig: [ i686-linux, x86_64-linux, x86_64-darwin ] + pinch: [ i686-linux, x86_64-linux, x86_64-darwin ] pinchot: [ i686-linux, x86_64-linux, x86_64-darwin ] + ping: [ i686-linux, x86_64-linux, x86_64-darwin ] pinpon: [ i686-linux, x86_64-linux, x86_64-darwin ] pipe-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cacophony: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7605,14 +7796,15 @@ dont-distribute-packages: pipes-courier: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-fluid: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-illumina: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-io: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] - pipes-lzma: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-p2p: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-random: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-rt: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-shell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7634,21 +7826,28 @@ 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 ] 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 ] plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-gtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-light-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + plots: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + plur: [ i686-linux, x86_64-linux, x86_64-darwin ] + plural: [ i686-linux, x86_64-linux, x86_64-darwin ] png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7656,9 +7855,11 @@ dont-distribute-packages: pocket: [ i686-linux, x86_64-linux, x86_64-darwin ] point-octree: [ i686-linux, x86_64-linux, x86_64-darwin ] pointfree-fancy: [ i686-linux, x86_64-linux, x86_64-darwin ] + pointful: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -7668,33 +7869,37 @@ dont-distribute-packages: poly-control: [ i686-linux, x86_64-linux, x86_64-darwin ] polydata-core: [ i686-linux, x86_64-linux, x86_64-darwin ] polydata: [ i686-linux, x86_64-linux, x86_64-darwin ] - polynom: [ i686-linux, x86_64-linux, x86_64-darwin ] polynomial: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] + polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] + pomaps: [ i686-linux, x86_64-linux, x86_64-darwin ] pomodoro: [ i686-linux, x86_64-linux, x86_64-darwin ] pomohoro: [ i686-linux, x86_64-linux, x86_64-darwin ] ponder: [ i686-linux, x86_64-linux, x86_64-darwin ] pong-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - pontarius-mediaserver: [ i686-linux, x86_64-linux, x86_64-darwin ] pontarius-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] - pontarius-xpmn: [ i686-linux, x86_64-linux, x86_64-darwin ] pool-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pool: [ i686-linux, x86_64-linux, x86_64-darwin ] popenhs: [ i686-linux, x86_64-linux, x86_64-darwin ] + poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] portager: [ i686-linux, x86_64-linux, x86_64-darwin ] porte: [ i686-linux, x86_64-linux, x86_64-darwin ] porter: [ i686-linux, x86_64-linux, x86_64-darwin ] PortFusion: [ i686-linux, x86_64-linux, x86_64-darwin ] ports: [ i686-linux, x86_64-linux, x86_64-darwin ] + posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] + posix-api: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-pty: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-realtime: [ i686-linux, x86_64-linux, x86_64-darwin ] posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] postgres-embedded: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgres-tmp: [ i686-linux, x86_64-linux, x86_64-darwin ] postgres-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-copy-escape: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-lo-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7706,13 +7911,14 @@ dont-distribute-packages: postgresql-simple-url: [ 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 ] postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] + postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + potoki-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-core: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] potoki-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7727,7 +7933,7 @@ dont-distribute-packages: pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] praglude: [ i686-linux, x86_64-linux, x86_64-darwin ] - precis: [ i686-linux, x86_64-linux, x86_64-darwin ] + pragmatic-show: [ i686-linux, x86_64-linux, x86_64-darwin ] precursor: [ i686-linux, x86_64-linux, x86_64-darwin ] pred-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] predicate-class: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7744,18 +7950,17 @@ dont-distribute-packages: presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-ncols: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-relative-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - 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-array: [ 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 ] primitive-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] - primitive-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-indexed: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] - primitive-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] + PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] pringletons: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7775,13 +7980,13 @@ dont-distribute-packages: process-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] process-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] processing: [ i686-linux, x86_64-linux, x86_64-darwin ] - procrastinating-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] producer: [ i686-linux, x86_64-linux, x86_64-darwin ] product: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] prof2pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + profiteur: [ i686-linux, x86_64-linux, x86_64-darwin ] progress-meter: [ i686-linux, x86_64-linux, x86_64-darwin ] progress: [ i686-linux, x86_64-linux, x86_64-darwin ] progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7794,16 +7999,18 @@ dont-distribute-packages: prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] prometheus-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] - prometheus-metrics-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] + prometheus: [ i686-linux, x86_64-linux, x86_64-darwin ] promise: [ i686-linux, x86_64-linux, x86_64-darwin ] + pronounce: [ i686-linux, x86_64-linux, x86_64-darwin ] proof-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] propane: [ i686-linux, x86_64-linux, x86_64-darwin ] + propellor: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] properties: [ i686-linux, x86_64-linux, x86_64-darwin ] property-list: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] - prospect: [ i686-linux, x86_64-linux, x86_64-darwin ] prosper: [ i686-linux, x86_64-linux, x86_64-darwin ] + proteome: [ 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 ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7811,6 +8018,7 @@ dont-distribute-packages: protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protolude-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] proton-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + prototype: [ i686-linux, x86_64-linux, x86_64-darwin ] prove-everywhere-server: [ i686-linux, x86_64-linux, x86_64-darwin ] proxy-kindness: [ i686-linux, x86_64-linux, x86_64-darwin ] proxy-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7818,7 +8026,9 @@ dont-distribute-packages: pseudo-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] PSQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] pthread: [ i686-linux, x86_64-linux, x86_64-darwin ] + PTQ: [ i686-linux, x86_64-linux, x86_64-darwin ] ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] + publicsuffix: [ i686-linux, x86_64-linux, x86_64-darwin ] publicsuffixlistcreate: [ i686-linux, x86_64-linux, x86_64-darwin ] pubnub: [ i686-linux, x86_64-linux, x86_64-darwin ] pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7827,7 +8037,6 @@ dont-distribute-packages: pugs-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] pugs-DrIFT: [ i686-linux, x86_64-linux, x86_64-darwin ] pugs-hsregex: [ i686-linux, x86_64-linux, x86_64-darwin ] - pugs-HsSyck: [ i686-linux, x86_64-linux, x86_64-darwin ] Pugs: [ i686-linux, x86_64-linux, x86_64-darwin ] PUH-Project: [ i686-linux, x86_64-linux, x86_64-darwin ] punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7837,6 +8046,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 ] @@ -7847,6 +8057,7 @@ dont-distribute-packages: pushme: [ i686-linux, x86_64-linux, x86_64-darwin ] putlenses: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] + puzzle-draw: [ i686-linux, x86_64-linux, x86_64-darwin ] pvd: [ i686-linux, x86_64-linux, x86_64-darwin ] PyF: [ i686-linux, x86_64-linux, x86_64-darwin ] pyffi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7863,7 +8074,6 @@ dont-distribute-packages: QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-imager: [ i686-linux, x86_64-linux, x86_64-darwin ] qr-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] - qt: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-cpp-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7882,14 +8092,13 @@ dont-distribute-packages: queryparser-presto: [ i686-linux, x86_64-linux, x86_64-darwin ] queryparser-vertica: [ i686-linux, x86_64-linux, x86_64-darwin ] queryparser: [ i686-linux, x86_64-linux, x86_64-darwin ] - querystring-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] questioner: [ i686-linux, x86_64-linux, x86_64-darwin ] queuelike: [ i686-linux, x86_64-linux, x86_64-darwin ] quick-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] quickbooks: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-arbitrary-template: [ i686-linux, x86_64-linux, x86_64-darwin ] - quickcheck-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-property-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7899,6 +8108,7 @@ dont-distribute-packages: quickcheck-report: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-state-machine-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-state-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-string-random: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-webdriver: [ 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 ] @@ -7922,6 +8132,7 @@ dont-distribute-packages: R-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] raaz: [ i686-linux, x86_64-linux, x86_64-darwin ] rad: [ i686-linux, x86_64-linux, x86_64-darwin ] + radian: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7930,13 +8141,14 @@ dont-distribute-packages: rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] rails-session: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] - Raincat: [ i686-linux, x86_64-linux, x86_64-darwin ] + raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] - ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] + rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] raml: [ i686-linux, x86_64-linux, x86_64-darwin ] rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] randfile: [ i686-linux, x86_64-linux, x86_64-darwin ] + rando: [ i686-linux, x86_64-linux, x86_64-darwin ] random-access-list: [ i686-linux, x86_64-linux, x86_64-darwin ] random-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] random-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7945,11 +8157,12 @@ dont-distribute-packages: random-hypergeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] random-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] RandomDotOrg: [ i686-linux, x86_64-linux, x86_64-darwin ] + range-set-list: [ i686-linux, x86_64-linux, x86_64-darwin ] range-space: [ i686-linux, x86_64-linux, x86_64-darwin ] Range: [ i686-linux, x86_64-linux, x86_64-darwin ] - range: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranged-sets: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] + rank1dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] rank2classes: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] rapid-term: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7968,7 +8181,7 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] - rasterific-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] + rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7976,7 +8189,9 @@ dont-distribute-packages: razom-text-util: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] + rdf: [ i686-linux, x86_64-linux, x86_64-darwin ] rdioh: [ i686-linux, x86_64-linux, x86_64-darwin ] react-flux-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] react-flux: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7985,17 +8200,19 @@ dont-distribute-packages: reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-automation: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-bunch: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] - reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] read-io: [ i686-linux, x86_64-linux, x86_64-darwin ] readline-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8005,18 +8222,16 @@ dont-distribute-packages: really-simple-xml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] reasonable-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] record-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + record-encode: [ i686-linux, x86_64-linux, x86_64-darwin ] record-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] record: [ i686-linux, x86_64-linux, x86_64-darwin ] - records-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] records: [ i686-linux, x86_64-linux, x86_64-darwin ] + recursive-line-count: [ i686-linux, x86_64-linux, x86_64-darwin ] recursors: [ i686-linux, x86_64-linux, x86_64-darwin ] reddit: [ i686-linux, x86_64-linux, x86_64-darwin ] - redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] - redis-io: [ i686-linux, x86_64-linux, x86_64-darwin ] - redis-resp: [ i686-linux, x86_64-linux, x86_64-darwin ] redis-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] redis: [ i686-linux, x86_64-linux, x86_64-darwin ] redland: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8024,9 +8239,11 @@ dont-distribute-packages: reduce-equations: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] reenact: [ i686-linux, x86_64-linux, x86_64-darwin ] + ref-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] - Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + ref-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] refcount: [ i686-linux, x86_64-linux, x86_64-darwin ] Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] refh: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8043,8 +8260,7 @@ dont-distribute-packages: refurb: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-tdfa-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8053,11 +8269,7 @@ dont-distribute-packages: regex-tdfa-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-tre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-type: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex-with-pcre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ] - regex: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexchar: [ i686-linux, x86_64-linux, x86_64-darwin ] - regexdot: [ i686-linux, x86_64-linux, x86_64-darwin ] regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] regexpr-symbolic: [ i686-linux, x86_64-linux, x86_64-darwin ] regexqq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8076,6 +8288,7 @@ dont-distribute-packages: rei: [ i686-linux, x86_64-linux, x86_64-darwin ] reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] + relacion: [ i686-linux, x86_64-linux, x86_64-darwin ] relapse: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8090,7 +8303,6 @@ dont-distribute-packages: remote-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] remote: [ i686-linux, x86_64-linux, x86_64-darwin ] remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] - reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-array: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8114,10 +8326,11 @@ dont-distribute-packages: reprinter: [ i686-linux, x86_64-linux, x86_64-darwin ] reproject: [ i686-linux, x86_64-linux, x86_64-darwin ] req-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + require: [ 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 ] resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] resolve-trivial-conflicts: [ i686-linux, x86_64-linux, x86_64-darwin ] resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8132,14 +8345,12 @@ dont-distribute-packages: rest-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] rest-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] rest-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + rest-stringmap: [ i686-linux, x86_64-linux, x86_64-darwin ] rest-types: [ i686-linux, x86_64-linux, x86_64-darwin ] rest-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] restful-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] - restless-git: [ i686-linux, x86_64-linux, x86_64-darwin ] - RESTng: [ i686-linux, x86_64-linux, x86_64-darwin ] restricted-workers: [ i686-linux, x86_64-linux, x86_64-darwin ] restyle: [ i686-linux, x86_64-linux, x86_64-darwin ] - resumable-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] rethinkdb-client-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] rethinkdb-model: [ i686-linux, x86_64-linux, x86_64-darwin ] rethinkdb-wereHamster: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8157,9 +8368,11 @@ dont-distribute-packages: rfc-psql: [ i686-linux, x86_64-linux, x86_64-darwin ] rfc-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] + ribosome: [ 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 ] ridley: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8167,8 +8380,6 @@ dont-distribute-packages: riff: [ i686-linux, x86_64-linux, x86_64-darwin ] ring-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] riot: [ i686-linux, x86_64-linux, x86_64-darwin ] - ripple-federation: [ i686-linux, x86_64-linux, x86_64-darwin ] - ripple: [ i686-linux, x86_64-linux, x86_64-darwin ] risc386: [ i686-linux, x86_64-linux, x86_64-darwin ] riscv-isa: [ i686-linux, x86_64-linux, x86_64-darwin ] rivers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8191,16 +8402,14 @@ dont-distribute-packages: rncryptor: [ i686-linux, x86_64-linux, x86_64-darwin ] rob: [ i686-linux, x86_64-linux, x86_64-darwin ] robin: [ i686-linux, x86_64-linux, x86_64-darwin ] - robot: [ i686-linux, x86_64-linux, x86_64-darwin ] robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] roc-cluster-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] roc-cluster: [ i686-linux, x86_64-linux, x86_64-darwin ] - roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] - roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] - roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] roku-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + rollbar-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] roller: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] + ron: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8208,12 +8417,12 @@ 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 ] roundtrip-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] - route-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] route-planning: [ i686-linux, x86_64-linux, x86_64-darwin ] rowrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] rpc-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8225,11 +8434,9 @@ dont-distribute-packages: rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] rss-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - rss: [ i686-linux, x86_64-linux, x86_64-darwin ] - RtMidi: [ i686-linux, x86_64-linux, x86_64-darwin ] + rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] rtnetlink: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - rtorrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] rts-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] ruby-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] ruby-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8250,9 +8457,14 @@ dont-distribute-packages: safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-length: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-money-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-money-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-money-serialise: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-money-store: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-money-xmlbf: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-money: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] - safecopy-migrate: [ i686-linux, x86_64-linux, x86_64-darwin ] safecopy-store: [ i686-linux, x86_64-linux, x86_64-darwin ] safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] safepath: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8285,6 +8497,7 @@ dont-distribute-packages: satchmo-funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-minisat: [ i686-linux, x86_64-linux, x86_64-darwin ] satchmo-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] + satchmo: [ i686-linux, x86_64-linux, x86_64-darwin ] savage: [ i686-linux, x86_64-linux, x86_64-darwin ] sax: [ i686-linux, x86_64-linux, x86_64-darwin ] SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8292,12 +8505,13 @@ dont-distribute-packages: sc3-rdu: [ i686-linux, x86_64-linux, x86_64-darwin ] scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] + SCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] + scalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] scat: [ i686-linux, x86_64-linux, x86_64-darwin ] scc: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] schedule-planner: [ i686-linux, x86_64-linux, x86_64-darwin ] schedyield: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8307,7 +8521,6 @@ dont-distribute-packages: scholdoc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] - science-constants: [ i686-linux, x86_64-linux, x86_64-darwin ] scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] scion: [ i686-linux, x86_64-linux, x86_64-darwin ] scons2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8316,42 +8529,42 @@ dont-distribute-packages: scottish: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-binding-play: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-cookie: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-format: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-params-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-path-normalizer: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-resource: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-session: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-view: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] scp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] scrabble-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] sdl2-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-fps: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-mixer: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-sprite: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2-ttf: [ i686-linux, x86_64-linux, x86_64-darwin ] - sdl2: [ i686-linux, x86_64-linux, x86_64-darwin ] sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] - seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] seakale-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] seakale-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] seakale: [ i686-linux, x86_64-linux, x86_64-darwin ] + search-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] sec: [ i686-linux, x86_64-linux, x86_64-darwin ] secdh: [ i686-linux, x86_64-linux, x86_64-darwin ] seclib: [ i686-linux, x86_64-linux, x86_64-darwin ] second-transfer: [ i686-linux, x86_64-linux, x86_64-darwin ] + secp256k1: [ i686-linux, x86_64-linux, x86_64-darwin ] secret-santa: [ i686-linux, x86_64-linux, x86_64-darwin ] secret-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8365,9 +8578,11 @@ dont-distribute-packages: Semantique: [ i686-linux, x86_64-linux, x86_64-darwin ] semdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] + semibounded-lattices: [ i686-linux, x86_64-linux, x86_64-darwin ] Semigroup: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroupoids-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ] + semilattices: [ i686-linux, x86_64-linux, x86_64-darwin ] semiring-num: [ i686-linux, x86_64-linux, x86_64-darwin ] semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8379,6 +8594,8 @@ dont-distribute-packages: sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] + seqid-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + seqid: [ i686-linux, x86_64-linux, x86_64-darwin ] seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] seqloc: [ i686-linux, x86_64-linux, x86_64-darwin ] sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8390,28 +8607,43 @@ dont-distribute-packages: serv: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-aeson-specs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-cookie: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-rocksdb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-checked-exceptions-core: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-checked-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-client-namedargs: [ 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 ] + servant-dhall: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-github-webhook: [ 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-namedargs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-pandoc: [ 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 ] @@ -8422,10 +8654,18 @@ dont-distribute-packages: servant-rawm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-server-namedargs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-streaming-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-streaming-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-streaming-server: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-swagger-ui-core: [ 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-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-swagger: [ 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 ] @@ -8441,14 +8681,16 @@ dont-distribute-packages: sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] sessiontypes-distributed: [ i686-linux, x86_64-linux, x86_64-darwin ] sessiontypes: [ i686-linux, x86_64-linux, x86_64-darwin ] - set-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + set-cover: [ i686-linux, x86_64-linux, x86_64-darwin ] + set-of: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] + setdown: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ i686-linux, x86_64-linux, x86_64-darwin ] setoid: [ i686-linux, x86_64-linux, x86_64-darwin ] sets: [ i686-linux, x86_64-linux, x86_64-darwin ] setters: [ i686-linux, x86_64-linux, x86_64-darwin ] + sexp-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] - sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] sext: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8459,30 +8701,26 @@ dont-distribute-packages: sgd: [ i686-linux, x86_64-linux, x86_64-darwin ] SGdemo: [ i686-linux, x86_64-linux, x86_64-darwin ] sgf: [ i686-linux, x86_64-linux, x86_64-darwin ] + SGplus: [ i686-linux, x86_64-linux, x86_64-darwin ] sgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] + sh2md: [ i686-linux, x86_64-linux, x86_64-darwin ] sha-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] shade: [ i686-linux, x86_64-linux, x86_64-darwin ] shadower: [ i686-linux, x86_64-linux, x86_64-darwin ] - shady-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - shady-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] - shake-ats: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] shared-fields: [ i686-linux, x86_64-linux, x86_64-darwin ] - shared-memory: [ i686-linux, x86_64-linux, x86_64-darwin ] she: [ i686-linux, x86_64-linux, x86_64-darwin ] shelduck: [ i686-linux, x86_64-linux, x86_64-darwin ] - shell-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] - shell-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-compatline: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8492,7 +8730,9 @@ 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 ] - shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] + shellwords: [ i686-linux, x86_64-linux, x86_64-darwin ] + shh: [ i686-linux, x86_64-linux, x86_64-darwin ] + shimmer: [ 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 ] shopify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8506,12 +8746,14 @@ dont-distribute-packages: sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] sigma-ij: [ i686-linux, x86_64-linux, x86_64-darwin ] + sign: [ i686-linux, x86_64-linux, x86_64-darwin ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] signed-multiset: [ i686-linux, x86_64-linux, x86_64-darwin ] silvi: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -8521,36 +8763,38 @@ dont-distribute-packages: simple-download: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-genetic-algorithm: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-index: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-log-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-money: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-neural-networks: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-pascal: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-rope: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-session: [ i686-linux, x86_64-linux, x86_64-darwin ] - simple-sql-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-tar: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] simple: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleargs: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - SimpleH: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleirc: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleLog: [ i686-linux, x86_64-linux, x86_64-darwin ] simplenote: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleServer: [ i686-linux, x86_64-linux, x86_64-darwin ] + simplest-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] singleton-dict: [ i686-linux, x86_64-linux, x86_64-darwin ] + singleton-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] singnal: [ i686-linux, x86_64-linux, x86_64-darwin ] sink: [ i686-linux, x86_64-linux, x86_64-darwin ] siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8561,6 +8805,7 @@ dont-distribute-packages: sized-grid: [ i686-linux, x86_64-linux, x86_64-darwin ] sized-types: [ i686-linux, x86_64-linux, x86_64-darwin ] sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + sized: [ i686-linux, x86_64-linux, x86_64-darwin ] sizes: [ i686-linux, x86_64-linux, x86_64-darwin ] sjsp: [ i686-linux, x86_64-linux, x86_64-darwin ] skeletal-set: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8568,18 +8813,21 @@ 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 ] slack-web: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] - slave-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] + slick: [ i686-linux, x86_64-linux, x86_64-darwin ] slidemews: [ i686-linux, x86_64-linux, x86_64-darwin ] Slides: [ i686-linux, x86_64-linux, x86_64-darwin ] slim: [ i686-linux, x86_64-linux, x86_64-darwin ] sloane: [ i686-linux, x86_64-linux, x86_64-darwin ] + slope-field: [ i686-linux, x86_64-linux, x86_64-darwin ] slot-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] + slug: [ i686-linux, x86_64-linux, x86_64-darwin ] smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] smallcaps: [ i686-linux, x86_64-linux, x86_64-darwin ] smallcheck-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8603,7 +8851,6 @@ dont-distribute-packages: smtlib2-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] - smtp2mta: [ i686-linux, x86_64-linux, x86_64-darwin ] SMTPClient: [ i686-linux, x86_64-linux, x86_64-darwin ] smtps-gmail: [ i686-linux, x86_64-linux, x86_64-darwin ] smuggler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8614,9 +8861,10 @@ dont-distribute-packages: snap-configuration-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-error-collector: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-loader-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] - snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-language: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8675,19 +8923,18 @@ dont-distribute-packages: snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] snowtify: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] + soap-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] - sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-icmp: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket-io: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] - socket: [ i686-linux, x86_64-linux, x86_64-darwin ] socketed: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] + sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -8715,13 +8962,16 @@ dont-distribute-packages: sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] sparser: [ i686-linux, x86_64-linux, x86_64-darwin ] spata: [ i686-linux, x86_64-linux, x86_64-darwin ] - spatial-math: [ i686-linux, x86_64-linux, x86_64-darwin ] spatial-rotations: [ i686-linux, x86_64-linux, x86_64-darwin ] - spdx: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] special-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + species: [ i686-linux, x86_64-linux, x86_64-darwin ] + spectral-clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] + speculation-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + speculation: [ i686-linux, x86_64-linux, x86_64-darwin ] speechmatics: [ i686-linux, x86_64-linux, x86_64-darwin ] + speedy-slice: [ i686-linux, x86_64-linux, x86_64-darwin ] spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ] sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8746,7 +8996,9 @@ 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 ] + sproxy-web: [ 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 ] sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8760,7 +9012,6 @@ dont-distribute-packages: sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ] sqsd-local: [ i686-linux, x86_64-linux, x86_64-darwin ] squeal-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - squeeze: [ i686-linux, x86_64-linux, x86_64-darwin ] srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] sscan: [ i686-linux, x86_64-linux, x86_64-darwin ] sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8779,16 +9030,19 @@ dont-distribute-packages: stack-hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-network: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-prism: [ 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 ] + stack-type: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack2cabal: [ 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 ] stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] - stackage-query: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-to-hackage: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-types: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage2nix: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8796,7 +9050,6 @@ dont-distribute-packages: standalone-derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] starling: [ i686-linux, x86_64-linux, x86_64-darwin ] - starrover2: [ i686-linux, x86_64-linux, x86_64-darwin ] stash: [ i686-linux, x86_64-linux, x86_64-darwin ] Stasis: [ i686-linux, x86_64-linux, x86_64-darwin ] state-bag: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8805,6 +9058,7 @@ dont-distribute-packages: state: [ i686-linux, x86_64-linux, x86_64-darwin ] stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] stateWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] + static-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] static-closure: [ i686-linux, x86_64-linux, x86_64-darwin ] static-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] static-text: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8814,31 +9068,35 @@ 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 ] + status-notifier-item: [ i686-linux, x86_64-linux, x86_64-darwin ] + staversion: [ 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 ] stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] steambrowser: [ i686-linux, x86_64-linux, x86_64-darwin ] - steeloverseer: [ i686-linux, x86_64-linux, x86_64-darwin ] stego-uuid: [ i686-linux, x86_64-linux, x86_64-darwin ] stemmer-german: [ i686-linux, x86_64-linux, x86_64-darwin ] stemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] - stitch: [ i686-linux, x86_64-linux, x86_64-darwin ] STL: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] - stm-hamt: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-io-hooks: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-promise: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-supply: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] stochastic: [ i686-linux, x86_64-linux, x86_64-darwin ] + StockholmAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] storable: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + stp: [ i686-linux, x86_64-linux, x86_64-darwin ] str: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-ATermLib: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8851,32 +9109,33 @@ dont-distribute-packages: stream-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + streamdeck: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] streaming-postgresql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-process: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] strelka: [ i686-linux, x86_64-linux, x86_64-darwin ] strict-data: [ i686-linux, x86_64-linux, x86_64-darwin ] - strict-types: [ i686-linux, x86_64-linux, x86_64-darwin ] StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] StrictCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] strictly: [ i686-linux, x86_64-linux, x86_64-darwin ] string-isos: [ i686-linux, x86_64-linux, x86_64-darwin ] + string-random: [ i686-linux, x86_64-linux, x86_64-darwin ] string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] stringtable-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe-core: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe-http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] - stripe-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + stripe-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-traversal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8885,6 +9144,7 @@ dont-distribute-packages: stt: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] stutter: [ i686-linux, x86_64-linux, x86_64-darwin ] + stylish-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] stylized: [ i686-linux, x86_64-linux, x86_64-darwin ] sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8892,48 +9152,49 @@ dont-distribute-packages: submark: [ i686-linux, x86_64-linux, x86_64-darwin ] subsample: [ i686-linux, x86_64-linux, x86_64-darwin ] substring-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + subwordgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] successors: [ i686-linux, x86_64-linux, x86_64-darwin ] suffix-array: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] sunroof-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-server: [ i686-linux, x86_64-linux, x86_64-darwin ] super-user-spark: [ i686-linux, x86_64-linux, x86_64-darwin ] + superbubbles: [ i686-linux, x86_64-linux, x86_64-darwin ] superbuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ] - superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] superevent: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] - sv-core: [ i686-linux, x86_64-linux, x86_64-darwin ] sv-svfactor: [ i686-linux, x86_64-linux, x86_64-darwin ] sv: [ i686-linux, x86_64-linux, x86_64-darwin ] SVD2HS: [ i686-linux, x86_64-linux, x86_64-darwin ] + svfactor: [ i686-linux, x86_64-linux, x86_64-darwin ] svg-builder-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] - svg-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] + svgcairo: [ i686-linux, x86_64-linux, x86_64-darwin ] svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-light-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] swagger-petstore: [ i686-linux, x86_64-linux, x86_64-darwin ] swagger-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + swagger2: [ i686-linux, x86_64-linux, x86_64-darwin ] swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] swf: [ i686-linux, x86_64-linux, x86_64-darwin ] swift-lda: [ i686-linux, x86_64-linux, x86_64-darwin ] - sws: [ i686-linux, x86_64-linux, x86_64-darwin ] syb-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] syb-with-class-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] SybWidget: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8941,7 +9202,10 @@ dont-distribute-packages: sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] sym: [ i686-linux, x86_64-linux, x86_64-darwin ] + symantic-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + symantic-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] symantic-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + symantic: [ i686-linux, x86_64-linux, x86_64-darwin ] symengine-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] symengine: [ i686-linux, x86_64-linux, x86_64-darwin ] symmetric-properties: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8974,9 +9238,9 @@ dont-distribute-packages: t3-client: [ i686-linux, x86_64-linux, x86_64-darwin ] t3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] ta: [ i686-linux, x86_64-linux, x86_64-darwin ] + table-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] table-tennis: [ i686-linux, x86_64-linux, x86_64-darwin ] table: [ i686-linux, x86_64-linux, x86_64-darwin ] - TableAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] tableaux: [ i686-linux, x86_64-linux, x86_64-darwin ] Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] tables: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8992,14 +9256,12 @@ dont-distribute-packages: tagged-th: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-timers: [ i686-linux, x86_64-linux, x86_64-darwin ] taglib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] - tagset-positional: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-megaparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] tai64: [ i686-linux, x86_64-linux, x86_64-darwin ] tai: [ i686-linux, x86_64-linux, x86_64-darwin ] - tailfile-hinotify: [ i686-linux, x86_64-linux, x86_64-darwin ] takahashi: [ i686-linux, x86_64-linux, x86_64-darwin ] takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9016,10 +9278,12 @@ dont-distribute-packages: tasty-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-hedgehog-coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-jenkins-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-tap: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-travis: [ i686-linux, x86_64-linux, x86_64-darwin ] TaxonomyTools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9033,8 +9297,10 @@ dont-distribute-packages: tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] tdigest-Chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + tdigest: [ i686-linux, x86_64-linux, x86_64-darwin ] TeaHS: [ i686-linux, x86_64-linux, x86_64-darwin ] teams: [ i686-linux, x86_64-linux, x86_64-darwin ] + teardown: [ i686-linux, x86_64-linux, x86_64-darwin ] teeth: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-bot-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9047,7 +9313,6 @@ dont-distribute-packages: template-haskell-compat-v0208: [ i686-linux, x86_64-linux, x86_64-darwin ] template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] template-hsml: [ i686-linux, x86_64-linux, x86_64-darwin ] - template-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] templateify: [ i686-linux, x86_64-linux, x86_64-darwin ] templatepg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9056,11 +9321,19 @@ 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 ] - term-rewriting: [ 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 ] + termbox-banana: [ 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-punch: [ 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 ] @@ -9082,19 +9355,15 @@ dont-distribute-packages: testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] testpack: [ i686-linux, x86_64-linux, x86_64-darwin ] testpattern: [ i686-linux, x86_64-linux, x86_64-darwin ] - testPkg: [ i686-linux, x86_64-linux, x86_64-darwin ] testrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] TeX-my-math: [ i686-linux, x86_64-linux, x86_64-darwin ] tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-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-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 ] text-markup: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9102,10 +9371,8 @@ dont-distribute-packages: text-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] text-position: [ i686-linux, x86_64-linux, x86_64-darwin ] text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-replace: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-show-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] text-time: [ i686-linux, x86_64-linux, x86_64-darwin ] - text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-zipper-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9123,28 +9390,31 @@ dont-distribute-packages: th-instance-reification: [ i686-linux, x86_64-linux, x86_64-darwin ] th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] th-kinds-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-nowq: [ i686-linux, x86_64-linux, x86_64-darwin ] th-sccs: [ i686-linux, x86_64-linux, x86_64-darwin ] th-to-exp: [ i686-linux, x86_64-linux, x86_64-darwin ] th-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] th-typegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] thank-you-stars: [ i686-linux, x86_64-linux, x86_64-darwin ] - theatre: [ i686-linux, x86_64-linux, x86_64-darwin ] themoviedb: [ i686-linux, x86_64-linux, x86_64-darwin ] thentos-cookie-session: [ i686-linux, x86_64-linux, x86_64-darwin ] Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest: [ i686-linux, x86_64-linux, x86_64-darwin ] + these-skinny: [ i686-linux, x86_64-linux, x86_64-darwin ] + these: [ i686-linux, x86_64-linux, x86_64-darwin ] thih: [ i686-linux, x86_64-linux, x86_64-darwin ] thimk: [ i686-linux, x86_64-linux, x86_64-darwin ] Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] - threepenny-editors: [ i686-linux, x86_64-linux, x86_64-darwin ] + threadmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + threads-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] + threadscope: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-contextmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui-flexbox: [ i686-linux, x86_64-linux, x86_64-darwin ] - Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + through-text: [ 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 ] @@ -9152,6 +9422,7 @@ dont-distribute-packages: TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-serial: [ i686-linux, x86_64-linux, x86_64-darwin ] + tidal-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ] tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ] tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9175,16 +9446,19 @@ dont-distribute-packages: timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] + timeplot: [ i686-linux, x86_64-linux, x86_64-darwin ] timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] - timerep: [ i686-linux, x86_64-linux, x86_64-darwin ] + timers-tick: [ i686-linux, x86_64-linux, x86_64-darwin ] timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] timespan: [ i686-linux, x86_64-linux, x86_64-darwin ] timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] + tintin: [ i686-linux, x86_64-linux, x86_64-darwin ] tiny-scheduler: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] tinyMesh: [ i686-linux, x86_64-linux, x86_64-darwin ] tinytemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] + tinyXml: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] titan: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9203,12 +9477,16 @@ 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 ] + tomland: [ i686-linux, x86_64-linux, x86_64-darwin ] + tonatona-google-server-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + too-many-cells: [ i686-linux, x86_64-linux, x86_64-darwin ] + toodles: [ 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 ] @@ -9222,12 +9500,15 @@ dont-distribute-packages: toysolver: [ i686-linux, x86_64-linux, x86_64-darwin ] tpar: [ i686-linux, x86_64-linux, x86_64-darwin ] tpb: [ i686-linux, x86_64-linux, x86_64-darwin ] + tpdb: [ i686-linux, x86_64-linux, x86_64-darwin ] trace-call: [ i686-linux, x86_64-linux, x86_64-darwin ] trace-function-call: [ i686-linux, x86_64-linux, x86_64-darwin ] trace: [ i686-linux, x86_64-linux, x86_64-darwin ] traced: [ i686-linux, x86_64-linux, x86_64-darwin ] + tracetree: [ 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 ] @@ -9246,7 +9527,9 @@ 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 ] + trasa: [ 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 ] trawl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9261,6 +9544,7 @@ dont-distribute-packages: TrendGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] trhsx: [ i686-linux, x86_64-linux, x86_64-darwin ] triangulation: [ i686-linux, x86_64-linux, x86_64-darwin ] + trie-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ] tries: [ i686-linux, x86_64-linux, x86_64-darwin ] trigger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9273,19 +9557,16 @@ dont-distribute-packages: tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] tskiplist: [ i686-linux, x86_64-linux, x86_64-darwin ] - tslib: [ i686-linux, x86_64-linux, x86_64-darwin ] tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] tsparse: [ i686-linux, x86_64-linux, x86_64-darwin ] tsuntsun: [ i686-linux, x86_64-linux, x86_64-darwin ] tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] ttask: [ i686-linux, x86_64-linux, x86_64-darwin ] ttn-client: [ i686-linux, x86_64-linux, x86_64-darwin ] - ttn: [ i686-linux, x86_64-linux, x86_64-darwin ] tttool: [ i686-linux, x86_64-linux, x86_64-darwin ] tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] - tuple-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-ops: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9293,8 +9574,8 @@ dont-distribute-packages: turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] turingMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -9307,12 +9588,14 @@ dont-distribute-packages: twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + twilio: [ i686-linux, x86_64-linux, x86_64-darwin ] twill: [ i686-linux, x86_64-linux, x86_64-darwin ] twine: [ i686-linux, x86_64-linux, x86_64-darwin ] - twisty: [ i686-linux, x86_64-linux, x86_64-darwin ] - twitch: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter-feed: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-types-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] txt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9330,12 +9613,12 @@ dont-distribute-packages: type-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] type-indexed-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] type-int: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-bst: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-natural-number-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-natural-number-operations: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-level-sets: [ i686-linux, x86_64-linux, x86_64-darwin ] type-list: [ i686-linux, x86_64-linux, x86_64-darwin ] - type-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] type-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9345,23 +9628,24 @@ dont-distribute-packages: type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] - TypeCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-admin: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] + typedflow: [ i686-linux, x86_64-linux, x86_64-darwin ] typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeIlluminator: [ i686-linux, x86_64-linux, x86_64-darwin ] typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeNat: [ i686-linux, x86_64-linux, x86_64-darwin ] typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] - typerep-map: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + typography-geometry: [ 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 ] uber: [ i686-linux, x86_64-linux, x86_64-darwin ] uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] uconv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9373,23 +9657,17 @@ dont-distribute-packages: ui-command: [ i686-linux, x86_64-linux, x86_64-darwin ] UMM: [ i686-linux, x86_64-linux, x86_64-darwin ] unagi-bloomfilter: [ i686-linux, x86_64-linux, x86_64-darwin ] + unagi-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] unamb-custom: [ i686-linux, x86_64-linux, x86_64-darwin ] unbound: [ i686-linux, x86_64-linux, x86_64-darwin ] unbounded-delays-units: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - 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 ] - uni-posixutil: [ i686-linux, x86_64-linux, x86_64-darwin ] - uni-reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] uni-uDrawGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] - uni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-normalization: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-show: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] - unicoder: [ i686-linux, x86_64-linux, x86_64-darwin ] uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9398,19 +9676,25 @@ dont-distribute-packages: uniquely-represented-sets: [ i686-linux, x86_64-linux, x86_64-darwin ] units-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] units-defs: [ i686-linux, x86_64-linux, x86_64-darwin ] - units-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] units: [ i686-linux, x86_64-linux, x86_64-darwin ] unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] unity-testresult-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] unitym-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] + universe-instances-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + universe: [ i686-linux, x86_64-linux, x86_64-darwin ] + universum: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-fcntl: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-handle: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] unm-hip: [ i686-linux, x86_64-linux, x86_64-darwin ] unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] unordered-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] + unordered-intmap: [ i686-linux, x86_64-linux, x86_64-darwin ] unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] + unpacked-either: [ i686-linux, x86_64-linux, x86_64-darwin ] + unpacked-maybe-numeric: [ i686-linux, x86_64-linux, x86_64-darwin ] + unpacked-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] unpacked-these: [ i686-linux, x86_64-linux, x86_64-darwin ] unpacked-validation: [ i686-linux, x86_64-linux, x86_64-darwin ] unroll-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9426,11 +9710,14 @@ dont-distribute-packages: upskirt: [ i686-linux, x86_64-linux, x86_64-darwin ] ureader: [ i686-linux, x86_64-linux, x86_64-darwin ] urembed: [ i686-linux, x86_64-linux, x86_64-darwin ] + uri-bytestring-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + uri-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] uri-enumerator-file: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -9438,12 +9725,15 @@ 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 ] + urlencoded: [ 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 ] urxml: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-hid: [ i686-linux, x86_64-linux, x86_64-darwin ] + usb-id-database: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-safe: [ i686-linux, x86_64-linux, x86_64-darwin ] users-mysql-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9452,6 +9742,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 ] @@ -9464,29 +9757,35 @@ dont-distribute-packages: uulib: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] uvector: [ i686-linux, x86_64-linux, x86_64-darwin ] + uxadt: [ i686-linux, x86_64-linux, x86_64-darwin ] v4l2-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] + vabal: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-ubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] + vado: [ i686-linux, x86_64-linux, x86_64-darwin ] valid-names: [ i686-linux, x86_64-linux, x86_64-darwin ] validate-input: [ i686-linux, x86_64-linux, x86_64-darwin ] validated-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] validated-types: [ i686-linux, x86_64-linux, x86_64-darwin ] Validation: [ i686-linux, x86_64-linux, x86_64-darwin ] - validation: [ i686-linux, x86_64-linux, x86_64-darwin ] validations: [ i686-linux, x86_64-linux, x86_64-darwin ] + validity-path: [ i686-linux, x86_64-linux, x86_64-darwin ] vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] var: [ i686-linux, x86_64-linux, x86_64-darwin ] varan: [ i686-linux, x86_64-linux, x86_64-darwin ] variable-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] variables: [ i686-linux, x86_64-linux, x86_64-darwin ] - varying: [ i686-linux, x86_64-linux, x86_64-darwin ] + variation: [ 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 ] + vaultenv: [ i686-linux, x86_64-linux, x86_64-darwin ] + vaultenv: [ 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 ] vcf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9495,51 +9794,61 @@ dont-distribute-packages: Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Transform: [ i686-linux, x86_64-linux, x86_64-darwin ] + vec: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-floating-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-floating: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] vector-random: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-read-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] - vector-space-map: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-space-points: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + vectortiles: [ i686-linux, x86_64-linux, x86_64-darwin ] Verba: [ i686-linux, x86_64-linux, x86_64-darwin ] verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict: [ i686-linux, x86_64-linux, x86_64-darwin ] + verifiable-expressions: [ i686-linux, x86_64-linux, x86_64-darwin ] verify: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + versioning-servant: [ i686-linux, x86_64-linux, x86_64-darwin ] + versioning: [ i686-linux, x86_64-linux, x86_64-darwin ] vfr-waypoints: [ i686-linux, x86_64-linux, x86_64-darwin ] vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] vhd: [ i686-linux, x86_64-linux, x86_64-darwin ] vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] vicinity: [ i686-linux, x86_64-linux, x86_64-darwin ] ViennaRNA-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + viewprof: [ i686-linux, x86_64-linux, x86_64-darwin ] views: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] Villefort: [ i686-linux, x86_64-linux, x86_64-darwin ] vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ] vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] - vinyl-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-vectors: [ i686-linux, x86_64-linux, x86_64-darwin ] virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] + visibility: [ i686-linux, x86_64-linux, x86_64-darwin ] vision: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-graphrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] visualize-cbn: [ i686-linux, x86_64-linux, x86_64-darwin ] + vivid-supercollider: [ i686-linux, x86_64-linux, x86_64-darwin ] + vivid: [ 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 ] @@ -9551,19 +9860,19 @@ 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 ] + vulkan-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + vulkan: [ 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 ] wai-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-frontend-monadcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-git-http: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-hmac-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9580,6 +9889,7 @@ dont-distribute-packages: wai-middleware-etag: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-preprocessor: [ 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 ] @@ -9587,16 +9897,19 @@ dont-distribute-packages: 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-routes: [ 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 ] wai-session-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] - wai-session-tokyocabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-static-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-throttler: [ i686-linux, x86_64-linux, x86_64-darwin ] + waitfree: [ i686-linux, x86_64-linux, x86_64-darwin ] waitra: [ i686-linux, x86_64-linux, x86_64-darwin ] waldo: [ i686-linux, x86_64-linux, x86_64-darwin ] + wallpaper: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ] WashNGo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9607,10 +9920,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 ] @@ -9636,11 +9951,11 @@ dont-distribute-packages: webfinger-client: [ i686-linux, x86_64-linux, x86_64-darwin ] webify: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkit2gtk3-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] webpage: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] websockets-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] - websockets-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] weighted-regexp: [ i686-linux, x86_64-linux, x86_64-darwin ] weighted: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9658,15 +9973,20 @@ dont-distribute-packages: why3: [ i686-linux, x86_64-linux, x86_64-darwin ] WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] + wild-bind-indicator: [ i686-linux, x86_64-linux, x86_64-darwin ] + wild-bind-task-x11: [ i686-linux, x86_64-linux, x86_64-darwin ] windns: [ i686-linux, x86_64-linux, x86_64-darwin ] windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] - winery: [ i686-linux, x86_64-linux, x86_64-darwin ] winio: [ i686-linux, x86_64-linux, x86_64-darwin ] - wire-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + Wired: [ i686-linux, x86_64-linux, x86_64-darwin ] + wires: [ i686-linux, x86_64-linux, x86_64-darwin ] wiring: [ i686-linux, x86_64-linux, x86_64-darwin ] + withdependencies: [ 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 ] + wl-pprint-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + wl-pprint-terminfo: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPLib: [ i686-linux, x86_64-linux, x86_64-darwin ] wlc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9677,25 +9997,28 @@ dont-distribute-packages: word2vec-model: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] wordchoice: [ i686-linux, x86_64-linux, x86_64-darwin ] - Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] + wordpass: [ i686-linux, x86_64-linux, x86_64-darwin ] wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + work-time: [ i686-linux, x86_64-linux, x86_64-darwin ] workdays: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-osx: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-types: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-windows: [ i686-linux, x86_64-linux, x86_64-darwin ] + Workflow: [ i686-linux, x86_64-linux, x86_64-darwin ] wp-archivebot: [ i686-linux, x86_64-linux, x86_64-darwin ] wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ] wrecker-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -9704,10 +10027,7 @@ dont-distribute-packages: wumpus-microprint: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] WURFL: [ i686-linux, x86_64-linux, x86_64-darwin ] - wx: [ i686-linux, x86_64-linux, x86_64-darwin ] wxAsteroids: [ i686-linux, x86_64-linux, x86_64-darwin ] - wxc: [ i686-linux, x86_64-linux, x86_64-darwin ] - wxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] WXDiffCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] wxdirect: [ i686-linux, x86_64-linux, x86_64-darwin ] wxFruit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9722,8 +10042,8 @@ dont-distribute-packages: X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ] X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ] + xattr: [ 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 ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] xcp: [ i686-linux, x86_64-linux, x86_64-darwin ] xdcc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9735,6 +10055,7 @@ dont-distribute-packages: xhb-atom-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] xhb-ewmh: [ i686-linux, x86_64-linux, x86_64-darwin ] xhb: [ i686-linux, x86_64-linux, x86_64-darwin ] + xilinx-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] xine: [ i686-linux, x86_64-linux, x86_64-darwin ] xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] xkbcommon: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9746,6 +10067,7 @@ dont-distribute-packages: xml-conduit-decode: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-html-conduit-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9755,12 +10077,11 @@ dont-distribute-packages: xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-tydom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-tydom-core: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] - XML: [ i686-linux, x86_64-linux, x86_64-darwin ] xmlbf-xeno: [ i686-linux, x86_64-linux, x86_64-darwin ] xmlbf-xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmlhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] XMLParser: [ i686-linux, x86_64-linux, x86_64-darwin ] xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9770,12 +10091,9 @@ dont-distribute-packages: xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-gpl: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-entryhelper: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-screenshot: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-vanessa: [ i686-linux, x86_64-linux, x86_64-darwin ] - xmonad-wallpaper: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-windownames: [ i686-linux, x86_64-linux, x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9790,7 +10108,6 @@ dont-distribute-packages: xsd: [ i686-linux, x86_64-linux, x86_64-darwin ] xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] xtc: [ i686-linux, x86_64-linux, x86_64-darwin ] - xturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] xxhash: [ i686-linux, x86_64-linux, x86_64-darwin ] y0l0bot: [ i686-linux, x86_64-linux, x86_64-darwin ] yabi-muno: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9802,19 +10119,27 @@ 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-datasource: [ i686-linux, x86_64-linux, x86_64-darwin ] + yam-job: [ 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 ] + yam: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-pretty-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] @@ -9823,6 +10148,8 @@ dont-distribute-packages: yarr: [ i686-linux, x86_64-linux, x86_64-darwin ] yate: [ i686-linux, x86_64-linux, x86_64-darwin ] yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaya-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaya: [ i686-linux, x86_64-linux, x86_64-darwin ] ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] yeller: [ i686-linux, x86_64-linux, x86_64-darwin ] yeshql-postgresql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9835,6 +10162,7 @@ dont-distribute-packages: yesod-auth-bcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-bcryptdb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-deskcom: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-hmac-keccak: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9846,6 +10174,7 @@ dont-distribute-packages: yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-zendesk: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9864,6 +10193,7 @@ dont-distribute-packages: yesod-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-markdown: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-pagination: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paypal-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9875,7 +10205,6 @@ dont-distribute-packages: yesod-raml-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml: [ i686-linux, x86_64-linux, x86_64-darwin ] - yesod-recaptcha2: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-recaptcha: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9889,8 +10218,8 @@ dont-distribute-packages: yesod-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-vend: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] - yet-another-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ] + yggdrasil: [ i686-linux, x86_64-linux, x86_64-darwin ] yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9913,9 +10242,7 @@ dont-distribute-packages: yices: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] - yoga: [ i686-linux, x86_64-linux, x86_64-darwin ] + yoda: [ 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 ] yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9925,10 +10252,11 @@ dont-distribute-packages: yu-core: [ i686-linux, x86_64-linux, x86_64-darwin ] yu-launch: [ i686-linux, x86_64-linux, x86_64-darwin ] yu-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] - yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] + yx: [ i686-linux, x86_64-linux, x86_64-darwin ] yxdb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] z3-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] + z85: [ i686-linux, x86_64-linux, x86_64-darwin ] zabt: [ i686-linux, x86_64-linux, x86_64-darwin ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9943,6 +10271,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 ] @@ -9952,11 +10281,10 @@ dont-distribute-packages: zifter-hlint: [ i686-linux, x86_64-linux, x86_64-darwin ] zifter-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] zifter: [ i686-linux, x86_64-linux, x86_64-darwin ] + zigbee-znet25: [ i686-linux, x86_64-linux, x86_64-darwin ] zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] - ZipFold: [ i686-linux, x86_64-linux, x86_64-darwin ] zipkin: [ i686-linux, x86_64-linux, x86_64-darwin ] - zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] ziptastic-client: [ i686-linux, x86_64-linux, x86_64-darwin ] ziptastic-core: [ i686-linux, x86_64-linux, x86_64-darwin ] zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9964,7 +10292,6 @@ dont-distribute-packages: ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ] - zmqat: [ i686-linux, x86_64-linux, x86_64-darwin ] zoneinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom-cache-pcm: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom-cache-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9974,6 +10301,7 @@ dont-distribute-packages: zre: [ i686-linux, x86_64-linux, x86_64-darwin ] zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] + zsyntax: [ i686-linux, x86_64-linux, x86_64-darwin ] ztar: [ i686-linux, x86_64-linux, x86_64-darwin ] zuramaru: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ 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 be90794f58d96de0b9b64fba9f54cd1681311e59..0000000000000000000000000000000000000000 --- 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 d016bd6ce8d67bb521157ed22b445c2a383092f6..0502e7003133270a8bee65ae119faaf809b6ab77 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -126,13 +126,21 @@ self: super: builtins.intersectAttrs super { # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; - # Prevents needing to add security_tool as a build tool to all of x509-system's - # dependencies. - x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc + # Prevents needing to add `security_tool` as a run-time dependency for + # everything using x509-system to give access to the `security` executable. + 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; @@ -145,9 +153,6 @@ self: super: builtins.intersectAttrs super { gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; - # Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build - taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; })); - # Add necessary reference to gtk3 package gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3; @@ -314,6 +319,9 @@ self: super: builtins.intersectAttrs super { # https://github.com/bos/pcap/issues/5 pcap = addExtraLibrary super.pcap pkgs.libpcap; + # https://github.com/NixOS/nixpkgs/issues/53336 + greenclip = addExtraLibrary super.greenclip pkgs.xorg.libXdmcp; + # The cabal files for these libraries do not list the required system dependencies. miniball = overrideCabal super.miniball (drv: { librarySystemDepends = [ pkgs.miniball ]; @@ -466,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: { @@ -511,4 +519,51 @@ self: super: builtins.intersectAttrs super { # 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 = if pkgs.stdenv.isDarwin then super.futhark else 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" + ''; + }); + + # On Darwin, git-annex mis-detects options to `cp`, so we wrap the binary to + # ensure it uses Nixpkgs' coreutils. + git-annex = with pkgs; + if (!stdenv.isLinux) then + let path = stdenv.lib.makeBinPath [ coreutils ]; + in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: { + postFixup = '' + wrapProgram $out/bin/git-annex \ + --prefix PATH : "${path}" + ''; + }) + else super.git-annex; + + # The test suite has undeclared dependencies on git. + githash = dontCheck super.githash; + + # Avoid infitite recursion with yaya. + yaya-hedgehog = super.yaya-hedgehog.override { yaya = dontCheck self.yaya; }; + + # Avoid infitite recursion with tonatona. + tonaparser = dontCheck super.tonaparser; + } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index b8943a55394ab5161d9358d202ce27eb12ec3d5c..a4f0399cf3c622774f4cbc973f0ca6eda301d37a 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 cdbf119af8c4e42a226252d8689a550af69a9c19..2724ff5d6220163d705dfb0f828bf2d76c1627b6 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 @@ -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) @@ -72,6 +74,11 @@ in , hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock +, # Don't fail at configure time if there are multiple versions of the + # same package in the (recursive) dependencies of the package being + # built. Will delay failures, if any, to compile time. + allowInconsistentDependencies ? false +, maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221 } @ args: assert editedCabalFile != null -> revision != null; @@ -120,6 +127,7 @@ let "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" "--with-gcc=${stdenv.cc.targetPrefix}cc" "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" + "--with-ar=${stdenv.cc.bintools.targetPrefix}ar" # use the one that comes with the cross compiler. "--with-hsc2hs=${ghc.targetPrefix}hsc2hs" "--with-strip=${stdenv.cc.bintools.targetPrefix}strip" @@ -152,6 +160,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)) [ @@ -172,8 +181,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; @@ -190,20 +198,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"; @@ -213,8 +216,7 @@ let continue fi ''; - -in +in stdenv.lib.fix (drv: assert allPkgconfigDepends != [] -> pkgconfig != null; @@ -249,6 +251,7 @@ stdenv.mkDerivation ({ '' + postPatch; setupCompilerEnvironmentPhase = '' + NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) runHook preSetupCompilerEnvironment echo "Build with ${ghc}." @@ -339,11 +342,12 @@ stdenv.mkDerivation ({ echo configureFlags: $configureFlags ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" - if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then - echo >&2 "*** abort because of serious configure-time warning from Cabal" - exit 1 - fi - + ${stdenv.lib.optionalString (!allowInconsistentDependencies) '' + if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then + echo >&2 "*** abort because of serious configure-time warning from Cabal" + exit 1 + fi + ''} export GHC_PACKAGE_PATH="$packageConfDir:" runHook postConfigure @@ -373,6 +377,10 @@ stdenv.mkDerivation ({ runHook postHaddock ''; + # The scary sed expression handles two cases in v2.5 Cabal's package configs: + # 1. 'id: short-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO' + # 2. 'id:\n + # very-long-descriptive-useful-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO' installPhase = '' runHook preInstall @@ -387,7 +395,7 @@ stdenv.mkDerivation ({ rmdir "$packageConfFile" fi for packageConfFile in "$packageConfDir/"*; do - local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) + local pkgId=$( ${gnused}/bin/sed -n -e ':a' -e '/^id:$/N; s/id:\n[ ]*\([^\n]*\).*$/\1/p; s/id:[ ]*\([^\n]*\)$/\1/p; ta' $packageConfFile ) mv $packageConfFile $packageConfDir/$pkgId.conf done @@ -427,6 +435,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? @@ -437,23 +452,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; } @@ -487,3 +490,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/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 2afe270e0fc8714fec76a44bea700b5914a8af6a..184d45eda4453e012c43254493d19ac7bba2daea 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,6 +1,5 @@ -{ stdenv, ghc, pkgconfig, glibcLocales, cacert, stack }@depArgs: - -with stdenv.lib; +{ stdenv, ghc, pkgconfig, glibcLocales +, cacert, stack, makeSetupHook, lib }@depArgs: { buildInputs ? [] , extraArgs ? [] @@ -10,34 +9,27 @@ with stdenv.lib; , ... }@args: -let stackCmd = "stack --internal-re-exec-version=${stack.version}"; - - # Add all dependencies in buildInputs including propagated ones to - # STACK_IN_NIX_EXTRA_ARGS. - addStackArgsHook = '' -for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]} -do - [ -d "$pkg/lib" ] && \ - export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib" - [ -d "$pkg/include" ] && \ - export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include" -done - ''; +let + + stackCmd = "stack --internal-re-exec-version=${stack.version}"; + + # Add all dependencies in buildInputs including propagated ones to + # STACK_IN_NIX_EXTRA_ARGS. + stackHook = makeSetupHook {} ./stack-hook.sh; + in stdenv.mkDerivation (args // { - buildInputs = - buildInputs ++ - optional (stdenv.hostPlatform.libc == "glibc") glibcLocales ++ - [ ghc pkgconfig stack ]; + buildInputs = buildInputs + ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; - STACK_PLATFORM_VARIANT="nix"; - STACK_IN_NIX_SHELL=1; - STACK_IN_NIX_EXTRA_ARGS = extraArgs; - shellHook = addStackArgsHook + args.shellHook or ""; + nativeBuildInputs = [ ghc pkgconfig stack stackHook ]; + STACK_PLATFORM_VARIANT = "nix"; + STACK_IN_NIX_SHELL = 1; + STACK_IN_NIX_EXTRA_ARGS = extraArgs; # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042. - LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs); + LD_LIBRARY_PATH = lib.makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs); # ^^^ Internally uses `getOutput "lib"` (equiv. to getLib) # Non-NixOS git needs cert @@ -48,18 +40,33 @@ in stdenv.mkDerivation (args // { preferLocalBuild = true; - configurePhase = args.configurePhase or '' + preConfigure = '' export STACK_ROOT=$NIX_BUILD_TOP/.stack - ${addStackArgsHook} ''; - buildPhase = args.buildPhase or "${stackCmd} build"; + buildPhase = args.buildPhase or '' + runHook preBuild + + ${stackCmd} build + + runHook postBuild + ''; + + checkPhase = args.checkPhase or '' + runHook preCheck - checkPhase = args.checkPhase or "${stackCmd} test"; + ${stackCmd} test + + runHook postCheck + ''; doCheck = args.doCheck or true; installPhase = args.installPhase or '' + runHook preInstall + ${stackCmd} --local-bin-path=$out/bin build --copy-bins + + runHook postInstall ''; }) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 003d9d259ace73a1f831a7830ebe9dc4f6440614..f82f49dd8912e024164209093ac60088768ad309 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; @@ -266,6 +274,7 @@ self: { ]; description = "Efficient, high-level dynamic programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ADPfusionForest" = callPackage @@ -317,6 +326,7 @@ self: { ]; description = "Dynamic programming for Set data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AERN-Basics" = callPackage @@ -717,7 +727,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 +736,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 +750,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 +765,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 +1188,8 @@ self: { }: mkDerivation { pname = "BNFC"; - version = "2.8.1"; - sha256 = "082r1arj76563q1grc9ivpzfip8ghdffm87fj4q830s40dffl6rc"; + version = "2.8.2"; + sha256 = "1n4zgm6gls6lpasn8y5hy0m75qkkbk6mj18g2yhjrw8514a5860h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -1192,7 +1203,6 @@ self: { ]; description = "A compiler front-end generator"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC-meta" = callPackage @@ -1397,6 +1407,7 @@ self: { ]; description = "Libary for Hidden Markov Models in HMMER3 format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Biobase" = callPackage @@ -1457,6 +1468,24 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "BiobaseFR3D" = callPackage ({ mkDerivation, base, BiobaseXNA, bytestring, containers , filemanip, iteratee, tuple @@ -1474,20 +1503,61 @@ 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; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -1568,6 +1638,7 @@ self: { ]; description = "Newick file format parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseTrainingData" = callPackage @@ -1609,30 +1680,30 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseVienna" = callPackage @@ -1948,6 +2019,7 @@ self: { libraryHaskellDepends = [ base bytestring network text ]; description = "A socker wrapper that makes the IO of sockets much cleaner"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Buster" = callPackage @@ -2005,6 +2077,7 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "Delimited continuations and dynamically scoped variables"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CC-delcont-alt" = callPackage @@ -2237,6 +2310,7 @@ self: { ]; description = "Firing rules semantic of CSPM"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-Frontend" = callPackage @@ -2363,83 +2437,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,7 +2466,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_2_4_0_0" = callPackage + "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 @@ -2479,8 +2476,10 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "2.4.0.0"; - sha256 = "1zz0vadgr8vn2x7fzv4hcip1mcvxah50sx6zzrxhn9c1lw0l0cgl"; + version = "2.4.1.0"; + sha256 = "151mrrd9sskghvlwmj32da5gafwqj6sv9xz9fmp84b7vm4nr0skk"; + revision = "1"; + editedCabalFile = "1dvs2i0kfk8rji9wbrv7y0iydbif9jzg4c7rmaa6lxg8hp7mij2n"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -2573,6 +2572,7 @@ self: { libraryHaskellDepends = [ base containers fgl parsec ]; description = "An implementation and DSL for the Carneades argumentation model"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CarneadesIntoDung" = callPackage @@ -2589,6 +2589,7 @@ self: { ]; description = "A translation from the Carneades argumentation model into Dung's AFs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Cartesian" = callPackage @@ -2679,6 +2680,7 @@ self: { ]; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-cairo" = callPackage @@ -2695,6 +2697,7 @@ self: { ]; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-diagrams" = callPackage @@ -2733,6 +2736,7 @@ self: { ]; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-simple" = callPackage @@ -2758,8 +2762,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 ]; @@ -2923,6 +2927,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Libary for parsing Clustal tools output"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Coadjute" = callPackage @@ -3393,8 +3398,8 @@ self: { ({ mkDerivation, base, HUnit, mtl, old-locale, QuickCheck, time }: mkDerivation { pname = "Craft3e"; - version = "0.1.1.0"; - sha256 = "1r81jr1lsx3jyjqybbbdnynh5sh36nn7mp8a0zzjzkmmrqm405bk"; + version = "0.1.1.1"; + sha256 = "0p5cdayl6j25pk7ab857bf3mcdp73464z56d98apnsb94j0d3whg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3420,6 +3425,7 @@ self: { ]; description = "Collects together existing Haskell cryptographic functions into a package"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CurryDB" = callPackage @@ -3487,8 +3493,8 @@ self: { }: mkDerivation { pname = "DAV"; - version = "1.3.2"; - sha256 = "0sai0b7bxwif5czmmdik5dx318drx18inid87wfrxckrflsi8cv1"; + version = "1.3.3"; + sha256 = "149rdrbjx59a2rbx2r6fzhmyl3f35a2gbh4sarbpffv0pmirrx14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -3507,6 +3513,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 { @@ -3636,25 +3672,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; }) {}; @@ -3963,6 +4004,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "A very simple implementation of decision trees for discrete attributes"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DeepArrow" = callPackage @@ -3974,7 +4016,6 @@ self: { libraryHaskellDepends = [ base haskell-src mtl TypeCompose ]; description = "Arrows for \"deep application\""; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DeepDarkFantasy" = callPackage @@ -4046,7 +4087,6 @@ self: { libraryHaskellDepends = [ base containers xmonad xmonad-contrib ]; description = "A library for specifying xmonad key bindings with functionality"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Dflow" = callPackage @@ -4386,6 +4426,7 @@ self: { libraryHaskellDepends = [ base cmdargs containers parsec ]; description = "An implementation of the Dung argumentation frameworks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Dust" = callPackage @@ -4566,8 +4607,8 @@ self: { }: mkDerivation { pname = "Earley"; - version = "0.12.1.0"; - sha256 = "07dxsl2cvb40z2z41a263xpg5mhplaqj9p2qjhaw6q5rkjz9653k"; + version = "0.13.0.0"; + sha256 = "0pyj9c5d6xvz4mdpg0nfrl0100rh34442ix73l6ys4pnsadyql0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ListLike ]; @@ -4579,6 +4620,7 @@ self: { ]; description = "Parsing all context-free grammars using Earley's algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ebnf2ps" = callPackage @@ -4998,10 +5040,10 @@ self: { }: mkDerivation { pname = "Euterpea"; - version = "2.0.5"; - sha256 = "186r8a2829sqx4l6n80vifc7g8b5ap66jl3hnqdwzg7s2c0r9saq"; + version = "2.0.6"; + sha256 = "0smaa34s0yz90q4qx104glyx8s93k6vn6r60m6aq9infm7rkffxw"; revision = "1"; - editedCabalFile = "1fy3f610i8nwfipfm1dxgb8807k1vix9d65rgn59k579390xfvw8"; + editedCabalFile = "1yrr18wv22ri1v8mij4lazl5lpri7sf8bxbz7igsbs8dngmycn9r"; libraryHaskellDepends = [ array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm @@ -5384,6 +5426,7 @@ self: { ]; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FileSystem" = callPackage @@ -5420,13 +5463,15 @@ self: { }) {}; "Fin" = callPackage - ({ mkDerivation, alg, base, foldable1, natural-induction, peano }: + ({ mkDerivation, alg, base, foldable1, natural-induction, peano + , universe-base + }: mkDerivation { pname = "Fin"; - version = "0.2.5.0"; - sha256 = "0jh64an111k7a3limqc03irk914s8asy6h4iik7layw4pagpsiyc"; + version = "0.2.7.0"; + sha256 = "0w29dc2mdy0q3y5v6mkc0m51vp1bmbx8bswvr1khby63vb5zwcf3"; 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; @@ -5572,8 +5617,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 @@ -5591,6 +5636,8 @@ self: { pname = "ForSyDe"; version = "3.1.1"; sha256 = "0ggwskyxpdrjny0rz61zdp20r5vzig8ggmqxf0qa8gljvvfp6bhp"; + revision = "2"; + editedCabalFile = "1aqgir67890wknbrjk1lj3f8kgdvr6abxrhzam1wh7n9jy3i5d68"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers directory filepath mtl old-time @@ -5603,17 +5650,17 @@ self: { }) {}; "ForestStructures" = callPackage - ({ mkDerivation, base, containers, criterion, fgl, QuickCheck - , tasty, tasty-quickcheck, tasty-th, unordered-containers, vector - , vector-th-unbox + ({ 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.0.2"; - sha256 = "0gv9hvwbql015k28xvphx4dllpfp5dgi36l3bkg48630xrzhcx7y"; + version = "0.0.1.0"; + sha256 = "1hhmcc0cpjbixqjgl35gv9dpymamdfb4vhhd5hard0qpg1xllnvw"; libraryHaskellDepends = [ - base containers fgl QuickCheck unordered-containers vector - vector-th-unbox + base bifunctors containers fgl lens QuickCheck unordered-containers + vector vector-th-unbox ]; testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck tasty-th vector @@ -5745,7 +5792,6 @@ self: { libraryHaskellDepends = [ base HaXml ]; description = "A binding for the Financial Products Markup Language (v5.3)"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FractalArt" = callPackage @@ -5795,8 +5841,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.5.0"; - sha256 = "0dd2gqgxjhy23a9xhz62gzashjqmcv34gkcys4wz9l6y2fk1a5xl"; + version = "0.6.1"; + sha256 = "07pqy9ljf0ag5yxd62fi3c41pcvysfqccjizfiwz8ycfdj2b6a6l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5813,7 +5859,6 @@ self: { benchmarkHaskellDepends = [ base criterion pipes transformers ]; description = "Data frames For working with tabular data files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Frames-beam" = callPackage @@ -5837,6 +5882,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 @@ -5881,6 +5945,7 @@ self: { executableHaskellDepends = [ base GLUT OpenGL random ]; description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Fungi" = callPackage @@ -5975,6 +6040,8 @@ self: { pname = "GLFW-b"; version = "3.2.1.0"; sha256 = "19mngkprzlm322pfyljvm4lyk1j7j8ss50m5kzzmkwk3mph25h1i"; + revision = "2"; + editedCabalFile = "0xlby7483dv33c13f44kkvmai186g72jhxmcq8749s1hyxi6fqnb"; libraryHaskellDepends = [ base bindings-GLFW deepseq ]; testHaskellDepends = [ base bindings-GLFW deepseq HUnit test-framework @@ -6103,8 +6170,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.10.2"; - sha256 = "05x733nk3dbla4y6p7b1nx4pv3b0wm6idhsm7p30z2f968k3hyv9"; + version = "0.10.3"; + sha256 = "09zcb0ijm20nmynqsl585nhn1qaldkp3c8v3y28gn2cj606m8cqr"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -6112,7 +6179,6 @@ self: { libraryToolDepends = [ hpp ]; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPX" = callPackage @@ -6236,14 +6302,18 @@ self: { pname = "Gamgine"; version = "0.5.3"; sha256 = "08awl1f1310ifx9gzjrinsv37n7k2yaxvmjaymjh01pawlp3w4gc"; + revision = "1"; + editedCabalFile = "1i14r4r8814l8cilp24ypcsbac284m6pvib5037sypgqv72wn044"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring composition cpphs data-lens directory filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show StateVar time unordered-containers utility-ht Vec zlib ]; + libraryToolDepends = [ cpphs ]; description = "Some kind of game library or set of utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ganymede" = callPackage @@ -6566,8 +6636,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 @@ -6581,6 +6651,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_10_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.10.0"; + sha256 = "0953f91f62ncna402vsrfzdcyxhdpjna3bgdw017kad0dfymacs7"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -7152,11 +7245,14 @@ 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"; + revision = "1"; + editedCabalFile = "1gl61kqccd909dif3644qi1whrcbkrfif6d52hrlf2vc3kwpjs0z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -7164,9 +7260,11 @@ 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; }) {}; "HCard" = callPackage @@ -7260,8 +7358,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.3.2.5"; - sha256 = "0l9i7mkdcch7f1ajl0fma7rra3dc0llmlia0iqhqb4k0gcrpy7l8"; + version = "2.3.2.6"; + sha256 = "1kas80zv3vbqq9cd73w87fj4mwxcphfmf7ycfnl4jwdzpqjzr0yj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8114,6 +8212,7 @@ self: { testHaskellDepends = [ base HTF ]; description = "Generation of PDF documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HPath" = callPackage @@ -8540,8 +8639,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.13.2.4"; - sha256 = "1xibrzs465hg9snwvl6gp6hll6g6c7m8s2ckk8vkfg386pywmi9n"; + version = "0.13.2.5"; + sha256 = "1kmf95y4vijdiih27xa35acl02dsxqnd9qa56z1waki5qqiz6nin"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8572,6 +8671,8 @@ self: { pname = "HTTP"; version = "4000.3.12"; sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3"; + revision = "2"; + editedCabalFile = "1gw6xzp1n4gsqwnbfr29ds8v4wpk78b2bha8i108dqav97viwm8c"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -8889,10 +8990,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 = [ @@ -8901,7 +9000,6 @@ self: { executableHaskellDepends = [ base directory polyparse pretty ]; description = "Utilities for manipulating XML documents"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Hach" = callPackage @@ -9079,21 +9177,20 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A library for arbitrary precision decimal numbers"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HasCacBDD" = callPackage - ({ mkDerivation, base, Cabal, CacBDD, directory, process + ({ mkDerivation, base, Cabal, CacBDD, directory, hspec, process , QuickCheck }: mkDerivation { pname = "HasCacBDD"; - version = "0.1.0.0"; - sha256 = "1dp4glfvd3ihaq2k3y40h7yz29c5lh76mjdzjcqb0ixvkh13d7dy"; + version = "0.1.0.1"; + sha256 = "0mvhhwgz2k46d2adrrs5bhc4x2yx3zr5fwi2nnxzrjhm1ki9b8zb"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base process QuickCheck ]; librarySystemDepends = [ CacBDD ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base hspec QuickCheck ]; description = "Haskell bindings for CacBDD"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -9175,8 +9272,8 @@ self: { ({ mkDerivation, array, base, containers, random }: mkDerivation { pname = "HaskellForMaths"; - version = "0.4.8"; - sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j"; + version = "0.4.9"; + sha256 = "1jgim9g0jbv6k31aalq0yps843jmfx74k53lnd1p79kgad7670rz"; libraryHaskellDepends = [ array base containers random ]; description = "Combinatorics, group theory, commutative algebra, non-commutative algebra"; license = stdenv.lib.licenses.bsd3; @@ -9228,8 +9325,8 @@ self: { }: mkDerivation { pname = "HaskellNet-SSL"; - version = "0.3.4.0"; - sha256 = "03q48g4gzmhjl4a5wwn0q3man8s44pn028a0fidjpmfmgxa95bl3"; + version = "0.3.4.1"; + sha256 = "0j36zcx5vfg4jzc7vvfj4ifcvcgyy2sn9rxnxj3vg2cw77idqyp1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring connection data-default HaskellNet network tls @@ -9502,6 +9599,7 @@ self: { ]; description = "A Haskell binding for Chipmunk"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Hipmunk-Utils" = callPackage @@ -9800,20 +9898,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 }: @@ -9862,29 +9965,16 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.14"; - sha256 = "12blnh5x69wvhw1lx3vk14lm1klhqblgd539ffqnrg2dn9qh4ga4"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_4_15" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.4.15"; - sha256 = "0idmak6d8mpbxphyq9hkxkmby2wnzhc1phywlgm0zw6q47pwxgff"; + version = "0.11.4.16"; + sha256 = "1jbbrhbvl3y1l0g1wv5h7l59bj7w8ajl8bfpxfwjypgmqlrlks19"; + revision = "1"; + editedCabalFile = "0hc113g6jp7ci5gxx2chhp1h64nzx47c4ahwisyqgs3f6prm6dqr"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -9963,24 +10053,34 @@ self: { }) {}; "HsYAML" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, mtl, parsec - , text - }: + ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }: mkDerivation { pname = "HsYAML"; - version = "0.1.1.2"; - sha256 = "1100yzyxbvin48q3dgmzpnhz1gbqaxnkpnwy7ywzj2wrvwrr8hjx"; - revision = "2"; - editedCabalFile = "0kxfvp899l06x3y6zhnnfjx7kw1mjb3c7g0flnkllndp9i9a3pkl"; + version = "0.1.1.3"; + sha256 = "0awkwmdbdis5cbazrshiskds02kri51i19jbmgmrqbnqqhk3rl2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers dlist mtl parsec text + base bytestring containers mtl parsec text ]; description = "Pure Haskell YAML 1.2 parser"; license = stdenv.lib.licenses.gpl2; }) {}; + "HsYAML-aeson" = callPackage + ({ mkDerivation, aeson, base, bytestring, HsYAML, mtl, text, vector + }: + mkDerivation { + pname = "HsYAML-aeson"; + version = "0.1.0.0"; + sha256 = "1hf1gwa89ghd4aaim6g8dx9wppp6d1y0w1xiddm1r8lpfidca1nw"; + libraryHaskellDepends = [ + aeson base bytestring HsYAML mtl text vector + ]; + description = "JSON to YAML Adapter"; + license = stdenv.lib.licenses.gpl2Plus; + }) {}; + "Hsed" = callPackage ({ mkDerivation, array, base, bytestring, cmdargs, data-accessor , data-accessor-template, data-accessor-transformers, directory @@ -10164,6 +10264,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 @@ -10177,8 +10279,8 @@ self: { ({ mkDerivation, base, mtl, QuickCheck, Stream }: mkDerivation { pname = "IOSpec"; - version = "0.3"; - sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy"; + version = "0.3.1.1"; + sha256 = "1w6f7jnjm4n0s4mr18yqv81rsnrh8f6806x523gnqljbyak18p1l"; libraryHaskellDepends = [ base mtl QuickCheck Stream ]; description = "A pure specification of the IO monad"; license = stdenv.lib.licenses.bsd3; @@ -10190,8 +10292,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "1.1.0"; - sha256 = "0f7dckgiv5yq87gb7fd31k0h4adqi6xmdc010rdb6yfgpbk10k29"; + version = "1.1.2"; + sha256 = "0zpjji441ys2x6zmndyg7203w3j4j8flhwrl4593a6bz6vqzkwwb"; libraryHaskellDepends = [ aeson attoparsec base iproute network network-info random text ]; @@ -10335,6 +10437,7 @@ self: { ]; description = "Multiline strings, interpolation and templating"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Interpolation-maxs" = callPackage @@ -10346,6 +10449,7 @@ self: { libraryHaskellDepends = [ base syb template-haskell ]; description = "Multiline strings, interpolation and templating"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IntervalMap" = callPackage @@ -10354,8 +10458,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 = [ @@ -10623,31 +10727,16 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.9.5"; - sha256 = "0mf3ihr0xy2wc2wzb9a17g0n3p60x7pvm8akwpvhdy8klvs6r744"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels_3_3_1" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; - version = "3.3.1"; - sha256 = "0k60hc156pj7dj9qqcwi1v3vibfsszccll96fbmn4hrkcqgn1aza"; + version = "3.3.3"; + sha256 = "1i5k81nfgibbmf5f70iicbh8rqbng61r926wcf9hwy2aa2vba11c"; + revision = "1"; + editedCabalFile = "1q8xyxn1a4ldaa1grmr7dywdbf4vqjw65v52h6z7ssz12hgjx0gq"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib ]; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-blp" = callPackage @@ -10657,8 +10746,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 = [ @@ -10686,22 +10775,6 @@ self: { }) {}; "JuicyPixels-extra" = callPackage - ({ mkDerivation, base, criterion, hspec, JuicyPixels }: - mkDerivation { - pname = "JuicyPixels-extra"; - version = "0.3.0"; - sha256 = "08hf3dklz3zaczbffq11z1yjk3hqf53rnz3g9n989ndw8ybkm865"; - revision = "3"; - editedCabalFile = "1xr4vjhzjw3ynibb6693dhcz2jbvbx4yg2bir8w2s98n37gwsxd7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base JuicyPixels ]; - testHaskellDepends = [ base hspec JuicyPixels ]; - benchmarkHaskellDepends = [ base criterion JuicyPixels ]; - description = "Efficiently scale, crop, flip images with JuicyPixels"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels-extra_0_4_0" = callPackage ({ mkDerivation, base, criterion, hspec, hspec-discover , JuicyPixels }: @@ -10716,7 +10789,6 @@ self: { benchmarkHaskellDepends = [ base criterion JuicyPixels ]; description = "Efficiently scale, crop, flip images with JuicyPixels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-repa" = callPackage @@ -10739,8 +10811,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 ]; @@ -10840,8 +10912,8 @@ self: { ({ mkDerivation, array, base, Cabal }: mkDerivation { pname = "KMP"; - version = "0.1.0.2"; - sha256 = "14dpqfji00jq2rc09l8d1ivphpiwkryjk5sn6lrwxv8mcly3pvhn"; + version = "0.2.0.0"; + sha256 = "0x90yi4aplfqhwaaw5ymgcmv6fpg7659r8n7ir6xfkrpgfmk18i9"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ base Cabal ]; description = "Knuth–Morris–Pratt string searching algorithm"; @@ -11012,6 +11084,7 @@ self: { ]; description = "Library for automated composition and musical learning"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "KyotoCabinet" = callPackage @@ -11064,6 +11137,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; + "LC3" = callPackage + ({ mkDerivation, base, bytestring, hspec, lens, mtl, vector }: + mkDerivation { + pname = "LC3"; + version = "0.1.0.2"; + sha256 = "029l4rgdzas0w9c4dpgfxhgbl1ngkvsfd3yf6mx8vwriwgmqbs05"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring hspec lens mtl vector + ]; + description = "LC-3 virtual machine"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "LDAP" = callPackage ({ mkDerivation, base, HUnit, openldap }: mkDerivation { @@ -11081,12 +11169,12 @@ self: { }) {inherit (pkgs) openldap;}; "LParse" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "LParse"; - version = "0.2.2.2"; - sha256 = "0cgmbn6c7fgk6dngx7j1l56sizi37shs5mrdkiqy2k4imb7bc4hl"; - libraryHaskellDepends = [ base ]; + version = "0.3.0.0"; + sha256 = "0nl76ycq608p2wm61pqn64wmq5aqmnwc9p8k4mvx8zwqw06jqlmm"; + libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "A continuation-based parser library"; license = stdenv.lib.licenses.mit; @@ -11348,8 +11436,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 @@ -11822,8 +11910,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"; @@ -11840,6 +11928,7 @@ self: { libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MC-Fold-DP" = callPackage @@ -12224,10 +12313,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; @@ -12240,7 +12327,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 @@ -12250,8 +12337,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 @@ -12274,6 +12385,7 @@ self: { libraryHaskellDepends = [ base glib template-haskell ]; description = "Useful types and definitions missing from other libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MissingM" = callPackage @@ -12431,18 +12543,12 @@ self: { }) {}; "MonadCompose" = callPackage - ({ mkDerivation, base, data-default, ghc-prim, kan-extensions - , mmorph, monad-products, mtl, parallel, random, transformers - , transformers-compat - }: + ({ mkDerivation, base, free, mmorph, mtl, transformers }: mkDerivation { pname = "MonadCompose"; - version = "0.8.4.2"; - sha256 = "0y5cigcf6xian619qdnnvs9m5rzqy7n3yhz133ws54im9qzsdhvi"; - libraryHaskellDepends = [ - base data-default ghc-prim kan-extensions mmorph monad-products mtl - parallel random transformers transformers-compat - ]; + version = "0.9.0.0"; + sha256 = "1jq8ms16karqqa6qxp4n24f2v4bcc8n8mzfjm6b6q3n8hg7dj8yd"; + libraryHaskellDepends = [ base free mmorph mtl transformers ]; description = "Methods for composing monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -12707,8 +12813,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 @@ -12880,7 +12986,6 @@ self: { libraryHaskellDepends = [ base containers random ]; description = "A name generator written in Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NanoProlog" = callPackage @@ -13028,23 +13133,24 @@ self: { }) {inherit (pkgs) net_snmp;}; "Network-NineP" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, convertible - , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl - , network, NineP, regex-posix, stateref, transformers + ({ mkDerivation, async, base, binary, bytestring, containers + , convertible, exceptions, hslogger, monad-loops, monad-peel + , mstate, mtl, network, NineP, regex-posix, stateref, transformers }: mkDerivation { pname = "Network-NineP"; - version = "0.4.3"; - sha256 = "1hsfcicijzqy7vxvknxxq9qa4qx3d1smg6mw4mpvk46nvxny8sc1"; + version = "0.4.5"; + sha256 = "1s11idqg8bvimhal86569wlw746cyyq67dxvvabnbn3q23mjkflh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers convertible exceptions hslogger - monad-loops monad-peel mstate mtl network NineP regex-posix - stateref transformers + async base binary bytestring containers convertible exceptions + hslogger monad-loops monad-peel mstate mtl network NineP + regex-posix stateref transformers ]; description = "High-level abstraction over 9P protocol"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NewBinary" = callPackage @@ -13126,8 +13232,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"; @@ -13265,6 +13371,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Library providing a non-empty list datatype, and total functions operating on it"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NonEmptyList" = callPackage @@ -13432,6 +13539,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 @@ -13439,6 +13548,7 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit time ]; description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Object" = callPackage @@ -13529,6 +13639,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Provides a wrapper for deriving word types with fewer bits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Omega" = callPackage @@ -13587,6 +13698,8 @@ self: { pname = "OneTuple"; version = "0.2.2"; sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq"; + revision = "1"; + editedCabalFile = "07jd23glblzmnlw7sn565sk9gm7vj9h459j46bkbcrrxnp0n0myq"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -13736,8 +13849,8 @@ self: { }: mkDerivation { pname = "OpenGLRaw"; - version = "3.3.1.0"; - sha256 = "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb"; + version = "3.3.2.0"; + sha256 = "1qy41qpqmksvgy7j73b46ksvm00mh6amgy9n9wkal4czkaj26kpj"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -13908,6 +14021,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 { @@ -13993,10 +14122,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "PSQueue"; - version = "1.1"; - sha256 = "1k291bh8j5vpcrn6vycww2blwg7jxx9yrfmrqdanz48gs4d8gq58"; - revision = "1"; - editedCabalFile = "0gpx33bkhpwya7prnqzwpbnylm4v4nm4x8m02ggmj7d6rkklb2qq"; + version = "1.1.0.1"; + sha256 = "1cik7sw10sacsijmfhghzy54gm1qcyxw14shlp86lx8z89kcnkza"; libraryHaskellDepends = [ base ]; description = "Priority Search Queue"; license = stdenv.lib.licenses.bsd3; @@ -14018,6 +14145,7 @@ self: { ]; description = "An implementation of Montague's PTQ"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PUH-Project" = callPackage @@ -14385,13 +14513,14 @@ self: { }: mkDerivation { pname = "Persistence"; - version = "1.1.3"; - sha256 = "1v3agyf5dw7dckn3c8lww135dqyyrgb6mws4sy51lqm8zbqdnqb3"; + version = "1.1.4.2"; + sha256 = "0lvzzcmsmpmsj63ysf3ad6a2v14cf61daz767fxkcf7b7cl50cjp"; libraryHaskellDepends = [ base containers maximal-cliques parallel vector ]; description = "Quickly detect clusters and holes in data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Phsu" = callPackage @@ -14485,8 +14614,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.12.2.2"; - sha256 = "07zxn4gqkmprrpfyd8vvsf4c2350965k029nzvs0zvrwfbkxin4m"; + version = "0.12.2.3"; + sha256 = "1wmylc6z8ikq2qky46jvzffrrjzl8c9xzzlkwsx8223cxa2n59pn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14598,19 +14727,19 @@ self: { "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 @@ -14640,6 +14769,7 @@ self: { ]; description = "Pretty-printing for primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Printf-TH" = callPackage @@ -14957,30 +15087,15 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, containers, deepseq, random - , template-haskell, tf-random, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.11.3"; - sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328"; - libraryHaskellDepends = [ - base containers deepseq random template-haskell tf-random - transformers - ]; - testHaskellDepends = [ base ]; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_12_2" = callPackage ({ mkDerivation, base, containers, deepseq, erf, process, random , template-haskell, tf-random, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.12.2"; - sha256 = "0cqjxwjn0374baf3qs059jmj8qr147i2fqxn6cjhsn4wbzxnc48r"; + version = "2.12.6.1"; + sha256 = "0w51zbbvh46g3wllqfmx251xzbnddy94ixgm6rf8gd95qvssfahb"; + revision = "1"; + editedCabalFile = "0w5gygp6pmyjzjjx5irfflcbx586zfnqidq669ssqqfsadf944xv"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -14988,7 +15103,6 @@ self: { testHaskellDepends = [ base deepseq process ]; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck-GenT" = callPackage @@ -15003,12 +15117,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; }) {}; @@ -15160,6 +15274,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 @@ -15331,8 +15457,8 @@ self: { }: mkDerivation { pname = "RSA"; - version = "2.3.0"; - sha256 = "0csk933gb2ayijxx6ar110lmsbvgyn7p5bqln3g2qbfxz73nvrzf"; + version = "2.3.1"; + sha256 = "06k7nd7b1rdfb7891gw9bihrd9ripffbgqa14q1ryyj6vqa9r4jw"; libraryHaskellDepends = [ base binary bytestring crypto-api crypto-pubkey-types SHA ]; @@ -15344,14 +15470,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "RSolve" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "RSolve"; + version = "0.1.0.1"; + sha256 = "1qqcn87hmya2cl8d4b312y4j4s099czsw5qgqcwh1gc261ppkxvm"; + libraryHaskellDepends = [ base containers ]; + description = "A general solver for equations"; + license = stdenv.lib.licenses.mit; + }) {}; + "Raincat" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time }: mkDerivation { pname = "Raincat"; - version = "1.2"; - sha256 = "1zyxkvjxkadwakg03xnjii1hx0gs45ap9rfkpi4kxipzxppq1klk"; + version = "1.2.1"; + sha256 = "10y9zi22m6hf13c9h8zd9vg7mljpwbw0r3djb6r80bna701fdf6c"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -15361,7 +15498,7 @@ self: { ]; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Random123" = callPackage @@ -15426,6 +15563,8 @@ self: { pname = "Ranged-sets"; version = "0.3.0"; sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l"; + revision = "1"; + editedCabalFile = "0xv8ph5vfwfcvk5hbkcxbsf9vwhpikxzkz7zsr7c5ky2bw707gfv"; libraryHaskellDepends = [ base HUnit QuickCheck ]; description = "Ranged sets for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -15477,8 +15616,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.4"; - sha256 = "13f5ay9wmva9k15a6pk4imxz6rj80gwc1f16906m7a6rm9vgwvlq"; + version = "0.7.4.2"; + sha256 = "1sg63cvcb64gbrxkn5pgs1nvvb1c9qfya7xxwn5daqpjgan426w1"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -15580,8 +15719,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 ]; @@ -15697,11 +15836,10 @@ 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; }) {}; "RxHaskell" = callPackage @@ -15734,6 +15872,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 @@ -15748,6 +15906,7 @@ self: { ]; description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SDL" = callPackage @@ -15928,6 +16087,7 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "(updated) Small geometry library for dealing with vectors and collision detection"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SHA" = callPackage @@ -16137,8 +16297,8 @@ self: { }: mkDerivation { pname = "SVGFonts"; - version = "1.7"; - sha256 = "1k9ili7l9pp5a009jh55vigb917wdnsl6iaz0ggp6d4nw1jwsg6s"; + version = "1.7.0.1"; + sha256 = "06vnpkkr19s9b1wjp7l2w29vr7fsghcrffd2knlxvdhjacrfpc9h"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base blaze-markup blaze-svg bytestring cereal @@ -16257,6 +16417,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 @@ -16318,6 +16499,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "SecureHash-SHA3" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "SecureHash-SHA3"; + version = "0.1.1.0"; + sha256 = "0dva3bzfzyzh8kxljyipd041a2w1zhxjvxmhnw2mlv2jcywnk2hz"; + revision = "1"; + editedCabalFile = "034vwq9cfqjj6hj2nf5g8n2p5gsxpdgp6gwgsmi40klracl5ps5s"; + 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 { @@ -16421,8 +16615,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 ]; @@ -16694,6 +16888,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 @@ -16713,8 +16908,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 ]; @@ -17121,12 +17316,14 @@ self: { }) {}; "Stack" = callPackage - ({ mkDerivation, base, nats, stm }: + ({ mkDerivation, base, deepseq, nats, stm }: mkDerivation { pname = "Stack"; - version = "0.3.2"; - sha256 = "1rap4xyldzwj26r8mbvzkyy9021q8h06pz8cyd061vyslrl7p89b"; - libraryHaskellDepends = [ base nats stm ]; + version = "0.4.0"; + sha256 = "0i8frm923gkk9h8z38jijrd43dfsj9rwzxhwj6xv57rq7l3nq583"; + revision = "2"; + editedCabalFile = "1n4zyl9iagzjx3i3zb5w24mf5x51nwwnnzrrc1rgkflvxlirm9md"; + libraryHaskellDepends = [ base deepseq nats stm ]; description = "Stack data structure"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -17194,6 +17391,7 @@ self: { ]; description = "Libary for Stockholm aligmnent format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Stomp" = callPackage @@ -17250,6 +17448,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; @@ -17280,7 +17480,7 @@ self: { version = "4.0.0.0"; sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk"; libraryHaskellDepends = [ base mtl ]; - license = stdenv.lib.licenses.unfree; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -17314,15 +17514,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; }) {}; @@ -17526,7 +17726,6 @@ self: { libraryHaskellDepends = [ base DeepArrow TypeCompose ]; description = "Tangible Values -- composable interfaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TYB" = callPackage @@ -17558,7 +17757,6 @@ self: { ]; description = "Ferry Table Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Tables" = callPackage @@ -17932,6 +18130,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 @@ -18129,14 +18346,13 @@ self: { ({ mkDerivation, base, base-orphans }: mkDerivation { pname = "TypeCompose"; - version = "0.9.13"; - sha256 = "0cmlldr665mzi0jsb567pn6qbqxr6cyq9ky3mfh1sfls5yhwr5hc"; - revision = "2"; - editedCabalFile = "026h1zgp7fj8ccq8rpzcq0s4wdbw2v7fskcj73n40mfhv0gx26y0"; + version = "0.9.14"; + sha256 = "0msss17lrya6y5xfvxl41xsqs6yr09iw6m1px4xlwin72xwly0sn"; + revision = "1"; + editedCabalFile = "1pxg6az5vkl0zvs3zdvvvnhxqawd9fkkd44jmzzzyyibppgni6x4"; libraryHaskellDepends = [ base base-orphans ]; description = "Type composition classes & instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TypeIlluminator" = callPackage @@ -18272,8 +18488,8 @@ self: { }: mkDerivation { pname = "Unique"; - version = "0.4.7.5"; - sha256 = "0wd4rwbn765n2jyzwwwcghqh1qx69wb9ci7wmvw1ahzg0wbadbqz"; + version = "0.4.7.6"; + sha256 = "19388lmnld4z1vgnj9cfwhm51xn0m0rwsq76w5752sy9nzcpck91"; libraryHaskellDepends = [ base containers extra hashable unordered-containers ]; @@ -18362,25 +18578,29 @@ self: { "VKHS" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , case-insensitive, clock, containers, data-default-class - , directory, filepath, http-client, http-client-tls, http-types - , mtl, network-uri, optparse-applicative, parsec, pipes, pipes-http - , pretty-show, regexpr, scientific, split, tagsoup, text, time + , directory, filepath, flippers, hashable, http-client + , http-client-tls, http-types, mtl, network-uri + , optparse-applicative, parsec, pipes, pipes-http, pretty-show + , process, regexpr, scientific, split, tagsoup, text, time , utf8-string, vector }: mkDerivation { pname = "VKHS"; - version = "1.9.1"; - sha256 = "1jhllxylsclshs027vinx5p3rql3964dy4p37q916g4g58ml83j6"; + version = "1.9.2"; + sha256 = "0axipbapshpdybzaiklcyyzly1awnfmpg7q2hqf3sy97rw72blbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive clock - containers data-default-class directory filepath http-client - http-client-tls http-types mtl network-uri optparse-applicative - parsec pipes pipes-http pretty-show scientific split tagsoup time - utf8-string vector + containers data-default-class directory filepath flippers hashable + http-client http-client-tls http-types mtl network-uri + optparse-applicative parsec pipes pipes-http pretty-show process + regexpr scientific split tagsoup text time utf8-string vector + ]; + executableHaskellDepends = [ + base bytestring directory filepath mtl optparse-applicative parsec + regexpr text ]; - executableHaskellDepends = [ regexpr text ]; description = "Provides access to Vkontakte social network via public API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -18490,6 +18710,7 @@ self: { testToolDepends = [ c2hs ]; description = "ViennaRNA v2 bindings"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ViennaRNA-extras" = callPackage @@ -18540,8 +18761,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; @@ -18551,7 +18772,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 @@ -18577,8 +18798,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 ]; @@ -18864,8 +19085,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; @@ -19023,6 +19244,7 @@ self: { ]; description = "Wire-aware hardware description"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "WordAlignment" = callPackage @@ -19125,6 +19347,7 @@ self: { ]; description = "Workflow patterns over a monad for thread state logging & recovery"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "WxGeneric" = callPackage @@ -19495,17 +19718,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 @@ -19537,6 +19763,7 @@ self: { ]; description = "Software synthesizer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Yocto" = callPackage @@ -19641,7 +19868,6 @@ self: { libraryHaskellDepends = [ base TypeCompose ]; description = "Zipping folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ZipperAG" = callPackage @@ -19920,8 +20146,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 @@ -19933,6 +20159,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "An embedded language for accelerated array processing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-arithmetic" = callPackage @@ -20216,6 +20443,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 ]; @@ -20224,6 +20453,7 @@ self: { ]; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-llvm" = callPackage @@ -20280,6 +20510,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 @@ -20428,6 +20660,8 @@ self: { pname = "acid-state"; version = "0.14.3"; sha256 = "1d8hq8cj6h4crfnkmds6mhrhhg7r1b1byb8fybaj8khfa99sj0nm"; + revision = "1"; + editedCabalFile = "1sff496w6wpvs88jjk8306zvf0z1169g9n0y99sglqgzb03bw6gp"; libraryHaskellDepends = [ array base bytestring cereal containers directory extensible-exceptions filepath mtl network safecopy stm @@ -20531,6 +20765,22 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "acme-circular-containers" = callPackage + ({ mkDerivation, base, containers, doctest, doctest-discover + , graph-wrapper + }: + mkDerivation { + pname = "acme-circular-containers"; + version = "0.1.0.0"; + sha256 = "1xngqlx0avn84qx696hjm8cdqqs9p0ls90kklkz5rs48fbcma3pr"; + libraryHaskellDepends = [ base containers graph-wrapper ]; + testHaskellDepends = [ + base containers doctest doctest-discover graph-wrapper + ]; + description = "Spineless containers which are fast to read but inefficient to update"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "acme-cofunctor" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -20925,6 +21175,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 @@ -20949,11 +21200,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; }) {}; @@ -20975,6 +21226,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; @@ -21046,6 +21299,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; @@ -21070,8 +21325,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 ]; @@ -21125,6 +21380,18 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "activitystreams-aeson" = callPackage ({ mkDerivation, aeson, base, text, time, unordered-containers }: mkDerivation { @@ -21220,8 +21487,8 @@ self: { }: mkDerivation { pname = "adblock2privoxy"; - version = "1.4.2"; - sha256 = "17ikb90zwz3vvs9yg3z83pzs442vy5nx0h44i64akn10aykw8hic"; + version = "2.0.0"; + sha256 = "0wd6zavym2afw7ba2h6i5snwp5gyq64q81gwwlw7y0kslv3xkaw9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -21232,7 +21499,6 @@ self: { ]; description = "Convert adblock config files to privoxy format"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "addLicenseInfo" = callPackage @@ -21274,6 +21540,8 @@ self: { pname = "adict"; version = "0.4.1"; sha256 = "07w3595cwlicvwg04w9i5sg1x9d3r8c64pq0yi5pmnza7jpd5vgq"; + revision = "1"; + editedCabalFile = "07aigsviy51b7hhp1nikvx620s6b8i8j98cvm0rp04pp90n1jqf8"; libraryHaskellDepends = [ array base binary containers dawg PSQueue vector ]; @@ -21296,8 +21564,8 @@ self: { pname = "adjunctions"; version = "4.4"; sha256 = "1sbal7cbhm12crfnfhkk322jnzgx7lhw3jzq0p463bipagsjwz2h"; - revision = "1"; - editedCabalFile = "0582nnn3fab63nd7ng8smk2c8j7pciiyzfj1na34wqid2hs675as"; + revision = "2"; + editedCabalFile = "1yfsjx7dqikg3hvld7i91xfsg5lawmr5980lvfd794sybmgxsf17"; libraryHaskellDepends = [ array base comonad containers contravariant distributive free mtl profunctors semigroupoids semigroups tagged transformers @@ -21384,24 +21652,41 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aern2-real" = callPackage @@ -21425,6 +21710,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Exact real numbers via Cauchy sequences and MPFR"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson_0_7_0_6" = callPackage @@ -21459,49 +21745,20 @@ self: { ({ 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, 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.3.1.1"; - sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4"; - 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 tasty tasty-hunit - tasty-quickcheck template-haskell text time time-locale-compat - unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_0_0" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, directory - , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, QuickCheck + , hashable-time, integer-logarithms, primitive, QuickCheck , quickcheck-instances, scientific, tagged, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, th-abstraction, time , time-locale-compat, unordered-containers, uuid-types, vector }: mkDerivation { pname = "aeson"; - version = "1.4.0.0"; - sha256 = "042phqkabjrlrl3azr3ba9q7naz4c2cjl5nplbfz8iidpf6j0sli"; + version = "1.4.2.0"; + sha256 = "1l4b675nxddim3v30kd7zr3vmrs7i1m81rh8h9bfbm9k9a0p3kkm"; + revision = "1"; + editedCabalFile = "067y82gq86740j2zj4y6v7z9b5860ncg2g9lfnrpsnb9jqm7arl1"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable scientific tagged template-haskell text + ghc-prim hashable primitive scientific tagged template-haskell text th-abstraction time time-locale-compat unordered-containers uuid-types vector ]; @@ -21515,7 +21772,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -21612,10 +21868,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 @@ -21647,6 +21901,7 @@ self: { ]; description = "Easy functions for converting from Aeson.Value"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-diff" = callPackage @@ -21659,6 +21914,8 @@ self: { pname = "aeson-diff"; version = "1.1.0.5"; sha256 = "1kzvqzbl6pp5g49dp4qqc7cbisnkpqz0i18b6nmdb7f1nrhdvnb1"; + revision = "1"; + editedCabalFile = "0a29nph4a1ny365nhsxlm73mk6zgaam4sfx6knzqjy8dxp1gkj48"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21708,8 +21965,8 @@ self: { pname = "aeson-extra"; version = "0.4.1.1"; sha256 = "1y7xss382hdxrv4jzprsm3b7ij7wiw8jgjg9wp49dx6bfvcnb2nl"; - revision = "1"; - editedCabalFile = "14blp4jmcd81ipxany6q7x706xj8fhy019a73c391n767r1nwpq1"; + revision = "3"; + editedCabalFile = "0b9ccv529msmqay0gw2xcxm67n08hmv6s45ivyd8vq0rig4wz407"; libraryHaskellDepends = [ aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat-batteries bytestring containers deepseq exceptions @@ -21727,18 +21984,18 @@ self: { }) {}; "aeson-filthy" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, text + ({ mkDerivation, aeson, base, bytestring, doctest, text, time , unordered-containers }: mkDerivation { pname = "aeson-filthy"; - version = "0.1.2"; - sha256 = "1sph4iq87vl66rbxvhhh5j699yskpb8zs1mvc3nvp60nyg1145b8"; + version = "0.1.3"; + sha256 = "121ygm5k9qjizwjj7w5dklxs5sv0zysrnpvwb37ar4bjkcxhs0ap"; libraryHaskellDepends = [ - aeson base bytestring text unordered-containers + aeson base bytestring text time unordered-containers ]; testHaskellDepends = [ - aeson base bytestring doctest text unordered-containers + aeson base bytestring doctest text time unordered-containers ]; description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input"; license = stdenv.lib.licenses.bsd3; @@ -21794,6 +22051,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-gadt-th" = callPackage + ({ mkDerivation, aeson, base, dependent-sum, markdown-unlit + , template-haskell, transformers + }: + mkDerivation { + pname = "aeson-gadt-th"; + version = "0.1.2.0"; + sha256 = "1rlcf37qb16cxrym9f0p1spmwplf521hkvdc4kl5af7q573dahkg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base dependent-sum template-haskell transformers + ]; + executableHaskellDepends = [ + aeson base dependent-sum markdown-unlit + ]; + description = "Derivation of Aeson instances for GADTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-generic-compat" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -21896,11 +22173,14 @@ self: { ({ mkDerivation, aeson, base }: mkDerivation { pname = "aeson-options"; - version = "0.0.0"; - sha256 = "0z2r1rnh819wms8l1scv18l178i2y1ixcjm6ir59vir5bl19wxm0"; + version = "0.1.0"; + sha256 = "0d5wfcgsjrpmangknmrr2lxvr3h96d65y3vkkas6m9aqi1rrkqv4"; + revision = "1"; + editedCabalFile = "0sibi1vhgkx0v082iffpqxg1mshrwd1d1s3xnpaqn0rdpfpja31d"; libraryHaskellDepends = [ aeson base ]; description = "Options to derive FromJSON/ToJSON instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-parsec-picky" = callPackage @@ -22032,7 +22312,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 @@ -22040,15 +22320,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 @@ -22199,20 +22478,18 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, base-prelude, bytestring, foldl - , json-pointer, json-pointer-aeson, mtl-prelude, scientific, text - , transformers, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, mtl + , scientific, text, transformers, unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.12.4"; - sha256 = "0ya2gbyf2gg1psbmm1cz7qbv9m9kp3lls9rzzkmadhxnqr1wfn2f"; + version = "0.16"; + sha256 = "07l08rbx7xdp0jnr672skmisaa5wikpn6h43m6i9l7l7x1937b38"; libraryHaskellDepends = [ - aeson base-prelude bytestring foldl json-pointer json-pointer-aeson - mtl-prelude scientific text transformers unordered-containers - vector + aeson attoparsec base bytestring mtl scientific text transformers + unordered-containers vector ]; - description = "An API for parsing \"aeson\" JSON tree into Haskell types"; + description = "API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -22231,16 +22508,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; @@ -22447,31 +22725,32 @@ self: { ]; description = "And-inverter graphs in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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; @@ -22607,8 +22886,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.8"; - sha256 = "0yj022qf7afxs8md45qxz42n9i5g60572lz330szbm9ziwdwb1wp"; + version = "5.9"; + sha256 = "0chmrj8r1qh1k1xkp9gybadxz5zz04v2zh26byrckyx7l2bb7j8x"; libraryHaskellDepends = [ array base binary containers deepseq exceptions mtl mwc-random random semigroups vector @@ -22647,6 +22926,7 @@ self: { ]; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment" = callPackage @@ -22679,6 +22959,7 @@ self: { ]; description = "Cairo-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment-chart" = callPackage @@ -22696,6 +22977,7 @@ self: { ]; description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aivika-experiment-diagrams" = callPackage @@ -22769,8 +23051,8 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.8"; - sha256 = "0mndlxvi98k74q2qvzc7wry8ndcgmyi9ph1sas42cbc7a2djnlf0"; + version = "5.9"; + sha256 = "1vqwhjwjsnrbqp3n97arl2nz28xb0vwxvsn42iqf8fxj6xsks3y1"; libraryHaskellDepends = [ aivika array base containers exceptions mtl mwc-random random semigroups vector @@ -22826,8 +23108,8 @@ self: { }: mkDerivation { pname = "alarmclock"; - version = "0.5.0.2"; - sha256 = "0k6nfgxbhnsdlxiv1d6q7kgfmfnix8d1z9cpp84kz9m9jw4a6x15"; + version = "0.6.0.2"; + sha256 = "1zhq3sx6x54v7cjzmjvcs7pzqyql3x4vk3b5n4x7xhgxs54xdasc"; libraryHaskellDepends = [ async base clock stm time unbounded-delays ]; @@ -22938,6 +23220,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; @@ -22966,8 +23250,8 @@ self: { ({ mkDerivation, base, util }: mkDerivation { pname = "alg"; - version = "0.2.6.0"; - sha256 = "0y0qhhmyjzd8sf6v74066yx41nl1zsnsmk8scjvdym8j8k8mvrpk"; + version = "0.2.9.0"; + sha256 = "0w5lxmz52nskh8ms3nliya78v1pb77f7nyn19klqf8yskaalywlq"; libraryHaskellDepends = [ base util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; @@ -23012,12 +23296,15 @@ self: { pname = "algebra"; version = "4.3.1"; sha256 = "090jaipyx5pcav2wqcqzds51fwx49l4c9cpp9nnk16bgkf92z615"; + revision = "1"; + editedCabalFile = "1lxxbbibsf1lkm6fv0svfvfbr0dg16jwcm18hcmfgwypzxqdrbdz"; libraryHaskellDepends = [ adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void ]; description = "Constructive abstract algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "algebra-dag" = callPackage @@ -23078,8 +23365,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; @@ -23087,21 +23374,21 @@ self: { "algebraic-graphs" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, containers - , deepseq, extra, mtl, QuickCheck + , deepseq, extra, inspection-testing, mtl, QuickCheck }: mkDerivation { pname = "algebraic-graphs"; - version = "0.2"; - sha256 = "0rfs58z60nn041ymi7lilc7dyijka30l4hhdznfaz9sfzx4f8yl8"; + version = "0.3"; + sha256 = "1q4xlyg3xjm7q2x11s4lbffywp096y3s3b72b8amfdyi27har4hl"; libraryHaskellDepends = [ array base base-compat containers deepseq mtl ]; testHaskellDepends = [ - array base base-compat base-orphans containers extra QuickCheck + 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "algebraic-prelude" = callPackage @@ -23208,6 +23495,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 { @@ -23305,6 +23603,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 @@ -23411,8 +23711,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 ]; @@ -26227,8 +26527,8 @@ self: { }: mkDerivation { pname = "amqp-worker"; - version = "0.2.4"; - sha256 = "0ps0d9hly3cc9y7cmi5gr6p3h8qddig7sz3s7v6dl0icy3bvhinc"; + version = "0.2.5"; + sha256 = "0crbrmxwv1dwd84l41p2zmx5ap5wwr0n5a9cznz87x3cc6qncylq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26241,7 +26541,6 @@ self: { ]; description = "High level functions for working with message queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amrun" = callPackage @@ -26726,8 +27025,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 @@ -26741,8 +27040,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 ]; @@ -26750,12 +27049,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-terminal_0_8_1" = callPackage + "ansi-terminal_0_9" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; - version = "0.8.1"; - sha256 = "1fm489l5mnlyb6bidq7vxz5asvhshmxz38f0lijgj0z7yyzqpwwy"; + version = "0.9"; + sha256 = "00xcq21rp0y8248pwik9rlrfb2m8c27aasla37zdg741yb0c4mfp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base colour ]; @@ -26781,6 +27080,7 @@ self: { testHaskellDepends = [ array base hspec linebreak ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansi-wl-pprint" = callPackage @@ -26789,6 +27089,8 @@ self: { pname = "ansi-wl-pprint"; version = "0.6.8.2"; sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56"; + revision = "1"; + editedCabalFile = "00b704rygy4ap540jj3ry7cgiqwwi5zx9nhj7c3905m6n6v3in88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base ]; @@ -26802,6 +27104,8 @@ self: { pname = "ansigraph"; version = "0.3.0.5"; sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f"; + revision = "1"; + editedCabalFile = "047pnpd9sviia1wxx9czidz2in6jq7jgbln7l6dy2j157vyqi93k"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Terminal-based graphing via ANSI and Unicode"; @@ -26919,8 +27223,27 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "6.0.1"; - sha256 = "0y8a3rs5sy2qv2pwqb6ap6bl64qhp7x0jqqy1q237vfm2w6vrj6v"; + version = "6.2.0"; + sha256 = "0kd31s399rddcjj8ayvki85j66xlkb7gh0jgfwxmxcxp3x4gs0xi"; + libraryHaskellDepends = [ + amazonka amazonka-athena amazonka-core base lens resourcet text + unliftio-core + ]; + testHaskellDepends = [ + amazonka amazonka-athena amazonka-core base lens resourcet text + unliftio-core + ]; + license = stdenv.lib.licenses.mit; + }) {}; + + "antiope-athena_6_3_0" = callPackage + ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base + , lens, resourcet, text, unliftio-core + }: + mkDerivation { + pname = "antiope-athena"; + version = "6.3.0"; + sha256 = "0yzvzhwl92k1v50w1jzlz2zq5rp7n6x1j51fpqrqq97vj7vqzfsq"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -26930,24 +27253,63 @@ self: { unliftio-core ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "antiope-contract" = callPackage + ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: + mkDerivation { + pname = "antiope-contract"; + version = "6.3.0"; + sha256 = "1d9z3vm7ab6fn0b1v0795v36x36j7lczjgkn2krx7zxq7srzf77l"; + 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.2.0"; + sha256 = "0g3bhh8vdnkd5h9savhjc053jbb4k7b7chbzcjjqd4kj95v8jmr3"; 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; + }) {}; + + "antiope-core_6_3_0" = callPackage + ({ mkDerivation, amazonka, amazonka-core, base, bytestring + , exceptions, generic-lens, http-client, http-types, lens + , monad-logger, mtl, resourcet, text, transformers, unliftio-core + }: + mkDerivation { + pname = "antiope-core"; + version = "6.3.0"; + sha256 = "001qkmiild396pg9hnw776djygjm692k1w9bmckn6l9ahiz8yah0"; + libraryHaskellDepends = [ + 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 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; @@ -26960,8 +27322,29 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.0.1"; - sha256 = "1f8ixkvh7f5dgxl76823f275c3r6f1xmwhx4rfcmd6z90dn8damm"; + version = "6.2.0"; + sha256 = "1kv6ihb6829fbgzz489sg0zyz02rp9p8wk90w4x3sjsynf8djrjj"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-dynamodb antiope-core base + generic-lens lens text unliftio-core unordered-containers + ]; + testHaskellDepends = [ + amazonka amazonka-core amazonka-dynamodb antiope-core base + generic-lens lens text unliftio-core unordered-containers + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "antiope-dynamodb_6_3_0" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb + , antiope-core, base, generic-lens, lens, text, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "antiope-dynamodb"; + version = "6.3.0"; + sha256 = "0912726sm6g2ssrzni3ldiavb506wa51ib07n4gm8vapzhnwxxlb"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -26981,8 +27364,31 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "6.0.1"; - sha256 = "1ib2j0jlcfzq89a4vs7r282hpmqnqg2gw8l1ibfiahl4ac91z7zn"; + version = "6.2.0"; + sha256 = "11zkyfv06fsqxznr36hh563yz401y3wg2a5hc6x6ydza4xdnrzdz"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 + base generic-lens lens lens-aeson monad-loops network-uri text + unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 + base generic-lens lens lens-aeson monad-loops network-uri text + unliftio-core + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "antiope-messages_6_3_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson + , monad-loops, network-uri, text, unliftio-core + }: + mkDerivation { + pname = "antiope-messages"; + version = "6.3.0"; + sha256 = "0yg38mayxzm7awgn0jczyh3vkyvhm3nmi47vry7knws916xrpr4x"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -26998,23 +27404,51 @@ 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.2.0"; + sha256 = "1gb9ypj5gp6qkzncg44sja35pw2s6qg7msjrlcvhdfbcjs6pxrqj"; libraryHaskellDepends = [ - 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 http-types + lens monad-logger mtl network-uri resourcet text unliftio-core + ]; + testHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "antiope-s3_6_3_0" = callPackage + ({ 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.3.0"; + sha256 = "00szjn9vbb6xndzs0wpq2hw9a529ldy5y0pckfm3xkd6ap5ifx41"; + libraryHaskellDepends = [ + 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; @@ -27027,8 +27461,28 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "6.0.1"; - sha256 = "0hqvh3vzpdr9g6v778qn17nfrqvg8i2lszqgss9fb8290mlm8x01"; + version = "6.2.0"; + sha256 = "0npm9q3vf2njiqwyswxc6xh5psjls0skz29mz22y59sk25m5fmkv"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-sns base generic-lens lens + text unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-sns base generic-lens lens + text unliftio-core + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "antiope-sns_6_3_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base + , generic-lens, lens, text, unliftio-core + }: + mkDerivation { + pname = "antiope-sns"; + version = "6.3.0"; + sha256 = "0fr51vp8ihlv7pnlrl73knd8wwck1rsw5v4yzm2b8299m7gqd86v"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -27048,8 +27502,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.0.1"; - sha256 = "0pfhhgc7dkp4dn2k0dxy2pkmbml9js351ab2y2hln5jpsni9qfc0"; + version = "6.2.0"; + sha256 = "0v33diw8cwvfb9b4k24whbyl4apjq67rh36ndn5qr6627kp3b825"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -27064,6 +27518,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiope-sqs_6_3_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 + , amazonka-sqs, antiope-messages, antiope-s3, base, conduit + , generic-lens, lens, lens-aeson, monad-loops, mtl, network-uri + , text, unliftio-core + }: + mkDerivation { + pname = "antiope-sqs"; + version = "6.3.0"; + sha256 = "0a1kkzy9nldhwgh8xvnp4lqv49gpm6q9prnv2bgwlp00izy2r5s1"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 amazonka-sqs + antiope-messages antiope-s3 base conduit generic-lens lens + lens-aeson monad-loops mtl network-uri text unliftio-core + ]; + testHaskellDepends = [ + aeson amazonka amazonka-core amazonka-s3 amazonka-sqs + antiope-messages antiope-s3 base conduit generic-lens lens + lens-aeson monad-loops mtl network-uri text unliftio-core + ]; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antiprimes" = callPackage ({ mkDerivation, base, hspec, primes }: mkDerivation { @@ -27104,6 +27582,31 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "antlrc" = callPackage ({ mkDerivation, antlr3c, base, bytestring, c2hs, enumerator , haskell98, regex-posix @@ -27141,6 +27644,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 @@ -27160,7 +27683,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 }: @@ -27205,8 +27728,8 @@ self: { }: mkDerivation { pname = "apart"; - version = "0.1.1"; - sha256 = "1xrmdzaf56gzmrg596kfkp01pvn9m9w2mvz58z3zhx6jda1zvaan"; + version = "0.1.3"; + sha256 = "16y5k372kmqsn81bksl9j01nbfhsk0cwriwpfycjsnzgmg8wnkpb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27225,14 +27748,16 @@ self: { "apecs" = callPackage ({ mkDerivation, base, containers, criterion, linear, mtl - , QuickCheck, stm, template-haskell, vector + , QuickCheck, template-haskell, vector }: mkDerivation { pname = "apecs"; - version = "0.5.0.0"; - sha256 = "11ya44z5lk2vk0pwz1m8ygr0x6gkf7xhwiy0k28s5kd65vlpx6bw"; + version = "0.7.1"; + sha256 = "0cvjqv6zbjzvp01ikfx5lkwb7fbq25555rbvfriwhsfjqanw5pj7"; + revision = "1"; + editedCabalFile = "14v5704fhysxpip0s7bfsg073kfbal3b0335s9nb14nwwak7bsyn"; libraryHaskellDepends = [ - base containers mtl stm template-haskell vector + base containers mtl template-haskell vector ]; testHaskellDepends = [ base containers criterion linear QuickCheck vector @@ -27242,6 +27767,64 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "apecs-gloss" = callPackage + ({ mkDerivation, apecs, apecs-physics, base, containers, gloss + , linear + }: + mkDerivation { + pname = "apecs-gloss"; + version = "0.2.0"; + sha256 = "0qkdjanbrnwhxzr168xwrnhcd1hwsymlb1nvsb1mrklzj93amfvh"; + 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; + }) {}; + + "apecs-stm" = callPackage + ({ mkDerivation, apecs, base, containers, list-t, stm + , stm-containers, template-haskell, vector + }: + mkDerivation { + pname = "apecs-stm"; + version = "0.1.1"; + sha256 = "0d0l48fynsk84y2ifb004dpr39s2hdcwrgfp1ds3qff6784sh66b"; + libraryHaskellDepends = [ + apecs base containers list-t stm stm-containers template-haskell + vector + ]; + description = "STM stores for apecs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "apelsin" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , directory, filepath, glib, gtk, HTTP, mtl, network, process @@ -27319,7 +27902,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 @@ -27327,30 +27910,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; @@ -27735,8 +28313,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 ]; @@ -27751,8 +28329,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "appar"; - version = "0.1.4"; - sha256 = "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq"; + version = "0.1.7"; + sha256 = "07zjgx7xpjgkjqvga0wv542cyrjzh1mszlczg82nbmij2cflzppn"; libraryHaskellDepends = [ base bytestring ]; description = "A simple applicative parser"; license = stdenv.lib.licenses.bsd3; @@ -27924,8 +28502,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.5.0.0"; - sha256 = "1bvlbchpma3vlxfvjbyd01rmzqc9h5q3my9n7v3wal2p7ysvjpqz"; + version = "0.6.0.0"; + sha256 = "0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28077,6 +28655,131 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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 @@ -28087,8 +28790,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.10.0.2"; - sha256 = "13jmv7bxiy0v2y2w6qwsb9mh5m97sxrlb5w1kaqzag8d0cnz7w6c"; + version = "0.10.1"; + sha256 = "09n6v32yz612ag4acjd4jwnmv0ljarxi3b7v2mp4bj18c2gx1wbq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28482,31 +29185,46 @@ self: { }) {}; "arithmoi" = callPackage - ({ mkDerivation, array, base, containers, exact-pi, gauge, ghc-prim - , integer-gmp, integer-logarithms, mtl, QuickCheck, random + ({ 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.7.0.0"; - sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb"; - revision = "3"; - editedCabalFile = "1s0jm2y0jhfrj7af80csckiizkfq5h0v4zb92mkwh1pkfi763fha"; + version = "0.8.0.0"; + sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2"; + revision = "2"; + editedCabalFile = "1jv5ch28pjiq3a83hyvknzfwmsbwgqs6g9618z79ss3385k0cwl9"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ - array base containers exact-pi ghc-prim integer-gmp - integer-logarithms mtl random vector + array base containers deepseq exact-pi ghc-prim integer-gmp + integer-logarithms random transformers vector ]; testHaskellDepends = [ - base containers integer-gmp QuickCheck smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck transformers vector + base containers exact-pi integer-gmp QuickCheck smallcheck tasty + tasty-hunit tasty-quickcheck tasty-smallcheck transformers vector ]; benchmarkHaskellDepends = [ - base containers gauge integer-logarithms random vector + base containers deepseq gauge integer-logarithms random vector ]; description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "arity-generic-liftA" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "arity-generic-liftA"; + version = "0.1.0.0"; + sha256 = "08ljx42nwpls02rg9qyzynfs6gwyxbw7v265mrh2cmb2gfb8g6wl"; + revision = "1"; + editedCabalFile = "0daxl4ds7bdjf1jjbf20hqqzss7srmzzkhgq2d0si8n2203jj8d9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "Provides an arity-generic version of the liftA2, liftA3... liftAn functions."; + license = stdenv.lib.licenses.mit; }) {}; "armada" = callPackage @@ -28531,13 +29249,15 @@ self: { pname = "armor"; version = "0.1"; sha256 = "0jmq6lhi1byhjzgkvnn4p481z8wik93angx7sf6cjfj5j0kqzv71"; + revision = "3"; + editedCabalFile = "1aksr6s5hcvxjjxd95z4n0xadhdpvz8l75906v5f18p7gkk6sjm7"; libraryHaskellDepends = [ base bytestring containers directory filepath HUnit lens ]; testHaskellDepends = [ aeson base bytestring containers directory hspec HUnit lens text ]; - description = "Armor data structures against serialization backwards compatibility problems"; + description = "Prevent serialization backwards compatibility problems using golden tests"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28581,14 +29301,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) arpack;}; - "array_0_5_2_0" = callPackage + "array_0_5_3_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.2.0"; - sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj"; - revision = "1"; - editedCabalFile = "195c914pc0vk1ya6lz42kb4gmhkam7s0xi7x0dgzhpb5gkcrs5qx"; + version = "0.5.3.0"; + sha256 = "07pyr2x09n23rdxldqgbx12hlg9dk92q9p56bpcdw3r87ajc3m9z"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; @@ -28647,6 +29365,7 @@ self: { benchmarkHaskellDepends = [ base criterion ghc-prim ]; description = "Extra foreign primops for primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "array-utils" = callPackage @@ -28660,6 +29379,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "arraylist" = callPackage + ({ mkDerivation, base, hashable, initialize, MonadRandom, primitive + , smallcheck, tasty, tasty-smallcheck + }: + mkDerivation { + pname = "arraylist"; + version = "0.1.0.0"; + sha256 = "1swvn9k7j2pwcln4znzrszgwgdi4f26q9qlaz2fi8jixc089v91g"; + libraryHaskellDepends = [ base initialize primitive ]; + testHaskellDepends = [ + base hashable MonadRandom primitive smallcheck tasty + tasty-smallcheck + ]; + description = "Memory-efficient ArrayList implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "arrow-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -28695,6 +29431,7 @@ self: { libraryHaskellDepends = [ base containers mtl ]; description = "List arrows for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arrowapply-utils" = callPackage @@ -28769,6 +29506,20 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "arx" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-nums, containers, file-embed, hashable, parsec @@ -28822,15 +29573,14 @@ self: { }: mkDerivation { pname = "ascii"; - version = "0.0.5.1"; - sha256 = "06z63pr5g1wcsyii3pr8svz23cl9n4srspbkvby595pxfcbzkirn"; + version = "0.0.5.2"; + sha256 = "1kbf6iml4nvkzf78xqvxy67469vznd05ig8aprq7zx5vr9njliby"; libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable semigroups text ]; description = "Type-safe, bytestring-based ASCII values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ascii-art-to-unicode" = callPackage @@ -28990,8 +29740,8 @@ self: { }: mkDerivation { pname = "asciidiagram"; - version = "1.3.3.1"; - sha256 = "194jdii485z0fif07nvjcj5468m53zgm2v9x1h3pj8xlmfh9rrly"; + version = "1.3.3.2"; + sha256 = "0kbf4jswdyvd0x4yk00ss4yjqla852rd64081lkf1xn7yi0k8d1b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29004,7 +29754,6 @@ self: { ]; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asic" = callPackage @@ -29022,41 +29771,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 @@ -29102,6 +29851,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 @@ -29265,8 +30016,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; @@ -29304,14 +30055,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) assimp;}; + "assoc" = callPackage + ({ mkDerivation, base, bifunctors }: + mkDerivation { + pname = "assoc"; + version = "1"; + sha256 = "0i1jj6lrabl0fhh1iya4nxr2hw1s4xmhca5qnim93ng5znziv9n2"; + libraryHaskellDepends = [ base bifunctors ]; + description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "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"; @@ -29466,6 +30253,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "Async combinators"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-dejafu" = callPackage @@ -29558,6 +30346,7 @@ self: { ]; description = "A modified version of async that supports worker groups and many-to-many task dependencies"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-refresh" = callPackage @@ -29620,6 +30409,7 @@ self: { ]; description = "Provides API for timer based execution of IO actions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asynchronous-exceptions" = callPackage @@ -29733,6 +30523,7 @@ self: { ]; description = "1976 US Standard Atmosphere Model"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atmos-dimensional" = callPackage @@ -29744,6 +30535,7 @@ self: { libraryHaskellDepends = [ atmos base dimensional ]; description = "dimensional wrapper on atmos package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atmos-dimensional-tf" = callPackage @@ -29810,26 +30602,26 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators - , data-default, lens-simple, mono-traversable, parsers + ({ mkDerivation, base, blaze-builder, conduit, data-default + , filepath, lens-simple, mono-traversable, parsers , quickcheck-instances, resourcet, safe-exceptions, tasty - , tasty-hunit, tasty-quickcheck, text, time, timerep + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time, timerep , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "atom-conduit"; - version = "0.5.0.1"; - sha256 = "1k9ix1br0vfajjqnprlnhzidvkx9a1pmkyiv2rb3nxb7fp3wb24c"; + version = "0.5.0.3"; + sha256 = "0hj9r6akwaxdhlaqnapfpa00d61vk4b7di67vn1h5jlscvzgrrc2"; libraryHaskellDepends = [ - base blaze-builder conduit conduit-combinators lens-simple - mono-traversable parsers safe-exceptions text time timerep - uri-bytestring xml-conduit xml-types + base blaze-builder conduit lens-simple mono-traversable parsers + safe-exceptions text time timerep uri-bytestring xml-conduit + xml-types ]; testHaskellDepends = [ - base blaze-builder conduit conduit-combinators data-default - lens-simple mono-traversable parsers quickcheck-instances resourcet - safe-exceptions tasty tasty-hunit tasty-quickcheck text time - uri-bytestring xml-conduit xml-types + base blaze-builder conduit data-default filepath lens-simple + mono-traversable parsers quickcheck-instances resourcet + safe-exceptions tasty tasty-golden tasty-hunit tasty-quickcheck + text time uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.publicDomain; @@ -29926,13 +30718,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; @@ -29999,8 +30791,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.29"; - sha256 = "02zk3qbg2h14wc5x7sizllgj39zprgx63j8rbf2lk9nd3yiqc4va"; + version = "0.2.0.30"; + sha256 = "19i3g3njmmhkhyx02q37r7n373n6h0yha6g5hrx0ix5nn8bp4k4w"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup filepath ]; @@ -30024,8 +30816,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.2.0"; - sha256 = "10xwgc7y324fgisqjkx2jk5bq226fj3ayl373m6m1nbnx2qax22w"; + version = "3.2.4.5"; + sha256 = "0nn43pzj57sjhsngidp47pacdi40sngdmfh47iwppgnn1anc7crp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -30044,7 +30836,6 @@ self: { doHaddock = false; description = "A build tool for ATS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ats-setup" = callPackage @@ -30122,8 +30913,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 @@ -30134,7 +30927,6 @@ self: { ]; description = "Efficient parsing and serialisation of S-Expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attomail" = callPackage @@ -30170,6 +30962,8 @@ self: { pname = "attoparsec"; version = "0.13.2.2"; sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx"; + revision = "2"; + editedCabalFile = "1j06na26rsahrbkzrs71nl7ym8fk390pnvh577wlxs4ik6hsn2va"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -30287,25 +31081,13 @@ self: { }) {}; "attoparsec-ip" = callPackage - ({ mkDerivation, attoparsec, base, ip }: - mkDerivation { - pname = "attoparsec-ip"; - version = "0.0.1"; - sha256 = "0aananvfa7h9d73yf1c69zw5b3s3m67qhfmfrzdbifw3wj5cm9cd"; - libraryHaskellDepends = [ attoparsec base ip ]; - testHaskellDepends = [ base ]; - description = "Parse IP data types with attoparsec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "attoparsec-ip_0_0_3" = 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 @@ -30319,10 +31101,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; @@ -30435,29 +31215,14 @@ self: { }) {}; "attoparsec-uri" = callPackage - ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip - , strict, text, vector - }: - mkDerivation { - pname = "attoparsec-uri"; - version = "0.0.4"; - sha256 = "1wzisb9xnykaxnp1jp0a3lvh1m2swynk2r2mg6nfv5jzlv52q0sf"; - libraryHaskellDepends = [ - attoparsec attoparsec-ip base bytedump ip strict text vector - ]; - description = "URI parser / printer using attoparsec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "attoparsec-uri_0_0_6" = 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 @@ -30679,6 +31444,7 @@ self: { ]; 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 @@ -30806,29 +31572,14 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.10"; - sha256 = "0rf28h7nzm5ngcrj1900d0vgwbfr1y3s4q7wwbvdw2mg29rw4f0r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base Cabal directory filepath ]; - description = "Automatically re-export modules"; - license = stdenv.lib.licenses.mit; - }) {}; - - "autoexporter_1_1_11" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; - version = "1.1.11"; - sha256 = "17d1a2fns4b3gw8cggg9yq1fxvkyr859s3y22i9lviz6x7hd8dvn"; + version = "1.1.13"; + sha256 = "05mgvif7wiq0vplk92kp8qn4a5wfma1gwdihqlz5lspmczszpdkv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; executableHaskellDepends = [ base Cabal directory filepath ]; description = "Automatically re-export modules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autom" = callPackage @@ -30847,6 +31598,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "automata" = callPackage + ({ mkDerivation, base, bytestring, containers, contiguous + , enum-types, HUnit, leancheck, leancheck-enum-instances, primitive + , primitive-containers, QuickCheck, quickcheck-classes + , quickcheck-enum-instances, semirings, tasty, tasty-hunit + , tasty-leancheck, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "automata"; + version = "0.1.0.0"; + sha256 = "1xb0rqnkykazg7m50dsxa5pxfd2096wmqbwli01j7wxw8lrqcy9i"; + libraryHaskellDepends = [ + base bytestring containers contiguous primitive + primitive-containers semirings transformers + ]; + testHaskellDepends = [ + base containers enum-types HUnit leancheck leancheck-enum-instances + primitive QuickCheck quickcheck-classes quickcheck-enum-instances + tasty tasty-hunit tasty-leancheck tasty-quickcheck + ]; + description = "automata"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "automitive-cse" = callPackage ({ mkDerivation, base, bytestring, cereal, cryptonite, memory , quickcheck-simple @@ -30945,15 +31721,17 @@ 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; }) {}; "avatar-generator" = callPackage @@ -30994,8 +31772,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "22"; - editedCabalFile = "040kvq16wknnjq0kr5j6y17xvjfh87y22hska3whs3ci6zw1fr30"; + revision = "29"; + editedCabalFile = "07vc32yn5d954higzxg3c94l3wzgc38b7y2xq8c5rkxwqz8xf97s"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -31056,20 +31834,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; @@ -31133,56 +31909,30 @@ self: { }) {}; "avro" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, containers, data-binary-ieee754, directory, entropy - , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib - , QuickCheck, scientific, semigroups, tagged, template-haskell - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "avro"; - version = "0.3.4.2"; - sha256 = "0g6y8f6j38n52vqwj185lyqc666cqrmgd6pn3427cqlhcj927b7v"; - libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific - semigroups tagged template-haskell text unordered-containers vector - ]; - testHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - directory entropy extra fail hashable hspec lens lens-aeson mtl - pure-zlib QuickCheck scientific semigroups tagged template-haskell - text transformers unordered-containers vector - ]; - description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "avro_0_3_5_1" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, containers, data-binary-ieee754, directory, entropy + ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors + , binary, bytestring, containers, data-binary-ieee754, directory , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib , QuickCheck, scientific, semigroups, tagged, template-haskell - , text, transformers, unordered-containers, vector + , text, tf-random, transformers, unordered-containers, vector }: mkDerivation { pname = "avro"; - version = "0.3.5.1"; - sha256 = "147w9a30z2vxjf8lsmf4vy0p9dvc8c3lla45b42sinr9916m61f8"; + version = "0.4.1.2"; + sha256 = "07akc3ngfwsmm0fsvli8f4msc99yrx87mqlm96b896as4rwyziv2"; libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific - semigroups tagged template-haskell text unordered-containers vector + aeson array base base16-bytestring bifunctors binary bytestring + containers data-binary-ieee754 fail hashable mtl pure-zlib + scientific semigroups tagged template-haskell text tf-random + unordered-containers vector ]; testHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - directory entropy extra fail hashable hspec lens lens-aeson mtl + aeson array base base16-bytestring bifunctors binary bytestring + containers directory extra fail hashable hspec lens lens-aeson mtl pure-zlib QuickCheck scientific semigroups tagged template-haskell - text transformers unordered-containers vector + text tf-random transformers unordered-containers vector ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avwx" = callPackage @@ -31274,6 +32024,8 @@ self: { pname = "aws"; version = "0.18"; sha256 = "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj"; + revision = "1"; + editedCabalFile = "0y3xkhnaksj926khsy1d8gks2jzphkaibi97h98l47nbh962ickj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31309,18 +32061,18 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.20"; - sha256 = "0pwpabmypi1w8rni9qfwabgn95jks4h8dyw6889mn8xzsrhdhyf0"; + version = "0.21"; + sha256 = "0g6sp8wgirinp0kaa73s283mjws6wbihg38jklbj9dx6sxdmdja9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring blaze-builder byteable bytestring case-insensitive cereal conduit conduit-extra containers cryptonite data-default directory - exceptions filepath http-conduit http-types lifted-base memory - monad-control mtl network old-locale resourcet safe scientific - tagged text time transformers unordered-containers utf8-string - vector xml-conduit + exceptions filepath http-client-tls http-conduit http-types + lifted-base memory monad-control mtl network old-locale resourcet + safe scientific tagged text time transformers unordered-containers + utf8-string vector xml-conduit ]; testHaskellDepends = [ aeson base bytestring conduit errors http-client http-client-tls @@ -31434,17 +32186,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 @@ -31452,7 +32205,6 @@ self: { ]; description = "Helper function and types for working with amazonka"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-ec2" = callPackage @@ -31667,6 +32419,50 @@ 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, template-haskell, text, uuid, wreq + }: + mkDerivation { + pname = "aws-lambda-haskell-runtime"; + version = "1.0.9"; + sha256 = "0cx59jmqzjz1ff1mng63pf008mxmfffpv9nlcmrisjliginjh2v3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit directory filepath + microlens-platform mtl optparse-generic process template-haskell + text uuid wreq + ]; + executableHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base hspec mtl ]; + 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 @@ -31891,24 +32687,35 @@ 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, containers, directory, filepath + , freer-simple, ghcid, 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.9"; + sha256 = "0kr7iblj23dlfjzym2ndrns2x7z65sdn2pz8dwxsqvn8jhh24p7f"; 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 containers directory filepath freer-simple ghcid + 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 containers freer-simple optparse-applicative + ]; + testHaskellDepends = [ + base bytestring containers 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; }) {}; @@ -31987,6 +32794,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 @@ -32058,17 +32883,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 @@ -32076,7 +32900,6 @@ self: { benchmarkHaskellDepends = [ base criterion pipes ]; description = "Immutable disk-based B* trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "b9" = callPackage @@ -32089,8 +32912,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.49"; - sha256 = "0n9vci1wc2ws4nyzmmqi2npwkd3zz28znyqj4905y1hc126x0yi3"; + version = "0.5.61"; + sha256 = "0yr29ynxiwc2qr000c5h1w3k373qvbr5p8z451r3q24i4c6rcrid"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32109,6 +32932,7 @@ self: { ]; description = "A tool and library for building virtual machine images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "babl" = callPackage @@ -32160,27 +32984,6 @@ self: { }) {}; "backprop" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, directory - , hmatrix, microlens, microlens-th, mwc-random, primitive - , reflection, simple-reflect, time, transformers, vector, vinyl - }: - mkDerivation { - pname = "backprop"; - version = "0.2.5.0"; - sha256 = "1xbbmv6cp9n21x2bqpr0p4cls994mchxp7hd7k6ib83avr0vwbda"; - libraryHaskellDepends = [ - base containers deepseq microlens primitive reflection - simple-reflect transformers vector vinyl - ]; - benchmarkHaskellDepends = [ - base criterion deepseq directory hmatrix microlens microlens-th - mwc-random time vector - ]; - description = "Heterogeneous automatic differentation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "backprop_0_2_6_1" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, directory , hmatrix, microlens, microlens-th, mwc-random, primitive , reflection, time, transformers, vector, vinyl @@ -32199,7 +33002,6 @@ self: { ]; description = "Heterogeneous automatic differentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backtracking-exceptions" = callPackage @@ -32242,6 +33044,7 @@ self: { executableHaskellDepends = [ base gd X11 ]; description = "braindead utility to compose Xinerama backgrounds"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bag" = callPackage @@ -32484,8 +33287,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"; @@ -32513,15 +33316,17 @@ self: { }) {}; "barbies" = callPackage - ({ mkDerivation, base, bifunctors, QuickCheck, tasty + ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit , tasty-quickcheck }: mkDerivation { pname = "barbies"; - version = "0.1.4.0"; - sha256 = "03ndlns5kmk3v0n153m7r5v91f8pwzi8fazhanjv1paxadwscada"; + version = "1.1.0.0"; + sha256 = "02lnq2f5n75r214lrhkhdl3a85lzn3am197df4a0mp6pvw07z1cs"; 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; }) {}; @@ -32635,12 +33440,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 ]; @@ -32654,8 +33459,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; @@ -32667,8 +33472,8 @@ self: { }: mkDerivation { pname = "base-compat-batteries"; - version = "0.10.1"; - sha256 = "1j8ky6241mj1ymbwm9scvyvbknj7n2r56cnkg9y1zf2xwjpqnmqm"; + version = "0.10.5"; + sha256 = "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p"; libraryHaskellDepends = [ base base-compat ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -32676,22 +33481,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "base-compat-batteries_0_10_4" = callPackage - ({ mkDerivation, base, base-compat, contravariant, hspec - , hspec-discover, QuickCheck - }: - mkDerivation { - pname = "base-compat-batteries"; - version = "0.10.4"; - sha256 = "11k4k2n88kyaa41431cmjwmnlnhjbqx95r67mgrdxfyqxxwnxwp8"; - libraryHaskellDepends = [ base base-compat contravariant ]; - testHaskellDepends = [ base hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "base-compat with extra batteries"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "base-compat-migrate" = callPackage ({ mkDerivation, base, base-compat }: mkDerivation { @@ -32704,6 +33493,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 @@ -32714,6 +33504,8 @@ self: { pname = "base-encoding"; version = "0.1.0.0"; sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si"; + revision = "1"; + editedCabalFile = "0miysladpqwm5qhphv23qhvambd7245n14qbkgvp664xj56y6df1"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring text ]; @@ -32762,8 +33554,8 @@ 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"; @@ -32771,20 +33563,6 @@ self: { }) {}; "base-orphans" = callPackage - ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck - }: - mkDerivation { - pname = "base-orphans"; - version = "0.7"; - sha256 = "057f9npnqk71ccfh95djfkpd54dzazphj06grwxa3fyhwcwxrb8a"; - libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base hspec QuickCheck ]; - testToolDepends = [ hspec-discover ]; - description = "Backwards-compatible orphan instances for base"; - license = stdenv.lib.licenses.mit; - }) {}; - - "base-orphans_0_8" = callPackage ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck }: mkDerivation { @@ -32796,7 +33574,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backwards-compatible orphan instances for base"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-prelude" = callPackage @@ -32814,8 +33591,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-unicode-symbols"; - version = "0.2.2.4"; - sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52"; + version = "0.2.3"; + sha256 = "1ia6li7qjg1zkak4gf6mnbshw45mq9bfjr0jch58ds0lscmvwyzf"; libraryHaskellDepends = [ base ]; description = "Unicode alternatives for common functions and operators"; license = stdenv.lib.licenses.bsd3; @@ -32895,6 +33672,7 @@ self: { ]; description = "Parsing and serialization for Base58 addresses (Bitcoin and Ripple)"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base58string" = callPackage @@ -32911,18 +33689,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; }) {}; @@ -32936,8 +33718,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 @@ -32947,6 +33729,7 @@ self: { ]; description = "A newtype around ByteString, for base64 encoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base64-conduit" = callPackage @@ -32978,6 +33761,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Base64 implementation for String's"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base91" = callPackage @@ -33014,6 +33798,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basement_0_0_9" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.9"; + sha256 = "0fx9zw20id9lmv5likmsy1xs9cy286zd284wcd721xwvl74bg040"; + revision = "1"; + editedCabalFile = "0f5syvnp7g108adssmsqz7v8pgaasknvbi88g1lnm1ygn65kwpv1"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Foundation scrap box of array & string"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "basen-bytestring" = callPackage ({ mkDerivation, base, bytestring, QuickCheck }: mkDerivation { @@ -33139,12 +33937,13 @@ self: { pname = "basic-sop"; version = "0.2.0.2"; sha256 = "0cd5zlv3w3r99ck5cz43kppand0n9vx26g4d4fqqcmvjxk8zwhy7"; + revision = "1"; + editedCabalFile = "0rvhcbywgpidnq1vg79a9scq6hraqdyv67j63vyidm0q20ml5mpv"; libraryHaskellDepends = [ base deepseq generics-sop QuickCheck text ]; description = "Basic examples and functions for generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "baskell" = callPackage @@ -33362,6 +34161,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 { @@ -33568,6 +34381,7 @@ self: { ]; description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "beam-migrate" = callPackage @@ -33590,6 +34404,23 @@ self: { ]; description = "SQL DDL support and migrations support library for Beam"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "beam-newtype-field" = callPackage + ({ mkDerivation, base, beam-core, beam-migrate, lens + , postgresql-simple + }: + mkDerivation { + pname = "beam-newtype-field"; + version = "0.2.0.0"; + sha256 = "1fb78n178jzx4457b0c3kyxc70c4qszq3pplmgrzgsibri8r2xlf"; + libraryHaskellDepends = [ + base beam-core beam-migrate lens postgresql-simple + ]; + description = "A newtype for wrapping newtypes into beam schemas"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "beam-postgres" = callPackage @@ -33611,6 +34442,7 @@ self: { ]; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "beam-sqlite" = callPackage @@ -33620,14 +34452,15 @@ 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 ]; description = "Beam driver for SQLite"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "beam-th" = callPackage @@ -33681,8 +34514,8 @@ 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 ]; @@ -33705,22 +34538,19 @@ 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; }) {}; "beeminder-api" = callPackage @@ -33823,8 +34653,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 ]; @@ -33834,6 +34664,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 { @@ -33849,15 +34698,14 @@ 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 ]; executableHaskellDepends = [ base bytestring ]; description = "Micro-benchmarking with detailed statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bencode" = callPackage @@ -33873,15 +34721,41 @@ 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 - , pretty, QuickCheck, text + ({ mkDerivation, attoparsec, base, bencode, bytestring, containers + , criterion, deepseq, ghc-prim, hspec, integer-gmp, mtl, pretty + , QuickCheck, text }: mkDerivation { pname = "bencoding"; - version = "0.4.4.0"; - sha256 = "088w5r0yz81b3iid3bc61lvm4d9f361kv2gq9jz7sbm43fkraxpp"; + version = "0.4.5.1"; + sha256 = "1q2xpcskpj3hk3vkk09flrnbyss1aq5yqngkxwm7qrcly2798pxa"; + revision = "1"; + editedCabalFile = "17yr0lcpsm482as9qcl44padm2ahz51al4izfq2z1p1jizih4mxv"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ghc-prim integer-gmp mtl pretty text @@ -33890,12 +34764,10 @@ self: { attoparsec base bytestring containers ghc-prim hspec QuickCheck ]; benchmarkHaskellDepends = [ - AttoBencode attoparsec base bencode bytestring criterion deepseq - ghc-prim + attoparsec base bencode bytestring criterion deepseq ghc-prim ]; description = "A library for encoding and decoding of BEncode data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bento" = callPackage @@ -34046,6 +34918,7 @@ self: { ]; description = "A horizontal version of tetris for braille users"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "between" = callPackage @@ -34108,6 +34981,7 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring time ]; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bgzf" = callPackage @@ -34135,6 +35009,8 @@ self: { pname = "bhoogle"; version = "0.1.3.5"; sha256 = "1gig9w1k1w2kw6y3wx6ckmc7kamwwzzq7mbaxil0rmb5ms0p1rf9"; + revision = "2"; + editedCabalFile = "0jwfw2xa55ysfxyzp5n2pf2vq753iagpmvg9xnj69nv6ly9whfp7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -34142,7 +35018,8 @@ 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)"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bibdb" = callPackage @@ -34225,6 +35102,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bifunctor" = callPackage + ({ mkDerivation, base, category }: + mkDerivation { + pname = "bifunctor"; + version = "0.1.0.0"; + sha256 = "056fbcmrbzdagxr37nzq06668r9js8q9h79pnz6hv19lfljgspb1"; + libraryHaskellDepends = [ base category ]; + description = "Bifunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bifunctors" = callPackage ({ mkDerivation, base, base-orphans, comonad, containers, hspec , hspec-discover, QuickCheck, semigroups, tagged, template-haskell @@ -34518,10 +35407,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 ]; @@ -34579,6 +35466,7 @@ self: { ]; description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package."; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-file" = callPackage @@ -34674,8 +35562,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 @@ -34688,6 +35576,7 @@ self: { ]; description = "Orphan instances for binary"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-parser" = callPackage @@ -34740,7 +35629,6 @@ self: { ]; description = "Extends binary with parsec/attoparsec style parsing combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-protocol" = callPackage @@ -34791,8 +35679,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; @@ -34883,10 +35771,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 @@ -34905,6 +35793,7 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-tree" = callPackage @@ -35178,7 +36067,6 @@ self: { executableHaskellDepends = [ base binary bytestring split ]; description = "Very low-level FFI bindings for Codec2"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) codec2;}; "bindings-common" = callPackage @@ -35517,7 +36405,6 @@ self: { description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -35535,8 +36422,8 @@ self: { ({ mkDerivation, base, monetdb-mapi }: mkDerivation { pname = "bindings-monetdb-mapi"; - version = "0.1.0.1"; - sha256 = "0ghl73n679y5srg4b2jwy6xgnd4lbv7wad8k133k6c7k70zq89hl"; + version = "0.1.0.2"; + sha256 = "1f6n2x8c0r72d011piyf8fqclfxcqda98ha3w29c86y66qid0wjm"; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ monetdb-mapi ]; description = "Low-level bindings for the MonetDB API (mapi)"; @@ -35774,6 +36661,7 @@ self: { libraryHaskellDepends = [ base binary bytestring rank1dynamic ]; description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binembed" = callPackage @@ -35841,6 +36729,7 @@ self: { ]; description = "Aggregate continuous values into discrete bins"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bio" = callPackage @@ -35913,6 +36802,8 @@ self: { pname = "biocore"; version = "0.3.1"; sha256 = "06ml9p144bv0c9hv6pkcvhdgc0vw0jxzbqb834ilr38kjmrpsar1"; + revision = "1"; + editedCabalFile = "0lz3inilvxn1simbpm8002iv7h9wk1gzng2vj3gpxps99zvihqc4"; libraryHaskellDepends = [ base bytestring stringable ]; description = "A bioinformatics library"; license = "LGPL"; @@ -35951,8 +36842,8 @@ self: { }: mkDerivation { pname = "biohazard"; - version = "1.0.4"; - sha256 = "1gj5xr0b9s2zifknm10bynkh0gvsi0gmw2sa3zcp1if17ixndv2c"; + version = "1.1.1"; + sha256 = "1b9jba89l4jsyzxn3s40qp0njq4b5hdgvbs07vsrrbnlwlvshb7a"; libraryHaskellDepends = [ async attoparsec base base-prelude bytestring containers exceptions hashable primitive stm text transformers unix unordered-containers @@ -36073,6 +36964,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "birch-beer" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, colour + , containers, deepseq, diagrams, diagrams-cairo, diagrams-graphviz + , diagrams-gtk, diagrams-lib, diversity, fgl, foldl, graphviz, gtk + , hierarchical-clustering, hierarchical-spectral-clustering, lens + , matrix-market-attoparsec, mtl, optparse-generic, palette, plots + , safe, scientific, sparse-linear-algebra, spectral-clustering + , split, statistics, SVGFonts, temporary, text, text-show + , typed-spreadsheet, vector + }: + mkDerivation { + pname = "birch-beer"; + version = "0.1.0.1"; + sha256 = "1xnv6zg9rc8klsjvaqf524pvplhizydjdrfybxnfjsi4d3kp612g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cassava colour containers deepseq diagrams + diagrams-cairo diagrams-graphviz diagrams-gtk diagrams-lib + diversity fgl foldl graphviz gtk hierarchical-clustering + hierarchical-spectral-clustering lens matrix-market-attoparsec mtl + palette plots safe scientific sparse-linear-algebra + spectral-clustering split statistics SVGFonts temporary text + text-show typed-spreadsheet vector + ]; + executableHaskellDepends = [ + aeson base cassava colour diagrams diagrams-cairo diagrams-lib + hierarchical-spectral-clustering lens optparse-generic + sparse-linear-algebra text text-show vector + ]; + description = "Plot a colorful tree"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bird" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, hack , hack-handler-happstack, haskell98, MissingH, mtl, parsec, process @@ -36094,6 +37020,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bisc" = callPackage + ({ mkDerivation, base, directory, filepath, selda, selda-sqlite + , text, xdg-basedir + }: + mkDerivation { + pname = "bisc"; + version = "0.1.0.0"; + sha256 = "16gjnqjp1rhsi59nxhx24zxwabzk75wiz97163pd657j02a5mwl0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath selda selda-sqlite text xdg-basedir + ]; + description = "A small tool that clears qutebrowser cookies"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "bisect-binary" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hashable , haskeline, integer-logarithms, optparse-applicative, process @@ -36143,7 +37086,6 @@ self: { ]; description = "Plays chess"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bit-array" = callPackage @@ -36196,6 +37138,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Lazy, infinite, compact stream of Bool with O(1) indexing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bit-vector" = callPackage @@ -36635,14 +37578,17 @@ self: { }: mkDerivation { pname = "bitset-word8"; - version = "0.1.1.0"; - sha256 = "01lvkz6j925pfbh5ik1imxjpf8idvm7bxpp63jxmslsz7pnyvs8l"; + version = "0.1.1.1"; + sha256 = "1pjjpqfqjnylfs5npnh7w75h9xk5gpkwzaqx0a972wa9h18gih7z"; libraryHaskellDepends = [ base containers template-haskell th-lift-instances ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ + base containers hspec QuickCheck template-haskell th-lift-instances + ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq vector + base bytestring containers criterion deepseq template-haskell + th-lift-instances vector ]; description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; license = stdenv.lib.licenses.mit; @@ -36751,17 +37697,20 @@ self: { }) {}; "bitvec" = callPackage - ({ mkDerivation, base, HUnit, primitive, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, vector + ({ mkDerivation, base, HUnit, primitive, QuickCheck + , quickcheck-classes, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector }: mkDerivation { pname = "bitvec"; - version = "0.1.0.2"; - sha256 = "15a9p3wpjyq9761yjpbxgzl6mfly9gbwzbpsqi0zyza09cf51gk2"; + version = "0.1.1.0"; + sha256 = "12wvilgmibkvbd1hb15ixyidkqdyadx8i8jwm9n50q9qjp4phmm5"; + revision = "1"; + editedCabalFile = "02y6rvmgvxhmw0mqq9b20hs75x42kkgsp2c3kppwmp4pspjipmjm"; libraryHaskellDepends = [ base primitive vector ]; testHaskellDepends = [ - base HUnit primitive QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 vector + base HUnit primitive QuickCheck quickcheck-classes test-framework + test-framework-hunit test-framework-quickcheck2 vector ]; description = "Unboxed vectors of bits / dense IntSets"; license = stdenv.lib.licenses.publicDomain; @@ -36774,6 +37723,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 ]; @@ -36805,13 +37756,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.6.0"; + sha256 = "16wkwrkvz12n1wq2q1ch8b9dwqsm011v26d03pj5lk0ms6g0c9qb"; 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; @@ -36827,6 +37780,7 @@ self: { libraryHaskellDepends = [ base containers text ]; description = "A lousy Prelude replacement by a lousy dude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bk-tree" = callPackage @@ -36949,6 +37903,25 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "blake2_0_3_0" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, criterion + , hlint, QuickCheck, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "blake2"; + version = "0.3.0"; + sha256 = "0y937kr3dp87likwrl4wpaw80jhf383k89zn8li1yj3zp1vb6niv"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base base16-bytestring bytestring hlint QuickCheck tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "A library providing BLAKE2"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blakesum" = callPackage ({ mkDerivation, base, bytestring, text, vector }: mkDerivation { @@ -37033,6 +38006,7 @@ self: { ]; description = "HTML5 Canvas Graphics Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blas" = callPackage @@ -37053,8 +38027,8 @@ self: { }: mkDerivation { pname = "blas-carray"; - version = "0.0.1.1"; - sha256 = "0ijzcdrbfb9w3vs4g96p30h7ilh9s05ij8n0prinmr1ngmvipbdx"; + version = "0.1.0.1"; + sha256 = "1aqphwgzcryzfzjzsv6ph4kcmswqd7mgs65dj8lsjzkhfc6izggl"; libraryHaskellDepends = [ base blas-ffi carray netlib-carray netlib-ffi storable-complex transformers @@ -37064,12 +38038,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blas-comfort-array" = callPackage + ({ mkDerivation, base, blas-ffi, comfort-array + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "blas-comfort-array"; + version = "0.0.0.1"; + sha256 = "1m6kq46sz4chjfc5kh1vqvdfzvn0c46iq93hv9d5rrc9adhma7gb"; + libraryHaskellDepends = [ + base blas-ffi comfort-array netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran BLAS via comfort-array"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blas-ffi" = callPackage ({ mkDerivation, base, blas, netlib-ffi }: mkDerivation { pname = "blas-ffi"; - version = "0.0.1.1"; - sha256 = "0dphqcnnka0ahfgdnshm8r3bd6r5wbpln9kksa6y09yi2nnqh3gf"; + version = "0.1"; + sha256 = "1zmw1x37ayssplj8w01ivfyh2jjg906c389cjah4hpn5dpb7p9w5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base netlib-ffi ]; libraryPkgconfigDepends = [ blas ]; description = "Auto-generated interface to Fortran BLAS"; @@ -37318,8 +38311,10 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.8.2.1"; - sha256 = "0ih1c3qahkdgzbqihdhny5s313l2m66fbb88w8jbx7yz56y7rawh"; + version = "0.8.2.2"; + sha256 = "1qc2mn2zb2sdj3xvv73asibqnb11l7b5l30ff05qrfh7sy7wzw66"; + revision = "1"; + editedCabalFile = "0ivspcxz0b2r7kcas5hlw0fh92883r8ghwz9lck7nyqn6wn5i8zx"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -37611,6 +38606,7 @@ self: { ]; description = "Elasticsearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloodhound-amazonka-auth" = callPackage @@ -37633,6 +38629,7 @@ self: { ]; description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloomfilter" = callPackage @@ -37802,6 +38799,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 @@ -37874,7 +38887,6 @@ self: { ]; description = "Three games for inclusion in a web server"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bogocopy" = callPackage @@ -38191,25 +39203,26 @@ 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 ]; description = "Boolean normal form: NNF, DNF & CNF"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boolector" = callPackage ({ mkDerivation, base, boolector, c2hs, containers, directory, mtl - , temporary + , temporary, time }: mkDerivation { pname = "boolector"; - version = "0.0.0.5"; - sha256 = "0wgz2x8jwv5zwh9g7jpvl1q6inyvhjlh4jf3983r3zxr3k2jmxq5"; + version = "0.0.0.8"; + sha256 = "09zhrg6zrf3viigjdw4q4c1i0x4ww467m9ghapdfwq4d01cr0c43"; libraryHaskellDepends = [ - base containers directory mtl temporary + base containers directory mtl temporary time ]; librarySystemDepends = [ boolector ]; libraryToolDepends = [ c2hs ]; @@ -38262,8 +39275,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; @@ -38294,8 +39307,8 @@ self: { ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: mkDerivation { pname = "boomerang"; - version = "1.4.5.5"; - sha256 = "0i2svn3bs57hhwgplkydvvpznl178dlm3byi0j4y2ckd9gqpzz4d"; + version = "1.4.5.6"; + sha256 = "0zkr9w9qqrcicdm6r928a1z1svspnx6vh0b9mac4q7cd1h021ph3"; libraryHaskellDepends = [ base mtl semigroups template-haskell text ]; @@ -38399,12 +39412,15 @@ 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 ]; description = "Boring and Absurd types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boring-game" = callPackage @@ -38507,6 +39523,8 @@ self: { pname = "bound-extras"; version = "0"; sha256 = "0j010sbdm0bc9dq4lsyw1vb2x0j6gcjxp7ywjn8izdh6yqr2r3qq"; + revision = "1"; + editedCabalFile = "0qcxcpn8hdmkg3mqz80i0j9jrym2pk11k5hyjhqbmrqlhf3fr7qw"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -38516,6 +39534,7 @@ self: { ]; description = "ScopeH and ScopeT extras for bound"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bound-gen" = callPackage @@ -38529,6 +39548,18 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bounded-tchan" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -38591,8 +39622,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; @@ -38676,8 +39707,8 @@ self: { ({ mkDerivation, base, directory, process }: mkDerivation { pname = "brainfuck-monad"; - version = "0.5.0"; - sha256 = "0dr371scgb6hc43vdj2fbic9z1aw4bfhnc910y22a9y26kcldp2g"; + version = "0.5.1"; + sha256 = "1y0dz80q2rniz23b0m2dircyl244id9888pblaqj8d4zcapsnsww"; libraryHaskellDepends = [ base directory process ]; description = "BrainFuck monad"; license = stdenv.lib.licenses.bsd3; @@ -38781,49 +39812,67 @@ self: { "brick" = 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.37.2"; - sha256 = "176rq7xpwww1c3h7hm6n6z7sxbd3wc2zhxvnk65llk9lipc6rf3w"; + version = "0.46"; + sha256 = "1alfv1z0adp74d7vcqp92c73y8rkhv96s3lj4dqjxkqk044zgd9p"; 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; }) {}; - "brick_0_41_1" = 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 + "brick-dropdownmenu" = callPackage + ({ mkDerivation, base, brick, containers, microlens, microlens-ghc + , microlens-th, pointedlist, vector, vty }: mkDerivation { - pname = "brick"; - version = "0.41.1"; - sha256 = "1sgxw18n3261gz0yfpig3p9vi84b2rlrsdkmvn5az26qrwrycqfd"; + pname = "brick-dropdownmenu"; + version = "0.1.0"; + sha256 = "1801l15xrl5a822v0cdrf8d41iklfqlp6gzkyj14a7fqf3ycc7rw"; 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 brick containers microlens microlens-ghc microlens-th + pointedlist vector vty ]; - testHaskellDepends = [ base containers QuickCheck ]; - description = "A declarative terminal user interface library"; + description = "A drop-down menu widget for brick"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "brick-filetree" = callPackage + ({ mkDerivation, base, brick, comonad, containers, directory + , directory-tree, filepath, free, vector, vty + }: + mkDerivation { + pname = "brick-filetree"; + version = "0.1.0.2"; + sha256 = "0ppc2y407db7kx8hzrjbx3qhd4w39d5p4zra3bxsc99ny9aqbrmk"; + libraryHaskellDepends = [ + base brick comonad containers directory directory-tree filepath + free vector vty + ]; + testHaskellDepends = [ + base brick comonad containers directory directory-tree filepath + free vector vty + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "brick-skylighting" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty @@ -39023,17 +40072,83 @@ self: { ]; description = "Haskell source code formatter"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "broadcast-chan" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, async, base, criterion, deepseq, stm + , unliftio-core + }: mkDerivation { pname = "broadcast-chan"; - version = "0.1.1"; - sha256 = "1wl5x7qi00z7q9k6rbmzszzbrqycfcpg04a1ikrnvzqs61ddcnxd"; - libraryHaskellDepends = [ base ]; - description = "Broadcast channel type that avoids 0 reader space leaks"; + 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 @@ -39115,17 +40230,17 @@ self: { "bsb-http-chunked" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-builder, deepseq, doctest, gauge, hedgehog, semigroups - , tasty, tasty-hedgehog, tasty-hunit + , deepseq, doctest, gauge, hedgehog, semigroups, tasty + , tasty-hedgehog, tasty-hunit }: mkDerivation { pname = "bsb-http-chunked"; - version = "0.0.0.3"; - sha256 = "181bmywrb6w3v4hljn6lxiqb0ql1imngsm4sma7i792y6m9p05j4"; - libraryHaskellDepends = [ base bytestring bytestring-builder ]; + version = "0.0.0.4"; + sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql"; + libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder doctest - hedgehog tasty tasty-hedgehog tasty-hunit + attoparsec base blaze-builder bytestring doctest hedgehog tasty + tasty-hedgehog tasty-hunit ]; benchmarkHaskellDepends = [ base blaze-builder bytestring deepseq gauge semigroups @@ -39152,8 +40267,10 @@ self: { }: mkDerivation { pname = "bson"; - version = "0.3.2.6"; - sha256 = "106fdxzwpkp5vrnfsrjjwy8dn9rgmxrp79ji7xaxv8dgb9hw73bk"; + version = "0.3.2.7"; + sha256 = "0avzr3aa3mbr9hcjwd0nr0pnpiym7s35qw7nghz51mrzb76rsci7"; + revision = "1"; + editedCabalFile = "1y6gy4rq2wb123p1qc35p0hnk8dqh2hnlys2c97znwcjjsd5p203"; libraryHaskellDepends = [ base binary bytestring cryptohash data-binary-ieee754 mtl network text time @@ -39213,6 +40330,7 @@ self: { ]; description = "Mapping between BSON and algebraic data types"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bspack" = callPackage @@ -39240,6 +40358,8 @@ self: { pname = "bsparse"; version = "0.0.5"; sha256 = "12wn8jlqkb9d9vpdbwc3m288cgnr15cq4wv5fxlp7f10p3y42l2a"; + revision = "1"; + editedCabalFile = "0vlcwcgmlk4ghwhiyy4234driyvq5ap5g587nmf23fh8b54g7j3q"; libraryHaskellDepends = [ base bytestring ]; description = "A simple unassuming parser for bytestring"; license = stdenv.lib.licenses.bsd3; @@ -39247,14 +40367,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 @@ -39262,7 +40382,6 @@ self: { benchmarkHaskellDepends = [ base clock ghc-prim hashable ]; description = "B-Tree on Unmanaged Heap"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "btree-concurrent" = callPackage @@ -39292,8 +40411,8 @@ self: { ({ mkDerivation, base, bytestring, time, unix }: mkDerivation { pname = "btrfs"; - version = "0.1.2.3"; - sha256 = "13dq5xdzny1c0yih67r3yhnsr9vxxim8kbqbj5hcygb2cmf0pz3y"; + version = "0.2.0.0"; + sha256 = "1h56yb4a3i1c452splxj06c8harrcws2pg86rx7jz6b804ncrzr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring time unix ]; @@ -39349,6 +40468,8 @@ self: { pname = "buffer"; version = "0.5.3"; sha256 = "0bf9y6rb3q26rk6qd7a2mjlb1gd1gp2k080ywhp5g48l474h6p26"; + revision = "1"; + editedCabalFile = "19v3zis3fqirsacacqnn7ypgvddgi6i8dj8bkbap2ln2mmqkvlh0"; libraryHaskellDepends = [ base base-prelude bug bytestring ]; testHaskellDepends = [ bug quickcheck-instances rerebase tasty tasty-hunit @@ -39367,8 +40488,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 ]; @@ -39443,6 +40564,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "buffon-machines" = callPackage + ({ mkDerivation, base, mtl, multiset, random, template-haskell }: + mkDerivation { + pname = "buffon-machines"; + version = "1.1.1.0"; + sha256 = "0985xh66j3f8p352gsq9balndwrsnylqilnnbk2sfb535jyh84dh"; + libraryHaskellDepends = [ + base mtl multiset random template-haskell + ]; + description = "Perfect simulation of discrete random variables"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bug" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -39463,8 +40597,8 @@ self: { }: mkDerivation { pname = "bugsnag-haskell"; - version = "0.0.2.0"; - sha256 = "0jkcfgs6ln3pcq5c0pz170wwphkx27ya2xj7li1avph5j5q42dxl"; + version = "0.0.3.0"; + sha256 = "1g1wqs3vlgdyk8f0xwvrzb1hc77xmjm8ygaw1skrh64darj8y9cq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39536,8 +40670,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 @@ -39613,25 +40747,31 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bumper" = callPackage @@ -39778,8 +40918,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.7.2"; - sha256 = "098klf1rqr39alrxw0s28p5wdfrisrkf5grdsjr78yxp2jxq3987"; + version = "0.7.4"; + sha256 = "1ivisgd7w7hi0yvfnm689grq0mfn03k2rmj5sn570qcpa4xfm2kw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -39807,10 +40947,8 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.3.1.1"; - sha256 = "1llhsqg8m4f7am14kvw4psm5fb8kcph27mk059vg2mq65xns470z"; - revision = "2"; - editedCabalFile = "0r600p7pd4l4p75igklwfqqxp2jyl2ghqc3y6jhn473rrw31g36m"; + version = "1.3.2.1"; + sha256 = "16jwhj3lrghn11igc5ci484r4xc1ii6hz6ysj39njds547dmznda"; libraryHaskellDepends = [ base bifunctors containers deque extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -39821,6 +40959,7 @@ self: { ]; description = "Chops a command or program invocation into digestable pieces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "butter" = callPackage @@ -39842,23 +40981,23 @@ self: { ]; description = "Monad Transformer for Asyncronous Message Passing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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; @@ -39878,6 +41017,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-embed" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "bv-embed"; + version = "0.1.0"; + sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79"; + libraryHaskellDepends = [ base ]; + description = "Define embeddings of small bit vectors into larger ones"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bv-little" = callPackage ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit @@ -39885,8 +41035,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 @@ -39900,6 +41050,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bv-little_1_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp + , keys, mono-traversable, mono-traversable-keys, primitive + , QuickCheck, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text-show + }: + mkDerivation { + pname = "bv-little"; + version = "1.0.0"; + sha256 = "0hdzwcdm3cdiqyjkl5k9hg61za51w61j5168c17nfs1yyhh0fdms"; + libraryHaskellDepends = [ + base deepseq hashable integer-gmp keys mono-traversable + mono-traversable-keys primitive QuickCheck text-show + ]; + testHaskellDepends = [ + base deepseq hashable mono-traversable mono-traversable-keys + QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text-show + ]; + benchmarkHaskellDepends = [ + base criterion deepseq hashable mono-traversable QuickCheck + smallcheck + ]; + description = "Efficient little-endian bit vector library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, mtl, parameterized-utils , prettyclass, QuickCheck, random @@ -39926,8 +41104,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.3.1.0"; - sha256 = "11kchyzm908ld3s3k8jh8phbryhp4zj5d3aq4sflfd8pkrns321d"; + version = "0.3.2.0"; + sha256 = "100s2f4w0lgnsjgjazck7hnbk3k9ibg1i4rdcyza9jphp67vjgar"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40025,6 +41203,8 @@ self: { pname = "byteset"; version = "0.1.1.0"; sha256 = "18dg863wbbjh95yial4gy6vi5spwygp0l7dfx6bj00lz4xdrqj8k"; + revision = "1"; + editedCabalFile = "1lgxxxrmw4g32pa861n6qbfpzwv14wfjrlp4hv5zd9hygy6v6q2p"; libraryHaskellDepends = [ base binary ]; description = "Set of bytes"; license = stdenv.lib.licenses.bsd3; @@ -40065,14 +41245,15 @@ self: { ]; description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-builder" = callPackage ({ 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"; @@ -40186,7 +41367,6 @@ self: { benchmarkHaskellDepends = [ base bytestring gauge text ]; description = "checks to see if a given bytestring adheres to a certain encoding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-from" = callPackage @@ -40205,6 +41385,7 @@ self: { ]; description = "A type-class to convert values from ByteString"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-handle" = callPackage @@ -40215,6 +41396,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 @@ -40273,6 +41456,7 @@ self: { ]; description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-progress" = callPackage @@ -40354,6 +41538,7 @@ self: { ]; description = "Efficient conversion of values into readable byte strings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-strict-builder" = callPackage @@ -40567,8 +41752,8 @@ self: { }: mkDerivation { pname = "c-mosquitto"; - version = "0.1.5.0"; - sha256 = "07pqy6809lma8b69s91m93ibkag7irma07axnhkhsswkhd2kf5im"; + version = "0.1.6.0"; + sha256 = "16rx690qgjg219l1zkdrlx0gb2ihxd6jhgnh53v0v9hrqlxn35cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40615,6 +41800,7 @@ self: { executableHaskellDepends = [ base c0parser ]; description = "Simple C0 Syntax Check"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c0parser" = callPackage @@ -40626,6 +41812,7 @@ self: { libraryHaskellDepends = [ base parsec ]; description = "Simple C0 Parser"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c10k" = callPackage @@ -40669,8 +41856,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.28.5"; - sha256 = "1xid997cc38rym6hsgv8xz5dg8jcsh8hs5rrwaxkij7mc09an45x"; + version = "0.28.6"; + sha256 = "1nplgxfin139x12sb656f5870rpdclrhzi8mq8pry035qld15pci"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -40735,6 +41922,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ca-province-codes" = callPackage + ({ mkDerivation, aeson, base, hspec, QuickCheck, text }: + mkDerivation { + pname = "ca-province-codes"; + version = "1.0.0.0"; + sha256 = "1lhmmqn83v9bflm4x2nqbxx6pjh393id29syglinaqal4dvl5qq3"; + libraryHaskellDepends = [ aeson base text ]; + testHaskellDepends = [ aeson base hspec QuickCheck text ]; + description = "ISO 3166-2:CA Province Codes and Names"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cab" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, conduit , conduit-extra, containers, directory, filepath, process @@ -40800,8 +41999,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "2.0.0"; - sha256 = "039j25av78fg4dg34q0i3h4ahb6j820kja1f2411rsxbrl9li5ca"; + version = "2.2.1"; + sha256 = "13pqdmghs92rwkg8fkky30sqimq54yzw2y1z5czdsmlj46r8i6ij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40816,6 +42015,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-bundle-clib" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath + , process, temporary, text, time + }: + mkDerivation { + pname = "cabal-bundle-clib"; + version = "0.1.0"; + sha256 = "02fwpasnvpc2np7aibwmgpmy0yz638iya8w6sy6szxzfzmn2kscm"; + libraryHaskellDepends = [ + base bytestring Cabal directory filepath process temporary text + time + ]; + description = "Bundling C/C++ projects in Cabal package made easy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-cargs" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-lenses, cmdargs , directory, filepath, lens, system-fileio, system-filepath, tasty @@ -40823,12 +42038,12 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "1.0.0"; - sha256 = "025cdf78kg572b8bk5xxz4qxibjn4c72x2d3rxn6crz722139rf0"; + version = "1.2.0"; + sha256 = "10dqy2i2rq4hq81v2gar2bsq3glx5yg5mwp9a0h7drap69407ygs"; 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 ]; @@ -40836,6 +42051,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 @@ -40882,8 +42098,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.38.1"; - sha256 = "1sniyy2pappjjhvw1bma593gxdcjlg3j2afx8jgb70h6cbl3769n"; + version = "4.38.4"; + sha256 = "15jgn6wx0w96l2s7xmyp0n9m5sdqfls8kpmfgvykrdpw3mj3bnr0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40972,8 +42188,8 @@ self: { }: mkDerivation { pname = "cabal-file-th"; - version = "0.2.4"; - sha256 = "076rprsnb9nyhm97ky4vzfcvirl8wx4g3f68lx7k5inhmkzxfm8b"; + version = "0.2.6"; + sha256 = "0kam97xbmsn0alqyw709fpvj7j5dhdi90n98dmg1sfr5i54gh1nw"; libraryHaskellDepends = [ base Cabal directory pretty template-haskell ]; @@ -41090,23 +42306,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 = '' @@ -41184,8 +42402,10 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.8.0"; - sha256 = "1xz28mj98qfqra4kb7lwjkwa5ail0pn1fvia916wp6005mgvsh60"; + version = "0.9.0"; + sha256 = "0rvkwqzz92p85i9xwcxg3ah4imxh46ficg6yk0l6g9687970gfrg"; + revision = "1"; + editedCabalFile = "0snzm6qvalyczmdicff5fsradk3h1bm3cqcax6rmwzr7xa1j43p7"; libraryHaskellDepends = [ base Cabal lens strict system-fileio system-filepath text transformers unordered-containers @@ -41218,7 +42438,6 @@ self: { ]; description = "Cabal support for creating Mac OSX application bundles"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-meta" = callPackage @@ -41287,8 +42506,10 @@ self: { }: mkDerivation { pname = "cabal-plan"; - version = "0.4.0.0"; - sha256 = "0cbk0xhv189jv656x6a2s0bcnhkks4rlpkhvxbb215v5ldmrkpb1"; + version = "0.5.0.0"; + sha256 = "1vfa4lwfjhv4nyl1rwm7i99zdkwriighlhfcz0rgjwzgg56wrihq"; + revision = "1"; + editedCabalFile = "0nnh6qq36cpfwzqrv1i1cn93n6n32nbl6ddp0y22jmmxnx9xsrvp"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -41301,9 +42522,8 @@ self: { optparse-applicative parsec text vector ]; doHaddock = false; - description = "Library and utiltity for processing cabal's plan.json file"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + description = "Library and utility for processing cabal's plan.json file"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; }) {}; "cabal-progdeps" = callPackage @@ -41339,17 +42559,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; @@ -41489,10 +42710,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; @@ -41620,8 +42839,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.11"; - sha256 = "1wsxris61139j0bvrmzjmjqn186nmr5gvpddv098154d2w8hqn41"; + version = "2.14.1"; + sha256 = "1bkhh5s3x6as4pz70p2rgwkrb121k5ic7j5dhmlh0rwvhrr9g1z2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41654,28 +42873,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.1.1"; - sha256 = "1fm9vi7iyxcpvvivy973njlmsp7ia7cl4jijhf43h8wq60skh1md"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal filepath time ]; - executableHaskellDepends = [ - base Cabal filepath optparse-applicative - ]; - testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; - description = "Convert Cabal files into rpm spec files"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "cabal2spec_2_2_1" = callPackage - ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty - , tasty-golden, time - }: - mkDerivation { - pname = "cabal2spec"; - version = "2.2.1"; - sha256 = "1j4y942r2v1s9cvvgnpjckl7s9bmpby1w4z4gffpbfirrc2h1nq6"; + version = "2.2.2.1"; + sha256 = "0jv335b6vz1y6jp381hhrb2miniyqzkn18ansc67as04yf3ngmay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -41685,7 +42884,6 @@ self: { testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; description = "Convert Cabal files into rpm spec files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -41884,51 +43082,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; @@ -41936,44 +43118,37 @@ 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"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cacophony" = callPackage @@ -41984,10 +43159,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 = [ @@ -42003,7 +43176,6 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caf" = callPackage @@ -42053,8 +43225,10 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.5.0"; - sha256 = "1wxylv4d8120ri0vgar168ikqa9m6533ipdwi38qlmxmw20ws2j2"; + version = "0.13.6.0"; + sha256 = "0c0b0ffxd9dx4c52ny6im420f6wyjmd822fn6vh561d07nr0y08n"; + revision = "1"; + editedCabalFile = "1mldbaa3qp0nf4jyns1cnadyk8gga2w6hl3y2xdbnbbsjm42s4m9"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -42063,6 +43237,7 @@ self: { libraryPkgconfigDepends = [ cairo ]; description = "Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "cairo-appbase" = callPackage @@ -42077,6 +43252,7 @@ self: { executableHaskellDepends = [ base cairo glib gtk ]; description = "A template for building new GUI applications using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cairo-canvas" = callPackage @@ -42090,8 +43266,29 @@ self: { libraryHaskellDepends = [ base cairo linear mtl random time ]; description = "Simpler drawing API for Cairo"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cairo-core" = callPackage + ({ mkDerivation, base, bytestring, c2hs, Cabal, cairo, directory + , filepath, haskell-src-exts, http-client, http-client-tls, hxt + , hxt-xpath, monad-extras, transformers + }: + mkDerivation { + pname = "cairo-core"; + version = "1.16.4"; + sha256 = "1f4ps76mxgnk2y0gqk28kgs6qrslwccbisl6wrk2qwxd13cfwk86"; + setupHaskellDepends = [ + base bytestring Cabal directory filepath haskell-src-exts + http-client http-client-tls hxt hxt-xpath + ]; + libraryHaskellDepends = [ base monad-extras transformers ]; + libraryPkgconfigDepends = [ cairo ]; + libraryToolDepends = [ c2hs ]; + description = "Cairo Haskell binding (core functions)"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) cairo;}; + "cake" = callPackage ({ mkDerivation, array, base, binary, bytestring, cmdargs , containers, derive, directory, filepath, mtl, parsek, process @@ -42112,6 +43309,7 @@ self: { ]; description = "A build-system library and driver"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cake3" = callPackage @@ -42162,6 +43360,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cal-layout" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "cal-layout"; + version = "0.1.0.2"; + sha256 = "11i3nn1a84brm5isfqlapwnfwh7n9iyjr6kg1jjv8a9cv5nhbq3l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base ]; + description = "Calendar Layout Algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cal3d" = callPackage ({ mkDerivation, base, cal3d }: mkDerivation { @@ -42443,6 +43656,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 { @@ -42559,6 +43793,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cantor-pairing" = callPackage + ({ mkDerivation, arithmoi, base, containers, hspec, hspec-discover + , integer-gmp, integer-logarithms, mtl + }: + mkDerivation { + pname = "cantor-pairing"; + version = "0.1.1.0"; + sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw"; + libraryHaskellDepends = [ + arithmoi base containers integer-gmp integer-logarithms + ]; + testHaskellDepends = [ base containers hspec mtl ]; + testToolDepends = [ hspec-discover ]; + description = "Convert data to and from a natural number representation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cao" = callPackage ({ mkDerivation, alex, array, base, cmdargs, ConfigFile, containers , directory, dlist, filepath, happy, language-c, mtl, pretty @@ -42596,6 +43848,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 @@ -42615,42 +43891,46 @@ self: { ]; description = "OTP-like supervision trees in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "capnp" = callPackage - ({ mkDerivation, array, base, binary, bytes, bytestring, cereal - , containers, cpu, data-default, data-default-instances-vector - , deepseq, directory, dlist, exceptions, filepath, heredoc, HUnit - , mtl, pretty-show, primitive, process, process-extras, QuickCheck - , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, transformers, utf8-string, vector, wl-pprint-text + ({ mkDerivation, async, base, bytes, bytestring, containers, cpu + , data-default, data-default-instances-vector, deepseq, directory + , exceptions, filepath, focus, hashable, heredoc, hspec, list-t + , mtl, network, network-simple, pretty-show, primitive, process + , process-extras, QuickCheck, quickcheck-instances, quickcheck-io + , reinterpret-cast, resourcet, safe-exceptions, stm, stm-containers + , supervisors, text, transformers, vector, wl-pprint-text }: mkDerivation { pname = "capnp"; - version = "0.2.0.0"; - sha256 = "06frfg1dl2cxbksy07pp9njfdgmyamyywd9wn2izpgixpxhv6d7d"; + version = "0.4.0.0"; + sha256 = "1dzabszp3nn13rmvqmdl2gimwmkdpjzd303chbi0jw8248s14bfx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytes bytestring cpu data-default - data-default-instances-vector exceptions mtl primitive - reinterpret-cast text transformers vector + async base bytes bytestring containers cpu data-default + data-default-instances-vector exceptions focus hashable list-t mtl + network network-simple pretty-show primitive reinterpret-cast + safe-exceptions stm stm-containers supervisors text transformers + vector ]; executableHaskellDepends = [ - array base binary bytes bytestring cereal containers directory - dlist exceptions filepath mtl primitive reinterpret-cast text - transformers utf8-string vector wl-pprint-text + base bytes bytestring containers data-default directory exceptions + filepath mtl primitive reinterpret-cast safe-exceptions text + transformers vector wl-pprint-text ]; testHaskellDepends = [ - array base binary bytes bytestring data-default deepseq directory - exceptions heredoc HUnit mtl pretty-show primitive process - process-extras QuickCheck quickcheck-instances quickcheck-io - reinterpret-cast resourcet test-framework test-framework-hunit - test-framework-quickcheck2 text transformers vector + async base bytes bytestring containers data-default deepseq + directory exceptions heredoc hspec mtl network network-simple + pretty-show primitive process process-extras QuickCheck + quickcheck-instances quickcheck-io reinterpret-cast resourcet + safe-exceptions stm supervisors text transformers vector ]; description = "Cap'n Proto for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "capped-list" = callPackage @@ -42740,6 +44020,7 @@ self: { ]; description = "some spaghetti code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "carboncopy" = callPackage @@ -42852,8 +44133,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 = [ @@ -42877,8 +44158,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "3.1.0.3"; - sha256 = "0fb4pyz1f66r811ihpcrq5qpznnxrnrrsh8wfy5g8i5k8srf78n9"; + version = "3.4.5.0"; + sha256 = "0ps01gm27dajr8ixfppc2mfmx8yzr24fbq9k5n3c9xgxvn9w7rmc"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances @@ -42916,8 +44197,8 @@ self: { }: mkDerivation { pname = "casadi-bindings-core"; - version = "3.1.0.0"; - sha256 = "08z6jh8hn23162d6baznvs3br3fin4rp6j4sdfsiid1c3z92q3rn"; + version = "3.4.5.0"; + sha256 = "0iqzr6gm30a0v7523yqkipgph89wlyihwmnzidpvki0vlv6fldrl"; libraryHaskellDepends = [ base casadi-bindings-internal containers vector ]; @@ -42931,8 +44212,8 @@ self: { ({ mkDerivation, base, casadi, containers, vector }: mkDerivation { pname = "casadi-bindings-internal"; - version = "0.1.5.0"; - sha256 = "0p7kbg015447sasn6n4l5kdafrxc2yhgqrxg46xadma6vvv00hf2"; + version = "0.1.6.1"; + sha256 = "1y2h0r0l0b9y43n0irsc5s82x7xmzdjdjaz6cqmxk19v0hg4jdnx"; libraryHaskellDepends = [ base containers vector ]; librarySystemDepends = [ casadi ]; description = "low level bindings to CasADi"; @@ -43336,6 +44617,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 @@ -43356,8 +44639,8 @@ self: { }: mkDerivation { pname = "cassava-conduit"; - version = "0.5.0"; - sha256 = "0xj8hxyijkajgrg6g52lxfbg83d8gp01b2x35z0mqia2k6whlihr"; + version = "0.5.1"; + sha256 = "1y3pjvc273vxb8lr3wckliw23n8vninl034wc0zlfh1asplp4nxm"; libraryHaskellDepends = [ array base bifunctors bytestring cassava conduit containers mtl text @@ -43389,18 +44672,15 @@ self: { }) {}; "cassava-megaparsec" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers, hspec - , hspec-megaparsec, megaparsec, unordered-containers, vector + ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec + , megaparsec, unordered-containers, vector }: mkDerivation { pname = "cassava-megaparsec"; - version = "1.0.0"; - sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28"; - revision = "1"; - editedCabalFile = "0dk6bxyvlg0iq83m81cbyysiydcj3dsvhlishjc119hzpy8g8xd6"; + version = "2.0.0"; + sha256 = "0jwhvgfkgxpxp6cci9ahp3kryr4vaxbpqgjzf8ylr2592dm2irnf"; libraryHaskellDepends = [ - base bytestring cassava containers megaparsec unordered-containers - vector + base bytestring cassava megaparsec unordered-containers vector ]; testHaskellDepends = [ base bytestring cassava hspec hspec-megaparsec vector @@ -43437,8 +44717,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 = [ @@ -43548,6 +44828,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Exposes a Template Haskell function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "catch-fd" = callPackage @@ -43586,12 +44867,12 @@ self: { }) {}; "category" = callPackage - ({ mkDerivation, alg, base }: + ({ mkDerivation, alg, base, transformers }: mkDerivation { pname = "category"; - version = "0.2.0.1"; - sha256 = "0v5b15lgbdjrqpln532kw2d4isl5lf633jbld3clcp7c71vb7l07"; - libraryHaskellDepends = [ alg base ]; + version = "0.2.2.0"; + sha256 = "1a01i1jxvgwcvmg3n4zpsp1f9pfaj3h6kzv3as0l3dyrky7ma8r3"; + libraryHaskellDepends = [ alg base transformers ]; description = "Categorical types and classes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -43711,6 +44992,7 @@ self: { hspec QuickCheck ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayene-lpp" = callPackage @@ -43727,7 +45009,6 @@ self: { testHaskellDepends = [ base base16-bytestring hspec ]; description = "Cayenne Low Power Payload"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayley-client" = callPackage @@ -43737,8 +45018,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.4.7"; - sha256 = "13jrmlci29hdx0mxs4lzd9xdrdn9qga4891p49nhfpfiz4gch6xs"; + version = "0.4.8"; + sha256 = "09hrq1k8s8w7rawyn78hjagirs3yrkp79nn7p5w1l8amp27k5cdi"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -43792,10 +45073,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 = [ @@ -43807,19 +45086,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; }) {}; @@ -43830,10 +45114,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 @@ -43911,8 +45193,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.1.7"; - sha256 = "15acmkp512bzpq9d0yz4dclpvb71fr2wv292ygv371nhyzs8vilp"; + version = "0.1.2.3"; + sha256 = "16w16sysk0g9capl45v8pzyfg38mw2xnkj8dh5fghlc9vzfdgc53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44081,8 +45363,8 @@ self: { }: mkDerivation { pname = "cereal"; - version = "0.5.7.0"; - sha256 = "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs"; + version = "0.5.8.0"; + sha256 = "10j205g4w311ypk24ds2nmv1816s8645788s6a1vrfippa56dlrp"; libraryHaskellDepends = [ array base bytestring containers ghc-prim ]; @@ -44228,6 +45510,7 @@ self: { ]; description = "Use cereal to encode/decode io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-text" = callPackage @@ -44442,19 +45725,39 @@ 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 = "3"; + editedCabalFile = "06gyp3mxx9jkkbz9sbn389wjsz33s231vk53pbsm37a1z9ply14a"; 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; + }) {}; + + "cgi_3001_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, mtl + , multipart, network-uri, parsec, time, xhtml + }: + mkDerivation { + pname = "cgi"; + version = "3001.4.0.0"; + sha256 = "1d0nh5ymkqskkp4yn0gfz4mff8i0cxyw1wws8xxp6k1mg1ywa25k"; + revision = "1"; + editedCabalFile = "0q1s49hglw0zjcqsi7ba8nminywxgn6b83xds2lfp0r12q2h00xr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl multipart network-uri + parsec time xhtml + ]; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -44469,7 +45772,6 @@ self: { libraryHaskellDepends = [ base cgi mtl ]; description = "Undecidable instances for the cgi package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cgi-utils" = callPackage @@ -44582,8 +45884,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"; @@ -44644,6 +45946,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "char-decode" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, tasty + , tasty-quickcheck, text + }: + mkDerivation { + pname = "char-decode"; + version = "0.0.1"; + sha256 = "0cr0pp83mfnjnlwywig930bx2vcvwh579g0qic4w6jknsrn54w38"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + description = "Convert legacy byte encodings to and from Unicode"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "charade" = callPackage ({ mkDerivation, base, configurator, containers, filepath, heist , lens, mtl, QuickCheck, random, snap, snap-core, snap-extras @@ -44676,6 +45992,8 @@ self: { pname = "charset"; version = "0.3.7.1"; sha256 = "1gn0m96qpjww8hpp2g1as5yy0wcwy4iq73h3kz6g0yxxhcl5sh9x"; + revision = "1"; + editedCabalFile = "1z6nxw2g9vgsjq0g159sk8mwj68lwzxzi5iv5ynha0h85jcqxszy"; libraryHaskellDepends = [ array base bytestring containers semigroups unordered-containers ]; @@ -44865,6 +46183,7 @@ self: { ]; description = "The ChatWork API in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate" = callPackage @@ -44873,10 +46192,10 @@ self: { }: mkDerivation { pname = "cheapskate"; - version = "0.1.1"; - sha256 = "1hiqi7h76shjzs2zj0j8g6wnq2hbiq1hmfafdazr97fba2zl2432"; + version = "0.1.1.1"; + sha256 = "0qnyd8bni2rby6b02ff4bvfdhm1hwc8vzpmnms84jgrlg1lly3fm"; revision = "1"; - editedCabalFile = "1zrbp211ciia8j1br6krbxbqsj69kmx0rgkbvbpxdklmbgpfam3b"; + editedCabalFile = "0mf6qdpgh56n0ynyy272vhkk2bjrdhppks2vrw79gk0kzn29fggh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45059,6 +46378,7 @@ self: { ]; description = "A simple and intuitive library for automated testing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chell-hunit" = callPackage @@ -45116,6 +46436,69 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "chiasma" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, directory + , either, filepath, free, HTF, lens, mtl, parsec, posix-pty + , process, resourcet, split, transformers, typed-process, unix + , unliftio + }: + mkDerivation { + pname = "chiasma"; + version = "0.1.0.0"; + sha256 = "140p3qrrdh3im5qj43swl9cvljgyc39zy7ci5048j42h8x9q7glg"; + libraryHaskellDepends = [ + base bytestring data-default-class directory either filepath free + lens mtl parsec posix-pty process resourcet split transformers + typed-process unix unliftio + ]; + testHaskellDepends = [ + base bytestring data-default-class directory either filepath free + HTF lens mtl parsec posix-pty process resourcet split transformers + typed-process unix unliftio + ]; + description = "tmux api"; + license = stdenv.lib.licenses.mit; + 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 @@ -45156,6 +46539,7 @@ self: { libraryHaskellDepends = [ base MonadRandom ]; description = "Choose random elements from a stream"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "choose-exe" = callPackage @@ -45172,6 +46556,7 @@ self: { ]; description = "Command-line program to choose random element from a stream"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chorale" = callPackage @@ -45316,7 +46701,6 @@ self: { ]; description = "Datatypes required for chr library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chr-lang" = callPackage @@ -45366,6 +46750,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chromatin" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers + , data-default-class, deepseq, directory, filepath, Glob, hslogger + , HTF, lens, messagepack, nvim-hs, parsec, prettyprinter, resourcet + , ribosome, split, stm-chans, stm-conduit, strings, transformers + , typed-process, unliftio + }: + mkDerivation { + pname = "chromatin"; + version = "0.1.1.0"; + sha256 = "15b4anslh4f4ysmypp10rfp1b1x90nx0q29my7bw9rkdhrxl5i8q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit containers data-default-class deepseq + directory filepath Glob hslogger lens messagepack nvim-hs parsec + prettyprinter resourcet ribosome split stm-chans stm-conduit + strings transformers typed-process unliftio + ]; + executableHaskellDepends = [ + base bytestring conduit containers data-default-class deepseq + directory filepath Glob hslogger lens messagepack nvim-hs parsec + prettyprinter resourcet ribosome split stm-chans stm-conduit + strings transformers typed-process unliftio + ]; + testHaskellDepends = [ + base bytestring conduit containers data-default-class deepseq + directory filepath Glob hslogger HTF lens messagepack nvim-hs + parsec prettyprinter resourcet ribosome split stm-chans stm-conduit + strings transformers typed-process unliftio + ]; + description = "neovim package manager"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chronograph" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, thyme, vector-space }: mkDerivation { @@ -45503,6 +46923,17 @@ 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; + }) {}; + "church-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -45630,10 +47061,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 ]; @@ -45789,8 +47218,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; @@ -45833,8 +47262,8 @@ self: { }: mkDerivation { pname = "cisco-spark-api"; - version = "0.1.0.3"; - sha256 = "1fi8cadjszb92yih5ilagay8c9fj4aiwdx2qx1pwdc756jgjm5ky"; + version = "0.1.0.4"; + sha256 = "0i528c0lbk3k30q53p3qy01fq3mdpv0664q49lfvzcxkkjchwmbg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45849,7 +47278,7 @@ self: { aeson async attoparsec base bytestring conduit data-default hspec http-conduit http-types network-uri text wai warp ]; - description = "A Haskell bindings for Webex Teams API"; + description = "DEPRECATED in favor of webex-teams-api"; license = stdenv.lib.licenses.mit; }) {}; @@ -45979,8 +47408,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 ]; @@ -46127,6 +47556,7 @@ self: { testHaskellDepends = [ aeson base bytestring ]; description = "JSON Compilation Database Format encoding and decoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clang-pure" = callPackage @@ -46382,6 +47812,37 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "classify-frog" = callPackage + ({ mkDerivation, array, audacity, base, bifunctors, Cabal, carray + , comfort-array, concurrent-split, containers, deepseq + , explicit-exception, fft, filemanip, gnuplot, hmm-lapack, lapack + , 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.4.1"; + sha256 = "1jw61n54g65s9chqmp58ikngzmrabg8s90ghsqvm2hjg8hbx4h7p"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + array audacity base bifunctors Cabal carray comfort-array + concurrent-split containers deepseq explicit-exception fft + filemanip gnuplot hmm-lapack lapack 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 @@ -46445,8 +47906,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.4.0"; - sha256 = "1q7r4lnrxjsh7rj5nr0cs22ddp9m6maa7bzbkarxw3xbfrb2afrb"; + version = "1.5.0"; + sha256 = "1nm4lygxqb1wq503maki6dsah2gpn5rd22jmbwjxfwyzgyqy9fnk"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist ghc-prim hashable mono-traversable @@ -46467,8 +47928,8 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "1.4.0"; - sha256 = "096466cyyxxmg3jpq705xjjc4r7v9b607hgbys8vybjlldkjbvrr"; + version = "1.5.0"; + sha256 = "007xz0yzp0bzbrx7arj7xmjlwrja120kwgxrbkm98sydjlsph9ys"; libraryHaskellDepends = [ base bytestring classy-prelude conduit monad-control resourcet transformers void @@ -46487,8 +47948,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "1.4.0"; - sha256 = "0a4y9fipcikndzqqna5694f1wcwwin5ir076pjj1nm638a7silhc"; + version = "1.5.0"; + sha256 = "10wz09ksn537w5z9lmj4dsfi0ygk37d5khijr8qq3py2gr2c9ywz"; libraryHaskellDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -46505,8 +47966,8 @@ self: { }: 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"; @@ -46524,6 +47985,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks" = callPackage @@ -46540,8 +48002,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.24.0.7"; - sha256 = "1czalrr7y3526jb4cgi8bghxghqwsjwkfhm5vb4q19xzqg3kjqwy"; + version = "0.24.0.10"; + sha256 = "1jzbwfiyf0zigxf15c31ibmva7pxqdbkkp3l65s6gkcnq71isz6k"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ @@ -46568,8 +48030,8 @@ self: { }: mkDerivation { pname = "clckwrks-cli"; - version = "0.2.17.1"; - sha256 = "1si5xn68cq00zh4lg68pq0lnh5rijj1n0l4xbp9bhqy34mj59xfk"; + version = "0.2.17.2"; + sha256 = "0anrbigkx4y4fz8bsm1vgypf4s0ypapqh0kjyrcnyrpvn3ar5d45"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -46686,8 +48148,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.16.4"; - sha256 = "19fv38gqslg01ymj3nb838pnhir92gfkyl6kccik39brgcfd915b"; + version = "0.6.16.5"; + sha256 = "1k20i500f28pb55618zv80hg94ip4g6vkbn6szp468m4f2z01j9r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers @@ -46712,8 +48174,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.12"; - sha256 = "0xndx7843laiha1n8xscq13dv6x6fv098v1cdmmzx7qnvfvhhlxj"; + version = "0.4.3.15"; + sha256 = "0ks0dr5arc1kvyk1qhin153v77wi0p0hrpnp563g85scgdyl82bw"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory @@ -46866,18 +48328,18 @@ self: { }) {}; "cli" = callPackage - ({ mkDerivation, base, directory, mtl, QuickCheck, tasty - , tasty-quickcheck, terminfo, transformers - }: + ({ mkDerivation, base, basement, foundation }: mkDerivation { pname = "cli"; - version = "0.1.2"; - sha256 = "1jsavqpjnwmfipvyv4wnxv5qkw295nvvzbnkbaxqv67b4py322jq"; - libraryHaskellDepends = [ base mtl terminfo transformers ]; - testHaskellDepends = [ - base directory QuickCheck tasty tasty-quickcheck transformers - ]; - description = "Command Line Interface"; + version = "0.2.0"; + sha256 = "04hfcpbk1w2iyy9y78hr0klrffczkd9ni892a34gmc65qc1nwil8"; + revision = "1"; + editedCabalFile = "0nl0f952rsywalnfsahd6cjbmrn568mmbcpnd7xcy1xgnkajxk42"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base basement foundation ]; + executableHaskellDepends = [ base basement foundation ]; + description = "CLI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -47022,6 +48484,7 @@ self: { ]; description = "Command Line Interface File Manager"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clingo" = callPackage @@ -47135,8 +48598,8 @@ self: { }: mkDerivation { pname = "cloben"; - version = "0.1.0.3"; - sha256 = "1nzks0p5p0a76jys5dza6iqp48kd1lgxla3k3dfd8znlg9nd7dy2"; + version = "0.1.1.0"; + sha256 = "14vkga43sm995rg4s4npjca7xslgs33kl1ivknbflfidvgpdlxmb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -47144,7 +48607,6 @@ self: { ]; description = "Clone and benchmark Haskell cabal projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clock" = callPackage @@ -47231,14 +48693,13 @@ self: { }: mkDerivation { pname = "closed"; - version = "0.2.0"; - sha256 = "0762acn2dik98hp4bvlyvwfy1jfzb4i6ri9pnxa07risain1qc3s"; + version = "0.2.0.1"; + sha256 = "1d74bdjvn7rapakmv1vvf7wws2r12pydlbfym9nw1z6hqvvk8hsn"; libraryHaskellDepends = [ aeson base cassava deepseq hashable persistent QuickCheck text ]; testHaskellDepends = [ - aeson base cassava deepseq hashable hspec markdown-unlit persistent - QuickCheck text vector + aeson base cassava hspec markdown-unlit persistent text vector ]; testToolDepends = [ markdown-unlit ]; description = "Integers bounded by a closed interval"; @@ -47333,14 +48794,13 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.3"; - sha256 = "10in4z00in2js5w2zgg6ydm7i2n0f0y2ass421p5rqpfv9q7y179"; + version = "1.7.5"; + sha256 = "08cklswxmd7x0zxkkrlwh1qy57jbqp0dv3x57xskxpmwyhws2vgs"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; description = "Haskell CloudI API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloudyfs" = callPackage @@ -47385,8 +48845,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 ]; @@ -47502,8 +48962,8 @@ self: { ({ mkDerivation, base, containers, tree-fun }: mkDerivation { pname = "clumpiness"; - version = "0.17.0.0"; - sha256 = "15f4js9rnn2rpkrvr9lphh624hkf4m15rdlvfwn29bvf40yk0jzx"; + version = "0.17.0.2"; + sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc"; libraryHaskellDepends = [ base containers tree-fun ]; description = "Calculate the clumpiness of leaf properties in a tree"; license = stdenv.lib.licenses.gpl3; @@ -47529,8 +48989,8 @@ self: { }: mkDerivation { pname = "clustering"; - version = "0.4.0"; - sha256 = "16zhg2jb4a823gf8pdbm9y9yknpf1w6l3983563vk3wjna3ypfcn"; + version = "0.4.1"; + sha256 = "0p9hbnisqqlsb6239y8rprwvwa3zmkgdbqqkq9rfgsnr0azf8rwm"; libraryHaskellDepends = [ base binary containers matrices mwc-random parallel primitive unordered-containers vector @@ -47599,6 +49059,7 @@ self: { ]; description = "CMA-ES wrapper in Haskell"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmark" = callPackage @@ -47624,8 +49085,8 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.1.5"; - sha256 = "13b0mqks5c1q989slgsa3ixr5vvkfyic4ynzgv00kgl5qrs7hqk7"; + version = "0.1.6"; + sha256 = "0s39djd1j0rq63g4sy0cnras14m263anr56nvijcbcy9zg41dyf8"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -47791,6 +49252,7 @@ self: { libraryHaskellDepends = [ base mtl split syb transformers ]; description = "a library for command line parsing & online help"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmdtheline" = callPackage @@ -47933,6 +49395,60 @@ 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; + }) {}; + + "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 @@ -47961,14 +49477,15 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Simple system for generating code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "code-page" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.1.3"; - sha256 = "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76"; + version = "0.2"; + sha256 = "0i0qbrbhvrwkbikqb7hh7yxaipaavwzvyrw211d0vkz99f62mqxz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Windows code page library for Haskell"; @@ -48142,30 +49659,31 @@ self: { ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codex" = callPackage ({ mkDerivation, ascii-progress, base, bytestring, Cabal - , containers, cryptohash, directory, either, filepath, hackage-db - , http-client, lens, machines, machines-directory, MissingH - , monad-loops, network, process, tar, text, transformers, wreq - , yaml, zlib + , containers, cryptohash, directory, filepath, hackage-db + , http-client, lens, machines, machines-directory, network, process + , tar, text, transformers, wreq, yaml, zlib }: mkDerivation { pname = "codex"; - version = "0.5.1.2"; - sha256 = "0w9m737v3fdgslqdfw16bq7hhsimjazdxrd4r5kzpm0jai39707r"; + version = "0.5.2.0"; + sha256 = "1bvz8pzh9qgb7ffnmihcain877igf1hm8rs4z9qx1gckz2c566vv"; + revision = "1"; + editedCabalFile = "0v0jlarip2689jxixymqzy36qywla76j78iqzyyc6s7hrd63mrlx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ascii-progress base bytestring Cabal containers cryptohash - directory either filepath hackage-db http-client lens machines + directory filepath hackage-db http-client lens machines machines-directory process tar text transformers wreq yaml zlib ]; executableHaskellDepends = [ - ascii-progress base bytestring Cabal directory either filepath - hackage-db MissingH monad-loops network process transformers wreq - yaml + ascii-progress base Cabal directory filepath hackage-db network + process transformers wreq yaml ]; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; @@ -48442,6 +49960,7 @@ self: { ]; description = "Collapse the duplication output into clones and return their frequencies"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "collapse-util" = callPackage @@ -48465,8 +49984,8 @@ self: { }: mkDerivation { pname = "collection-json"; - version = "1.1.2.1"; - sha256 = "1x43b1rmlrsv8jmr2mawy2ykwljbbb4h8cfcfd6gxrkzxwvlxhsl"; + version = "1.3.1.0"; + sha256 = "0wlpv47jj5q2kiwm1daaw4p4s9vh3xfs4rpb78y2a1qw6r6nw9vw"; libraryHaskellDepends = [ aeson base network-uri network-uri-json text ]; @@ -48478,7 +49997,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Collection+JSON—Hypermedia Type Tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "collections" = callPackage @@ -48706,9 +50224,12 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colour-space" = callPackage @@ -48860,19 +50381,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; @@ -48999,12 +50524,18 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, utility-ht }: + ({ mkDerivation, base, deepseq, guarded-allocation, non-empty + , primitive, QuickCheck, storable-record, transformers, utility-ht + }: mkDerivation { pname = "comfort-array"; - version = "0.0.1.1"; - sha256 = "1p6ba5yjpldhy5j7cml2i0i6597pjw87l6xpym1hccn6q1mkqxq5"; - libraryHaskellDepends = [ base utility-ht ]; + version = "0.3"; + sha256 = "0vwp11vcw6h9shrafqgpiqbdm2ni9ad18z2r644hspxcrs24r4d6"; + libraryHaskellDepends = [ + base deepseq guarded-allocation non-empty 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; }) {}; @@ -49049,6 +50580,7 @@ self: { testHaskellDepends = [ base QuickCheck text ]; description = "CSV Parser & Producer"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "command" = callPackage @@ -49153,20 +50685,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; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.bsd3; }) {}; "comonad" = callPackage @@ -49250,8 +50781,8 @@ 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"; @@ -49341,6 +50872,8 @@ self: { pname = "compact-string-fix"; version = "0.3.2"; sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n"; + revision = "1"; + editedCabalFile = "1akx1kzpirl1fc3lfcrsa88jvrk023f9qyj2b2fbpz4p11d07qfc"; libraryHaskellDepends = [ base bytestring ]; description = "Same as compact-string except with a small fix so it builds on ghc-6.12"; license = stdenv.lib.licenses.bsd3; @@ -49359,6 +50892,7 @@ self: { ]; description = "A typeclass for structures which can be catMaybed, filtered, and partitioned"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compactmap" = callPackage @@ -49385,31 +50919,30 @@ 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"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compdata-automata" = callPackage @@ -49417,15 +50950,14 @@ 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 ]; description = "Tree automata on Compositional Data Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compdata-dags" = callPackage @@ -49435,8 +50967,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 ]; @@ -49450,6 +50982,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 @@ -49457,8 +51004,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 ]; @@ -49468,7 +51015,6 @@ self: { ]; description = "Parametric Compositional Data Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compensated" = callPackage @@ -49539,8 +51085,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; @@ -49592,6 +51138,7 @@ self: { ]; description = "Monad for allocation and cleanup of application resources"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "componentm-devel" = callPackage @@ -49605,6 +51152,7 @@ self: { ]; description = "Easy REPL driven development using ComponentM"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composable-associations" = callPackage @@ -49671,8 +51219,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 @@ -49696,8 +51244,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 ]; @@ -49709,19 +51257,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; @@ -49733,8 +51282,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 ]; @@ -49750,8 +51299,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 @@ -49773,8 +51322,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 @@ -49813,23 +51362,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.5.3.1"; - sha256 = "0dq4znxr3qy2avmv68lzw4xrbfccap19ri2hxmlkl6r8p2850k7d"; - libraryHaskellDepends = [ base ]; - description = "Higher-order function combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "composition-prelude_2_0_0_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "composition-prelude"; - version = "2.0.0.0"; - sha256 = "0kz0jr5pfy6d1pm8sbxzrp0h7bnaljspggmzz382p6xp4npr6pg5"; + version = "2.0.2.1"; + sha256 = "0vxgy13k0ca3bi7rh9wc1pdrlpdjbm6va95djmmysdw8a9yyp9wi"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "composition-tree" = callPackage @@ -49845,6 +51382,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compositional-data" = callPackage + ({ mkDerivation, base, bifunctor, c, category, criterion + , smallcheck, tasty, tasty-smallcheck, transformers, util + }: + mkDerivation { + pname = "compositional-data"; + version = "0.1.0.1"; + sha256 = "1pw7xqzin7v9xxjkm7xixf5d6r5jmgdgyvyhpsmn8bdqp8rrwgzj"; + libraryHaskellDepends = [ + base bifunctor category transformers util + ]; + testHaskellDepends = [ base c smallcheck tasty tasty-smallcheck ]; + benchmarkHaskellDepends = [ base c criterion ]; + description = "Compositional Data Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {c = null;}; + "compound-types" = callPackage ({ mkDerivation, base, base-prelude }: mkDerivation { @@ -49855,6 +51411,7 @@ self: { benchmarkHaskellDepends = [ base-prelude ]; description = "Sum and Product types and such"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compressed" = callPackage @@ -49866,12 +51423,15 @@ self: { pname = "compressed"; version = "3.11"; sha256 = "0gfxmfyzgpa176igsby50jpfhpfvd078d7nyvwwg2cjx8hpvyyyp"; + revision = "1"; + editedCabalFile = "0h3kfr2kdn74vk0mam5mwk6phclrcm79khd8yz2pp8j9zv1v8q3r"; libraryHaskellDepends = [ base comonad containers fingertree hashable keys pointed reducers semigroupoids semigroups unordered-containers ]; description = "Compressed containers and reducers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compression" = callPackage @@ -50056,21 +51616,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; @@ -50101,21 +51662,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; @@ -50199,6 +51767,7 @@ self: { ]; description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concrete-typerep" = callPackage @@ -50242,8 +51811,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 @@ -50259,8 +51828,8 @@ self: { }: mkDerivation { pname = "concurrency-benchmarks"; - version = "0.1.0"; - sha256 = "1qsn726ic2v7mxm7f05n1vlpcvn0xwys2yj0vn243fsmw3075gzi"; + version = "0.1.1"; + sha256 = "1zbkyyryh24k67kh3amzscfh7mljj1l6yqd926bkl4ps4d1mdn5d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50272,6 +51841,7 @@ self: { ]; description = "Benchmarks to compare concurrency APIs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-barrier" = callPackage @@ -50338,7 +51908,6 @@ self: { testHaskellDepends = [ async base dns hspec ]; description = "Concurrent DNS cache"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-extra" = callPackage @@ -50377,6 +51946,7 @@ self: { benchmarkHaskellDepends = [ base machines time ]; description = "Concurrent networked stream transducers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-output" = callPackage @@ -50385,8 +51955,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 @@ -50421,8 +51991,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; @@ -50471,9 +52041,12 @@ self: { pname = "concurrent-utilities"; version = "0.2.0.2"; sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi"; + revision = "1"; + editedCabalFile = "1phqnmgq7mj7751d4g599jy3brz4fmlm1z7qd88gkyr94mn5pm23"; libraryHaskellDepends = [ base ]; description = "More utilities and broad-used datastructures for concurrency"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrentoutput" = callPackage @@ -50620,8 +52193,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 @@ -50641,37 +52214,38 @@ self: { "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit - , conduit-combinators, conduit-extra, containers, criterion - , deepseq, directory, exceptions, HUnit, lzma-conduit + , conduit-combinators, conduit-extra, conduit-zstd, containers + , criterion, deepseq, directory, exceptions, HUnit, lzma-conduit , monad-control, mtl, pqueue, resourcet, stm, stm-conduit , streaming-commons, test-framework, test-framework-hunit , test-framework-th, transformers, unliftio-core, vector }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.8.1"; - sha256 = "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd"; + version = "0.0.9.0"; + sha256 = "1d2d9ak3mn77lklxr80xw9xpay31f71h5hd66mgrixk48bfr9p8i"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq exceptions lzma-conduit - monad-control mtl pqueue resourcet stm stm-conduit + conduit-extra conduit-zstd containers deepseq exceptions + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit streaming-commons transformers unliftio-core vector ]; testHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers deepseq directory exceptions HUnit - lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit - streaming-commons test-framework test-framework-hunit + conduit-extra conduit-zstd containers deepseq directory exceptions + HUnit lzma-conduit monad-control mtl pqueue resourcet stm + stm-conduit streaming-commons test-framework test-framework-hunit test-framework-th transformers unliftio-core vector ]; benchmarkHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra containers criterion deepseq exceptions lzma-conduit - monad-control mtl pqueue resourcet stm stm-conduit + conduit-extra conduit-zstd containers criterion deepseq exceptions + lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit streaming-commons transformers unliftio-core vector ]; description = "Conduit-based algorithms"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-audio" = callPackage @@ -50680,8 +52254,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; @@ -50695,8 +52269,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 ]; @@ -50715,8 +52289,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 ]; @@ -50735,8 +52309,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 @@ -51027,8 +52601,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 @@ -51072,6 +52646,98 @@ 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; + }) {}; + + "confcrypt_0_2_0_0" = 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.2.0.0"; + sha256 = "0gg1p06lmv7rs143am5kak6n7777f1ccf36xlscxwsyza5j1gi57"; + 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 @@ -51111,8 +52777,8 @@ self: { }: mkDerivation { pname = "config-ini"; - version = "0.2.2.0"; - sha256 = "1820w4y8k0qrlilrizkqckwiyli0x4qcdjmagvcngy5bfsw6fk9n"; + version = "0.2.4.0"; + sha256 = "0dfm4xb1sd713rcqzplzdgw68fyhj24i6lj8j3q8kldpmkl98lbf"; libraryHaskellDepends = [ base containers megaparsec text transformers unordered-containers ]; @@ -51165,8 +52831,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 @@ -51198,6 +52864,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"; @@ -51210,10 +52878,11 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configifier" = callPackage @@ -51254,41 +52923,10 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Simple data type for application configuration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configuration-tools" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base-unicode-symbols, base64-bytestring, bytestring, Cabal - , case-insensitive, connection, data-default, deepseq, directory - , dlist, enclosed-exceptions, filepath, http-client - , http-client-tls, http-types, monad-control, mtl, network-uri - , optparse-applicative, process, profunctors, semigroups, text, tls - , transformers, unordered-containers, wai, warp, warp-tls, x509 - , x509-system, x509-validation, yaml - }: - mkDerivation { - pname = "configuration-tools"; - version = "0.3.1"; - sha256 = "0ivfz3vjf81dnxqlzp4ij8snw0bfy227b26r3j1vvhc4n1qpxpz0"; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base-unicode-symbols - base64-bytestring bytestring Cabal case-insensitive connection - data-default deepseq directory dlist enclosed-exceptions filepath - http-client http-client-tls http-types monad-control mtl - network-uri optparse-applicative process profunctors semigroups - text tls transformers unordered-containers x509 x509-system - x509-validation yaml - ]; - testHaskellDepends = [ - base base-unicode-symbols bytestring Cabal enclosed-exceptions - http-types monad-control mtl text transformers unordered-containers - wai warp warp-tls yaml - ]; - description = "Tools for specifying and parsing configurations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "configuration-tools_0_4_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base-unicode-symbols, base64-bytestring, bytestring, Cabal , case-insensitive, connection, data-default, deepseq, directory @@ -51321,7 +52959,6 @@ self: { ]; description = "Tools for specifying and parsing configurations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configurator" = callPackage @@ -51491,6 +53128,8 @@ self: { pname = "connection"; version = "0.2.8"; sha256 = "1swkb9w5vx9ph7x55y51dc0srj2z27nd9ibgn8c0qcl6hx7g9cbh"; + revision = "1"; + editedCabalFile = "15qdwqqjv60w14m319a58yjmhzr39dydsnk6r26ydkwxwh23rk73"; libraryHaskellDepends = [ base byteable bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation @@ -51616,14 +53255,31 @@ 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; + }) {}; + + "constrained-category" = callPackage + ({ mkDerivation, alg, base, category, constraint, criterion + , smallcheck, tasty, tasty-smallcheck, unconstrained + }: + mkDerivation { + pname = "constrained-category"; + version = "0.1.0.0"; + sha256 = "01r5jyydixfh82zynjpacsv5dc0mz28bcm8xaz2pgf2pc4gcfl9h"; + libraryHaskellDepends = [ + alg base category constraint unconstrained + ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Constrained Categories"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -51678,12 +53334,12 @@ self: { }) {}; "constraint" = callPackage - ({ mkDerivation, base, category }: + ({ mkDerivation, base, category, unconstrained }: mkDerivation { pname = "constraint"; - version = "0.1.1.1"; - sha256 = "0iyz3n8qplp892cw2k2z5pp4pv54p5qaqrcjgpiwfm9jkri0v012"; - libraryHaskellDepends = [ base category ]; + version = "0.1.3.0"; + sha256 = "0yp09vg9hx5p7ncyh8h6mhcl14kanhhjldyn892lmp0jmlm7flyy"; + libraryHaskellDepends = [ base category unconstrained ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -51761,14 +53417,22 @@ self: { }) {}; "constraints-extras" = callPackage - ({ mkDerivation, base, constraints, template-haskell }: + ({ mkDerivation, aeson, base, constraints, markdown-unlit + , template-haskell + }: mkDerivation { pname = "constraints-extras"; - version = "0.2.0.0"; - sha256 = "0id5xaij014vabzkbnl54h8km667vk1mz8dk27kdzfa5vg6pj8j8"; + version = "0.2.3.1"; + sha256 = "1invhgwvhsab9jj776aaa180xsk1cbnwygxfappasbis42l26ab9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; + executableHaskellDepends = [ + aeson base constraints markdown-unlit + ]; description = "Utility package for constraints"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constrictor" = callPackage @@ -51793,6 +53457,7 @@ self: { ]; description = "Exact computation with constructible real numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constructive-algebra" = callPackage @@ -51862,8 +53527,8 @@ self: { ({ mkDerivation, base, containers, convert, lens, text, vector }: mkDerivation { pname = "container"; - version = "1.1.5"; - sha256 = "1hh3ahw1vfmws1hyyl6blqyxaz4qcip0h0d80ia8pb6b1gfbvxsm"; + version = "1.1.6"; + sha256 = "0q4zgd7hsnpq5wnn5gk5rz9nq1kfp8ci5kc6yp1rmzbyky3j0211"; libraryHaskellDepends = [ base containers convert lens text vector ]; @@ -51968,6 +53633,7 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols containers ]; description = "Unicode alternatives for common functions and operators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "containers-verified" = callPackage @@ -51979,7 +53645,6 @@ self: { libraryHaskellDepends = [ containers ]; description = "Formally verified drop-in replacement of containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "content-store" = callPackage @@ -52049,21 +53714,34 @@ self: { ({ mkDerivation, base, deepseq, primitive }: mkDerivation { pname = "contiguous"; - version = "0.3.0.0"; - sha256 = "15v53w85f8bxnnrjsj46nfnjshf91b8sld76jcqffzj5nfjxkv28"; + version = "0.3.2.0"; + sha256 = "0mgsha615rzaki7cn6w78ihrni3s9hza23srmxy9rpvybvh6xql7"; libraryHaskellDepends = [ base deepseq primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "contiguous-checked" = callPackage ({ mkDerivation, base, contiguous, primitive }: mkDerivation { pname = "contiguous-checked"; - version = "0.3.0.0"; - sha256 = "144v6c9w0x9a43z1wpfgrq8k5h3d9nnrdxx87wcrkfcprcghdy7b"; + version = "0.3.2.0"; + sha256 = "0jfqxz0v107xw6mjr0wb1abb6v5zd3siy7z0gk9nqcvyacb80z4a"; libraryHaskellDepends = [ base contiguous primitive ]; + description = "contiguous with bounds checks"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "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; }) {}; @@ -52099,12 +53777,18 @@ self: { }) {}; "continued-fractions" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, containers, QuickCheck, test-framework + , test-framework-quickcheck2 + }: mkDerivation { pname = "continued-fractions"; - version = "0.9.1.1"; - sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh"; + version = "0.10.0.2"; + sha256 = "03s1vrsps2l114b3jg8nmglbv9bwsrjv79j06lyg9pxgvhk4lcpx"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers QuickCheck test-framework + test-framework-quickcheck2 + ]; description = "Continued fractions"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -52142,22 +53826,6 @@ self: { }) {}; "contravariant" = callPackage - ({ mkDerivation, base, StateVar, transformers, transformers-compat - }: - mkDerivation { - pname = "contravariant"; - version = "1.4.1"; - sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9"; - revision = "1"; - editedCabalFile = "0qj5nymccrb9p0cd6hffsy90jidjng14g9yv95z8v6h4q84sbzvx"; - libraryHaskellDepends = [ - base StateVar transformers transformers-compat - ]; - description = "Contravariant functors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "contravariant_1_5" = callPackage ({ mkDerivation, base, StateVar, transformers }: mkDerivation { pname = "contravariant"; @@ -52166,7 +53834,6 @@ self: { libraryHaskellDepends = [ base StateVar transformers ]; description = "Contravariant functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "contravariant-extras" = callPackage @@ -52177,6 +53844,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 @@ -52221,6 +53890,24 @@ 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"; + revision = "2"; + editedCabalFile = "18jypzsawq0mp12i35f58px80i3k07ri0g07wcrh6af93vqkhvil"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers doctest doctest-discover temporary + ]; + description = "An alternative to monads in do-notation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "control-event" = callPackage ({ mkDerivation, base, containers, stm, time }: mkDerivation { @@ -52246,6 +53933,7 @@ self: { ]; description = "A typeclass for type isomorphisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-attempt" = callPackage @@ -52359,14 +54047,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; }) {}; @@ -52518,8 +54204,8 @@ self: { }: mkDerivation { pname = "convert"; - version = "1.5"; - sha256 = "0hw2qmb3g9p7zqqk92hwnzamld6kg121dkv4va4hkpcjlhb8af6g"; + version = "1.5.1"; + sha256 = "044syln587z5mc4fia0d81p47rpkbvzkyyrcxyckqkh2yj3b2k85"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring containers data-default impossible lens template-haskell text utf8-string @@ -52908,6 +54594,8 @@ self: { pname = "corecursive-main"; version = "0.1.0.0"; sha256 = "14ckdqmy3r06kqhlp7mpapmx01369vcfmaj78gjywlqznchpw6dk"; + revision = "1"; + editedCabalFile = "0ffdav9hqn3vn3a2fpxcjlflir0f2lay800rsdi1qg67jycdfk73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; @@ -53130,6 +54818,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "An object frequency counter"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "country" = callPackage @@ -53141,6 +54830,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 @@ -53441,7 +55132,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 @@ -53462,6 +55154,7 @@ self: { ]; description = "Cassandra CQL binary protocol"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cql-io" = callPackage @@ -53492,6 +55185,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cql-io_1_1_0" = callPackage + ({ mkDerivation, async, auto-update, base, bytestring, containers + , cql, cryptonite, data-default-class, Decimal, exceptions + , hashable, HsOpenSSL, iproute, lens, mtl, mwc-random, network + , primes, raw-strings-qq, retry, semigroups, stm, tasty + , tasty-hunit, text, time, transformers, unliftio-core + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "cql-io"; + version = "1.1.0"; + sha256 = "1pqqq31f9xcpn5rykkgrakgl17dm1nnskh1m88fxaynzjj485pkw"; + libraryHaskellDepends = [ + async auto-update base bytestring containers cql cryptonite + data-default-class exceptions hashable HsOpenSSL iproute lens mtl + mwc-random network retry semigroups stm text time transformers + unliftio-core unordered-containers uuid vector + ]; + testHaskellDepends = [ + async base containers cql Decimal iproute mtl primes raw-strings-qq + tasty tasty-hunit text time uuid + ]; + doHaddock = false; + description = "Cassandra CQL client"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cql-io-tinylog" = callPackage + ({ mkDerivation, base, bytestring, cql-io, tinylog }: + mkDerivation { + pname = "cql-io-tinylog"; + version = "0.1.0"; + sha256 = "14mr1i7g61h25fn2xa02iyzq1mxcgzkisfmiakdakiya4zxjk10f"; + libraryHaskellDepends = [ base bytestring cql-io tinylog ]; + description = "Tinylog integration for cql-io"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cqrs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -53685,19 +55418,15 @@ self: { }) {crack = null;}; "crackNum" = callPackage - ({ mkDerivation, base, FloatingHex, ieee754, reinterpret-cast }: + ({ mkDerivation, array, base, FloatingHex }: mkDerivation { pname = "crackNum"; - version = "2.2"; - sha256 = "15327p12jql90j5z02nfzx5fivp7zsbznkg1i79iby59n3njfv40"; + version = "2.3"; + sha256 = "1wrqq2g6hvqa8w0c4nad35d1favcjqi93ywnxqkc3i7pl37jb3s2"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base FloatingHex ieee754 reinterpret-cast - ]; - executableHaskellDepends = [ - base FloatingHex ieee754 reinterpret-cast - ]; + libraryHaskellDepends = [ array base FloatingHex ]; + executableHaskellDepends = [ array base FloatingHex ]; description = "Crack various integer, floating-point data formats"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53887,6 +55616,7 @@ self: { ]; description = "Conflict-free replicated data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "creatur" = callPackage @@ -53898,8 +55628,8 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.25"; - sha256 = "00bhszbjz7in5z1bilb1m3ld5sdd6xk5s95h6cw882qz0i1dmlp5"; + version = "5.9.28"; + sha256 = "11fscbkzyzajgg6m50s5x4rmxy1mxrgiqflamqxiwsyj9szw16xl"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl random @@ -54003,16 +55733,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; @@ -54039,16 +55771,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; @@ -54087,64 +55820,28 @@ self: { "criterion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, bytestring, cassava, code-page - , containers, deepseq, directory, exceptions, filepath, Glob, HUnit - , js-flot, js-jquery, microstache, mtl, mwc-random - , optparse-applicative, parsec, QuickCheck, semigroups, statistics + , containers, criterion-measurement, deepseq, directory, exceptions + , 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.4.1.0"; - sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary bytestring - cassava code-page containers deepseq directory exceptions filepath - Glob js-flot js-jquery microstache mtl mwc-random - optparse-applicative parsec semigroups statistics text time - transformers transformers-compat vector vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative semigroups - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_1_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 - }: - 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 @@ -54153,7 +55850,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-measurement" = callPackage @@ -54316,6 +56012,7 @@ self: { benchmarkHaskellDepends = [ attoparsec base criterion text time ]; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cron-compat" = callPackage @@ -54380,8 +56077,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "1"; - editedCabalFile = "0wi8d12i2v76irrv0f16y4sfcn2a9sg92l11499djidmdq50vji9"; + revision = "2"; + editedCabalFile = "071lxiwsf23ga1fkbjd47ykz7f5irhsh7q7zz2qczzjgnvzadadh"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -54522,14 +56219,19 @@ self: { }) {}; "crypto-enigma" = callPackage - ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck - , split + ({ mkDerivation, ansi-terminal, base, containers, HUnit + , optparse-applicative, QuickCheck, split, text }: mkDerivation { pname = "crypto-enigma"; - version = "0.0.2.12"; - sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b"; - libraryHaskellDepends = [ base containers MissingH mtl split ]; + version = "0.1.1.5"; + sha256 = "001kl84ngfwr644v7dyk5shkqfw606bpza8b61bv4p4lqyfk96l2"; + 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; @@ -54553,6 +56255,7 @@ self: { testHaskellDepends = [ base bytestring hspec QuickCheck ]; description = "Multihash library on top of cryptonite crypto library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-numbers" = callPackage @@ -54644,6 +56347,8 @@ self: { pname = "crypto-random"; version = "0.0.9"; sha256 = "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp"; + revision = "1"; + editedCabalFile = "1ax1iafbbqkcrvjnnxlvqh2zgpx8xzcbxl6l870207bpzwrja2f1"; libraryHaskellDepends = [ base bytestring securemem unix vector ]; description = "Simple cryptographic random related types"; license = stdenv.lib.licenses.bsd3; @@ -54845,8 +56550,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 @@ -54865,8 +56570,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 @@ -54885,8 +56590,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 ]; @@ -54907,8 +56612,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 @@ -54928,8 +56633,8 @@ self: { pname = "cryptoids"; version = "0.5.1.0"; sha256 = "0ai7hg4r944hck9vq2ffwwjsxp3mjfvxwhfr8b8765n1bh86i466"; - revision = "1"; - editedCabalFile = "0whcgkgdq7hp1z4dr8291q8kpqipfr4mvn8dqq7byxm10v59kn0k"; + revision = "3"; + editedCabalFile = "0pjdc90i3qyzxc289kjvn90hnn5xjjzjpgnb24iwqj6ik9asi86g"; libraryHaskellDepends = [ base binary bytestring cryptoids-class cryptoids-types cryptonite directory exceptions filepath memory @@ -54944,22 +56649,26 @@ self: { pname = "cryptoids-class"; version = "0.0.0"; sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy"; - revision = "3"; - editedCabalFile = "1hcdhmksd81sylfjyx0wb4yhrswdwbjlaarq8fbmwcl7fjm4sxfy"; + revision = "4"; + editedCabalFile = "0c3cq648sh5cpj0isknhayamzgzv8avixxfpzr4riags70jr28ld"; libraryHaskellDepends = [ base cryptoids-types exceptions ]; description = "Typeclass-based interface to cryptoids"; license = stdenv.lib.licenses.bsd3; }) {}; "cryptoids-types" = callPackage - ({ mkDerivation, base, binary, http-api-data, path-pieces }: + ({ mkDerivation, aeson, base, binary, deepseq, hashable + , http-api-data, path-pieces + }: mkDerivation { pname = "cryptoids-types"; - version = "0.0.0"; - sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b"; - revision = "2"; - editedCabalFile = "0dzfdjqbw197jrd7iygw8a74b9ryvym5xh8k9zy29y40ln20i2hg"; - libraryHaskellDepends = [ base binary http-api-data path-pieces ]; + version = "1.0.0"; + sha256 = "0dhv92hdydhhgwgdihl3wpiyxl10szrgfnb68ygn07xxhmmfc3hf"; + revision = "1"; + editedCabalFile = "0fy6fxzaimgi0nrplzdgi0s26cjz2nrv7y5gdnk0z6k3jd1x5qgb"; + libraryHaskellDepends = [ + aeson base binary deepseq hashable http-api-data path-pieces + ]; description = "Shared types for encrypting internal object identifiers before exposure"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -54976,6 +56685,8 @@ self: { pname = "cryptol"; version = "2.6.0"; sha256 = "0hlgff177s8lhv3s90cmqc3x2xr60g3vxvc7p1mhzb354zxbp2jz"; + revision = "1"; + editedCabalFile = "1smkc0gxbj1vl626iiy56aarx6rcnjzqprqzh443222samrrzr25"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -55063,6 +56774,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 @@ -55131,8 +56863,8 @@ self: { }: mkDerivation { pname = "csg"; - version = "0.1.0.5"; - sha256 = "12zwf2xiqiq4snwqhwvk1k3fl1bzlfbcd2vc2hsnv6v61ci6shq9"; + version = "0.1.0.6"; + sha256 = "0i4sr9qf78fs841j8d9rkdd73dm9i34rj6sp0475r3pnj7czqcq6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55168,6 +56900,7 @@ self: { ]; description = "a gallery of Csound instruments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-expression" = callPackage @@ -55307,20 +57040,23 @@ self: { }) {}; "css-syntax" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, directory, hspec - , scientific, text + ({ 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; }) {}; @@ -55406,6 +57142,7 @@ self: { ]; description = "A collection of CSV tools"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csv-table" = callPackage @@ -55537,7 +57274,6 @@ self: { executableToolDepends = [ alex happy ]; description = "Implementation of Univalence in Cubical Sets"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cubicbezier" = callPackage @@ -55558,6 +57294,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cubicbezier_0_6_0_6" = callPackage + ({ mkDerivation, base, containers, fast-math, integration, matrices + , microlens, microlens-mtl, microlens-th, mtl, parsec, tasty + , tasty-hunit, vector, vector-space + }: + mkDerivation { + pname = "cubicbezier"; + version = "0.6.0.6"; + sha256 = "0s7s1ak0x89jy3q4yxrcvjzsq9w4yh23ycjcja6i7klj5gggqwss"; + libraryHaskellDepends = [ + base containers fast-math integration matrices microlens + microlens-mtl microlens-th mtl vector vector-space + ]; + testHaskellDepends = [ base parsec tasty tasty-hunit ]; + description = "Efficient manipulating of 2D cubic bezier curves"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cubicspline" = callPackage ({ mkDerivation, base, hmatrix, safe }: mkDerivation { @@ -55575,8 +57330,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 @@ -55598,21 +57353,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 ]; @@ -55635,42 +57417,18 @@ self: { }) {cudd = null;}; "cue-sheet" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck + ({ mkDerivation, base, bytestring, containers, exceptions, hspec + , hspec-discover, hspec-megaparsec, megaparsec, mtl, QuickCheck , text }: mkDerivation { pname = "cue-sheet"; - version = "1.0.1"; - sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1"; - revision = "2"; - editedCabalFile = "09h4phhj0j1m4ab5gbfrz6475jn772x46l21k7l2qlxav6hi9w7x"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-default-class exceptions megaparsec - mtl QuickCheck text - ]; - testHaskellDepends = [ - base bytestring exceptions hspec hspec-megaparsec megaparsec - QuickCheck text - ]; - description = "Support for construction, rendering, and parsing of CUE sheets"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cue-sheet_2_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec - , mtl, QuickCheck, text - }: - mkDerivation { - pname = "cue-sheet"; - version = "2.0.0"; - sha256 = "1w6gmxwrqz7jlm7f0rccrik86w0syhjk5w5cvg29gi2yzj3grnql"; + version = "2.0.1"; + sha256 = "0papll3xcq2ipmya61jr71gf3zx2swmys829x5sbz7lv6abj9r3i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers data-default-class exceptions megaparsec - mtl QuickCheck text + base bytestring containers exceptions megaparsec mtl QuickCheck + text ]; testHaskellDepends = [ base bytestring exceptions hspec hspec-megaparsec megaparsec @@ -55679,7 +57437,6 @@ self: { 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 @@ -55688,8 +57445,8 @@ self: { }: mkDerivation { pname = "cufft"; - version = "0.9.0.0"; - sha256 = "1is6vk0nhvchi0n7d1kpy4vydf82lsb52pq4hqffiawlp0vp5scv"; + version = "0.9.0.1"; + sha256 = "1cf11ia4i19bpbs0wzkz2hqzc22hh2dvbn8m5frnwild83zal4n3"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; @@ -55726,26 +57483,29 @@ self: { }) {}; "curl-runnings" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , case-insensitive, cmdargs, directory, hspec, hspec-expectations - , http-conduit, http-types, megaparsec, text, unordered-containers - , vector, yaml + ({ 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.6.0"; - sha256 = "06dcxwhmzsinmay63m9wnsjsy1cgwyms64c0jicndnc3nhbl0824"; + version = "0.9.2"; + sha256 = "1xslp7zg6l3adljac6iga9c421cf0hab9zi4dyjbkws76imh1d0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring case-insensitive directory hspec - hspec-expectations http-conduit http-types megaparsec text - unordered-containers vector yaml + 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 ]; - executableHaskellDepends = [ base cmdargs text ]; 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 @@ -55760,6 +57520,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "bindings to libcurl, the multiprotocol file transfer library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "currencies" = callPackage @@ -55786,6 +57547,7 @@ self: { ]; description = "Types representing standard and non-standard currencies"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "currency-codes" = callPackage @@ -55936,6 +57698,45 @@ 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; + }) {}; + + "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 @@ -55974,15 +57775,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"; @@ -55996,8 +57797,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 ]; @@ -56081,6 +57882,7 @@ self: { ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cypher" = callPackage @@ -56107,8 +57909,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"; @@ -56146,6 +57948,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 @@ -56274,7 +58088,6 @@ self: { executableHaskellDepends = [ base optparse-applicative ]; description = "Basic Slack bot framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dao" = callPackage @@ -56340,8 +58153,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.14.1"; - sha256 = "0dfd6bp2wy0aabxx7l93gi3dmq21j970cds424xdy1mgmjcvrpb1"; + version = "2.14.2"; + sha256 = "0zm2486gyhiga1amclbg92cd09bvki6vgh0ll75hv5kl72j61lb5"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -56898,6 +58711,7 @@ self: { sha256 = "000x29a8x2ca7m85z0h7snm0297jf9ndr46dh3arv43fjlvfy3ag"; description = "Category theory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-cell" = callPackage @@ -56921,6 +58735,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Library for checking and normalization of data (e.g. from web forms)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-checked" = callPackage @@ -56938,8 +58753,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.1.2.1"; - sha256 = "05l4gkb9k9p7cykx831n9w8i5yy6qffi4pip2y2l5xg2hvi8464s"; + version = "0.1.2.2"; + sha256 = "1aibiml1vs983lbxq18zcn9h11k3zjrxpsx4rxssqdjwni1kg9yi"; libraryHaskellDepends = [ base deepseq QuickCheck ]; description = "Simple functional ring type"; license = stdenv.lib.licenses.bsd3; @@ -57608,6 +59423,7 @@ self: { ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-inttrie" = callPackage @@ -57700,6 +59516,7 @@ self: { ]; description = "Used to be Haskell 98 Lenses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-lens-fd" = callPackage @@ -57991,12 +59808,12 @@ self: { }) {}; "data-ref" = callPackage - ({ mkDerivation, base, stm, transformers }: + ({ mkDerivation, base, data-accessor, stm, transformers }: mkDerivation { pname = "data-ref"; - version = "0.0.1.1"; - sha256 = "0s7jckxgfd61ngzfqqd36jl1qswj1y3zgsyhj6bij6bl7klbxnm4"; - libraryHaskellDepends = [ base stm transformers ]; + version = "0.0.2"; + sha256 = "0xqgzcpp9b0y2w5h1nln529dizdplhpfl41vxvbhxxcdkng3j53v"; + libraryHaskellDepends = [ base data-accessor stm transformers ]; description = "Unify STRef and IORef in plain Haskell 98"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -58025,6 +59842,7 @@ self: { libraryHaskellDepends = [ base containers data-reify ]; description = "Common Sub-Expression Elimination for graphs generated by Data.Reify."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-repr" = callPackage @@ -58140,6 +59958,7 @@ self: { libraryHaskellDepends = [ base hashable unordered-containers ]; description = "A collection of standards representable by simple data types"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-stm32" = callPackage @@ -58283,15 +60102,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; @@ -58312,8 +60131,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; @@ -58351,6 +60170,7 @@ self: { libraryHaskellDepends = [ base ]; description = "utilities for handle data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-variant" = callPackage @@ -58396,25 +60216,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; @@ -58554,16 +60375,17 @@ self: { "datasets" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cassava - , directory, file-embed, filepath, hashable, microlens - , stringsearch, text, time, vector, wreq + , data-default-class, directory, file-embed, filepath, hashable + , microlens, req, stringsearch, text, time, vector }: mkDerivation { pname = "datasets"; - version = "0.2.5"; - sha256 = "1fpxk5wv12wyb1zr35mhinkbkmczgzny2903lszjn41n149kk4cs"; + version = "0.3.0"; + sha256 = "0k09vixdg9dz8a5nc41h1wk8gzs0kn2rfjcki7akpqpvjg766k0i"; libraryHaskellDepends = [ - aeson attoparsec base bytestring cassava directory file-embed - filepath hashable microlens stringsearch text time vector wreq + aeson attoparsec base bytestring cassava data-default-class + directory file-embed filepath hashable microlens req stringsearch + text time vector ]; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; @@ -58693,6 +60515,7 @@ self: { ]; description = "Directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dawg-ord" = callPackage @@ -58713,6 +60536,7 @@ self: { ]; description = "Directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbcleaner" = callPackage @@ -58873,6 +60697,8 @@ self: { pname = "dbus"; version = "0.10.15"; sha256 = "1a5sjavq8mfzz4zxpkd9b6jxsvy0kl1rjq2hhy40gcz2qjfnamb4"; + revision = "2"; + editedCabalFile = "0v9k4yrpzpkk3k33gp3z8qmv0q6kf0d6xps3ar4d3xs9ybrwvg0c"; libraryHaskellDepends = [ base bytestring cereal containers deepseq libxml-sax network parsec random text transformers unix vector xml-types @@ -58891,26 +60717,25 @@ self: { }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, criterion - , deepseq, directory, extra, filepath, lens, libxml-sax, network - , parsec, process, QuickCheck, random, resourcet, split, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, th-lift - , transformers, unix, vector, xml-types + ({ 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.0.1"; - sha256 = "1xg8wzs7xnh3455v3bbw9nd8inzr06n5939pzlq3nd4ajp3ba9d3"; + version = "1.2.3"; + sha256 = "04x0scjl9kyhh2wl02slfa7ykd2lmxbx6x7bp7wv8x4pwgd849zc"; libraryHaskellDepends = [ - base bytestring cereal containers deepseq filepath lens libxml-sax - network parsec random split template-haskell text th-lift - transformers unix vector xml-types + 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 - libxml-sax network parsec process QuickCheck random resourcet tasty - tasty-hunit tasty-quickcheck text transformers unix vector - xml-types + 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; @@ -59454,8 +61279,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.93.2"; - sha256 = "1a1brh07lvrchdll0aabmzikv7inlbaspx0nv3xa94cmzkgvr30l"; + version = "3.93.5"; + sha256 = "0nncxa65lhdvypnx1j7v179v4pk2jfglxzs88p9cka2nr095hs55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59485,6 +61310,7 @@ self: { libraryHaskellDepends = [ base directory filepath HSH ]; description = "Utilities to work with debian binary packages"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debian-build" = callPackage @@ -59546,20 +61372,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 @@ -59627,6 +61454,7 @@ self: { executableHaskellDepends = [ base ]; description = "More useful trace functions for investigating bugs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deburr" = callPackage @@ -59653,6 +61481,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 @@ -59700,6 +61539,7 @@ self: { testHaskellDepends = [ base mwc-probability ]; description = "DIY Markov Chains"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "decode-utf8" = callPackage @@ -59810,16 +61650,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 @@ -59861,8 +61699,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 @@ -59880,6 +61718,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Deep evaluation of data structures without NFData"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deepseq-th" = callPackage @@ -59921,19 +61760,24 @@ self: { "deferred-folds" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, transformers, unordered-containers, vector + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, transformers, unordered-containers + , vector }: mkDerivation { pname = "deferred-folds"; - version = "0.9.7"; - sha256 = "18kyf6li2n3gzsvvdqsf4vwb1l0la755m1dl7gddg2ysnb8kkqb0"; + version = "0.9.10"; + sha256 = "0rvb7cv45xs087jrm4dmv9ajyx5kfs8n01cclc7msfg90fcs60fx"; libraryHaskellDepends = [ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "definitive-base" = callPackage @@ -60075,14 +61919,31 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "1.11.0.3"; - sha256 = "192a0wv2kdk1js56lm6ikp9mx08fkb0wkxl1yba03p7dfnlj6bnx"; + version = "1.11.0.5"; + sha256 = "18pcjk60r1q798qba285g20fh8v5q2qphgpx3r0a0yy7p1qnjwv2"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + }) {}; + + "dejafu_1_12_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "1.12.0.0"; + sha256 = "1nkpqd7alnw383lkhbfqxfj2apks2gw84bk59f2agmiry5pbcs3p"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -60150,6 +62011,7 @@ self: { testHaskellDepends = [ async base dimensional exceptions time ]; description = "More useful and humain delaying functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "delicious" = callPackage @@ -60180,6 +62042,7 @@ self: { ]; description = "Parse character delimited textual data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "delimiter-separated" = callPackage @@ -60305,6 +62168,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 @@ -60331,6 +62234,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 @@ -60445,13 +62349,63 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deque" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck + }: mkDerivation { pname = "deque"; - version = "0.2.1"; - sha256 = "0r1jabz5jamm79nrbwjnajzzn77fkhqbjfnmkahg293761z1k781"; + 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; }) {}; @@ -60503,8 +62457,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.6.4"; - sha256 = "08vhs17h6lzgdr2b0iyl8scilfivvir5fav1qxxpqmdm7f8f8dis"; + version = "2.6.5"; + sha256 = "1rfh7pahrksjzypdkrs8wcijybdwnv2wlkiqax7svn11wgnym3c1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60514,6 +62468,7 @@ self: { executableHaskellDepends = [ base ]; description = "A program and library to derive instances for data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-IG" = callPackage @@ -60597,8 +62552,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 @@ -60668,8 +62623,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.5.1"; - sha256 = "18mkmwm147h601zbdn2lna357z2picpnsxrmkw2jc863chban5vy"; + version = "0.5.4"; + sha256 = "0kd76zvaj84391k9847q3zdvw5hlkdw3qwncysfbsvsh4g9glqwr"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat @@ -60710,8 +62665,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 ]; @@ -60725,8 +62680,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; @@ -60940,25 +62895,6 @@ self: { }) {}; "df1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , QuickCheck, tasty, tasty-quickcheck, text, time - }: - mkDerivation { - pname = "df1"; - version = "0.1.1"; - sha256 = "1qrgf823bf33g6vvilg9q4v1avdwh0iprf26qypzjsbzykbhj91n"; - libraryHaskellDepends = [ - attoparsec base bytestring containers text time - ]; - testHaskellDepends = [ - attoparsec base bytestring QuickCheck tasty tasty-quickcheck text - time - ]; - description = "Type, render and parse the df1 hierarchical structured log format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "df1_0_3" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , QuickCheck, tasty, tasty-quickcheck, text, time }: @@ -60979,31 +62915,41 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dfrac" = callPackage @@ -61064,73 +63010,80 @@ self: { "dhall" = 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.15.1"; - sha256 = "0c4fr0cs56wkfqiylbpi5qlyxxk9k6x5f9yphq12xf06l2vb6fza"; + 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; }) {}; - "dhall_1_17_0" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive - , cborg, containers, contravariant, criterion, cryptonite, deepseq - , Diff, directory, doctest, exceptions, filepath, hashable - , haskeline, http-client, http-client-tls - , insert-ordered-containers, lens-family-core, megaparsec, memory + "dhall_1_20_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , bytestring, case-insensitive, cborg, cborg-json, 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, QuickCheck, quickcheck-instances , repline, scientific, serialise, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, transformers - , unordered-containers, vector + , unordered-containers, uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.17.0"; - sha256 = "14a74zqsnv00hbv19lhmv78xzl36qnsznmncnzq7jji2aslgwad0"; + version = "1.20.1"; + sha256 = "1p5whphy666q0h22yq3jb4aipb5bkqp45bp86m7dp12ljksfhxz0"; + revision = "2"; + editedCabalFile = "0629z8lc97rapfcqcgvxwp9x4x3xqpzrly8m0nsn0dds7400jxrk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base bytestring case-insensitive cborg containers - contravariant cryptonite Diff directory exceptions filepath - hashable haskeline http-client http-client-tls - insert-ordered-containers lens-family-core megaparsec memory mtl + aeson aeson-pretty ansi-terminal base bytestring case-insensitive + cborg cborg-json 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 vector + template-haskell text transformers unordered-containers uri-encode + vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base containers deepseq directory doctest filepath hashable - insert-ordered-containers mockery prettyprinter QuickCheck - quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck - text transformers vector + base containers deepseq directory doctest filepath mockery + prettyprinter QuickCheck quickcheck-instances serialise tasty + tasty-hunit tasty-quickcheck text transformers vector ]; benchmarkHaskellDepends = [ base bytestring containers criterion directory serialise text @@ -61142,18 +63095,17 @@ self: { "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall - , insert-ordered-containers, neat-interpolation, optparse-generic - , shell-escape, text + , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.15"; - sha256 = "15xgfglxy5bac93i83pp4pc78yfcwq6ys9vpak9kmklsbr08ynq4"; + version = "1.0.18"; + sha256 = "036ccz1kwhavl03q5lh14dxic8gjqb5cw14aws6a53gpk6p4vvff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers dhall insert-ordered-containers - neat-interpolation shell-escape text + base bytestring containers dhall neat-interpolation shell-escape + text ]; executableHaskellDepends = [ base bytestring dhall optparse-generic text @@ -61182,24 +63134,25 @@ self: { "dhall-json" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall - , insert-ordered-containers, optparse-applicative, tasty - , tasty-hunit, text, unordered-containers, yaml + , optparse-applicative, tasty, tasty-hunit, text + , unordered-containers, vector, yaml }: mkDerivation { pname = "dhall-json"; - version = "1.2.3"; - sha256 = "1npw5x49jrijq6lby5ipnywqvbq67znmbsrfhnk0pi9pz4kixjw3"; + version = "1.2.6"; + sha256 = "0f18kn15v8pzkdayj2hql28fbba9i75msbi41yscik40lw2sg2cr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base dhall insert-ordered-containers optparse-applicative - text unordered-containers + aeson base dhall optparse-applicative text unordered-containers ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring dhall optparse-applicative text - yaml + vector yaml + ]; + testHaskellDepends = [ + aeson base bytestring dhall tasty tasty-hunit text ]; - testHaskellDepends = [ aeson base dhall tasty tasty-hunit text ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -61243,14 +63196,15 @@ self: { ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-text" = callPackage ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.12"; - sha256 = "1k68s83cqlwgivliag9n2vhin385k08f8vd506dcbix5farv9dp6"; + version = "1.0.15"; + sha256 = "1cijr733xbls3lc5av1hki0za194rxrzd24ryxf1n9kdpc6dv8mg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -61262,28 +63216,27 @@ self: { "dhall-to-cabal" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, contravariant - , dhall, Diff, directory, filepath, hashable - , insert-ordered-containers, microlens, optparse-applicative - , prettyprinter, tasty, tasty-golden, text, transformers, vector + , dhall, Diff, directory, filepath, hashable, microlens + , optparse-applicative, prettyprinter, tasty, tasty-golden + , tasty-hunit, text, transformers, vector }: mkDerivation { pname = "dhall-to-cabal"; - version = "1.3.0.1"; - sha256 = "0sb7wipngmxwd2mgzggcmg9pkzyqa65gp7j789y5lgp1q8q8gv26"; + version = "1.3.1.0"; + sha256 = "0qqzzmkilxnii3p1rlrs20c1k6c5i7zld8cnzwssm2w9v8v7pkwj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal containers contravariant dhall hashable - insert-ordered-containers text transformers vector + base bytestring Cabal containers contravariant dhall hashable text + transformers vector ]; executableHaskellDepends = [ - base bytestring Cabal dhall directory filepath - insert-ordered-containers microlens optparse-applicative - prettyprinter text transformers + base bytestring Cabal dhall directory filepath microlens + optparse-applicative prettyprinter text transformers ]; testHaskellDepends = [ base bytestring Cabal dhall Diff filepath microlens prettyprinter - tasty tasty-golden text + tasty tasty-golden tasty-hunit text ]; description = "Compile Dhall expressions to Cabal files"; license = stdenv.lib.licenses.mit; @@ -61310,29 +63263,13 @@ self: { }) {}; "di" = callPackage - ({ mkDerivation, base, df1, di-core, di-df1, di-handle, di-monad - , exceptions - }: - mkDerivation { - pname = "di"; - version = "1.0.1"; - sha256 = "0h7c6s18vj60higi23icjsf1ky756l553v3a18bdkf4dgcxfs4r9"; - libraryHaskellDepends = [ - base df1 di-core di-df1 di-handle di-monad exceptions - ]; - description = "Typeful hierarchical structured logging using di, mtl and df1"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "di_1_1_1" = callPackage ({ mkDerivation, base, containers, df1, di-core, di-df1, di-handle , di-monad, exceptions }: mkDerivation { pname = "di"; - version = "1.1.1"; - sha256 = "0ibbhc0mnf4qwz90hgxnyd2vc6n86qqnyiahcr30lxknvqmbnskk"; + version = "1.2"; + sha256 = "0d4ywmnibg9h12bah4bdh03fs2l50f5s590kv45baz010bcqyx0b"; libraryHaskellDepends = [ base containers df1 di-core di-df1 di-handle di-monad exceptions ]; @@ -61400,29 +63337,13 @@ self: { }: mkDerivation { pname = "di-monad"; - version = "1.0.2"; - sha256 = "1s2f2rvchfc6ha8w75rcz5w9706vf9zmxgrimav211vph3hpjkdq"; - libraryHaskellDepends = [ - base containers di-core exceptions mtl pipes stm transformers - ]; - description = "mtl flavoured typeful hierarchical structured logging for di-core"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "di-monad_1_2" = 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 ]; description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dia-base" = callPackage @@ -61471,6 +63392,7 @@ self: { doHaddock = false; description = "Embedded domain-specific language for declarative vector graphics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-boolean" = callPackage @@ -61510,7 +63432,6 @@ self: { ]; description = "Braille diagrams with plain text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-builder" = callPackage @@ -61541,6 +63462,7 @@ self: { ]; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -61553,6 +63475,8 @@ self: { pname = "diagrams-cairo"; version = "1.4.1"; sha256 = "0n368gv7jjnynp7gfbnaywnd4x65956qqifcxpi3gsy8yi0zsr6z"; + revision = "1"; + editedCabalFile = "0irrv1mf7lz3n4dy5pz9y6kw00v1rly47g2g6hi95nj6a6hib3z0"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -61561,6 +63485,7 @@ self: { ]; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-canvas" = callPackage @@ -61579,6 +63504,7 @@ self: { ]; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-contrib" = callPackage @@ -61593,6 +63519,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.3"; sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5"; + revision = "2"; + editedCabalFile = "0xpw4myq4n6k5lxdll1wg76m3gfymwb746x6qd48qfy3z22nrymw"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -61605,6 +63533,7 @@ self: { ]; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-core" = callPackage @@ -61616,8 +63545,8 @@ self: { pname = "diagrams-core"; version = "1.4.1.1"; sha256 = "10mnicfyvawy3jlpgf656fx2y4836x04p3z1lpgyyr1nkvwyk0m1"; - revision = "1"; - editedCabalFile = "0qf0b27lx8w16x85rr4zf3sf4qzkywyi04incv3667054v7y8m25"; + revision = "2"; + editedCabalFile = "1lf7xcq42l4hjksgp1nhj7600shvw9q5a27bh729fyfphmvv3xkf"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -61639,6 +63568,7 @@ self: { ]; description = "Graph layout and drawing with GrahpViz and diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-gtk" = callPackage @@ -61654,6 +63584,7 @@ self: { ]; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-haddock" = callPackage @@ -61684,6 +63615,7 @@ self: { ]; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -61719,6 +63651,7 @@ self: { ]; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-lib" = callPackage @@ -61735,6 +63668,8 @@ self: { pname = "diagrams-lib"; version = "1.4.2.3"; sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5"; + revision = "2"; + editedCabalFile = "0gn1lpsq1v9qpyhpizyknn3sfixg1b64s0dsl1jf25lz4kcrpbs7"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -61802,10 +63737,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 @@ -61813,7 +63746,6 @@ self: { ]; description = "PGF backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-postscript" = callPackage @@ -61825,14 +63757,15 @@ self: { pname = "diagrams-postscript"; version = "1.4.1"; sha256 = "171c53msr2x8da87fghl7jikbmrwy7gdxwhdviixc2y3k4fijn57"; - revision = "1"; - editedCabalFile = "0z0rh7lwyr3vx6llq6q9s5f1vzqk4zxpcg5ibfn5jdp274kfd7r1"; + revision = "2"; + editedCabalFile = "0s6z3kaj1dm5kifaydnd2nx97g5qbc6jjqy3wn4dwa9rm7w49753"; libraryHaskellDepends = [ base containers data-default-class diagrams-core diagrams-lib dlist hashable lens monoid-extras mtl semigroups split statestack ]; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-qrcode" = callPackage @@ -61858,8 +63791,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 @@ -61912,8 +63845,8 @@ self: { pname = "diagrams-solve"; version = "0.1.1"; sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; - revision = "2"; - editedCabalFile = "1zgpx0jmgfr3mg77w3nz08cmgzlwfav2c6bcn68f53z829a6y5lf"; + revision = "4"; + editedCabalFile = "1yjacw17ga4rh6iw70vclk03qm5xjw4y17c7m43gjw8h3cfaq15d"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -61932,8 +63865,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 @@ -62110,8 +64043,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; @@ -62174,6 +64107,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 @@ -62273,12 +64207,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "differential" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , deepseq, foldl, inline-r, lens, lens-aeson, optparse-generic + , scientific, sparse-linear-algebra, statistics, text, text-show + , vector + }: + mkDerivation { + pname = "differential"; + version = "0.1.1.0"; + sha256 = "0h6w082zq4f4p7j61bdi3jzpb42wwgh1d3067jywlnx2qwa0ijhp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq foldl inline-r lens + lens-aeson scientific sparse-linear-algebra statistics text + text-show vector + ]; + executableHaskellDepends = [ + base bytestring cassava containers inline-r optparse-generic text + text-show vector + ]; + description = "Finds out whether an entity comes from different distributions (statuses)"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diffmap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { 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; @@ -62343,6 +64305,7 @@ self: { testHaskellDepends = [ array base bytestring digest QuickCheck ]; description = "Pure hash functions for bytestrings"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-bootstrap" = callPackage @@ -62508,6 +64471,7 @@ self: { ]; description = "Scotty backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-snap" = callPackage @@ -62535,6 +64499,8 @@ self: { pname = "digit"; version = "0.7"; sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql"; + revision = "2"; + editedCabalFile = "0335fzcbrf4hciz9gdkk41y9jkd5vm5vbz99v9ick76q48h2bs6p"; libraryHaskellDepends = [ base lens parsers scientific semigroupoids semigroups template-haskell @@ -62596,30 +64562,32 @@ self: { "dimensional" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob - , hspec, ieee754, numtype-dk, QuickCheck, semigroups - , template-haskell, vector + , hspec, hspec-discover, ieee754, numtype-dk, QuickCheck + , semigroups, template-haskell, vector }: mkDerivation { pname = "dimensional"; - version = "1.1"; - sha256 = "05jy0xs1nmxz7x3b589313hqk317838crhd974knm5k73jf8h99s"; + version = "1.3"; + sha256 = "0i4k7m134w3pczj8qllc59djdhisj92z78qrzap9v0f4rx8jb8r9"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk semigroups vector ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck template-haskell ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Statically checked physical dimensions, using Type Families and Data Kinds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dimensional-codata" = callPackage ({ mkDerivation, base, dimensional, numtype-dk }: mkDerivation { pname = "dimensional-codata"; - version = "2014.0.0.0"; - sha256 = "1qyalw1y4ijl293s8qx2xp34716yiq4pfafb5czlk5vrwb4ym925"; + version = "2014.0.0.1"; + sha256 = "0jyvy79dfvx624gmi9gbnxhpzdrp6w0l5n6rc3k52m7cm2i085m9"; libraryHaskellDepends = [ base dimensional numtype-dk ]; description = "CODATA Recommended Physical Constants with Dimensional Types"; license = stdenv.lib.licenses.bsd3; @@ -62900,12 +64868,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_3_1" = callPackage + "directory_1_3_3_2" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.3.1"; - sha256 = "0f2nj0cgzdp90rhkqq5cl2v079qi59dm49mjz571zj5d842xn7f4"; + version = "1.3.3.2"; + sha256 = "0nr0lwpi20slgqc22br9ldrs57573irqbck8am0pz0gz3yvmqis3"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -62985,8 +64953,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 ]; @@ -63037,6 +65007,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 ]; @@ -63046,22 +65018,26 @@ 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.1"; + sha256 = "0cl40ph5qwpxa05q7jr67syq9dijxyzvmqzgw53wfri4800qxphn"; + revision = "1"; + editedCabalFile = "022rnkpy9frsn81d2m9n8r5crsjzjk679mfja5d65s5bzzg3plyj"; 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 @@ -63090,6 +65066,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 @@ -63107,6 +65085,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 @@ -63140,6 +65120,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 { @@ -63176,6 +65169,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 @@ -63311,6 +65306,7 @@ self: { libraryHaskellDepends = [ base ghcjs-base-stub stm ]; description = "Allows storing different resource-releasing actions together"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dist-upload" = callPackage @@ -63355,19 +65351,23 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-fork" = callPackage @@ -63386,6 +65386,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit unix ]; description = "Like 'forkIO', but uses remote machines instead of local threads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-fork-aws-lambda" = callPackage @@ -63437,6 +65438,7 @@ self: { ]; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-async" = callPackage @@ -63533,6 +65535,7 @@ self: { ]; description = "Collect node stats for EKG"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-execution" = callPackage @@ -63658,6 +65661,7 @@ self: { ]; description = "monad-control style typeclass and transformer instances for Process monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-monad-control" = callPackage @@ -63674,6 +65678,7 @@ self: { ]; description = "Orphan instances for MonadBase and MonadBaseControl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-p2p" = callPackage @@ -63683,8 +65688,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 = [ @@ -63694,6 +65699,7 @@ self: { executableHaskellDepends = [ base distributed-process mtl ]; description = "Peer-to-peer node discovery for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-platform" = callPackage @@ -63780,6 +65786,7 @@ self: { ]; description = "Simple zero-configuration backend for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-supervisor" = callPackage @@ -63892,6 +65899,7 @@ self: { ]; description = "Tests and test support tools for distributed-process"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-zookeeper" = callPackage @@ -63936,6 +65944,7 @@ self: { ]; description = "Compositional, type-safe, polymorphic static values and closures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distribution" = callPackage @@ -64009,26 +66018,6 @@ self: { }) {}; "distributive" = callPackage - ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest - , generic-deriving, hspec, tagged, transformers - , transformers-compat - }: - mkDerivation { - pname = "distributive"; - version = "0.5.3"; - sha256 = "0y566r97sfyvhsmd4yxiz4ns2mqgwf5bdbp56wgxl6wlkidq0wwi"; - revision = "6"; - editedCabalFile = "06bd38rf31yrvvy989r44pm0id3dsxwcp6nxg7wk6ccj3n2b8rzk"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base-orphans tagged transformers transformers-compat - ]; - testHaskellDepends = [ base doctest generic-deriving hspec ]; - description = "Distributive functors -- Dual to Traversable"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "distributive_0_6" = callPackage ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest, doctest , generic-deriving, hspec, hspec-discover, tagged, transformers }: @@ -64042,7 +66031,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Distributive functors -- Dual to Traversable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diversity" = callPackage @@ -64135,7 +66123,6 @@ self: { ]; description = "Generate Haskell code from a type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "djinn-ghc" = callPackage @@ -64184,8 +66171,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"; @@ -64212,8 +66199,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 ]; @@ -64251,8 +66238,8 @@ self: { }: mkDerivation { pname = "dmcc"; - version = "1.0.0.1"; - sha256 = "1qlw3jx9nn2by757kqask1ib2wi32zgdj53kinj2lnjn5f9qs466"; + version = "1.1.0.0"; + sha256 = "1lrscg4b13wd4gnkg3nsl2ala851lk03p9jxmlxmf2hbf4cl6cnc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64267,7 +66254,6 @@ self: { ]; description = "AVAYA DMCC API bindings and WebSockets server for AVAYA"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dmenu" = callPackage @@ -64350,6 +66336,8 @@ self: { pname = "dns"; version = "3.0.4"; sha256 = "1aa4zb9zkk244rndimrq8maxj9qrmz3rb13v9n8jblmp6ssk6d3v"; + revision = "1"; + editedCabalFile = "15jafrm919w4p23m7kpmyc1yvzpy88jcccycc00dza69d119zjdr"; libraryHaskellDepends = [ async attoparsec auto-update base base64-bytestring binary bytestring containers cryptonite iproute mtl network psqueues safe @@ -64433,6 +66421,22 @@ self: { 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 @@ -64528,23 +66532,30 @@ self: { ]; description = "An API client for docker written in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "docker-build-cacher" = callPackage - ({ mkDerivation, base, containers, foldl, language-docker + ({ mkDerivation, aeson, base, containers, foldl, language-docker , system-filepath, text, turtle }: mkDerivation { pname = "docker-build-cacher"; - version = "2.0.0"; - sha256 = "1y5w6l75fvszx33f254a6sncvb3wab0iq7dci3qbj7s2147vl63n"; - isLibrary = false; + version = "2.1.1"; + sha256 = "0n8x0mcb0rznazbwf9yrnl4mha6zxvpn9kqwna7xd9rxqasqzv0n"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + aeson base containers foldl language-docker system-filepath text + turtle + ]; executableHaskellDepends = [ - base containers foldl language-docker system-filepath text turtle + aeson base containers foldl language-docker system-filepath text + turtle ]; - description = "Builds a services with docker and caches all of its intermediate stages"; + description = "Builds a docker image and caches all of its intermediate stages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dockercook" = callPackage @@ -64578,17 +66589,18 @@ self: { testHaskellDepends = [ base HTF text vector ]; description = "A build tool for multiple docker image layers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dockerfile" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "dockerfile"; - version = "0.1.0.1"; - sha256 = "0980w0fh5xb7azknnmph6rmnzswsjw360ga5ymds2valq2vc0ji9"; + version = "0.2.0"; + sha256 = "1amm7xrfry3fnd53wj50b684lp1vkv98yrz52xxhlldzb4jrk8cp"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - description = "A simple DSL for describing and generating Dockerfile containers in Haskell"; + description = "A Haskell DSL for generating Dockerfiles"; license = stdenv.lib.licenses.mit; }) {}; @@ -64652,8 +66664,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.16.0"; - sha256 = "0hkccch65s3kp0b36h7bqhilnpi4bx8kngncm7ma9vbd3dwacjdv"; + version = "0.16.0.1"; + sha256 = "106pc4rs4cfym7754gzdgy36dm9aidwmnqpjm9k7yq1hfd4pallv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64674,28 +66686,6 @@ self: { }) {}; "doctest-discover" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , filepath - }: - mkDerivation { - pname = "doctest-discover"; - version = "0.1.0.9"; - sha256 = "1clr6w1h726bbcpq2px2c51jsk48i6ki1yd9vhqj2scvy4nvp437"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring directory doctest filepath - ]; - executableHaskellDepends = [ - aeson base bytestring directory doctest filepath - ]; - testHaskellDepends = [ base doctest ]; - doHaddock = false; - description = "Easy way to run doctests via cabal"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "doctest-discover_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath }: @@ -64715,7 +66705,6 @@ self: { doHaddock = false; description = "Easy way to run doctests via cabal"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover-configurator" = callPackage @@ -64747,11 +66736,11 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.2.0.3"; - sha256 = "1vm9rwym2fdl76kwgkh21z2ixfcvza1df4gba2hm7hkk0n4ndcq6"; + version = "0.3.0.0"; + sha256 = "13m5f15076grwln29pnpqrq9h45cy46pagpk1qw3vzspp7k4ahk1"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base doctest ]; + libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Generate driver file for doctest's cabal integration"; @@ -64769,6 +66758,79 @@ self: { testHaskellDepends = [ base doctest HUnit QuickCheck ]; description = "Allow QuickCheck-style property testing within doctest"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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 @@ -64847,6 +66909,7 @@ self: { libraryHaskellDepends = [ array base containers ]; description = "The Lengauer-Tarjan graph dominators algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dom-parser" = callPackage @@ -64996,28 +67059,28 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, directory, exceptions, hspec - , hspec-megaparsec, megaparsec, optparse-applicative, process, text - , transformers, yaml + ({ mkDerivation, base, base-compat, containers, directory + , exceptions, hspec, hspec-megaparsec, megaparsec + , optparse-applicative, process, text, transformers, yaml }: mkDerivation { pname = "dotenv"; - version = "0.5.2.5"; - sha256 = "1qglnss7jpns585l1k2m3pwqv7mq3jvh66ypmjjxxi1zcihbz5x1"; + version = "0.8.0.0"; + sha256 = "0b1pz7wh5kf0sjkig0y4ks6i2z5yzpvlnd6hgzl0sj4j6w2j35ly"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base-compat directory exceptions megaparsec process text - transformers yaml + 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 directory exceptions hspec hspec-megaparsec - megaparsec process text transformers yaml + 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; @@ -65147,6 +67210,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dovin" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath + , hashable, lens, mtl, parsec, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, unordered-containers + }: + mkDerivation { + pname = "dovin"; + version = "0.1.0.1"; + sha256 = "1imllaywr647vkgwk7j3ha1zv3h4bks64jpjn0y3q15mlzmrcdws"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base containers hashable lens mtl parsec unordered-containers + ]; + executableHaskellDepends = [ + base containers hashable lens mtl parsec unordered-containers + ]; + testHaskellDepends = [ + base containers hashable lens mtl parsec tasty tasty-discover + tasty-hunit tasty-quickcheck unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + description = "A proof assistant for Magic: The Gathering puzzles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dow" = callPackage ({ mkDerivation, array, base, directory, elerea, GLFW , mersenne-random, OpenGL @@ -65422,6 +67512,7 @@ self: { ]; description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "drClickOn" = callPackage @@ -65436,6 +67527,27 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "draw-poker" = callPackage ({ mkDerivation, base, random-shuffle, safe }: mkDerivation { @@ -65465,6 +67577,7 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A port of asciimoo's drawille to haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dresdner-verkehrsbetriebe" = callPackage @@ -65504,6 +67617,7 @@ self: { ]; description = "Simple schema management for arbitrary databases"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "drifter-postgresql" = callPackage @@ -65527,6 +67641,26 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "drinkery" = callPackage ({ mkDerivation, base, exceptions, mtl, transformers }: mkDerivation { @@ -65539,14 +67673,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;}; @@ -65760,6 +67895,7 @@ self: { executableHaskellDepends = [ base bytestring ]; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dtd" = callPackage @@ -65802,12 +67938,11 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dtrace" = callPackage @@ -65870,6 +68005,7 @@ self: { ]; description = "Network multiplayer 2D shooting game"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dual-tree" = callPackage @@ -65880,8 +68016,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 ]; @@ -65892,6 +68028,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dualizer" = callPackage + ({ mkDerivation, base, bifunctors, comonad, containers, lens + , template-haskell, transformers + }: + mkDerivation { + pname = "dualizer"; + version = "0.1.0.1"; + sha256 = "022wiqvy2lxfc9zqibrd3av994r6hi9pkqi3b3m53h6zaphpnwl7"; + libraryHaskellDepends = [ + base bifunctors comonad containers lens template-haskell + transformers + ]; + description = "Automatically generate dual constructions"; + license = "AGPL"; + }) {}; + "dublincore-xml-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , data-default, QuickCheck, quickcheck-instances, resourcet @@ -66002,7 +68154,6 @@ self: { ]; description = "A plug-in for rendering GHC core"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dunai" = callPackage @@ -66010,8 +68161,8 @@ self: { }: mkDerivation { pname = "dunai"; - version = "0.4.0.0"; - sha256 = "05xqhbz0x7wzfka4wl2wvfhzr242nx4ci4r3zvm89mcyxn9q7x6n"; + version = "0.5.1"; + sha256 = "07bkjp7z5lbm6466nc99p4ngiqkh5mgbczwl7rflxzis4w1vm997"; libraryHaskellDepends = [ base MonadRandom transformers transformers-base ]; @@ -66019,6 +68170,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dunai-core" = callPackage + ({ mkDerivation, base, MonadRandom, transformers, transformers-base + }: + mkDerivation { + pname = "dunai-core"; + version = "0.5.1.0"; + sha256 = "1p8161m671dgf13q0rnpp797nymdxpi5nf6xl9mh9zj495libbzz"; + libraryHaskellDepends = [ + base MonadRandom transformers transformers-base + ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "duplo" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base , base64-bytestring, bytestring, containers, directory @@ -66206,8 +68371,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"; @@ -66308,6 +68473,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dynamic-graphs" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, hashable, hashtables, mwc-random, primitive, QuickCheck + , semigroups, test-framework, test-framework-quickcheck2 + , test-framework-th, text, unordered-containers, vector + }: + mkDerivation { + pname = "dynamic-graphs"; + version = "0.1.0.3"; + sha256 = "1zwrvpg8nxc4lx3mc5jaj1fcbg1hhk4b52ng4qh5r57xkhqj6xg5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers hashable hashtables mwc-random primitive semigroups + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers deepseq hashable mwc-random + primitive QuickCheck semigroups test-framework + test-framework-quickcheck2 test-framework-th text + unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion primitive ]; + description = "Dynamic graph algorithms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dynamic-linker-template" = callPackage ({ mkDerivation, base, containers, template-haskell, unix }: mkDerivation { @@ -66457,6 +68649,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 @@ -66534,8 +68738,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"; @@ -66564,6 +68768,8 @@ self: { pname = "eap"; version = "0.9.0.2"; sha256 = "0bgx7sxpmvhd84j7kkqznazw7p1fl862w7jxlap473g2q5365kqc"; + revision = "1"; + editedCabalFile = "1lsy7pl39s02f45l7g9alw49xwh7m8m4bm3ydcz11rh9xdgcb9jv"; libraryHaskellDepends = [ base binary bytestring cryptonite memory mtl pretty-hex ]; @@ -66596,6 +68802,7 @@ self: { libraryHaskellDepends = [ base data-default ]; description = "Robert Penner's easing equations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "easy-api" = callPackage @@ -66671,18 +68878,14 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "easytensor" = callPackage @@ -66696,6 +68899,7 @@ self: { benchmarkHaskellDepends = [ base dimensions time ]; description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "easytensor-vulkan" = callPackage @@ -66707,6 +68911,7 @@ self: { libraryHaskellDepends = [ base dimensions easytensor vulkan-api ]; description = "Use easytensor with vulkan-api"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "easytest" = callPackage @@ -66715,8 +68920,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 ]; @@ -66792,7 +68997,6 @@ self: { ]; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eccrypto" = callPackage @@ -66966,6 +69170,7 @@ self: { ]; description = "Templating language with similar syntax and features to Liquid or Jinja2"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edenmodules" = callPackage @@ -67089,6 +69294,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "A monad for rewriting things"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edit-distance" = callPackage @@ -67246,7 +69452,6 @@ self: { libraryHaskellDepends = [ base type-level-sets ]; description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "effective-aspects" = callPackage @@ -67332,20 +69537,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 = [ @@ -67385,8 +69590,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.7.9"; - sha256 = "04xy76737zp1vpnn1b76xd5z4d6hfxd4l707v8s1cd8vb18y3dc0"; + version = "3.7.14"; + sha256 = "1ar5yg00arqd09wva0q1y4d8lfpd0vjw9sgk47jsyqs7ydm59hnb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67396,6 +69601,7 @@ self: { ]; description = "A tutorial program for the Egison programming language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "egyptian-fractions" = callPackage @@ -67469,21 +69675,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 @@ -67562,8 +69770,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 @@ -67588,6 +69796,7 @@ self: { ]; description = "Send ekg metrics to a Bosun instance"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-carbon" = callPackage @@ -67596,8 +69805,8 @@ self: { }: mkDerivation { pname = "ekg-carbon"; - version = "1.0.10"; - sha256 = "0mvx5qpj5fzdb991gb344a5a34fvgys6xy3xxpr65bddlbpv0mk9"; + version = "1.0.11"; + sha256 = "02cmwpdbqfi6n9dqk2y6yqvds2i6rmbs6vzkab0l90507c7rdqf8"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -67629,10 +69838,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 ]; @@ -67700,8 +69907,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 ]; @@ -67732,8 +69939,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 @@ -67791,6 +69998,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 ]; @@ -67807,8 +70016,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 @@ -67878,6 +70087,7 @@ self: { libraryHaskellDepends = [ base elerea SDL ]; description = "Elerea FRP wrapper for SDL"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elevator" = callPackage @@ -67904,14 +70114,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elf_0_30" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec }: + mkDerivation { + pname = "elf"; + version = "0.30"; + sha256 = "16gfpqsqfwlq4qprh0nswa4br1rz7rj7in7v803cqggkxz7s5c4p"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ base bytestring containers hspec ]; + description = "An Elf parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "eliminators" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons, template-haskell, th-abstraction, th-desugar }: mkDerivation { pname = "eliminators"; - version = "0.4.1"; - sha256 = "000x3gjwyf2s44ry16a2a9dk7cqjvl0dh21r5k85s19ljrxsxv1v"; + version = "0.5"; + sha256 = "0d1d2pp8r2gai25q898v30gb5r82pjzi9smqndn27p1bk9xlqzzr"; libraryHaskellDepends = [ base extra singleton-nats singletons template-haskell th-abstraction th-desugar @@ -67943,8 +70166,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 @@ -68041,6 +70264,7 @@ self: { ]; description = "A library to generate Elm types from Haskell source"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-export-persistent" = callPackage @@ -68281,6 +70505,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm2nix" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary + , bytestring, containers, data-default, directory, filepath, here + , mtl, optparse-applicative, process, req, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "elm2nix"; + version = "0.1.0"; + sha256 = "140qv6zvq4860fd5pglhwgd9pnxv6nha3ah3pmp4d2x3jkvg3hcy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary bytestring containers data-default + directory filepath here mtl process req text transformers + unordered-containers + ]; + executableHaskellDepends = [ + ansi-wl-pprint base directory here optparse-applicative + ]; + testHaskellDepends = [ base ]; + description = "Turn your Elm project into buildable Nix project"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "elo" = callPackage ({ mkDerivation, base, tasty }: mkDerivation { @@ -68410,6 +70659,7 @@ self: { ]; description = "Parsing and rendering of email and MIME headers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-postmark" = callPackage @@ -68434,8 +70684,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.6"; - sha256 = "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5"; + version = "2.3.2.10"; + sha256 = "0wfk5dkpaw0gk4p0vwdpb24c6kz4gjx0z4am79v5c3k38gmb3rak"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -68444,23 +70694,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "email-validate_2_3_2_7" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; - version = "2.3.2.7"; - sha256 = "1qdl0g8nbngr6kz4xrgi06rn1zf1np55ipk3wwdrg9hpfaaazcs3"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -68604,6 +70837,7 @@ self: { testHaskellDepends = [ base containers HUnit ]; description = "Empirical Mode Decomposition and Hilbert-Huang Transform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "emgm" = callPackage @@ -68674,7 +70908,6 @@ self: { testHaskellDepends = [ base ]; description = "Binding to the Enchant library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) enchant;}; "enclosed-exceptions" = callPackage @@ -68792,10 +71025,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 @@ -68803,7 +71036,6 @@ self: { ]; description = "A Haskell implementation of Engine.IO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-growler" = callPackage @@ -68912,14 +71144,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 @@ -68936,6 +71198,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 { @@ -68964,6 +71237,7 @@ self: { executableHaskellDepends = [ base ]; description = "enumerate all the values in a finite type (automatically)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enumerate-function" = callPackage @@ -69013,6 +71287,8 @@ self: { pname = "enumerator"; version = "0.4.20"; sha256 = "02a75dggj295zkhgjry5cb43s6y6ydpjb5w6vgl7kd9b6ma11qik"; + revision = "1"; + editedCabalFile = "10mn8a6sj7fvcprfmngr5z1h434k6yhdij064lqxjpiqyr1srg9z"; libraryHaskellDepends = [ base bytestring containers text transformers ]; @@ -69083,14 +71359,22 @@ self: { }) {}; "enummapset" = callPackage - ({ mkDerivation, base, containers, deepseq, semigroups }: + ({ mkDerivation, array, base, containers, deepseq, ghc-prim, HUnit + , QuickCheck, semigroups, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: mkDerivation { pname = "enummapset"; - version = "0.5.2.2"; - sha256 = "0x6fihrgvb2y6m0z2gi8n97b54aidydd8fnbmj02bq3x73gxnbvr"; + version = "0.6.0.1"; + sha256 = "0nljpb5fxk4piwl5mh1v23ps9bzhxxcybfhd8mmb66k20gxxxf7q"; libraryHaskellDepends = [ base containers deepseq semigroups ]; + testHaskellDepends = [ + array base containers deepseq ghc-prim HUnit QuickCheck semigroups + test-framework test-framework-hunit test-framework-quickcheck2 + ]; description = "IntMap and IntSet with Enum keys/elements"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "enummapset-th" = callPackage @@ -69177,14 +71461,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 ]; @@ -69378,8 +71684,8 @@ self: { }: mkDerivation { pname = "equational-reasoning"; - version = "0.5.1.0"; - sha256 = "11203rdw4q9s5ramhmr2hdimgwin3zwjas8csxqxxldkv3x9a05l"; + version = "0.5.1.1"; + sha256 = "12l0h86y3qxjr04y2908l9l5jh1q2hw5xhchxk7j8c216vlwv5ql"; libraryHaskellDepends = [ base containers singletons template-haskell th-desugar th-extras void @@ -69388,6 +71694,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "equeue" = callPackage + ({ mkDerivation, base, containers, contravariant, delay, mtl + , semigroups, stm, tasty, tasty-hunit, time + }: + mkDerivation { + pname = "equeue"; + version = "0"; + sha256 = "14risb13sv4mz5scyhcvg6knb791lx4b9jm3k9189fhxkr5a28cc"; + libraryHaskellDepends = [ + base containers contravariant mtl semigroups stm + ]; + testHaskellDepends = [ + base containers contravariant delay semigroups stm tasty + tasty-hunit time + ]; + description = "Application level triggered, and edge triggered event multiqueues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "equivalence" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans , template-haskell, test-framework, test-framework-quickcheck2 @@ -69395,10 +71721,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 ]; @@ -69409,6 +71733,7 @@ self: { ]; description = "Maintaining an equivalence relation implemented as union-find using STT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "erd" = callPackage @@ -69683,6 +72008,7 @@ self: { ]; description = "`bracket`-like functions for `ExceptT` over `IO` monad"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ersaconcat" = callPackage @@ -69794,6 +72120,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 @@ -69846,83 +72193,97 @@ 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 + ({ mkDerivation, aeson, attoparsec, base, bcrypt, bytestring + , case-insensitive, classy-prelude, classy-prelude-conduit + , classy-prelude-yesod, conduit, containers, data-default + , directory, ekg, ekg-core, entropy, esqueleto, fast-logger + , file-embed, foreign-store, hjsmin, hscolour, hspec, http-api-data + , http-client, http-client-tls, http-conduit, http-types + , iso8601-time, microlens, monad-logger, monad-metrics, mtl + , optparse-generic, parser-combinators, 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 + , 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.7"; + sha256 = "06nlmz8j6f64dgbd9y9b7i9fd1bv32yxijx764zlvy75i6vbips5"; 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 + aeson attoparsec base bcrypt bytestring case-insensitive + classy-prelude classy-prelude-conduit classy-prelude-yesod conduit + containers data-default directory ekg ekg-core entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour http-api-data + http-client http-client-tls http-conduit http-types iso8601-time + microlens monad-logger monad-metrics mtl parser-combinators + persistent persistent-sqlite persistent-template 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 + aeson attoparsec base bcrypt bytestring case-insensitive + classy-prelude classy-prelude-conduit classy-prelude-yesod conduit + containers data-default directory ekg ekg-core entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour http-api-data + http-client http-client-tls http-conduit http-types iso8601-time + microlens monad-logger monad-metrics mtl optparse-generic + parser-combinators persistent persistent-sqlite persistent-template + 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 + aeson attoparsec base bcrypt bytestring case-insensitive + classy-prelude classy-prelude-conduit classy-prelude-yesod conduit + containers data-default directory ekg ekg-core entropy esqueleto + fast-logger file-embed foreign-store hjsmin hscolour hspec + http-api-data http-client http-client-tls http-conduit http-types + iso8601-time microlens monad-logger monad-metrics mtl + parser-combinators persistent persistent-sqlite persistent-template + 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"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "esqueleto" = callPackage ({ mkDerivation, base, blaze-html, bytestring, conduit, containers - , hspec, HUnit, monad-control, monad-logger, persistent - , persistent-sqlite, persistent-template, QuickCheck, resourcet - , tagged, text, transformers, unordered-containers + , hspec, monad-logger, mysql, mysql-simple, persistent + , persistent-mysql, persistent-postgresql, persistent-sqlite + , persistent-template, postgresql-libpq, postgresql-simple + , resourcet, tagged, text, time, transformers, unliftio + , unordered-containers }: mkDerivation { pname = "esqueleto"; - version = "2.5.3"; - sha256 = "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x"; + version = "2.6.0"; + sha256 = "1asbvcjmbyd44rfs8a645cvfqmf95b6hnb3l7lqd56kv32km69nn"; libraryHaskellDepends = [ base blaze-html bytestring conduit monad-logger persistent - resourcet tagged text transformers unordered-containers + resourcet tagged text time transformers unliftio + unordered-containers ]; testHaskellDepends = [ - base conduit containers hspec HUnit monad-control monad-logger - persistent persistent-sqlite persistent-template QuickCheck - resourcet text transformers + base blaze-html bytestring conduit containers hspec monad-logger + mysql mysql-simple persistent persistent-mysql + persistent-postgresql persistent-sqlite persistent-template + postgresql-libpq postgresql-simple resourcet tagged text time + transformers unliftio unordered-containers ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ess" = callPackage @@ -70087,8 +72448,8 @@ self: { pname = "ether"; version = "0.5.1.0"; sha256 = "1180l4z2cdgc6zj9pcr2c0lj28ka85kbk8sxd42fis65k2ahr61n"; - revision = "1"; - editedCabalFile = "01q86w79xswdkq08m375xwfqjgix6bzbc4lpxz4phqvzf38lc8i5"; + revision = "2"; + editedCabalFile = "0ax7jq2gpb12zh4v2gcpqpckznpbkc8b743k94fljvks0yq3kl0k"; libraryHaskellDepends = [ base exceptions mmorph monad-control mtl reflection tagged template-haskell transformers transformers-base transformers-lift @@ -70103,7 +72464,6 @@ self: { ]; description = "Monad transformers and classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ethereum-analyzer" = callPackage @@ -70340,6 +72700,8 @@ self: { pname = "euler-tour-tree"; version = "0.1.1.0"; sha256 = "166gbinlf0ay8y2clzjzf5b2x489hcr1gzj8w5qk341z01f8pckh"; + revision = "1"; + editedCabalFile = "0rix7nslzfdds5hz2hvam8dydndhv04xg10wazf7l37q88gk880w"; libraryHaskellDepends = [ base containers fingertree mtl parser-combinators transformers Unique @@ -70443,6 +72805,7 @@ self: { ]; description = "Monoidal, monadic and first-class events"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "event-driven" = callPackage @@ -70680,16 +73043,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.1"; + sha256 = "04sqpzhmsisr93da55dhmprsbks0kkwsb3dg8fkx2w0casyb58f6"; 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"; @@ -70698,20 +73061,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.1"; + sha256 = "1v024nxs7bdh8q6m1r0wnn877pbc54kg22yg4qlwbsmsibq61c82"; 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; @@ -70719,16 +73085,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.1"; + sha256 = "1b7nhigf4r26zfbcq0civbsw8mhsz4hpdsdnm94zmkysl5k58f04"; 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; @@ -70736,19 +73102,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.1"; + sha256 = "1xd3ngjjpimfpglkgad3r9dmd7sf2mq3kdlbqs4d6xz28gd7vh7y"; 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; @@ -70780,66 +73147,30 @@ self: { , 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-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec - , tasty-hunit, text, time, transformers-base, unordered-containers - , uuid - }: - mkDerivation { - pname = "eventstore"; - version = "1.1.5"; - sha256 = "1c8iiq943smldh5yvjpfycfjzy8hnsb2dmvcnbzk41cpcdq2zkx8"; - 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-exceptions semigroups stm stm-chans 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-exceptions - semigroups stm stm-chans 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; - }) {}; - - "eventstore_1_1_6" = 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-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec - , tasty-hunit, text, time, transformers-base, unordered-containers - , uuid + , 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.1.6"; - sha256 = "00bdkklwrabxvbr725hkdsc1a2fdr50gdwryn7spmsqxmqgzv96w"; - revision = "1"; - editedCabalFile = "1y1a7brw220bg4mfc80qhkcyzlm38qvs6pkr7p8xyk104b8k5qgx"; + version = "1.2.1"; + sha256 = "1yya52bk3sgfgrarf88a3n7i0jdwr1hd615a17ixxbb1vc9v44y8"; 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-exceptions semigroups stm stm-chans text time + 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-exceptions - semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time - transformers-base unordered-containers uuid + 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; @@ -70871,20 +73202,21 @@ self: { }) {}; "ewe" = callPackage - ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty - , transformers + ({ mkDerivation, alex, array, base, Cabal, containers, happy, mtl + , pretty, transformers, uuagc, uuagc-cabal, uulib }: mkDerivation { pname = "ewe"; - version = "0.1.0.46"; - sha256 = "06pz56a4r4j601p100lnvih7pi1hfpvd6hr23mz5wk5dbkm9ng6f"; + version = "0.3.1.1"; + sha256 = "1kxjsxl0idy82xynjbafw7695m9aylgs9bpkr2gvcmzs5lpyni8p"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal uuagc uuagc-cabal uulib ]; executableHaskellDepends = [ - array base containers mtl pretty transformers + array base containers mtl pretty transformers uuagc-cabal ]; - executableToolDepends = [ alex happy ]; - description = "A language for teaching simple programming languages"; + executableToolDepends = [ alex happy uuagc ]; + description = "An interpreter for EWE programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -70931,14 +73263,20 @@ self: { }) {}; "exact-pi" = callPackage - ({ mkDerivation, base, numtype-dk }: + ({ mkDerivation, base, numtype-dk, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: mkDerivation { pname = "exact-pi"; - version = "0.4.1.4"; - sha256 = "15v10wn5zgg7y66jzfg0l8lx2qpj91dh7rp05aa3c6c3dss9dx3v"; + 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 @@ -70984,6 +73322,7 @@ self: { libraryHaskellDepends = [ base exceptions transformers ]; description = "Safely deal with exceptions in ExceptT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-hierarchy" = callPackage @@ -70995,6 +73334,7 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "Exception type hierarchy with TemplateHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-mailer" = callPackage @@ -71060,6 +73400,8 @@ self: { pname = "exception-transformers"; version = "0.4.0.7"; sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj"; + revision = "1"; + editedCabalFile = "0sahi93f75acvmqagkjc1lcwx31crja6z9hyww9abj85x45pqa6f"; libraryHaskellDepends = [ base stm transformers transformers-compat ]; @@ -71233,8 +73575,8 @@ self: { }: mkDerivation { pname = "exhaustive"; - version = "1.1.6"; - sha256 = "00gdgr9xqzy14sqx31j4afljvfc4ar2jrzmwpp3z6ybfq1saw7vk"; + version = "1.1.7"; + sha256 = "02kv3vv7gz8lqwm5iz4nddyzxp17cgsb6j12lc5kf51l481vpb1z"; libraryHaskellDepends = [ base generics-sop template-haskell transformers ]; @@ -71281,53 +73623,81 @@ self: { }) {inherit (pkgs) exif;}; "exinst" = callPackage - ({ mkDerivation, aeson, base, binary, bytes, bytestring, cborg - , cereal, constraints, deepseq, hashable, profunctors, QuickCheck - , serialise, singletons, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, binary, bytestring, constraints, deepseq + , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "exinst"; - version = "0.6"; - sha256 = "0pljgk0y4azzgp0k9q8dl7jpf9bf2719xax54mnc35g1px4s21p9"; + version = "0.7"; + sha256 = "01m50pixmrw6mrd04nxw6qwx0z5k857pn3nqfiybpmp4zbc3bwac"; libraryHaskellDepends = [ - aeson base binary bytes cborg cereal constraints deepseq hashable - profunctors QuickCheck serialise singletons + base binary constraints deepseq hashable profunctors QuickCheck + singletons ]; testHaskellDepends = [ - aeson base binary bytes bytestring cborg cereal constraints deepseq - hashable profunctors QuickCheck serialise singletons tasty - tasty-hunit tasty-quickcheck + 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; }) {}; "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; + }) {}; + + "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; }) {}; "exinst-deepseq" = callPackage @@ -71356,6 +73726,24 @@ 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; + }) {}; + "existential" = callPackage ({ mkDerivation, base, cereal, constraints, control-invariants , lens, portable-template-haskell-lens, QuickCheck @@ -71394,8 +73782,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; @@ -71410,8 +73798,8 @@ self: { pname = "exitcode"; version = "0.1.0.1"; sha256 = "1h4qv29g59dxwsb2i4qrnf2f96xsmzngc9rnrqfkh8nkkcr71br5"; - revision = "1"; - editedCabalFile = "0p2kmkgqbfcf5za5n210a6ra6758dkmkwvs516aj3y895na6j14z"; + revision = "2"; + editedCabalFile = "0g30lnsl947bsxcw53swl0vv3qg8c7vqf8axpdnhl28mdrxa0ax9"; libraryHaskellDepends = [ base lens mmorph mtl semigroupoids semigroups transformers ]; @@ -71435,6 +73823,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Compression and decompression in the exomizer format"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exp-cache" = callPackage @@ -71444,8 +73833,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 = [ @@ -71465,8 +73854,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; @@ -71479,8 +73868,10 @@ self: { }: mkDerivation { pname = "exp-pairs"; - version = "0.1.6.0"; - sha256 = "1qsvly4klhk17r2pk60cf03dyz0cjc449fa2plqrlai9rl7xjfp6"; + version = "0.2.0.0"; + sha256 = "0ry9k89xfy2493j7yypyiqcj0v7h5x9w8gl60dy28w4597yinisp"; + revision = "1"; + editedCabalFile = "1fkllbgsygzm1lw3g3a9l8fg8ap74bx0x7ja8yx3lbrjjsaqh8pa"; libraryHaskellDepends = [ base containers deepseq ghc-prim prettyprinter ]; @@ -71542,20 +73933,22 @@ 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"; + revision = "1"; + editedCabalFile = "0wp4p8ax6cx6z8h7kjjajlr3h2155gzr5zffh2ky9w31ax9iggw9"; 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; @@ -71729,8 +74122,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 @@ -71738,6 +74131,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 @@ -71746,8 +74140,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 ]; @@ -71756,6 +74150,35 @@ self: { ]; description = "Encode and Decode expressions from Z3 ASTs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "expresso" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , haskeline, mtl, parsec, tasty, tasty-hunit, template-haskell + , text, unordered-containers, wl-pprint + }: + mkDerivation { + pname = "expresso"; + version = "0.1.2.0"; + sha256 = "15s4gpf7pv6wv13q5i1cff7s93nx5vb8gyjfm4ifz76ki3xafgcn"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable haskeline mtl parsec + template-haskell text unordered-containers wl-pprint + ]; + executableHaskellDepends = [ + base containers directory filepath hashable haskeline mtl parsec + text unordered-containers wl-pprint + ]; + testHaskellDepends = [ + base containers directory filepath hashable haskeline mtl parsec + tasty tasty-hunit text unordered-containers wl-pprint + ]; + description = "A simple expressions language based on row types"; + license = stdenv.lib.licenses.bsd3; }) {}; "extcore" = callPackage @@ -71819,8 +74242,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 @@ -71831,50 +74254,26 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, comonad - , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton - , mtl, prettyprinter, primitive, profunctors, QuickCheck - , semigroups, StateVar, tagged, template-haskell, text, th-lift - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "extensible"; - version = "0.4.9"; - sha256 = "11iyz4lgs2bf6wg1iiancwj58ywpj8f93bqj9scy4mzz8mpyllmp"; - libraryHaskellDepends = [ - aeson base bytestring cassava comonad constraints deepseq ghc-prim - hashable monad-skeleton mtl prettyprinter primitive profunctors - QuickCheck semigroups StateVar tagged template-haskell text th-lift - transformers unordered-containers vector - ]; - testHaskellDepends = [ base lens QuickCheck template-haskell ]; - description = "Extensible, efficient, optics-friendly data types and effects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extensible_0_4_10" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, comonad , constraints, deepseq, exceptions, ghc-prim, hashable, lens , monad-skeleton, mtl, prettyprinter, primitive, profunctors - , QuickCheck, resourcet, semigroups, StateVar, tagged - , template-haskell, text, th-lift, transformers - , unordered-containers, vector + , QuickCheck, resourcet, StateVar, tagged, template-haskell, text + , th-lift, transformers, unordered-containers, vector }: mkDerivation { pname = "extensible"; - version = "0.4.10"; - sha256 = "012xryq2jz7k6dmrzjh8j3yn9ggyna63vppi6xwdqjxks9xms2zq"; + version = "0.5"; + sha256 = "1nsidp8rb3fnkybirgql2ij1vwjzsy2da3qp8abjb1g8aj50ih14"; libraryHaskellDepends = [ aeson base bytestring cassava comonad constraints deepseq exceptions ghc-prim hashable monad-skeleton mtl prettyprinter - primitive profunctors QuickCheck resourcet semigroups StateVar - tagged template-haskell text th-lift transformers - unordered-containers vector + primitive profunctors QuickCheck resourcet StateVar tagged + template-haskell text th-lift transformers unordered-containers + vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; description = "Extensible, efficient, optics-friendly data types and effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible-data" = callPackage @@ -71900,12 +74299,15 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "3.1.0.1"; - sha256 = "1znqhcx5y4mpkbib18nma2c6bw4wxyxlxg3s8kafdalrx61rdhy3"; + version = "5.0.0.1"; + sha256 = "0ff0h24ff5m5dnfiazh8sfvmby3sdb2dil7zqxg8qwykjdc1dcy3"; + revision = "1"; + editedCabalFile = "1ihcxj58a3ca80zfyxgbzjzgps9izy96vnj7h4sk9wwb9khbxl1f"; 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 @@ -71916,27 +74318,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.18.1"; + sha256 = "14kx3ipwz51g2qvdmz97v4mckglh6hajw6yzbzllqysgljs243cl"; + 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 @@ -71980,8 +74390,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.6.9"; - sha256 = "0xxcpb00pgwi9cmy6a7ghh6rblxry42p8pz5ssfgj20fs1xwzj1b"; + version = "1.6.14"; + sha256 = "170jmwx2wnpa6bs92pcijm4ib4hq0vs4582s6v63wrcn1m9l21m6"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -72107,6 +74517,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 { @@ -72142,7 +74568,6 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "facts" = callPackage @@ -72151,6 +74576,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; @@ -72251,6 +74678,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "failable" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "failable"; + version = "0.1.1.0"; + sha256 = "0wg4jhilnyqxs6kqikbli1ia6xl4hi4hipdc1pp1f2d2gxgg0afb"; + revision = "1"; + editedCabalFile = "05952427jqydy44yqsjad3xwy62k48f7ygyby28rg6s5l59966pz"; + libraryHaskellDepends = [ base mtl transformers ]; + description = "A 'Failable' error monad class to unify failure across monads that can fail"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "failable-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -72311,6 +74751,8 @@ self: { pname = "fake"; version = "0.1.1.1"; sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf"; + revision = "1"; + editedCabalFile = "1a1rsa8hpgpyw8m2bq9ns76n4dbr4iymjhxqkiif6b6xvg8zwld5"; libraryHaskellDepends = [ base containers generics-sop random text time ]; @@ -72345,6 +74787,29 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "falling-turnip" = callPackage ({ mkDerivation, base, gloss, gloss-raster, JuicyPixels-repa , QuickCheck, random, repa, repa-algorithms, vector @@ -72426,20 +74891,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.1.1"; - sha256 = "0adnngx0bqbrcsxkgpdfb60p4jhvx0b8ls37g94q6cx9s0n3cmb8"; - 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; @@ -72452,8 +74913,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 = [ @@ -72463,7 +74924,6 @@ self: { ]; description = "Fast ByteString Builder"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-combinatorics" = callPackage @@ -72503,17 +74963,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "fast-downward" = callPackage + ({ mkDerivation, base, containers, list-t, mtl, process, temporary + , text, transformers + }: + mkDerivation { + pname = "fast-downward"; + version = "0.1.1.0"; + sha256 = "1c4qsihjf6wjmmh4nm088pxaj7xc1mm9di8jq124zgllf85j1lfl"; + libraryHaskellDepends = [ + base containers list-t mtl process temporary text transformers + ]; + description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-logger" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory - , easy-file, filepath, hspec, text, unix, unix-time + , easy-file, filepath, hspec, text, unix-compat, unix-time }: mkDerivation { pname = "fast-logger"; - version = "2.4.11"; - sha256 = "1ad2vq4nifdxshqk9yrmghqizhkgybfz134kpr6padglb2mxxrdv"; + version = "2.4.13"; + sha256 = "1ciji847kcpg8zfld964wd20c5n554y3ak5340rn07k6dx0fzm2b"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text - unix unix-time + unix-compat unix-time ]; testHaskellDepends = [ base bytestring directory hspec ]; description = "A fast logging system"; @@ -72561,11 +75037,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 @@ -72650,7 +75125,6 @@ self: { librarySystemDepends = [ fcgi ]; description = "A Haskell library for writing FastCGI programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fcgi;}; "fastedit" = callPackage @@ -72804,8 +75278,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.0.1"; - sha256 = "05z8dyw1yf2bh42mrrk1d9rxqdz1p6gn8sjnpk66s2k76xrg4vm2"; + version = "0.24.0.2"; + sha256 = "00qm6n8ali6inqmm64mrcz414iwiin8zwpavq5w1hnrmvzlbazg5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72963,6 +75437,19 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fb" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bytestring, cereal, conduit, conduit-extra @@ -73120,8 +75607,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 @@ -73271,22 +75758,18 @@ self: { license = "GPL"; }) {}; - "fedora-haskell-tools" = callPackage - ({ mkDerivation, base, directory, filepath, process, time, unix }: + "fedora-dists" = callPackage + ({ mkDerivation, base }: mkDerivation { - pname = "fedora-haskell-tools"; - version = "0.5.1"; - sha256 = "1543i2lxzplqmx1cpggp5773qvqc6jzn4960c1cgyhg9mjd13adr"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath process time unix - ]; - description = "Building and managing tools for Fedora Haskell"; + pname = "fedora-dists"; + version = "1.0.0.2"; + sha256 = "0jc7kv2zflxwfbidc4wm6wad8hpwfxw7w2ri1zghk3970dkl7lnl"; + libraryHaskellDepends = [ base ]; + description = "Library for Fedora distribution versions"; license = stdenv.lib.licenses.gpl3; }) {}; - "fedora-haskell-tools_0_6" = callPackage + "fedora-haskell-tools" = callPackage ({ mkDerivation, base, csv, directory, filepath, HTTP, process , time, unix }: @@ -73301,7 +75784,6 @@ self: { ]; description = "Building and maintenance tools for Fedora Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fedora-packages" = callPackage @@ -73343,26 +75825,27 @@ 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"; + revision = "1"; + editedCabalFile = "10xjd3syr70g3blnjy7xvd6s21y68vxsi69f6bmizpsylbfb0245"; 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; }) {}; @@ -73736,8 +76219,8 @@ self: { }: mkDerivation { pname = "fficxx"; - version = "0.5"; - sha256 = "16r7pbfxr1xf5jxwyk2qv50yishpk0mzndl88hv9bwpz7gbj55yy"; + version = "0.5.0.1"; + sha256 = "01rvg7y9c0jczypjgrq7b6cbl79n10flsllkbgm9z5hhymwga38s"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring Cabal containers data-default directory either errors filepath hashable haskell-src-exts lens mtl @@ -73746,7 +76229,6 @@ self: { ]; description = "automatic C++ binding generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fficxx-runtime" = callPackage @@ -73780,6 +76262,7 @@ self: { ]; description = "Minimal bindings to the FFmpeg library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; libavformat = null; libswscale = null;}; @@ -73827,7 +76310,6 @@ self: { librarySystemDepends = [ fftw ]; description = "Low level bindings to FFTW"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fftw;}; "fgl" = callPackage @@ -73836,8 +76318,8 @@ self: { }: mkDerivation { pname = "fgl"; - version = "5.6.0.0"; - sha256 = "1i6cp4b3w7sjk7y1dq3fh6bci2sm5h3lnbbaw9ln19nwncg2wwll"; + version = "5.7.0.1"; + sha256 = "04793yh778ck3kz1z2svnfdwwls2kisbnky4lzvf4zjfgpv7mkpz"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -74023,22 +76505,6 @@ self: { }) {}; "file-embed" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , template-haskell - }: - mkDerivation { - pname = "file-embed"; - version = "0.0.10.1"; - sha256 = "0lj164cnzqyd487mli91nnr7137a4h4qsasfwsnsh77sx12fpk9k"; - libraryHaskellDepends = [ - base bytestring directory filepath template-haskell - ]; - testHaskellDepends = [ base filepath ]; - description = "Use Template Haskell to embed file contents directly"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "file-embed_0_0_11" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , template-haskell }: @@ -74052,7 +76518,6 @@ self: { testHaskellDepends = [ base filepath ]; description = "Use Template Haskell to embed file contents directly"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "file-embed-lzma" = callPackage @@ -74063,8 +76528,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 @@ -74156,8 +76621,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 @@ -74252,8 +76717,8 @@ self: { pname = "filepath-crypto"; version = "0.1.0.0"; sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0"; - revision = "5"; - editedCabalFile = "1xyrac6m3szzj7x68fnrf7nh43gq03g9rwyynfxdx290bgc38gch"; + revision = "7"; + editedCabalFile = "0dniq1rzv6qb75svf2ya32r0116pjh9jlgly7106x3gyziq2cwh3"; libraryHaskellDepends = [ base binary bytestring case-insensitive cryptoids cryptoids-class cryptoids-types exceptions filepath sandi template-haskell @@ -74288,6 +76753,7 @@ self: { ]; description = "Functions on System.FilePath"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fileplow" = callPackage @@ -74313,8 +76779,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.3.3"; - sha256 = "04qvp5hmnnassw13lw7g1l785lgdlfzl9msy4k1ja8p6gksy7r1c"; + version = "0.6.3.4"; + sha256 = "0q1ynqjslcxx5r93l6w2hsmd1khlq38c5g5mwrifrv12qnh28sx0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale @@ -74327,6 +76793,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filesystem-abstractions" = callPackage + ({ mkDerivation, base, bytestring, list-tries, posix-paths + , semigroups + }: + mkDerivation { + pname = "filesystem-abstractions"; + version = "0"; + sha256 = "1qrxc8q10fqd7b0ss84nykz8vmyjwwxw5ywxp11xabad966shl18"; + libraryHaskellDepends = [ + base bytestring list-tries posix-paths semigroups + ]; + description = "A shared set of abstractions and types for representing filessytem data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "filesystem-conduit" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , containers, hspec, QuickCheck, system-fileio, system-filepath @@ -74418,6 +76899,7 @@ self: { testHaskellDepends = [ base bytestring HUnit ]; description = "Filterable request logging wai middleware. Change how data is logged and when."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filtrable" = callPackage @@ -74439,10 +76921,13 @@ 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"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "final" = callPackage @@ -74480,8 +76965,8 @@ self: { }: mkDerivation { pname = "find-clumpiness"; - version = "0.2.3.1"; - sha256 = "0aicxjh58cz25kxigz013j07a0vc5jyirs75daqjmlgd3rj5b7h8"; + version = "0.2.3.2"; + sha256 = "1qid4dinkydpikw1a7q4zj3cx3bh7mzz7bfd8l1mz7fykdi8lwac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74495,6 +76980,7 @@ self: { ]; description = "Find the clumpiness of labels in a tree"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "find-conduit" = callPackage @@ -74550,8 +77036,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 @@ -74697,13 +77183,28 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "first-class-families"; - version = "0.1.0.0"; - sha256 = "19lm7p45rn3rlz51pi08ka2sc6nd01ba56pdp6nxakynmc44mw25"; + version = "0.3.0.1"; + sha256 = "07291dj197230kq8vxqdgs52zl428w12sgy18y0n5lk18g5isxib"; + revision = "1"; + editedCabalFile = "1gybi18yw6dzp3r82x0xq9364m3isqq31gvaa1agf6hk9c9szfl2"; libraryHaskellDepends = [ base ]; description = "First class type families"; license = stdenv.lib.licenses.mit; }) {}; + "first-class-families_0_5_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "first-class-families"; + version = "0.5.0.0"; + sha256 = "03skw4axj6zk593zi8fwynzjyiq6s7apjqmjqv6rxpxhj17vqwpj"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "First class type families"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "first-class-patterns" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -74754,7 +77255,6 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fit" = callPackage @@ -74807,19 +77307,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; @@ -74861,12 +77365,15 @@ self: { }) {}; "fixed-length" = callPackage - ({ mkDerivation, base, non-empty, tfp, utility-ht }: + ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht + }: mkDerivation { pname = "fixed-length"; - version = "0.2"; - sha256 = "16rqls3zhrm757brz7zkw7m58nvxbj03af9vff98w6hp8gag4w9i"; - libraryHaskellDepends = [ base non-empty tfp utility-ht ]; + version = "0.2.1"; + sha256 = "0jabfv9ga94maw35a7xdw5lwi55d7z92nn2zs2c8z3jk0a4bcld1"; + libraryHaskellDepends = [ + base non-empty storable-record tfp utility-ht + ]; description = "Lists with statically known length based on non-empty package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -74947,18 +77454,6 @@ self: { }) {}; "fixed-vector" = callPackage - ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: - mkDerivation { - pname = "fixed-vector"; - version = "1.1.0.0"; - sha256 = "1iclmv1xkyr1wdszrahzdim6ilqvpxrhpsiammcxishg9gwvxl0y"; - libraryHaskellDepends = [ base deepseq primitive ]; - testHaskellDepends = [ base doctest filemanip primitive ]; - description = "Generic vectors with statically known size"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed-vector_1_2_0_0" = callPackage ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; @@ -74968,7 +77463,6 @@ self: { 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 @@ -74977,14 +77471,15 @@ self: { }: 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 ]; description = "Binary instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-cborg" = callPackage @@ -74993,14 +77488,15 @@ 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 ]; description = "Binary instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-cereal" = callPackage @@ -75009,14 +77505,15 @@ 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 ]; description = "Cereal instances for fixed-vector"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-hetero" = callPackage @@ -75046,8 +77543,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; @@ -75257,8 +77754,8 @@ self: { pname = "flac"; version = "0.1.2"; sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; - revision = "3"; - editedCabalFile = "09xml5mv63q0wzw09s0ssjdzgnq041gr6gjhk63dr252rydnn4zh"; + revision = "5"; + editedCabalFile = "0rwwq8qrxd497rd5m0kidz4v69frj72ds7a6zrdqigj5f5471rhd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions @@ -75274,22 +77771,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {FLAC = null;}; + "flac_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , exceptions, filepath, FLAC, hspec, hspec-discover, mtl, temporary + , text, transformers, vector, wave + }: + mkDerivation { + pname = "flac"; + version = "0.2.0"; + sha256 = "03zmsnnpkk26ss8ka2l7x9gsfcmiqfyc73v7fna6sk5cwzxsb33c"; + revision = "1"; + editedCabalFile = "1phwdnya8bgw24a80vbw0m4pm7r67grnc6si8683jz620snnsm48"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers directory exceptions filepath mtl text + transformers vector wave + ]; + librarySystemDepends = [ FLAC ]; + testHaskellDepends = [ + base bytestring directory filepath hspec temporary transformers + vector wave + ]; + testToolDepends = [ hspec-discover ]; + description = "Complete high-level binding to libFLAC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {FLAC = null;}; + "flac-picture" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, directory - , flac, hspec, JuicyPixels, temporary + ({ mkDerivation, base, bytestring, directory, flac, hspec + , hspec-discover, JuicyPixels, temporary }: mkDerivation { pname = "flac-picture"; - version = "0.1.1"; - sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w"; - revision = "1"; - editedCabalFile = "02vdh61nzig0yrv6ja6fjlgfcznj5k4iqh3i5f9g5p078ycqb17w"; + version = "0.1.2"; + sha256 = "02h36z65xmy0mvg7j2863h35dcf24l08ma0dxjbqcn42sca9ss0m"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring flac JuicyPixels ]; testHaskellDepends = [ - base bytestring data-default-class directory flac hspec JuicyPixels - temporary + base bytestring directory flac hspec JuicyPixels temporary ]; + testToolDepends = [ hspec-discover ]; description = "Support for writing picture to FLAC metadata blocks with JuicyPixels"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -75343,25 +77865,23 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flat-maybe" = callPackage @@ -75530,7 +78050,6 @@ self: { libraryHaskellDepends = [ base bytestring parsec utf8-string ]; description = "A parser for IGC files"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flight-kml" = callPackage @@ -75554,7 +78073,6 @@ self: { ]; description = "Parsing of pilot tracklogs dumped as KML"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flip-cmd" = callPackage @@ -75670,38 +78188,26 @@ 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"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_15" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; - version = "1.0.15"; - sha256 = "1i3rhjjl8w9xmvckz0qrlbg7jfdz6v5w5cgmhs8xqjys5ssmla2y"; + version = "1.0.17"; + sha256 = "06adx3drx4b283v0aawhzyigvjizbhig8lqxw9cgqfn1pvc1kv46"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -75872,21 +78378,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; + pkgconfig = null;}; "fltkhs-demos" = callPackage ({ mkDerivation, base, bytestring, directory, fltkhs, process, stm @@ -75930,6 +78443,7 @@ self: { executableHaskellDepends = [ base bytestring fltkhs ]; description = "Fltkhs Fluid Examples"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fltkhs-hello-world" = callPackage @@ -75946,6 +78460,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 @@ -76020,6 +78552,7 @@ self: { ]; description = "The parser for fluffy to parsec the question bank in .docx type"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fluid-idl" = callPackage @@ -76137,11 +78670,13 @@ self: { }: mkDerivation { pname = "fmt"; - version = "0.6"; - sha256 = "14hk6ra8j1zzw7ibimj207mi1xl5pmln6kyz0y66j4bg1r8invsy"; + version = "0.6.1.1"; + sha256 = "1bfj94ahc06xj6x5v5gmjzgw30cgxsc1vjygajqiqnanimbhn8i6"; + revision = "2"; + editedCabalFile = "1prdnb8a8n338clkvjx0c8hmbkiy8x2c9j87b94302bq6x7rmf9d"; 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 @@ -76156,6 +78691,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 @@ -76198,17 +78745,6 @@ self: { }) {}; "focus" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "focus"; - version = "0.1.5.2"; - sha256 = "1dswf4l7d6z3rrv1d00fr3vcpawnvxhj3q741fh62s5wq948v662"; - libraryHaskellDepends = [ base ]; - description = "A general abstraction for manipulating elements of container data structures"; - license = stdenv.lib.licenses.mit; - }) {}; - - "focus_1_0_1_2" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "focus"; @@ -76217,6 +78753,32 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A general abstraction for manipulating elements of container data structures"; license = stdenv.lib.licenses.mit; + }) {}; + + "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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -76226,8 +78788,8 @@ self: { }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.7"; - sha256 = "13y6l6ng5rrva0sx9sa4adp6p2yrpyfz91v3jbkamgh4g99w8zpz"; + version = "0.2.0.8"; + sha256 = "1j7v11nq2q7p50z27lbmprwqrhvcf9qa5zy2hql68zsi53q3wszw"; libraryHaskellDepends = [ base data-default-class stm stm-delay time ]; @@ -76242,8 +78804,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 @@ -76274,30 +78836,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.3"; - sha256 = "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk"; - revision = "1"; - editedCabalFile = "043axkgbjwvzlh5il1cmrb36svri3v0zja00iym9p0vm9gldh81c"; - libraryHaskellDepends = [ - base bytestring comonad containers contravariant hashable - mwc-random primitive profunctors semigroupoids semigroups text - transformers unordered-containers vector vector-builder - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Composable, streaming, and efficient left folds"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foldl_1_4_4" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers - , contravariant, criterion, hashable, mwc-random, primitive - , profunctors, semigroupoids, semigroups, text, transformers - , unordered-containers, vector, vector-builder - }: - mkDerivation { - pname = "foldl"; - version = "1.4.4"; - sha256 = "0dy8dhpys2bq6pn0m6klsykk4mfxi6q8hr8gqbfcvqk6g4i5wyn7"; + version = "1.4.5"; + sha256 = "19qjmzc7gaxfwgqbgy0kq4vhbxvh3qjnwsxnc7pzwws2if5bv80b"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids semigroups text @@ -76306,7 +78846,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl-incremental" = callPackage @@ -76338,8 +78877,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 @@ -76380,7 +78919,6 @@ self: { ]; description = "Transducers for foldl folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl-transduce-attoparsec" = callPackage @@ -76402,7 +78940,6 @@ self: { ]; description = "Attoparsec and foldl-transduce integration"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "folds" = callPackage @@ -76462,6 +78999,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 @@ -76469,8 +79035,8 @@ self: { }: mkDerivation { pname = "follow-file"; - version = "0.0.2"; - sha256 = "0661fp7gf5gyb4w06qm7lfaclzp0zk96gkhcx3pallckfr3214hk"; + version = "0.0.3"; + sha256 = "0nxvw17ndjrg34mc2a0bcyprcng52f6mn3l7mhx2fc11njdf2b93"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76479,11 +79045,11 @@ 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; }) {}; "follower" = callPackage @@ -76620,8 +79186,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 ]; @@ -76760,10 +79326,8 @@ self: { }: mkDerivation { pname = "forma"; - version = "1.1.0"; - sha256 = "09f377ak1208lr8sskdga3nq47a151whd7z982pwv552w1q75p5p"; - revision = "1"; - editedCabalFile = "0yn650g1x3v56d45iqks1x7bz6ji8454ppr0qx48bmjnlbb34s1q"; + version = "1.1.1"; + sha256 = "10q06yjz66h92qm0569l172v0c6mp9m3jfyakyva5v7xdqr8rvxb"; libraryHaskellDepends = [ aeson base containers mtl text unordered-containers ]; @@ -76866,13 +79430,13 @@ self: { }: mkDerivation { pname = "formatting"; - version = "6.3.6"; - sha256 = "06nkm9scy3a41v4m7npgkl9lvy5py6v7chsx0yhdy4pr4mvdna3a"; + version = "6.3.7"; + sha256 = "06jwb1pmh15f2b9dfplm64y9yszazg26m4h7rl4dn4inqg14znqc"; libraryHaskellDepends = [ array base bytestring clock ghc-prim integer-gmp old-locale scientific semigroups text time transformers ]; - testHaskellDepends = [ base hspec semigroups ]; + testHaskellDepends = [ base hspec semigroups text ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76958,15 +79522,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "forsyde-deep" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath + , HUnit, mtl, parameterized-data, pretty, process, QuickCheck + , random, regex-posix, syb, template-haskell, type-level + }: + mkDerivation { + pname = "forsyde-deep"; + version = "0.2.0"; + sha256 = "1rznghp5njbs474cr1pmipmflf53rk8al6pb2d16vhj717431vf9"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ + base Cabal containers directory filepath HUnit mtl + parameterized-data pretty process QuickCheck random regex-posix syb + template-haskell type-level + ]; + libraryHaskellDepends = [ + base containers directory filepath mtl parameterized-data pretty + process random regex-posix syb template-haskell type-level + ]; + testHaskellDepends = [ + base directory HUnit parameterized-data QuickCheck random syb + type-level + ]; + description = "ForSyDe's Haskell-embedded Domain Specific Language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forsyde-shallow" = callPackage - ({ mkDerivation, base, directory, hspec, old-time, process, random + ({ mkDerivation, base, directory, doctest, hspec, old-time, process + , QuickCheck, random }: mkDerivation { pname = "forsyde-shallow"; - version = "3.3.2.0"; - sha256 = "1cfqv2mn1ccbp2j7vnjj123ys2n5s414dqid4ywy1l749pzf7w1j"; + version = "3.4.0.0"; + sha256 = "0czrgfx22j94xp56mf4cwrz2rdw2id77va89xpjxxrhdzwzfsvcn"; libraryHaskellDepends = [ base directory old-time process random ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ + base directory doctest hspec old-time process QuickCheck random + ]; description = "ForSyDe's Haskell-embedded Domain Specific Language"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -77009,20 +79604,19 @@ self: { ]; description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fortytwo" = callPackage - ({ mkDerivation, ansi-terminal, async, base, doctest, hspec - , process, text - }: + ({ mkDerivation, ansi-terminal, base, doctest, hspec, text }: mkDerivation { pname = "fortytwo"; - version = "1.0.4"; - sha256 = "0gbvhlsyhfslxrwkdldn15adj8f371rhx5qxfapcpqfa6pwbjsfd"; + version = "1.0.5"; + sha256 = "1jmvj3h70h31a906b8wvycqwl1spfqgdmwhzf5x84aykih5xlcfs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base text ]; - testHaskellDepends = [ async base doctest hspec process ]; + testHaskellDepends = [ base doctest hspec ]; description = "Interactive terminal prompt"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -77121,6 +79715,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foundation_0_0_22" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.22"; + sha256 = "1a66abjm0qy90i1kc0zik373gy83p14vxw0q7qx2yd8yqf2kf28j"; + revision = "1"; + editedCabalFile = "18kk8h7d0gr57p95b6y9ax6ngbj76gd68rc3br85sk90nl89zxjz"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + description = "Alternative prelude with batteries and no dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foundation-edge" = callPackage ({ mkDerivation, bytestring, foundation, text }: mkDerivation { @@ -77180,6 +79790,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fpe" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, integer-logarithms + , vector + }: + mkDerivation { + pname = "fpe"; + version = "0.1.1"; + sha256 = "1rzd1g6zk98l5bz5d7pr66i10gd2kx6vrv9py06wcnz3b5svkx2l"; + libraryHaskellDepends = [ + base bytestring integer-logarithms vector + ]; + testHaskellDepends = [ + base bytestring cryptonite integer-logarithms vector + ]; + description = "Format-preserving encryption"; + license = stdenv.lib.licenses.mit; + }) {}; + "fpipe" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -77234,8 +79862,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; @@ -77388,6 +80016,7 @@ self: { benchmarkHaskellDepends = [ base time ]; description = "Cached and parallel data fetching"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freddy" = callPackage @@ -77407,28 +80036,10 @@ self: { ]; description = "RabbitMQ Messaging API supporting request-response"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free" = callPackage - ({ mkDerivation, base, bifunctors, comonad, containers - , distributive, exceptions, mtl, profunctors, semigroupoids - , semigroups, template-haskell, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "free"; - version = "5.0.2"; - sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg"; - libraryHaskellDepends = [ - base bifunctors comonad containers distributive exceptions mtl - profunctors semigroupoids semigroups template-haskell transformers - transformers-base transformers-compat - ]; - description = "Monads for free"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free_5_1" = callPackage ({ mkDerivation, base, comonad, containers, distributive , exceptions, mtl, profunctors, semigroupoids, template-haskell , transformers, transformers-base @@ -77443,28 +80054,38 @@ self: { ]; description = "Monads for free"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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"; license = stdenv.lib.licenses.mpl20; + }) {}; + + "free-category" = callPackage + ({ mkDerivation, base, free-algebras }: + mkDerivation { + pname = "free-category"; + version = "0.0.2.0"; + sha256 = "16gs7n3gl5whda376j87qm9jfdx6zhmnyp43fjfaj6s5y2s0z53z"; + libraryHaskellDepends = [ base free-algebras ]; + description = "Free category"; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -77496,22 +80117,18 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-game" = callPackage @@ -77661,6 +80278,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 @@ -77669,6 +80318,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 ]; @@ -77813,16 +80464,16 @@ self: { "freer-simple" = callPackage ({ mkDerivation, base, criterion, extensible-effects, free, mtl , natural-transformation, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, transformers-base + , tasty-quickcheck, template-haskell, transformers-base }: mkDerivation { pname = "freer-simple"; - version = "1.1.0.0"; - sha256 = "00dvn620xg24pxw1h9p7dgl5wj25q77mfdsmxlmijsr0ysqwv611"; + version = "1.2.1.0"; + sha256 = "199cg3y4wx1kh2mrdzf7qswi0jnx9nbgj0a6z75y7ql639lqya5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base natural-transformation transformers-base + base natural-transformation template-haskell transformers-base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -77835,6 +80486,79 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel , pretty, random, syb @@ -77949,6 +80673,7 @@ self: { ]; description = "Fresco binding for Haskell"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fresh" = callPackage @@ -77983,6 +80708,7 @@ self: { ]; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-devil" = callPackage @@ -78016,6 +80742,7 @@ self: { ]; description = "Converts between the Friday and JuicyPixels image types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-scale-dct" = callPackage @@ -78047,6 +80774,7 @@ self: { ]; description = "Attempt to pretty-print any input"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friendly-time" = callPackage @@ -78139,6 +80867,7 @@ self: { libraryHaskellDepends = [ base containers mtl ]; description = "Arduino programming without the hassle of C"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frpnow" = callPackage @@ -78380,8 +81109,8 @@ self: { }: mkDerivation { pname = "fswatch"; - version = "0.1.0.5"; - sha256 = "0f1rvvkfqm3q12dvagmsdpvw0c9r5a9gj6g34rrsyjdbpc818prw"; + version = "0.1.0.6"; + sha256 = "1972pw7p9njl6h225v8yam5riyiyzkvzhbkv987wl1l3ayga9mdf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78400,8 +81129,8 @@ self: { }: mkDerivation { pname = "fswatcher"; - version = "0.2.1"; - sha256 = "12m7975hj98aady01hkkc99v53sqi23dizkrq38pgdkbpdl6qsmz"; + version = "0.2.2"; + sha256 = "0rdvh9310qbnp6vh3janr60nla33kyfy23yfzbzsca8ridr7ab7w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78410,7 +81139,6 @@ self: { ]; description = "Watch a file/directory and run a command when it's modified"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ftdi" = callPackage @@ -78437,8 +81165,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 @@ -78450,21 +81178,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 @@ -78570,6 +81296,7 @@ self: { ]; description = "In-memory full text search engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fullstop" = callPackage @@ -78684,6 +81411,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 { @@ -78706,8 +81454,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 ]; @@ -78723,8 +81473,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 = [ @@ -78741,18 +81491,28 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "function-builder" = callPackage + ({ mkDerivation, base, tagged }: + mkDerivation { + pname = "function-builder"; + version = "0.1.1.0"; + sha256 = "1qj78l8j6f9wnvapmkijhgby45g23r0w2wwwwlnkbnrvy869fr4p"; + libraryHaskellDepends = [ base tagged ]; + description = "Create poly variadic functions for monoidal results"; + license = stdenv.lib.licenses.bsd3; }) {}; "function-combine" = callPackage @@ -78835,8 +81595,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 ]; @@ -78858,7 +81618,6 @@ self: { ]; description = "Functor combinators with tries & zippers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "functor-friends" = callPackage @@ -78878,10 +81637,11 @@ self: { pname = "functor-infix"; version = "0.0.5"; sha256 = "0rifm1p5zq2711vak2lyxzz2xs03saym3m3695wpf3zy38safbpn"; + revision = "1"; + editedCabalFile = "0nvk9hff0vd3s7q67pb4my5vfz1y954y0l8vlbbmdx9i20r1m8nf"; libraryHaskellDepends = [ base template-haskell ]; description = "Infix operators for mapping over compositions of functors. Lots of them."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "functor-monadic" = callPackage @@ -78899,8 +81659,8 @@ self: { ({ mkDerivation, base, ghc-prim, lens }: mkDerivation { pname = "functor-utils"; - version = "1.17.1"; - sha256 = "1ixssxdhw94l1kjxd5k4gvq8wz4b9d0vww5mg2al9q3vzb7d4pld"; + version = "1.17.2"; + sha256 = "1sf4d3af4kf341g7slpylm2113cy0597fngr5ldlds8znylspmms"; libraryHaskellDepends = [ base ghc-prim lens ]; description = "Collection of functor utilities, providing handy operators, like generalization of (.)."; license = stdenv.lib.licenses.asl20; @@ -78941,8 +81701,8 @@ self: { }: mkDerivation { pname = "funflow"; - version = "1.3.2"; - sha256 = "01r1l1r8qg6w7wfcbs7qwxy22b7rd1cdixds425ynp9h0246lrmf"; + version = "1.4.0"; + sha256 = "1pd690y41bf6lrk6bzl730hvpaaazya927nslwp8ii5rcn6wjx7f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78968,6 +81728,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 @@ -79035,6 +81817,32 @@ 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; + }) {}; + + "fused-effects-lens" = callPackage + ({ mkDerivation, base, fused-effects, hspec, lens }: + mkDerivation { + pname = "fused-effects-lens"; + version = "0.1.0.0"; + sha256 = "010gavgbv5zvszvn6gizz7sx405fclfh6ik58a2sd0kf8mvsgzs8"; + libraryHaskellDepends = [ base fused-effects lens ]; + testHaskellDepends = [ base fused-effects hspec lens ]; + description = "Monadic lens combinators for fused-effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fusion" = callPackage ({ mkDerivation, base, directory, doctest, filepath, pipes-safe , transformers, void @@ -79050,6 +81858,63 @@ 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.8.1"; + sha256 = "18qha0bai5zf4shcz2a6lixkhx6mk395njm81ds2zcp1iilwgih2"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "futun" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -79126,7 +81991,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Filters a list based on a fuzzy string search"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzy-dates" = callPackage @@ -79168,8 +82032,8 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.1.0.6"; - sha256 = "18v1zsmdgy5if7l23vciip6dbbhbpgvn0dy0ray0pqwdcw9yh6kk"; + version = "0.1.0.8"; + sha256 = "096izffsa3fgdi8qiz7n6l2fl2rbiq6kv5h1xljmq0nkaig5m5wv"; libraryHaskellDepends = [ base base-unicode-symbols data-default lens text text-metrics unordered-containers vector @@ -79286,19 +82150,20 @@ self: { }) {}; "g4ip-prover" = callPackage - ({ mkDerivation, array, base, directory, system-filepath }: + ({ mkDerivation, array, base, directory, filepath, happy }: mkDerivation { pname = "g4ip-prover"; - version = "0.1.0.1"; - sha256 = "1r1i8i5vwy02zaccqjlv6w5qlpbp61lc4im9sz2wlkc8yx2yj8bg"; - isLibrary = false; + version = "2.0.0.0"; + sha256 = "1g79hip95n3nmjhyfvryk7z0fnb46xqy8lg0hq1xanqlsmyx7w4c"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - array base directory system-filepath - ]; + libraryHaskellDepends = [ array base directory filepath ]; + libraryToolDepends = [ happy ]; + executableHaskellDepends = [ array base directory filepath ]; + executableToolDepends = [ happy ]; + testHaskellDepends = [ base ]; description = "Theorem prover for intuitionistic propositional logic using G4ip"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gact" = callPackage @@ -79371,16 +82236,21 @@ self: { }) {}; "gamma" = callPackage - ({ mkDerivation, base, continued-fractions, converge - , template-haskell, vector + ({ mkDerivation, base, continued-fractions, converge, erf, numbers + , QuickCheck, template-haskell, test-framework + , test-framework-quickcheck2, vector }: mkDerivation { pname = "gamma"; - version = "0.9.0.2"; - sha256 = "09z4m0qsf1aa2al7x3gl7z3xy6r4m0xqhnz8b917dxa104zw6flq"; + version = "0.10.0.0"; + sha256 = "17pdnff340hgmq0dyxf5jrnkrhrgzp96pisc2fppvjbhdw8ndm65"; libraryHaskellDepends = [ base continued-fractions converge template-haskell vector ]; + testHaskellDepends = [ + base erf numbers QuickCheck test-framework + test-framework-quickcheck2 + ]; description = "Gamma function and related functions"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -79411,6 +82281,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 @@ -79480,18 +82361,18 @@ self: { libraryHaskellDepends = [ base free transformers ]; description = "Limit how many steps a program may take"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gasp" = callPackage ({ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gauge" = callPackage @@ -79500,8 +82381,8 @@ self: { }: mkDerivation { pname = "gauge"; - version = "0.2.3"; - sha256 = "0slsimv2zn9yhakxy2wdyfj6bgjd1p65wp6nr8j0ba7df64xykjs"; + version = "0.2.4"; + sha256 = "1p8accsrv0njiqgybz2plwiglg90nazibggc270j7gmqxqna0zr9"; libraryHaskellDepends = [ base basement deepseq directory process vector ]; @@ -79604,6 +82485,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) GConf;}; "gd" = callPackage @@ -79742,14 +82624,13 @@ 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 ]; description = "zooming rotating fractal gears graphics demo"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gedcom" = callPackage @@ -80144,6 +83025,7 @@ self: { ]; description = "Derivation of Aeson instances using GHC generics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-arbitrary" = callPackage @@ -80186,19 +83068,54 @@ 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; }) {}; + "generic-data_0_5_0_0" = callPackage + ({ mkDerivation, base, base-orphans, contravariant, generic-lens + , one-liner, show-combinators, tasty, tasty-hunit + }: + mkDerivation { + pname = "generic-data"; + version = "0.5.0.0"; + sha256 = "1hy43a1f5y1ymszilz908sl7an7hj7sz7yzchhxh83ki2sf0ya7s"; + libraryHaskellDepends = [ + base base-orphans contravariant show-combinators + ]; + testHaskellDepends = [ + base generic-lens one-liner 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.2.0.0"; + sha256 = "02pnxdhmc5m7i9m269s1pggn6gsqj73flv6d86zfkpnqwwsvd5qs"; + 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; + }) {}; + "generic-deepseq" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -80264,8 +83181,8 @@ self: { }: mkDerivation { pname = "generic-lens"; - version = "1.0.0.2"; - sha256 = "0s21jfw0ndkkmx7di3q0b7xj7hws6yxxcsflal617c44iqc8lvsy"; + version = "1.1.0.0"; + sha256 = "1frng5vgk4pkaw8wqqj6ch9p5fk88rbw1mmxzs0cp13wpxnr9wpc"; libraryHaskellDepends = [ base profunctors tagged ]; testHaskellDepends = [ base doctest HUnit inspection-testing lens profunctors @@ -80324,6 +83241,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 @@ -80349,6 +83277,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"; @@ -80408,8 +83338,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; @@ -80446,6 +83376,7 @@ self: { ]; description = "Generic generation of HXT XmlPickler instances using GHC Generics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generics-eot" = callPackage @@ -80470,26 +83401,28 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generics-sop" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: + ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core + , template-haskell + }: mkDerivation { pname = "generics-sop"; - version = "0.3.2.0"; - sha256 = "168v62i845jh9jbfaz3ldz8svz4wmzq9mf2vhb7pxlnbkk8fqq1h"; - revision = "2"; - editedCabalFile = "0hc00hjgxm7vzq146d9kwapgqnjbhdi0c7icyvrpc2fhc4cnwlwf"; - libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; + 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; }) {}; @@ -80500,8 +83433,8 @@ self: { 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; @@ -80684,6 +83617,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; @@ -80737,13 +83672,13 @@ self: { }) {}; "genvalidity" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, validity }: + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.5.1.0"; - sha256 = "17ykq38j9a2lzir6dqz5jgy6ndaafrpkhqhcg96c5ppg7wcxaaj0"; + version = "0.7.0.0"; + sha256 = "1bjsqqyr1n306icfdl8sh3amqq95zpr5hawwbv46nbf0rxci88w1"; libraryHaskellDepends = [ base QuickCheck validity ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; }) {}; @@ -80768,41 +83703,24 @@ self: { ]; description = "GenValidity support for aeson"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-bytestring" = callPackage - ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec - , hspec, QuickCheck, validity, validity-bytestring - }: - mkDerivation { - pname = "genvalidity-bytestring"; - version = "0.2.0.2"; - sha256 = "1qy19j0cyza2a6z59br4wma68081xqsq9m4ndmv195ym04a0bfa3"; - libraryHaskellDepends = [ - base bytestring genvalidity QuickCheck validity validity-bytestring - ]; - testHaskellDepends = [ - base bytestring genvalidity genvalidity-hspec hspec QuickCheck - ]; - description = "GenValidity support for ByteString"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-bytestring_0_3_0_0" = 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; @@ -80815,16 +83733,17 @@ self: { }: mkDerivation { pname = "genvalidity-containers"; - version = "0.5.0.0"; - sha256 = "1qjqwsmdcwww4fwd3m40cckwq3xgmm37kc6s25z75w768grr51br"; + version = "0.5.1.1"; + sha256 = "1z7bmbwi07nylkgm3dysmnv57z1iww2sjy2zv88jpg6nvq9r9ffg"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; testHaskellDepends = [ - base containers genvalidity genvalidity-hspec hspec + 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 @@ -80833,70 +83752,82 @@ self: { }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.6.1.1"; - sha256 = "0jqdsslag6zz499z5ilra3dklsdvil92kzdx6gb591xvc30a74vs"; + version = "0.6.2.2"; + sha256 = "1npy88slf7immafk1vgl6w9gp526xdlvhr96qnrc8phf7b7bfkrf"; libraryHaskellDepends = [ base genvalidity genvalidity-property hspec hspec-core QuickCheck transformers validity ]; testHaskellDepends = [ - base doctest genvalidity hspec hspec-core QuickCheck + 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 - , genvalidity-text, hspec, QuickCheck, text + , genvalidity-property, genvalidity-text, hspec, QuickCheck, text + , validity }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.3.0.0"; - sha256 = "0bqjfl86gj2201w5yingzizwq8hn63zdhir9wp3p0jiah2zp5rxh"; + 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-text hspec text + 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 + , genvalidity-hspec, genvalidity-property, hspec, QuickCheck + , validity }: mkDerivation { pname = "genvalidity-hspec-binary"; - version = "0.2.0.2"; - sha256 = "1h14b0m5kq3md5rys07rrn5jjcpk0c09fln40v221z2rrssnh211"; + version = "0.2.0.3"; + sha256 = "1am9brcf3wh2fdrfwlkcqiamwc2zlcw3lihpcqgz0sm3jhka56xr"; libraryHaskellDepends = [ base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; - testHaskellDepends = [ base doctest genvalidity hspec ]; + 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 + , genvalidity-hspec, genvalidity-property, hspec, QuickCheck + , validity }: mkDerivation { pname = "genvalidity-hspec-cereal"; - version = "0.2.0.2"; - sha256 = "16r4g9k9rjifvbmy5nwkan6lnwhjvp85nlfihr1in5lwxf3gcl71"; + version = "0.2.0.3"; + sha256 = "11bii2nf52jfarfb5jzgj6pmsz59mcvivb8nxc90z97gdd5w6zll"; libraryHaskellDepends = [ base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; - testHaskellDepends = [ base doctest genvalidity hspec ]; + 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 @@ -80906,36 +83837,39 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-hashable"; - version = "0.2.0.2"; - sha256 = "0s4z5k4myx4c6sky11l7s2lsvkxgyri11ikq75nfinff8b44h7iw"; + version = "0.2.0.3"; + sha256 = "0lb1aiv07fbbkyhh8ig2lhqgm9yibrny2bw9qwbdkwwsi6hk4566"; libraryHaskellDepends = [ base genvalidity genvalidity-hspec genvalidity-property hashable hspec QuickCheck validity ]; testHaskellDepends = [ - base doctest genvalidity genvalidity-hspec hashable hspec - hspec-core QuickCheck + 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 @@ -80979,6 +83913,7 @@ self: { ]; description = "GenValidity support for Path"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-property" = callPackage @@ -80987,8 +83922,8 @@ self: { }: mkDerivation { pname = "genvalidity-property"; - version = "0.2.1.0"; - sha256 = "0xwq2wnrxlxcllina9faxxs8svslpxr73z9cw8asgc4b3hf41drm"; + version = "0.3.0.0"; + sha256 = "03cpmkqmfqypj9kydrdzs0pyix0ffwrlx8idzvgyrqiyhg03rsis"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -81003,8 +83938,8 @@ self: { }: mkDerivation { pname = "genvalidity-scientific"; - version = "0.2.0.1"; - sha256 = "1wxrcpmhcbiklzqf5zjn0q7hpgkds5jjmdhl9kq68vbm96lm8zgn"; + version = "0.2.1.0"; + sha256 = "0gchsn5pvmbk57y7jn33zcbdr78mx3vb8v4cwr8b4pj5af6d84dg"; libraryHaskellDepends = [ base genvalidity QuickCheck scientific validity validity-scientific ]; @@ -81013,6 +83948,7 @@ self: { ]; description = "GenValidity support for Scientific"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-text" = callPackage @@ -81031,6 +83967,7 @@ self: { ]; description = "GenValidity support for Text"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-time" = callPackage @@ -81039,14 +83976,15 @@ 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 ]; testHaskellDepends = [ base genvalidity-hspec hspec time ]; description = "GenValidity support for time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-unordered-containers" = callPackage @@ -81056,17 +83994,19 @@ self: { }: mkDerivation { pname = "genvalidity-unordered-containers"; - version = "0.2.0.3"; - sha256 = "0r89pisv6a7m0vf6dif7lx7w7gc4jsx33d4hzskwz3x6si07xadd"; + 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 @@ -81085,6 +84025,7 @@ self: { ]; description = "GenValidity support for UUID"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-vector" = callPackage @@ -81093,8 +84034,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 ]; @@ -81103,6 +84044,7 @@ self: { ]; description = "GenValidity support for vector"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geo-resolver" = callPackage @@ -81196,25 +84138,27 @@ self: { libraryHaskellDepends = [ base dimensional lens semigroups ]; description = "Types for geodetic operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geodetics" = callPackage ({ mkDerivation, array, base, checkers, dimensional, HUnit - , QuickCheck, test-framework, test-framework-hunit + , QuickCheck, semigroups, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { pname = "geodetics"; - version = "0.0.6"; - sha256 = "0hp5p6m6szj1h5hzmrs3pyj4cfvcvkgdc95s5xa0lcxc3z8bn7g2"; + version = "0.1.0"; + sha256 = "1yq5d5k4p1vzql37q9a5c37riz87mh94rk0xv67xiaa4f8vpchqm"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ array base dimensional ]; + libraryHaskellDepends = [ array base dimensional semigroups ]; testHaskellDepends = [ array base checkers dimensional HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Terrestrial coordinate systems and geodetic calculations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geohash" = callPackage @@ -81234,8 +84178,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 @@ -81245,25 +84189,24 @@ self: { }) {}; "geojson" = callPackage - ({ mkDerivation, aeson, base, bytestring, hlint, lens, scientific - , semigroups, tasty, tasty-hspec, tasty-quickcheck, 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.3"; - sha256 = "17ra6kb2bgz9ydhqhgp00wmpd3dqxqgc89wifnn3qqk0rqwsqilz"; + version = "3.0.4"; + sha256 = "0dnk9cb7y8wgnx8wzzln635r9pijljd9h5rinl0s9g4bjhw0rcw5"; libraryHaskellDepends = [ - aeson base lens scientific semigroups text transformers validation - vector + aeson base containers deepseq lens scientific semigroups text + transformers validation ]; testHaskellDepends = [ - aeson base bytestring hlint tasty tasty-hspec tasty-quickcheck text - validation + 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geojson-types" = callPackage @@ -81316,8 +84259,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.1.1.2"; - sha256 = "1kggbm3hdg1x0ci3lfps1nglr5hk56ws96yfrv257zaz8kq64s1d"; + version = "0.2.1"; + sha256 = "15dhxhqswi9h8zas0x27hma7pz4c7rn40pppjraax29pi4alaiq9"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -81366,8 +84309,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 ]; @@ -81393,28 +84336,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 @@ -81454,6 +84396,7 @@ self: { ]; description = "Github Standard Labeler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gh-pocket-knife" = callPackage @@ -81475,20 +84418,20 @@ 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"; @@ -81496,14 +84439,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "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 ]; @@ -81512,12 +84455,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; @@ -81541,8 +84484,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; @@ -81594,6 +84537,7 @@ self: { testHaskellDepends = [ base ghc ghc-paths ]; description = "A small-step semantics for Core"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-datasize" = callPackage @@ -81690,8 +84634,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.8.0"; - sha256 = "1wdxap20wh8sdaqnpsk463mihg6v3va786zb1amgzrcjpsv49is5"; + version = "0.8.0.1"; + sha256 = "1658lr4av48y8m0p5fs3sjxkkbdkwdf6m02byzw69gqg3xzz1i99"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81704,22 +84648,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; @@ -81757,8 +84702,8 @@ self: { }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.6.1"; - sha256 = "141k6qiys0m0r4br7ikp4i546vs3xcil9cwglzcdfcbnb5nj1z87"; + version = "0.5.8.2"; + sha256 = "18wlhvgpbk7ym1vbi8fkdwbjhcplgr7zcqm328yi4v7rilbxw7cn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81773,30 +84718,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-exactprint_0_5_7_1" = 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"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base bytestring containers Diff directory filemanip filepath ghc - ghc-boot ghc-paths HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -81841,6 +84762,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 @@ -81904,13 +84837,12 @@ 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"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-make" = callPackage @@ -82050,6 +84982,7 @@ self: { ]; description = "A parallel wrapper for 'ghc --make'"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-parser" = callPackage @@ -82062,6 +84995,7 @@ self: { libraryToolDepends = [ cpphs happy ]; description = "Haskell source parser from GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-paths" = callPackage @@ -82070,8 +85004,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"; @@ -82111,12 +85045,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; @@ -82129,8 +85063,8 @@ self: { }: mkDerivation { pname = "ghc-prof"; - version = "1.4.1.3"; - sha256 = "16ckk4ldpkq7khka5mhkngrcazrnfxw394rm7mcshhlr7f41ydlr"; + version = "1.4.1.5"; + sha256 = "0cpyzfyfkq6c17xpccgibjpq8j0l4w33mbpivim3kha7k76ilbg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82257,7 +85191,7 @@ self: { libraryHaskellDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-syb" = callPackage @@ -82288,8 +85222,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 ]; @@ -82304,6 +85238,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; @@ -82350,6 +85286,7 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Faster replacements for traceEvent and traceMarker"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-extra" = callPackage @@ -82359,8 +85296,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.2.6"; - sha256 = "0dx6rk6lpklqqklj74mg92vjn66kkjfxp87hwazzlx9wai23r3cm"; + version = "0.3"; + sha256 = "1khkchxic6i3sg3g3dzdg8dsdgk86xy5j5lnh5n5hr7fpdm9ppj7"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp transformers @@ -82380,8 +85317,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.5.1"; - sha256 = "0yvdb3y82wrm41p9sbbsmfq91cp9kzx7mmqr20wgxrqamhnw952v"; + version = "0.6"; + sha256 = "0dzjqzfh1mywx2dzki6yhrac5l2y2h58zjwmgps3vk16n8krnljb"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ghc-typelits-natnormalise template-haskell transformers @@ -82426,6 +85363,7 @@ self: { ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-usage" = callPackage @@ -82462,18 +85400,18 @@ 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; @@ -82511,6 +85449,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 { @@ -82570,32 +85520,6 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.7"; - sha256 = "1dcx12vkjw5w1np4bz8ypaf8bdw1s8yrlhq6i5x2pilvsf1dljqg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs directory extra filepath process time - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_7_1" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time, unix @@ -82619,7 +85543,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -82650,6 +85573,7 @@ self: { ]; description = "Allow GHCJS projects to compile under GHC and develop using intero"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-codemirror" = callPackage @@ -82779,12 +85703,11 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-promise" = callPackage @@ -82968,6 +85891,53 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo-again" = callPackage + ({ mkDerivation, base, cairo-core, haskell-gi-base + , template-haskell + }: + mkDerivation { + pname = "gi-cairo-again"; + version = "1.16.0"; + sha256 = "1xxrcx9dsscymz2v53splzrr39gajw2bcr3ksblak46bamb67bmg"; + libraryHaskellDepends = [ + base cairo-core haskell-gi-base template-haskell + ]; + description = "Bridge between packages gi-* and cairo-core"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gi-cairo-connector" = callPackage + ({ mkDerivation, base, gi-cairo, gi-cairo-render, haskell-gi-base + , mtl + }: + mkDerivation { + pname = "gi-cairo-connector"; + version = "0.0.1"; + sha256 = "0lhaki2qjk8f6bn78sag4g38g549sjzbjbah27j2i46xj7j08png"; + libraryHaskellDepends = [ + base gi-cairo gi-cairo-render haskell-gi-base mtl + ]; + description = "GI friendly Binding to the Cairo library"; + license = stdenv.lib.licenses.lgpl21; + }) {}; + + "gi-cairo-render" = callPackage + ({ mkDerivation, array, base, bytestring, c2hs, cairo + , haskell-gi-base, mtl, text, utf8-string + }: + mkDerivation { + pname = "gi-cairo-render"; + version = "0.0.1"; + sha256 = "0arbynn7ilrc3shddff1rxcvlg6k3m617lrq4fdsqfas3amxarm4"; + libraryHaskellDepends = [ + array base bytestring haskell-gi-base mtl text utf8-string + ]; + libraryPkgconfigDepends = [ cairo ]; + libraryToolDepends = [ c2hs ]; + description = "GI friendly Binding to the Cairo library"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) cairo;}; + "gi-dbusmenu" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -83027,7 +85997,6 @@ self: { haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gtk3 ]; - doHaddock = false; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; }) {gtk3 = pkgs.gnome3.gtk;}; @@ -83039,8 +86008,8 @@ self: { }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.16"; - sha256 = "0vqnskshbfp9nsgyfg4pifrh007rb7k176ci8niik96kxh95zfzx"; + version = "2.0.18"; + sha256 = "1b9ypv07siyr9gry471skc3qlaiwqf055ywz8nib5x39vs6rfcpj"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -83053,18 +86022,19 @@ self: { }) {inherit (pkgs) gdk_pixbuf;}; "gi-gdkx11" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk - , gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkx11"; - version = "3.0.2"; - sha256 = "0s3iry866p6v2hm4d841fcimrhjsk9miskkqf9js8as7mwlk7jac"; + version = "3.0.4"; + sha256 = "0pm1jnmal4vy53icndzzs76vcvxzn3lm31dfwg6nb6fnch5p4036"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib - haskell-gi haskell-gi-base haskell-gi-overloading text transformers + base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject + gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text + transformers ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; @@ -83107,14 +86077,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 { @@ -83126,11 +86095,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 @@ -83147,7 +86116,6 @@ self: { haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ glib ]; - doHaddock = false; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; @@ -83304,8 +86272,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.24"; - sha256 = "14cyj1acxs39avciyzqqb1qa5dr4my8rv3mfwv1kv92wa9a5i97v"; + version = "3.0.27"; + sha256 = "1i8xrq56lp8ha87zykr3hgp13yp8amsxal320mknr2s29x6iw1kr"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -83313,23 +86281,25 @@ 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, gi-gobject, gi-gtk, haskell-gi - , haskell-gi-base, haskell-gi-overloading, mtl, text - , unordered-containers + ({ 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.1.0"; - sha256 = "1yqvqbhlgbpq5s77fvqi8f644i059gg64xdkgwr4ka6zdz4fhiaf"; + version = "0.4.1"; + sha256 = "1hgrmmf2jk9mcrhq7ak95j9wc15lgv1jis8immvsjvhfqdayc212"; libraryHaskellDepends = [ - base gi-gobject gi-gtk haskell-gi haskell-gi-base - haskell-gi-overloading mtl text unordered-containers + base gi-glib 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 vector ]; description = "Declarative GTK+ programming in Haskell"; license = stdenv.lib.licenses.mpl20; @@ -83342,14 +86312,14 @@ self: { }: mkDerivation { pname = "gi-gtk-declarative-app-simple"; - version = "0.1.0"; - sha256 = "157xhfixlf545qzk9v4sav6817fdznxk0kwiin59xn9d3ldp71ak"; + version = "0.4.0"; + sha256 = "0pa6mjv386cvgvm8zywx3wdm5jwx0sm2rgxmybp9sxvyarbp6wqi"; libraryHaskellDepends = [ async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative haskell-gi haskell-gi-base haskell-gi-overloading pipes pipes-concurrency text ]; - description = "Declarative GTK+ programming in Haskell in the style of [Pux](https://github.com/alexmingoia/purescript-pux)."; + description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = stdenv.lib.licenses.mpl20; }) {}; @@ -83360,8 +86330,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 @@ -83414,18 +86384,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; @@ -83491,7 +86461,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)" @@ -83603,7 +86572,6 @@ self: { text transformers ]; libraryPkgconfigDepends = [ vte_291 ]; - doHaddock = false; description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; }) {vte_291 = pkgs.gnome3.vte;}; @@ -83753,25 +86721,26 @@ 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 + , regex-tdfa, 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.4.0"; + sha256 = "0mk0jmw0qvbv73n7g8n14shnyxjkkq6wp3vnk1gx1dnmbk20vdm7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring data-default filepath http-types - mtl parsec safe scientific text time transformers + mtl parsec regex-tdfa safe scientific text time transformers 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 @@ -83780,7 +86749,27 @@ self: { ]; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; - 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 @@ -83813,8 +86802,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.5.0"; - sha256 = "0p1mwzbrzb74wxlykasza4qvvlck2b0wgnhvfa0j3h27x4ii8xjw"; + version = "0.13.6.0"; + sha256 = "1ck92sy9j3jrwi2w6a0nslz92aczznsz96rdqq8v78rqqislpirm"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -83823,6 +86812,7 @@ self: { libraryPkgconfigDepends = [ system-glib ]; description = "Binding to GIO"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {system-glib = pkgs.glib;}; "gipeda" = callPackage @@ -83893,20 +86883,20 @@ self: { }) {}; "git" = callPackage - ({ mkDerivation, base, basement, byteable, bytedump, bytestring - , containers, cryptonite, hourglass, memory, patience, random - , system-fileio, system-filepath, tasty, tasty-quickcheck - , unix-compat, utf8-string, vector, zlib, zlib-bindings + ({ mkDerivation, base, basement, bytedump, bytestring, containers + , cryptonite, hourglass, memory, random, system-fileio + , system-filepath, tasty, tasty-quickcheck, unix-compat + , utf8-string, vector, zlib, zlib-bindings }: mkDerivation { pname = "git"; - version = "0.2.2"; - sha256 = "18sn3rvmrqw8xy7xaqpv82inqj981z79sm6h1aw4jvvzsf6llzwa"; + version = "0.3.0"; + sha256 = "0kd35qnxv2vnfaaq13dbf734jq11p05v6sdbxf91pag49817b6bz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base basement byteable bytestring containers cryptonite hourglass - memory patience random system-fileio system-filepath unix-compat - utf8-string vector zlib zlib-bindings + base basement bytestring containers cryptonite hourglass memory + random system-fileio system-filepath unix-compat utf8-string vector + zlib zlib-bindings ]; testHaskellDepends = [ base bytedump bytestring hourglass tasty tasty-quickcheck @@ -83936,31 +86926,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.20190129"; + sha256 = "0gsi1ymv7dmx429vhv58979hfh23zrfvrsam6saf16ckh5hd0n81"; 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; @@ -83969,19 +86961,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 @@ -84188,6 +87182,8 @@ self: { pname = "git-monitor"; version = "3.1.1.5"; sha256 = "0jqmcldnl1hd0za33jw4490qgx9ngqbh7pyy47y1pb9j1hvci9jj"; + revision = "1"; + editedCabalFile = "18s9vigsi5z5j2m5q956nj4h84bwgfh8v010dz4jahhrlkavg1ra"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -84292,6 +87288,7 @@ self: { testToolDepends = [ git ]; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitHUD" = callPackage @@ -84356,8 +87353,8 @@ self: { }: mkDerivation { pname = "githash"; - version = "0.1.0.1"; - sha256 = "03zc7vjlnrr7ix7cnpgi70s0znsi07ms60dci8baxbcmjbibdcgy"; + version = "0.1.3.1"; + sha256 = "0vpwzbhnr0xwc7vkg3l5qy4awgsr1fkxj58lz6m56jayaad6hn7a"; libraryHaskellDepends = [ base bytestring directory filepath process template-haskell ]; @@ -84367,40 +87364,37 @@ self: { ]; description = "Compile git revision info into Haskell projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github" = callPackage - ({ mkDerivation, aeson, aeson-compat, 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, 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.19"; - sha256 = "1523p2rv4jwsbsqjc9g3qff4cy5dhdy5wzp382x5nr11rmbrpsph"; - revision = "3"; - editedCabalFile = "0s3zmkzgfbh1mc0492i7rjiawxkzg0im8z2p10niv5ff58m87yri"; + version = "0.20"; + sha256 = "0gyinmrdwbqd6h5bvlv5jkv2rfp48p11088w5ayms8h361ck3kdp"; libraryHaskellDepends = [ - aeson aeson-compat 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 + 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-compat base base-compat bytestring file-embed hspec + 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 @@ -84428,6 +87422,7 @@ self: { executableToolDepends = [ git ]; description = "backs up everything github knows about a repository, to the repository"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) git;}; "github-data" = callPackage @@ -84477,8 +87472,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.2.2"; - sha256 = "0mnkj8p90inaw6cic60hx05yq2lf2aahmv313qi59di5jqkyg106"; + version = "1.2.4"; + sha256 = "1s4vmqrzq7w35kfij9pyxm9b672khhx03whi4adz6l51xij6a3yb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84510,6 +87505,7 @@ self: { ]; description = "Various Github helper utilities"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-types" = callPackage @@ -84528,6 +87524,7 @@ self: { ]; description = "Type definitions for objects used by the GitHub v3 API"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-utils" = callPackage @@ -84587,8 +87584,8 @@ self: { }: mkDerivation { pname = "github-webhooks"; - version = "0.10.0"; - sha256 = "1pvif863yi6qxwjd43insjvrzizaz78b3kf8l13rmy3irjlqljh8"; + version = "0.10.1"; + sha256 = "1hjl5ygvxhh70l951zc4n4qmdf3vf2x983jyimsinyv03bl11i6x"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite deepseq deepseq-generics memory text time vector @@ -84615,7 +87612,6 @@ self: { ]; description = "More efficient replacement to the great git-radar"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitignore" = callPackage @@ -84640,32 +87636,33 @@ 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-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.2"; + sha256 = "0chsmyqb7cvnvkdj3dg5m6hdg28c987rl7rv3wjb78h6pqhql44l"; 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-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"; @@ -84764,8 +87761,8 @@ self: { }: mkDerivation { pname = "gitlib-libgit2"; - version = "3.1.2"; - sha256 = "1nj9f2qmjxb5k9b23wfyz290pgb01hnzrswbamwb7am9bnkk250b"; + version = "3.1.2.1"; + sha256 = "0gm2d8x7brcf3x3d6jy3anig158cj3961gicw1wq7xg0wz90l3mr"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators containers directory exceptions fast-logger filepath gitlib hlibgit2 mmorph monad-loops @@ -84978,8 +87975,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 ]; @@ -85009,28 +88006,8 @@ self: { }: mkDerivation { pname = "glabrous"; - version = "0.3.6"; - sha256 = "1ba1smngfq6xqwcbfg10sy2qjxh7miyd8qbfmmv14klzwimk44ri"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring cereal cereal-text - either text unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - description = "A template DSL library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glabrous_0_4_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.1"; + sha256 = "11s7fhlv3aq80h20jf2l447bmxy95dy7dqvzqfp0myy4hgsasks3"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -85040,7 +88017,6 @@ self: { ]; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -85191,6 +88167,7 @@ self: { ]; description = "ReactJS binding using Glazier.Command."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glazier-react-examples" = callPackage @@ -85235,6 +88212,7 @@ self: { ]; description = "Generic widget library using glazier-react"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gli" = callPackage @@ -85268,8 +88246,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.6.0"; - sha256 = "1sz8mvac39sxj7skw8zasbp6srm4k92223l29lll1125d8n0cwaf"; + version = "0.13.7.0"; + sha256 = "06hdn8mprq6xclp8xfr1iqx82i0nhims3dhjblqn26ig5fdidjbw"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -85277,6 +88255,7 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Binding to the GLIB library for Gtk2Hs"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "glicko" = callPackage @@ -85327,16 +88306,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"; - revision = "1"; - editedCabalFile = "142909apkky5z443qifchd2cm1dakw2zpbcfyxpvpi7crzhq0h1d"; + version = "2.29"; + sha256 = "04i6dzb6fgvx1vxpn8syzc9pa4mq2m62mrgq4iraqwgkzl54ahgx"; + revision = "2"; + editedCabalFile = "0s37m39c3vnwskvbsiziysm9ck7l30bfkp2jg0l49dhi8v01q6cs"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -85344,14 +88323,13 @@ 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 ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gll" = callPackage @@ -85368,7 +88346,6 @@ self: { ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glob-posix" = callPackage @@ -85493,21 +88470,6 @@ self: { }) {}; "gloss" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim - , gloss-rendering, GLUT, OpenGL - }: - mkDerivation { - pname = "gloss"; - version = "1.12.0.0"; - sha256 = "0jxcvvmxvmb7n0wp4lwhvl4axkbhwwv4i6pi4xng357hfanxh1k9"; - libraryHaskellDepends = [ - base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL - ]; - description = "Painless 2D vector graphics, animations and simulations"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss_1_13_0_1" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim , gloss-rendering, GLUT, OpenGL }: @@ -85515,12 +88477,13 @@ 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 ]; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-accelerate" = callPackage @@ -85532,6 +88495,7 @@ self: { libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-algorithms" = callPackage @@ -85540,6 +88504,8 @@ 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; @@ -85578,8 +88544,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 = [ @@ -85591,22 +88557,23 @@ self: { }) {}; "gloss-export" = callPackage - ({ mkDerivation, base, GLFW-b, gloss, gloss-rendering, GLUT - , JuicyPixels, OpenGLRaw, vector + ({ mkDerivation, base, directory, filepath, GLFW-b, gloss + , gloss-rendering, GLUT, JuicyPixels, OpenGLRaw, vector }: mkDerivation { pname = "gloss-export"; - version = "0.1.0.0"; - sha256 = "0m5k8zr90wqh6sjgn5c3mrpffwkq8g42qji8ss77l97a2hcv50dq"; + 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 ]; + 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 @@ -85618,6 +88585,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 @@ -85647,29 +88615,13 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.12.0.0"; - sha256 = "14a1qcajm4fp4hr4y55mw1jl5id747d455yn1818y5kz75m4k7y8"; - libraryHaskellDepends = [ - base containers ghc-prim gloss gloss-rendering repa - ]; - description = "Parallel rendering of raster images"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-raster_1_13_0_1" = 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 ]; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-raster-accelerate" = callPackage @@ -85691,30 +88643,18 @@ self: { }) {}; "gloss-rendering" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: - mkDerivation { - pname = "gloss-rendering"; - version = "1.12.0.0"; - sha256 = "1g64wlyk13lssf8p71xhpjaqygzdkn5fq6k2bmqwixmq56bhpnb0"; - libraryHaskellDepends = [ - base bmp bytestring containers GLUT OpenGL - ]; - description = "Gloss picture data types and rendering functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-rendering_1_13_0_2" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; version = "1.13.0.2"; sha256 = "0ivzijqkxn0r4iqk0rmq0bzdzzgv9a8fgwy3gwnfibmvhhm9jfq0"; + revision = "1"; + editedCabalFile = "0r57zc8ryxgjb4ydcdlmq19hl3nj6gjm3z85wrmdkn0wrx16mqih"; libraryHaskellDepends = [ base bmp bytestring containers GLUT OpenGL ]; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-sodium" = callPackage @@ -85775,13 +88715,14 @@ self: { "glue-common" = callPackage ({ mkDerivation, async, base, ekg-core, hashable, hspec - , lifted-base, monad-control, QuickCheck, quickcheck-instances - , text, time, transformers, transformers-base, unordered-containers + , hspec-discover, lifted-base, monad-control, QuickCheck + , quickcheck-instances, text, time, transformers, transformers-base + , unordered-containers }: mkDerivation { pname = "glue-common"; - version = "0.5"; - sha256 = "0wza8cmschfh6kk21wm2bz12ly3in7kf0cv6jma0a78fiphdwg2q"; + version = "0.6.1"; + sha256 = "1s4fm4cf88n4fw7alqb4jigw1pjh242jr7a8d9p52qcgkqn9qnwy"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -85791,6 +88732,7 @@ self: { QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85798,14 +88740,14 @@ self: { "glue-core" = callPackage ({ mkDerivation, async, base, ekg-core, glue-common, hashable - , hspec, lifted-base, monad-control, QuickCheck + , hspec, hspec-discover, lifted-base, monad-control, QuickCheck , quickcheck-instances, text, time, transformers, transformers-base , unordered-containers }: mkDerivation { pname = "glue-core"; - version = "0.5"; - sha256 = "0x89h04j8z58nd1cx6rxn0hgjgb24kdzgl21m2xrlj7h1fp9fwfi"; + version = "0.6.1"; + sha256 = "0fmqir0wcyhgl154rzg93qxdmxzfpi05mckzg7mihkh57fsy4pk0"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -85815,6 +88757,7 @@ self: { monad-control QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85822,14 +88765,14 @@ self: { "glue-ekg" = callPackage ({ mkDerivation, async, base, ekg-core, glue-common, hashable - , hspec, lifted-base, monad-control, QuickCheck + , hspec, hspec-discover, lifted-base, monad-control, QuickCheck , quickcheck-instances, text, time, transformers, transformers-base , unordered-containers }: mkDerivation { pname = "glue-ekg"; - version = "0.5"; - sha256 = "0ckbmjizfclpdyzrc85l9hh79yl82rmbkim5gq543qnppi1pn4h6"; + version = "0.6.1"; + sha256 = "1pigh4s546mv4l2bnwrr6y8473bss0s8ydymr929bz2svrfyhlmz"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -85839,6 +88782,7 @@ self: { monad-control QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85851,8 +88795,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.5"; - sha256 = "10nw8bzxbcghyy9xyb69ka3a3w66fysczhhgrshy462ihpw8p8bw"; + version = "0.6.1"; + sha256 = "1na0rnl0ac666man17xi4f5rg0zrw7f7ky44nfn2cag6398b109i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85876,7 +88820,6 @@ self: { ]; description = "turtle like LOGO with glut"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gmap" = callPackage @@ -85956,7 +88899,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) gnome-keyring; inherit (pkgs) libgnome_keyring;}; @@ -86076,7 +89018,6 @@ self: { libraryHaskellDepends = [ base directory filepath process ]; description = "GHCi bindings to lambdabot"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "goal-core" = callPackage @@ -86181,8 +89122,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 @@ -86199,8 +89140,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; @@ -86236,6 +89177,28 @@ 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; + }) {}; + "gofer-prelude" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -87691,6 +90654,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 @@ -87714,13 +90691,13 @@ self: { }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.4.0.1"; - sha256 = "1icya5sh7psr2m12wdx6a5dq9897lp92gq1skxp6s55sksqvglw8"; + version = "0.5.0.0"; + sha256 = "07myy4q56lnapjxjfiz8skh2h32k5i132mi9sn68aad03a6rx6k1"; libraryHaskellDepends = [ aeson base google-static-maps http-client servant servant-client text ]; - description = "Google Maps Geocoding API bindings"; + description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -87789,8 +90766,8 @@ self: { }: mkDerivation { pname = "google-oauth2-jwt"; - version = "0.3.0"; - sha256 = "1mi7mdkq2d7n3pxlspc5zgval7wb2q7sn261k704nwrbm0phzzbj"; + version = "0.3.1"; + sha256 = "121g7fsdcnv65gp81z450dqqw6ii75pwn3cbilwx5yv4mm571mvi"; libraryHaskellDepends = [ base base64-bytestring bytestring HsOpenSSL RSA text unix-time ]; @@ -87820,8 +90797,8 @@ self: { }: mkDerivation { pname = "google-server-api"; - version = "0.2.0.1"; - sha256 = "0d07flz3vpdyq4ifldp466zhj19ll7zlcnwn0ns47d72r79wghiw"; + version = "0.3.1.0"; + sha256 = "12n3cd4k515z8shi6klxa2s3cbccqk8h38y45h1lqk1j8ydp3r21"; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring HsOpenSSL http-api-data http-client http-client-tls mime-mail monad-control @@ -87841,14 +90818,14 @@ self: { }: mkDerivation { pname = "google-static-maps"; - version = "0.5.0.2"; - sha256 = "05gxk4xnxlshcais8ljzp2wbr93kfi97bjbk2rasj5s2mbvw7rvi"; + version = "0.6.0.0"; + sha256 = "0h2vm6yk076n4xcwlqcl7m786bqrk0vgpcx0h3j04bq2qik88sq5"; libraryHaskellDepends = [ aeson base base64-bytestring bytedump bytestring cryptonite double-conversion http-client JuicyPixels memory network-uri servant servant-client servant-JuicyPixels text utf8-string ]; - description = "Bindings to the Google Static Maps API"; + description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -88370,12 +91347,13 @@ self: { "grammatical-parsers" = callPackage ({ mkDerivation, base, checkers, containers, criterion, deepseq , doctest, monoid-subclasses, parsers, QuickCheck, rank2classes - , tasty, tasty-quickcheck, testing-feat, text, transformers + , size-based, tasty, tasty-quickcheck, testing-feat, text + , transformers }: mkDerivation { pname = "grammatical-parsers"; - version = "0.3.1"; - sha256 = "12lrzzpv48j34y6lwyiq7hg3mahynwj934rsfjmyamy5m5ya0170"; + version = "0.3.2"; + sha256 = "1xmxjds8jpg8q3vmmrypcz3gcjwv9sxyxmpkcrlrjm0wziv175x7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88386,11 +91364,12 @@ self: { ]; testHaskellDepends = [ base checkers containers doctest monoid-subclasses parsers - QuickCheck rank2classes tasty tasty-quickcheck testing-feat + QuickCheck rank2classes size-based tasty tasty-quickcheck + testing-feat ]; benchmarkHaskellDepends = [ - base containers criterion deepseq monoid-subclasses rank2classes - text + base containers criterion deepseq monoid-subclasses parsers + rank2classes text ]; description = "parsers that combine into grammars"; license = stdenv.lib.licenses.bsd3; @@ -88728,6 +91707,7 @@ self: { libraryHaskellDepends = [ array base bytestring containers ]; description = "Serialization of data structures with references"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-utils" = callPackage @@ -88768,8 +91748,8 @@ self: { }: mkDerivation { pname = "graph-wrapper"; - version = "0.2.5.1"; - sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3"; + version = "0.2.6.0"; + sha256 = "19jvr7d1kkyh4qdscljbgqnlpv6rr7fsn3h9dm3bji3dgbsdd7mq"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ array base containers deepseq hspec QuickCheck @@ -88916,6 +91896,24 @@ 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; + }) {}; + "graphql" = callPackage ({ mkDerivation, attoparsec, base, tasty, tasty-hunit, text }: mkDerivation { @@ -88954,6 +91952,18 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "graphs" = callPackage ({ mkDerivation, array, base, containers, transformers , transformers-compat, void @@ -89008,8 +92018,8 @@ self: { }: mkDerivation { pname = "graphviz"; - version = "2999.20.0.2"; - sha256 = "0kj7ap0gnliviq2p8lscw1m06capnsa90vpvcys24nqy5nw2wrp7"; + version = "2999.20.0.3"; + sha256 = "04k26zw61nfv1pkd00iaq89pgsaiym0sf4cbzkmm2k2fj5xa587g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89017,8 +92027,7 @@ self: { polyparse process temporary text wl-pprint-text ]; testHaskellDepends = [ - base containers fgl fgl-arbitrary filepath hspec hspec-discover - QuickCheck text + base containers fgl fgl-arbitrary filepath hspec QuickCheck text ]; testSystemDepends = [ graphviz ]; testToolDepends = [ hspec-discover ]; @@ -89105,15 +92114,14 @@ self: { }: mkDerivation { pname = "gray-extended"; - version = "1.5.2"; - sha256 = "1jn9bx47jdai9yqf9mcfzkv3yfyd4bl0n9hd6njc9m83zycyfsnm"; + version = "1.5.6"; + sha256 = "13a18vri2akfahp8k7s5sg6knn0plcsf6lqdzy05628wymiia2s3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; description = "Gray encoding schemes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graylog" = callPackage @@ -89271,15 +92279,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.3.0"; + sha256 = "0q15cifn34p0biwwrmkhhgzps2k7d0i8mdb2vazbbf7bshqs2ld8"; libraryHaskellDepends = [ - aeson base greskell-core semigroups text transformers + aeson base exceptions greskell-core semigroups text transformers unordered-containers vector ]; testHaskellDepends = [ @@ -89297,29 +92305,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.2.2"; - sha256 = "1h9sx4sdfh2flbvnrmhwy7g5lrzg018w9qrqrrkd4szi499dxc0d"; - libraryHaskellDepends = [ - aeson base containers hashable scientific semigroups text - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec QuickCheck - text unordered-containers vector - ]; - description = "Haskell binding for Gremlin graph query language - core data types and tools"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-core_0_1_2_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , doctest-discover, hashable, hspec, QuickCheck, scientific - , semigroups, text, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "greskell-core"; - version = "0.1.2.3"; - sha256 = "026lipvhc4kjcmf1d604f6m71b3hrrkaafdvymmn1fsxa360dw0s"; + version = "0.1.2.4"; + sha256 = "11agvhvpv94rnylc5ch5cg90w5z1i0ywdw47yca83503lmv3y790"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -89330,7 +92317,6 @@ self: { ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-websocket" = callPackage @@ -89340,8 +92326,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 @@ -89356,21 +92342,19 @@ 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.12"; + sha256 = "1ax536wr6h8kcnmnnxyd7vcdkqbjlrhrx6jab526b3f2a88n5q6z"; + 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gridbounds" = callPackage @@ -89435,6 +92419,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "grids" = callPackage + ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive + , gauge, hspec, singletons, vector + }: + mkDerivation { + pname = "grids"; + version = "0.3.0.0"; + sha256 = "01i6izwlgkv4pc6sfywn8fg2s01x15q0lwxag3kzzhb63nm20kli"; + libraryHaskellDepends = [ + adjunctions base comonad deepseq distributive singletons vector + ]; + testHaskellDepends = [ + adjunctions base comonad deepseq distributive hspec singletons + vector + ]; + benchmarkHaskellDepends = [ + adjunctions base comonad deepseq distributive gauge singletons + vector + ]; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "grm" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, happy , parsec, process, syb, wl-pprint @@ -89544,8 +92551,8 @@ self: { }: mkDerivation { pname = "groundhog"; - version = "0.9.0"; - sha256 = "09d0n91cd0bvmrik4ail2svbh7l8vp5va0344jzvy1g2ancy0yj0"; + version = "0.10.0"; + sha256 = "1wckm2qrgmv1ccavwvq8ji3pfb4y197s1n1adv8hz9bqk246byrq"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring containers monad-control mtl resourcet safe-exceptions scientific @@ -89553,7 +92560,6 @@ self: { ]; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-converters" = callPackage @@ -89582,8 +92588,8 @@ self: { }: mkDerivation { pname = "groundhog-inspector"; - version = "0.8.0.2"; - sha256 = "1wbsx0qjbhliglwk4yhh44ra54i34cypvki9zvw28khpc8mxdfmz"; + version = "0.10.0"; + sha256 = "1l4smiydqqgpfqcyq77d2g0cvglanqfhlhx3y1k9n3kx94yss5a2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89596,7 +92602,6 @@ self: { ]; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-mysql" = callPackage @@ -89606,15 +92611,14 @@ self: { }: mkDerivation { pname = "groundhog-mysql"; - version = "0.9.0"; - sha256 = "0n3zcvb1qh5jdfrzgiamaf51fvkhgabsl07asy7wcdp0hb8rxdkq"; + version = "0.10"; + sha256 = "1idyisl0dbij4ffd0bn1bm681az87wc30qnkn1vmr0cd0xb6mwnx"; libraryHaskellDepends = [ base bytestring containers groundhog monad-control monad-logger mysql mysql-simple resource-pool resourcet text time transformers ]; description = "MySQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-postgresql" = callPackage @@ -89625,8 +92629,8 @@ self: { }: mkDerivation { pname = "groundhog-postgresql"; - version = "0.9.0"; - sha256 = "0r756ccnrwzwl6x9fkrvyws8l00sp9jjqlj5n42jkw7nwwx3i8gy"; + version = "0.10"; + sha256 = "1digvi8ra58r122i030h0b089sbyzaclir1cg4iqaflbzrnz45l9"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers groundhog monad-control postgresql-libpq postgresql-simple resource-pool @@ -89634,7 +92638,6 @@ self: { ]; description = "PostgreSQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-sqlite" = callPackage @@ -89644,32 +92647,30 @@ self: { }: mkDerivation { pname = "groundhog-sqlite"; - version = "0.9.0"; - sha256 = "06985myr96dc7f6hkkm9nihvvl2c19wdl1bn3nfvyj78yvz8ryxb"; + version = "0.10.0"; + sha256 = "1z6yss15aw0a14i0nj0flb0h2641sjr70mhasp718qmc4iwkgw7x"; libraryHaskellDepends = [ base bytestring containers direct-sqlite groundhog monad-control resource-pool resourcet text transformers unordered-containers ]; description = "Sqlite3 backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "groundhog-th" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, groundhog - , template-haskell, text, time, unordered-containers, yaml + , libyaml, template-haskell, text, time, unordered-containers, yaml }: mkDerivation { pname = "groundhog-th"; - version = "0.9.0"; - sha256 = "1wwfgyak5kdhnn6i07y114q063ryg9w3sngh0c2fh2addh5xrqay"; + version = "0.10.2"; + sha256 = "1bpxvprsxd66k951yjlvpbpzni2f0s94ypkad698a2iyccb2slzk"; libraryHaskellDepends = [ - aeson base bytestring containers groundhog template-haskell text - time unordered-containers yaml + aeson base bytestring containers groundhog libyaml template-haskell + text time unordered-containers yaml ]; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "group-by-date" = callPackage @@ -89797,31 +92798,31 @@ self: { }) {}; "grpc-api-etcd" = callPackage - ({ mkDerivation, base, proto-lens, proto-lens-protoc }: + ({ mkDerivation, base, proto-lens, proto-lens-runtime }: mkDerivation { pname = "grpc-api-etcd"; - version = "0.1.0.1"; - sha256 = "0sr9nsk207ap1psf4mypzjbpbppxwmbbcv6z07dxpv1dwzs6dnyf"; - libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; + 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; }) {}; "grpc-etcd-client" = callPackage - ({ mkDerivation, base, bytestring, data-default-class - , grpc-api-etcd, http2-client, http2-client-grpc, lens, network - , proto-lens, proto-lens-protoc + ({ 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.1.2"; - sha256 = "1xrdasrg0m3cxlb227wmnl9vbakqiikrm3wi07wbnmbg6n5agzkr"; + version = "0.1.2.0"; + sha256 = "0ly24551b54cpzh05rmn9j6xl3qb3wi456yv45c69sv7i8jq63zf"; libraryHaskellDepends = [ - base bytestring data-default-class grpc-api-etcd http2-client - http2-client-grpc lens network proto-lens proto-lens-protoc + 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 @@ -89886,6 +92887,24 @@ self: { libraryHaskellDepends = [ base hierarchical-clustering ]; description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gscholar-rss" = callPackage + ({ mkDerivation, base, feed, http-conduit, scalpel-core, text, uri + }: + mkDerivation { + pname = "gscholar-rss"; + version = "0.2.1.0"; + sha256 = "0a4hhcggfbgxraq2jj40gvrg64nw37h7y6jj7pgswa623m85040j"; + 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 @@ -89951,8 +92970,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 @@ -89995,6 +93014,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage @@ -90031,32 +93051,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gtk" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text + "gtfs-realtime" = callPackage + ({ mkDerivation, base, protocol-buffers + , protocol-buffers-descriptor }: mkDerivation { - pname = "gtk"; - version = "0.14.10"; - sha256 = "0cq6cpr42mjansnbk3p38xkqslqcb8lbl4smc73kaqr1xcg6gq98"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; + pname = "gtfs-realtime"; + version = "0.2.0.0"; + sha256 = "0ydi358ks9cswwqqdjhxhbasr9l34gmqjxwnvylp5zhgymnyjhl0"; libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text + base protocol-buffers protocol-buffers-descriptor ]; - libraryPkgconfigDepends = [ gtk2 ]; - description = "Binding to the Gtk+ graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - }) {gtk2 = pkgs.gnome2.gtk;}; + description = "GTFS RealTime protobafs library (autogenerated from .proto file)"; + license = stdenv.lib.licenses.bsd3; + }) {}; - "gtk_0_15_0" = callPackage + "gtk" = 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"; + version = "0.15.1"; + sha256 = "1hhx6qcbd0qlwvi1d98vkmshrq1j7wiia0i3pwdidvfrjkn3aa7j"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -90081,6 +93098,7 @@ self: { ]; description = "A collection of auxiliary operations and widgets related to Gtk+"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-jsinput" = callPackage @@ -90092,6 +93110,7 @@ self: { libraryHaskellDepends = [ base gtk json transformers ]; description = "A simple custom form widget for gtk which allows inputing of JSON values"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-largeTreeStore" = callPackage @@ -90108,6 +93127,7 @@ self: { testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-mac-integration" = callPackage @@ -90125,7 +93145,7 @@ self: { description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk-mac-integration-gtk2 = null;}; + }) {inherit (pkgs) gtk-mac-integration-gtk2;}; "gtk-serialized-event" = callPackage ({ mkDerivation, array, base, containers, glib, gtk, gtk2 @@ -90154,26 +93174,29 @@ self: { libraryHaskellDepends = [ base gtk ]; description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-sni-tray" = callPackage - ({ mkDerivation, base, bytestring, cairo, containers, dbus - , dbus-hslogger, directory, enclosed-exceptions, filepath, gi-cairo - , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut - , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative + ({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger + , directory, enclosed-exceptions, filepath, gi-cairo + , gi-cairo-connector, gi-cairo-render, gi-dbusmenugtk3, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut, gtk3, haskell-gi + , haskell-gi-base, hslogger, optparse-applicative , status-notifier-item, text, transformers, transformers-base, unix }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.5.0"; - sha256 = "0vfxskzhcm1a3i7kvqxfvmqdvx7xk6hnbpsnqymrzjaj11w9r9x0"; + version = "0.1.6.0"; + sha256 = "0i8k6jk6jq97cahlgbj8acqdqw4zkh0cyy8i6clznbknl02qqp2i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cairo containers dbus directory enclosed-exceptions - filepath gi-cairo gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib - gi-gtk gtk-strut haskell-gi haskell-gi-base hslogger - status-notifier-item text transformers transformers-base unix + base bytestring containers dbus directory enclosed-exceptions + filepath gi-cairo gi-cairo-connector gi-cairo-render + gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib gi-gtk gtk-strut + haskell-gi haskell-gi-base hslogger status-notifier-item text + transformers transformers-base unix ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ @@ -90182,14 +93205,15 @@ self: { ]; description = "A standalone StatusNotifierItem/AppIndicator tray"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; "gtk-strut" = callPackage ({ 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; @@ -90204,6 +93228,7 @@ self: { libraryHaskellDepends = [ base gtk ]; description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk-toy" = callPackage @@ -90228,6 +93253,7 @@ self: { libraryPkgconfigDepends = [ xlibsWrapper ]; description = "A wrapper around the eggtraymanager library for Linux system trays"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) xlibsWrapper;}; "gtk2hs-buildtools" = callPackage @@ -90236,8 +93262,8 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.4.0"; - sha256 = "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg"; + version = "0.13.5.0"; + sha256 = "01a3q7ciinrwa6xjk0qwpyjabdjzfsy8qqfkp0iir2h8i8prnpz4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90249,6 +93275,7 @@ self: { executableHaskellDepends = [ base ]; description = "Tools to build the Gtk2Hs suite of User Interface libraries"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk2hs-cast-glade" = callPackage @@ -90276,6 +93303,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 @@ -90387,28 +93415,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.14.9"; - sha256 = "1rcn0x6q0r0a3waxdsyvbyzfswsi6j7yr9fsixqr1c0g334lmqa8"; - 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; - }) {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"; + version = "0.15.1"; + sha256 = "0kya9ag8c7zl8sqx32hmlmz9rpxghvyr2svzcr38lzizfd74bnpq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90440,8 +93448,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"; @@ -90450,12 +93458,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 @@ -90512,6 +93524,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) gtksourceview;}; "gtksourceview3" = callPackage @@ -90531,14 +93544,15 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtksourceview3 = pkgs.gnome3.gtksourceview;}; "guarded-allocation" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "guarded-allocation"; - version = "0.0"; - sha256 = "1fj8zf9drvkd8bydiy7g0z9dqqjn7d8mf1jdhwcyx6c013ixnmsj"; + version = "0.0.1"; + sha256 = "15a6g0bkjf9r0zl7x61ip05kb7k4rf7yxr7z8jybs5q8g78i1b0c"; libraryHaskellDepends = [ base ]; description = "Memory allocation with added stress tests and integrity checks"; license = stdenv.lib.licenses.bsd3; @@ -90762,6 +93776,7 @@ self: { ]; description = "Control your Arduino board from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hBDD" = callPackage @@ -90962,8 +93977,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 @@ -90995,7 +94010,6 @@ self: { ]; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB" = callPackage @@ -91194,6 +94208,7 @@ self: { ]; description = "A Gtk mixer GUI application for FreeBSD"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haar" = callPackage @@ -91359,7 +94374,6 @@ self: { libraryHaskellDepends = [ base bytestring cgi containers hack ]; description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack-handler-cgi" = callPackage @@ -91591,7 +94605,6 @@ self: { ]; description = "Hack2 contrib extra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-handler-happstack-server" = callPackage @@ -91829,6 +94842,7 @@ self: { ]; description = "Utility to manage secure file-based package repositories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-security" = callPackage @@ -91842,8 +94856,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 @@ -91873,6 +94887,7 @@ self: { ]; description = "Hackage security bindings against the HTTP library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-server" = callPackage @@ -91938,8 +94953,8 @@ self: { }: mkDerivation { pname = "hackage-whatsnew"; - version = "0.1.1"; - sha256 = "140qsl0aqw2zg246inijifvcddmirba613as0hrg11hkd52f6fhr"; + version = "0.1.3"; + sha256 = "0hrpwrx4ic8hn7ziimc5a34l6y1lywkmzphb73qpk2xgl91q6gq0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -91948,7 +94963,6 @@ self: { ]; description = "Check for differences between working directory and hackage"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage2hwn" = callPackage @@ -92089,6 +95103,7 @@ self: { ]; description = "Hackage and Portage integration tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hactor" = callPackage @@ -92157,15 +95172,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"; @@ -92241,8 +95256,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 @@ -92312,26 +95327,7 @@ 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 + "haddock-library_1_5_0_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, containers, deepseq , directory, filepath, hspec, hspec-discover, optparse-applicative , QuickCheck, transformers, tree-diff @@ -92351,29 +95347,27 @@ self: { doHaddock = false; description = "Library exposing some functionality of Haddock"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haddock-library_1_6_0" = callPackage + "haddock-library" = 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; }) {}; "haddock-test" = callPackage @@ -92421,8 +95415,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.13.0"; - sha256 = "1z5qaxslshd1adkhqcpx8m8fs8d3dw4vwbwvsqcpm7gis63qhbqg"; + version = "1.15.0"; + sha256 = "13xpbwnh6xs3lj6vgqanww3ipz8bsfh3q305rkrb7kgl338nqgsm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92871,8 +95865,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.12.3.0"; - sha256 = "1cczcca2h5spvrq8z2nm5ygphcrjfm6k725ppbcc05c4w49dqwm4"; + version = "4.12.5.1"; + sha256 = "0zxl99qrzzngc6z08hpl4rxssb7djqdbccjay76sgq8akw40x720"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -92893,6 +95887,7 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -92912,14 +95907,14 @@ self: { "hakyll-agda" = callPackage ({ mkDerivation, Agda, base, containers, directory, filepath - , hakyll, mtl, pandoc, transformers, xhtml + , hakyll, mtl, pandoc, text, transformers, xhtml }: mkDerivation { pname = "hakyll-agda"; - version = "0.1.10.1"; - sha256 = "0k8c38nh12ccg73jfnjwzgbxmvqmfd77bzvk9algi1g4r5f1dyl3"; + version = "0.1.11"; + sha256 = "19zgpwmip8fcl9sai6ykhrsp4vkzpjnapkyccbg904qa1xwmlf8k"; libraryHaskellDepends = [ - Agda base containers directory filepath hakyll mtl pandoc + Agda base containers directory filepath hakyll mtl pandoc text transformers xhtml ]; description = "Wrapper to integrate literate Agda files with Hakyll"; @@ -93045,6 +96040,27 @@ 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 }: @@ -93057,6 +96073,7 @@ self: { ]; description = "Allow Hakyll to create hierarchical menues from directories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-elm" = callPackage @@ -93085,6 +96102,7 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-filestore" = callPackage @@ -93099,6 +96117,31 @@ self: { ]; description = "FileStore utilities for Hakyll"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hakyll-images" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, filepath + , hakyll, HUnit-approx, JuicyPixels, JuicyPixels-extra, tasty + , tasty-hunit + }: + mkDerivation { + pname = "hakyll-images"; + version = "0.4.2"; + sha256 = "0la1c25jlqw0y0zfcskkj4mlmkpamr2psqfnsrgz52zvmhy2ha2p"; + revision = "1"; + editedCabalFile = "1kmvb0cxvphmx0f1bgjq636yga58n4g2lqrg2xg5xfpwf8r956qf"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary bytestring hakyll JuicyPixels JuicyPixels-extra + ]; + testHaskellDepends = [ + base binary bytestring directory filepath hakyll HUnit-approx + JuicyPixels JuicyPixels-extra tasty tasty-hunit + ]; + description = "Hakyll utilities to work with images"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-ogmarkup" = callPackage @@ -93119,13 +96162,14 @@ 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 ]; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-series" = callPackage @@ -93137,6 +96181,7 @@ self: { libraryHaskellDepends = [ base containers hakyll ]; description = "Adds series functionality to hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-shakespeare" = callPackage @@ -93154,6 +96199,7 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-shortcode" = callPackage @@ -93178,6 +96224,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hal" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, envy + , exceptions, http-conduit, http-types, mtl, text, time + }: + mkDerivation { + pname = "hal"; + version = "0.1.2"; + sha256 = "0fflx0xism12cfdifwpiv0caxkm4f46yqhcwyrdwrdmq6q0pxdk2"; + revision = "1"; + editedCabalFile = "09ng464s88dsfdwk4zdzi0yagy5mm41035p4glwiyhdqxc5n60yg"; + libraryHaskellDepends = [ + aeson base bytestring containers envy exceptions http-conduit + http-types mtl text time + ]; + description = "A runtime environment for Haskell applications running on AWS Lambda"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "halberd" = callPackage ({ mkDerivation, base, Cabal, containers, haskell-names , haskell-packages, haskell-src-exts, HUnit, mtl, safe, split, syb @@ -93308,8 +96373,8 @@ self: { }: mkDerivation { pname = "halma"; - version = "0.3.0.0"; - sha256 = "0hnm9ic18fivcf0wjmz6sap8b249g5f0bzq4pranxl822n4gcjnf"; + version = "0.3.0.1"; + sha256 = "1bmc7s4vl1k2i66q1ir6mkzn67j5gycshkkwp4d2v1dd86sswf28"; libraryHaskellDepends = [ aeson base containers data-default diagrams-lib grid ]; @@ -93319,7 +96384,6 @@ self: { ]; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halma-gui" = callPackage @@ -93328,8 +96392,8 @@ self: { }: mkDerivation { pname = "halma-gui"; - version = "0.1.1.0"; - sha256 = "0qc8i75h8xa7nwzpv62bck404f4jji3nmjgyid06r52rb3cr5h18"; + version = "0.1.1.1"; + sha256 = "15kp369lvy67mc86f5c6k3x0849vcl4bqmd5l4brymy79d7b2f2p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93383,13 +96447,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; }) {}; @@ -93561,6 +96623,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "han2zen" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "han2zen"; + version = "0.1"; + sha256 = "1wm2pa549z3yvyxzl0wbaz623za54fyryhz9bjx4xi7fwlgxylqk"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base text ]; + description = "Convert Halfwidth Katakana to Fullwidth Katakana"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "handa-data" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -93646,6 +96720,7 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "HandleLike class"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "handsy" = callPackage @@ -93799,27 +96874,31 @@ 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, silently, stm, temporary, time + , transformers, typed-process, yaml }: mkDerivation { pname = "hapistrano"; - version = "0.3.5.10"; - sha256 = "1pkgbcpddk5ik0b1b684nnvwil68kla1w7660c1751dyhhh78ikw"; + version = "0.3.9.1"; + sha256 = "0s2xhisyjx3d9rgzqcc09l2x3a8fkc5d7rdcrrcrgwz6vxcdv0pv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base filepath formatting gitrev mtl path process time transformers + aeson base filepath formatting gitrev mtl path process stm time + transformers typed-process ]; 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 + silently temporary ]; description = "A deployment library for Haskell applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happindicator" = callPackage @@ -94013,8 +97092,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.3.4.11"; - sha256 = "1df9yybqzljfilpqgrz8qpa6iy5lfa3f3vmz0ip8qpvzgcxyhpd7"; + version = "2.3.4.15"; + sha256 = "1vgyzclziis403d08x4s26ml7ay0icwymixddbm409c99p6l8lif"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -94148,7 +97227,6 @@ self: { ]; description = "Happstack extension for use with FastCGI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-fay" = callPackage @@ -94319,6 +97397,7 @@ self: { ]; description = "Support for using JMacro with Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-lite" = callPackage @@ -94378,8 +97457,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.5.1.1"; - sha256 = "0qgx142xbig19j5j31b4vcgznzaw9c6fg4009vzp9yhvfbfnajk1"; + version = "7.5.1.3"; + sha256 = "0agxmrf2njd3whvgw4in0ixgss1qlmi6cdi9fglhs7nhykpkgllk"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -94402,8 +97481,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.1.6.5"; - sha256 = "0hp13wxaghs6ldqpbpyf8agph7b1y488fc516z1n6bvbpzcbhbvq"; + version = "7.1.6.7"; + sha256 = "18jvim1hm1d4ia8ka2kxwzzzpdvs6wy0v2k5qz6bg9lsv4wi9xil"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -94477,6 +97556,8 @@ self: { pname = "happstack-util"; version = "6.0.3"; sha256 = "0hqssd5wzir6rxn46q8r3hdp3nl7v5m7w322j39120xpg2bhiphh"; + revision = "1"; + editedCabalFile = "00j8h4r2dy3wj56487zh2g4ghj2jf0wj09cbxd7iswpapzwq6f1f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94539,8 +97620,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 ]; @@ -94811,8 +97892,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "harp"; - version = "0.4.3.1"; - sha256 = "0g4ig5s5rawlbq7zj1hkydnkw2s1gn7x0sdimd6j6kr5bynrdnhk"; + version = "0.4.3.2"; + sha256 = "1abyfsr0ya7j0s6znixhfhsr9mlmcg16rg5d9909b0xr896bkbn6"; libraryHaskellDepends = [ base ]; description = "HaRP allows pattern-matching with regular expressions"; license = stdenv.lib.licenses.bsd3; @@ -94884,37 +97965,49 @@ 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.2"; + sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i"; + revision = "3"; + editedCabalFile = "10h7pbkrkc9cdxx09zk0s8ygcdva2xy646zq3k8czph3vdaffzqx"; 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-extras" = callPackage - ({ mkDerivation, base, containers, free, hasbolt, lens, mtl - , neat-interpolation, template-haskell, text, th-lift-instances + ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers + , data-default, free, hasbolt, lens, mtl, neat-interpolation + , scientific, template-haskell, text, th-lift-instances + , unordered-containers, vector }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.11"; - sha256 = "1x0dm5x4jr1k619s7ad78bb717c8572s8pakailf8g2wsyc340gr"; + version = "0.0.0.16"; + sha256 = "1759pk8w5vvgm194lbfj1z9vxwh19d1s36lwpwni1qk7l1lpvvm6"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base containers free hasbolt lens mtl neat-interpolation - template-haskell text th-lift-instances + aeson aeson-casing base containers free hasbolt lens mtl + neat-interpolation scientific template-haskell text + th-lift-instances unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default hasbolt mtl text ]; description = "Extras for hasbolt library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascal" = callPackage @@ -95181,6 +98274,8 @@ self: { pname = "hashable-orphans"; version = "0"; sha256 = "0mpvfhf07swhj7vb9mrrrbq4a4il0i49nlzh2157kf66a891ih47"; + revision = "1"; + editedCabalFile = "00ngp3hqp3i0xbx00vdgv92pq0n1q5dffjfjni5bnb3rzlafsvvl"; libraryHaskellDepends = [ base hashable sorted-list time ]; description = "Provides instances missing from Hashable"; license = stdenv.lib.licenses.bsd3; @@ -95191,10 +98286,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; @@ -95249,6 +98342,7 @@ self: { libraryHaskellDepends = [ base containers simple-money ]; description = "A library for working with HashFlare.io contracts and hashrates"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashids" = callPackage @@ -95559,22 +98653,21 @@ self: { }) {}; "haskdogs" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hasktags, optparse-applicative, process, text + ({ mkDerivation, base, containers, directory, filepath, hasktags + , optparse-applicative, process-extras, text }: mkDerivation { pname = "haskdogs"; - version = "0.5.3"; - sha256 = "1n3vwrm99h4kzcimav18dkbvkpkhspwdf5gz8da1sr4g0m4kg96n"; + version = "0.6.0"; + sha256 = "0xqnsirgbwnp3kbvdmbg8d1b8lm2yk4fvjx71k8274gi7z62l458"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring containers directory filepath hasktags - optparse-applicative process text + base containers directory filepath hasktags optparse-applicative + process-extras text ]; description = "Generate tags file for Haskell project and its nearest deps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskeem" = callPackage @@ -95596,14 +98689,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_4_3" = callPackage + "haskeline_0_7_5_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , process, stm, terminfo, transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.7.4.3"; - sha256 = "0ydnsr1nhh7mfgvbpclidcfbgzf7j8g5vnwxrnkmgg1dphq0jv84"; + version = "0.7.5.0"; + sha256 = "1inyq7qwih0hnqlm6gy769vsxzjpvqx9ry390dmcvvql9520hrfj"; configureFlags = [ "-fterminfo" ]; libraryHaskellDepends = [ base bytestring containers directory filepath process stm terminfo @@ -95709,6 +98802,8 @@ self: { pname = "haskell-awk"; version = "1.1.1"; sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd"; + revision = "1"; + editedCabalFile = "1rrplmf2n4vkwisi367gi4a6yyh0ri2sdjqmdix7xyvfdad7m9cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95742,6 +98837,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 @@ -95764,8 +98914,8 @@ self: { "haskell-ci" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers - , deepseq, Diff, directory, filepath, ShellCheck, tasty - , tasty-golden, transformers + , deepseq, Diff, directory, filepath, tasty, tasty-golden + , transformers }: mkDerivation { pname = "haskell-ci"; @@ -95774,8 +98924,7 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal containers deepseq directory filepath ShellCheck - transformers + base Cabal containers deepseq directory filepath transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -95784,6 +98933,7 @@ self: { ]; description = "Cabal package script generator for Travis-CI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-cnc" = callPackage @@ -95874,8 +99024,10 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.7.0"; - sha256 = "1xrjrdrn8an1w5dig134jcy9whwjfm2vnb8s4vvd1aa8iq37p87p"; + version = "0.0.10.1"; + sha256 = "187blp0s8grabi11qpv06ckrys84ia51chf9h01449jxcw53fa76"; + revision = "1"; + editedCabalFile = "16kxaa0b9law55c3v9m664wpb8zafldh2wpl0brznq5bjwg1pqz5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -95903,6 +99055,7 @@ self: { testHaskellDepends = [ base ]; description = "Client library for the Disque datastore"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-docs" = callPackage @@ -95938,6 +99091,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 @@ -96038,19 +99192,18 @@ self: { }) {}; "haskell-gettext" = callPackage - ({ mkDerivation, base, binary, bytestring, bytestring-trie - , containers, filepath, haskell-src-exts, mtl, old-locale, parsec - , text, time, transformers, uniplate + ({ mkDerivation, base, binary, bytestring, containers, filepath + , haskell-src-exts, mtl, old-locale, parsec, text, time + , transformers, uniplate }: mkDerivation { pname = "haskell-gettext"; - version = "0.1.1.0"; - sha256 = "1kfqrm90my0h15f1x6n4fzzf9fvyicg87fqwbal37hj888jb0gv8"; + version = "0.1.2.0"; + sha256 = "1j7f8bcqqidgz3zbnlpy5v9adbp6yr9mla6b1a3m0gam9c7zlgin"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bytestring-trie containers mtl parsec text - time transformers + base binary bytestring containers mtl parsec text time transformers ]; executableHaskellDepends = [ base filepath haskell-src-exts old-locale time uniplate @@ -96062,37 +99215,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.5"; + sha256 = "1pxnwljicxyxr83c7d8xvla7zbp2krv1n6fp4i2zh8bqwln3fkgh"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -96173,8 +99321,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 @@ -96187,7 +99335,6 @@ self: { ]; description = "Haskell interface of the igraph library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) igraph;}; "haskell-import-graph" = callPackage @@ -96246,8 +99393,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; @@ -96261,40 +99408,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.2.2.0"; - sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd"; - revision = "1"; - editedCabalFile = "0bdgpj5cj4qwp31glmilp1gqdm8c3fkqvgw18aqv8pz2wg39x23y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable haskell-lsp-types hslogger lens mtl network-uri parsec - sorted-list stm text time unordered-containers yi-rope - ]; - executableHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hslogger lens mtl network-uri parsec stm text time transformers - unordered-containers vector yi-rope - ]; - testHaskellDepends = [ - aeson base containers directory filepath hashable hspec lens - network-uri sorted-list text yi-rope - ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp_0_8_0_0" = 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 - , transformers, unordered-containers, vector, yi-rope - }: - mkDerivation { - pname = "haskell-lsp"; - version = "0.8.0.0"; - sha256 = "04mihj4538pys6v4m3dwijfzcpsv52jizm416rnnwc88gr8q6wkk"; + version = "0.8.0.1"; + sha256 = "1lvrqxp6v5xvha88l8r6n86ydvlszzxmi7fazvjxz4bixy9zvw8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96313,7 +99428,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-lsp-client" = callPackage @@ -96338,37 +99452,20 @@ self: { }) {}; "haskell-lsp-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, filepath - , hashable, lens, network-uri, text, unordered-containers - }: - mkDerivation { - pname = "haskell-lsp-types"; - version = "0.2.2.0"; - sha256 = "0wchy8qrd450s90j6d26psznrd3n245lvn01qxa42l5akljmlymx"; - libraryHaskellDepends = [ - aeson base bytestring data-default filepath hashable lens - network-uri text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp-types_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.8.0.0"; - sha256 = "11dm7v9rvfig6m40m0np7cs5cfaawwpw67c445dz15vls5pri71n"; + version = "0.8.0.1"; + sha256 = "0czh6fqrzzp5xkawwiia5n437pmch41rnkp166lpvglfqg4gx8y8"; libraryHaskellDepends = [ aeson base bytestring data-default filepath hashable lens network-uri scientific text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-menu" = callPackage @@ -96453,8 +99550,32 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.2"; - sha256 = "1gfqyh0lgi4n20dmh6pavxixy3flw385fp2iisks99l30nzn0kyv"; + version = "0.9.4"; + sha256 = "0dbf5rxysm57jn018wd3dfz3m621n0347mbpgv7q2yb77cwrlg8y"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers data-lens-light filepath + haskell-src-exts mtl transformers traverse-with-class uniplate + ]; + testHaskellDepends = [ + base containers filemanip filepath haskell-src-exts mtl pretty-show + tasty tasty-golden traverse-with-class + ]; + description = "Name resolution library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haskell-names_0_9_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , data-lens-light, filemanip, filepath, haskell-src-exts, mtl + , pretty-show, tasty, tasty-golden, transformers + , traverse-with-class, uniplate + }: + mkDerivation { + pname = "haskell-names"; + version = "0.9.6"; + sha256 = "06g1h1dvsh31hm18v3hkx2s4bcrv2h49kgc2x9k1xk6532a9503w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -96535,6 +99656,7 @@ self: { ]; description = "Manage nix overrides for haskell packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-packages" = callPackage @@ -96657,6 +99779,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 @@ -96749,7 +99872,6 @@ self: { ]; description = "Snake game implemetation in Haskell using SDL2"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-spacegoo" = callPackage @@ -96804,17 +99926,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 @@ -96825,6 +99945,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 { @@ -96881,6 +100022,7 @@ self: { libraryHaskellDepends = [ base haskell-src-exts ]; description = "Pretty print haskell code with comments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-simple" = callPackage @@ -96900,8 +100042,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 @@ -96919,6 +100061,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 ]; @@ -96947,6 +100091,21 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-time-range" = callPackage ({ mkDerivation, base, doctest, lens, semigroups, text, time }: mkDerivation { @@ -96989,14 +100148,15 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "1.1.0.2"; - sha256 = "0j81dmg2mgxlc4wy054a13bvx549xs19fr729rirdj2illdgbw1c"; + version = "1.1.1.0"; + sha256 = "022d1jj3afgjjzfmv99ilcmqckk8p7njfg1r7byjbl8rq9wqnhg7"; libraryHaskellDepends = [ base classyplate ghc mtl pretty references template-haskell uniplate ]; description = "Haskell AST for efficient tooling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-ast-fromghc" = callPackage @@ -97057,14 +100217,15 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "1.1.0.2"; - sha256 = "0c054gvnn38r5vlpka5jsvq3n8lcn3j77jg45g1zl1az0099mzhl"; + version = "1.1.1.0"; + sha256 = "0gppj0k99iqxd54m81s8h9dhq9gqj2sadi54swijd67pyq31vnn1"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl references safe split template-haskell transformers uniplate ]; description = "Creating the Haskell-Tools AST from GHC's representations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-builtin-refactorings" = callPackage @@ -97078,8 +100239,8 @@ self: { }: mkDerivation { pname = "haskell-tools-builtin-refactorings"; - version = "1.1.0.2"; - sha256 = "1wm7c63cw4izg6vlrm2xdyrfvf4cwcqs2n144y8k0zf442xaq5l9"; + version = "1.1.1.0"; + sha256 = "0n8sydhcdl71kvf765kxc4ldg3gy8rk7i0jzagsj95k58c6mc8f6"; libraryHaskellDepends = [ aeson base Cabal classyplate containers deepseq directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -97096,6 +100257,7 @@ self: { ]; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-cli" = callPackage @@ -97107,8 +100269,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "1.1.0.2"; - sha256 = "0222qiyjncfyvcizsjx8qv4j8pjfrqb1mi18566fg689bhwl8x7z"; + version = "1.1.1.0"; + sha256 = "1ii9vdmmf2ncdzvlhsiv6afawkdlp5gyc369p2dxkg1nfi0d2px5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97131,6 +100293,7 @@ self: { ]; description = "Command-line frontend for Haskell-tools Refact"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-daemon" = callPackage @@ -97143,8 +100306,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "1.1.0.2"; - sha256 = "048k4pa26z3b3m83km8wbhr7nx2z3zmg4gyp1ga15idv73fis3kl"; + version = "1.1.1.0"; + sha256 = "1q8wfib72b4kiiwrz5hr5kzl2lbsff46gbzjidscv90z7c8niv2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97164,6 +100327,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 @@ -97175,8 +100339,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "1.1.0.2"; - sha256 = "1lnv9j4h45g0z1s9pf86py39p2bs8dbz3xybg0bwz89yix8h7nhl"; + version = "1.1.1.0"; + sha256 = "1y0hikwcns6dghr1pvbqv2hk4hgsnpwimaa32yxplwafnghcrcaj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97188,6 +100352,7 @@ self: { executableHaskellDepends = [ base ]; description = "Debugging Tools for Haskell-tools"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-demo" = callPackage @@ -97200,8 +100365,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "1.1.0.2"; - sha256 = "0c2m6xqcl22x9ay3n9j64lphmsvxsgcwymvbxscwpki9mv7wbvkx"; + version = "1.1.1.0"; + sha256 = "0n03yk99fwk6fxkf3zvcxgr1aikq32d7jysy6cvw2lbwym12rxci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97218,6 +100383,7 @@ self: { ]; description = "A web-based demo for Haskell-tools Refactor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-experimental-refactorings" = callPackage @@ -97230,8 +100396,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.1.0.2"; - sha256 = "1kqiblwc0dp3p7yx10jqxflsgybc0vvgrvi0ylxhgkmn6cpmnkqv"; + version = "1.1.1.0"; + sha256 = "0xmz5fs0hqk27mgi70ipl41wxjgw8swz9z9q1yw9yj00f046q9ia"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -97248,6 +100414,7 @@ self: { ]; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-prettyprint" = callPackage @@ -97256,14 +100423,15 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "1.1.0.2"; - sha256 = "01j212inqx7hq24kcw7n0619bgz7bj576xrh06h10n0wqhd6qfbq"; + version = "1.1.1.0"; + sha256 = "09cg9g8ihq2c5c5wlfnfqvjj9cg2nbak0xxc1mdqlg2cnrdif6rs"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate ]; description = "Pretty printing of Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-refactor" = callPackage @@ -97276,8 +100444,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "1.1.0.2"; - sha256 = "12gkmji62kvnqjih9845hmsdj2f52hvmqgrz7s5wclpn3b5fhczq"; + version = "1.1.1.0"; + sha256 = "0lbwyzc4ngd6sjgalw3w47c1r7x2af93rhrcdwncldfd98q4gaif"; libraryHaskellDepends = [ aeson base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -97293,6 +100461,7 @@ self: { ]; description = "Refactoring Tool for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-rewrite" = callPackage @@ -97302,8 +100471,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "1.1.0.2"; - sha256 = "1az7924bsiapn7g8gj75vdi47alrlly0wnwhcd7p8a24kh1hj055"; + version = "1.1.1.0"; + sha256 = "0m90f0vqy5iqj7b6a8lgzp5dxpvfnlz7zdsi8f0d2xqg6w8rgv24"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -97314,6 +100483,7 @@ self: { ]; description = "Facilities for generating new parts of the Haskell-Tools AST"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tor" = callPackage @@ -97436,6 +100606,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell2020" = callPackage + ({ mkDerivation, array, base }: + mkDerivation { + pname = "haskell2020"; + version = "0.1.0.0"; + sha256 = "02amj6wza3aaw3i84yjh6zwn7v5g3v1d748ajc7gv6cpd4904pzq"; + libraryHaskellDepends = [ array base ]; + description = "Haskell 2020[draft] Standard Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell98" = callPackage ({ mkDerivation, array, base, directory, old-locale, old-time , process, time @@ -98060,6 +101241,7 @@ self: { executableHaskellDepends = [ base ]; description = "Haskell Evaluation inside of LaTeX code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskmon" = callPackage @@ -98118,35 +101300,33 @@ self: { ]; description = "An adapter for haskoin to network-bitcoin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskoin-core" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring - , cereal, conduit, containers, cryptonite, deepseq, entropy - , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3 - , network, QuickCheck, safe, scientific, secp256k1-haskell, split - , string-conversions, text, time, transformers - , unordered-containers, vector + , 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.5.2"; - sha256 = "1sjsni26m9f36v9zc3q6gkpv8d7bnwvn88s1v77d5z81jszfwq2b"; + version = "0.8.4"; + sha256 = "0hpabz26wyxvpkvc2xv1xscmbvn0yfj2nnd41ysaf4xgfnh4c9sw"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit - containers cryptonite deepseq entropy hashable memory mtl murmur3 - network QuickCheck scientific secp256k1-haskell split - string-conversions text time transformers unordered-containers - vector + containers cryptonite entropy hashable memory mtl murmur3 network + QuickCheck scientific secp256k1-haskell split string-conversions + text time transformers unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring cereal containers hspec HUnit mtl QuickCheck - safe split string-conversions text vector + safe split string-conversions text unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskoin-crypto" = callPackage @@ -98174,23 +101354,26 @@ self: { "haskoin-node" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra - , hashable, haskoin-core, hspec, monad-logger, mtl, network, nqe - , random, resourcet, rocksdb-haskell, rocksdb-query - , string-conversions, time, unique, unliftio + , 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.5.2"; - sha256 = "1wrkah2sbinkc5yp2b6mj6z0aps1pl7j1hncygmsa5pvg8iifjih"; + version = "0.9.5"; + sha256 = "1c0nms9q9x0fsg1hkn5kz8jpal79b0143yca156nb563bdlx0pfd"; libraryHaskellDepends = [ - base bytestring cereal conduit conduit-extra hashable haskoin-core - monad-logger mtl network nqe random resourcet rocksdb-haskell - rocksdb-query string-conversions time unique unliftio + 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 bytestring cereal haskoin-core hspec monad-logger mtl network - nqe random rocksdb-haskell unliftio + base bytestring cereal haskoin-core hspec HUnit monad-logger mtl + network nqe random rocksdb-haskell safe unliftio ]; + testToolDepends = [ hspec-discover ]; description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -98241,34 +101424,38 @@ self: { }) {}; "haskoin-store" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, conduit - , containers, directory, filepath, 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 + ({ 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.1.3"; - sha256 = "1xlvh0q6jx37p4rnq4qspwnnq7hpvaqi9ib1mlgkdxj7ypxk26fr"; + version = "0.9.3"; + sha256 = "17k51kh9vi2bkf6hfn50wpqsnc0qrclvphqy8wcmsz0n2ik8rb7h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cereal conduit containers haskoin-core - haskoin-node monad-logger mtl network nqe random rocksdb-haskell - rocksdb-query string-conversions text time transformers unliftio + 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 bytestring conduit directory filepath haskoin-core - haskoin-node http-types monad-logger nqe optparse-applicative - rocksdb-haskell scotty string-conversions text unliftio + 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 haskoin-core haskoin-node hspec monad-logger nqe - rocksdb-haskell unliftio + 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 @@ -98483,43 +101670,341 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskseg" = callPackage + ({ mkDerivation, ansi-terminal, array, base, bytestring, containers + , exact-combinatorics, logging-effect, monad-loops, MonadRandom + , mtl, optparse-generic, random, random-shuffle, text, vector, zlib + }: + mkDerivation { + pname = "haskseg"; + version = "0.1.0.1"; + sha256 = "0m9226wwkkvfqr2nfhf2gxymav3fp6klvzilsrkx502dqlll25qc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base bytestring containers exact-combinatorics + logging-effect monad-loops MonadRandom mtl optparse-generic random + random-shuffle text vector zlib + ]; + executableHaskellDepends = [ + ansi-terminal array base bytestring containers exact-combinatorics + logging-effect monad-loops MonadRandom mtl optparse-generic random + random-shuffle text vector zlib + ]; + description = "Simple unsupervised segmentation model"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "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 ]; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "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 + ({ mkDerivation, base, bytestring, cereal, criterion, directory + , doctest, ghc-prim, haskus-utils, haskus-utils-data + , haskus-utils-types, megaparsec, mtl, primitive, QuickCheck, tasty + , tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "haskus-binary"; - version = "1.0"; - sha256 = "1gw08zx7mqhi6n0wx6s6n4fvw5ambbdxnahr3r3p22yfqnqcp4y2"; + version = "1.3"; + sha256 = "06smbrvkpiz3rwmlsrxv6a5zh5952ivpl7wg85li6bc90dnz04rm"; libraryHaskellDepends = [ - base bytestring cereal haskus-utils mtl + base bytestring cereal directory ghc-prim haskus-utils + haskus-utils-data haskus-utils-types megaparsec mtl primitive + template-haskell transformers ]; testHaskellDepends = [ - base bytestring haskus-utils QuickCheck tasty tasty-quickcheck + base bytestring doctest haskus-utils haskus-utils-data QuickCheck + tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "Haskus binary format manipulation"; @@ -98548,20 +102033,19 @@ self: { }) {}; "haskus-utils" = callPackage - ({ mkDerivation, base, containers, extra, file-embed + ({ mkDerivation, base, containers, extra, file-embed, hashable , haskus-utils-data, haskus-utils-types, haskus-utils-variant - , list-t, mtl, recursion-schemes, stm, stm-containers, tasty - , tasty-quickcheck, template-haskell, transformers, vector + , list-t, mtl, stm, stm-containers, tasty, tasty-quickcheck + , template-haskell, transformers, vector }: mkDerivation { pname = "haskus-utils"; - version = "1.0"; - sha256 = "1pfjarir86c2sxjh8l0jc7z5acsz8slcwb7imjdxf3dsdiy8swwd"; + version = "1.4"; + sha256 = "1d18q6yd4gy80qa6w1s9c4z7fyn9fqdvnvxdm4mhzi2bwx51yzfg"; libraryHaskellDepends = [ - base containers extra file-embed haskus-utils-data - haskus-utils-types haskus-utils-variant list-t mtl - recursion-schemes stm stm-containers template-haskell transformers - vector + base containers extra file-embed hashable haskus-utils-data + haskus-utils-types haskus-utils-variant list-t mtl stm + stm-containers template-haskell transformers vector ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Haskus utility modules"; @@ -98569,43 +102053,83 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskus-utils-compat" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , haskus-binary, haskus-utils-data, template-haskell + }: + mkDerivation { + pname = "haskus-utils-compat"; + version = "1.0"; + sha256 = "0mgklzs26xhq06gij4cn9iz69z028apmrhafd8cqar3kg75lisyx"; + libraryHaskellDepends = [ + base bytestring directory filepath haskus-binary haskus-utils-data + template-haskell + ]; + description = "Compatibility modules with other external packages (ByteString, etc.)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskus-utils-data" = callPackage ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl , recursion-schemes, transformers }: mkDerivation { pname = "haskus-utils-data"; - version = "1.0"; - sha256 = "007ykjinkxr9kdrk7hl81zndpan60b5l51m32nlj2xv2pjm326z4"; + version = "1.1.1"; + sha256 = "1igwlprfknz3aydls849a3l7agm5zqn8c90aqw547bc0asjcsnll"; libraryHaskellDepends = [ base containers extra haskus-utils-types mtl recursion-schemes transformers ]; description = "Haskus utility modules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskus-utils-types" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "haskus-utils-types"; - version = "1.0"; - sha256 = "1rxnaw53vfmi3gv8h7j6vw4y4xxnqzwaaasd6x22fm7fzc5q64vf"; + version = "1.3.1"; + sha256 = "1qsji8pcncwqj7dgww7azlfk4vdjbalsspkj53cbwxfcib1nmcsw"; 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, criterion, deepseq, doctest, exceptions + , haskus-utils-data, haskus-utils-types, QuickCheck, tasty + , tasty-quickcheck, template-haskell, transformers + }: mkDerivation { pname = "haskus-utils-variant"; - version = "1.0"; - sha256 = "1kkqngvzifxps0hhp49syh2w4an3y4s4nvp3qbh3p00h9dw3hmsn"; + version = "2.5"; + sha256 = "1nbaq2f33a2q2qpxalvq52sqn47bil41klkp84qdan3rfzh8a7rh"; libraryHaskellDepends = [ - base haskus-utils-data haskus-utils-types + base deepseq exceptions haskus-utils-data haskus-utils-types + template-haskell transformers ]; - description = "Haskus utility modules"; + testHaskellDepends = [ base doctest tasty tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; + description = "Variant and EADT"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haskus-web" = callPackage + ({ mkDerivation, base, bytestring, clay, happstack-server + , happstack-server-tls, haskus-utils-compat, lucid, text + }: + mkDerivation { + pname = "haskus-web"; + version = "1.1"; + sha256 = "15d2718d7iqfxkdl6ggdyl81lp98s3djsgd37wmyx1xx9v03lg3g"; + libraryHaskellDepends = [ + base bytestring clay happstack-server happstack-server-tls + haskus-utils-compat lucid text + ]; + description = "Haskus web"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -98683,8 +102207,8 @@ self: { }: mkDerivation { pname = "hasmin"; - version = "1.0.2.1"; - sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb"; + version = "1.0.3"; + sha256 = "0p9a1q8brymkd4y74gn4iiwihikn55wx2h9zz3mpd6ab53rsz43k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98700,7 +102224,6 @@ self: { benchmarkHaskellDepends = [ base criterion directory text ]; description = "CSS Minifier"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasparql-client" = callPackage @@ -98755,7 +102278,6 @@ self: { benchmarkHaskellDepends = [ bug criterion rerebase ]; description = "An efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -98836,7 +102358,6 @@ self: { ]; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-generic" = callPackage @@ -98896,12 +102417,13 @@ self: { }) {}; "hasql-pool" = callPackage - ({ mkDerivation, base-prelude, hasql, resource-pool, time }: + ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: mkDerivation { pname = "hasql-pool"; - version = "0.5"; - sha256 = "0bsxh9yf5p2iknrnssrif563n42ih14cj95qmy9z2lz2kbycscrs"; + version = "0.5.0.1"; + sha256 = "1isnn3klvqcr13wvq6fsj3b5sysjs6xlll9s3ysihd1x4v87zii8"; libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -99005,7 +102527,6 @@ self: { testHaskellDepends = [ async hasql rebase ]; description = "A composable abstraction over the retryable transactions for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hastache" = callPackage @@ -99344,6 +102865,7 @@ self: { ]; description = "A truth table generator for classical propositional logic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haven" = callPackage @@ -99353,10 +102875,8 @@ self: { }: mkDerivation { pname = "haven"; - version = "0.2.0.0"; - sha256 = "0cclphiq2jkk1msp5yg2mpkfn98jlqnc0vvwmi3vqcy5ln7641v1"; - revision = "1"; - editedCabalFile = "1p4m1iv3649b2wf6wdgbknhpms8rna5sibdi93zxyj0a4b23dh23"; + version = "0.2.0.1"; + sha256 = "15q9cgfifz87ns730agv2vzc8rp5lqggiclc91khpckm2qppk6yd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99365,6 +102885,7 @@ self: { ]; description = "Recursively retrieve maven dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haverer" = callPackage @@ -99448,10 +102969,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "2.0.1.0"; - sha256 = "07s3jxqvdcla3qj8jjxd5088kp7h015i2q20kjhs4n73swa9h9fd"; - revision = "1"; - editedCabalFile = "04k5q5hvnbw1shrb8pqw3nwsylpb78fi802xzfq2gcmrnl6hy58p"; + version = "2.0.1.1"; + sha256 = "1wfnwi3impv4cv359a65yh50c6kdfxhvbwycf5h76w3cvqdhvwsr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99541,8 +103060,10 @@ self: { }: mkDerivation { pname = "haxr"; - version = "3000.11.2"; - sha256 = "0iwbdvywily6ma1a1v9l4kflvm8d8234zhvyb9imx7g7grns1kgb"; + version = "3000.11.3"; + sha256 = "1ab422ngg63w91a71j17swzzdxk0y2053fijml0illarcrd77cnj"; + revision = "1"; + editedCabalFile = "0h71nvlia8k7ykhywxbx79xj30g6ld0gqqmrdhyp3aip8ly6cb6y"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -99871,6 +103392,7 @@ self: { ]; description = "Third-party extensions to hbro"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hburg" = callPackage @@ -100011,6 +103533,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 { @@ -100446,10 +103991,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 = [ @@ -100559,6 +104102,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heaps" = callPackage @@ -100600,6 +104144,7 @@ self: { libraryHaskellDepends = [ async base io-streams time ]; description = "Heartbeats for io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heatitup" = callPackage @@ -100629,6 +104174,7 @@ self: { ]; description = "Find and annotate ITDs"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heatitup-complete" = callPackage @@ -100652,6 +104198,7 @@ self: { ]; description = "Find and annotate ITDs with assembly or read pair joining"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heatshrink" = callPackage @@ -100681,8 +104228,8 @@ self: { }: mkDerivation { pname = "heavy-logger"; - version = "0.3.2.0"; - sha256 = "1kx6l7ysniqjzzp7l74vjcfbi8qz5xqjqvisb49k18cnf22mikvv"; + version = "0.3.2.1"; + sha256 = "09m8wqldmiwys4g5fjisgfc192g55y88gr9akgfhs18nm1gggix6"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default fast-logger hsyslog lifted-base monad-control monad-logger mtl stm @@ -100691,7 +104238,6 @@ self: { ]; description = "Full-weight logging based on fast-logger"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heavy-logger-amazon" = callPackage @@ -100707,7 +104253,6 @@ self: { ]; description = "heavy-logger compatibility with amazonka-core logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heavy-logger-instances" = callPackage @@ -100728,7 +104273,6 @@ self: { ]; description = "Orphan instances for data types in heavy-logger package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hebrew-time" = callPackage @@ -100791,8 +104335,10 @@ self: { }: mkDerivation { pname = "hedgehog"; - version = "0.6"; - sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq"; + version = "0.6.1"; + sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"; + revision = "2"; + editedCabalFile = "1l0iw2jqdvxgfysfvp1x0s2pq3kyvpapjdjkx9pi4bkxpjpkvbza"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory exceptions lifted-async mmorph monad-control mtl @@ -100852,6 +104398,8 @@ self: { pname = "hedgehog-fn"; version = "0.6"; sha256 = "0xi1y2cv2kkyxav261qaw9a4r4q8ng91187bdwi4rqlpp9zvc0pv"; + revision = "1"; + editedCabalFile = "19v7amg8l6s1gadnya8nxkcbi0vd3wqc7h6gvqvs099qaqm7zbb1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100892,37 +104440,60 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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.4"; - sha256 = "1xsa6wgakmjhwz9s9fybbwsx6gxy6630bqyrai0sb4vmd9lnbxfx"; + 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_11_0" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, stm, test-framework, test-framework-hunit + , text, time, tls, unordered-containers, vector + }: + mkDerivation { + pname = "hedis"; + version = "0.11.0"; + sha256 = "070m9jrv1jczrxscbrr0fln45harw2y9rcj9qnp4d9sj7m597vvy"; + 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 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 @@ -101025,27 +104596,39 @@ self: { }) {}; "hedn" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, bytestring - , containers, deepseq, hspec, hspec-contrib, HUnit, mtl, QuickCheck - , scientific, stringsearch, template-haskell, text, time - , time-locale-compat, utf8-string, vector + ({ mkDerivation, base, containers, deepseq, deriving-compat + , hedgehog, megaparsec, parser-combinators, prettyprinter + , scientific, template-haskell, text, time, uuid, vector }: mkDerivation { pname = "hedn"; - version = "0.1.9.0"; - sha256 = "077wf446x0rrac3bdzmyhpacb54smx02msdz45cra3yzn3n0rq7l"; + version = "0.2.0.0"; + sha256 = "1yi7j2ikpd1lv32hzgv38v1r4wzh7ffq71js2648d4j1v9jhq1sj"; libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq mtl - scientific stringsearch text time time-locale-compat utf8-string - vector + base containers deepseq deriving-compat megaparsec + parser-combinators prettyprinter scientific template-haskell text + time uuid vector ]; testHaskellDepends = [ - base bytestring containers hspec hspec-contrib HUnit QuickCheck - template-haskell text time vector + base containers hedgehog megaparsec text time uuid vector ]; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hedra" = callPackage + ({ mkDerivation, base, doctest, haskeline, random }: + mkDerivation { + pname = "hedra"; + version = "0.1"; + sha256 = "17yvqfhxvxrfy7g6s3wv4gp59s2mgikw1dc078jzhb1g00zggwb4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base random ]; + executableHaskellDepends = [ base haskeline ]; + testHaskellDepends = [ base doctest ]; + description = "A small library and executable for generating dice rolls"; + license = stdenv.lib.licenses.mit; }) {}; "hein" = callPackage @@ -101069,17 +104652,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 @@ -101096,10 +104680,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; @@ -101599,13 +105184,12 @@ self: { ({ mkDerivation, base, doctest, time }: mkDerivation { pname = "herf-time"; - version = "0.2.2"; - sha256 = "13nn46l5mf555rab3fwl38g4fznjh3n07754l671vqcr8c5zfm4m"; + version = "0.3.0"; + sha256 = "00ar1kb29gjvna7rcdg6wj3f22dil2pzbzy8zblvyc452zjy03y2"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest ]; description = "haskell time manipulation in a 'kerf like' style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hermit" = callPackage @@ -101672,6 +105256,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 @@ -101854,8 +105439,8 @@ self: { }: mkDerivation { pname = "heterocephalus"; - version = "1.0.5.2"; - sha256 = "08sr2ps3kb2v6pglkls814w6fpvwkysd3k2s15pj9fhmhx82kf2h"; + version = "1.0.5.3"; + sha256 = "0kvrv15xm6igd6nkyfij1h982jqpbf61pzinv8jdb4fcjqwf08s7"; libraryHaskellDepends = [ base blaze-html blaze-markup containers dlist mtl parsec shakespeare template-haskell text transformers @@ -101875,6 +105460,7 @@ self: { testHaskellDepends = [ base ]; description = "Allows the use of tuples as literals for Heterogeneous collections"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heterolist" = callPackage @@ -101927,6 +105513,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.24"; + sha256 = "0bzhswisrmlw8ajl6mr13vr3a7l0vywl394aihrc0xs6vwgyflh0"; + 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 { @@ -102043,18 +105677,6 @@ self: { }) {}; "hexml" = callPackage - ({ mkDerivation, base, bytestring, extra }: - mkDerivation { - pname = "hexml"; - version = "0.3.3"; - sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4"; - libraryHaskellDepends = [ base bytestring extra ]; - testHaskellDepends = [ base bytestring ]; - description = "XML subset DOM parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hexml_0_3_4" = callPackage ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; @@ -102064,7 +105686,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "XML subset DOM parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexml-lens" = callPackage @@ -102129,13 +105750,14 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.7"; - sha256 = "0r9psvrgwkg8y9xvgc3rkay828ri5xbp2z5jjf6b52v99j8aipd8"; + version = "0.1.8"; + sha256 = "05c5pjxxsivcbppbl2n8dwyv6zh7azc3l998s2rhgjja55cpfmg0"; libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle" = callPackage @@ -102298,6 +105920,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 { @@ -102599,33 +106243,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 = [ @@ -102634,6 +106276,7 @@ self: { ]; description = "Geometric Algorithms, Data structures, and Data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgeos" = callPackage @@ -102671,6 +106314,7 @@ self: { ]; description = "Bindings to libintl.h (gettext, bindtextdomain)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgis" = callPackage @@ -102739,8 +106383,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"; @@ -102814,6 +106458,7 @@ self: { ]; description = "Compile Mercurial (hg) version info into Haskell code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgrib" = callPackage @@ -102848,6 +106493,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {harp = null;}; + "hhp" = callPackage + ({ mkDerivation, base, Cabal, containers, deepseq, directory + , doctest, filepath, ghc, hlint, hspec, io-choice, process, syb + }: + mkDerivation { + pname = "hhp"; + version = "0.0.0"; + sha256 = "1520cax79wrf5a183630pji3bypz6qck73fa3p0x63vgcv3p5rwk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base Cabal containers deepseq directory filepath ghc hlint + io-choice process syb + ]; + executableHaskellDepends = [ + base containers directory filepath ghc + ]; + testHaskellDepends = [ + base Cabal containers deepseq directory doctest filepath ghc hlint + hspec io-choice process syb + ]; + description = "Happy Haskell Programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hi" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory , doctest, filepath, hspec, HUnit, optparse-applicative, parsec @@ -102947,21 +106618,34 @@ self: { }) {inherit (pkgs) hidapi;}; "hid-examples" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, cassava, Chart - , Chart-diagrams, extra, fmt, hint, mtl, optparse-applicative - , random, safe, text, time + ({ mkDerivation, aeson, base, blaze-html, bytestring, cassava + , Chart, Chart-diagrams, data-default, directory, doctest, extra + , filepath, fmt, hedgehog, hint, http-client, mtl + , optparse-applicative, random, req, safe, safe-exceptions, split + , system-locale, tasty, tasty-golden, tasty-hedgehog, tasty-hspec + , text, time, transformers, unix-compat }: mkDerivation { pname = "hid-examples"; - version = "0.2"; - sha256 = "1rp6v40z8i2slnsacw42adkqp98bg8fml573lpz9mz7ipn05gi9x"; + version = "0.4"; + sha256 = "11r2ln131axkw31afki3jnrz1md668z0qnvx915qwyppga62rk8l"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base hedgehog safe safe-exceptions split + ]; executableHaskellDepends = [ - base blaze-html bytestring cassava Chart Chart-diagrams extra fmt - hint mtl optparse-applicative random safe text time + aeson base blaze-html bytestring cassava Chart Chart-diagrams + data-default directory extra filepath fmt hedgehog hint http-client + mtl optparse-applicative random req safe safe-exceptions + system-locale text time transformers unix-compat + ]; + testHaskellDepends = [ + base doctest filepath hedgehog tasty tasty-golden tasty-hedgehog + tasty-hspec ]; + doHaddock = false; description = "Examples to accompany the book \"Haskell in Depth\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -103020,6 +106704,7 @@ self: { testHaskellDepends = [ base hspec HUnit QuickCheck ]; description = "Fast algorithms for single, average/UPGMA and complete linkage clustering"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hierarchical-clustering-diagrams" = callPackage @@ -103054,6 +106739,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hierarchical-spectral-clustering" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava + , clustering, containers, eigen, fgl, filepath + , hierarchical-clustering, hmatrix, lens, managed, modularity, mtl + , optparse-generic, safe, sparse-linear-algebra + , spectral-clustering, streaming, streaming-bytestring + , streaming-cassava, streaming-with, text, text-show, tree-fun + , vector + }: + mkDerivation { + pname = "hierarchical-spectral-clustering"; + version = "0.2.2.0"; + sha256 = "0c0lv9vr8srb6bipjx70m7p5mr91hfhnymv8brwj6hllq4cp576m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base cassava clustering containers eigen fgl + hierarchical-clustering hmatrix managed modularity mtl safe + sparse-linear-algebra spectral-clustering streaming + streaming-bytestring streaming-cassava streaming-with text tree-fun + vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cassava containers filepath + hmatrix lens optparse-generic safe text text-show vector + ]; + description = "Hierarchical spectral clustering of a graph"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hierarchy" = callPackage ({ mkDerivation, base, directory, doctest, exceptions, filepath , free, mmorph, monad-control, mtl, transformers, transformers-base @@ -103074,6 +106790,7 @@ self: { ]; description = "Predicated traversal of generated trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hiernotify" = callPackage @@ -103134,8 +106851,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 @@ -103249,7 +106966,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Command line tool for highlighting parts of files matching a regex"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "highlight-versions" = callPackage @@ -103266,6 +106982,7 @@ self: { ]; description = "Highlight package versions which differ from the latest version on Hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "highlighter" = callPackage @@ -103333,8 +107050,8 @@ self: { pname = "hills"; version = "0.1.2.6"; sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh"; - revision = "1"; - editedCabalFile = "1qdn733rdn4c15avgncgns10j2hw0bvnzdkd5f9yzm3s8vq8sqv9"; + revision = "2"; + editedCabalFile = "11f4mmhxivxkdcn4wdcz1hszfyi3hdggls22x2q0m3jxq3lw0izg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103570,22 +107287,6 @@ self: { }) {}; "hinotify" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , unix - }: - mkDerivation { - pname = "hinotify"; - version = "0.3.10"; - sha256 = "17ax3n68a5c2ddazp86aciliskrh6znd3bnry0wcllmb6dbpsaxg"; - revision = "1"; - editedCabalFile = "07z0n5rvki3w0kjr190bwv7sq8p3myspv8999ilz9rlsqf5a0324"; - libraryHaskellDepends = [ async base bytestring containers unix ]; - testHaskellDepends = [ base bytestring directory unix ]; - description = "Haskell binding to inotify"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hinotify_0_4" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , unix }: @@ -103597,7 +107298,6 @@ self: { testHaskellDepends = [ base bytestring directory unix ]; description = "Haskell binding to inotify"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinotify-bytestring" = callPackage @@ -103662,8 +107362,8 @@ self: { }: mkDerivation { pname = "hint"; - version = "0.8.0"; - sha256 = "0h8wan0hb16m1gcil1csaay9f9f1pq3kfgbzfsfpjszmr1i2sw1f"; + version = "0.9.0"; + sha256 = "1g7q4clzc2pdnbvmm265dindjpynabsykd088qjjzlk6590sy9bl"; libraryHaskellDepends = [ base directory exceptions filepath ghc ghc-boot ghc-paths mtl random temporary unix @@ -103693,8 +107393,7 @@ self: { "hinter" = callPackage ({ mkDerivation, base, directory, exceptions, extensible-exceptions - , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, temporary - , unix + , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix }: mkDerivation { pname = "hinter"; @@ -103702,35 +107401,36 @@ self: { sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl"; libraryHaskellDepends = [ base directory exceptions filepath ghc ghc-boot ghc-paths mtl - random temporary unix + random 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; }) {}; "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.3"; + sha256 = "10pm7hdir81f46d081rk3pc6nnlxhpksmd7qrh1vwyvad4nf9p55"; 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; @@ -103954,6 +107654,7 @@ self: { ]; description = "A generic, DAWG-based dictionary"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hist-pl-fusion" = callPackage @@ -104031,8 +107732,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"; @@ -104080,27 +107781,20 @@ self: { }) {}; "hit" = callPackage - ({ mkDerivation, attoparsec, base, byteable, bytedump, bytestring - , containers, cryptohash, hourglass, mtl, parsec, patience, random - , system-fileio, system-filepath, tasty, tasty-quickcheck - , unix-compat, utf8-string, vector, zlib, zlib-bindings + ({ mkDerivation, base, bytestring, containers, git, hashable + , hashtables, hourglass }: mkDerivation { pname = "hit"; - version = "0.6.3"; - sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv"; - isLibrary = true; + version = "0.7.0"; + sha256 = "1d3kqc9yd5hxcrr406cwbxjqnqj0bh4laayx2v1mqqz48x6rmqah"; + isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base byteable bytestring containers cryptohash hourglass - mtl parsec patience random system-fileio system-filepath - unix-compat utf8-string vector zlib zlib-bindings - ]; - testHaskellDepends = [ - base bytedump bytestring hourglass tasty tasty-quickcheck + executableHaskellDepends = [ + base bytestring containers git hashable hashtables hourglass ]; - description = "Git operations in haskell"; + description = "Git like program in haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -104218,12 +107912,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 @@ -104264,17 +107958,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; @@ -104393,9 +108090,9 @@ self: { "hledger" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat-batteries - , bytestring, cmdargs, containers, criterion, csv, data-default - , Decimal, Diff, directory, file-embed, filepath, hashable - , haskeline, here, hledger-lib, html, HUnit, lucid, megaparsec, mtl + , bytestring, cmdargs, containers, criterion, data-default, Decimal + , Diff, directory, easytest, filepath, hashable, haskeline + , 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 @@ -104404,39 +108101,39 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.10"; - sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n"; + version = "1.13.2"; + sha256 = "0dxw5zhynhdhangib5awcciz7qlgmnx9km4dph7nrw2ikj6ffmwv"; 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 + containers data-default Decimal Diff directory easytest filepath + hashable haskeline 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 filepath + haskeline 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 filepath + haskeline 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 + containers criterion data-default Decimal directory easytest + filepath haskeline 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 @@ -104454,8 +108151,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.10"; - sha256 = "1axcpipq6m4r9bh2633j7l88pc4ax8ycb2q0wivhfq2dp1pbylbf"; + version = "1.13"; + sha256 = "1pkim0qxgakbngnslw04lhlmv2ad195lw60hxz5iyrxywizkiwp3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104466,6 +108163,7 @@ self: { ]; description = "Web API server for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-chart" = callPackage @@ -104502,15 +108200,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.8"; + sha256 = "02dfi6drhipj1an2smalhgjp52scmcy6ndixakjk5y0zpvkxzzbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104528,6 +108226,7 @@ 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; }) {}; @@ -104537,8 +108236,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5.2"; - sha256 = "10ck23d69wxylxbp8cj7ic8slklm9l88xbb4p29nvm5lgjiqidbq"; + version = "1.5.3"; + sha256 = "1ff113z2ir07ihdvfa5fca4x326zwm2jd7sjy6hjpr4qgi1mszvs"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104564,35 +108263,38 @@ 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 - , transformers, uglymemo, utf8-string + , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec + , cmdargs, containers, data-default, Decimal, deepseq, directory + , doctest, easytest, extra, file-embed, filepath, Glob, hashtables + , megaparsec, mtl, mtl-compat, old-time, parsec, parser-combinators + , pretty-show, regex-tdfa, safe, split, tabular, template-haskell + , text, time, transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.10"; - sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1"; + version = "1.13.1"; + sha256 = "1g98gikpvx002zjc1smj21lz4x9ghfa2965rb0vlnqmwcz5pqak7"; 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 file-embed + filepath Glob hashtables megaparsec mtl mtl-compat old-time parsec + parser-combinators pretty-show regex-tdfa safe split tabular + template-haskell 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 + file-embed filepath Glob hashtables megaparsec mtl mtl-compat + old-time parsec parser-combinators pretty-show regex-tdfa safe + split tabular template-haskell text time transformers uglymemo + utf8-string ]; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = stdenv.lib.licenses.gpl3; @@ -104601,22 +108303,22 @@ 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 + , text-zipper, time, transformers, unix, vector, vty }: mkDerivation { pname = "hledger-ui"; - version = "1.10.1"; - sha256 = "1h4hhsyajpiydvs1p6f4z1s3kblyfn4lvnwwbar6lj4z5jfizm67"; + version = "1.13.1"; + sha256 = "0jafgvnc88r24zab8kijj1v0jj8y2481ybsya3gnf3bfcb7p7xyp"; 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 unix vector + vty ]; description = "Curses-style user interface for the hledger accounting tool"; license = stdenv.lib.licenses.gpl3; @@ -104645,23 +108347,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.13"; + sha256 = "045bhllvxs92r96hx9aaipc9hpaqhv7b3dm2nxc1912iq761wqnp"; 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 ]; @@ -104729,8 +108431,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 ]; @@ -104749,8 +108451,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.1.10"; - sha256 = "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w"; + version = "2.1.14"; + sha256 = "0arz6x0r4pji37papdrc6brybcd2a2sackvhzmhy89ycgy0k04kk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104818,6 +108520,7 @@ self: { ]; description = "Library and utility interfacing to longurl.org"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlrdb" = callPackage @@ -104835,6 +108538,7 @@ self: { ]; description = "High-level Redis Database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlrdb-core" = callPackage @@ -104843,14 +108547,15 @@ 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 ]; description = "High-level Redis Database Core API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hls" = callPackage @@ -104939,6 +108644,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 @@ -104950,31 +108657,6 @@ self: { }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage - ({ mkDerivation, backprop, base, finite-typelits - , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog - , hmatrix, hmatrix-vector-sized, microlens, microlens-platform - , vector, vector-sized - }: - mkDerivation { - pname = "hmatrix-backprop"; - version = "0.1.2.3"; - sha256 = "1x833a48czc2hphswxgwf1ihkgxz13w3bz2d2zs9dqq8xkzdf4mx"; - revision = "1"; - editedCabalFile = "03zrx1kvyz8gn2w2ygd7ql98yimsm3kyrnrr1cc99mz1cm0phnrv"; - libraryHaskellDepends = [ - backprop base ghc-typelits-knownnat ghc-typelits-natnormalise - hmatrix hmatrix-vector-sized microlens vector vector-sized - ]; - testHaskellDepends = [ - backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized - microlens microlens-platform vector-sized - ]; - description = "hmatrix operations lifted for backprop"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hmatrix-backprop_0_1_2_4" = callPackage ({ mkDerivation, backprop, base, finite-typelits , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog , hmatrix, hmatrix-vector-sized, microlens, microlens-platform @@ -104982,8 +108664,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 @@ -105115,27 +108797,25 @@ 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"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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 }: @@ -105220,8 +108900,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 ]; @@ -105260,6 +108940,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 @@ -105268,8 +108949,8 @@ 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 @@ -105411,22 +109092,44 @@ 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; }) {}; + "hmm-lapack" = callPackage + ({ mkDerivation, base, boxes, comfort-array, containers, deepseq + , explicit-exception, fixed-length, lapack, lazy-csv, netlib-ffi + , non-empty, prelude-compat, QuickCheck, random, semigroups, tfp + , transformers, utility-ht + }: + mkDerivation { + pname = "hmm-lapack"; + version = "0.3.0.2"; + sha256 = "1rwxp4gjk2z8k42k7l1g3sy07jl2rhc7xgypjripb3chmfkp6zvn"; + libraryHaskellDepends = [ + base boxes comfort-array containers deepseq explicit-exception + fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat + QuickCheck random semigroups tfp transformers utility-ht + ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Hidden Markov Models using LAPACK primitives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hmp3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, mersenne-random, ncurses, old-time, pcre-light @@ -105609,6 +109312,7 @@ self: { ]; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hnn" = callPackage @@ -105636,7 +109340,7 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; - license = stdenv.lib.licenses.unfree; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -105723,8 +109427,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.7.2"; - sha256 = "0klkgr11p8m03ksrad59pqs0czp6hrgmzxynng4zirbmz643plvf"; + version = "1.8.3"; + sha256 = "1mx0ifkcji8d30f4ar50jraj1sz91n6v803yfb4zaj9wppw2iz57"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106029,6 +109733,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; @@ -106190,21 +109896,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; @@ -106529,24 +110242,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.5"; + sha256 = "1vpx6v8b0jixn82iqz085w2qpyj5pl2qyhrcd0a4p0vs5qmplf60"; 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 ]; @@ -106596,8 +110309,8 @@ self: { pname = "hookup"; version = "0.2.2"; sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf"; - revision = "2"; - editedCabalFile = "12x7h7yg0x9gqv9yj2snp3k221yzyphm1l7aixkz1szxp1pndfgy"; + revision = "4"; + editedCabalFile = "1l52m4pl1l0mrnl4czx25i8xvba03l7bvqskk59cgwfk8q1kk935"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; @@ -106700,8 +110413,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.21.2"; - sha256 = "13064b3ybjsa78gw1dhykl24l1ccqxsdq773zwb95ccz3v4dy65l"; + version = "0.21.3"; + sha256 = "18y6qxb53v9dbjz4mhxvzc0b8jyk909w140y22hxcbwn41vqh48l"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -106717,21 +110430,17 @@ self: { executableToolDepends = [ alex happy ]; description = "hOpenPGP-based command-line tools"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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.4"; + sha256 = "0wbnibaffpmk453jbvh95r1d1scz1ivkj59ddrbd3hf4iwr6rx4x"; 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 ]; @@ -106933,6 +110642,7 @@ self: { ]; description = "date time"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "horizon" = callPackage @@ -106974,17 +110684,15 @@ self: { }: mkDerivation { pname = "hosc"; - version = "0.16"; - sha256 = "1xj5kkpkzzwfi26n28s0gkr9vzkmvp276n9jb75j2ccbr8q79vbj"; - revision = "1"; - editedCabalFile = "0n9ra6qhy5wighwa3zn5496473kdarhdgzsvmhnlp14s6sgw8akb"; + version = "0.17"; + sha256 = "0340lldzim02ixj4n0smfwn20y5i0z7v0gqgbb0mdjs6c90rqhv6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary blaze-builder bytestring data-binary-ieee754 network time transformers ]; description = "Haskell Open Sound Control"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {}; "hosc-json" = callPackage @@ -107003,6 +110711,7 @@ self: { ]; description = "Haskell Open Sound Control JSON Serialisation"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc-utils" = callPackage @@ -107251,24 +110960,6 @@ self: { }) {}; "hp2pretty" = callPackage - ({ mkDerivation, array, attoparsec, base, containers, filepath - , floatshow, mtl, optparse-applicative, semigroups, text - }: - mkDerivation { - pname = "hp2pretty"; - version = "0.8.0.2"; - sha256 = "1j3rn4xjpyqnl8vcsc9pyj03mwpilq20g0z8brh3prsvhjb9gl9g"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array attoparsec base containers filepath floatshow mtl - optparse-applicative semigroups text - ]; - description = "generate pretty graphs from heap profiles"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hp2pretty_0_9" = callPackage ({ mkDerivation, array, attoparsec, base, containers, filepath , floatshow, mtl, optparse-applicative, semigroups, text }: @@ -107284,46 +110975,9 @@ self: { ]; description = "generate pretty graphs from heap profiles"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpack" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal - , containers, cryptonite, deepseq, directory, filepath, Glob, hspec - , http-client, http-client-tls, http-types, HUnit, interpolate - , mockery, pretty, QuickCheck, scientific, template-haskell - , temporary, text, transformers, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.28.2"; - sha256 = "18w0h76jdp3mk9vin8da9iz3cwhcxmw787xy8wlh8bxcpcr16q5r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types pretty scientific text transformers unordered-containers - vector yaml - ]; - executableHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types pretty scientific text transformers unordered-containers - vector yaml - ]; - testHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob hspec http-client http-client-tls - http-types HUnit interpolate mockery pretty QuickCheck scientific - template-haskell temporary text transformers unordered-containers - vector yaml - ]; - description = "An alternative format for Haskell packages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hpack_0_31_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit @@ -107333,8 +110987,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.31.0"; - sha256 = "0lh60zqjzbjq0hkdia97swz0g1r3ihj84fph9jq9936fpb7hm1n9"; + version = "0.31.1"; + sha256 = "0fipbmmj4x588z7vh635mizhym9krydfxr49bgaf7xir4fsb4fmc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107359,7 +111013,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpack-convert" = callPackage @@ -107395,25 +111048,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; - hydraPlatforms = stdenv.lib.platforms.none; + description = "hpack's dhalling"; + license = stdenv.lib.licenses.bsd3; }) {}; "hpaco" = callPackage @@ -107485,7 +111146,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 @@ -107562,8 +111223,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 ]; @@ -107595,6 +111256,7 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Coveralls.io support for Haskell."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-strobe" = callPackage @@ -107684,8 +111346,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.9.0.6"; - sha256 = "07443kb6w1kwcg78j8jaffb5pblv9si7bvsmlg4dbm32m4wd66xx"; + version = "0.9.0.7"; + sha256 = "1l08b668bl9gwbrzkhljg73aizv640gcc7smiafhgrnk2bsl7q2p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107703,6 +111365,7 @@ self: { ]; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplayground" = callPackage @@ -107775,7 +111438,6 @@ self: { testHaskellDepends = [ base bytestring transformers ]; description = "A Haskell pre-processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpqtypes" = callPackage @@ -107788,40 +111450,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.5.3.0"; - sha256 = "1igzja5vy3pfvn2xi4bfbrbnxggxwav16cw2kfjrzkp2xrxq09gz"; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ - aeson async base bytestring containers data-default-class - exceptions lifted-base monad-control mtl resource-pool semigroups - text text-show time transformers transformers-base vector - ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ - aeson base bytestring exceptions HUnit lifted-base monad-control - mtl QuickCheck random scientific test-framework - test-framework-hunit text text-show time transformers-base - unordered-containers vector - ]; - description = "Haskell bindings to libpqtypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) postgresql;}; - - "hpqtypes_1_6_0_0" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers - , data-default-class, directory, exceptions, filepath, HUnit - , lifted-base, monad-control, mtl, postgresql, QuickCheck, random - , resource-pool, scientific, semigroups, test-framework - , test-framework-hunit, text, text-show, time, transformers - , transformers-base, unordered-containers, vector - }: - 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 @@ -107848,10 +111478,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.6.2.0"; - sha256 = "095kxfk12bzl7gl44fa7xmwfnx63707s1jz861hqjmi9dv3mm8kp"; - revision = "1"; - editedCabalFile = "0ifzjs8vvnb9viksgakvjz69yppppgx8iqz2pqvb2dnwjwk4hamd"; + version = "1.7.0.0"; + sha256 = "07cfmaai4d2wb37qqir4apxfbad9n1hb5yj4zpx5aappl213d96f"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash data-default exceptions fields-json hpqtypes lifted-base log-base @@ -107873,8 +111501,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.11"; - sha256 = "0740yc33ginskkiggyaqc1khkb2bzb4vg0r12rj59f3gimzfiwlk"; + version = "2.4.12"; + sha256 = "0xj000ikh3y8dg5sbrl7ycb471qgra4khmk4kq079biasjvhf58a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107973,6 +111601,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell bindings for libpuz"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpygments" = callPackage @@ -108023,23 +111652,51 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hpython" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, containers + , criterion, deepseq, deriving-compat, digit, dlist, filepath + , fingertree, generic-lens, hedgehog, lens, megaparsec, mtl + , parsers, parsers-megaparsec, semigroupoids, text, these + , validation + }: + mkDerivation { + pname = "hpython"; + version = "0.2"; + sha256 = "1c9ryyfm3cdhl3n5vqhzsxi31jl0vg5qaq1n8li1cy843bjgl63a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bifunctors bytestring containers deriving-compat digit dlist + fingertree generic-lens lens megaparsec mtl parsers + parsers-megaparsec semigroupoids text these validation + ]; + executableHaskellDepends = [ base lens text ]; + testHaskellDepends = [ + base filepath hedgehog lens megaparsec text validation + ]; + benchmarkHaskellDepends = [ + base criterion deepseq megaparsec text validation + ]; + description = "Python language tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "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 ]; @@ -108055,6 +111712,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 @@ -108070,7 +111738,6 @@ self: { ]; description = "A query language for transforming HTML5"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hranker" = callPackage @@ -108095,6 +111762,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 @@ -108137,18 +111806,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.1"; - sha256 = "0a2pljkqjvx88cssq24yq8h06md864fvvr77ka0nnmk3znyddn9f"; + 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 = [ @@ -108156,6 +111825,7 @@ self: { ]; description = "A Riemann Client for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hruby" = callPackage @@ -108165,8 +111835,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 @@ -108196,8 +111866,8 @@ self: { ({ mkDerivation, base, syb }: mkDerivation { pname = "hs-bibutils"; - version = "6.6.0.0"; - sha256 = "0n2sz2zl4naspryd49ii858qkjp2lapns5a2gr8zm6vvn5sh1f0l"; + version = "6.7.0.0"; + sha256 = "1qfyssl76lm4g09yxr3y10kmf8cnzls46g5h0ijk0wpk9wlhbln5"; libraryHaskellDepends = [ base syb ]; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; license = "GPL"; @@ -108323,6 +111993,7 @@ self: { ]; description = "Conllu validating parser and utils"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-di" = callPackage @@ -108768,6 +112439,7 @@ self: { testHaskellDepends = [ base HUnit network temporary unix ]; description = "Write a server supporting Server::Starter's protocol in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-snowtify" = callPackage @@ -108882,10 +112554,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 = [ @@ -108899,7 +112569,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Create ATS types from Haskell types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs2bf" = callPackage @@ -108964,6 +112633,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 @@ -108994,6 +112675,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {xenctrl = null;}; + "hsakamai" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , conduit-extra, cryptonite, doctest, http-client, http-conduit + , http-types, memory, optparse-applicative, random, text, unix + , unix-time, uuid, xml-conduit, yaml + }: + mkDerivation { + pname = "hsakamai"; + version = "0.1.0.0"; + sha256 = "1wg0jw7m0hvvv6b5xz0y012kgnx4zxfms53gvryw0zk6ll841h3i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit cryptonite + http-client http-conduit http-types memory random text unix-time + uuid xml-conduit + ]; + executableHaskellDepends = [ + aeson base bytestring case-insensitive conduit conduit-extra + cryptonite http-client http-conduit http-types memory + optparse-applicative random text unix unix-time uuid xml-conduit + yaml + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive conduit cryptonite doctest + http-client http-conduit http-types memory random text unix-time + uuid xml-conduit + ]; + description = "Akamai API(Edgegrid and Netstorage)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsaml2" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, cryptonite, data-default, http-types, HUnit, hxt @@ -109027,8 +112740,8 @@ self: { }: mkDerivation { pname = "hsass"; - version = "0.7.0"; - sha256 = "0mqsj1jm37pqc1vwjs5y5mh4sfhdyclp1vdr7q5nq2a3pa3qwxbk"; + version = "0.8.0"; + sha256 = "1bnjvj6dpmcbpkbi4g5m5hvr0w5rmd7y5zkiwbqc8n9y4l2dkd5g"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers @@ -109174,38 +112887,43 @@ 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; }) {}; "hsc3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , data-default, data-ordlist, directory, filepath, hashable, hosc - , network, process, random, safe, split, transformers, vector + , data-ordlist, directory, filepath, hosc, murmur-hash, network + , process, random, safe, split, transformers, vector }: mkDerivation { pname = "hsc3"; - version = "0.16"; - sha256 = "0m6pas8dx48mx91159s7p7fljnivs13cg34gys906nhq11dmjdqn"; + version = "0.17"; + sha256 = "1k7gm0qk96rm7rphmmwlqh99kn5v79g8szyyhb9cqg3rfv6as1ld"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base binary bytestring containers data-default data-ordlist - directory filepath hashable hosc network process random safe split + array base binary bytestring containers data-ordlist directory + filepath hosc murmur-hash network process random safe split transformers vector ]; description = "Haskell SuperCollider"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {}; "hsc3-auditor" = callPackage @@ -109278,6 +112996,7 @@ self: { libraryHaskellDepends = [ base directory filepath hsc3 process ]; description = "haskell supercollider graph drawing"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-forth" = callPackage @@ -109401,6 +113120,7 @@ self: { ]; description = "Create and control scsynth processes"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-rec" = callPackage @@ -109614,6 +113334,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 { @@ -109667,14 +113468,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; }) {}; @@ -109696,6 +113499,7 @@ self: { testHaskellDepends = [ base containers text ]; description = "Collision-resistant IDs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hscurses" = callPackage @@ -109729,34 +113533,75 @@ 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 + 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 + exceptions filepath monad-loops mtl network optparse-applicative + process text transformers unordered-containers + ]; + testHaskellDepends = [ + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hsdev_0_3_3_0" = callPackage + ({ 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-client, lens + , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl + , network, network-uri, optparse-applicative, process + , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm + , syb, template-haskell, text, text-region, time, transformers + , transformers-base, uniplate, unix, unordered-containers, vector + }: + mkDerivation { + pname = "hsdev"; + version = "0.3.3.0"; + sha256 = "17pylby88xmr8hibhpiyygzdnjwznh1zss4969z6w2dk2489lkrz"; + 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 haddock-api + haddock-library haskell-names haskell-src-exts hdocs hformat hlint + http-client lens lifted-base mmorph monad-control monad-loops mtl + network network-uri optparse-applicative process regex-pcre-builtin + scientific simple-log sqlite-simple stm syb template-haskell text + text-region time transformers transformers-base uniplate unix unordered-containers vector ]; executableHaskellDepends = [ @@ -109765,8 +113610,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; @@ -109807,12 +113652,30 @@ self: { pname = "hsdns"; version = "1.7.1"; sha256 = "0i50p31zxsrkx9hv3mqcl2042lf922b1fsswmd99d66ybkl01kag"; + revision = "1"; + editedCabalFile = "0w4hrmj7ph5dgarl82xpa0g77ncjdqk0wc9wp771pry98xxihzl8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers network ]; + librarySystemDepends = [ adns ]; + description = "Asynchronous DNS Resolver"; + license = stdenv.lib.licenses.lgpl3; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {inherit (pkgs) adns;}; + + "hsdns_1_8" = callPackage + ({ mkDerivation, adns, base, containers, network }: + mkDerivation { + pname = "hsdns"; + version = "1.8"; + sha256 = "0jxnfgzsshhaf3n8ywhxy84l6ldhz5cdwaayr61v26iqgm3c3qk0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers network ]; librarySystemDepends = [ adns ]; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; @@ -109936,8 +113799,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 ]; @@ -110101,8 +113966,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.8.6"; - sha256 = "0ylbg5bcylc0gql0qvmih66dj1qj8imn31b6bl70mynwkqh96g1d"; + version = "0.8.8"; + sha256 = "0q6348iz4w8zfdrzv98vydw5rdxlhqapdqhxrnhd6dqlcjq3rf1j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110115,6 +113980,7 @@ self: { ]; description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsini" = callPackage @@ -110135,16 +114001,19 @@ self: { }) {}; "hsinstall" = callPackage - ({ mkDerivation, base, directory, filepath }: + ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process + , safe-exceptions + }: mkDerivation { pname = "hsinstall"; - version = "1.6"; - sha256 = "04f86mk2304q9kz37hr18b9jcz66wk04z747xzpxbnnwig390406"; + version = "2.2"; + sha256 = "14c98wysvsq4k581s3f5zw44grm6f0wvbmgdda8sshhg7v2059r3"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ + base Cabal directory filepath heredoc process safe-exceptions + ]; description = "Install Haskell software"; license = stdenv.lib.licenses.isc; }) {}; @@ -110214,10 +114083,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 ]; @@ -110295,42 +114164,43 @@ self: { }) {}; "hslua" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, fail - , lua5_3, mtl, QuickCheck, quickcheck-instances, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, fail, lua5_3, mtl, QuickCheck, quickcheck-instances + , tasty, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "0.9.5.2"; - sha256 = "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f"; + version = "1.0.2"; + sha256 = "0w2gcp66ny3crxip0gn86abz8psz2z14nx2z2wna0s8p0n8v5agx"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions fail mtl text ]; librarySystemDepends = [ lua5_3 ]; testHaskellDepends = [ - base bytestring containers QuickCheck quickcheck-instances tasty - tasty-expected-failure tasty-hunit tasty-quickcheck text + base bytestring containers exceptions fail mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text ]; - description = "A Lua language interpreter embedding in Haskell"; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "Bindings to Lua, an embeddable scripting language"; license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage - ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit - , ieee754, QuickCheck, quickcheck-instances, scientific, text - , unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec + , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific + , text, unordered-containers, vector }: mkDerivation { pname = "hslua-aeson"; - version = "0.3.0.2"; - sha256 = "0qfqq2xz5jqws1bh7iwznnv50kgqc1v5xxvnrraqkmz7hh4wyam2"; + version = "1.0.0"; + sha256 = "0wvcf0adv2b5fn7mvi8p6ydzsyzbn43qyk1kjvvi9achrgvc59zz"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base hashable hslua hspec HUnit ieee754 QuickCheck + 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"; @@ -110338,14 +114208,13 @@ self: { }) {}; "hslua-module-text" = callPackage - ({ mkDerivation, base, hslua, tasty, tasty-hunit, text }: + ({ mkDerivation, base, bytestring, hslua, tasty, tasty-hunit, text + }: mkDerivation { pname = "hslua-module-text"; - version = "0.1.2.1"; - sha256 = "0bcfpb1dhnxp0gr376ai4w7vczr9zrjl1r3r6w7kcxivfkwq9cxf"; - revision = "1"; - editedCabalFile = "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n"; - libraryHaskellDepends = [ base hslua 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; @@ -110661,8 +114530,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 @@ -110692,61 +114561,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hspec_2_4_8" = callPackage - ({ mkDerivation, base, call-stack, directory, hspec-core - , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck - , stringbuilder, transformers - }: - mkDerivation { - pname = "hspec"; - version = "2.4.8"; - sha256 = "18pddkfz661b1nr1nziq8cnmlzxiqzzmrcrk3iwn476vi3bf1m4l"; - libraryHaskellDepends = [ - base call-stack hspec-core hspec-discover hspec-expectations HUnit - QuickCheck transformers - ]; - testHaskellDepends = [ - base call-stack directory hspec-core hspec-discover - hspec-expectations hspec-meta HUnit QuickCheck stringbuilder - transformers - ]; - testToolDepends = [ hspec-discover ]; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec" = callPackage - ({ mkDerivation, base, call-stack, directory, hspec-core - , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck - , stringbuilder, transformers + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.5.5"; - sha256 = "1yv4k5b5kkig2q3waj28587sq28wms7wfav5a3lq4dra6jybimfm"; + version = "2.6.1"; + sha256 = "1jkfqhdymr62rzqmlmc22mpla23p67rnls3v3zs30ggxbgs4dxlb"; libraryHaskellDepends = [ - base call-stack hspec-core hspec-discover hspec-expectations HUnit - QuickCheck transformers - ]; - testHaskellDepends = [ - base call-stack directory hspec-core hspec-discover - hspec-expectations hspec-meta HUnit QuickCheck stringbuilder - transformers + base hspec-core hspec-discover hspec-expectations QuickCheck ]; - testToolDepends = [ hspec-discover ]; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; }) {}; - "hspec_2_5_6" = callPackage + "hspec_2_7_0" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.5.6"; - sha256 = "0nfs2a0ymh8nw5v5v16qlbf3np8j1rv7nw3jwa9ib7mlqrmfp9ly"; + version = "2.7.0"; + sha256 = "1qbikvd91cimbn439zwsdcrz0hsl7n2w4cl0vlcw8kbf94nm6z7z"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -110789,43 +114626,16 @@ self: { ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }: mkDerivation { pname = "hspec-contrib"; - version = "0.5.0"; - sha256 = "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv"; + 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; }) {}; - "hspec-core_2_4_8" = callPackage - ({ mkDerivation, ansi-terminal, array, base, call-stack, deepseq - , directory, filepath, hspec-expectations, hspec-meta, HUnit - , process, QuickCheck, quickcheck-io, random, setenv, silently, stm - , temporary, tf-random, time, transformers - }: - mkDerivation { - 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 - tf-random time transformers - ]; - testHaskellDepends = [ - ansi-terminal array base call-stack deepseq directory filepath - hspec-expectations hspec-meta HUnit process QuickCheck - quickcheck-io random setenv silently stm temporary tf-random time - transformers - ]; - testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-core" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta @@ -110834,10 +114644,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.5.5"; - sha256 = "1vfrqlpn32s9wiykmkxbnrnd5p56yznw20pf8fwzw78ar4wpz55x"; - revision = "1"; - editedCabalFile = "1fifkdjhzrvwsx27qcsj0jam66sswjas5vfrzmb75z0xqyg5lpr7"; + version = "2.6.1"; + sha256 = "0xg43kan7p6ahi5827qwcyiic6bq0bp8n0n8h3j4kh87qhdl4avv"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -110849,12 +114657,13 @@ self: { quickcheck-io random setenv silently stm temporary tf-random transformers ]; + testToolDepends = [ hspec-meta ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; }) {}; - "hspec-core_2_5_6" = callPackage + "hspec-core_2_7_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -110862,8 +114671,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.5.6"; - sha256 = "0pj53qna5x742vnkdlhid7ginqv61awgw4csgb5ay2rd6br8q63g"; + version = "2.7.0"; + sha256 = "1y4j0ivngz7jrff1riyy2iirnb5kc9p4cr619wdrsrvrm3blgzrz"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -110888,8 +114697,8 @@ self: { }: mkDerivation { pname = "hspec-dirstream"; - version = "1.0.0.0"; - sha256 = "0xj7qj6j3mp1j3q4pdm0javjc4rw586brcd399ygh74vpa669pgf"; + version = "1.0.0.2"; + sha256 = "1df6rjgwj6rw78dh1ihswk7sgh72c8aqnaaj4r9k0gjq30hkdlfr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base dirstream filepath hspec hspec-core pipes pipes-safe @@ -110900,32 +114709,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hspec-discover_2_4_8" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck - }: - mkDerivation { - pname = "hspec-discover"; - version = "2.4.8"; - sha256 = "0llwdfpjgfpi7dr8caw0fldb9maqznmqh4awkvx72bz538gqmlka"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck - ]; - description = "Automatically discover and run Hspec tests"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-discover" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.5.5"; - sha256 = "04aidzi91ccr9bygmfkjzshz34z9vh8wvqj4zinx2clxq6r7gqfz"; + version = "2.6.1"; + sha256 = "189gj8drfzdf3j3xm8gbj9hjc1ha95ajhi47s9r440yjhyarlmlx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -110933,17 +114723,18 @@ self: { testHaskellDepends = [ base directory filepath hspec-meta QuickCheck ]; + testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; license = stdenv.lib.licenses.mit; }) {}; - "hspec-discover_2_5_6" = callPackage + "hspec-discover_2_7_0" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.5.6"; - sha256 = "0ilaq6l4gikpv6m82dyzfzhdq2d6x3h5jc7zlmw84jx43asqk5lc"; + version = "2.7.0"; + sha256 = "1n3by0dn3x3kfy7vnyfdz0dr2wwwj82m0ijlm9s1n6aa976xddhw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -111137,8 +114928,8 @@ self: { ({ mkDerivation, base, hspec, hspec-core, HUnit, leancheck }: mkDerivation { pname = "hspec-leancheck"; - version = "0.0.2"; - sha256 = "1780xhwmbvkhca3l6rckbnr92f7i3icarwprdcfnrrdpk4yq9ml8"; + 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"; @@ -111146,22 +114937,6 @@ self: { }) {}; "hspec-megaparsec" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-expectations - , megaparsec - }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "1.0.0"; - sha256 = "1dafrbzjm7rzwvcpjpk3bsg7bd111xfij94n17sh8wfykzhim5hl"; - libraryHaskellDepends = [ - base containers hspec-expectations megaparsec - ]; - testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hspec-megaparsec_2_0_0" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec }: @@ -111169,41 +114944,17 @@ self: { pname = "hspec-megaparsec"; version = "2.0.0"; sha256 = "0c4vb0c2y8yar0jjhh24wkkp1g7pbg2wc8h8nw3avfznbil6zyd8"; + revision = "1"; + editedCabalFile = "15hpf1v1d4dwzdvk7xhgj37yd37pcyj6yzw750k1fcj6j0hk4rb7"; libraryHaskellDepends = [ base containers hspec-expectations megaparsec ]; testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; description = "Utility functions for testing Megaparsec parsers with Hspec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-meta" = callPackage - ({ mkDerivation, ansi-terminal, array, async, base, call-stack - , deepseq, directory, filepath, hspec-expectations, HUnit - , QuickCheck, quickcheck-io, random, setenv, time, transformers - }: - mkDerivation { - pname = "hspec-meta"; - version = "2.4.6"; - sha256 = "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv time transformers - ]; - executableHaskellDepends = [ - ansi-terminal array async base call-stack deepseq directory - filepath hspec-expectations HUnit QuickCheck quickcheck-io random - setenv time transformers - ]; - description = "A version of Hspec which is used to test Hspec itself"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-meta_2_5_6" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, HUnit , QuickCheck, quickcheck-io, random, setenv, stm, time @@ -111211,10 +114962,10 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.5.6"; - sha256 = "196dyacvh7liq49ccwd5q0dw6n74igrvhk35zm95i3y8m44ky3a4"; + version = "2.6.0"; + sha256 = "1n1a4633wfivylglji8920f67mx7qz8j4q58n8p7dxk6yg4h3mz6"; revision = "1"; - editedCabalFile = "0c7dq1vvk09fj6nljwwshgpkszg725hrpgnq9l2aka230sig9vz4"; + editedCabalFile = "1qh3j6mhlz2bvdk8qc5fa4nqh93q4vqnvxmqqisg4agacnvyp4b2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111229,7 +114980,6 @@ self: { ]; 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 @@ -111270,8 +115020,8 @@ self: { }: mkDerivation { pname = "hspec-need-env"; - version = "0.1.0.0"; - sha256 = "0ny2qbj5ipa8nsigx70x4mhdv5611fis0dm4j9i82zkxc2l92b9d"; + version = "0.1.0.3"; + sha256 = "164ng7ryb9dpw2v0wazi9s8xqwsx9yla83p0ln05m6zlirpp6jc6"; libraryHaskellDepends = [ base hspec-core hspec-expectations ]; testHaskellDepends = [ base hspec hspec-core setenv transformers ]; description = "Read environment variables for hspec tests"; @@ -111482,8 +115232,8 @@ self: { }: mkDerivation { pname = "hspec-wai"; - version = "0.9.0"; - sha256 = "1fnzarsksv8hwawggimvy3qyb8k5vkj3971xkg86lzdpl789xzn8"; + version = "0.9.2"; + sha256 = "0gr8j8x8vvzygxyqc0likam63f3427x4p73g95a387aksr5l2ph5"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive hspec-core hspec-expectations http-types QuickCheck text transformers wai @@ -111504,8 +115254,8 @@ self: { }: mkDerivation { pname = "hspec-wai-json"; - version = "0.9.0"; - sha256 = "11c0w9mg4syd532mnbrdiib4a07k1qm70x02jm3gqzzwlwgl1id1"; + version = "0.9.2"; + sha256 = "1p6adknahl357cjkfg32aha6v79mwwr55isgl4hj2rh45r429qw2"; libraryHaskellDepends = [ aeson aeson-qq base bytestring case-insensitive hspec-wai template-haskell @@ -111544,6 +115294,7 @@ self: { libraryHaskellDepends = [ base hspec hspec-discover ]; description = "Alpha version of Hspec 2.0"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspecVariant" = callPackage @@ -111903,6 +115654,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 { @@ -111979,6 +115753,8 @@ self: { pname = "hstatistics"; version = "0.3"; sha256 = "1v7f2844p6bjzcwc2pnjyb8zl42kw1x021gcn688dvdxs6cgdwvs"; + revision = "1"; + editedCabalFile = "0qcp1kgpwnqphqq1fd92lfp8d0vcf3l6ighsdiqin51qg499xz9w"; libraryHaskellDepends = [ array base hmatrix hmatrix-gsl-stats random vector ]; @@ -112073,25 +115849,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; }) {}; @@ -112270,6 +116050,7 @@ self: { ]; description = "hsp+jmacro support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsx-xhtml" = callPackage @@ -112290,8 +116071,8 @@ self: { }: mkDerivation { pname = "hsx2hs"; - version = "0.14.1.3"; - sha256 = "15y7mk01cffc1xgsddkqqmi76npbi7mikgia6xa3xk4916kwsl91"; + version = "0.14.1.5"; + sha256 = "0cw66j3firzgg5c7689y0kffgfq36yn4y17yprbbgv6kw4g7wid4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112315,16 +116096,14 @@ self: { }) {}; "hsyslog" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: + ({ mkDerivation, base }: mkDerivation { pname = "hsyslog"; - version = "5.0.1"; - sha256 = "05k0ckgqzjpa3mqamlswi0kpvqxvq40awip0cvhpzjx64240vpl6"; + version = "5.0.2"; + sha256 = "1kkypn0dd92aqv8dr112bhkr9k9r9mchnyyvy41kvhj2zg447v1y"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; description = "FFI interface to syslog(3) from POSIX.1-2001"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; @@ -112352,14 +116131,15 @@ 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 ]; testHaskellDepends = [ base hspec time ]; description = "Log to syslog over a network via UDP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hszephyr" = callPackage @@ -112466,6 +116246,7 @@ self: { ]; description = "Import from the Tiled map editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "htime" = callPackage @@ -112501,8 +116282,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "htlset"; - version = "0.1.0.0"; - sha256 = "18wbw6zfb424xq3m05hjxypiiaqc75nd365y9l8035dvi29mfbnf"; + version = "0.1.0.1"; + sha256 = "0i7qipq0dbyd9zqjl1n6sxzma066293gpbxwqwd84wiw3vw2gz3w"; libraryHaskellDepends = [ base containers ]; description = "Heterogenous Set"; license = stdenv.lib.licenses.bsd3; @@ -112573,8 +116354,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 @@ -112749,6 +116530,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 @@ -112840,8 +116648,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "2.1.0.2"; - sha256 = "0m5v4f6djwr6sr9sndfal4gwxl0ryq2cg661ka8br7v1ww2d70yl"; + version = "2.1.0.3"; + sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -112947,6 +116755,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "htssets" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "htssets"; + version = "0.2.0.0"; + sha256 = "15wbafj54yfipp3pfqk0yd5qlzm76457mngv1fs899sp31y2m2cv"; + libraryHaskellDepends = [ base containers ]; + description = "Heterogenous Sets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-accept" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -112956,30 +116775,30 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Functions for working with HTTP Accept headers"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-api-data" = callPackage - ({ mkDerivation, attoparsec, attoparsec-iso8601, base, bytestring - , Cabal, cabal-doctest, containers, directory, doctest, filepath - , hashable, hspec, hspec-discover, http-types, HUnit, QuickCheck - , quickcheck-instances, text, time, time-locale-compat - , unordered-containers, uri-bytestring, uuid-types + ({ 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.3.8.1"; - sha256 = "1cq6459b8wz6nvkvpi89dg189n5q2xdq4rdq435hf150555vmskf"; - revision = "1"; - editedCabalFile = "1843bapm2rdkl4941rycryircpqpp7mbal7vgmlikf11f8ws7y7x"; + version = "0.4"; + sha256 = "12ja2rrs6dvajw300agp4fms21859a7n193m7nicmwixy8wkyzl3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - attoparsec attoparsec-iso8601 base bytestring containers hashable - http-types text time time-locale-compat unordered-containers - uri-bytestring uuid-types + attoparsec attoparsec-iso8601 base base-compat bytestring + containers cookie hashable http-types tagged text time + time-locale-compat unordered-containers uuid-types ]; testHaskellDepends = [ - base bytestring directory doctest filepath hspec HUnit QuickCheck - quickcheck-instances text time unordered-containers uuid-types + 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"; @@ -113007,8 +116826,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 @@ -113025,6 +116844,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client_0_6_1" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , case-insensitive, containers, cookie, deepseq, directory + , exceptions, filepath, ghc-prim, hspec, http-types, memory + , mime-types, monad-control, network, network-uri, random, stm + , streaming-commons, text, time, transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.6.1"; + sha256 = "0ryj5far7744c297ji9aaqcm56rpm2fyma8mbghli086nq4xiryl"; + libraryHaskellDepends = [ + array base blaze-builder bytestring case-insensitive containers + cookie deepseq exceptions filepath ghc-prim http-types memory + mime-types network network-uri random stm streaming-commons text + time transformers + ]; + testHaskellDepends = [ + async base blaze-builder bytestring case-insensitive containers + deepseq directory hspec http-types monad-control network + network-uri streaming-commons text time transformers zlib + ]; + doCheck = false; + description = "An HTTP client engine"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -113104,14 +116951,18 @@ self: { }) {}; "http-client-openssl" = callPackage - ({ mkDerivation, base, HsOpenSSL, hspec, http-client, http-types - , network + ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client + , http-types, network }: mkDerivation { pname = "http-client-openssl"; - version = "0.2.2.0"; - sha256 = "1ahh2b34cwkmspwg8zilf2llmayf03p33z2gsw455wkhgfbhshcn"; - libraryHaskellDepends = [ base HsOpenSSL http-client network ]; + version = "0.3.0.0"; + sha256 = "0y7d1bp045mj1lnbd74a1v4viv5g5awivdhbycq75hnvqf2n50vl"; + revision = "2"; + editedCabalFile = "0p8vgakciq8ar9pfahh1bmriann3h0xn4z3xb328lgbcxxxpwqfd"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL http-client network + ]; testHaskellDepends = [ base HsOpenSSL hspec http-client http-types ]; @@ -113267,10 +117118,10 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.3.2"; - sha256 = "1iay4hr0mj8brkxvgkv1liqa8irl9axfc3qhn8qsvcyq4n1l95km"; + version = "2.3.5"; + sha256 = "0hbdsp5x7mwxcjkshkf0hqfgkjcsy1g34m4im5v078izhv3fzad9"; revision = "1"; - editedCabalFile = "0g6rg8r33q5rmrx5287vjfcqwjacchgzyfc8aqqrhrfz3fq5ll0g"; + editedCabalFile = "03yfl2n04blmmqca18b18jwplmcz7qjzqjgzrrzbd1nr290ivqjz"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra http-client http-client-tls http-types mtl resourcet transformers unliftio-core @@ -113330,7 +117181,6 @@ self: { ]; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-date" = callPackage @@ -113431,6 +117281,8 @@ self: { pname = "http-io-streams"; version = "0.1.0.0"; sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv"; + revision = "1"; + editedCabalFile = "10fcy17ny5qvabm98md9j8r7vfklgzxvg89iinna7wm4v6q6j5w5"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder bytestring case-insensitive containers directory HsOpenSSL io-streams mtl @@ -113438,6 +117290,7 @@ self: { ]; description = "HTTP client based on io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-kinder" = callPackage @@ -113529,10 +117382,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 ]; @@ -113561,6 +117412,7 @@ self: { ]; description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-pony" = callPackage @@ -113832,8 +117684,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 ]; @@ -113858,29 +117710,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; @@ -113892,8 +117744,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 ]; @@ -113908,8 +117760,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 = [ @@ -113923,16 +117775,15 @@ self: { "http2-client-grpc" = callPackage ({ mkDerivation, async, base, binary, bytestring, case-insensitive , data-default-class, http2, http2-client, http2-grpc-types, lens - , proto-lens, proto-lens-protoc, text, tls + , proto-lens, text, tls }: mkDerivation { pname = "http2-client-grpc"; - version = "0.5.0.3"; - sha256 = "19vzrln75y64gkmzxcasmzxp8qsccg9jpr0z5k9s8w0g5vnfmp9x"; + version = "0.5.0.4"; + sha256 = "1277qp7gvwvqb12pz6j2nm08zdgx9nia4zak9d4pyw147dcf9qwv"; libraryHaskellDepends = [ async base binary bytestring case-insensitive data-default-class - http2 http2-client http2-grpc-types lens proto-lens - proto-lens-protoc text tls + http2 http2-client http2-grpc-types lens proto-lens text tls ]; testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; @@ -113948,8 +117799,8 @@ self: { pname = "http2-grpc-types"; version = "0.3.0.0"; sha256 = "0r3gfc8alm535hqmyy39hd7nhpp3dmba52l4wf38bj7j3ckggpy5"; - revision = "1"; - editedCabalFile = "10gmgp63ll7zv8sbcw2klc0xi4qaiakbgsv46a5gv1pdgwh78w8b"; + revision = "2"; + editedCabalFile = "0b3dpd1krsaxxbg08vp9m2r2f2w4ab1dylb6bp945dfyr7fl6c1c"; libraryHaskellDepends = [ base binary bytestring case-insensitive proto-lens zlib ]; @@ -113963,8 +117814,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 ]; @@ -114043,6 +117894,34 @@ 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.2"; + sha256 = "0ggb6g6cdx6qzvda4l2z9danq5pkwncf3p2cyb68bwghs988fgxs"; + 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 = "Bindings for TVM machine learning framework"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {tvm_runtime = null;}; + "htzaar" = callPackage ({ mkDerivation, base, OpenGL, random, SDL }: mkDerivation { @@ -114238,8 +118117,8 @@ self: { ({ mkDerivation, base, criterion, doctest, Glob }: mkDerivation { pname = "human-readable-duration"; - version = "0.2.0.3"; - sha256 = "1nlrfp4j9i83gym765srndqaa62f22jwqzbmmql8fn4l54dakwwk"; + version = "0.2.1.3"; + sha256 = "1zq85v9knc73ck9lqrn4k0w121ifpjg7j053qmhgam0605j89236"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; benchmarkHaskellDepends = [ base criterion ]; @@ -114310,8 +118189,8 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.2.0.6"; - sha256 = "10zndwkgpliyycyynfd34nhzplfhs9cychpznzzcwbpckx3w5ajl"; + version = "1.2.1.0"; + sha256 = "075xx6rz1bxyj00plkrfz04wfq1rim8nkn43xj0d7js86qhvqyrc"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -114562,6 +118441,7 @@ self: { ]; description = "R5RS Scheme interpreter, compiler, and library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "husk-scheme-libs" = callPackage @@ -114577,6 +118457,7 @@ self: { ]; description = "Extra libraries for the husk Scheme platform"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "husky" = callPackage @@ -114667,6 +118548,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 @@ -114686,39 +118579,43 @@ self: { ]; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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 = [ @@ -114728,6 +118625,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 { @@ -114741,42 +118656,71 @@ self: { "hw-dsv" = callPackage ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion - , deepseq, directory, hedgehog, hspec, hspec-discover, hw-bits + , 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.4"; + sha256 = "0bp9c2023iyalsgf5ih9aray1ifbmarqkl88whwrkh333lys946f"; 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 ]; 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-eliasfano" = callPackage ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-packed-vector , hw-prim, QuickCheck, safe, vector @@ -114793,6 +118737,7 @@ self: { ]; description = "Elias-Fano"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-excess" = callPackage @@ -114811,6 +118756,7 @@ self: { ]; description = "Excess"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-fingertree" = callPackage @@ -114862,6 +118808,20 @@ self: { }) {}; "hw-hspec-hedgehog" = callPackage + ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: + mkDerivation { + pname = "hw-hspec-hedgehog"; + version = "0.1.0.4"; + sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq"; + revision = "2"; + editedCabalFile = "1jh0p4i87c2bn926s0d7qx6ykssjj26fia0d24grlklkd14bnmpq"; + libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; + testHaskellDepends = [ base hedgehog hspec ]; + description = "Interoperability between hspec and hedgehog"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-hspec-hedgehog_0_1_0_5" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit , transformers }: @@ -114869,14 +118829,15 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.0.5"; sha256 = "0kznqpliqnahyayi1q08mfz4qwhqvz54hb8cv6r2ps3lyjnpmlfk"; - revision = "1"; - editedCabalFile = "05fg0d89652yhsji35ckh9qiiy4y7c04i6zya9hrkgwl2jaq55fv"; + revision = "2"; + editedCabalFile = "0rnmwi88yj0xdnywwzswhcwgs6pj5s1m3vpgvbz31r4jpz8mvfkh"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; testHaskellDepends = [ base hedgehog hspec ]; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-int" = callPackage @@ -114891,31 +118852,19 @@ self: { }) {}; "hw-ip" = callPackage - ({ mkDerivation, base, hedgehog, hspec, hw-hspec-hedgehog }: - mkDerivation { - pname = "hw-ip"; - version = "0.1.0.0"; - sha256 = "1gw0g6xd6q2rbnpb8j2yi8ddq39r2l8rplx8nfwk9mqzpgxx0r1n"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; - description = "Library for manipulating IP addresses and CIDR blocks"; - 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 + ({ mkDerivation, appar, base, containers, generic-lens, hedgehog + , hspec, hw-bits, hw-hspec-hedgehog, iproute, text }: mkDerivation { pname = "hw-ip"; - version = "0.2.0.2"; - sha256 = "0c2nz9iq5x7mys90zy29ka4zkdggqngz77wjm51kv1jp7rsnpqn7"; + version = "2.0.1.0"; + sha256 = "1r1ck890id7x9b1dpp23h656mvh24bacxdbvxhgkdjiryklrjsqr"; libraryHaskellDepends = [ - attoparsec base generic-lens hw-bits text + appar base containers generic-lens hw-bits iproute text ]; testHaskellDepends = [ - attoparsec base generic-lens hedgehog hspec hw-bits - hw-hspec-hedgehog text + appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog + text ]; description = "Library for manipulating IP addresses and CIDR blocks"; license = stdenv.lib.licenses.bsd3; @@ -114924,75 +118873,72 @@ self: { "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, conduit, containers, criterion, dlist, hspec - , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-mquery - , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, mmap - , mono-traversable, parsec, QuickCheck, resourcet, text - , transformers, vector, word8 + , bytestring, containers, criterion, directory, dlist, hspec + , hw-balancedparens, hw-bits, hw-mquery, hw-parser, hw-prim + , hw-rankselect, hw-rankselect-base, lens, mmap + , optparse-applicative, text, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.6.0.0"; - sha256 = "1na1xcgnnig27cv1v773jr7mv5izv8n1dnf6k3irw9rml3l213mv"; - revision = "1"; - editedCabalFile = "18w22jnsjv8f4k2q3548vdzl80p4r80pn96rnp69f6l36ibmx771"; + version = "0.9.0.1"; + sha256 = "00prvi3jrb02g92vq1ghyxpdpqangj482x1k3l13s385804grgqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring conduit containers - dlist hw-balancedparens hw-bits hw-conduit hw-mquery hw-parser - hw-prim hw-rankselect hw-rankselect-base mmap mono-traversable - resourcet text vector word8 + ansi-wl-pprint array attoparsec base bytestring containers dlist + hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect + hw-rankselect-base mmap text vector word8 ]; executableHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring conduit containers - criterion dlist hw-balancedparens hw-bits hw-conduit hw-diagnostics - hw-mquery hw-parser hw-prim hw-rankselect hw-rankselect-base mmap - mono-traversable resourcet text vector word8 + base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery + hw-prim hw-rankselect hw-rankselect-base lens mmap + optparse-applicative vector ]; testHaskellDepends = [ - attoparsec base bytestring conduit containers hspec - hw-balancedparens hw-bits hw-conduit hw-prim hw-rankselect - hw-rankselect-base mmap parsec QuickCheck resourcet transformers - vector + attoparsec base bytestring containers hspec hw-balancedparens + hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector ]; benchmarkHaskellDepends = [ - base bytestring conduit criterion hw-balancedparens hw-bits - hw-conduit hw-prim hw-rankselect hw-rankselect-base mmap resourcet - vector + base bytestring criterion directory hw-balancedparens hw-bits + hw-prim hw-rankselect hw-rankselect-base mmap vector ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hw-json_0_8_1_0" = callPackage + "hw-json_1_0_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 + , bits-extra, bytestring, criterion, directory, dlist, hedgehog + , hspec, hspec-discover, hw-balancedparens, hw-bits + , hw-hspec-hedgehog, hw-json-simd, hw-mquery, hw-parser, hw-prim + , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap + , optparse-applicative, text, transformers, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.8.1.0"; - sha256 = "1dllysbajkjsyb0rr9rhp2pmyrl99l7n086w8ifkm3491vgph179"; + version = "1.0.0.1"; + sha256 = "1svynix1vilp6w5azm0nlkx3b92m5x8plnj8jnw4k6ybr4mdw32b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring containers dlist + ansi-wl-pprint array attoparsec base bits-extra bytestring dlist hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect - hw-rankselect-base mmap text vector word8 + hw-rankselect-base hw-simd mmap text vector word8 ]; executableHaskellDepends = [ - base bytestring criterion dlist hw-balancedparens hw-bits hw-mquery - hw-prim hw-rankselect hw-rankselect-base mmap vector + base bytestring dlist hw-balancedparens hw-json-simd hw-mquery + hw-prim hw-rankselect hw-rankselect-base lens mmap + optparse-applicative vector ]; testHaskellDepends = [ - attoparsec base bytestring containers hspec hw-balancedparens - hw-bits hw-prim hw-rankselect hw-rankselect-base mmap vector + attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base + transformers vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base bytestring criterion directory hw-balancedparens hw-bits - hw-prim hw-rankselect hw-rankselect-base mmap vector + base bytestring criterion directory mmap ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; @@ -115018,6 +118964,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-json-simd" = callPackage + ({ mkDerivation, base, bytestring, c2hs, hw-prim, lens + , optparse-applicative, vector + }: + mkDerivation { + pname = "hw-json-simd"; + version = "0.1.0.1"; + sha256 = "0pi67lyx9ysvgfsk75a4yzmfrn65f7i65pp2m6z5hd5svali37sw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + base bytestring hw-prim lens optparse-applicative vector + ]; + testHaskellDepends = [ base bytestring hw-prim lens vector ]; + description = "SIMD-based JSON semi-indexer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache , containers, errors, hashable, hspec, http-client, http-types @@ -115026,8 +118993,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "2.1.0"; - sha256 = "06yz55g4hqv8lbx0ywkiwwww81dmk44zi37s7sq09vkvbk9hm9v2"; + version = "4.0.0"; + sha256 = "0khqvd1l44bx4mnrv7hbvr0qbak6n17l4qqk3lwga21qnchnlgak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115046,21 +119013,22 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, rdkafka, transformers, unix + , either, hspec, monad-loops, rdkafka, text, transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "2.5.0"; - sha256 = "0cr3s26ivb46d14mglnr9phhnsj85h8n3b8p6lmcjk1xs4jidick"; + version = "2.6.0"; + sha256 = "1318gyl3jn3q2namzpzf0254hqpib2nn1kipf6gnfp4dvwv0wbgn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors bytestring containers transformers unix + base bifunctors bytestring containers text transformers unix ]; librarySystemDepends = [ rdkafka ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base bifunctors bytestring containers either hspec monad-loops + base bifunctors bytestring containers either hspec monad-loops text + transformers ]; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; @@ -115073,8 +119041,8 @@ self: { }: mkDerivation { pname = "hw-kafka-conduit"; - version = "2.5.0"; - sha256 = "0n495336vhikd0r5j6i8ydrxv3xwwckbg2ympaf3flcsjv4bwc08"; + version = "2.6.0"; + sha256 = "0z3rhxzj8zni2z0mb7aka21dblyniqby0qf2y6cnnjw6gmvrkc1b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115090,18 +119058,54 @@ self: { }) {}; "hw-mquery" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }: + ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, lens, QuickCheck, semigroups + }: mkDerivation { pname = "hw-mquery"; - version = "0.1.0.1"; - sha256 = "0g8i7vlb0xhmcwdkvakmr6j7hy8gfyil4w0vnygshmqb96qaajkj"; + version = "0.1.0.3"; + sha256 = "0i020vl1f2nkk80rd1fmx9ilkrzyggp01ka3bz9n0365mcq5g3s5"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ ansi-wl-pprint base dlist ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.mit; + libraryHaskellDepends = [ + ansi-wl-pprint base dlist lens semigroups + ]; + executableHaskellDepends = [ + ansi-wl-pprint base dlist lens semigroups + ]; + testHaskellDepends = [ + ansi-wl-pprint base dlist hedgehog hspec hw-hspec-hedgehog lens + QuickCheck semigroups + ]; + testToolDepends = [ hspec-discover ]; + description = "Monadic query DSL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hw-mquery_0_2_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, lens, QuickCheck, semigroups + }: + mkDerivation { + pname = "hw-mquery"; + version = "0.2.0.0"; + sha256 = "006p6j77gd68mrdfwghx29wxyyxam3khicgkaadi8b97aza3nz3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base dlist lens semigroups + ]; + executableHaskellDepends = [ + ansi-wl-pprint base dlist lens semigroups + ]; + testHaskellDepends = [ + ansi-wl-pprint base dlist hedgehog hspec hw-hspec-hedgehog lens + QuickCheck semigroups + ]; + testToolDepends = [ hspec-discover ]; + description = "Monadic query DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-packed-vector" = callPackage @@ -115120,24 +119124,10 @@ self: { ]; description = "Packed Vector"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-parser" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hw-prim - , mono-traversable, text - }: - mkDerivation { - pname = "hw-parser"; - version = "0.0.0.3"; - sha256 = "1wn68s00smwnivi813jcb71mx095v1kjgd2253gqknpmdv3ig16x"; - libraryHaskellDepends = [ - attoparsec base bytestring hw-prim mono-traversable text - ]; - description = "Simple parser support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-parser_0_1_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hw-prim, text }: mkDerivation { pname = "hw-parser"; @@ -115158,31 +119148,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.6.2.14"; - sha256 = "18x7gxvn8p55j5iva4ag31kmdzcvlq76a56shsnh821xw3aw6ala"; - 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; - }) {}; - - "hw-prim_0_6_2_15" = 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.15"; - sha256 = "10ab0fmygcgwm748m6grpfdzfxixsns2mbxhxhj3plmcbkfxxbyc"; + version = "0.6.2.22"; + sha256 = "16dfajzylki7g7p8q2a79dvx3xymxkrpckajdks9k3q4rxsc6k0i"; libraryHaskellDepends = [ base bytestring mmap semigroups transformers vector ]; @@ -115219,39 +119186,6 @@ self: { }) {}; "hw-rankselect" = callPackage - ({ mkDerivation, base, bytestring, conduit, criterion, deepseq - , directory, hedgehog, hspec, hw-balancedparens, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap - , QuickCheck, resourcet, vector - }: - mkDerivation { - pname = "hw-rankselect"; - version = "0.10.0.3"; - sha256 = "1jqlyprb83bnffmq6ck6xpx27mqnmrarn890r2dn8k06asghf7da"; - revision = "1"; - editedCabalFile = "1rkni89h3sq02y03phb2bgx4yrx4gly9mzan6r4ziph0qayf09wf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base - vector - ]; - executableHaskellDepends = [ - base directory hw-bits hw-prim hw-rankselect-base mmap vector - ]; - testHaskellDepends = [ - base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog - hw-prim hw-rankselect-base mmap QuickCheck vector - ]; - benchmarkHaskellDepends = [ - base bytestring conduit criterion directory hw-bits hw-prim - hw-rankselect-base mmap resourcet vector - ]; - description = "Rank-select"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-rankselect_0_12_0_4" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, hedgehog, hspec, hw-balancedparens, hw-bits , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens @@ -115306,6 +119240,7 @@ self: { ]; description = "Rank-select base"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-simd" = callPackage @@ -115316,8 +119251,8 @@ self: { }: mkDerivation { pname = "hw-simd"; - version = "0.1.1.2"; - sha256 = "0jcd6clhcqdmkcvhvf68xldgmx4n1wp333438ypbwk2mwp1q559l"; + version = "0.1.1.3"; + sha256 = "0wryx86ycpcyw1dyp2ks1j0rk7pk6yqihmwsa1sij1pf36qdkbrq"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base vector @@ -115338,6 +119273,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-streams" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , ghc-prim, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, hw-prim, mmap, primitive, QuickCheck + , semigroups, transformers, vector + }: + mkDerivation { + pname = "hw-streams"; + version = "0.0.0.10"; + sha256 = "08ghjvgyd13b1mby213j86p9b8fbk3j3jbj1n9czq4w9sbsbpxxw"; + 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 + ]; + testToolDepends = [ hspec-discover ]; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-string-parse" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { @@ -115366,6 +119330,7 @@ self: { ]; description = "Succint datastructures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-vector" = callPackage @@ -115380,19 +119345,21 @@ self: { testHaskellDepends = [ base hspec QuickCheck vector ]; description = "Vector type with convenient typeclass instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-xml" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, cereal, conduit, containers, criterion, deepseq - , ghc-prim, hspec, hw-balancedparens, hw-bits, hw-conduit - , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap - , mtl, QuickCheck, resourcet, transformers, vector, word8 + , ghc-prim, hspec, hspec-discover, hw-balancedparens, hw-bits + , hw-conduit, hw-parser, hw-prim, hw-rankselect, hw-rankselect-base + , lens, mmap, mtl, QuickCheck, resourcet, transformers, vector + , word8 }: mkDerivation { pname = "hw-xml"; - version = "0.1.0.3"; - sha256 = "15vycayfmykds6dka0kw106fjk2wg3qgifk698fwkj1i4chsia97"; + version = "0.1.0.4"; + sha256 = "1ay4qz30m1aiych3rypbmpfbsc8wjal5w4l7h1zm44hl9ghiap9d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -115411,12 +119378,14 @@ self: { hw-conduit hw-prim hw-rankselect hw-rankselect-base QuickCheck vector ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring conduit criterion hw-balancedparens hw-bits hw-conduit hw-prim mmap resourcet vector ]; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwall-auth-iitk" = callPackage @@ -115467,8 +119436,8 @@ self: { }: mkDerivation { pname = "hwhile"; - version = "0.1.1.2"; - sha256 = "1zilz8fdy90dpq6rzj98d70jw5j668fqpx28jhkpj50k72xlrpkb"; + version = "0.1.1.3"; + sha256 = "1cd5a6szangr456dsw6j4zf8cgg30lw4dkhsjhw02lag9ips6v7s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115521,6 +119490,40 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hws" = callPackage ({ mkDerivation, array, base, containers, directory, haskell98 , html, mtl, network, old-time, regex-compat, text, unix @@ -115727,6 +119730,7 @@ self: { libraryHaskellDepends = [ base bytestring curl hxt parsec ]; description = "LibCurl interface for HXT"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-expat" = callPackage @@ -115738,6 +119742,7 @@ self: { libraryHaskellDepends = [ base bytestring hexpat hxt ]; description = "Expat parser for HXT"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-extras" = callPackage @@ -115794,6 +119799,7 @@ self: { libraryHaskellDepends = [ base hxt mtl ]; description = "Utility functions for using HXT picklers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-regex-xmlschema" = callPackage @@ -115844,6 +119850,7 @@ self: { ]; description = "TagSoup parser for HXT"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-unicode" = callPackage @@ -115869,6 +119876,7 @@ self: { ]; description = "The XPath modules for HXT"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-xslt" = callPackage @@ -115884,6 +119892,7 @@ self: { ]; description = "The XSLT modules for HXT"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxthelper" = callPackage @@ -116296,7 +120305,6 @@ self: { libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyper-extra" = callPackage @@ -116312,7 +120320,6 @@ self: { ]; description = "Display instances for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyper-haskell-server" = callPackage @@ -116524,8 +120531,8 @@ self: { }: mkDerivation { pname = "hyraxAbif"; - version = "0.2.3.10"; - sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b"; + version = "0.2.3.15"; + sha256 = "1wfmlqgk751ij30x0dkyc9fyc6j1a96l0s7fjj1sywdvawd8cfh1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116538,7 +120545,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 @@ -116583,7 +120590,6 @@ self: { ]; description = "Haskell interface to Zenity dialogs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hzk" = callPackage @@ -116657,8 +120663,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 @@ -116666,6 +120672,7 @@ self: { ]; description = "iCalendar data types, parser, and printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iException" = callPackage @@ -116991,10 +120998,8 @@ self: { }: mkDerivation { pname = "identicon-style-squares"; - version = "0.1.0.0"; - sha256 = "12iawbazg5dd6n2giyib3ihj42xh9fnp53lgi3a5gd5x8spixwi9"; - revision = "1"; - editedCabalFile = "00ry1hxan1kgq46wdq3l5n7aiv9v54kmyc7zh4xczvikn6x0gcg9"; + version = "0.1.0.1"; + sha256 = "1x456v7fb211f7ciipp2bfn9fvh5w4i34bl5mjw7bkn7hgsaa3x6"; libraryHaskellDepends = [ base identicon JuicyPixels polyvariadic ]; @@ -117112,8 +121117,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; @@ -117140,6 +121145,7 @@ self: { ]; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -117642,8 +121648,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "ihs"; - version = "0.1.0.2"; - sha256 = "0cprv8g7kz07s5954020ac9yfggf3d2wmwp4xa61q4sz5rs7wiwq"; + version = "0.1.0.3"; + sha256 = "1zfmxgb3l7mihzjyggzb30d9b57y2z80yk562z2x2padsqx95gqk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; @@ -117806,8 +121812,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 @@ -117977,19 +121983,18 @@ self: { , blaze-markup, bytestring, case-insensitive, conduit, connection , containers, directory, dyre, fast-logger, filepath, hashable , HaskellNet, HaskellNet-SSL, http-client, http-client-tls - , http-types, lifted-base, microlens, mime-mail, monad-time - , mono-traversable, monoid-subclasses, mtl, network, opml-conduit - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , rss-conduit, safe-exceptions, stm, streaming-bytestring - , streaming-with, streamly, text, time, timerep, tls, transformers - , transformers-base, uri-bytestring, xml, xml-conduit, xml-types + , http-types, lifted-base, microlens, mime-mail, monad-control + , monad-time, mono-traversable, monoid-subclasses, mtl, network + , opml-conduit, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, rss-conduit, safe-exceptions, stm + , streaming-bytestring, streaming-with, streamly, text, time + , timerep, tls, transformers-base, uri-bytestring, xml, xml-conduit + , xml-types }: mkDerivation { pname = "imm"; - version = "1.3.0.0"; - sha256 = "1rkndzm0mmc0qpg4i08jkmp00w5jhh4az02y3vzwaaqjfd32jxar"; - revision = "1"; - editedCabalFile = "02g2cpwqp9fqggzjv5y2gyvxayqbrfjai133jn7y2laa9bxia3x4"; + version = "1.4.0.0"; + sha256 = "0dz7zss373gc80xlng11agsr2yx51l0pdab72605w9rpn0znplrg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117997,12 +122002,11 @@ self: { case-insensitive conduit connection containers directory dyre fast-logger filepath hashable HaskellNet HaskellNet-SSL http-client http-client-tls http-types lifted-base microlens mime-mail - monad-time mono-traversable monoid-subclasses mtl network - opml-conduit optparse-applicative prettyprinter + monad-control monad-time mono-traversable monoid-subclasses mtl + network opml-conduit optparse-applicative prettyprinter prettyprinter-ansi-terminal rss-conduit safe-exceptions stm streaming-bytestring streaming-with streamly text time timerep tls - transformers transformers-base uri-bytestring xml xml-conduit - xml-types + transformers-base uri-bytestring xml xml-conduit xml-types ]; executableHaskellDepends = [ base ]; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; @@ -118091,6 +122095,18 @@ 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; + }) {}; + "implicit" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg , bytestring, bytestring-builder, containers, criterion, deepseq @@ -118200,8 +122216,8 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "impossible"; - version = "1.1.3"; - sha256 = "01p9s6nzzlmgg1gr42ys6wkxnzp1jqs3ay8jz5lbm1nkbjlabs4n"; + version = "1.1.4"; + sha256 = "0557f8a9aaslkhpyp7b6zidg88a3472ya31rp8amqf71393nvkqp"; libraryHaskellDepends = [ base lens ]; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; license = stdenv.lib.licenses.asl20; @@ -118337,11 +122353,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "inchworm"; - version = "1.0.2.2"; - sha256 = "0r8a8hg3fzfc619zsjdnid1la0njnfrijhqfgqjmis4ncivah52h"; + version = "1.1.1.2"; + sha256 = "1dsrx48srmrqcw4y60prgnzxzr7nc7vyzjv0nnr2vaay3j6pxkii"; libraryHaskellDepends = [ base ]; - description = "Inchworm Lexer Framework"; + description = "Simple parser combinators for lexical analysis"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "include-file" = callPackage @@ -118425,8 +122442,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 @@ -118436,7 +122453,6 @@ self: { ]; description = "Generic parser library capable of providing partial results from partial input"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -118476,23 +122492,22 @@ 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 ]; description = "Indentation sensitive parsing combinators for Parsec and Trifecta"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indentation-core" = callPackage ({ 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; @@ -118504,8 +122519,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"; @@ -118518,15 +122533,14 @@ self: { }: mkDerivation { pname = "indentation-trifecta"; - version = "0.0.2"; - sha256 = "0d2mxd1cdcr0zfz618dh4grin4z2bjfv4659i2zsddxm9li0dqis"; + version = "0.1.0"; + sha256 = "1za8x4w26ifxvfv5xra5xpykr67ari91c4p0vca89y28q54l9qpj"; libraryHaskellDepends = [ base indentation-core mtl parsers trifecta ]; testHaskellDepends = [ base tasty tasty-hunit trifecta ]; description = "Indentation sensitive parsing combinators for Trifecta"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indentparser" = callPackage @@ -118567,18 +122581,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; @@ -118616,10 +122633,11 @@ self: { pname = "indexed-extras"; version = "0.2"; sha256 = "17rbk2kgiy04n48i6hk4lracwdl45qqklvs1lri7mma2r62f67xh"; + revision = "1"; + editedCabalFile = "0103q2ns33wmcnlhda2lcrz2x1kr2cyfxpv7akj6y09k7q19ir77"; libraryHaskellDepends = [ base bifunctors indexed mtl pointed ]; description = "Indexed functors, monads and comonads that require extensions to Haskell98"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indexed-free" = callPackage @@ -118637,8 +122655,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"; @@ -118667,6 +122685,7 @@ self: { libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ]; description = "Indian Language Font Converter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indices" = callPackage @@ -118827,8 +122846,8 @@ self: { }: mkDerivation { pname = "inflections"; - version = "0.4.0.3"; - sha256 = "028dj9pgs5g6qb9x1hc8r4rn0rznr1ynn79vln48k2llyf2r38dx"; + version = "0.4.0.4"; + sha256 = "0lspb0xpfj4q6wrzgss7pfjmr6xb5clj7y686vsairbkpcj3cfcl"; libraryHaskellDepends = [ base exceptions megaparsec text unordered-containers ]; @@ -118861,8 +122880,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.6.0.7"; - sha256 = "1fafcsrwfwxjzlz69qz9bq0pxc5iym12xnr6zv7j34yj6j96xzb2"; + version = "1.6.1.2"; + sha256 = "1bzy78amw6k02bi2fjm2i8vah9lwxpy2fdlq35gdsffhwrif29mg"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -118876,31 +122895,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_6_0_9" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, QuickCheck, scientific - , tagged, template-haskell, text, time, unordered-containers - , vector - }: - mkDerivation { - pname = "influxdb"; - version = "1.6.0.9"; - sha256 = "0xs2bbqgaj6zmk6wrfm21q516qa2x7qfcvfazkkvyv49vvk9i7is"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -118943,6 +122937,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ini_0_4_1" = callPackage + ({ mkDerivation, attoparsec, base, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "ini"; + version = "0.4.1"; + sha256 = "0mvwii8jbh2ll54qb9dij5m66c6324s2y4vrwz1qr4wz40m3qa8l"; + libraryHaskellDepends = [ + attoparsec base text unordered-containers + ]; + testHaskellDepends = [ base hspec unordered-containers ]; + description = "Quick and easy configuration files in the INI format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ini-qq" = callPackage ({ mkDerivation, base, HUnit, ini, raw-strings-qq, template-haskell , text @@ -118977,6 +122988,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 { @@ -119039,6 +123061,8 @@ self: { pname = "inline-c"; version = "0.5.6.1"; sha256 = "0kpbwrri9idllwd7gfamghrdrz16zqjphmb3cp5nq160dxz73brd"; + revision = "1"; + editedCabalFile = "0q8wxvsi2gycyv98hw910p87633l9azchnn9783vsknbycsi1c64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119064,8 +123088,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.6.1.0"; - sha256 = "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h"; + version = "0.7.0.1"; + sha256 = "19scbviwiv1fbsdcjji3dscjg7w0xa8r97xwkqqrwm7zhvrg5wns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119100,8 +123124,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 ]; @@ -119141,6 +123165,7 @@ self: { testHaskellDepends = [ base hspec jni jvm text ]; description = "Java interop via inline Java code in Haskell modules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inline-r" = callPackage @@ -119156,6 +123181,8 @@ self: { pname = "inline-r"; version = "0.9.2"; sha256 = "1h2gwrh8kzx3przx29gcl4wffni3bxy1yrfabf88bdxjwj79s7z0"; + revision = "1"; + editedCabalFile = "01cxsjdxy5brdnw966928bcdivc8ab7kq91vdqkg2q801jf5jj9g"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions inline-c mtl pretty primitive process reflection setenv @@ -119222,8 +123249,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 @@ -119235,6 +123262,7 @@ self: { ]; description = "Associative containers retaining insertion order for traversals"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inserts" = callPackage @@ -119272,31 +123300,14 @@ self: { }: mkDerivation { pname = "inspection-testing"; - version = "0.2.0.1"; - sha256 = "1551dvk63xb4lr2zsyg3ri8v1nsjs050k2jsf8v0vfasx7w9ns8z"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inspection-testing_0_3" = 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 ]; testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -119322,6 +123333,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "instana-haskell-trace-sdk" = callPackage + ({ mkDerivation, aeson, aeson-extra, base, binary, bytestring + , containers, directory, ekg-core, exceptions, hslogger + , http-client, http-client-tls, http-types, HUnit, network, process + , random, regex-base, regex-tdfa, retry, scientific, servant + , servant-server, stm, sysinfo, text, time, transformers, unix + , unordered-containers, wai, warp + }: + mkDerivation { + pname = "instana-haskell-trace-sdk"; + version = "0.1.0.0"; + sha256 = "1px0p990sr2l7l7h8k5l24bjvi4ag5i3v78vwlhgzykpfsxwq3bg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-extra base bytestring containers directory ekg-core + exceptions hslogger http-client http-client-tls http-types network + process random regex-base regex-tdfa retry scientific stm sysinfo + text time unix unordered-containers wai + ]; + executableHaskellDepends = [ + aeson base binary bytestring hslogger http-client http-types + servant servant-server text time transformers unix wai warp + ]; + testHaskellDepends = [ + aeson aeson-extra base bytestring directory ekg-core exceptions + hslogger http-client http-types HUnit process random regex-base + regex-tdfa retry scientific text unix unordered-containers + ]; + description = "SDK for adding custom Instana tracing support to Haskell applications"; + license = stdenv.lib.licenses.mit; + }) {}; + "instance-control" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -119486,6 +123530,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 @@ -119502,6 +123548,8 @@ self: { pname = "int-multimap"; version = "0.3.1"; sha256 = "0sl3xzlw0mzyq1h28mqklm41q9pknsf1qmd74a5syn24m01dknnv"; + revision = "1"; + editedCabalFile = "09lnidjri2z00mfbn73cc9mzbgadmlcym9y1hia0c219dm8zjrh0"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -119527,24 +123575,6 @@ self: { }) {}; "integer-logarithms" = callPackage - ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck - , smallcheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck - }: - mkDerivation { - pname = "integer-logarithms"; - version = "1.0.2.1"; - sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j"; - libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; - testHaskellDepends = [ - base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck - tasty-smallcheck - ]; - description = "Integer logarithms"; - license = stdenv.lib.licenses.mit; - }) {}; - - "integer-logarithms_1_0_2_2" = callPackage ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck , smallcheck, tasty, tasty-hunit, tasty-quickcheck , tasty-smallcheck @@ -119553,6 +123583,8 @@ self: { pname = "integer-logarithms"; 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 @@ -119560,7 +123592,6 @@ self: { ]; description = "Integer logarithms"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-pure" = callPackage @@ -119709,15 +123740,14 @@ 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 ]; description = "Prelude replacement based on protolude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intern" = callPackage @@ -119762,8 +123792,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.32"; - sha256 = "0xk693yhq2hkilznjzsszamvg7pg1l0qyb2y17ffr2s966i4pfr0"; + version = "0.1.38"; + sha256 = "1s7si6rw6xlgczismyj9wh40ym39fcskpbyf1ldab6krwxykf65v"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -119823,14 +123853,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 ]; @@ -119886,6 +123917,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "interpolator" = callPackage + ({ mkDerivation, aeson, base, containers, either, hspec + , mono-traversable, mtl, product-profunctors, profunctors + , QuickCheck, template-haskell, text + }: + mkDerivation { + pname = "interpolator"; + version = "0.1.1"; + sha256 = "13symhhxvv2dxn7449p8b9g7p37p98icj0ql63y9qkdg6s7b8rf0"; + libraryHaskellDepends = [ + aeson base containers either mono-traversable mtl + product-profunctors profunctors QuickCheck template-haskell text + ]; + testHaskellDepends = [ + aeson base containers either hspec mono-traversable mtl + product-profunctors profunctors QuickCheck template-haskell text + ]; + description = "Runtime interpolation of environment variables in records using profunctors"; + license = stdenv.lib.licenses.mit; + }) {}; + "interprocess" = callPackage ({ mkDerivation, base, typed-process }: mkDerivation { @@ -119973,8 +124025,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.7.1.1"; - sha256 = "1s947b71r0m3f81w8sid2cwgh9j16bxsmlpi498rzxajq32cd5yk"; + version = "0.7.2"; + sha256 = "0iv79rlgi7xi5l0a530m8vniba5jnn45hddwfrrm9yyfvpfgx1sw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -120005,36 +124057,14 @@ self: { }) {}; "intro" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , dlist, extra, hashable, lens, mtl, QuickCheck, safe, text - , transformers, unordered-containers, writer-cps-mtl - }: - mkDerivation { - pname = "intro"; - version = "0.3.2.0"; - sha256 = "0nffkv59ws5ls8smafsvbgnpfhs6bbf6balwn23za1dlb5982ky3"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq dlist extra hashable mtl - safe text transformers unordered-containers writer-cps-mtl - ]; - testHaskellDepends = [ - base binary bytestring containers deepseq dlist extra hashable lens - mtl QuickCheck safe text transformers unordered-containers - writer-cps-mtl - ]; - description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "intro_0_5_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, dlist , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers , unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.5.1.0"; - sha256 = "0gsj5l0vgvpbdw2vwlr9r869jwc08lqbypp24g33dlnd338pjxzs"; + version = "0.5.2.1"; + sha256 = "0i5cpa5jx82nb1gi1wdhgnbmxlb7s4nbya46k6byajf7g50i5qp8"; libraryHaskellDepends = [ base bytestring containers deepseq dlist extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -120046,7 +124076,6 @@ self: { ]; description = "Safe and minimal prelude"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "intro-prelude" = callPackage @@ -120148,6 +124177,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 @@ -120193,6 +124224,7 @@ self: { ]; description = "Invertible parsing combinators framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -120256,8 +124288,8 @@ self: { }: mkDerivation { pname = "io-choice"; - version = "0.0.6"; - sha256 = "1vqw5v1b9mrkhhszxp1rg8gl1d53akdlzwh40w01b1ni208jhav1"; + version = "0.0.7"; + sha256 = "16v6b9r5k2y5vm2s8k3j7xc5wh77nqd8j636mc6wxcxwn3260jir"; libraryHaskellDepends = [ base lifted-base monad-control template-haskell transformers transformers-base @@ -120353,10 +124385,8 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.5.0.1"; - sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx"; - revision = "1"; - editedCabalFile = "1d7rpwi10rqcry58d4hc651xvk9xzni6n6k22wm9532l14i3x21c"; + version = "1.5.1.0"; + sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la"; configureFlags = [ "-fNoInteractiveTests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -120378,10 +124408,8 @@ self: { }: mkDerivation { pname = "io-streams-haproxy"; - version = "1.0.0.2"; - sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp"; - revision = "2"; - editedCabalFile = "0jrasbn4s6ac0691bf88fbflpha2vn24bd45gk0s3znvl395dxgr"; + version = "1.0.1.0"; + sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp"; libraryHaskellDepends = [ attoparsec base bytestring io-streams network transformers ]; @@ -120415,8 +124443,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; @@ -120465,6 +124493,7 @@ self: { ]; description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ioref-stable" = callPackage @@ -120515,31 +124544,6 @@ self: { }) {}; "ip" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , doctest, hashable, hspec, HUnit, primitive, QuickCheck - , quickcheck-classes, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, vector - }: - mkDerivation { - pname = "ip"; - version = "1.3.0"; - sha256 = "10dc3b41j11xa9rfqlbbrjs4wjszn1zn50w9cjs4i0yc02fqck4y"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector - ]; - testHaskellDepends = [ - attoparsec base bytestring doctest hspec HUnit QuickCheck - quickcheck-classes test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring criterion text - ]; - description = "Library for IP and MAC addresses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ip_1_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, doctest, hashable, hspec, HUnit, primitive, QuickCheck , quickcheck-classes, test-framework, test-framework-hunit @@ -120592,6 +124596,18 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ip6addr" = callPackage ({ mkDerivation, base, cmdargs, IPv6Addr, text }: mkDerivation { @@ -120695,8 +124711,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.7.5"; - sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd"; + version = "1.7.7"; + sha256 = "0gab5930nvzrpvisx3x43ydnp2rd4fbmy9cq1zpgqy1adx5gx8z6"; libraryHaskellDepends = [ appar base byteorder containers network ]; @@ -120752,6 +124768,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ipynb" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, base64-bytestring + , bytestring, containers, directory, filepath, microlens + , microlens-aeson, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "ipynb"; + version = "0.1"; + sha256 = "0daadhzil4q573mqb0rpvjzm0vpkzgzqcimw480qpvlh6rhppwj5"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-diff base base64-bytestring bytestring directory + filepath microlens microlens-aeson tasty tasty-hunit text + unordered-containers vector + ]; + description = "Data structure for working with Jupyter notebooks (ipynb)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, directory, filepath, memory, mtl, process, temporary @@ -120810,8 +124849,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 @@ -120859,6 +124898,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 @@ -120901,6 +124942,7 @@ self: { ]; description = "A DCC message parsing and helper library for IRC clients"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-fun-bot" = callPackage @@ -121006,6 +125048,7 @@ self: { ]; description = "A library for writing IRC bots"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ircbouncer" = callPackage @@ -121031,51 +125074,51 @@ self: { }) {}; "iri" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , contravariant, hashable, ip, profunctors, ptr, punycode - , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text - , text-builder, th-lift, th-lift-instances, unordered-containers - , vector, vector-builder, vector-instances + ({ mkDerivation, attoparsec, base, bytestring, contravariant + , hashable, ip, profunctors, ptr, punycode, QuickCheck + , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-builder, th-lift + , th-lift-instances, unordered-containers, vector, vector-builder + , vector-instances }: mkDerivation { pname = "iri"; - version = "0.3.4"; - sha256 = "071vg01q5swwscvfsqqyk6ysqbl1yqpwnwklhj0h985sxv9zdkm6"; + version = "0.4"; + sha256 = "0v790f2fl4hcb6069ak5cscd156ry3065cshjh9c30239allw7m5"; libraryHaskellDepends = [ - attoparsec base base-prelude bug bytestring contravariant hashable - ip profunctors ptr punycode semigroups template-haskell text - text-builder th-lift th-lift-instances unordered-containers vector - vector-builder vector-instances + attoparsec base bytestring contravariant hashable ip profunctors + ptr punycode semigroups template-haskell text text-builder th-lift + th-lift-instances unordered-containers vector vector-builder + vector-instances ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; - description = "RFC-based International Resource Identifier library"; + description = "RFC-based resource identifier library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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 @@ -121134,13 +125177,12 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isdicom" = callPackage @@ -121186,6 +125228,7 @@ self: { executableHaskellDepends = [ base gtk3 ]; description = "A program to show the size of image and whether suitable for wallpaper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "islink" = callPackage @@ -121273,6 +125316,7 @@ self: { ]; description = "Types and parser for ISO8601 durations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iso8601-time" = callPackage @@ -121287,6 +125331,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "isobmff" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, data-default + , function-builder, hspec, mtl, pretty-types, QuickCheck + , singletons, tagged, template-haskell, text, time, type-spec + , vector + }: + mkDerivation { + pname = "isobmff"; + version = "0.13.0.0"; + sha256 = "032lcpdifrryi4ryz3gwzh9l5927amcpr8xk8jbjwz0mj3z857d5"; + libraryHaskellDepends = [ + base bytestring data-default function-builder mtl pretty-types + singletons tagged template-haskell text time type-spec vector + ]; + testHaskellDepends = [ + base binary bytestring hspec mtl pretty-types QuickCheck tagged + text type-spec + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion tagged type-spec + ]; + description = "A parser and generator for the ISO-14496-12/14 base media file format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "isobmff-builder" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, data-default , hspec, mtl, pretty-types, QuickCheck, singletons, tagged @@ -121366,8 +125435,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 ]; @@ -121378,6 +125447,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 @@ -121566,14 +125654,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; }) {}; @@ -121624,6 +125754,7 @@ self: { libraryToolDepends = [ alex happy ]; description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-artifact" = callPackage @@ -121659,6 +125790,7 @@ self: { ]; description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-bitdata" = callPackage @@ -121696,6 +125828,7 @@ self: { ]; description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-examples" = callPackage @@ -121718,6 +125851,7 @@ self: { ]; description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-hw" = callPackage @@ -121730,6 +125864,7 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-opts" = callPackage @@ -121746,6 +125881,7 @@ self: { ]; description = "Ivory compiler optimizations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-quickcheck" = callPackage @@ -121767,6 +125903,7 @@ self: { ]; description = "QuickCheck driver for Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-serialize" = callPackage @@ -121783,6 +125920,7 @@ self: { ]; description = "Serialization library for Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-stdlib" = callPackage @@ -121795,6 +125933,7 @@ self: { libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivy-web" = callPackage @@ -121870,8 +126009,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 ]; @@ -121889,8 +126028,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 ]; @@ -122029,6 +126168,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 @@ -122105,10 +126267,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 = [ @@ -122126,8 +126286,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, time }: mkDerivation { pname = "japanese-calendar"; - version = "0.1.0.0"; - sha256 = "0i9699xammqi5q5rjn7cyzv41alm1c9hnq9njhf6mnxf0d08ch2y"; + version = "0.1.0.2"; + sha256 = "1dkfp2qj588nnd5r3ad37145n3mjm76h9pc2y7ga9s76cvi52xqy"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec QuickCheck time ]; description = "Data type of Japanese Calendar (Wareki)"; @@ -122217,8 +126377,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; @@ -122342,6 +126502,7 @@ self: { executableHaskellDepends = [ base ghcjs-base-stub ]; description = "Extra javascript functions when using GHCJS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "javasf" = callPackage @@ -122515,6 +126676,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 @@ -122525,6 +126709,8 @@ self: { pname = "jmacro"; version = "0.6.15"; sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s"; + revision = "2"; + editedCabalFile = "0r16y3sk22vgrciaadrdzjd768mnh08s019ffgk5jma782nz9v7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122539,6 +126725,7 @@ self: { ]; description = "QuasiQuotation library for programmatic generation of Javascript code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc" = callPackage @@ -122557,6 +126744,7 @@ self: { ]; description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc-happstack" = callPackage @@ -122573,6 +126761,7 @@ self: { ]; description = "Happstack backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc-snap" = callPackage @@ -122588,6 +126777,7 @@ self: { ]; description = "Snap backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jml-web-service" = callPackage @@ -122611,6 +126801,19 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jni" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, containers , cpphs, deepseq, inline-c, jdk, singletons @@ -122627,6 +126830,7 @@ self: { libraryToolDepends = [ cpphs ]; description = "Complete JNI raw bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) jdk;}; "jobqueue" = callPackage @@ -122711,15 +126915,15 @@ self: { }) {}; "jord" = callPackage - ({ mkDerivation, base, haskeline, hspec, HUnit }: + ({ mkDerivation, base, criterion, haskeline, hspec, HUnit }: mkDerivation { pname = "jord"; - version = "0.4.2.0"; - sha256 = "0nhkxd8vbygybihm1c20bhn8cfylj94l5jr9f7phkp1667lqxdgc"; + 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; @@ -122744,12 +126948,13 @@ self: { , bytestring, concise, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck - , template-haskell, text, time, unordered-containers, vector, x509 + , template-haskell, text, time, unix, unordered-containers, vector + , x509 }: mkDerivation { pname = "jose"; - version = "0.7.0.0"; - sha256 = "051rjqfskizgm9j927zh500q54lii3scldsymgcdfbaw40d0mncc"; + version = "0.8.0.0"; + sha256 = "027698xq5l8in420x3sc5zqwp16i1jzjcy8rlh546j8acxcvrqc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122758,7 +126963,9 @@ self: { QuickCheck quickcheck-instances safe semigroups template-haskell text time unordered-containers vector x509 ]; - executableHaskellDepends = [ aeson base bytestring lens mtl ]; + executableHaskellDepends = [ + aeson base bytestring lens mtl semigroups text unix + ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring concise containers cryptonite hspec lens memory monad-time mtl network-uri @@ -122771,30 +126978,6 @@ self: { }) {}; "jose-jwt" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal - , containers, criterion, cryptonite, doctest, either, hspec, HUnit - , memory, mtl, QuickCheck, text, time, transformers - , transformers-compat, unordered-containers, vector - }: - mkDerivation { - pname = "jose-jwt"; - version = "0.7.8"; - sha256 = "0azkqllqc35hp2d2q50cwk472amhf0q5fkqs04a4kpnj50z6kqfk"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring cereal containers cryptonite - either memory mtl text time transformers transformers-compat - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring cryptonite doctest either hspec HUnit memory - mtl QuickCheck text unordered-containers vector - ]; - benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; - description = "JSON Object Signing and Encryption Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "jose-jwt_0_8_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit , memory, mtl, QuickCheck, text, time, transformers @@ -122816,7 +126999,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion cryptonite ]; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jot" = callPackage @@ -122846,6 +127028,7 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "A library for decoding JPEG files written in pure Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jps" = callPackage @@ -122909,6 +127092,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 @@ -123082,8 +127267,8 @@ self: { }: mkDerivation { pname = "json"; - version = "0.9.2"; - sha256 = "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6"; + version = "0.9.3"; + sha256 = "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb"; libraryHaskellDepends = [ array base bytestring containers mtl parsec pretty syb text ]; @@ -123091,6 +127276,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 @@ -123158,6 +127354,7 @@ self: { ]; description = "Encoders of JSON AST"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-ast-quickcheck" = callPackage @@ -123177,29 +127374,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; @@ -123324,8 +127524,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.3"; - sha256 = "08y6w4sad6f0f5gs3znw9yfp51cskw9q81xq5q70g6glq14lph50"; + version = "1.0.6"; + sha256 = "1j5x5ibax81348m4m1fv8pz0044gbvlskgh9gpn5dn8d0cpd7vf7"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -123398,12 +127598,14 @@ self: { }) {}; "json-pointer" = callPackage - ({ mkDerivation, attoparsec, base-prelude, text }: + ({ mkDerivation, attoparsec, base, base-prelude, text }: mkDerivation { pname = "json-pointer"; - version = "0.1.2.1"; - sha256 = "1anij6svbkygz9qyssqhz9vyj43gyhsvrypb6fzjl4k5ss7aibq0"; - libraryHaskellDepends = [ attoparsec base-prelude text ]; + version = "0.1.2.2"; + sha256 = "0cwk5jxg528dipfdhrmmjpz950pfpaykncvw16rajvf35wvcnk9x"; + revision = "1"; + editedCabalFile = "0bs7fa02jjq9r7bn3vlwn4xq93yllj62h3bb5g2lsihx1svk7lkn"; + libraryHaskellDepends = [ attoparsec base base-prelude text ]; description = "JSON Pointer parsing and interpretation utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -123505,7 +127707,6 @@ self: { ]; description = "Fully-featured JSON-RPC 2.0 library"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-rpc-client" = callPackage @@ -123518,8 +127719,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 = [ @@ -123564,8 +127765,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 = [ @@ -123589,6 +127790,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 @@ -123600,6 +127803,7 @@ self: { ]; description = "Types and type classes for defining JSON schemas"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-sop" = callPackage @@ -123610,15 +127814,14 @@ 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 ]; description = "Generics JSON (de)serialization using generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-state" = callPackage @@ -123643,8 +127846,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 ]; @@ -123714,6 +127917,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A polymorphic, type-safe, json-structured tracing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-types" = callPackage @@ -123995,6 +128199,7 @@ self: { ]; description = "Manage users in MariaDB >= 10.1.1"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "judge" = callPackage @@ -124040,6 +128245,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {Judy = null;}; + "juicy-draw" = callPackage + ({ mkDerivation, base, JuicyPixels, numeric-extras, primitive }: + mkDerivation { + pname = "juicy-draw"; + version = "0.2.0.0"; + sha256 = "0fi4kwcb8mqnzi3cx2gzpls6nyc8vxnhjfgrb7zf04bpcsph7rgr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base JuicyPixels numeric-extras primitive + ]; + executableHaskellDepends = [ base JuicyPixels ]; + description = "Draw and fill lines, rectangles and polygons"; + license = stdenv.lib.licenses.mit; + }) {}; + "juicy-gcode" = callPackage ({ mkDerivation, base, configurator, lens, linear, matrix , optparse-applicative, svg-tree, text @@ -124066,8 +128287,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.4.1"; - sha256 = "1vpd5j71x85ni6wmvmifb5fw8h3y77l67a3dsngsdcs22jilbbgw"; + version = "0.4.2"; + sha256 = "0vxy06dan6iq03p8p2frzvyab5zaahh4pd37rzqg2vh71m6rqka7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124169,6 +128390,7 @@ self: { ]; description = "Call JVM methods from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jvm-batching" = callPackage @@ -124206,8 +128428,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 @@ -124271,59 +128493,30 @@ self: { "jwt" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cryptonite - , data-default, doctest, http-types, HUnit, lens, lens-aeson - , memory, network-uri, QuickCheck, scientific, semigroups, tasty - , tasty-hunit, tasty-quickcheck, tasty-th, text, time - , unordered-containers, vector + , doctest, http-types, HUnit, lens, lens-aeson, memory, network-uri + , QuickCheck, scientific, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text, time, unordered-containers + , vector, x509, x509-store }: mkDerivation { pname = "jwt"; - version = "0.7.2"; - sha256 = "0c8aq9y7chq58xp9qd0w5dgbh2q3ksfidj3b4dm5k68ks89p95hp"; - revision = "1"; - editedCabalFile = "1q8h94yslw6k6zcjbwx94pnji8dcr2w5n1wzgzfb8hb78w2qr1dm"; - libraryHaskellDepends = [ - aeson base bytestring containers cryptonite data-default http-types - memory network-uri scientific semigroups text time - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers cryptonite data-default doctest - http-types HUnit lens lens-aeson memory network-uri QuickCheck - scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th - text time unordered-containers vector - ]; - description = "JSON Web Token (JWT) decoding and encoding"; - license = stdenv.lib.licenses.mit; - }) {}; - - "jwt_0_8_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, cryptonite - , doctest, HsOpenSSL, http-types, HUnit, lens, lens-aeson, memory - , network-uri, QuickCheck, RSA, scientific, semigroups, tasty - , tasty-hunit, tasty-quickcheck, tasty-th, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "jwt"; - version = "0.8.0"; - sha256 = "0ij921vgm0sqlc2ryymqxz6ipgl2iwm0916ny7g5l47qh2fjhcjg"; + version = "0.9.0"; + sha256 = "1glkaahp3jq744s61y0ja5fdggwac9p1dwia4c19k1ld6qhd5395"; revision = "1"; - editedCabalFile = "0b0znxxh6zgbq5xhxds2a1yxaqg5rka3xkhlchrbjabi9m5ndp84"; + editedCabalFile = "1vpd4pq8mh4dha7i2pfv4iqpw411yachzkf7p9rnfyicipj53pw2"; libraryHaskellDepends = [ - aeson base bytestring containers cryptonite HsOpenSSL http-types - memory network-uri RSA scientific semigroups text time - unordered-containers vector + aeson base bytestring containers cryptonite http-types memory + network-uri scientific semigroups text time unordered-containers + vector x509 x509-store ]; testHaskellDepends = [ - aeson base bytestring containers cryptonite doctest HsOpenSSL - http-types HUnit lens lens-aeson memory network-uri QuickCheck RSA - scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th - text time unordered-containers vector + aeson base bytestring containers cryptonite doctest http-types + HUnit lens lens-aeson memory network-uri QuickCheck scientific + semigroups tasty tasty-hunit tasty-quickcheck tasty-th text time + unordered-containers vector x509 x509-store ]; description = "JSON Web Token (JWT) decoding and encoding"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kademlia" = callPackage @@ -124345,6 +128538,7 @@ self: { ]; description = "An implementation of the Kademlia DHT Protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kafka" = callPackage @@ -124589,6 +128783,7 @@ self: { benchmarkHaskellDepends = [ aeson base containers criterion text ]; description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kansas-comet" = callPackage @@ -124608,6 +128803,7 @@ self: { ]; description = "A JavaScript push mechanism based on the comet idiom"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kansas-lava" = callPackage @@ -124673,13 +128869,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; @@ -124759,8 +128959,10 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.6.0.0"; - sha256 = "1ll33qvxlqdja7yljyv1mlc5sy4q8izgdscz6zvbyqnjl9iczrn3"; + version = "0.7.0.0"; + sha256 = "1z4533952sal5ma71xpsrwbi9pniy1cciw20w31igrx9rw9kx98b"; + revision = "1"; + editedCabalFile = "1lzla1iv5ll9iks5xh8399vs2mjxb33pbdg115kqbq9r5z3h84qp"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -124792,8 +128994,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 @@ -124869,8 +129071,8 @@ self: { }: mkDerivation { pname = "katip-syslog"; - version = "0.1.0.0"; - sha256 = "0fj6c0rzs2v5ng3gsc9qlk5ksszh2dpmi378ydxxcrjjzkz3ng6c"; + version = "0.1.2.0"; + sha256 = "0ff6zxl2jddwgkzyg9lli843lww06j75x7r8bg55grph34pf13p5"; libraryHaskellDepends = [ aeson base bytestring hsyslog katip string-conv text ]; @@ -125024,6 +129226,7 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kbq-gu" = callPackage @@ -125109,6 +129312,7 @@ self: { ]; description = "Fast and flexible k-d trees for various types of point queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keccak" = callPackage @@ -125190,6 +129394,7 @@ self: { ]; description = "Rapid Gtk Application Development - I18N"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-mvc-controller" = callPackage @@ -125263,6 +129468,7 @@ self: { libraryHaskellDepends = [ base directory filepath MissingK ]; description = "Haskell on Gtk rails - Easy handling of configuration files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-mvc-solutions-gtk" = callPackage @@ -125309,6 +129515,7 @@ self: { ]; description = "Haskell on Gtk rails - Gtk-based View for MVC applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keera-hails-reactive-fs" = callPackage @@ -125564,8 +129771,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 ]; @@ -125657,8 +129864,8 @@ self: { }: mkDerivation { pname = "keystore"; - version = "0.8.1.0"; - sha256 = "11dfxm7wxn1l82cr30gn2xw45ma7apssfgrgz95wrzm5k0kq331v"; + version = "0.8.1.1"; + sha256 = "013cvfp8cfj90lj4n41g8wwrv6xj3iql4m3zzawmpxzkqwmflsqy"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125693,6 +129900,7 @@ self: { ]; description = "Pure Haskell key/value store implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keyword-args" = callPackage @@ -125804,6 +130012,7 @@ self: { ]; description = "Kick Channels: bounded channels with non-blocking writes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kif-parser" = callPackage @@ -125825,6 +130034,44 @@ 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; + }) {}; + + "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; + }) {}; + + "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 { @@ -125866,12 +130113,15 @@ 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 ]; description = "Kleene algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kmeans" = callPackage @@ -125938,18 +130188,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; }) {}; @@ -126094,8 +130344,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"; @@ -126111,8 +130361,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 ]; @@ -126411,8 +130661,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.5"; - sha256 = "0ixiqppj7sdkbhp2i6nr4xch82j4r6gxwwn0rvbb0x6wzikkdrf3"; + version = "1.0.8"; + sha256 = "0nryr2bsl7wn80nfwpvs45nyf02micq422b95dhw8ln79knpa4vm"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -126580,6 +130830,7 @@ self: { libraryHaskellDepends = [ base containers mtl read-bounded ]; description = "Declarative command line parser using type-driven pattern matching"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-placeholders" = callPackage @@ -126689,8 +130940,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; @@ -126701,6 +130952,7 @@ self: { ]; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -126714,8 +130966,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 @@ -126740,8 +130992,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 @@ -126752,6 +131004,7 @@ self: { ]; description = "Lambdabot Haskell plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -126761,8 +131014,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 @@ -126781,8 +131034,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 @@ -126801,8 +131054,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 @@ -126818,8 +131071,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 @@ -126834,8 +131087,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 ]; @@ -126847,8 +131100,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"; @@ -126875,6 +131128,53 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lambdabot-xmpp" = callPackage + ({ mkDerivation, base, data-default, lambdabot-core + , lambdabot-haskell-plugins, lambdabot-irc-plugins + , lambdabot-misc-plugins, lambdabot-novelty-plugins + , lambdabot-reference-plugins, lambdabot-social-plugins + , lifted-base, mtl, network, pontarius-xmpp, split, text, tls + , x509-validation, xml-types + }: + mkDerivation { + pname = "lambdabot-xmpp"; + version = "0.1.0.0"; + sha256 = "1bn8gd2gxl44xqffiy8skh714hkvfv2d318v1qg9k52pp53al2ny"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base data-default lambdabot-core lambdabot-haskell-plugins + lambdabot-irc-plugins lambdabot-misc-plugins + lambdabot-novelty-plugins lambdabot-reference-plugins + lambdabot-social-plugins lifted-base mtl network pontarius-xmpp + split text tls x509-validation xml-types + ]; + description = "Lambdabot plugin for XMPP (Jabber) protocol"; + license = "unknown"; + 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 @@ -127217,6 +131517,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {mp3lame = null;}; + "lame_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, directory, exceptions, filepath + , hspec, hspec-discover, htaglib, mp3lame, temporary, text + , transformers, wave + }: + mkDerivation { + pname = "lame"; + version = "0.2.0"; + sha256 = "1bqq3aanfffdsl3v0am7jdfslcr6y372cq7jx36z7g09zy5mp2sp"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath text transformers + wave + ]; + librarySystemDepends = [ mp3lame ]; + testHaskellDepends = [ + base directory filepath hspec htaglib temporary text + ]; + testToolDepends = [ hspec-discover ]; + description = "Fairly complete high-level binding to LAME encoder"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {mp3lame = null;}; + "lame-tester" = callPackage ({ mkDerivation, base-noprelude, bizzlelude, containers, semigroups , tasty, tasty-hunit, validation @@ -127261,27 +131585,26 @@ 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 ]; benchmarkHaskellDepends = [ base criterion ]; description = "Parser and pretty-printer for ATS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-bash" = callPackage @@ -127332,8 +131655,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 @@ -127385,6 +131710,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 @@ -127466,10 +131793,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "6.0.4"; - sha256 = "1brlqlxa1h7iv2p17h4nb6ly7nr4dr9j815z3yiz0gbj91bgj4c1"; - revision = "1"; - editedCabalFile = "0la3l8m32zmgb4nk4fwchy1abip0k1b0x1i9205dih136g1iaq62"; + version = "8.0.0"; + sha256 = "00zryknsc0717ysq8g1ip5dm70v8b33lfrscbzpdcw5dd2j32k7n"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -127551,7 +131876,6 @@ self: { ]; description = "JavaScript parser and pretty-printer library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-ecmascript-analysis" = callPackage @@ -127590,13 +131914,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; @@ -127646,7 +131975,6 @@ self: { ]; description = "GLSL abstract syntax tree, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-go" = callPackage @@ -127718,6 +132046,8 @@ self: { pname = "language-java"; version = "0.2.9"; sha256 = "03hrj8hgyjmw2fvvk4ik30fdmbi3hndpkvf1bqcnpzqy5anwh58x"; + revision = "1"; + editedCabalFile = "0fnbg9b8isyk8dpmggh736mms7a2m65956y1z15wds63imzhs2ik"; libraryHaskellDepends = [ array base parsec pretty ]; libraryToolDepends = [ alex ]; testHaskellDepends = [ @@ -127824,6 +132154,7 @@ self: { ]; description = "Lua parser and pretty-printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-lua-qq" = callPackage @@ -127947,26 +132278,29 @@ self: { "language-oberon" = callPackage ({ mkDerivation, base, containers, directory, either, filepath , grammatical-parsers, optparse-applicative, parsers, prettyprinter - , rank2classes, repr-tree-syb, tasty, tasty-hunit, text + , rank2classes, repr-tree-syb, tasty, tasty-hunit, template-haskell + , text, transformers }: mkDerivation { pname = "language-oberon"; - version = "0.2"; - sha256 = "052kgd4d1cwdqs8znkx2fagjlb39x6c2lhvic6il2c67ali53nhr"; + version = "0.2.1"; + sha256 = "1ia0m9bgrz1jksw349a0pgmkfvy5ykc29n55w7w457c60y37bs02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory either filepath grammatical-parsers - parsers prettyprinter rank2classes text + parsers prettyprinter rank2classes template-haskell text + transformers ]; executableHaskellDepends = [ base containers either filepath grammatical-parsers optparse-applicative prettyprinter rank2classes repr-tree-syb text ]; testHaskellDepends = [ - base directory either filepath tasty tasty-hunit + base directory either filepath grammatical-parsers prettyprinter + tasty tasty-hunit text ]; - description = "Parser and pretty-printer for the Oberon programming language"; + description = "Parser, pretty-printer, and type checker for the Oberon programming language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -127989,6 +132323,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 { @@ -128028,89 +132388,43 @@ self: { }) {}; "language-puppet" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + ({ 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 - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.20.1"; - sha256 = "0gak1v8p6fnrac7br2gvz3wg8mymm82gyv4wbdcp5rkj7ncm19vs"; - 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 - ]; - 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 - ]; - testHaskellDepends = [ - base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl - pcre-utils protolude scientific strict-base-types temporary text - transformers unordered-containers vector - ]; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "language-puppet_1_4_0" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, exceptions, filecache, filepath - , formatting, Glob, hashable, hruby, hslogger, hspec - , hspec-megaparsec, http-api-data, http-client, lens, lens-aeson - , megaparsec, memory, mtl, operational, optparse-applicative - , parallel-io, parsec, parser-combinators, pcre-utils, process - , protolude, random, regex-pcre-builtin, scientific, servant - , servant-client, split, stm, strict-base-types, temporary, text - , time, transformers, unix, unordered-containers, vector, yaml + , 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.4.0"; - sha256 = "169kzd6csar170j0zqzisa82jxs5xfang17ys6aa4m1jx0nbh4mz"; + 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 parser-combinators pcre-utils process protolude - random regex-pcre-builtin scientific servant servant-client split - stm strict-base-types text time transformers unix - unordered-containers vector yaml + 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; @@ -128355,17 +132669,28 @@ self: { }) {}; "lapack" = callPackage - ({ mkDerivation, base, blas-ffi, comfort-array, lapack-ffi - , netlib-ffi, non-empty, transformers, utility-ht + ({ mkDerivation, base, blas-ffi, boxes, ChasingBottoms + , comfort-array, data-ref, deepseq, fixed-length + , guarded-allocation, lapack-ffi, lazyio, netlib-ffi, non-empty + , QuickCheck, quickcheck-transformer, random, semigroups, tfp + , transformers, unique-logic-tf, utility-ht }: mkDerivation { pname = "lapack"; - version = "0.1"; - sha256 = "195v3jpz5n5vksa8svqng1kwc629ds2kd1p55f6npz2q2j6k8lac"; + version = "0.2.1"; + sha256 = "1m6n36cjk69maqrb2alya8ki2kndvpfjn2nyb8p4k5333x4ka6xm"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base blas-ffi comfort-array lapack-ffi netlib-ffi non-empty + base blas-ffi boxes comfort-array deepseq fixed-length + guarded-allocation lapack-ffi lazyio netlib-ffi non-empty tfp transformers utility-ht ]; + testHaskellDepends = [ + base ChasingBottoms comfort-array data-ref netlib-ffi non-empty + QuickCheck quickcheck-transformer random semigroups tfp + transformers unique-logic-tf utility-ht + ]; description = "Numerical Linear Algebra using LAPACK"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -128377,15 +132702,30 @@ self: { }: mkDerivation { pname = "lapack-carray"; - version = "0.0.2"; - sha256 = "1dr4mbhc5y21mbnksyi530rsvckfp4mclhhig2rjhx3b06cksfna"; + version = "0.0.3"; + sha256 = "1l4dwkdk6m5ran92j7k9yxqin1spgx8sg0bi2kfn1pcs6jzgn3si"; libraryHaskellDepends = [ base carray lapack-ffi netlib-carray netlib-ffi storable-complex transformers ]; description = "Auto-generated interface to Fortran LAPACK via CArrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lapack-comfort-array" = callPackage + ({ mkDerivation, base, comfort-array, lapack-ffi + , netlib-comfort-array, netlib-ffi, storable-complex, transformers + }: + mkDerivation { + pname = "lapack-comfort-array"; + version = "0.0"; + sha256 = "06pzjr9n5pn0aqgf1p7njls65m10zfryzld3sxlr9ybailmnsa2j"; + libraryHaskellDepends = [ + base comfort-array lapack-ffi netlib-comfort-array netlib-ffi + storable-complex transformers + ]; + description = "Auto-generated interface to Fortran LAPACK via comfort-array"; + license = stdenv.lib.licenses.bsd3; }) {}; "lapack-ffi" = callPackage @@ -128398,7 +132738,6 @@ self: { libraryPkgconfigDepends = [ liblapack ]; description = "Auto-generated interface to Fortran LAPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) liblapack;}; "lapack-ffi-tools" = callPackage @@ -128409,8 +132748,8 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1.1"; - sha256 = "1y3h69mkbjidl146y1w0symk8rgpir5gb5914ymmg83nsyyl16vk"; + version = "0.1.2"; + sha256 = "14wfnddya7ch8hm3wgabd7nma7ahcgv6h2innfbp1ck92isn2s0q"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -128544,6 +132883,7 @@ self: { ]; description = "Use actual LaTeX to render formulae inside Hakyll pages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "latex-formulae-image" = callPackage @@ -128560,6 +132900,7 @@ self: { ]; description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "latex-formulae-pandoc" = callPackage @@ -128581,6 +132922,7 @@ self: { ]; description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "latex-function-tables" = callPackage @@ -128603,6 +132945,7 @@ self: { testHaskellDepends = [ base ]; description = "Function table specifications in latex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "latex-live-snippets" = callPackage @@ -128631,6 +132974,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 @@ -128642,6 +132987,7 @@ self: { ]; description = "Fine-grained library for constructing and manipulating lattices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "launchpad-control" = callPackage @@ -128714,8 +133060,8 @@ self: { }: mkDerivation { pname = "layered-state"; - version = "1.1.4"; - sha256 = "06mwkz6816nkwlsc51hfx0y67dhf42rkib165xag7kga7843idxa"; + version = "1.1.5"; + sha256 = "122z7jzhy65ksdkgn505gkjgn0j04gqq38q5k1d3xlg96x670chk"; libraryHaskellDepends = [ base constraints data-default exceptions lens lens-utils monad-branch monoid mtl primitive profunctors prologue transformers @@ -128746,8 +133092,8 @@ self: { }: mkDerivation { pname = "layers-game"; - version = "0.5.3"; - sha256 = "050l8fd77xhl4fqhl8s1c22gdww3if69mzflgrai9gwq31kiasp3"; + version = "0.6.0"; + sha256 = "03a8l2hmirhfnl7s07yq06szmwcr5lz2lapbpp22ryqjr3zpvwf6"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -128804,8 +133150,8 @@ self: { }: mkDerivation { pname = "layouting"; - version = "1.1.3"; - sha256 = "1ji0hmfa87n3pl61gmgk4phmpir29j5r81ack95s3h7nxh0q5qh7"; + version = "1.1.4"; + sha256 = "0p50zg1xydvci313dh87g0asx292vbhbz5iaywcw9rapwxlg5zld"; libraryHaskellDepends = [ base container layered-state prologue terminal-text text ]; @@ -128847,6 +133193,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 @@ -128969,6 +133317,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; @@ -128984,6 +133334,7 @@ self: { libraryHaskellDepends = [ array base vector ]; description = "L-BFGS optimization"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lca" = callPackage @@ -129036,6 +133387,7 @@ self: { ]; description = "Online Latent Dirichlet Allocation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ldap-client" = callPackage @@ -129054,6 +133406,7 @@ self: { testHaskellDepends = [ base bytestring hspec process semigroups ]; description = "Pure Haskell LDAP Client Library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ldapply" = callPackage @@ -129140,20 +133493,20 @@ self: { ({ 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"; license = stdenv.lib.licenses.bsd3; }) {}; - "leancheck_0_7_4" = callPackage + "leancheck_0_9_0" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.7.4"; - sha256 = "1lbr0b3k4fk0xlmqh5v4cidayzi9ijkr1i6ykzg2gd0xmjl9b4bq"; + version = "0.9.0"; + sha256 = "12s3pwihb6i5anv5zm8xvlz6gq4bfk0nrgvkmg83my1sg5pcknl4"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; @@ -129161,6 +133514,35 @@ 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, array, base, bytestring, containers, leancheck + , nats, text, time + }: + mkDerivation { + pname = "leancheck-instances"; + version = "0.0.3"; + sha256 = "1h6aw2fvdcjaz9r90l3c9znykn0y9gvg74ycvkrqw823sd9ywwd6"; + libraryHaskellDepends = [ + array base bytestring containers leancheck nats text time + ]; + testHaskellDepends = [ + base bytestring containers leancheck nats text + ]; + description = "Common LeanCheck instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "leankit-api" = callPackage ({ mkDerivation, aeson, base, bytestring, colour, curl, split }: mkDerivation { @@ -129174,6 +133556,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "leanpub-concepts" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "leanpub-concepts"; + version = "1.0.0.1"; + sha256 = "1vf62iryqmj8ll16cm5xpwaqzlhw8rb7p6pshm87assm9lnw3k8c"; + libraryHaskellDepends = [ base bytestring text ]; + description = "Types for the Leanpub API"; + license = stdenv.lib.licenses.mit; + }) {}; + + "leanpub-wreq" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions + , leanpub-concepts, lens, rando, text, time, transformers + , unordered-containers, wreq + }: + mkDerivation { + pname = "leanpub-wreq"; + version = "1.0.0.0"; + sha256 = "060ilipz2aj7rci6yiy2r6j8c10hlv8q8qv5wm7ic9rjl2gvx4ra"; + libraryHaskellDepends = [ + aeson base bytestring exceptions leanpub-concepts lens rando text + time transformers unordered-containers wreq + ]; + description = "Use the Leanpub API via Wreq"; + license = stdenv.lib.licenses.mit; + }) {}; + "leapseconds" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, time }: mkDerivation { @@ -129209,25 +133619,10 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Learning Algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "learn-physics" = callPackage - ({ mkDerivation, base, gloss, gnuplot, hmatrix, vector-space }: - mkDerivation { - pname = "learn-physics"; - version = "0.6.2"; - sha256 = "0j69q7jyznjjizkyyn032dfc1g9r6fssxp4b183bapj1xp9n116j"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base gloss gnuplot hmatrix vector-space - ]; - executableHaskellDepends = [ base gloss gnuplot ]; - description = "Haskell code for learning physics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "learn-physics_0_6_3" = callPackage ({ mkDerivation, base, gloss, gnuplot, hmatrix, not-gloss , spatial-math, vector-space }: @@ -129493,48 +133888,6 @@ self: { }) {}; "lens" = callPackage - ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , Cabal, cabal-doctest, call-stack, comonad, containers - , contravariant, criterion, deepseq, directory, distributive - , doctest, exceptions, filepath, free, generic-deriving, ghc-prim - , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors - , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect - , tagged, template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text - , th-abstraction, transformers, transformers-compat - , unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; - version = "4.16.1"; - sha256 = "1im4drhbydbawd6i0jsrzpqihnmx4ywpkg7yg94ddwsw3mxwkgpm"; - revision = "2"; - editedCabalFile = "11h83lj5mba4grhz1qx3irz10ysm9c3k7k6i6xv2cr60q8xin3ri"; - setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; - libraryHaskellDepends = [ - array base base-orphans bifunctors bytestring call-stack comonad - containers contravariant distributive exceptions filepath free - ghc-prim hashable kan-extensions mtl parallel profunctors - reflection semigroupoids semigroups tagged template-haskell text - th-abstraction transformers transformers-compat - unordered-containers vector void - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving HUnit mtl nats parallel QuickCheck semigroups - simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - benchmarkHaskellDepends = [ - base bytestring comonad containers criterion deepseq - generic-deriving transformers unordered-containers vector - ]; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "lens_4_17" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring , Cabal, cabal-doctest, call-stack, comonad, containers , contravariant, criterion, deepseq, directory, distributive @@ -129572,7 +133925,6 @@ self: { ]; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-accelerate" = callPackage @@ -129581,9 +133933,12 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-action" = callPackage @@ -129645,8 +134000,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 ]; @@ -129658,8 +134013,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; @@ -129693,25 +134048,11 @@ self: { ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { pname = "lens-labels"; - version = "0.2.0.1"; - sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj"; - revision = "1"; - editedCabalFile = "0iyh7msip83dzj9gj5f18zchvjinhx40dmdb52vza0x1763qkilv"; - libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; - description = "Integration of lenses with OverloadedLabels"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens-labels_0_3_0_0" = callPackage - ({ mkDerivation, base, ghc-prim, profunctors, tagged }: - mkDerivation { - pname = "lens-labels"; - version = "0.3.0.0"; - sha256 = "1kpbn9lsaxvw86w3r121rymrxcyihci7njpcw3f2663pb01v39rn"; + 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 @@ -129773,8 +134114,8 @@ self: { }: mkDerivation { pname = "lens-regex"; - version = "0.1.0"; - sha256 = "0hjizjmvdngxn63gs7x87qidh71aqhvyigrnqlbfjqan76pb6m29"; + version = "0.1.1"; + sha256 = "0c673v6k6y7dng6qmi4jbh3jlx803mg5g1911bz54r785fm6p50d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129808,6 +134149,8 @@ self: { pname = "lens-sop"; version = "0.2.0.2"; sha256 = "16bd95cwqiprz55s5272mv6wiw5pmv6mvihviiwbdbilhq400s3z"; + revision = "1"; + editedCabalFile = "0k7xdwj64kd56kjh7ghjwm79rjwjqxlw5nwzwj0cq5q56vb340jm"; libraryHaskellDepends = [ base fclabels generics-sop transformers ]; @@ -129845,15 +134188,14 @@ 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 ]; description = "Lenses for toml-parser"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-tutorial" = callPackage @@ -129869,14 +134211,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lens-typelevel" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "lens-typelevel"; + version = "0.1.1.0"; + sha256 = "0lsdp6rgacsa13fppa2dfn2nz8cdrvj5clmlshzrv1h0423hfgbp"; + libraryHaskellDepends = [ base singletons ]; + description = "Type-level lenses using singletons"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-utils" = callPackage ({ mkDerivation, aeson, base, containers, data-default, lens , monoid, split, template-haskell }: mkDerivation { pname = "lens-utils"; - version = "1.4.5"; - sha256 = "00xcwyl12w95k14rc12ww2i0kgbrv39q1lvq5kfj3z7l5hv4fg0g"; + version = "1.4.6"; + sha256 = "1gz2mf33lszk33yszzcsbjhch1jxszg1h9cin49wwbgrb0imz7ds"; libraryHaskellDepends = [ aeson base containers data-default lens monoid split template-haskell @@ -129931,8 +134284,10 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.0.11.3"; - sha256 = "0kb9fydcv0skp94bhvhbqggam8vrq2wv5iradxmggaf41h0ly123"; + version = "1.1.1.1"; + sha256 = "00ydjvvpqil044wjb52cf804qn8fdqvf3rn3jghinb10y8i4a62k"; + revision = "1"; + editedCabalFile = "1vamkgjrngsdq8k820xkr0h613ly2s3lpf0hdqkvqkynywmd2ing"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129947,6 +134302,7 @@ self: { ]; description = "frugal issue tracker"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz" = callPackage @@ -129979,6 +134335,7 @@ self: { ]; description = "Van Laarhoven lens templates"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "level-monad" = callPackage @@ -130220,8 +134577,8 @@ self: { }: mkDerivation { pname = "lhs2tex"; - version = "1.21"; - sha256 = "17yfqvsrd2p39fxfmzfvnliwbmkfx5kxmdk0fw5rx9v17acjmnc7"; + version = "1.22"; + sha256 = "1g9966m4pw5rp7a83839k46jmih64rn6w0xnmjlrl0df9ddkpsky"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -130267,6 +134624,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "libarchive" = callPackage + ({ mkDerivation, base, bytestring, filepath, libarchive }: + mkDerivation { + pname = "libarchive"; + version = "0.2.0.0"; + sha256 = "14kad23r22bx65h2iq0n0cbxhzzwj56gwpi73vciycjg0i5w04yd"; + libraryHaskellDepends = [ base bytestring filepath ]; + libraryPkgconfigDepends = [ libarchive ]; + description = "Haskell bindings for libarchive"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) libarchive;}; + "libarchive-conduit" = callPackage ({ mkDerivation, archive, base, bytestring, conduit, resourcet , transformers @@ -130370,6 +134739,8 @@ self: { pname = "libgraph"; version = "1.14"; sha256 = "0grzimgy946mnwggmlc3sja567v2s21ymcwzlwf110k11pjqp5xp"; + revision = "1"; + editedCabalFile = "12xyrvvyh73b93k74lj55zwaygsvd93p4bm51kcd54m0pv0lclbq"; libraryHaskellDepends = [ array base containers monads-tf process union-find ]; @@ -130580,8 +134951,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 @@ -130622,6 +134993,7 @@ self: { librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libnotify;}; "libnvvm" = callPackage @@ -130708,6 +135080,91 @@ 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; + }) {}; + + "libraft_0_2_0_0" = callPackage + ({ mkDerivation, atomic-write, attoparsec, base, base16-bytestring + , bytestring, cereal, concurrency, containers, cryptohash-sha256 + , dejafu, directory, exceptions, file-embed, haskeline + , hunit-dejafu, lifted-base, monad-control, mtl, network + , network-simple, parsec, postgresql-simple, process, protolude + , QuickCheck, quickcheck-state-machine, random, repline, stm, tasty + , tasty-dejafu, tasty-discover, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, text, time, transformers, transformers-base + , tree-diff, word8 + }: + mkDerivation { + pname = "libraft"; + version = "0.2.0.0"; + sha256 = "0lm2b9n1xlpzsxcvnhc3bkcgzbrwxb1l0ffjjqa55hn42dw8ng1d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-write attoparsec base base16-bytestring bytestring cereal + concurrency containers cryptohash-sha256 directory exceptions + file-embed haskeline lifted-base monad-control mtl network + network-simple parsec postgresql-simple protolude random repline + text time transformers transformers-base word8 + ]; + executableHaskellDepends = [ + atomic-write attoparsec base base16-bytestring bytestring cereal + concurrency containers cryptohash-sha256 directory exceptions + file-embed haskeline lifted-base monad-control mtl network + network-simple parsec postgresql-simple protolude random repline + stm text time transformers transformers-base word8 + ]; + testHaskellDepends = [ + atomic-write attoparsec base base16-bytestring bytestring cereal + concurrency containers cryptohash-sha256 dejafu directory + exceptions file-embed haskeline hunit-dejafu lifted-base + monad-control mtl network network-simple parsec postgresql-simple + process protolude QuickCheck quickcheck-state-machine random + repline tasty tasty-dejafu tasty-discover tasty-expected-failure + tasty-hunit tasty-quickcheck text time transformers + transformers-base tree-diff word8 + ]; + testToolDepends = [ tasty-discover ]; + description = "Raft consensus algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "librandomorg" = callPackage ({ mkDerivation, base, bytestring, curl }: mkDerivation { @@ -130757,8 +135214,28 @@ self: { ]; description = "Use Libravatar, the decentralized avatar delivery service"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "libretls" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, libressl, libtls + , monad-ste, primitive, transformers, vector + }: + mkDerivation { + pname = "libretls"; + version = "0.0.0.0"; + sha256 = "11x9hckw0h34w3ynjwfr6lyyv22p7g4dpi5qknpy8in9ffjymmk9"; + libraryHaskellDepends = [ + base monad-ste primitive transformers vector + ]; + libraryPkgconfigDepends = [ libtls ]; + testHaskellDepends = [ base containers hspec HUnit libressl ]; + description = "libtls bindings"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {libressl = null; libtls = null;}; + "libroman" = callPackage ({ mkDerivation, base, hspec, QuickCheck, split }: mkDerivation { @@ -130777,8 +135254,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 ]; @@ -130861,6 +135338,7 @@ self: { libraryPkgconfigDepends = [ systemd ]; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -130878,6 +135356,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; + "libtelnet" = callPackage + ({ mkDerivation, base, bytestring, libtelnet }: + mkDerivation { + pname = "libtelnet"; + version = "0.1.0.0"; + sha256 = "0s2ldi4ikjdvki8r190mnkjd0jkahn8ln6gvqb8bn5d291j19nmc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ libtelnet ]; + description = "Bindings to libtelnet"; + license = stdenv.lib.licenses.gpl3Plus; + }) {inherit (pkgs) libtelnet;}; + "libvirt-hs" = callPackage ({ mkDerivation, base, c2hs, libvirt, syb, unix }: mkDerivation { @@ -130971,12 +135463,25 @@ 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 { pname = "libzfs"; version = "0.2.0.0"; sha256 = "1g3bn3dmkzalzpm645ag4vk9736in0xcszj28girpyphyiyfkk45"; + revision = "1"; + editedCabalFile = "0rvk7mbqz5yr5qx52ais53x1sknbf9r87q7rypk63jznjj1jcbmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl transformers ]; @@ -131047,6 +135552,7 @@ self: { ]; testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lift-generics" = callPackage @@ -131087,8 +135593,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 ]; @@ -131141,6 +135647,7 @@ self: { ]; description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-protolude" = callPackage @@ -131167,8 +135674,8 @@ self: { }: mkDerivation { pname = "lifted-stm"; - version = "0.1"; - sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0"; + version = "0.2"; + sha256 = "115yh4rpm7z97jrc088g5jb49amr31kz5sdllpydq3h1yi1wlmbq"; libraryHaskellDepends = [ array base monad-finally stm transformers transformers-abort transformers-base transformers-compat @@ -131327,15 +135834,14 @@ 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 ]; description = "representation of Integer Linear Programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "limp-cbc" = callPackage @@ -131344,8 +135850,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 = [ @@ -131441,6 +135947,7 @@ self: { ]; description = "Haskell SDK for the LINE API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "line-break" = callPackage @@ -131528,6 +136035,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "Lifting linear vector spaces into Accelerate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-algebra-cblas" = callPackage @@ -131641,21 +136149,15 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-vect" = callPackage @@ -131691,6 +136193,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 @@ -131756,6 +136260,7 @@ self: { libraryHaskellDepends = [ base containers mtl safe ]; description = "Lines of Action, 2-player strategy board game"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linguistic-ordinals" = callPackage @@ -131782,6 +136287,7 @@ self: { ]; description = "Use web link relation types (RFC 5988) in Haskell"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linkchk" = callPackage @@ -131829,6 +136335,7 @@ self: { testHaskellDepends = [ base ]; description = "A pure linked list which is mutable through iterators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linkedhashmap" = callPackage @@ -131874,6 +136381,7 @@ self: { ]; description = "A Haskell library for the Slack API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linode" = callPackage @@ -132415,10 +136923,8 @@ self: { }: mkDerivation { pname = "list-t"; - version = "1.0.1"; - sha256 = "0wv78c3fg4g98pwdamsaasfnww4mdyffp4fhvb685s12kpg8shy3"; - revision = "1"; - editedCabalFile = "0jv0wxxr6rpw9mi3n6jbjqlk403wzycyafrc26vcwkdjaw63ckxb"; + version = "1.0.3.1"; + sha256 = "0h6bwljy0cqm1fsq151glglnvczjcvbphxiw7c83ps2zy9whg4y9"; libraryHaskellDepends = [ base mmorph monad-control mtl transformers transformers-base ]; @@ -132541,8 +137047,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 @@ -132556,11 +137062,33 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "list-zip-def"; - version = "0.1.0.2"; - sha256 = "15123r7a52qb6dcxy1bxid8llykx439srqripmvji3rizwlqaa89"; + version = "0.1.0.3"; + sha256 = "0sklydccvdbxnj0c79lj7pcvw5v0bkycs9zp566gdcfy08qcjq79"; libraryHaskellDepends = [ base ]; description = "Provides zips with default values"; license = stdenv.lib.licenses.publicDomain; + }) {}; + + "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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -132891,18 +137419,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; @@ -133022,10 +137550,10 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "6.3.0"; - sha256 = "10v13f0pcsjaz7lhpg5wr520qp9rgajbv5c3pqx4v79nmfv797jd"; + 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 @@ -133049,8 +137577,8 @@ self: { }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.5.0.0"; - sha256 = "1715x7wggllp445kkb6f2pkc87qw504yvl2adzz2i4fz8jzm1jhd"; + version = "0.6.1.0"; + sha256 = "12w1rkkaf50jl2vdkyk4xpvjmsxzjbfkdyklaq5p6b8ykw872pda"; libraryHaskellDepends = [ array base bytestring llvm-hs-pure prettyprinter text ]; @@ -133070,8 +137598,8 @@ self: { }: mkDerivation { pname = "llvm-hs-pure"; - version = "6.2.1"; - sha256 = "1a9xzg6q4gd6j7dkvpkqpnrmh8y1fabllpjbh0m181v1c52aj23r"; + version = "7.0.0"; + sha256 = "1b82cin889qkyp9qv5p3yk7wq7ibnx2v9pk0mpvk6k9ca7fpr7dg"; libraryHaskellDepends = [ attoparsec base bytestring containers fail mtl template-haskell transformers unordered-containers @@ -133314,8 +137842,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 @@ -133356,25 +137884,23 @@ 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"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loc-test" = callPackage ({ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "local-address" = callPackage @@ -133585,7 +138111,6 @@ self: { libraryHaskellDepends = [ base clock stm ]; description = "set a maximum on the number of concurrent actions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log" = callPackage @@ -133662,8 +138187,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 @@ -133698,10 +138223,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.0.0"; - sha256 = "0bjsng7ganwbqxvj9zi7w7l547iw9yh972bc0mc82cnwd6awclj5"; - revision = "1"; - editedCabalFile = "11sd5si8snl5agl34arp9lkxjnm07rd5rs05apq1lvcac70la18d"; + version = "0.10.0.1"; + sha256 = "1nnchsrkcm08r1lrlldr7icqnzsz3g024dlwg2z9la66n9d0fvl0"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -133709,6 +138232,7 @@ self: { ]; description = "Structured logging solution (Elasticsearch back end)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-postgres" = callPackage @@ -133899,8 +138423,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 @@ -134001,6 +138525,7 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade-syslog" = callPackage @@ -134031,6 +138556,7 @@ self: { libraryToolDepends = [ alex happy ]; description = "Import, export etc. for TPTP, a syntax for first-order logic"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logic-classes" = callPackage @@ -134398,6 +138924,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; @@ -134412,6 +138940,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Dependently-typed linked list implementation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lookup-tables" = callPackage @@ -134689,8 +139218,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; @@ -134704,8 +139233,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "4"; - editedCabalFile = "11zfnngp3blx8c3sgy5cva1g9bp69wqz7ys23gdm905i7sjjs6a9"; + revision = "6"; + editedCabalFile = "1zkf8ss6siai3py4drb5hr0m3np2kk3vrzb6kcxhq0vxxz3xynjh"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -134762,8 +139291,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.4.0.0"; - sha256 = "0kiddzb7lwwdf96jz4ghvjnwr2hf9jiv8vjjlxwm76k3ab4wx09c"; + version = "0.5.0.2"; + sha256 = "0g5kw8y59bdyzj7zzwif1810q7wk87d7q53idpw250g6s4dwycxa"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -134776,6 +139305,7 @@ self: { ]; description = "Functional test framework for LSP servers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lss" = callPackage @@ -134824,8 +139354,8 @@ self: { }: mkDerivation { pname = "ltext"; - version = "0.1.2.2"; - sha256 = "12ql2p9zkib4m7hbfxzn8pxg0n9rgf35bhf1csrf48b6kzl9z28f"; + version = "0.1.3"; + sha256 = "1sd8iqcfm7qsp8rq1ckixi8lss8mwi4siqqgsybbxjg6ajs9m2x6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134839,12 +139369,12 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltiv1p1" = callPackage @@ -134990,10 +139520,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 @@ -135400,8 +139928,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 = [ @@ -135474,8 +140002,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 @@ -135586,6 +140114,7 @@ self: { ]; description = "Arrow based stream transducers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "machines" = callPackage @@ -135634,6 +140163,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "machines-attoparsec" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, machines, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "machines-attoparsec"; + version = "0"; + sha256 = "0mxm1gy7kr7czhmfwskl56wnawb2l3axfig22935bliq75mpvbs4"; + libraryHaskellDepends = [ + attoparsec base bytestring machines text + ]; + testHaskellDepends = [ + attoparsec base bytestring machines tasty tasty-hunit text + ]; + description = "Parse machines streams with attoparsec parsers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "machines-binary" = callPackage ({ mkDerivation, base, binary, bytestring, machines }: mkDerivation { @@ -135671,6 +140218,17 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "machines-encoding" = callPackage + ({ mkDerivation, base, bytestring, machines, text }: + mkDerivation { + pname = "machines-encoding"; + version = "0"; + sha256 = "1n8skhf48q7dissrq7hpgsccjgh1hspjqh331m58z8id9xry133g"; + libraryHaskellDepends = [ base bytestring machines text ]; + description = "Transcode encodings with machines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "machines-io" = callPackage ({ mkDerivation, base, bytestring, chunked-data, machines , transformers @@ -135760,6 +140318,8 @@ self: { pname = "maclight"; version = "0.1.0.0"; sha256 = "0qf44jza8avq2yfsx2f0bdxbnda4lm3xq9qaivmslfbdfjy3mxv3"; + revision = "1"; + editedCabalFile = "0v10y2x6c2cyh1qc0yki1mn69bcps0bdbq1mipf35mjmd0zs5iyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base filemanip filepath parsec strict ]; @@ -135771,6 +140331,23 @@ self: { ]; description = "Control screen and keyboard backlights on MACs under Linux"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "macos-corelibs" = callPackage + ({ mkDerivation, base, containers, managed, mtl, profunctors + , tagged, transformers + }: + mkDerivation { + pname = "macos-corelibs"; + version = "0.0.1.0"; + sha256 = "1ma5dc8j1s3fpqkqwlqnb32vwchdyabxp001qa7r7balima5xfjs"; + libraryHaskellDepends = [ + base containers managed mtl profunctors tagged transformers + ]; + description = "Haskell bindings to C-based Mac OS SDK frameworks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "macosx-make-standalone" = callPackage @@ -135796,25 +140373,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.13"; - sha256 = "10a7q64dm9vw2a3qzvixlg0632l5h8j6xj9ga3w430fxch618f26"; + 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 ]; @@ -135861,8 +140438,8 @@ self: { }: mkDerivation { pname = "magic-wormhole"; - version = "0.1.0"; - sha256 = "0lkwnbr76chiakc7j51pm23q15q26l3xqglg1rj5blwybkymg29x"; + version = "0.2.1"; + sha256 = "1wdn5nykn4wqb65xdhkpy8gpz216a5wi3nngadf58c7acym60gyx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135885,41 +140462,41 @@ self: { "magicbane" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring - , conduit, conduit-combinators, data-default, 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 + , 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.3.0"; - sha256 = "1jg6mhi046gdp0mhwzx2n40dv2ysrj8mkif6krb4vg3mdwh39lr0"; + version = "0.4.0"; + sha256 = "0n2yn3jbklibb21pm2ifiy9035d3xmrh8cgywnpawm51p5q3klwl"; libraryHaskellDepends = [ aeson aeson-qq attoparsec base bytestring conduit - conduit-combinators data-default 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 + 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 { pname = "magico"; - version = "0.0.1.1"; - sha256 = "0cr6dk02k80ljfajg715rk5afzlll12zlg50dpxlb39624nli7hl"; + version = "0.0.1.2"; + sha256 = "17vr7bn7w7wyh7v3gw4lv7nj0qzv2b8cn9f9drjlb08ahxqgqg08"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -136071,20 +140648,19 @@ self: { }) {}; "main-tester" = callPackage - ({ mkDerivation, base, bytestring, directory, doctest, hspec - , hspec-core, QuickCheck, text + ({ mkDerivation, base, bytestring, directory, hspec, hspec-core + , QuickCheck, text }: mkDerivation { pname = "main-tester"; - version = "0.1.0.0"; - sha256 = "0sagm9fkdgjv8x602bjj32glcrivjf3yz47gpbbm48k0mk0dj2dc"; + version = "0.2.0.0"; + sha256 = "0iqb7p90hsygpscyddpvrxdaxka8hdc5xk3acacfns0didc7icnc"; libraryHaskellDepends = [ base bytestring directory ]; testHaskellDepends = [ - base bytestring doctest hspec hspec-core QuickCheck text + 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 @@ -136107,6 +140683,8 @@ self: { pname = "mainland-pretty"; version = "0.7"; sha256 = "1xzavchbp345a63i24hs8632l3xk0c1pxqd32b2i6615cp9pnxqi"; + revision = "1"; + editedCabalFile = "1apyqnbcsbjfkqc1d6mk74pxl12130r6ijwhj555gddls9g0qdf3"; libraryHaskellDepends = [ base containers srcloc text transformers ]; @@ -136260,14 +140838,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; }) {}; @@ -136684,6 +141262,7 @@ self: { ]; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mandulia" = callPackage @@ -136772,8 +141351,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 @@ -136795,8 +141374,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; @@ -136831,6 +141410,7 @@ self: { executableHaskellDepends = [ base bytestring cassava containers ]; description = "Extensions to Data.Map"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-syntax" = callPackage @@ -136841,12 +141421,15 @@ 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 ]; description = "Syntax sugar for defining maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mapalgebra" = callPackage @@ -136856,24 +141439,21 @@ self: { }: mkDerivation { pname = "mapalgebra"; - version = "0.1.1"; - sha256 = "1zcba17nj804lbhnlr02bcg8qfaxv3nq8ddiqxpq2qp4mv8n8g4f"; + version = "0.1.2"; + sha256 = "191f8ipm12c270nhwa7g4ibadnajj8pys8q0vjc5l7f0s9m4g8ak"; libraryHaskellDepends = [ base bytestring containers data-default deepseq hmatrix massiv massiv-io vector ]; testHaskellDepends = [ - base bytestring containers data-default deepseq hmatrix - HUnit-approx massiv massiv-io QuickCheck tasty tasty-hunit - tasty-quickcheck vector + base containers hmatrix HUnit-approx massiv massiv-io QuickCheck + tasty tasty-hunit tasty-quickcheck vector ]; benchmarkHaskellDepends = [ - base bytestring containers criterion data-default deepseq hmatrix - massiv massiv-io vector + base containers criterion hmatrix massiv massiv-io vector ]; description = "Efficient, polymorphic Map Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mappy" = callPackage @@ -136896,6 +141476,7 @@ self: { testHaskellDepends = [ base containers hspec parsec QuickCheck ]; description = "A functional programming language focused around maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mapquest-api" = callPackage @@ -136949,22 +141530,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; @@ -137002,6 +141583,7 @@ self: { libraryHaskellDepends = [ base monads-tf papillon ]; description = "markdown parser with papillon"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markdown-unlit" = callPackage @@ -137111,6 +141693,7 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -137262,6 +141845,7 @@ self: { testHaskellDepends = [ base hspec text ]; description = "Compile time string interpolation a la Scala and CoffeeScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "marxup" = callPackage @@ -137312,32 +141896,14 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, data-default, data-default-class, deepseq - , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector - }: - mkDerivation { - pname = "massiv"; - version = "0.2.0.0"; - sha256 = "0jyripzh4da29bvbhrfmwvjicr22ll9vbd0f3wiv4gcmlpnhls9j"; - libraryHaskellDepends = [ - base data-default-class deepseq ghc-prim primitive vector - ]; - testHaskellDepends = [ - base data-default deepseq hspec QuickCheck safe-exceptions vector - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, data-default, data-default-class , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions , vector }: mkDerivation { pname = "massiv"; - version = "0.2.1.0"; - sha256 = "0x5qf5hp6ncrjc28xcjd2v4w33wpyy69whmgvvp163y0q3v1n3q7"; + version = "0.2.7.0"; + sha256 = "080pdghb6yf08addkysdpgdgzf60lc90z580vk2igjfc23w9xwc7"; libraryHaskellDepends = [ base bytestring data-default-class deepseq ghc-prim primitive vector @@ -137348,7 +141914,6 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -137357,8 +141922,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.1.4.0"; - sha256 = "0yah1g7cm959kzzlqkgbzrx5aswd697518v89z7r5380f6hqq4cc"; + version = "0.1.5.0"; + sha256 = "1vgq6rdmnh3v2rgch9k46sw9jfwhfpngxxl4cz0w1pjsjq7sp2fw"; libraryHaskellDepends = [ base bytestring data-default deepseq directory filepath JuicyPixels massiv netpbm process vector @@ -137405,6 +141970,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matchable" = callPackage + ({ mkDerivation, base, containers, doctest, hashable, hspec, tagged + , unordered-containers, vector + }: + mkDerivation { + pname = "matchable"; + version = "0.1.2"; + sha256 = "0wrbq9pqndr9rm8iy3vmz756q77s0ih3y2is0hvv48w89hn5a4r0"; + libraryHaskellDepends = [ + base containers hashable tagged unordered-containers vector + ]; + testHaskellDepends = [ base containers doctest hspec ]; + description = "A type class for Matchable Functors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "matchable-th" = callPackage + ({ mkDerivation, base, containers, matchable, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "matchable-th"; + version = "0.1.0.0"; + sha256 = "1381zpnpzgng7iwx326bjwi1i3300a0aa0hhp1j5wr0mxad8hyr3"; + libraryHaskellDepends = [ + base matchable template-haskell th-abstraction + ]; + testHaskellDepends = [ base containers matchable ]; + description = "Generates Matchable instances using TemplateHaskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "matcher" = callPackage ({ mkDerivation, base, base-prelude, profunctors, success, text , transformers @@ -137434,35 +142031,14 @@ self: { }) {inherit (pkgs) pcre;}; "math-functions" = callPackage - ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.2.1.0"; - sha256 = "1sv5vabsx332v1lpb6v3jv4zrzvpx1n7yprzd8wlcda5vsc5a6zp"; - libraryHaskellDepends = [ - base deepseq primitive vector vector-th-unbox - ]; - testHaskellDepends = [ - base deepseq erf HUnit primitive QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector - vector-th-unbox - ]; - description = "Special functions and Chebyshev polynomials"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "math-functions_0_3_0_2" = callPackage ({ mkDerivation, base, data-default-class, deepseq, erf, HUnit , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector, vector-th-unbox }: mkDerivation { pname = "math-functions"; - version = "0.3.0.2"; - sha256 = "094kf3261b3m07r6gyf63s0pnhw5v0z1q5pzfskl4y8fdjvsp4kb"; + version = "0.3.1.0"; + sha256 = "0mb61yn7faxhpj5d6w5dzgawz2hbjbdqbxz3dkw4855r1bnfnh1k"; libraryHaskellDepends = [ base data-default-class deepseq primitive vector vector-th-unbox ]; @@ -137473,7 +142049,6 @@ self: { ]; description = "Collection of tools for numeric computations"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mathblog" = callPackage @@ -137645,6 +142220,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matrices_0_5_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, primitive, tasty + , tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "matrices"; + version = "0.5.0"; + sha256 = "0k8x75k1vkalpmcblmfjqy7lq49nr5mznh134h3d0zqz0q5ky0gx"; + libraryHaskellDepends = [ base deepseq primitive vector ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "native matrix based on vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "matrix" = callPackage ({ mkDerivation, base, criterion, deepseq, loop, primitive , QuickCheck, semigroups, tasty, tasty-quickcheck, vector @@ -137723,22 +142316,21 @@ self: { "matrix-static" = callPackage ({ mkDerivation, base, deepseq, ghc-typelits-knownnat - , ghc-typelits-natnormalise, matrix, semigroups, tasty, tasty-hunit - , vector + , ghc-typelits-natnormalise, matrix, tasty, tasty-hunit, vector }: mkDerivation { pname = "matrix-static"; - version = "0.1"; - sha256 = "0l4p0ahlpgf39wjwrvr6ibxpj5b6kmyn2li6yjbddi0af137ii4q"; + version = "0.2"; + sha256 = "0g4vkzc6jw4sx2an86d20fv9b23jzly8dxsan7ygih1mp8rn5r07"; libraryHaskellDepends = [ base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix - semigroups vector + vector ]; testHaskellDepends = [ base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix - semigroups tasty tasty-hunit vector + tasty tasty-hunit vector ]; - description = "Wrapper around matrix that adds matrix sizes to the type-level"; + description = "Type-safe matrix operations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -137765,30 +142357,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 @@ -137813,8 +142406,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40900.1.0"; - sha256 = "1ngpinpal50s8bizwvnpafx6zh8zqb7m0yc21lcp7ybh4yhwikad"; + version = "50200.1.0"; + sha256 = "1adqh3s34zw74x4idjy1ln8qq9qlqq146kb9b4gd2lijrr8zrjn7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137829,7 +142422,6 @@ self: { ]; description = "Client API for Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mattermost-api-qc" = callPackage @@ -137838,14 +142430,13 @@ 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 ]; description = "QuickCheck instances for the Mattermost client API library"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "maude" = callPackage @@ -138071,8 +142662,8 @@ self: { }: mkDerivation { pname = "mbug"; - version = "1.3"; - sha256 = "1pa3myyd2qrb14797hix4dh0ajpwr49219x5bf030yps6b0hsi91"; + version = "1.3.2"; + sha256 = "05cyznwvwjc1ajjkr28h8dawlk10nx60ybx30g6vs5h68zlq43nd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138123,17 +142714,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; }) {}; @@ -138283,8 +142872,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 @@ -138374,6 +142963,7 @@ self: { ]; description = "Parse song module files from Amiga MED and OctaMED"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mediabus" = callPackage @@ -138483,6 +143073,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Constant-time queries for the median of a stream of numeric data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mediawiki" = callPackage @@ -138505,24 +143096,27 @@ self: { }) {}; "mediawiki2latex" = callPackage - ({ mkDerivation, array, base, blaze-html, bytestring, containers - , directory, directory-tree, file-embed, filepath, happstack-server - , highlighting-kate, HTTP, http-conduit, hxt, hxt-http, mtl - , network, parsec, process, split, temporary, text, transformers - , url, utf8-string, utility-ht + ({ mkDerivation, array, base, blaze-html, blaze-markup, bytestring + , containers, deepseq, directory, directory-tree, file-embed + , filepath, happstack-server, hashable, highlighting-kate, HTTP + , http-client, http-conduit, http-types, hxt, hxt-http, mtl + , network, network-uri, parsec, process, split, strict, temporary + , text, time, transformers, url, utf8-string, utility-ht + , zip-archive }: mkDerivation { pname = "mediawiki2latex"; - version = "7.9.0.1"; - sha256 = "0q708hh5280k5hknf1mh3nza7qvpszplcis90y0i78a2jd0x2r3w"; + version = "7.33"; + sha256 = "1a8k0yh8j9si4aj8xpwlssmp31qgc7g53pds1hdi2mfi8clxmah7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base blaze-html bytestring containers directory - directory-tree file-embed filepath happstack-server - highlighting-kate HTTP http-conduit hxt hxt-http mtl network parsec - process split temporary text transformers url utf8-string - utility-ht + array base blaze-html blaze-markup bytestring containers deepseq + directory directory-tree file-embed filepath happstack-server + hashable highlighting-kate HTTP http-client http-conduit http-types + hxt hxt-http mtl network network-uri parsec process split strict + temporary text time transformers url utf8-string utility-ht + zip-archive ]; description = "Convert MediaWiki text to LaTeX"; license = "GPL"; @@ -138573,8 +143167,8 @@ self: { }: mkDerivation { pname = "mega-sdist"; - version = "0.3.3.1"; - sha256 = "0p4n5m91i80cns1g5n18bczpyxm8jcc205syr3k8xd7x9gwg69ww"; + version = "0.3.3.2"; + sha256 = "0jhlaww753spj5k2mrzrizcb408265wglc7gycdicnashsxc7qd4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -138585,7 +143179,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "megaparsec" = callPackage + "megaparsec_6_5_0" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-discover, hspec-expectations , mtl, parser-combinators, QuickCheck, scientific, text @@ -138609,9 +143203,10 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "megaparsec_7_0_0" = callPackage + "megaparsec" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -138619,8 +143214,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "7.0.0"; - sha256 = "101kri8w4wf30xs9fnp938il13hxhy6gnnl4m1f0ws4d8q6qgmmz"; + version = "7.0.4"; + sha256 = "1hg83m85f4v78mqdkznd1ddk9y32hnrv0bgva7ir3vydx37aanrj"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -138635,7 +143230,6 @@ self: { ]; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "meldable-heap" = callPackage @@ -138867,6 +143461,7 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring containers ]; description = "Library for reading `/proc/meminfo`"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memis" = callPackage @@ -138982,12 +143577,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"; @@ -139031,8 +143626,8 @@ self: { }: mkDerivation { pname = "menoh"; - version = "0.2.0"; - sha256 = "0n6wl03d8gyvmdjmxz0hrbvwvbyzc4qyz7qr5ydgxyxj56pg2cb4"; + version = "0.3.0"; + sha256 = "0w2p2g5zk4n3k84yrk7hs7kgk82w6avd2i0zk6iczjhhkihh1c6m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -139044,23 +143639,38 @@ 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; hydraPlatforms = stdenv.lib.platforms.none; }) {menoh = null;}; + "menshen" = callPackage + ({ mkDerivation, aeson, base, hspec, QuickCheck, regex-tdfa + , scientific, text + }: + mkDerivation { + pname = "menshen"; + version = "0.0.1"; + sha256 = "1i4h5s3d57466hzyp7mag1z7dbp306qm2sf4k3a0frpsz2n2ijsw"; + libraryHaskellDepends = [ base regex-tdfa scientific text ]; + testHaskellDepends = [ + aeson base hspec QuickCheck regex-tdfa scientific text + ]; + description = "Data Validation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mercury-api" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory , hashable, HUnit, optparse-applicative, text, unordered-containers }: mkDerivation { pname = "mercury-api"; - version = "0.1.0.1"; - sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr"; - revision = "2"; - editedCabalFile = "093c8afmcrnbfliz1ykpyc4w40dli2wig0qi0xcwg8445idwp2kg"; + version = "0.1.0.2"; + sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139084,8 +143694,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 = [ @@ -139093,7 +143703,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; }) {}; @@ -139145,10 +143755,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 ]; @@ -139156,7 +143764,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; }) {}; @@ -139193,8 +143801,8 @@ self: { pname = "messagepack"; version = "0.5.4"; sha256 = "0z2xbfqg9x8ymbr0j81br610ja8f0wd2wvvrnjrk222vbp0915ck"; - revision = "1"; - editedCabalFile = "0p13in70gvxl8d8hjl1dcxczfpcfyffy2lxbdy1d21h742ks1zjb"; + revision = "2"; + editedCabalFile = "199x0hqa6h6wqysaip1wc7kivc26f3wkb8y4il70mzmz80skmm29"; libraryHaskellDepends = [ base bytestring cereal containers deepseq ]; @@ -139204,6 +143812,7 @@ self: { ]; description = "Serialize instance for Message Pack Object"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "messagepack-rpc" = callPackage @@ -139221,6 +143830,7 @@ self: { ]; description = "Message Pack RPC over TCP"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "messente" = callPackage @@ -139305,6 +143915,7 @@ self: { libraryHaskellDepends = [ base ]; description = "metamorphisms: ana . cata or understanding folds and unfolds"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "metaplug" = callPackage @@ -139319,6 +143930,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 @@ -139465,6 +144126,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 @@ -139478,6 +144155,7 @@ self: { testHaskellDepends = [ base HUnit template-haskell ]; description = "Simple recursion schemes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microaeson" = callPackage @@ -139489,6 +144167,8 @@ self: { pname = "microaeson"; version = "0.1.0.0"; sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; + revision = "1"; + editedCabalFile = "0pxgpmr0xv355rnpr8m7l07swbzsjbfiba3dxyz53bdjcc8ya9dq"; libraryHaskellDepends = [ array base bytestring containers deepseq text ]; @@ -139562,6 +144242,7 @@ self: { ]; description = "A Microformats 2 parser"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microformats2-types" = callPackage @@ -139596,24 +144277,24 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.9.1"; - sha256 = "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51"; + 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; }) {}; "microlens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, hashable, lens, lens-aeson, microlens, scientific, tasty - , tasty-hunit, text, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq + , hashable, microlens, scientific, tasty, tasty-hunit, text + , unordered-containers, vector }: mkDerivation { pname = "microlens-aeson"; - version = "2.3.0"; - sha256 = "1iahlh505jrlpd9ndkr5asfnzdpp6m6m2lm44ds15461py485wpj"; - revision = "2"; - editedCabalFile = "1ri98vr3bbx0l9b4vpmcwhf8fm5lgj92kw4g0v3jx6xajwwc5dc8"; + version = "2.3.0.1"; + sha256 = "1ncb0dhhr62yw8808c1h43cl48ib6clifklcrfx7acj5j482ikcs"; + revision = "1"; + editedCabalFile = "18490w9yvsn8rx18wb29bg1wj5vxa7il3gsi3cz2myx9iawhnnxq"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable microlens scientific text unordered-containers vector @@ -139622,21 +144303,17 @@ self: { aeson base bytestring deepseq hashable microlens tasty tasty-hunit text unordered-containers vector ]; - benchmarkHaskellDepends = [ - aeson base bytestring criterion deepseq hashable lens lens-aeson - microlens text unordered-containers vector - ]; description = "Law-abiding lenses for Aeson, using microlens"; license = stdenv.lib.licenses.mit; }) {}; "microlens-contra" = callPackage - ({ mkDerivation, base, contravariant, microlens }: + ({ mkDerivation, base, microlens }: mkDerivation { pname = "microlens-contra"; - version = "0.1.0.1"; - sha256 = "15gmqxi24jy8w83852y5qf4xymiilkl24sppcaw7r2hn6yfz30s9"; - libraryHaskellDepends = [ base contravariant microlens ]; + version = "0.1.0.2"; + sha256 = "1ny9qhvd7rfzdkq4jdcgh4mfia856rsgpdhg8lprfprh6p7lhy5m"; + libraryHaskellDepends = [ base microlens ]; description = "True folds and getters for microlens"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -139659,8 +144336,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.9.1"; - sha256 = "03iwgg8zww9irv59l70c8yy7vzxir1zf66y12210xk91k5hq6jrj"; + version = "0.4.10"; + sha256 = "102dbrdsdadxbbhvx8avv1wbk84767a7lkb8ckp3zxk9g7qlly33"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -139689,8 +144366,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.3.10"; - sha256 = "1d4nhmgf9jq0ixc7qhwm7aaw3xdr0nalw58d0ydsydgf02cyazwv"; + version = "0.3.11"; + sha256 = "18950lxgmsg5ksvyyi3zs1smjmb1qf1q73a3p3g44bh21miz0xwb"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -139705,8 +144382,8 @@ self: { }: mkDerivation { pname = "microlens-th"; - version = "0.4.2.2"; - sha256 = "02nj7lnl61yffi3c6wn341arxhld5r0vj6nzcb5zmqjhnqsv8c05"; + version = "0.4.2.3"; + sha256 = "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j"; libraryHaskellDepends = [ base containers microlens template-haskell th-abstraction transformers @@ -139741,8 +144418,8 @@ self: { }: mkDerivation { pname = "microsoft-translator"; - version = "0.1.1"; - sha256 = "12f5ki7i7cd8b6dzkg5q8chk1vnlr0izm3r62b371xf8hpmxn0av"; + version = "0.1.2"; + sha256 = "0qvf07a0nshbrzgqx5236b5bzc7z7jh49acsx7x7hyj5xsrcp7cw"; libraryHaskellDepends = [ base bytestring http-api-data http-client http-client-tls http-media mtl safe servant servant-client text time xml @@ -139753,28 +144430,14 @@ self: { }) {}; "microspec" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - 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_1" = callPackage ({ mkDerivation, base, QuickCheck, time }: mkDerivation { pname = "microspec"; - version = "0.2.0.1"; - sha256 = "1ygkxsj7rm42f245qip8893lm189immmd5ajimp5d1pkzfkw4dnp"; + 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; }) {}; "microstache" = callPackage @@ -139786,8 +144449,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 @@ -139846,12 +144509,11 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi" = callPackage @@ -139907,6 +144569,7 @@ self: { ]; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-simple" = callPackage @@ -139937,6 +144600,8 @@ self: { pname = "midi-util"; version = "0.2.0.1"; sha256 = "0s37csd1x039q0cb487pd811jz7h0i26chvvbmwffh11bc2icjzc"; + revision = "1"; + editedCabalFile = "0a3hasbhvd327m65yqqyjah7y8r48l65bqg1ymcrc0s2zff10gl5"; libraryHaskellDepends = [ base containers event-list midi non-negative ]; @@ -140067,6 +144732,7 @@ self: { testHaskellDepends = [ base containers mwc-probability ]; description = "The Metropolis algorithm"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mikmod" = callPackage @@ -140134,8 +144800,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.2.2"; - sha256 = "0dag2r79wpq67ydd7blwha2jf8nd5311bxv3li3fm88m0kbqrni1"; + version = "0.5.2.4"; + sha256 = "104mvrjf5dk3afqvqc6p1p8ww6dqc1ygi59pgc4yk2zzzllbiczz"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base monad-control mtl murmur-hash network random resource-pool @@ -140147,6 +144813,7 @@ self: { ]; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime" = callPackage @@ -140226,14 +144893,15 @@ self: { ]; description = "MIME implementation for String's"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-types" = callPackage ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "mime-types"; - version = "0.1.0.8"; - sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8"; + version = "0.1.0.9"; + sha256 = "1lkipa4v73z3l5lqs6sdhl898iq41kyxv2jb9agsajzgd58l6cha"; libraryHaskellDepends = [ base bytestring containers text ]; description = "Basic mime-type handling types and functions"; license = stdenv.lib.licenses.mit; @@ -140270,6 +144938,7 @@ self: { executableHaskellDepends = [ base directory mtl random ]; description = "Minesweeper simulation using neural networks"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minesweeper" = callPackage @@ -140352,6 +145021,7 @@ self: { ]; description = "Minimal ini like configuration library with a few extras"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minimorph" = callPackage @@ -140360,8 +145030,8 @@ self: { }: mkDerivation { pname = "minimorph"; - version = "0.1.6.1"; - sha256 = "0i5qigcj5qpzyg2br8xppd36b5q86y3n457g0hdpv9469d2pnrwl"; + version = "0.2.1.0"; + sha256 = "1phpsd0j8c987sw99p4hyywr4ydcxf5aq4h6xqdl3acwi0dv4zhj"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit text @@ -140529,16 +145199,15 @@ self: { }) {}; "miniutter" = callPackage - ({ mkDerivation, base, binary, containers, ghc-prim, HUnit - , minimorph, test-framework, test-framework-hunit, text + ({ mkDerivation, base, binary, containers, HUnit, minimorph + , test-framework, test-framework-hunit, text }: mkDerivation { pname = "miniutter"; - version = "0.4.7.0"; - sha256 = "10nwg3vw0p8hb8hgc34xspg4vrwf8xyhi22b9j57ms3045marjdd"; - libraryHaskellDepends = [ - base binary containers ghc-prim minimorph text - ]; + 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 ]; @@ -140586,21 +145255,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 @@ -140643,26 +145318,110 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "miso" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, http-api-data - , http-types, lucid, network-uri, servant, servant-lucid, text - , transformers, vector + "mismi-core" = callPackage + ({ mkDerivation, amazonka, amazonka-core, base, bytestring + , exceptions, hedgehog, http-client, http-types, lens + , mismi-core-test, mismi-kernel, mismi-p, mmorph, mtl, resourcet + , retry, text, transformers }: mkDerivation { - pname = "miso"; - version = "0.21.1.0"; - sha256 = "1yz909nmm0qjvm4kbq5r8a5r4881pcq0n2jzf29y9svcz8apw08l"; - isLibrary = true; - isExecutable = true; + pname = "mismi-core"; + version = "0.0.3"; + sha256 = "0n0kgh4haqdwiz0s8wln0jvrcjkrzpjckz25pmb3hr4s5fqlprcw"; libraryHaskellDepends = [ - aeson base bytestring containers http-api-data http-types lucid - network-uri servant servant-lucid text transformers vector + amazonka amazonka-core base bytestring exceptions http-client + http-types lens mismi-kernel mismi-p mtl resourcet retry text + transformers ]; - description = "A tasty Haskell front-end framework"; + testHaskellDepends = [ + amazonka-core base exceptions hedgehog mismi-core-test mismi-p + mmorph resourcet transformers + ]; + description = "AWS Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {mismi-core-test = null;}; + + "mismi-kernel" = callPackage + ({ mkDerivation, base, hedgehog, mismi-p, text }: + mkDerivation { + pname = "mismi-kernel"; + version = "0.0.3"; + sha256 = "15by5x8lvnfsr7ajayy6jz7mcwnrjcavhmgm9mb9v11dyg101lq9"; + libraryHaskellDepends = [ base mismi-p text ]; + testHaskellDepends = [ base hedgehog mismi-p text ]; + description = "AWS Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mismi-p" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "mismi-p"; + version = "0.0.3"; + sha256 = "115wc7gmy76a99p4rcp6fdz0w6c1z5kjn98ffxkkzx760nj5xvy9"; + libraryHaskellDepends = [ base text ]; + description = "A commmon prelude for the mismi project"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mismi-s3" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, async + , attoparsec, base, bifunctors, bytestring, conduit, conduit-extra + , containers, criterion, cryptohash, directory, exceptions, extra + , filepath, hedgehog, http-client, http-types, lens, lifted-async + , lifted-base, mismi-core, mismi-core-test, mismi-p, mismi-s3-core + , mismi-s3-core-test, mmorph, monad-loops, mtl, process, random + , resourcet, retry, SafeSemaphore, semigroups, stm + , template-haskell, temporary, text, time, transformers + , transformers-bifunctors, unix, unix-bytestring + , unordered-containers, uuid + }: + mkDerivation { + pname = "mismi-s3"; + version = "0.0.3"; + sha256 = "1dlknwfvkf7sjifg9xl7gk7kj2yz9jgp3ngi5665jcyc47w39ph8"; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-s3 async attoparsec base bifunctors + bytestring conduit conduit-extra directory exceptions extra + filepath http-client http-types lens lifted-async lifted-base + mismi-core mismi-p mismi-s3-core mmorph monad-loops mtl process + resourcet retry SafeSemaphore semigroups stm template-haskell text + time transformers transformers-bifunctors unix unix-bytestring + unordered-containers uuid + ]; + testHaskellDepends = [ + amazonka amazonka-core amazonka-s3 base bytestring conduit + containers cryptohash directory exceptions filepath hedgehog + http-client lens mismi-core mismi-core-test mismi-p mismi-s3-core + mismi-s3-core-test mtl resourcet temporary text time transformers + transformers-bifunctors unix uuid + ]; + benchmarkHaskellDepends = [ + base conduit-extra criterion directory exceptions filepath hedgehog + mismi-core mismi-core-test mismi-p mtl random resourcet temporary + text transformers unix uuid + ]; + description = "AWS Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {mismi-core-test = null; mismi-s3-core-test = null;}; + + "mismi-s3-core" = callPackage + ({ mkDerivation, attoparsec, base, hedgehog, mismi-p, text }: + mkDerivation { + pname = "mismi-s3-core"; + version = "0.0.3"; + sha256 = "1cigfvspxxxzpw52xn7nb7sqyvxb64fm5w7m2nxakff85jj8skpq"; + libraryHaskellDepends = [ attoparsec base mismi-p text ]; + testHaskellDepends = [ base hedgehog mismi-p text ]; + description = "AWS Library"; license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_21_2_0" = callPackage + "miso" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector @@ -140679,6 +145438,53 @@ self: { ]; description = "A tasty Haskell front-end framework"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "miss" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , ChasingBottoms, containers, cryptohash-sha1, deepseq, digest + , directory, exceptions, filesystem-abstractions, list-tries, mtl + , posix-paths, process, QuickCheck, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-test-vector, temporary, text, time + , transformers, unix, vector, zlib + }: + mkDerivation { + pname = "miss"; + version = "0"; + sha256 = "1xcbjmv2fyjffn1j2xhn0glvxdb2cqd8frvc9yr1pgz6874sv60w"; + revision = "1"; + editedCabalFile = "0m4dvn39917fxmgd2ahigz70qqy4ccfsi4n0885v82kiqwgmvxxq"; + libraryHaskellDepends = [ + attoparsec base base16-bytestring bytestring containers + cryptohash-sha1 deepseq digest exceptions filesystem-abstractions + list-tries mtl posix-paths semigroups text time transformers unix + vector zlib + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring bytestring ChasingBottoms + containers directory exceptions mtl posix-paths process QuickCheck + tasty tasty-hunit tasty-quickcheck tasty-test-vector temporary text + unix + ]; + description = "A Haskell git implimentation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "miss-porcelain" = callPackage + ({ mkDerivation, base, bytestring, containers + , filesystem-abstractions, list-tries, miss, mtl, posix-paths + }: + mkDerivation { + pname = "miss-porcelain"; + version = "0"; + sha256 = "192hxmq5j5wl6njvay0192r5gqlbjahgqd8v6ndhb53yrg7ckjmc"; + libraryHaskellDepends = [ + base bytestring containers filesystem-abstractions list-tries miss + mtl posix-paths + ]; + description = "Useability extras built on top of miss"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -140742,8 +145548,25 @@ 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 + ]; + testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "mixed-types-num_0_3_2" = callPackage + ({ mkDerivation, base, convertible, hspec, hspec-smallcheck + , QuickCheck, smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.3.2"; + sha256 = "1jr9kdsrv90laspiy5l99apd1rd197jzlvlsz8xdgcm8rpffizs9"; libraryHaskellDepends = [ base convertible hspec hspec-smallcheck QuickCheck smallcheck template-haskell @@ -140751,6 +145574,7 @@ self: { testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mixpanel-client" = callPackage @@ -140760,8 +145584,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 @@ -140773,6 +145597,7 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Mixpanel client"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mkbndl" = callPackage @@ -140875,52 +145700,51 @@ self: { "mmark" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers - , criterion, data-default-class, deepseq, dlist, email-validate - , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid + , criterion, 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.5.6"; - sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw"; - revision = "6"; - editedCabalFile = "13cn8nkqj0zl26rgs01rspb2mz6gq1a6ax3g5bygdphvwzraswc5"; + version = "0.0.6.1"; + sha256 = "0riizf8qg6938w9vvf0lwaflsc3lpbqmbiqdfv8d7fhxpk10qaxw"; 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 + aeson base case-insensitive containers 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; }) {}; "mmark-cli" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid - , megaparsec, mmark, mmark-ext, optparse-applicative, stache, text + ({ 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.3.0"; - sha256 = "0nb17k23bs21qi7a888qp81w682ax2qvih9fbvdkdh6c2n6yklrp"; - revision = "2"; - editedCabalFile = "0i3gvfgm4bfbdyflhhaf4gdr7cbkw51i330f25rgha9k3s4v59w3"; + version = "0.0.5.0"; + sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring directory gitrev lucid megaparsec mmark - mmark-ext optparse-applicative stache text unordered-containers + aeson base bytestring directory ghc-syntax-highlighter gitrev lucid + megaparsec mmark mmark-ext optparse-applicative stache text + unordered-containers ]; - description = "Command line interface to MMark markdown processor"; + description = "Command line interface to the MMark markdown processor"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -140931,14 +145755,14 @@ 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; @@ -140959,16 +145783,19 @@ self: { "mmtf" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-msgpack - , hspec, QuickCheck, text + , hspec, http-conduit, QuickCheck, text }: mkDerivation { pname = "mmtf"; - version = "0.1.0.1"; - sha256 = "100hyv6qb8jkqaw2f2h2fz9m32xrh3ffll67y52a11pkxzilyh19"; + version = "0.1.2.0"; + sha256 = "0z3x3cz4lgsnbpbi9ra179wdi3xqq0h46a6x76mq8k76c0jms51y"; libraryHaskellDepends = [ - base binary bytestring containers data-msgpack text + base binary bytestring containers data-msgpack http-conduit text + ]; + testHaskellDepends = [ + base binary bytestring containers data-msgpack hspec http-conduit + QuickCheck text ]; - testHaskellDepends = [ base bytestring hspec QuickCheck ]; description = "Macromolecular Transmission Format implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -141107,34 +145934,10 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.2.2.0"; - sha256 = "1ldl2i34fl7srv72bjxnrbihafq8m8mmk5xca6lhcqwdpx8yakxb"; - 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; - }) {}; - - "modern-uri_0_3_0_0" = 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.0"; - sha256 = "059p1lzfk7bwshlgy0sgms651003992jgxv2lr7r714sy5brfwb4"; + version = "0.3.0.1"; + sha256 = "01a5jnv8kbl2c9ka9dgqm4a8b7n6frmg7yi8f417qcnwgn1lbs78"; + revision = "1"; + editedCabalFile = "13q0lapxk1v3ci3bqv21942jf2fw87frbbam53apd3i2iv69bqyr"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -141149,7 +145952,6 @@ self: { ]; description = "Modern library for working with URIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modify-fasta" = callPackage @@ -141197,14 +145999,26 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modular-arithmetic" = callPackage - ({ mkDerivation, base, doctest, Glob }: + ({ mkDerivation, base, doctest }: mkDerivation { pname = "modular-arithmetic"; - version = "1.2.1.3"; - sha256 = "1f5k25gqnn037fpan3l956ly0g5cgwnw7qxyc6sm6hgdcl91wn1l"; + version = "1.2.1.4"; + sha256 = "1nlv5bwyfppw6qz6j2z1cvgzpixciv5gygpcvqlfnmmv410il4si"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; + testHaskellDepends = [ base doctest ]; description = "A type for integers modulo some constant"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -141240,6 +146054,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "modularity" = callPackage + ({ mkDerivation, base, eigen, hmatrix, sparse-linear-algebra + , spectral-clustering, vector + }: + mkDerivation { + pname = "modularity"; + version = "0.2.1.0"; + sha256 = "1xs9hdxsdpylhq3dzmyxfycwyqzy3v1zz48gvzpfcamfivxxpdph"; + libraryHaskellDepends = [ + base eigen hmatrix sparse-linear-algebra spectral-clustering vector + ]; + description = "Find the modularity of a network"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "module-management" = callPackage ({ mkDerivation, applicative-extras, base, bytestring, Cabal , cmdargs, containers, data-default, directory, filepath, haskeline @@ -141332,8 +146162,8 @@ self: { }: mkDerivation { pname = "moesocks"; - version = "1.0.0.44"; - sha256 = "1j7181sjj5p6r419z9j8b8ikshhcgm2zwfbl4f1brbpyvwvs4ddz"; + version = "1.0.1.0"; + sha256 = "0g4dih837liigd4v2yj0wnqic2hqgc6zy6yqwpy0v22aa47abcqj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141381,6 +146211,8 @@ self: { pname = "mole"; version = "0.0.6"; sha256 = "0shsx1sc6rc5jxijvrc4bzqpjw4xdjq5ghlj8jnmm7gp8b6h6y5b"; + revision = "2"; + editedCabalFile = "1qykba99djdhwm0mmkrfbjdyjcx47gi5clxm8kz87ccx9qs72kfy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -141414,6 +146246,7 @@ self: { testHaskellDepends = [ base ]; description = "Mollie API client for Haskell http://www.mollie.com"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-abort-fd" = callPackage @@ -141483,8 +146316,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-branch"; - version = "1.0.3"; - sha256 = "15nk9lvwz4s6lx8g08x5npai0bk13s6mj26vz6biwy3shpf5v11r"; + version = "1.0.4"; + sha256 = "0g82ccql6pmj319ji3zpmxab78qwdlrjsl7cdfhjvv4m1i4kmzdf"; libraryHaskellDepends = [ base mtl transformers ]; description = "Monadic abstraction for computations that can be branched and run independently"; license = stdenv.lib.licenses.asl20; @@ -141538,6 +146371,7 @@ self: { libraryHaskellDepends = [ base binary containers data-lens mtl ]; description = "Monadic conversion between complex data structures and unique integers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-connect" = callPackage @@ -141601,18 +146435,18 @@ self: { }) {}; "monad-dijkstra" = callPackage - ({ mkDerivation, base, free, hlint, mtl, psqueues, tasty - , tasty-hspec, transformers + ({ mkDerivation, base, containers, free, hlint, mtl, psqueues + , tasty, tasty-hspec, transformers }: mkDerivation { pname = "monad-dijkstra"; - version = "0.1.1.0"; - sha256 = "1vchyiaxawjgixxc9b3pssdrdmsy5ji0f3gwwgjr8gp0dp73yki4"; - revision = "1"; - editedCabalFile = "1jkxalyj9libzgg1whzp3dw152j8abxng4jm9xrh2y2i48dw412c"; - libraryHaskellDepends = [ base free mtl psqueues transformers ]; + version = "0.1.1.2"; + sha256 = "1890rnypk3ra4f0f3m7nr31df3x6pmpw6ivid77wj7h9mdp0bdb6"; + libraryHaskellDepends = [ + base containers free mtl psqueues transformers + ]; testHaskellDepends = [ base hlint tasty tasty-hspec ]; - description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm"; + description = "A monad transformer for weighted graph searches"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -141814,13 +146648,14 @@ 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 ]; description = "A simple and fast logging monad"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger" = callPackage @@ -141832,8 +146667,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 @@ -141951,29 +146786,6 @@ self: { }) {}; "monad-memo" = callPackage - ({ mkDerivation, array, base, containers, criterion, mtl, primitive - , QuickCheck, random, test-framework, test-framework-quickcheck2 - , transformers, vector - }: - mkDerivation { - pname = "monad-memo"; - version = "0.4.1"; - sha256 = "07gid18rsja7gvk2ccsbwvpz223x59mdk9x9w36bz18cy2pw802c"; - libraryHaskellDepends = [ - array base containers mtl primitive transformers vector - ]; - testHaskellDepends = [ - array base containers mtl primitive QuickCheck random - test-framework test-framework-quickcheck2 transformers vector - ]; - benchmarkHaskellDepends = [ - array base containers criterion mtl primitive transformers vector - ]; - description = "Memoization monad transformer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-memo_0_5_1" = callPackage ({ mkDerivation, array, base, containers, criterion, primitive , QuickCheck, random, test-framework, test-framework-quickcheck2 , transformers, vector @@ -142174,21 +146986,18 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-primitive" = callPackage @@ -142239,6 +147048,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Record and replay the results of monadic actions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-resumption" = callPackage @@ -142301,6 +147111,7 @@ self: { testHaskellDepends = [ base stm ]; description = "Concise, overloaded accessors for IORef, STRef, TVar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-ste" = callPackage @@ -142367,6 +147178,7 @@ self: { libraryHaskellDepends = [ base mtl ]; description = "Stateful supply monad"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-task" = callPackage @@ -142477,6 +147289,7 @@ self: { libraryHaskellDepends = [ base base-compat stm ]; description = "Generic operations over variables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-wrap" = callPackage @@ -142495,8 +147308,8 @@ 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; @@ -142506,8 +147319,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "monadLib"; - version = "3.7.3"; - sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q"; + version = "3.9"; + sha256 = "1vibzls4ld4v7rib14nb9blni1c42csv4b1igaplks85xyr5grrm"; libraryHaskellDepends = [ base ]; description = "A collection of monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -142605,6 +147418,7 @@ self: { testHaskellDepends = [ base ]; description = "Constraint Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monadiccp-gecode" = callPackage @@ -142702,14 +147516,13 @@ 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 ]; description = "A monoid for monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monadplus" = callPackage @@ -142807,8 +147620,8 @@ self: { ({ mkDerivation, base, bindings-monetdb-mapi }: mkDerivation { pname = "monetdb-mapi"; - version = "0.1.0.1"; - sha256 = "1r035w349js424x0864xghvs79v4wsf9br4rwqpfqkyz2hxsqhx0"; + version = "0.1.0.2"; + sha256 = "069jmlnrgia36ncl5mqaqq0iaqwrhx6ig5jjnlxr40vfdi4m4dw6"; libraryHaskellDepends = [ base bindings-monetdb-mapi ]; description = "Mid-level bindings for the MonetDB API (mapi)"; license = stdenv.lib.licenses.bsd3; @@ -142956,8 +147769,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "1.0.9.0"; - sha256 = "0180ks0dyvpk1r20w5jw2w2n79mjnk69n9vhspaxzlyxqgim5psa"; + version = "1.0.11.0"; + sha256 = "1lipj4ld99cb3sc9i8va9w7cfki89h436dysyr5ifcb1l0kxg861"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -142988,6 +147801,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable-keys" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, keys + , mono-traversable, semigroups, text, transformers + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "mono-traversable-keys"; + version = "0.1.0"; + sha256 = "0xyl4n0ydfqrjydm2g62r1zl36bdvvp8nbxbqkbai1z24a9r51dw"; + libraryHaskellDepends = [ + base bytestring containers hashable keys mono-traversable + semigroups text transformers unordered-containers vector + vector-instances + ]; + description = "Type-classes for interacting with monomorphic containers with a key"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mono-traversable-wrapper" = callPackage ({ mkDerivation, base, mono-traversable }: mkDerivation { @@ -143003,8 +147834,8 @@ self: { ({ mkDerivation, base, containers, lens, mtl }: mkDerivation { pname = "monoid"; - version = "0.1.8"; - sha256 = "15mwj4w46wszawhiabykamaf020m795zg017jb2j49gpzk8abqjf"; + version = "0.1.9"; + sha256 = "13k5s9y37igvrsfbw5q76zy10fm585dijx10qk32c4agih9fxyfv"; libraryHaskellDepends = [ base containers lens mtl ]; description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used."; license = stdenv.lib.licenses.asl20; @@ -143029,8 +147860,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"; @@ -143086,8 +147917,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 ]; @@ -143097,7 +147928,6 @@ self: { ]; description = "Subclasses of Monoid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -143112,15 +147942,15 @@ self: { }) {}; "monoidal-containers" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype - , semigroups, unordered-containers + ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens + , newtype, semigroups, unordered-containers }: mkDerivation { pname = "monoidal-containers"; - version = "0.3.1.0"; - sha256 = "11gpqp4c54q6kmsdfpl0lcrfj6687h51mjpgirl299j6bam2bhs4"; + version = "0.4.0.0"; + sha256 = "15mh2hx7a31gr5zb2g30h2fcnb3a2wvv2y8hvzzk5l9cr2nvhcm1"; libraryHaskellDepends = [ - base containers deepseq hashable lens newtype semigroups + aeson base containers deepseq hashable lens newtype semigroups unordered-containers ]; description = "Containers with monoidal accumulation"; @@ -143168,6 +147998,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 @@ -143234,6 +148081,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 @@ -143260,20 +148123,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; @@ -143301,8 +148164,8 @@ self: { ({ mkDerivation, base, containers, hspec }: mkDerivation { pname = "more-containers"; - version = "0.1.0.5"; - sha256 = "1q1fs56a61ryild0zp43ash5mm83162v5v61x29vmc3hv1h79bnm"; + version = "0.1.2.0"; + sha256 = "0q3ljqjzzrx1y0vbsgvrnmbmvysxkfk2ky5xxix1kirpn1q45yjj"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; description = "A few more collections"; @@ -143328,8 +148191,8 @@ self: { }: mkDerivation { pname = "morfette"; - version = "0.4.4"; - sha256 = "064wgdk0yrrjh8b7xnpmhk541fwqh24pg7hq1rh28vf2fbv6blcy"; + version = "0.4.7"; + sha256 = "1vxqg55zsj36pi1bsydm0v4fls4blya9jjfdv56jgdfjsjzzljyh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -143380,40 +148243,53 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, code-page, containers - , criterion, deepseq, Earley, formatting, http-client - , http-client-tls, microlens, microlens-mtl, mtl - , optparse-applicative, pipes, QuickCheck, system-fileio - , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text - , transformers - }: + "morphisms" = callPackage + ({ mkDerivation }: mkDerivation { - pname = "morte"; - version = "1.6.20"; - sha256 = "01m382137sa9if332y9aag8fl77f4sd3i8kxz5cp8g1p10iyjjbl"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley formatting http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - base code-page formatting optparse-applicative text - ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - benchmarkHaskellDepends = [ base criterion system-filepath text ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; + pname = "morphisms"; + version = "0.1.1"; + sha256 = "0waj252x6xpxaph50l248r0xf44xzfsz6jpmza5mwi9qf1br6dws"; + description = "It's all about functions"; + license = stdenv.lib.licenses.mit; + }) {}; + + "morphisms-functors" = callPackage + ({ mkDerivation, morphisms }: + mkDerivation { + pname = "morphisms-functors"; + version = "0.1.7"; + sha256 = "1mv2sjn68n55482496icg84nbf3mn85fizf4q42781qn689np60q"; + libraryHaskellDepends = [ morphisms ]; + description = "Functors, theirs compositions and transformations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "morte_1_7_0" = callPackage + "morphisms-functors-inventory" = callPackage + ({ mkDerivation, morphisms, morphisms-functors }: + mkDerivation { + pname = "morphisms-functors-inventory"; + version = "0.1.0"; + sha256 = "16p5wj9yq6qsbzaqsx0p33fkginkf5mbqg4y7pak2wx1v7aqll2m"; + libraryHaskellDepends = [ morphisms morphisms-functors ]; + description = "Inventory is state and store"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "morphisms-objects" = callPackage + ({ mkDerivation, morphisms }: + mkDerivation { + pname = "morphisms-objects"; + version = "0.1.3"; + sha256 = "1d5jbjp8ih1fsna8w2mkw217ybsxdhyh7acq0r7b9iwngh52jj6b"; + libraryHaskellDepends = [ morphisms ]; + description = "Algebraic structures"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "morte" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, formatting, http-client , http-client-tls, microlens, microlens-mtl, mtl @@ -143423,8 +148299,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.7.0"; - sha256 = "1q2na2xw70jr71v1ysscqf3v3f2hvn4f0lxkh4dgsdy8986b41cl"; + version = "1.7.1"; + sha256 = "1ff9h3zzcz59q07v0yx93v537z6swy65j88z9cn6mgfjrxjmqx2b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -143477,6 +148353,64 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "moss" = callPackage + ({ mkDerivation, base, bytestring, conduit-extra, mtl, network + , network-simple, unix-compat + }: + mkDerivation { + pname = "moss"; + version = "0.1.0.0"; + sha256 = "19gy0x191gk6wa85vp5nhh0xgmr3mj2daiqx8bap452fm1y85qcr"; + libraryHaskellDepends = [ + base bytestring conduit-extra mtl network network-simple + unix-compat + ]; + description = "Haskell client for Moss"; + license = stdenv.lib.licenses.mit; + }) {}; + + "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 @@ -143496,7 +148430,6 @@ self: { testHaskellDepends = [ base indexed indexed-extras row-types ]; description = "Type-safe effectful state machines in Haskell"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "motor-diagrams" = callPackage @@ -143516,7 +148449,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate state diagrams from Motor FSM typeclasses"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "motor-reflection" = callPackage @@ -143534,7 +148466,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Reflect on Motor FSM typeclasses to obtain runtime representations"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mount" = callPackage @@ -143665,6 +148596,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mpg123;}; + "mpi-hs" = callPackage + ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion + , monad-loops, openmpi, store + }: + mkDerivation { + pname = "mpi-hs"; + version = "0.5.1.1"; + sha256 = "0vvbvck5hd3ca1l1bdcnkkb5p2xf9gj9ljf8v130x0fx3zhxjp13"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring cereal monad-loops store + ]; + librarySystemDepends = [ openmpi ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base binary ]; + 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 { @@ -143808,6 +148762,7 @@ self: { ]; description = "A MQTT client library"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mrifk" = callPackage @@ -143973,12 +148928,12 @@ self: { }) {}; "mstate" = callPackage - ({ mkDerivation, base, monad-peel, mtl, stm }: + ({ mkDerivation, base, fail, monad-peel, mtl, stm }: mkDerivation { pname = "mstate"; - version = "0.2.7"; - sha256 = "05rcpfang0biy16aglf6da44zp9zqy2x0zdsfl75mv1drkky6225"; - libraryHaskellDepends = [ base monad-peel mtl stm ]; + version = "0.2.8"; + sha256 = "13jv04skkb0ysxx9gswynp7fg7yz3nwy5zhzp209fbwr9izxcm05"; + libraryHaskellDepends = [ base fail monad-peel mtl stm ]; description = "MState: A consistent State monad for concurrent applications"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144136,6 +149091,7 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Monad Transformer Library with Type Families"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl-unleashed" = callPackage @@ -144301,19 +149257,21 @@ self: { "mulang" = callPackage ({ mkDerivation, aeson, alex, base, bytestring, containers, happy , hashable, haskell-src, hspec, inflections, language-java - , language-javascript, neat-interpolation, parsec, ParsecTools - , process, scientific, split, text, unordered-containers, vector + , language-javascript, language-python, monad-loops, mtl + , neat-interpolation, parsec, ParsecTools, process, scientific + , split, text, unordered-containers, vector }: mkDerivation { pname = "mulang"; - version = "3.6.1"; - sha256 = "0phpy2dickbam17n6ppq10qlfjxmhf1c7jb67qjk7672rxyrqfzb"; + version = "4.4.0"; + sha256 = "14fyiphg02f3q0li19fkya5l52xj60a1mpjryaxwx9cg47qi95hs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring containers hashable haskell-src inflections - language-java language-javascript parsec ParsecTools process - scientific split text unordered-containers vector + language-java language-javascript language-python monad-loops mtl + parsec ParsecTools process scientific split text + unordered-containers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -144321,11 +149279,11 @@ self: { ]; executableToolDepends = [ alex happy ]; testHaskellDepends = [ - aeson base bytestring hspec neat-interpolation text + aeson base bytestring containers hspec neat-interpolation text ]; testToolDepends = [ alex happy ]; description = "An intermediate language designed to perform advanced code analysis"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -144425,6 +149383,7 @@ self: { ]; description = "Command lines for options that take multiple arguments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multifile" = callPackage @@ -144507,6 +149466,52 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "multimap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -144658,21 +149663,22 @@ 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; @@ -144682,13 +149688,12 @@ self: { ({ 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"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multirec-alt-deriver" = callPackage @@ -144723,8 +149728,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"; @@ -144737,9 +149742,12 @@ self: { pname = "multiset-comb"; version = "0.2.4.1"; sha256 = "1nih0101d6z2m4wi22804vjxrd5nr35mmqk31lm7bhanmwnl7qwa"; + revision = "1"; + editedCabalFile = "1amjahzg4lpgmhf4v456waa216afjpq3gcb45pqid5km9z1ycjdg"; libraryHaskellDepends = [ base containers transformers ]; description = "Combinatorial algorithms over multisets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multisetrewrite" = callPackage @@ -144761,10 +149769,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 = [ @@ -144773,6 +149779,7 @@ self: { testHaskellDepends = [ base hspec transformers ]; description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multivariant" = callPackage @@ -145031,6 +150038,8 @@ self: { pname = "music-parts"; version = "1.9.0"; sha256 = "1kiz968kcwcyczxg5gl40c7bwgkn86l7qi0ak8p68bm4rmsw9id4"; + revision = "1"; + editedCabalFile = "03w6wqxrz00gr6wbk6id3bf0yyqvcy1jpqwjl26bxc0vn3r2jizz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ adjunctions aeson base bytestring cassava containers data-default @@ -145248,6 +150257,7 @@ self: { ]; description = "A representation of the MusicXML format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mustache" = callPackage @@ -145470,20 +150480,6 @@ self: { }) {}; "mwc-random" = callPackage - ({ mkDerivation, base, math-functions, primitive, time, vector }: - mkDerivation { - pname = "mwc-random"; - version = "0.13.6.0"; - sha256 = "05j7yh0hh9nxic3dijmzv44kc6gzclvamdph7sq7w19wq57k6pq6"; - libraryHaskellDepends = [ - base math-functions primitive time vector - ]; - doCheck = false; - description = "Fast, high quality pseudo random number generation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mwc-random_0_14_0_0" = callPackage ({ mkDerivation, base, math-functions, primitive, time, vector }: mkDerivation { pname = "mwc-random"; @@ -145495,7 +150491,6 @@ self: { doCheck = false; description = "Fast, high quality pseudo random number generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random-accelerate" = callPackage @@ -145504,11 +150499,12 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random-monad" = callPackage @@ -145715,6 +150711,7 @@ self: { ]; description = "Export from MyAnimeList"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mybitcoin-sci" = callPackage @@ -145728,7 +150725,6 @@ self: { ]; description = "Binding to mybitcoin.com's Shopping Cart Interface."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "myo" = callPackage @@ -145797,8 +150793,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.5"; - sha256 = "0x9hdwg94s0baw7jn7ba2mk0rr7qpf1hyf88pm6gv4vdgz86gcs9"; + version = "0.1.7"; + sha256 = "1nbj958nsr568c1mhwhcidz8d1p35c6b99m8xz2z0w8ig737nbgg"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ mysql ]; @@ -145834,10 +150830,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.8.3.0"; - sha256 = "1b3sa119m82qmq2mkn0ixhs175i6l92nk4qwvfhh226crj6g5bp9"; - revision = "1"; - editedCabalFile = "1kpfmrwwdaxjqwbsc6m9imlcfi2vvkz62pin5nrvm1fk17isy69v"; + version = "0.8.4.2"; + sha256 = "1lg9w9kwjnrx948r24flw0yjwxc8f93ygg45dl2djk4kfxdfnlaz"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -145848,7 +150842,6 @@ self: { ]; description = "pure haskell MySQL driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-haskell-nem" = callPackage @@ -145864,7 +150857,6 @@ self: { ]; description = "Adds a interface like mysql-simple to mysql-haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mysql-haskell-openssl" = callPackage @@ -145975,6 +150967,7 @@ self: { ]; description = "Web application to view and kill MySQL queries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mzv" = callPackage @@ -146014,6 +151007,7 @@ self: { executableHaskellDepends = [ base HSH mtl process ]; description = "Utility to call iwconfig"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "n-tuple" = callPackage @@ -146028,6 +151022,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 @@ -146089,34 +151145,34 @@ self: { , base, bytestring, classy-prelude, conduit, conduit-extra , containers, exceptions, fast-logger, hashable, http-client , http-client-tls, http-conduit, http-types, iso8601-time, lens - , lens-aeson, monad-control, monad-logger, mtl, random, resourcet - , retry, safe-exceptions, say, scientific, split, stm, stm-chans - , stm-conduit, tasty, tasty-hunit, template-haskell, text, time - , transformers, transformers-base, unliftio, unliftio-core - , unordered-containers, uuid, vector, wai, warp + , lens-aeson, modern-uri, monad-control, monad-logger, mtl, random + , resourcet, retry, safe-exceptions, say, scientific, split, stm + , stm-chans, stm-conduit, tasty, tasty-hunit, template-haskell + , text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers, uuid, vector, wai, warp }: mkDerivation { pname = "nakadi-client"; - version = "0.6.0.0"; - sha256 = "15hcaccm25frzar2fwyrrhai9kpja7xdcpi2ibl6gf3drp6z65jy"; + version = "0.7.0.0"; + sha256 = "16d7ffbm3zrc8kwx1vy0xjxiiv0lxnpxvk93ixhiqyhfddych89x"; libraryHaskellDepends = [ aeson aeson-casing async async-timer base bytestring conduit conduit-extra containers exceptions hashable http-client http-client-tls http-conduit http-types iso8601-time lens - monad-control monad-logger mtl resourcet retry safe-exceptions - scientific split stm stm-chans template-haskell text time - transformers transformers-base unliftio unliftio-core + modern-uri monad-control monad-logger mtl resourcet retry + safe-exceptions scientific split stm stm-chans template-haskell + text time transformers transformers-base unliftio unliftio-core unordered-containers uuid vector ]; testHaskellDepends = [ aeson aeson-casing aeson-qq async async-timer base bytestring classy-prelude conduit conduit-extra containers exceptions fast-logger hashable http-client http-client-tls http-conduit - http-types iso8601-time lens lens-aeson monad-control monad-logger - mtl random resourcet retry safe-exceptions say scientific split stm - stm-chans stm-conduit tasty tasty-hunit template-haskell text time - transformers transformers-base unliftio unliftio-core - unordered-containers uuid vector wai warp + http-types iso8601-time lens lens-aeson modern-uri monad-control + monad-logger mtl random resourcet retry safe-exceptions say + scientific split stm stm-chans stm-conduit tasty tasty-hunit + template-haskell text time transformers transformers-base unliftio + unliftio-core unordered-containers uuid vector wai warp ]; description = "Client library for the Nakadi Event Broker"; license = stdenv.lib.licenses.bsd3; @@ -146138,28 +151194,17 @@ self: { }) {}; "named" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "named"; - version = "0.1.0.0"; - sha256 = "0n26085hhqcqazwb02j5ippicl04caln935dbsq8sgkaj1imryp7"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Named parameters (keyword arguments) for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "named_0_2_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "named"; version = "0.2.0.0"; sha256 = "17ldvxypf099wj5phzh2aymzfwmyiyzhz24h1aj2s21nrys5n6n0"; + revision = "2"; + editedCabalFile = "0h9d74h6g685g1g0ylqf7kws1ancdy3q6fi39vinf5alkqa7kxwd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Named parameters (keyword arguments) for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "named-formlet" = callPackage @@ -146245,8 +151290,8 @@ self: { ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { pname = "namespace"; - version = "0.1.4.0"; - sha256 = "12v2mk4wcqsdcwym6dbwkwcamr04l4vncdwfj0bsnxzvf4mjzx7p"; + version = "0.1.4.1"; + sha256 = "14z8g7nya4pp4gvspcmz4pkz1vd9g268pav2xxb203vi7va7wbff"; libraryHaskellDepends = [ base containers monoid-extras ]; testHaskellDepends = [ base ]; description = "A Generic Haskell library for managing namespaces"; @@ -146255,15 +151300,20 @@ 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; }) {}; "nano-erl" = callPackage @@ -146356,8 +151406,10 @@ self: { }: mkDerivation { pname = "nanomsg-haskell"; - version = "0.2.3"; - sha256 = "0q9zjay4njlr3dakmwhcmyhh3hw7p3q2ani3s5acmm3zdj25slqx"; + version = "0.2.4"; + sha256 = "00941a7vp6y4gzxpjlr4516ic96l5892w0akqajq3jyh5601jqg3"; + revision = "1"; + editedCabalFile = "02ahbmda51j7ayvda9nwvkbw8wnd1gm9kqa3lqdqh8s587wl4wm7"; libraryHaskellDepends = [ base binary bytestring ]; librarySystemDepends = [ nanomsg ]; testHaskellDepends = [ @@ -146419,6 +151471,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 @@ -146447,12 +151517,13 @@ self: { pname = "naperian"; version = "0.1.0.0"; sha256 = "0ydlwk1m3xi12bv2rylay4lrz5j5aj1lz95ivilnh89qg4ahrnlb"; + revision = "1"; + editedCabalFile = "10bby5qlkw6yv2mh6zyscwda49hkxmxmrqfqjinlj246xi879f3m"; libraryHaskellDepends = [ adjunctions base comonad distributive free streams transformers ]; description = "Efficient representable functors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "naqsha" = callPackage @@ -146609,8 +151680,8 @@ self: { }: mkDerivation { pname = "natural"; - version = "0.3.0.2"; - sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd"; + version = "0.3.0.4"; + sha256 = "0c5z5msb2nx648m07cjv9hwaycdhcwis9ac6n7qbyvhxsis84jlg"; libraryHaskellDepends = [ base lens semigroupoids ]; testHaskellDepends = [ base checkers hedgehog lens QuickCheck tasty tasty-hedgehog @@ -146618,6 +151689,7 @@ self: { ]; description = "Natural number"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "natural-induction" = callPackage @@ -146678,8 +151750,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 @@ -146761,6 +151833,7 @@ self: { ]; description = "CPU load and memory usage indicators for i3bar"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ncurses" = callPackage @@ -146814,8 +151887,8 @@ self: { }: mkDerivation { pname = "neat-interpolation"; - version = "0.3.2.2"; - sha256 = "0ffcr6q9bmvlmz5j8s0q08pbqzcfz9pkh8gz52arzscflpncbj5n"; + version = "0.3.2.4"; + sha256 = "0lhpjckwhzlvx4cdhrwprwb85vc7hc44ybvk5nswgn7z73cp0wyy"; libraryHaskellDepends = [ base base-prelude megaparsec template-haskell text ]; @@ -147080,8 +152153,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 @@ -147163,6 +152236,58 @@ self: { broken = true; }) {ghc-binary = null;}; + "net-mqtt" = callPackage + ({ mkDerivation, async, attoparsec, base, binary, bytestring + , conduit, conduit-extra, containers, HUnit, network-conduit-tls + , network-uri, QuickCheck, stm, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "net-mqtt"; + version = "0.2.2.0"; + sha256 = "1pmjlj90jzyg7ypzaiyw4cl8qv6h5l7923b3zhfwsvi07c2lwi1h"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base binary bytestring conduit conduit-extra + containers network-conduit-tls network-uri stm text + ]; + executableHaskellDepends = [ + async attoparsec base binary bytestring conduit conduit-extra + containers network-conduit-tls network-uri stm text + ]; + testHaskellDepends = [ + async attoparsec base binary bytestring conduit conduit-extra + containers HUnit network-conduit-tls network-uri QuickCheck stm + tasty tasty-hunit tasty-quickcheck text + ]; + description = "An MQTT Protocol Implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "netclock" = callPackage ({ mkDerivation, base, bytestring, hosc, network }: mkDerivation { @@ -147239,23 +152364,42 @@ self: { }) {}; "netlib-carray" = callPackage - ({ mkDerivation, base, carray, netlib-ffi, transformers }: + ({ mkDerivation, array, base, carray, netlib-ffi, transformers }: mkDerivation { pname = "netlib-carray"; - version = "0.0.1.1"; - sha256 = "1vxyffhpayyxwak36b9i7gw35gz61ym9lxnhk45l0h4js3v05iwv"; - libraryHaskellDepends = [ base carray netlib-ffi transformers ]; + version = "0.1"; + sha256 = "0rh4m4xxwm8n0577khqa2cx74hnwmgz94phq2rwhsdppg6dd2xx5"; + libraryHaskellDepends = [ + array base carray netlib-ffi transformers + ]; description = "Helper modules for CArray wrappers to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; }) {}; + "netlib-comfort-array" = callPackage + ({ mkDerivation, base, comfort-array, netlib-ffi, transformers }: + mkDerivation { + pname = "netlib-comfort-array"; + version = "0.0"; + sha256 = "1lr28jpv4yznkfak9jvcmjnxfy6334bplvq8rkf7nsqs6jbjx3al"; + libraryHaskellDepends = [ + base comfort-array netlib-ffi transformers + ]; + description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "netlib-ffi" = callPackage - ({ mkDerivation, base, storable-complex, transformers }: + ({ mkDerivation, base, guarded-allocation, storable-complex + , transformers + }: mkDerivation { pname = "netlib-ffi"; - version = "0.1"; - sha256 = "0ckwa5r8fx2j7qb5phy6gm3xbg9crr9amglcicdxgnzgjd8aap2h"; - libraryHaskellDepends = [ base storable-complex transformers ]; + version = "0.1.1"; + sha256 = "0irf5gc9kw3pjb339nrzylr1ldz8fhgmpkji26dm3w18vkwic411"; + libraryHaskellDepends = [ + base guarded-allocation storable-complex transformers + ]; description = "Helper modules for FFI to BLAS and LAPACK"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -147348,8 +152492,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 @@ -147584,18 +152728,6 @@ self: { }) {}; "network" = callPackage - ({ mkDerivation, base, bytestring, doctest, hspec, HUnit, unix }: - mkDerivation { - pname = "network"; - version = "2.6.3.6"; - sha256 = "198mam7ahny48p9fajznbqq16a8ya2gw0xm3gnm1si1rmc4hdplv"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ base bytestring doctest hspec HUnit ]; - description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network_2_8_0_0" = callPackage ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit , unix }: @@ -147609,6 +152741,21 @@ self: { ]; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "network_3_0_0_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, hspec + , hspec-discover, HUnit, unix + }: + mkDerivation { + pname = "network"; + version = "3.0.0.1"; + sha256 = "03f7gi3skz2ivack73wgn0zsppxwscl6j6xvwjal6i7y3rzajiam"; + libraryHaskellDepends = [ base bytestring deepseq unix ]; + testHaskellDepends = [ base bytestring directory hspec HUnit ]; + testToolDepends = [ hspec-discover ]; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -147708,8 +152855,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "0.3.0.0"; - sha256 = "13mr3gxgc4g1ij0fj8xwn1md0hi9l1gpka06y072ffh8ib7qg98c"; + version = "0.4.0.2"; + sha256 = "0n7h1vfh4iwcni8v92hkfvwdqcnv928c1pxj5mrcrvfggpq97a1a"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -147720,7 +152867,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Arbitrary Instances for Network Types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-attoparsec" = callPackage @@ -147765,6 +152911,17 @@ self: { ]; description = "An interface to bitcoind"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "network-bsd" = callPackage + ({ mkDerivation, base, deepseq, network }: + mkDerivation { + pname = "network-bsd"; + version = "2.8.1.0"; + sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; + libraryHaskellDepends = [ base deepseq network ]; + description = "POSIX network database () API"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -147790,12 +152947,26 @@ 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 { pname = "network-bytestring"; version = "0.1.3.4"; sha256 = "19m10mj9nqsa7s0syv9dyhqkhvmf2h7yna8n7bq0xkdp8m9l0g96"; + revision = "1"; + editedCabalFile = "0znp4qkad1sd650kjqhbbrr2ap7bb772g3db92k7r2rrydr19cdl"; libraryHaskellDepends = [ base bytestring network unix ]; description = "Fast, memory-efficient, low-level networking"; license = stdenv.lib.licenses.bsd3; @@ -147806,8 +152977,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 ]; @@ -148013,8 +153184,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 @@ -148030,8 +153201,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 ]; @@ -148041,6 +153212,7 @@ self: { ]; description = "WebSocket backend for MessagePack RPC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-metrics" = callPackage @@ -148056,6 +153228,7 @@ self: { ]; description = "Send metrics to Ganglia, Graphite, and statsd"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-minihttp" = callPackage @@ -148087,6 +153260,7 @@ self: { libraryHaskellDepends = [ base binary bytestring network unix ]; description = "Recvmsg and sendmsg bindings"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-msgpack-rpc" = callPackage @@ -148223,15 +153397,17 @@ 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"; + revision = "1"; + editedCabalFile = "1xyz4b24vgnidvd43cfmf0k6090dayhfcp6n8x894ibd2mq3vash"; 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; @@ -148254,17 +153430,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; @@ -148390,6 +153566,7 @@ self: { ]; description = "In-memory instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-tcp" = callPackage @@ -148408,6 +153585,7 @@ self: { ]; description = "TCP instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-tests" = callPackage @@ -148424,6 +153602,7 @@ self: { ]; description = "Unit tests for Network.Transport implementations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-zeromq" = callPackage @@ -148490,34 +153669,42 @@ self: { "network-uri-json" = callPackage ({ mkDerivation, aeson, base, hspec, hspec-discover - , network-arbitrary, network-uri, QuickCheck, test-invariant, text + , network-arbitrary, network-uri, test-invariant, text }: mkDerivation { pname = "network-uri-json"; - version = "0.1.2.1"; - sha256 = "1xnlyghpyrbllzzr8bdmzgm12lsa1sg4miynh6d4awdppai9y433"; + version = "0.3.0.0"; + sha256 = "15qw2knzj5b90vb4rhzxiv9wxdv41f5l75hpp4y0ycc60q5xja27"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ - aeson base hspec network-arbitrary network-uri QuickCheck - test-invariant text + aeson base hspec network-arbitrary network-uri test-invariant text ]; testToolDepends = [ hspec-discover ]; description = "FromJSON and ToJSON Instances for Network.URI"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "network-uri-lenses" = callPackage + ({ mkDerivation, base, lens, network-uri }: + mkDerivation { + pname = "network-uri-lenses"; + version = "0.2.0.0"; + sha256 = "08yvcvpqwibxpqjz3qbkvks1aqgbshdc9chnj8b49yd1vdrzx41p"; + libraryHaskellDepends = [ base lens network-uri ]; + description = "Lenses for network-uri"; + license = stdenv.lib.licenses.bsd3; }) {}; "network-uri-static" = callPackage ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { pname = "network-uri-static"; - version = "0.1.0.0"; - sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9"; + version = "0.1.2.1"; + sha256 = "0sfyqkm49vgw6x2xkgaa0lv2fmrzwgcz33ch333jsib0qbmji5vw"; libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; description = "A small utility to declare type-safe static URIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-voicetext" = callPackage @@ -148683,17 +153870,15 @@ 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; }) {}; "newt" = callPackage @@ -148849,8 +154034,8 @@ self: { }: mkDerivation { pname = "ngram"; - version = "0.1.0.0"; - sha256 = "0qk5wgkr69jd9gdy524nsx6r9ss328ynq65k6wn5k7pjkmnfym26"; + version = "0.1.0.1"; + sha256 = "1y6fznq60r52xwvf9i99k5mczll2x8k064jn6ww97fldhrij1g1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148889,8 +154074,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.4.1"; - sha256 = "1a9swysq72igyfbqw078fj3j8vw6hw1v5h4f64kh9wvvdcrdl2rh"; + version = "1.6.4"; + sha256 = "13q2699mamkqfkklk6wgm9jzsb650lrbiqsf8sg66yvhgrxmmk0i"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -148899,6 +154084,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.4.0"; + sha256 = "19x6qzryjdac1alq4wsmy0as6258ga9b3ga3iszqwvqjdpc89a6n"; + 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 @@ -149106,42 +154306,40 @@ 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"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-derivation" = callPackage @@ -149150,8 +154348,8 @@ self: { }: mkDerivation { pname = "nix-derivation"; - version = "1.0.1"; - sha256 = "1z36ihzcnll6vpvv8hr95j9vx0j69v7nir6bxgd6wmidpzigkdmc"; + version = "1.0.2"; + sha256 = "16xx4817ncgqvhmydbfr35lhgiw34js2n5liyfing3qvbfprmscw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149168,18 +154366,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.6"; + sha256 = "0ls3zh769ibba1f5igwxvm49nyp2iljx9msgawi6g01s4469yzxv"; 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; @@ -149252,6 +154450,31 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nkjp" = callPackage ({ mkDerivation, base, bytestring, containers, data-named, filepath , polysoup, tar, text, zlib @@ -149275,14 +154498,13 @@ 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 ]; description = "Low-level bindings to the NLOPT optimization library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nlopt;}; "nlp-scores" = callPackage @@ -149347,8 +154569,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"; @@ -149445,6 +154667,7 @@ self: { executableHaskellDepends = [ array base containers regex-compat ]; description = "Parse and compare nofib runs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nofib-analyze" = callPackage @@ -149485,6 +154708,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 @@ -149627,8 +154861,8 @@ self: { }: mkDerivation { pname = "non-empty"; - version = "0.3.0.1"; - sha256 = "00zbnpcnmchbbdgyw19m1bl3bdhmw89pp9k0mq3z75nz0i40gg9z"; + version = "0.3.1"; + sha256 = "0118vf88pzx1spzx4amc9sxz5vdrmfpryp816fh9l7k5hnzhy0bh"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; @@ -149640,8 +154874,8 @@ self: { ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { pname = "non-empty-containers"; - version = "0.1.2.0"; - sha256 = "0lqyz0xn34byx8f71klj21ficjpy6c049x3fngs7x765vam2dmii"; + version = "0.1.4.0"; + sha256 = "1frjpvx3nzymkwyxz0zc4p11pvxdihx3d3hi31w3d9qanwncbc96"; libraryHaskellDepends = [ base containers semigroupoids ]; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149667,6 +154901,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 @@ -149679,6 +154914,7 @@ self: { testHaskellDepends = [ base checkers QuickCheck ]; description = "The Zipper for NonEmpty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "non-negative" = callPackage @@ -149732,12 +154968,32 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "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; @@ -149885,7 +155141,6 @@ self: { ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-gloss-examples" = callPackage @@ -149915,6 +155170,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Useful utility functions that only depend on base"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "notcpp" = callPackage @@ -149930,6 +155186,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "notmuch" = callPackage + ({ mkDerivation, base, bytestring, c2hs, deepseq, mtl, notmuch + , profunctors, tagged, talloc, text, time + }: + mkDerivation { + pname = "notmuch"; + version = "0.2.0.0"; + sha256 = "1w3g4747q02m0r0n8l5bkfp8icwwnvkp4bf9amkh7h80vidzmspy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq mtl profunctors tagged text time + ]; + librarySystemDepends = [ notmuch talloc ]; + libraryToolDepends = [ c2hs ]; + description = "Haskell binding to Notmuch, the mail indexer"; + license = stdenv.lib.licenses.gpl3; + }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;}; + "notmuch-haskell" = callPackage ({ mkDerivation, base, containers, filepath, notmuch, old-locale , parseargs, time @@ -150010,6 +155285,8 @@ self: { 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"; @@ -150020,13 +155297,14 @@ self: { ({ mkDerivation, base, containers, numeric-prelude, primes }: mkDerivation { pname = "np-extras"; - version = "0.3.1.1"; - sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf"; - revision = "2"; - editedCabalFile = "01jp7y4lsdxlfrbi5vqsc5iyjzzc996w7g88amkkfg5k6amlxb9r"; + version = "0.3.1.2"; + sha256 = "1nah4gxagr02nhwbyq2zinx6nj93h40lyw6fv1bv16x8v3d8p69m"; + revision = "1"; + editedCabalFile = "1imcizgbckwcmxwjicads55g0v6abprz3g69b6blkkgmcq5r9x6b"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "np-linear" = callPackage @@ -150065,24 +155343,23 @@ self: { }) {}; "nqe" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , containers, exceptions, hspec, mtl, 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.4.1"; - sha256 = "1x6ila806i1b1smiby47c1sfj3m09xlxcqpg3ywdibh31znbhhqj"; + version = "0.6.1"; + sha256 = "1l0dydhcqmgf6bamy29sgry8sjirvw3khzjkhpjlb12zl2y75xxd"; libraryHaskellDepends = [ - base conduit containers mtl 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"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nsis" = callPackage @@ -150246,6 +155523,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "num-non-negative" = callPackage + ({ mkDerivation, base, inj }: + mkDerivation { + pname = "num-non-negative"; + version = "0.1"; + sha256 = "0ikhjcjwziv55gnf79fhajhgp5m3441snxg8amc241h5iw4rls8x"; + libraryHaskellDepends = [ base inj ]; + description = "Non-negative numbers"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "number" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -150347,6 +155635,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Convert numbers to number words"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numerals-base" = callPackage @@ -150498,6 +155787,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "numerical" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-expectations, HUnit + , monad-ste, primitive, tagged, transformers, transformers-compat + , vector, vector-algorithms + }: + mkDerivation { + pname = "numerical"; + version = "0.0.0.0"; + sha256 = "018d1hpyv384fbaa5cz8r5qhl2x6gblhj1jxgf9by8g8kyx11x63"; + libraryHaskellDepends = [ + base ghc-prim monad-ste primitive tagged transformers + transformers-compat vector vector-algorithms + ]; + testHaskellDepends = [ + base ghc-prim hspec hspec-expectations HUnit primitive tagged + transformers vector + ]; + description = "core package for Numerical Haskell project"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "numericpeano" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -150518,6 +155829,7 @@ self: { libraryHaskellDepends = [ base ]; description = "numeric classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numhask-array" = callPackage @@ -150637,6 +155949,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; @@ -150674,17 +155988,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; }) {}; @@ -150700,8 +156018,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 = [ @@ -150726,6 +156044,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvim-hs-contrib" = callPackage @@ -150749,6 +156068,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvim-hs-ghcid" = callPackage @@ -150766,6 +156086,7 @@ self: { ]; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nvvm" = callPackage @@ -150774,8 +156095,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 ]; @@ -150843,8 +156164,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 ]; @@ -150905,6 +156226,7 @@ self: { ]; description = "Extensible Resource Descriptor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "oauth10a" = callPackage @@ -150926,6 +156248,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 @@ -151073,16 +156421,40 @@ self: { ]; description = "Composable objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; }) {}; @@ -151245,8 +156617,8 @@ self: { }: mkDerivation { pname = "odbc"; - version = "0.2.0"; - sha256 = "1dv7h2c6y59dsyhz99k1lzydms618i65jra7gzacf88zb4idnvi7"; + version = "0.2.2"; + sha256 = "0dkkkrv43kl3643i0j4hgj1mcsk1jhrl086dygd6hqb9hd4156k5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151321,6 +156693,26 @@ 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.1"; + sha256 = "0vw0k1lvh8fq4ivr7dq14ilydyaps010cz7wxk2m9sc6i2qq4jbf"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "off-simple" = callPackage ({ mkDerivation, base, parsec3, vector }: mkDerivation { @@ -151361,6 +156753,7 @@ self: { ]; description = "A lightweight markup language for story writers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ohloh-hs" = callPackage @@ -151520,6 +156913,7 @@ self: { ]; description = "Haskell utilities for building embedded Elm programs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "omaketex" = callPackage @@ -151677,16 +157071,21 @@ self: { }) {}; "once" = callPackage - ({ mkDerivation, base, containers, hashable, template-haskell - , unordered-containers + ({ mkDerivation, async, base, containers, hashable, hspec + , hspec-discover, HUnit, template-haskell, unordered-containers }: mkDerivation { pname = "once"; - version = "0.2"; - sha256 = "1a2833v9mvjjh0m87qc5aj0n5yb8wzg5mrxhlh4g7hgsl4lccgkm"; + 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; }) {}; @@ -151851,8 +157250,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 @@ -151937,6 +157338,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 { @@ -152060,6 +157495,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 { @@ -152097,9 +157560,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 @@ -152117,7 +157577,6 @@ self: { hardeningDisable = [ "bindnow" ]; description = "Haskell binding to OpenCV-3.x"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) opencv3;}; "opencv-extra" = callPackage @@ -152142,7 +157601,6 @@ self: { ]; description = "Haskell binding to OpenCV-3.x extra modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opencv-raw" = callPackage @@ -152304,6 +157762,8 @@ self: { pname = "openpgp"; version = "0.6.1"; sha256 = "03sdl0nzxnqbg8cnkglxkbz5xh5s57n6qgdjdnd82sdz139ia69s"; + revision = "1"; + editedCabalFile = "0m6nf0zmr90p5r47skwrj543wmb8wqbmiii0fycblz5kk8avf1li"; libraryHaskellDepends = [ base binary bytestring bzlib utf8-string zlib ]; @@ -152407,10 +157867,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 ]; @@ -152462,10 +157920,8 @@ self: { }: mkDerivation { pname = "openssl-streams"; - version = "1.2.1.3"; - sha256 = "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw"; - revision = "1"; - editedCabalFile = "0kvbb0sgli3h1yw229cllfrs2w1maapmvj1i472ywhpsgpz83362"; + version = "1.2.2.0"; + sha256 = "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr"; libraryHaskellDepends = [ base bytestring HsOpenSSL io-streams network ]; @@ -152707,6 +158163,7 @@ self: { ]; description = "An OpenTok SDK for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentype" = callPackage @@ -152892,6 +158349,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 @@ -152932,6 +158390,7 @@ self: { ]; description = "Numerical optimization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimusprime" = callPackage @@ -153016,6 +158475,7 @@ self: { testHaskellDepends = [ base chell options time ]; description = "Command-line option types for dates and times"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-applicative" = callPackage @@ -153024,8 +158484,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 ]; @@ -153084,22 +158544,25 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-simple" = callPackage - ({ mkDerivation, base, bytestring, directory, gitrev + ({ mkDerivation, base, bytestring, directory, githash , optparse-applicative, template-haskell, transformers }: mkDerivation { pname = "optparse-simple"; - version = "0.1.0"; - sha256 = "1g2cf4pcf1fa001z77g8gwnx0cxdpqs1iw9xp0kb9qrxm9gpk3c3"; + version = "0.1.1.1"; + sha256 = "0nqr81q5rvzpgl3r79rrmf30jzkds8gwdir2w1c9775jy2wslssl"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base gitrev optparse-applicative template-haskell transformers + base githash optparse-applicative template-haskell transformers ]; testHaskellDepends = [ base bytestring directory ]; description = "Simple interface to optparse-applicative"; @@ -153143,6 +158606,7 @@ self: { ]; description = "Orchestration-style co-ordination EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orchestrate" = callPackage @@ -153244,8 +158708,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 = [ @@ -153253,7 +158717,6 @@ self: { ]; description = "Order statistic trees based on weight-balanced trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "order-statistics" = callPackage @@ -153288,8 +158751,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; @@ -153371,21 +158834,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; @@ -153393,27 +158856,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 = [ @@ -153528,6 +158991,7 @@ self: { executableHaskellDepends = [ base process ]; description = "Show keys pressed with an on-screen display (Linux only)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "osm-conduit" = callPackage @@ -153659,8 +159123,8 @@ self: { pname = "ottparse-pretty"; version = "0.1.2.6"; sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5"; - revision = "2"; - editedCabalFile = "05fxdr12vwf486609f8ld6d3cgpr632402n404gi8hgxj5ijc6yx"; + revision = "3"; + editedCabalFile = "0g17l53dp1vcn2yzv37yvph9r4jsw4lgwip4l3h038r9g940lwjc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153668,6 +159132,7 @@ self: { ]; description = "Pretty-printer for Ott parse trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "overhang" = callPackage @@ -153802,8 +159267,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "packcheck"; - version = "0.3.1"; - sha256 = "1s171bgqpqh61vaf8s91bbpgn816380bma4wb8in4pnnaf2s0xhv"; + version = "0.4.1"; + sha256 = "056sjs771gdfvbyynb3vaxgabqj747hyhnbfjq83d0nnqyks8rdy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; @@ -153831,6 +159296,7 @@ self: { ]; description = "Check your cabal packages for lagging dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "packed" = callPackage @@ -154136,6 +159602,7 @@ self: { ]; description = "Receive hooks from pagure and do things with them"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "paint" = callPackage @@ -154147,6 +159614,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 @@ -154160,6 +159654,7 @@ self: { ]; description = "Utilities for choosing and creating color schemes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "palindromes" = callPackage @@ -154216,19 +159711,20 @@ self: { , case-insensitive, cmark-gfm, containers, criterion, data-default , deepseq, Diff, directory, doctemplates, exceptions , executable-path, filepath, Glob, haddock-library, hslua - , hslua-module-text, HTTP, http-client, http-client-tls, http-types - , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec - , process, QuickCheck, random, safe, scientific, SHA, skylighting + , hslua-module-text, HsYAML, HTTP, http-client, http-client-tls + , 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, yaml, 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.1"; - sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy"; - revision = "1"; - editedCabalFile = "16f2c7awxbs17xycl3z1x11h7gc7rfzvw7i3pslsn9nms7rz3s3v"; + version = "2.5"; + sha256 = "0bi26r2qljdfxq26gaxj1xnhrawrfndfavs3f3g098x0g3dwazfm"; + revision = "2"; + editedCabalFile = "1z44hcwqqmkmhfak7svrrf950amf008gzhnlxkhwdyjpnpqp21sm"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -154238,11 +159734,11 @@ self: { aeson aeson-pretty base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive cmark-gfm containers data-default deepseq directory doctemplates exceptions filepath - Glob haddock-library hslua hslua-module-text HTTP http-client - http-client-tls http-types JuicyPixels mtl network network-uri - pandoc-types parsec process random safe scientific SHA skylighting - split syb tagsoup temporary texmath text time unix - unordered-containers vector xml yaml zip-archive zlib + 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 unicode-transforms + unix unordered-containers vector xml zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -154254,43 +159750,46 @@ 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; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_2_3_2" = callPackage + "pandoc_2_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , binary, blaze-html, blaze-markup, bytestring, Cabal - , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doctemplates, exceptions - , executable-path, filepath, 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, 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 + , binary, blaze-html, blaze-markup, bytestring, case-insensitive + , cmark-gfm, containers, criterion, data-default, deepseq, Diff + , directory, doctemplates, exceptions, executable-path, filepath + , Glob, haddock-library, hslua, hslua-module-text, HsYAML, HTTP + , http-client, http-client-tls, http-types, ipynb, 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, unicode-transforms, unix, unordered-containers + , vector, weigh, xml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.2.3.2"; - sha256 = "0dmk2vy0kfsi8xzpa8h0kypidf264d5rjvcqyd7jf34rjj47ikk2"; + version = "2.6"; + sha256 = "046vya7ivngv0hp5chnfxc1dm5n3krbgm0883ph45l31c7liyxma"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive cmark-gfm containers data-default deepseq directory doctemplates exceptions filepath 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 + http-client http-client-tls http-types ipynb JuicyPixels mtl + network network-uri pandoc-types parsec process random safe SHA + skylighting split syb tagsoup temporary texmath text time + unicode-transforms unix unordered-containers vector xml zip-archive + zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -154302,7 +159801,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; @@ -154318,10 +159820,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.3.1"; - sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22"; - revision = "1"; - editedCabalFile = "1lqz432ij7yp6l412vcfk400nmxzbix6qckgmir46k1jm4glyqwk"; + version = "0.15.0.1"; + sha256 = "1y4jmralmcikmk75cf5bjlv4ymr42x35a6174ybqa99jmlm5znr9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -154343,6 +159843,42 @@ self: { doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pandoc-citeproc_0_16" = 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.16"; + sha256 = "1fs1dr7cgkzy0sb68fx85x6l5j1hx9sgkiyxzdfi90hpqnm207sy"; + 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 @@ -154364,14 +159900,16 @@ 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"; + revision = "1"; + editedCabalFile = "06ic2286am3jpmlb6jxnrx0y9c7rh5rs3l0chv1s5ahharp341g9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -154384,7 +159922,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 = [ @@ -154402,8 +159940,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; @@ -154456,6 +159994,7 @@ self: { ]; description = "A Pandoc filter to use graphviz"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-include" = callPackage @@ -154532,6 +160071,7 @@ self: { libraryHaskellDepends = [ base containers lens pandoc-types ]; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-placetable" = callPackage @@ -154540,8 +160080,8 @@ self: { }: mkDerivation { pname = "pandoc-placetable"; - version = "0.5"; - sha256 = "0kjlx2krgwf32y30cca09xnf1h3c91s0pzsv5xf7l8zw85jikxah"; + version = "0.5.1"; + sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -154576,6 +160116,50 @@ 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-pyplot_1_1_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hspec + , hspec-expectations, pandoc-types, tasty, tasty-hspec, tasty-hunit + , temporary, typed-process + }: + mkDerivation { + pname = "pandoc-pyplot"; + version = "1.1.0.0"; + sha256 = "0c04ayg4rnlycsw16gafiwvixxwc66wxfm4nk25bclbl67zyw8qj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath pandoc-types temporary + typed-process + ]; + executableHaskellDepends = [ base pandoc-types ]; + testHaskellDepends = [ + base directory filepath hspec hspec-expectations pandoc-types tasty + tasty-hspec tasty-hunit temporary + ]; + description = "A Pandoc filter for including figures generated from Matplotlib"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-sidenote" = callPackage ({ mkDerivation, base, monad-gen, pandoc, pandoc-types }: mkDerivation { @@ -154588,6 +160172,7 @@ self: { executableHaskellDepends = [ base pandoc-types ]; description = "Convert Pandoc Markdown-style footnotes into sidenotes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-stylefrommeta" = callPackage @@ -154605,6 +160190,7 @@ self: { ]; description = "Pandoc filter to customize links, images and paragraphs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-types" = callPackage @@ -154615,8 +160201,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 @@ -154650,8 +160236,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 = [ @@ -154662,6 +160248,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandora" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "pandora"; + version = "0.1.1"; + sha256 = "0x2pfvvpn7r99238ma3q6fnirx6zh2pzz86b4fijll2k7wqxkl94"; + description = "A box of patterns and paradigms"; + license = stdenv.lib.licenses.mit; + }) {}; + "pang-a-lambda" = callPackage ({ mkDerivation, base, bytestring, containers, IfElse, mtl, SDL , SDL-gfx, SDL-ttf, transformers, Yampa @@ -154689,8 +160285,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.5.0"; - sha256 = "1s29dmds28ffbcbic8pw3bsixkb6lzjm78j8qv4x3r9l64kvjndz"; + version = "0.13.6.0"; + sha256 = "14qcikd9r06ra7zp557c0bffd357yj4hk9bjigyhq2kdrc2l7igr"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -154699,18 +160295,20 @@ self: { libraryPkgconfigDepends = [ pango ]; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {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"; @@ -154800,6 +160398,7 @@ self: { testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; description = "Pansite: a simple web site management tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "papa" = callPackage @@ -155181,6 +160780,7 @@ self: { ]; description = "packrat parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pappy" = callPackage @@ -155288,8 +160888,8 @@ self: { pname = "parallel-io"; version = "0.3.3"; sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; - revision = "1"; - editedCabalFile = "1vlb2x1ghih4l64031rmh7h643c3knh5r5mwilf7g8izb58ypvkm"; + revision = "2"; + editedCabalFile = "0mggzni708nzxlsjbibdzf03s3b5lnqj2zi1hnbh1rd4j4jr07ym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155379,8 +160979,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 @@ -155468,17 +161068,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 = [ @@ -155489,6 +161090,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; @@ -155512,8 +161114,8 @@ self: { }: mkDerivation { pname = "paripari"; - version = "0.2.1.0"; - sha256 = "002sr369102k2wwzy3adav52vvz7d0yyy07lqzqf8b7fw6ffjcy2"; + version = "0.6.0.0"; + sha256 = "1604py5ms14xhmvsxdqx56xfbs3g4wkhjd8f5gsmhpqwz7acy511"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155667,6 +161269,7 @@ self: { ]; description = "Parsec combinators for parsing Haskell numeric types"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec-parsers" = callPackage @@ -155708,6 +161311,7 @@ self: { executableHaskellDepends = [ base containers mtl parsec pretty ]; description = "Pratt Parser combinator for Parsec"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec-tagsoup" = callPackage @@ -155837,8 +161441,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parser-combinators"; - version = "1.0.0"; - sha256 = "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75"; + version = "1.0.1"; + sha256 = "0cpa1j1r7gpyj1n9b1kam4wq6fjn6qh2a1w7m95k614sls7spxgd"; libraryHaskellDepends = [ base ]; description = "Lightweight package providing commonly useful parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -155924,8 +161528,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 ]; @@ -155986,6 +161590,7 @@ self: { ]; description = "Parser combinators with slicing, error recovery, and syntax highlighting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partage" = callPackage @@ -156078,38 +161683,35 @@ 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"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup-hedgehog" = callPackage ({ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-semigroup-test" = callPackage ({ 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"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-uri" = callPackage @@ -156121,6 +161723,7 @@ self: { libraryHaskellDepends = [ base network-uri ]; description = "Datatype for passing around unresolved URIs"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partly" = callPackage @@ -156165,6 +161768,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "passman" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring + , bytestring, containers, HCL, HUnit, lens, random, SHA, text + , transformers + }: + mkDerivation { + pname = "passman"; + version = "0.2"; + sha256 = "1rqld0cdk0m5vi1j095rjyyfjl65d2k983i0zqsjgl1w34bz02cb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bytestring + containers lens random SHA text + ]; + executableHaskellDepends = [ + aeson base bytestring containers HCL lens random transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit lens random + ]; + description = "a simple password manager"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "passman-cli" = callPackage ({ mkDerivation, base, conduit, contravariant, haskeline , optparse-applicative, passman-core, resourcet, text, X11, yaml @@ -156173,6 +161801,8 @@ self: { pname = "passman-cli"; version = "0.2.0.0"; sha256 = "0l0cbhngg2dxsy95a24x1g19cpnmngcgdkxklzjymmcnqmxp7jd8"; + revision = "1"; + editedCabalFile = "197mlc2v7azdgdnvr2pxm2whhpqj4v2czwn5vi6ksrax82xswcnc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -156186,25 +161816,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"; @@ -156221,6 +161849,7 @@ self: { libraryHaskellDepends = [ base containers MonadRandom random ]; description = "Password generation/validation library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pasta" = callPackage @@ -156275,8 +161904,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.0.0"; - sha256 = "1xbddlc73b0sgd02vxkbhra04wz77q0dn1937k6aq5l1vx663i81"; + version = "0.8.2.2"; + sha256 = "03k4njhn7sasr02446qj8x69hh8af7l35900lrvxr7qv741rc006"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -156287,6 +161916,7 @@ self: { ]; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "patch-combinators" = callPackage @@ -156302,26 +161932,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"; @@ -156393,29 +162025,10 @@ self: { }: mkDerivation { pname = "path-io"; - version = "1.3.3"; - sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; - revision = "3"; - editedCabalFile = "1h9hsibbflkxpjl2fqamqiv3x3gasf51apnmklrs9l9x8r32hzcc"; - libraryHaskellDepends = [ - base containers directory dlist exceptions filepath path temporary - time transformers unix-compat - ]; - testHaskellDepends = [ - base directory exceptions hspec path transformers unix-compat - ]; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "path-io_1_4_0" = callPackage - ({ mkDerivation, base, containers, directory, dlist, exceptions - , filepath, hspec, path, temporary, time, transformers, unix-compat - }: - mkDerivation { - pname = "path-io"; - version = "1.4.0"; - sha256 = "0pffdxzn59qm3ifk746sp2g3h2gip2ijs39gwi0k0xn1rkid6ph5"; + version = "1.4.1"; + sha256 = "0v5zwdsy8dd2ljidjm2rr8wfpvjlgk1g7c5xf40ddzjn9ghykk2p"; + revision = "1"; + editedCabalFile = "1qb9b3rvzpdm6xp2xljmp2izz0x26bj3zvai22iyl914pzph3181"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -156425,7 +162038,6 @@ self: { ]; description = "Interface to ‘directory’ package for users of ‘path’"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -156447,14 +162059,13 @@ 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 ]; description = "Read and write UTF-8 text files"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pathfinding" = callPackage @@ -156495,6 +162106,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 @@ -156534,12 +162147,28 @@ 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.1.0"; + sha256 = "0mfkqf5kwxqva6pizj967gv7m8zvjvwnli5ala0qvv7jq8gqnfsf"; + revision = "1"; + editedCabalFile = "0zr4w80zx7gw7amj2mlxl0k7lvczxnl0i13mijvxnb0g15sa5clg"; libraryHaskellDepends = [ base containers ]; description = "Patience diff and longest increasing subsequence"; license = stdenv.lib.licenses.bsd3; @@ -156579,6 +162208,8 @@ self: { pname = "pattern-trie"; version = "0.1.0"; sha256 = "1ldy1b81sryngf4rlfsw3f2qw0cirjnbvddvw98wrl2m50wzdmlg"; + revision = "1"; + editedCabalFile = "1v9f28gpns5v646hdzn7xfimq2v0sx3rws56r7lfh1qgcfdavy9f"; libraryHaskellDepends = [ base bytestring containers deepseq hashable text unordered-containers @@ -156809,6 +162440,7 @@ self: { ]; description = "PCD file loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pcf" = callPackage @@ -156897,12 +162529,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; }) {}; @@ -157218,6 +162852,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Peano numbers"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "peano-inf" = callPackage @@ -157288,6 +162923,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pedestrian-dag" = callPackage + ({ mkDerivation, array, base, binary, containers }: + mkDerivation { + pname = "pedestrian-dag"; + version = "0.2.0"; + sha256 = "075m58nmls893vis3l55dix8mrciwl2r8kz1s18mgwhxvadm4gdp"; + revision = "1"; + editedCabalFile = "1434n6ncyyryjqzn3xcg73nwvcr6si7cnf2k8g2qrp0xmrq0nx8b"; + libraryHaskellDepends = [ array base binary containers ]; + description = "A pedestrian implementation of directed acyclic graphs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "peg" = callPackage ({ mkDerivation, base, containers, filepath, haskeline, logict, mtl , parsec @@ -157340,6 +162989,7 @@ self: { ]; description = "Package to solve the Generalized Pell Equation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pem" = callPackage @@ -157362,23 +163012,19 @@ self: { "pencil" = callPackage ({ mkDerivation, base, data-default, directory, doctest - , edit-distance, feed, filepath, hashable, hsass, mtl, pandoc - , parsec, semigroups, text, time, unordered-containers, vector, xml - , yaml + , edit-distance, filepath, hashable, hsass, mtl, pandoc, parsec + , semigroups, text, time, unordered-containers, vector, xml, yaml }: mkDerivation { pname = "pencil"; - version = "0.1.2"; - sha256 = "0wgs79vsz52cnmbcfzbb3avn98ciadnispgr98h6kwhgj5pmaxbm"; - isLibrary = true; - isExecutable = true; + version = "0.1.3"; + sha256 = "0kga9i19qxp6g51dyavnybfs6znsija87hxsfrxblsyi4gqs9hbp"; libraryHaskellDepends = [ - base data-default directory edit-distance feed filepath hashable - hsass mtl pandoc parsec semigroups text time unordered-containers - vector xml yaml + base data-default directory edit-distance filepath hashable hsass + mtl pandoc parsec semigroups text time unordered-containers vector + xml yaml ]; - executableHaskellDepends = [ base text unordered-containers ]; - testHaskellDepends = [ base doctest ]; + testHaskellDepends = [ base doctest text unordered-containers ]; description = "Static site generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -157766,6 +163412,7 @@ self: { ]; description = "Permutations of finite sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "permute" = callPackage @@ -157780,6 +163427,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.1"; + sha256 = "1r14xfaa4rncv7sgrm6lznab8yyj6wh65yvzh2j2prwpjqswy5b7"; + 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 { @@ -157873,24 +163537,23 @@ self: { "persistent" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers - , fast-logger, haskell-src-meta, 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 + , 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.8.2"; - sha256 = "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9"; + version = "2.9.1"; + sha256 = "1b6shb1d8p7dapj428glmsy7w69424bxrvgf7ws8jd266h4gshk7"; revision = "1"; - editedCabalFile = "18a6dfpjakcmyl9qnflgi63rss09zj3xg0py6bliary4y2cqw4fz"; + editedCabalFile = "1ing9cdpafmfx0mpvrl3xzfvmw5aw2lpiq69nnhrsmlhb9pi8ni0"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers fast-logger haskell-src-meta - 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 + 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 @@ -157931,6 +163594,7 @@ self: { ]; description = "Parses a Persist Model file and produces Audit Models"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-cereal" = callPackage @@ -158080,6 +163744,7 @@ self: { ]; description = "Backend for the persistent library using mongoDB"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-mysql" = callPackage @@ -158089,8 +163754,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.8.1"; - sha256 = "0m76hsrgv118bg6sawna6xwg30q8vl84zqa8qc9kll4hzbw2kk40"; + version = "2.9.0"; + sha256 = "0aa1ia4r49vy5hfg59rbrfmfwdyaix0l32drdjnj9xxqbayifjzf"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -158108,8 +163773,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.4.2"; - sha256 = "012vnfxjqlp352jm5s8glvypgyjligsqfrhb3y0kpzvxlsw4a653"; + version = "0.5.2"; + sha256 = "1kc2q9cbgij5b5kz70jcy694v2frgzzb7mvld8dypsz11dlpmhjn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158122,7 +163787,6 @@ self: { ]; description = "A pure haskell backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-odbc" = callPackage @@ -158167,8 +163831,10 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.8.2.0"; - sha256 = "0j9g12fk1rlxhd45frxrj9bkmzrk1qbz611296af8nhxkw5wiwzj"; + 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 @@ -158196,6 +163862,23 @@ 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; + }) {}; + "persistent-ratelimit" = callPackage ({ mkDerivation, base, time, yesod }: mkDerivation { @@ -158243,6 +163926,7 @@ self: { ]; description = "Haskell references backed by an IntMap for persistence and reversibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-relational-record" = callPackage @@ -158268,6 +163952,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-spatial" = callPackage + ({ mkDerivation, aeson, base, hspec, http-api-data + , integer-logarithms, lens, persistent, QuickCheck, text + }: + mkDerivation { + pname = "persistent-spatial"; + version = "0.1.0.0"; + sha256 = "0x9ialzl7mmq3h4nx79z51czddn7xgs0sngixc38cdlmddvm2g36"; + revision = "1"; + editedCabalFile = "18qd2k3b6s8nd9v8fqsdf8f8pblm6frm8q8958zi5gs44096cgz8"; + libraryHaskellDepends = [ + aeson base http-api-data integer-logarithms lens persistent text + ]; + testHaskellDepends = [ + aeson base hspec http-api-data persistent QuickCheck text + ]; + description = "Database agnostic, spatially indexed type for geographic points"; + license = stdenv.lib.licenses.mit; + }) {}; + "persistent-sqlite_2_6_4" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-control, monad-logger, old-locale @@ -158278,6 +163982,8 @@ self: { pname = "persistent-sqlite"; version = "2.6.4"; sha256 = "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm"; + revision = "1"; + editedCabalFile = "0ddqbj5j2m99a5xrvb31mcav4nh48y0jcazm1jj3z577gqv4lbdq"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -158305,8 +164011,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.8.2"; - sha256 = "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6"; + version = "2.9.2"; + sha256 = "1pmmy1a1zi64c0v9sfawd3mz8qfidrrc3i9ghdhrmfqq1d0kir8g"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -158335,8 +164041,31 @@ 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 + tagged template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text transformers + ]; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + + "persistent-template_2_6_0" = callPackage + ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers + , ghc-prim, hspec, http-api-data, monad-control, monad-logger + , path-pieces, persistent, QuickCheck, tagged, template-haskell + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.6.0"; + sha256 = "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -158347,9 +164076,31 @@ self: { ]; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; 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 @@ -158386,6 +164137,7 @@ self: { ]; description = "Tests for Persistent"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-vector" = callPackage @@ -158803,15 +164555,17 @@ 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; }) {}; "phash" = callPackage @@ -158880,8 +164634,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.26.0"; - sha256 = "168qshbiawj1i7d676y2x5l2bmkhfvnf0fs2abr75v8g7hsa8imq"; + version = "0.0.28.0"; + sha256 = "106y0j3a3xnz76pdv1vdag1wqn21ybypxzygs66jm1qv6vlragcn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159037,6 +164791,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 @@ -159244,8 +165009,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"; @@ -159292,36 +165057,50 @@ self: { libraryHaskellDepends = [ base unix ]; description = "Run an IO action protected by a pidfile"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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 { @@ -159350,6 +165129,7 @@ self: { ]; description = "dice game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "piki" = callPackage @@ -159369,23 +165149,22 @@ self: { "pinboard" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl - , network, profunctors, QuickCheck, random, safe-exceptions - , semigroups, text, time, transformers, unordered-containers + , network, profunctors, QuickCheck, random, semigroups, text, time + , transformers, unliftio, unliftio-core, unordered-containers , vector }: mkDerivation { pname = "pinboard"; - version = "0.9.12.10"; - sha256 = "0jdhckdlpmgqrp8xy7m285w7kclg8dpl02szl6fd6iwzs8l8vjds"; + version = "0.10.1.4"; + sha256 = "1kmkxcvkfqwp2p46s22gdnvk12g7bx9dqr8cs04wjw1rbj0mli49"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls - http-types monad-logger mtl network profunctors random - safe-exceptions text time transformers unordered-containers vector + 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 - safe-exceptions semigroups text time transformers - unordered-containers + 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; @@ -159398,8 +165177,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 @@ -159411,6 +165190,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "An alternative implementation of Thrift for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinchot" = callPackage @@ -159432,6 +165212,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ping" = callPackage + ({ mkDerivation, base, cpu, ip, posix-api, primitive + , primitive-containers, stm, transformers + }: + mkDerivation { + pname = "ping"; + version = "0.1.0.1"; + sha256 = "0zrs98927wfnxw00125pssgw8i8yz7hlrd9043dmw7fviajay6n0"; + libraryHaskellDepends = [ + base cpu ip posix-api primitive primitive-containers stm + transformers + ]; + description = "icmp echo requests"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ping-parser-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, hspec, iproute, placeholders , QuickCheck, quickcheck-text, text @@ -159548,6 +165345,8 @@ self: { pname = "pipes"; version = "4.3.9"; sha256 = "1jqs4x3xw2ya3834p36p1ycx8nxjgn2ypaibhdv97xcw3wsxlk2w"; + revision = "1"; + editedCabalFile = "0mkwbbn8vlrsvm3pl2cyaw1qr9hbjqfm831naj7cbrmiksf2l5aa"; libraryHaskellDepends = [ base exceptions mmorph mtl semigroups transformers void ]; @@ -159596,6 +165395,7 @@ self: { ]; description = "A higher-level interface to using concurrency with pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-attoparsec" = callPackage @@ -159841,8 +165641,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 ]; @@ -160008,6 +165810,7 @@ self: { ]; description = "Fast traversal of directory trees using pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-fluid" = callPackage @@ -160030,6 +165833,7 @@ self: { ]; description = "Reactively combines Producers so that a value is yielded as soon as possible"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-group" = callPackage @@ -160056,6 +165860,8 @@ self: { pname = "pipes-http"; version = "1.0.5"; sha256 = "0m9hy9j6nnq2zngz1axbarjc1cwyxw7z36x40qw8yqz1dm39d8a9"; + revision = "1"; + editedCabalFile = "015psgj5wl67p0qdc00nrn717gv354gii70c57n1px5j81b0z5cl"; libraryHaskellDepends = [ base bytestring http-client http-client-tls pipes ]; @@ -160088,7 +165894,6 @@ self: { libraryHaskellDepends = [ base containers heaps pipes ]; description = "Interleave and merge streams of elements"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-io" = callPackage @@ -160171,6 +165976,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 ]; @@ -160180,7 +165987,6 @@ self: { ]; description = "LZMA compressors and decompressors for the Pipes package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-misc" = callPackage @@ -160348,6 +166154,7 @@ self: { libraryHaskellDepends = [ base mwc-random pipes vector ]; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-rt" = callPackage @@ -160368,18 +166175,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 @@ -160396,10 +166201,8 @@ self: { }: mkDerivation { pname = "pipes-safe"; - version = "2.2.9"; - sha256 = "160qba0r8lih186qfrpvnx1m2j632x5b7n1x53mif9aag41n9w8p"; - revision = "1"; - editedCabalFile = "08jxmxfhxfi3v19bvvmfs50c74ci6v36503knsb4qdscx9lr864d"; + version = "2.3.1"; + sha256 = "0dfdd3fccfd7wfn5228hbfj3h10xq01sddpy1v2ds63wlg84kwly"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -160659,6 +166462,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pixela" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default-class + , http-client, http-client-tls, http-types, split, text, time + , unordered-containers, uri-encode, vector + }: + mkDerivation { + pname = "pixela"; + version = "0.3.1.0"; + sha256 = "0kjv5536hakbxxgj3jfzmxlgxnwx7jk0izf4gly14l4yr8fbv4s1"; + libraryHaskellDepends = [ + aeson base bytestring data-default-class http-client + http-client-tls http-types split text time unordered-containers + uri-encode vector + ]; + testHaskellDepends = [ + aeson base bytestring data-default-class http-client + http-client-tls http-types split text time 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 @@ -160774,6 +166600,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Implementation of the PKTree spatial index data structure"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "placeholders" = callPackage @@ -160880,6 +166707,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 { @@ -161072,6 +166971,7 @@ self: { ]; description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk" = callPackage @@ -161083,6 +166983,7 @@ self: { libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ]; description = "GTK plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk-ui" = callPackage @@ -161113,6 +167014,7 @@ self: { ]; description = "GTK3 plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-lab" = callPackage @@ -161185,15 +167087,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; @@ -161241,6 +167143,7 @@ self: { ]; description = "Diagrams based plotting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plotserver-api" = callPackage @@ -161327,6 +167230,7 @@ self: { libraryHaskellDepends = [ base semigroups ]; description = "Plurality monad: Zero, one, or at least two"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plural" = callPackage @@ -161339,6 +167243,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "Pluralize"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ply-loader" = callPackage @@ -161536,8 +167441,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.3"; - sha256 = "0mnyh32d4fzcq9g1vsj8r04pacxvf8xx62rkkaha37rhp966f4mj"; + version = "1.1.1.4"; + sha256 = "03jnhppm39zdfrmg1784p1y5r7r5wd5di2ddq5d71slifq7j5wd1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161552,6 +167457,7 @@ self: { ]; description = "Tool for refactoring expressions into pointfree form"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointfree-fancy" = callPackage @@ -161591,6 +167497,7 @@ self: { executableHaskellDepends = [ base ]; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointless-fun" = callPackage @@ -161674,7 +167581,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 @@ -161920,10 +167828,8 @@ self: { ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "polyparse"; - version = "1.12"; - sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m"; - revision = "1"; - editedCabalFile = "18daiyj3009wx0bhr87fbgy7xfh68ss9qzn6k3lgmh1z9dfsryrd"; + version = "1.12.1"; + sha256 = "19fs18g7fvfdkm9zy28cgighjcxfa6mcpqgyp6whmsjkb3h393fx"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; @@ -161961,6 +167867,7 @@ self: { ]; description = "Online XML parsing with polyparse and tagsoup"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polytypeable" = callPackage @@ -161993,8 +167900,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"; @@ -162022,6 +167929,7 @@ self: { ]; description = "Maps and sets of partial orders"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pomodoro" = callPackage @@ -162131,8 +168039,9 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.5.4"; - sha256 = "0fmi915jmdh2k6fp97vywxpbljpcf6xpmvy3m7l1imqig0hfd8nf"; + version = "0.5.5"; + sha256 = "044fhp9fa2fp0aka972wmlmfq05k63dc1xb6fqrbwcyaamlprdsp"; + setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -162278,6 +168187,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;}; @@ -162292,6 +168202,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 { @@ -162344,6 +168266,7 @@ self: { librarySystemDepends = [ portaudio ]; description = "Haskell bindings for the PortAudio library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) portaudio;}; "porte" = callPackage @@ -162397,6 +168320,7 @@ self: { libraryHaskellDepends = [ base directory process ]; description = "Library to interact with port tools on FreeBSD"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "positive" = callPackage @@ -162442,8 +168366,22 @@ self: { librarySystemDepends = [ acl ]; description = "Support for Posix ACL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) acl;}; + "posix-api" = callPackage + ({ mkDerivation, base, primitive, tasty, tasty-hunit }: + mkDerivation { + pname = "posix-api"; + version = "0.2.0.0"; + sha256 = "059b5zip3i7cfa977kz0jzxc7b8nws9libkxwf8pnvxk70i7apq1"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base primitive tasty tasty-hunit ]; + description = "posix bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "posix-error-codes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -162475,6 +168413,7 @@ self: { libraryHaskellDepends = [ base transformers unix ]; description = "Nice wrapper around POSIX fcntl advisory locks"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "posix-paths" = callPackage @@ -162483,8 +168422,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.1.5"; - sha256 = "1pyi25gz2r3pc64f1i5awyp3mg5w74ik9wh5s9i9hs7bfmkjk1as"; + version = "0.2.1.6"; + sha256 = "0ibycc7z3gm6jr83cgsqwa7hkky2ldfqqd30ickgq6vn2rkp8fbj"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit QuickCheck unix @@ -162627,21 +168566,22 @@ self: { libraryHaskellDepends = [ base bytestring postgresql-simple text ]; description = "Create a temporary database that is deleted after performing some operation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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 = [ @@ -162651,9 +168591,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 @@ -162676,8 +168615,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 @@ -162751,8 +168690,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 @@ -162799,15 +168738,33 @@ 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;}; + "postgresql-lo-stream" = callPackage + ({ mkDerivation, base, bytestring, io-streams, lifted-base + , monad-loops, mtl, postgresql-simple + }: + mkDerivation { + pname = "postgresql-lo-stream"; + version = "0.1.1.0"; + sha256 = "196f6lz8i8y0cfnd4lqjky69wpi0mc2jfs7jz5v0j3r15jbs5212"; + libraryHaskellDepends = [ + base bytestring io-streams lifted-base monad-loops mtl + postgresql-simple + ]; + description = "Utilities for streaming PostgreSQL LargeObjects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-named" = callPackage ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl , postgresql-libpq, postgresql-simple, utf8-string @@ -162867,6 +168824,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 @@ -162909,23 +168868,26 @@ self: { "postgresql-simple" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers - , cryptohash, filepath, hashable, HUnit, postgresql-libpq + , 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.5.4.0"; - sha256 = "0xrsyx25v5z06qziy32wlb3lvkyci3nxkbb25nis21vkj3kimlgm"; + version = "0.6"; + sha256 = "1jp08vg040p2qbgy2hldkac1qy1m2k1r6r67hh6dziw5ak1kjs69"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder - case-insensitive containers hashable postgresql-libpq scientific - template-haskell text time transformers uuid-types vector + case-insensitive containers hashable Only postgresql-libpq + scientific template-haskell text time transformers uuid-types + vector ]; testHaskellDepends = [ - aeson base base16-bytestring bytestring containers cryptohash - filepath HUnit tasty tasty-golden tasty-hunit text time vector + 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; }) {}; @@ -162957,8 +168919,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-migration"; - version = "0.1.12.0"; - sha256 = "18sx8ila7w7k4ym4rs36dc48v0cdl3b4il5jfqyfcx34n3mb5y4q"; + version = "0.1.14.0"; + sha256 = "1z9fdfwpcnhbsq977070hn8ykxcnisjzvpdh5lz4bqirscx2gr2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162981,8 +168943,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 @@ -163041,8 +169003,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-typed"; - version = "0.1.0.2"; - sha256 = "12f06lzh2kw27ykwiwgbavj1wbkf4w0xjy6gk2nf4kzm65qvj8az"; + version = "0.1.1.1"; + sha256 = "1sfp83xy797zamgyxvcm4jrg3x1jl8f0gzb5c3jsmqbg16rnx0ay"; libraryHaskellDepends = [ base postgresql-libpq postgresql-simple template-haskell transformers typedquery utf8-string @@ -163060,6 +169022,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; + revision = "1"; + editedCabalFile = "0ck0vrlsyj3vm8sk59jnyyqpvnv1l9mciifdnrzwr981pha147qp"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -163156,8 +169120,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "5.1.0"; - sha256 = "1x6jipc8ixv9wic5l0nlsirm3baddmrhphrr3snil1by5kz208g6"; + version = "5.2.0"; + sha256 = "0h4167jr0k398paf2sgnxkm4iziqf3a9i61cbh7d0ix86z2v8a53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163172,14 +169136,14 @@ self: { ]; executableHaskellDepends = [ auto-update base base64-bytestring bytestring hasql hasql-pool - protolude retry text time unix warp + hasql-transaction protolude retry text time unix warp ]; testHaskellDepends = [ aeson aeson-qq async auto-update base base64-bytestring bytestring case-insensitive cassava containers contravariant hasql hasql-pool - heredoc hjsonschema hspec hspec-wai hspec-wai-json http-types lens - lens-aeson monad-control process protolude regex-tdfa time - transformers-base wai wai-extra + hasql-transaction heredoc hjsonschema hspec hspec-wai + hspec-wai-json http-types lens lens-aeson monad-control process + protolude regex-tdfa time transformers-base wai wai-extra ]; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; @@ -163275,6 +169239,7 @@ self: { ]; description = "Send email via Postmark using io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmaster" = callPackage @@ -163283,8 +169248,8 @@ self: { }: mkDerivation { pname = "postmaster"; - version = "0.3.2"; - sha256 = "1l1hq77qxi1f9nv7bxgkfvcm50p61svqvn9f59aq3b9zj2vikmf6"; + version = "0.3.3"; + sha256 = "05608xvaig1d67j3h8ykw7a11yr1mqkw98p0ii7gbp4mp3d9kncd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163314,8 +169279,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.0.15"; - sha256 = "09220lqyl4rd7al03349r6wbp8hd85rjfbr6kq1swzn3yja2zhsz"; + version = "2.1.4.1"; + sha256 = "1hc7jp7q6mdqva40v0dppihp1bnl30h7vxnkawg0kmczq5p9js35"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -163324,17 +169289,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 @@ -163345,25 +169310,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "potoki-conduit" = callPackage + ({ mkDerivation, acquire, base, base-prelude, bytestring, conduit + , potoki, potoki-core, profunctors, QuickCheck + , quickcheck-instances, rerebase, slave-thread, stm-chans, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "potoki-conduit"; + version = "0.1"; + sha256 = "11hg5zib91b1kp75amlng96b1n357rkj120afnc0825vvb81ky14"; + libraryHaskellDepends = [ + acquire base base-prelude bytestring conduit potoki-core + profunctors slave-thread stm-chans text + ]; + testHaskellDepends = [ + conduit potoki QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Integration of \"potoki\" and \"conduit\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "potoki-core" = callPackage ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion - , directory, foldl, hashable, ilist, primitive, profunctors, ptr - , QuickCheck, quickcheck-instances, random, rerebase, scanner - , split, stm, tasty, tasty-hunit, tasty-quickcheck, text, time + , deepseq, deferred-folds, directory, foldl, hashable, ilist + , primitive, profunctors, ptr, QuickCheck, quickcheck-instances + , random, rerebase, scanner, split, stm, stm-chans, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, time , transformers, unordered-containers, vector }: mkDerivation { pname = "potoki-core"; - version = "2.2.16"; - sha256 = "0xjrbv087qyqqd3h3lam2jgrikp5lvsb716ndmqv0i1s4qlzxa6d"; + version = "2.3.4.1"; + sha256 = "0mg8hd85xim33jv1abzgjfcy85mmrrvs30gpvspdci5d7xghqrmv"; libraryHaskellDepends = [ - acquire attoparsec base bytestring directory foldl hashable - primitive profunctors ptr scanner stm text time transformers - unordered-containers vector + acquire attoparsec base bytestring deepseq deferred-folds directory + foldl hashable primitive profunctors ptr scanner stm stm-chans text + text-builder time transformers unordered-containers vector ]; testHaskellDepends = [ - acquire attoparsec foldl ilist QuickCheck quickcheck-instances - random rerebase split 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\""; @@ -163580,8 +169570,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"; @@ -163658,24 +169648,25 @@ self: { ]; description = "Alternative Show class that gives shorter view if possible"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "preamble" = callPackage ({ 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; @@ -163736,8 +169727,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 @@ -163836,6 +169827,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "prefetch" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "prefetch"; + version = "0.1.0.0"; + sha256 = "0qc4khx92xqjzq8pp5agxzh9l1l79np32s7af1kffpvffz4r5rpn"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base bytestring ]; + description = "Prefetch stdin even before stdout is ready"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prefix-expression" = callPackage ({ mkDerivation, base, hspec, regex-pcre-builtin }: mkDerivation { @@ -164271,8 +170275,8 @@ self: { }: mkDerivation { pname = "pretty-show"; - version = "1.7"; - sha256 = "0br7pkxqqqhby2j2v1g847lgqsrasx56g1jw3dhmjh4flzs6warq"; + version = "1.9.5"; + sha256 = "0gs2pabi4qa4b0r5vffpf9b1cf5n9y2939a3lljjw7cmg6xvx5dh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -164285,54 +170289,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pretty-show_1_8_1" = callPackage - ({ mkDerivation, array, base, filepath, ghc-prim, happy - , haskell-lexer, pretty, text + "pretty-show-ansi-wl" = callPackage + ({ mkDerivation, ansi-wl-pprint, array, base, ghc-prim, happy + , haskell-lexer }: mkDerivation { - pname = "pretty-show"; - version = "1.8.1"; - sha256 = "0s8bj7ymbc9pz91kls2blrpip7pphcc683wd5ig8kywjmix1ibsg"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; + pname = "pretty-show-ansi-wl"; + version = "1.9.2.1"; + sha256 = "00g6crhwshscvchf4321sig1p7dr82is5vfa2x8vmxm7kr6ciki6"; libraryHaskellDepends = [ - array base filepath ghc-prim haskell-lexer pretty text + ansi-wl-pprint array base ghc-prim haskell-lexer ]; libraryToolDepends = [ happy ]; - executableHaskellDepends = [ base ]; - description = "Tools for working with derived `Show` instances and generic inspection of values"; + description = "Like pretty-show, but only for ansi-wl-pprint"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-simple" = callPackage - ({ mkDerivation, ansi-terminal, base, containers, criterion - , doctest, Glob, mtl, parsec, text, transformers - }: - mkDerivation { - pname = "pretty-simple"; - version = "2.1.0.1"; - sha256 = "1lfkbjpcgyiv915xvhpirhx8x7ng1jgrlxd6zlilcvnpkkm2xacs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base containers mtl parsec text transformers - ]; - testHaskellDepends = [ base doctest Glob ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "pretty printer for data types with a 'Show' instance"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pretty-simple_2_2_0_0" = 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 = [ @@ -164342,7 +170322,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-sop" = callPackage @@ -164351,10 +170330,11 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-terminal" = callPackage @@ -164394,6 +170374,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-types_0_3_0_1" = callPackage + ({ mkDerivation, base, hspec, mtl, tagged }: + mkDerivation { + pname = "pretty-types"; + version = "0.3.0.1"; + sha256 = "06dkyk3zdi9wv77yza0vgwl9v8zhyazyhdjbffkqpism07c80rgv"; + libraryHaskellDepends = [ base mtl tagged ]; + testHaskellDepends = [ base hspec tagged ]; + description = "A small pretty printing DSL for complex types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyFunctionComposing" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -164521,6 +170514,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; @@ -164549,9 +170544,12 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prim-instances" = callPackage @@ -164569,6 +170567,7 @@ self: { ]; description = "prim typeclass instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prim-ref" = callPackage @@ -164647,7 +170646,7 @@ self: { description = "FFI bindings for the primesieve library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {primesieve = null;}; + }) {inherit (pkgs) primesieve;}; "primitive_0_5_1_0" = callPackage ({ mkDerivation, base, ghc-prim }: @@ -164664,18 +170663,6 @@ self: { }) {}; "primitive" = callPackage - ({ mkDerivation, base, ghc-prim, transformers }: - mkDerivation { - pname = "primitive"; - version = "0.6.3.0"; - sha256 = "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd"; - libraryHaskellDepends = [ base ghc-prim transformers ]; - testHaskellDepends = [ base ghc-prim ]; - description = "Primitive memory-related operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "primitive_0_6_4_0" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "primitive"; @@ -164686,7 +170673,6 @@ self: { libraryHaskellDepends = [ base ghc-prim transformers ]; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive-checked" = callPackage @@ -164698,7 +170684,6 @@ self: { libraryHaskellDepends = [ base primitive ]; description = "primitive functions with bounds-checking"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive-containers" = callPackage @@ -164709,8 +170694,8 @@ self: { }: mkDerivation { pname = "primitive-containers"; - version = "0.3.0"; - sha256 = "0yk7gqngdkm3s3pmmzbvrjd52hiqjn0gg2j60iw7wnaalagcap6x"; + version = "0.3.1"; + sha256 = "0ikpnci6lk6nmalyr5kkqwrr12kpclr8ka001hlz0mcy8rrxncq3"; libraryHaskellDepends = [ aeson base contiguous deepseq hashable primitive primitive-sort quantification text unordered-containers vector @@ -164735,8 +170720,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.7.0.2"; - sha256 = "01xjis2y8gpa1f45g3nf9lminy3yhbsb10fzhk23z5n8205jh77d"; + version = "0.7.1"; + sha256 = "1xfvp63qi21iiz1905l61726vp2nnx3sffpphwf53j8yn193c33n"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive profunctors vector @@ -164747,7 +170732,6 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive-indexed" = callPackage @@ -164763,13 +170747,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.1"; + sha256 = "1sclcw9shl88sbc5nrr4m43mkhxm9j3jw0cc497n9fhi6x46kjw2"; 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; @@ -164809,7 +170798,6 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primula-board" = callPackage @@ -165100,16 +171088,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"; @@ -165434,6 +171420,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 { @@ -165505,6 +171504,7 @@ self: { ]; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "profunctor-extras" = callPackage @@ -165519,25 +171519,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "profunctors" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, comonad - , contravariant, distributive, semigroups, tagged, transformers + "profunctor-monad" = callPackage + ({ mkDerivation, base, constraints, hashable, mtl, profunctors + , transformers, unordered-containers }: mkDerivation { - pname = "profunctors"; - version = "5.2.2"; - sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9"; - revision = "2"; - editedCabalFile = "1ywlg9z8nlhd2avgb8c6gbkv8zyk7hvc25926bafyg0m0k8y1amq"; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad contravariant distributive - semigroups tagged transformers + pname = "profunctor-monad"; + version = "0.1.0.0"; + sha256 = "15lz4mbf7jcg19gn0hh9q58713p26hvbm5q0sa4baxrwk9n3rghs"; + libraryHaskellDepends = [ base constraints profunctors ]; + testHaskellDepends = [ + base hashable mtl transformers unordered-containers ]; - description = "Profunctors"; - license = stdenv.lib.licenses.bsd3; + description = "Monadic bidirectional programming"; + license = stdenv.lib.licenses.mit; }) {}; - "profunctors_5_3" = callPackage + "profunctors" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, semigroups, tagged, transformers }: @@ -165551,7 +171549,6 @@ self: { ]; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "progress" = callPackage @@ -165665,16 +171662,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.6"; + sha256 = "0ajxsgzbscg45c1dzhqassnga9k3i22f2l2w5kciina5q43ihla4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165686,10 +171683,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 @@ -165734,6 +171731,8 @@ self: { pname = "project-template"; version = "0.2.0.1"; sha256 = "1p69ww4rhah2qxragl615wl4a6mk4x9w09am8knmz3s4lxpljlpb"; + revision = "1"; + editedCabalFile = "0lq3sqnq0nr0gbvgzp0lqdl3j3mqdmdlf8xsw0j3pjh581xj3k0a"; libraryHaskellDepends = [ base base64-bytestring bytestring conduit conduit-extra containers directory filepath mtl resourcet text transformers @@ -165797,8 +171796,8 @@ self: { }: mkDerivation { pname = "prolog"; - version = "0.2.0.1"; - sha256 = "073sd3rhcfqw9csm0qsbc57ix57dv3k5yjr9hcc33b9zq5y10sp0"; + version = "0.3"; + sha256 = "02i79irax13rny953k6fvswsgbif9nnvysnnbq3k4w37b3g5maiv"; libraryHaskellDepends = [ base containers mtl parsec syb template-haskell th-lift transformers @@ -165830,8 +171829,8 @@ self: { ({ mkDerivation, base, fgl, graphviz, mtl, prolog, text }: mkDerivation { pname = "prolog-graph-lib"; - version = "0.2.0.1"; - sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr"; + version = "0.2.1.1"; + sha256 = "1qxikgryyh47zm0qwbsa7lpqmiphbl1askjjjc0rfr9dh5f0wclr"; libraryHaskellDepends = [ base fgl graphviz mtl prolog text ]; description = "Generating images of resolution trees for Prolog queries"; license = stdenv.lib.licenses.publicDomain; @@ -165849,8 +171848,8 @@ self: { }: mkDerivation { pname = "prologue"; - version = "3.2.4"; - sha256 = "0smh3g9k2l4ic9gh1i7aq541nnacipvvc9c0v04xq5rk0rzrswmv"; + version = "3.2.6"; + sha256 = "0xic2d3b7ya0qrb8r4q0v6f9zgbh7sw0l7rpbmz09i8pkx7bj90y"; libraryHaskellDepends = [ base bifunctors binary comonad cond container convert data-default deepseq deriving-compat either errors exceptions functor-utils @@ -165870,41 +171869,18 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "2.1.0"; - sha256 = "0kpzfmdibpp08rhc8v92nizi8hbb9dm7ysqd0wclx9s5273zqxal"; + version = "2.1.1"; + sha256 = "09g3xi6x6m6h15p3ibwyabfq15rhcaphq7ix2w23aphjwc64ll97"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-client http-types network-uri text transformers wai warp ]; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-client" = callPackage - ({ mkDerivation, atomic-primops, base, bytestring, clock - , containers, criterion, doctest, hspec, mtl, QuickCheck, random - , random-shuffle, stm, transformers, utf8-string - }: - mkDerivation { - pname = "prometheus-client"; - version = "0.3.0"; - sha256 = "0nyh90ixf4g54q8qy315fv310rn0sw6rypkj37876isdhq5w8a2z"; - libraryHaskellDepends = [ - atomic-primops base bytestring clock containers mtl stm - transformers utf8-string - ]; - testHaskellDepends = [ - atomic-primops base bytestring clock containers doctest hspec mtl - QuickCheck random-shuffle stm transformers utf8-string - ]; - benchmarkHaskellDepends = [ - base bytestring criterion random utf8-string - ]; - description = "Haskell client library for http://prometheus.io."; - license = stdenv.lib.licenses.asl20; - }) {}; - - "prometheus-client_1_0_0" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, clock , containers, criterion, deepseq, doctest, exceptions, hspec, mtl , QuickCheck, random, random-shuffle, stm, text, transformers @@ -165928,7 +171904,6 @@ self: { ]; description = "Haskell client library for http://prometheus.io."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prometheus-effect" = callPackage @@ -165973,7 +171948,21 @@ self: { testHaskellDepends = [ base doctest prometheus-client ]; description = "Metrics exposing GHC runtime information for use with prometheus-client"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "prometheus-proc" = callPackage + ({ mkDerivation, base, filepath, prometheus-client + , regex-applicative, unix, unix-memory + }: + mkDerivation { + pname = "prometheus-proc"; + version = "0.1.0.0"; + sha256 = "1384kcsnhby17ivjlii2ixqw1qhas6y4l1h8vq3lzaxqydbidhbm"; + libraryHaskellDepends = [ + base filepath prometheus-client regex-applicative unix unix-memory + ]; + description = "Export metrics from /proc for the current process"; + license = stdenv.lib.licenses.bsd3; }) {}; "promise" = callPackage @@ -166028,6 +172017,7 @@ self: { ]; description = "A library for interfacing with the CMU Pronouncing Dictionary"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proof-combinators" = callPackage @@ -166066,8 +172056,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.4.1"; - sha256 = "13adj770k3awgsdipjkwgfja6b1hkxdphf0aa4jayxm2jz9gkpbd"; + version = "5.6.1"; + sha256 = "1wbh9vc0jkdqsrqfnxvz2498awqkr0jph9qv6c0zwbqm7zbjzn04"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166078,6 +172068,7 @@ self: { executableHaskellDepends = [ base ]; description = "property-based host configuration management in haskell"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "properties" = callPackage @@ -166152,7 +172143,6 @@ self: { ]; description = "Explore continuations with trepidation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prosper" = callPackage @@ -166177,8 +172167,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 ]; @@ -166188,6 +172178,46 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libpulseaudio;}; + "proteome" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , data-default-class, deepseq, directory, either, filepath + , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs + , pretty-terminal, prettyprinter, process, resourcet, ribosome + , safe, split, stm, strings, text, time, transformers, unliftio + , utf8-string + }: + mkDerivation { + pname = "proteome"; + version = "0.3.17.0"; + sha256 = "1v0pk4mh8r56lmpxmc91h93rwm81d488qy5k648v1qfmj0qmgl25"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring containers data-default-class + deepseq directory either filepath hslogger lens messagepack + MissingH mtl nvim-hs pretty-terminal prettyprinter process + resourcet ribosome safe split stm strings text time transformers + unliftio utf8-string + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring containers data-default-class + deepseq directory either filepath hslogger lens messagepack + MissingH mtl nvim-hs pretty-terminal prettyprinter process + resourcet ribosome safe split stm strings text time transformers + unliftio utf8-string + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring containers data-default-class + deepseq directory either filepath hslogger HTF lens messagepack + MissingH mtl nvim-hs pretty-terminal prettyprinter process + resourcet ribosome safe split stm strings text time transformers + unliftio utf8-string + ]; + description = "neovim project manager"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens_0_2_2_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, lens-family, parsec, pretty, text @@ -166207,32 +172237,14 @@ self: { }) {}; "proto-lens" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, deepseq, lens-family, lens-labels, parsec - , pretty, text, transformers, void - }: - mkDerivation { - pname = "proto-lens"; - version = "0.3.1.0"; - sha256 = "1awlp7101vhqf2hhz3h93mf38lyyfx5ay3gvrdna0k3msykimgw7"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers data-default-class deepseq - lens-family lens-labels parsec pretty text transformers void - ]; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens_0_4_0_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq , lens-family, lens-labels, parsec, pretty, text, transformers , void }: mkDerivation { pname = "proto-lens"; - version = "0.4.0.0"; - sha256 = "1yj86mnjc3509ad9g19fr9fdkblwfyilb5ydv1isn6xs7llq3c3r"; + version = "0.4.0.1"; + sha256 = "1ryz183ds1k28nvw6y1w84k29aq5mgrpv5yyqarj0g463gp137cm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq lens-family @@ -166240,7 +172252,6 @@ self: { ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage @@ -166249,8 +172260,8 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.2.2"; - sha256 = "128r7g82yx4rs38yd9s4bwcpyiqm5yr4lyci3z88bhqsvkn4438i"; + version = "0.1.2.5"; + sha256 = "13cd9r9r2g913p3d3m7ljgv97wsdlr0v6js1r7k2w6npclgj13hd"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -166258,53 +172269,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "proto-lens-arbitrary_0_1_2_3" = callPackage - ({ mkDerivation, base, bytestring, containers, lens-family - , proto-lens, QuickCheck, text - }: - mkDerivation { - pname = "proto-lens-arbitrary"; - version = "0.1.2.3"; - sha256 = "0ljr6iyqrdlfay0yd2j6q2wm5k79wnn4ay4kbmzmw2fdy0p73gyn"; - 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; - }) {}; - "proto-lens-combinators" = callPackage - ({ mkDerivation, base, Cabal, data-default-class, HUnit - , lens-family, lens-family-core, proto-lens, proto-lens-protoc - , test-framework, test-framework-hunit, transformers - }: - mkDerivation { - pname = "proto-lens-combinators"; - version = "0.1.0.11"; - sha256 = "1i2rbvhdvglqg6b4iwr5a0pk7iq78nap491bqg77y4dwd45ipcpb"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; - libraryHaskellDepends = [ - base data-default-class lens-family proto-lens-protoc transformers - ]; - testHaskellDepends = [ - base HUnit lens-family lens-family-core proto-lens - proto-lens-protoc test-framework test-framework-hunit - ]; - description = "Utilities functions to proto-lens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens-combinators_0_4" = 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.4"; - sha256 = "1fc98ynjx0b9x4v56pzkf3h9y46a583aw3lf7l9ij4ck87y83q6b"; + version = "0.4.0.1"; + sha256 = "0dkd9jmmxf5r01di3q1r0qnyhkyxrjlnfxa40c2vq0fl16h68lkb"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ base lens-family proto-lens transformers @@ -166339,27 +172312,13 @@ self: { ({ 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; - }) {}; - - "proto-lens-optparse_0_1_1_3" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; - version = "0.1.1.3"; - sha256 = "0dciwsc1qa9iisym5702a0kjwfiikqgfijdzpf21q2aiffagkacd"; + version = "0.1.1.4"; + sha256 = "1dn5cjwbagcykh1fv99v6mmj7mlnl46nqlwpz1878fy7vl7i8lzh"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-protobuf-types_0_2_2_0" = callPackage @@ -166381,30 +172340,13 @@ self: { }) {inherit (pkgs) protobuf;}; "proto-lens-protobuf-types" = callPackage - ({ mkDerivation, base, Cabal, lens-family, proto-lens - , proto-lens-protoc, protobuf, text - }: - mkDerivation { - pname = "proto-lens-protobuf-types"; - version = "0.3.0.1"; - sha256 = "0630yl73s11dnfripbz5pa25mzpsnjzd278qcm5yiy6zmcz0a6ca"; - setupHaskellDepends = [ base Cabal proto-lens-protoc ]; - libraryHaskellDepends = [ - base lens-family proto-lens proto-lens-protoc text - ]; - libraryToolDepends = [ protobuf ]; - description = "Basic protocol buffer message types"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protobuf-types_0_4_0_0" = callPackage ({ mkDerivation, base, Cabal, lens-labels, proto-lens , proto-lens-runtime, proto-lens-setup, protobuf, text }: mkDerivation { pname = "proto-lens-protobuf-types"; - version = "0.4.0.0"; - sha256 = "1h2ss8nn569g97cvq3lflgcc6sz3k9y3gx0ini69d1lrkccd8jmg"; + version = "0.4.0.1"; + sha256 = "091284pyp4b36hnvfjsrsg6zlgw1payzwfbsy66sgbbi285mwira"; setupHaskellDepends = [ base Cabal proto-lens-setup ]; libraryHaskellDepends = [ base lens-labels proto-lens proto-lens-runtime text @@ -166412,7 +172354,6 @@ self: { libraryToolDepends = [ protobuf ]; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-protoc_0_2_2_3" = callPackage @@ -166443,39 +172384,13 @@ 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, temporary, text - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.3.1.2"; - sha256 = "15qypl2z5mccmxhq2bl86frzdalpcnsjiw6vypvnr6gxlr7mwhm7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers data-default-class deepseq - directory filepath haskell-src-exts lens-family lens-labels pretty - process proto-lens temporary 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_4_0_0" = 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.0"; - sha256 = "1w22278jjcyj9z4lwpkxws9v97maqrwacmd5d0pl8d2byh8jqry8"; + version = "0.4.0.2"; + sha256 = "1kvbv7c42qcynh25mh1vzwdzk4fhvjai031hwmsrmpqywgbgknmm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166488,7 +172403,6 @@ self: { ]; 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 @@ -166497,8 +172411,8 @@ self: { }: mkDerivation { pname = "proto-lens-runtime"; - version = "0.4.0.1"; - sha256 = "0kyd2y4jhzb0isclk5gw98c4n49kjnl27rlywmajmbfwf2d6w4yc"; + version = "0.4.0.2"; + sha256 = "1k6biy5z890nn5b76sd3xr086sbrqr09rx1r2a7jxra2l2ymc4sr"; libraryHaskellDepends = [ base bytestring containers deepseq filepath lens-family lens-labels proto-lens text @@ -166513,8 +172427,8 @@ self: { }: mkDerivation { pname = "proto-lens-setup"; - version = "0.4.0.0"; - sha256 = "0j0a2jq9axq8v4h918lnrvjg0zyb0gvr5v3x9c6lajv8fb8bxmlf"; + version = "0.4.0.1"; + sha256 = "1x8lj5z2ih20757m0di0lg4kn3s3g90qpjpv5wkzj2xf097cwqjp"; libraryHaskellDepends = [ base bytestring Cabal containers deepseq directory filepath process proto-lens-protoc temporary text @@ -166569,31 +172483,6 @@ self: { }) {}; "protobuf-simple" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, directory, filepath, hspec, mtl, parsec - , QuickCheck, quickcheck-instances, split, text - }: - mkDerivation { - pname = "protobuf-simple"; - version = "0.1.0.5"; - sha256 = "1w8nx700pyq0r909akyihcajsx5pgj76f2nfvwabib2fy4kv8ikb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 mtl text - ]; - executableHaskellDepends = [ - base containers directory filepath mtl parsec split text - ]; - testHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 filepath - hspec parsec QuickCheck quickcheck-instances split text - ]; - description = "Simple Protocol Buffers library (proto2)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "protobuf-simple_0_1_1_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, directory, filepath, hspec, mtl, parsec , QuickCheck, quickcheck-instances, split, text @@ -166616,20 +172505,20 @@ self: { ]; description = "Simple Protocol Buffers library (proto2)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string + ({ 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.11"; - sha256 = "1s41iprw4w6g56phrgali2b59isn2s67nzfwr38yfgib3lm4kjs7"; + version = "2.4.12"; + sha256 = "0z1vkqdhj41bqnjhks4d82jby6l9j91k8ycna76bhv9p2w0gvp4g"; libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string + 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; @@ -166639,8 +172528,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.11"; - sha256 = "06k8sz0i021mizdgh01rx7v08wc767njwppimgmm2hyg6k4bv450"; + version = "2.4.12"; + sha256 = "0h4c1pgl51h7xrsm76mz6wd1l41ps93y3nvdl0p7mks9w7wlpccn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -166723,8 +172612,8 @@ self: { }: mkDerivation { pname = "protolude"; - version = "0.2.2"; - sha256 = "0z251xxv8rhds981acdf6dr34ac2kc062mbq9gl2nj339grhqpb8"; + version = "0.2.3"; + sha256 = "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj"; libraryHaskellDepends = [ array async base bytestring containers deepseq ghc-prim hashable mtl mtl-compat stm text transformers transformers-compat @@ -166776,6 +172665,7 @@ self: { libraryHaskellDepends = [ base monads-tf ]; description = "prototype-based programming on Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prove-everywhere-server" = callPackage @@ -166883,10 +172773,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 @@ -166956,8 +172844,10 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.7.0"; - sha256 = "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc"; + version = "0.2.7.1"; + sha256 = "1hcfxb977lzxsmd47z0snjj4xdhiwnqzif8xkpwzw28dspn44zh4"; + revision = "1"; + editedCabalFile = "0336d9ckixv4n23vy5l3xk0wavfn3z9xk105gig0zv70b3jh3r3y"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged @@ -167046,23 +172936,8 @@ self: { }: mkDerivation { pname = "publicsuffix"; - version = "0.20180513"; - sha256 = "0wq9hz1z924a5pk17zyaf9nyz5z5fyrlf806rypdxnpvi4q1j7xm"; - libraryHaskellDepends = [ base filepath template-haskell ]; - testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion random ]; - description = "The publicsuffix list exposed as proper Haskell types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "publicsuffix_0_20180825" = callPackage - ({ mkDerivation, base, criterion, filepath, hspec, random - , template-haskell - }: - mkDerivation { - pname = "publicsuffix"; - version = "0.20180825"; - sha256 = "0wyni1f9v647zb7hg70da4s30dplv6whywd0jwghph1vqdlzlbma"; + version = "0.20190115"; + sha256 = "1w73kpqb8s6yc7h66cam89gcmz6qnsgis2fqvyr9vrqs466k3j01"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion random ]; @@ -167108,6 +172983,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "publish" = callPackage + ({ mkDerivation, base, bytestring, chronologique, directory + , filepath, hinotify, pandoc, pandoc-types, template-haskell, text + , typed-process, unbeliever, unix, unordered-containers + }: + mkDerivation { + pname = "publish"; + version = "0.3.2"; + sha256 = "1jkmp5wsd8ffrxvj965z9pch5g8vxkfwv70hxa3lipdh46k6ll7l"; + revision = "1"; + editedCabalFile = "136hi1c3ap2dvhn79dqdn29dfq5ncilg6qap41d0wf4jp7p419a8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring chronologique directory filepath hinotify pandoc + pandoc-types template-haskell text typed-process unbeliever unix + unordered-containers + ]; + description = "Publishing tools for papers, books, and presentations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pubnub" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , Cabal, cipher-aes, conduit, conduit-extra, crypto-api @@ -167440,6 +173337,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 @@ -167485,59 +173397,88 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "purebred-email" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring + , case-insensitive, concise, deepseq, lens, QuickCheck + , quickcheck-instances, semigroupoids, semigroups, stringsearch + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "purebred-email"; + version = "0.1.0.0"; + sha256 = "01r6pzv0c49lk2z68jz6z9fppdhdjyg7igl6ji44w1rmgpiaircj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring bytestring case-insensitive + concise deepseq lens semigroupoids semigroups stringsearch text + time + ]; + testHaskellDepends = [ + attoparsec base bytestring case-insensitive lens QuickCheck + quickcheck-instances semigroups tasty tasty-golden tasty-hunit + tasty-quickcheck text time + ]; + description = "types and parser for email messages (including MIME)"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "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.2"; + sha256 = "1y7bcfj6fdlwmisdd75xcdkz7grch0pcmb9xsh6zwyvi6c40a3g2"; 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; @@ -167588,28 +173529,29 @@ self: { , attoparsec, attoparsec-uri, base, bytestring, containers, deepseq , emailaddress, monad-control, mtl, QuickCheck , quickcheck-instances, scientific, stm, strict, tasty - , tasty-quickcheck, text, time, utf8-string, uuid, zeromq4-haskell - , zeromq4-simple + , tasty-quickcheck, text, time, utf8-string, uuid, vector + , zeromq4-haskell, zeromq4-simple }: mkDerivation { pname = "purescript-iso"; - version = "0.0.3"; - sha256 = "15y761jk2r95gdkv85p7ij9npf3a6dlsyidf8y8djzk3m7j8ya2g"; + version = "0.0.6"; + sha256 = "0zz71c8mv86ihqwcqsp0cjw9dlyd0xw394dz14mwg16frajn986k"; libraryHaskellDepends = [ aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri base bytestring containers deepseq emailaddress monad-control mtl QuickCheck quickcheck-instances scientific stm strict text time - utf8-string uuid zeromq4-haskell zeromq4-simple + utf8-string uuid vector zeromq4-haskell zeromq4-simple ]; testHaskellDepends = [ aeson aeson-attoparsec aeson-diff async attoparsec attoparsec-uri base bytestring containers deepseq emailaddress monad-control mtl QuickCheck quickcheck-instances scientific stm strict tasty - tasty-quickcheck text time utf8-string uuid zeromq4-haskell + 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 @@ -167677,24 +173619,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.2.0.0"; + sha256 = "0lkdjpgd04b7jxcrqvn395bhdac0ms0jbxdigd1xpvj6d9w7f9x3"; 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; }) {}; @@ -167795,8 +173738,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.1.5"; - sha256 = "0bidqvyx5ss3zgw2ypbwnii1vqfqp0kwyf31h53pvza7c3xrpq4x"; + version = "1.5.1.7"; + sha256 = "01p168y4hwn38b4lpf3pi7pv5w46pd8gmli42q7bs3jxd6jhhppc"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-types memory text time transformers @@ -167923,6 +173866,7 @@ self: { ]; description = "Creating graphics for pencil puzzles"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "puzzle-draw-cmdline" = callPackage @@ -168260,8 +174204,8 @@ self: { }: mkDerivation { pname = "qnap-decrypt"; - version = "0.3.2"; - sha256 = "1qq1cpnn7bg3nb3ig86wcc6xvjyljckjd1bgivh1sfhxh8p0p4ys"; + version = "0.3.4"; + sha256 = "0s263zkdns50bvanjiaiavdk6bpd1ccqbckdmxwbbl2sxp2s3jxz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -168302,8 +174246,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 @@ -168347,6 +174291,49 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "qrcode-core" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers, dlist, primitive, text, vector + }: + mkDerivation { + pname = "qrcode-core"; + version = "0.8.0"; + sha256 = "1rfrigh6ny305d3xq33cbpjjnhk0bsc2m00ic0y27jvyz73k8k43"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive containers dlist primitive + text vector + ]; + description = "QR code library in pure Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + + "qrcode-juicypixels" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels + , qrcode-core, text, vector + }: + mkDerivation { + pname = "qrcode-juicypixels"; + version = "0.8.0"; + sha256 = "14cjf8gykh22ps5i8sh5im2m4sq81kgz4cdxmqyc9rpidqh763wk"; + libraryHaskellDepends = [ + base base64-bytestring bytestring JuicyPixels qrcode-core text + vector + ]; + description = "Converts a qrcode-core image to JuicyPixels"; + license = stdenv.lib.licenses.mit; + }) {}; + + "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 @@ -168464,6 +174451,8 @@ self: { pname = "quadratic-irrational"; version = "0.0.6"; sha256 = "02hdxi9kjp7dccmb7ix3a0yqr7fvl2vpc588ibxq6gjd5v3716r0"; + revision = "1"; + editedCabalFile = "0i7dsl7zm9r7sgfs2cwmic3qbk15lc7kbhjd53vin89p21fh8mzm"; libraryHaskellDepends = [ arithmoi base containers mtl transformers ]; @@ -168521,6 +174510,8 @@ self: { pname = "quantification"; version = "0.5.0"; sha256 = "0ls8rhy0idrgj9dnd5ajjfi55bhz4qsyncj3ghw3nyrbr0q7j0bk"; + revision = "1"; + editedCabalFile = "0fn5ixppdyw4niyyf9iasvrbnaimjhwwi7di4l13bfylnmriliw9"; libraryHaskellDepends = [ aeson base binary containers ghc-prim hashable path-pieces text unordered-containers vector @@ -168897,66 +174888,50 @@ self: { }) {}; "quickcheck-classes" = callPackage - ({ mkDerivation, aeson, base, bifunctors, containers, primitive - , QuickCheck, semigroupoids, semigroups, semirings, tagged - , transformers, vector + ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers + , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings + , tagged, tasty, tasty-quickcheck, transformers, vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.14.1"; - sha256 = "0qk7nx855lrb9z1nkc74dshsij6p704rmggx0f9akwcpscsvhiim"; - revision = "1"; - editedCabalFile = "1jsqd19gwd5hizqlabk0haly9slri4m7bhj32vqvi0lk4mync94l"; + version = "0.6.1.0"; + sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h"; libraryHaskellDepends = [ - aeson base bifunctors containers primitive QuickCheck semigroupoids - semigroups semirings tagged transformers + aeson base base-orphans bifunctors containers fail primitive + QuickCheck semigroupoids semigroups semirings tagged transformers + vector ]; testHaskellDepends = [ - aeson base containers primitive QuickCheck semigroupoids tagged - transformers vector + aeson base base-orphans containers primitive QuickCheck + semigroupoids tagged tasty tasty-quickcheck transformers vector ]; description = "QuickCheck common typeclasses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage ({ 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-instances" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring - , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, tagged, text, time, transformers, transformers-compat - , unordered-containers, uuid-types, vector - }: + "quickcheck-enum-instances" = callPackage + ({ mkDerivation, base, enum-types, QuickCheck }: mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.18"; - sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55"; - revision = "2"; - editedCabalFile = "02mhzd7dkhmbd8ljm114j7ixp1lcllblz3zfkz0i7n976rac86w7"; - libraryHaskellDepends = [ - array base base-compat bytestring case-insensitive containers - hashable old-time QuickCheck scientific tagged text time - transformers transformers-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - base containers QuickCheck tagged uuid-types - ]; - description = "Common quickcheck instances"; + 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_0_3_19" = callPackage + "quickcheck-instances" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck , scientific, tagged, text, time, transformers, transformers-compat @@ -168977,7 +174952,6 @@ self: { ]; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -169153,8 +175127,8 @@ self: { }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.4.2"; - sha256 = "1sa243hysdnlv8326jnbnmmlkbxhxmbhfssya5qx925x56qhd2d3"; + version = "0.4.3"; + sha256 = "0f9hsjhrnab8gy51m4m1fn5i594ixx1qw14hsfwsakbn8f78aarx"; libraryHaskellDepends = [ ansi-wl-pprint base containers exceptions lifted-async matrix monad-control mtl pretty-show QuickCheck split stm tree-diff vector @@ -169172,6 +175146,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quickcheck-state-machine_0_6_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , directory, doctest, exceptions, filelock, filepath, http-client + , matrix, monad-logger, mtl, network, persistent + , persistent-postgresql, persistent-template, pretty-show, process + , QuickCheck, quickcheck-instances, random, resourcet, servant + , servant-client, servant-server, strict, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, text, tree-diff, unliftio, vector + , wai, warp + }: + mkDerivation { + pname = "quickcheck-state-machine"; + version = "0.6.0"; + sha256 = "0zbjap2jjd534w6cigi4xz34x3f6w8icvxyvxs35j61c52cp2pry"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers exceptions matrix mtl pretty-show + QuickCheck tree-diff unliftio vector + ]; + testHaskellDepends = [ + base bytestring containers directory doctest filelock filepath + http-client matrix monad-logger mtl network persistent + persistent-postgresql persistent-template pretty-show process + QuickCheck quickcheck-instances random resourcet servant + servant-client servant-server strict string-conversions tasty + tasty-hunit tasty-quickcheck text tree-diff unliftio vector wai + warp + ]; + description = "Test monadic programs using state machine based models"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-state-machine-distributed" = callPackage ({ mkDerivation, base, binary, containers, directory , distributed-process, mtl, network-transport @@ -169210,6 +175216,7 @@ self: { ]; description = "Helper to build generators with Text.StringRandom"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-text" = callPackage @@ -169224,6 +175231,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quickcheck-transformer" = callPackage + ({ mkDerivation, base, QuickCheck, random, transformers }: + mkDerivation { + pname = "quickcheck-transformer"; + version = "0.3"; + sha256 = "1lj6w1ywy8bixiwvapgb7ng5yy0nrxgvr8y9dn4kl3yvah936k4j"; + libraryHaskellDepends = [ base QuickCheck random transformers ]; + description = "A GenT monad transformer for QuickCheck library"; + license = stdenv.lib.licenses.mit; + }) {}; + "quickcheck-unicode" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -169720,6 +175738,7 @@ self: { testHaskellDepends = [ base HUnit lens ]; description = "Isomorphisms for measurements that use radians"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "radium" = callPackage @@ -169761,8 +175780,10 @@ self: { }: mkDerivation { pname = "radius"; - version = "0.5.0.2"; - sha256 = "08y57j4235ajkf3z05p8lcixgr2x1m6mih5l0bfic4gxfvs818wc"; + version = "0.6.0.1"; + sha256 = "19c2bv0iq4j0709rf9k9jk5q2s756bvjnr1gy630mcgp92rg8d9j"; + revision = "1"; + editedCabalFile = "1a4q1kz21v2m4wfdfaawdlkfnq9s8c5iijzcrdprrgsbi3kplrdi"; libraryHaskellDepends = [ base binary bytestring cryptonite iproute memory ]; @@ -170011,6 +176032,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "distributed-process node"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rakhana" = callPackage @@ -170052,20 +176074,20 @@ self: { ]; description = "The Rakuten API in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ralist" = callPackage ({ 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 ]; description = "Random access list with a list compatible interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rallod" = callPackage @@ -170154,6 +176176,7 @@ self: { ]; description = "Easy-to-use randomness for livecoding"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "random" = callPackage @@ -170190,6 +176213,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 @@ -170485,7 +176510,6 @@ self: { ]; description = "An efficient and versatile range library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "range-set-list" = callPackage @@ -170496,12 +176520,15 @@ 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 ]; description = "Memory efficient sets with ranges of elements"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "range-space" = callPackage @@ -170549,12 +176576,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; }) {}; @@ -170575,6 +176609,7 @@ self: { ]; description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rank2classes" = callPackage @@ -170583,8 +176618,8 @@ self: { }: mkDerivation { pname = "rank2classes"; - version = "1.1.0.1"; - sha256 = "1iw2xanyv7rw995sy3c0dvkjl3js4bd7n2hz0x509pkz8hzsa93w"; + version = "1.2.1"; + sha256 = "0dbg5hc8vy0nikyw9h99d9z5jpwfzqb3jwg1li5h281fi5cm4nb0"; libraryHaskellDepends = [ base distributive template-haskell transformers ]; @@ -170860,10 +176895,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 = [ @@ -170877,15 +176910,16 @@ self: { ]; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rate-limit" = callPackage ({ 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; @@ -170898,8 +176932,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.5"; - sha256 = "0an55fbl8q7d0h4zlpx8vg4kijwmw99f2fvf50nq06c6snlfjg4r"; + version = "1.0.8"; + sha256 = "045hr0jilydb1xcvhh9q5iwazpf1k1d2q1y0h4gkgnbn6qmgwhnk"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -170918,8 +176952,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.0.3"; - sha256 = "0bkk41qk0040a6sbsc5ky968gw1y5501ji7l2040hwz8j4z8wm84"; + version = "1.0.5"; + sha256 = "07k2gzc2by6zhsk1zqp0kjk37zc6ikigdp0j5d38pd7x30a7qk7x"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -170951,13 +176985,14 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, containers, filepath, http-client, http-client-tls - , HUnit, template-haskell, temporary, text, transformers + , bytestring, clock, containers, filepath, http-client + , http-client-tls, HUnit, template-haskell, temporary, text + , transformers }: mkDerivation { pname = "rattletrap"; - version = "4.1.2"; - sha256 = "0zmacxdf1k5mnvmrrkkvgjghzr4h948z5g73lavhmfg56i6vpkb2"; + version = "6.0.2"; + sha256 = "1904g1s61zazhg6zn189m7y9v5aap39zd0gfypzd9jrk6489aqi1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170971,23 +177006,25 @@ self: { transformers ]; testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls HUnit template-haskell - temporary text transformers + 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; }) {}; - "rattletrap_6_0_1" = callPackage + "rattletrap_6_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, containers, filepath, http-client, http-client-tls - , HUnit, template-haskell, temporary, text, transformers + , bytestring, clock, containers, filepath, http-client + , http-client-tls, HUnit, template-haskell, temporary, text + , transformers }: mkDerivation { pname = "rattletrap"; - version = "6.0.1"; - sha256 = "1chpivz9iprnj5p3kbqsgpviqg5d3dx41596ki1dydm1wmpn3bcj"; + version = "6.2.1"; + sha256 = "0pygwgq5q6mvpbkis2xiw6ac65fn8q9452qql5dc21p4mi27bwka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171001,9 +177038,9 @@ self: { transformers ]; testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls HUnit template-haskell - temporary text transformers + 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; @@ -171261,6 +177298,7 @@ self: { ]; description = "Read-Copy-Update for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rdf" = callPackage @@ -171279,6 +177317,7 @@ self: { ]; description = "Representation and Incremental Processing of RDF Data"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rdf4h" = callPackage @@ -171359,8 +177398,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, re2, vector }: mkDerivation { pname = "re2"; - version = "0.2"; - sha256 = "0qfmiwy4kc87a736fpzh4cscvldiywq641gb9kvn4hc3sq7dh1k9"; + version = "0.3"; + sha256 = "0slrbgpqccnxywy0aqlg65w6kzvfiqsf0n273m8cv3c32wvkw8nb"; libraryHaskellDepends = [ base bytestring vector ]; librarySystemDepends = [ re2 ]; testHaskellDepends = [ base bytestring HUnit vector ]; @@ -171509,8 +177548,8 @@ self: { }: mkDerivation { pname = "reactive-banana"; - version = "1.2.0.0"; - sha256 = "1bwzkpackjpzk2igmlahr2qhgacad62v48lam97g9q85zww70p29"; + version = "1.2.1.0"; + sha256 = "18vm9zxr59s8n5bmqx3pg8jbaay6vlz1icnf9p1vnq8bvsb6svyc"; libraryHaskellDepends = [ base containers hashable pqueue semigroups transformers unordered-containers vault @@ -171522,6 +177561,7 @@ self: { ]; description = "Library for functional reactive programming (FRP)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-automation" = callPackage @@ -171538,6 +177578,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "home (etc) automation using reactive-banana"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-bunch" = callPackage @@ -171570,6 +177611,7 @@ self: { testHaskellDepends = [ base ]; description = "Simple reactive programming with GTK GObject Introspection"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-banana-sdl" = callPackage @@ -171996,8 +178038,10 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.2.4"; - sha256 = "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya"; + 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 @@ -172064,19 +178108,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.1.3"; - sha256 = "0sb9gfwq6kvldywmwxni8kgd9vhkpk8xxhidldrj5cwf8a2ipwbx"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base extra filepath ]; - description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_1_4" = callPackage ({ mkDerivation, base, extra, filepath }: mkDerivation { pname = "record-dot-preprocessor"; @@ -172087,19 +178118,23 @@ self: { executableHaskellDepends = [ base extra filepath ]; description = "Preprocessor to allow record.field syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-encode" = callPackage - ({ mkDerivation, base, generics-sop, hspec, QuickCheck, vector }: + ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck + , vector + }: mkDerivation { pname = "record-encode"; - version = "0.2.2"; - sha256 = "1wdrvj2ilf5kqchfcfd3pnqgprc86fri7ajc5r0xqf6zc61s1fgk"; + version = "0.2.3"; + sha256 = "0xljdy3wfyirs3zwc1ij19w9520bc1n56cdigngfb9hs497d6jh3"; libraryHaskellDepends = [ base generics-sop vector ]; - testHaskellDepends = [ base generics-sop hspec QuickCheck vector ]; + testHaskellDepends = [ + base doctest generics-sop hspec QuickCheck vector + ]; description = "Generic encoding of records"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-gl" = callPackage @@ -172190,15 +178225,16 @@ self: { }: mkDerivation { pname = "records-sop"; - version = "0.1.0.1"; - sha256 = "1832cgh1ry1slj10ff2qpxr6ibbvii7z1hvvdcwhyj55c31zrhlc"; + 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 ]; description = "Record subtyping and record utilities with generics-sop"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "records-th" = callPackage @@ -172222,8 +178258,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "1.2.1.1"; - sha256 = "0dh50664y470281gjiwkmdz8abiwgqin9r1ymznldwm37c3jljv5"; + version = "2.2.2.0"; + sha256 = "1ij7yxh06zb7fjkba2ghq88kvhr1rw4jlc0miwqfl53f6ssvcklf"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for GHC"; license = stdenv.lib.licenses.bsd3; @@ -172235,17 +178271,35 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.0.3"; - sha256 = "17x0kjl3yqanx234mb838yy21gw4if6qgzpi5l0b17m8llvp086v"; + version = "5.1.1"; + sha256 = "0qw112jkl6jzy3wcyxvv5liv16mxiiqi5v5zyzazl9p8h2wy1rb0"; + libraryHaskellDepends = [ + base base-orphans comonad free template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; + description = "Representing common recursion patterns as higher-order functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "recursion-schemes_5_1_1_1" = callPackage + ({ mkDerivation, base, base-orphans, comonad, free, HUnit + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "recursion-schemes"; + version = "5.1.1.1"; + sha256 = "0f9f1x1vjdqk6bzgsiqv7z7fq955dlkca3m0l4sc2mnpds3b0cgj"; revision = "1"; - editedCabalFile = "0r0qwxa0yg6814w8zfdla3k25x971a7pdr06sqws7fz5zri8rrn8"; + editedCabalFile = "19sqa4v3knasdmfzwmal1pi0yfj3zllrdr6n1chjvy1b6fa5za7z"; libraryHaskellDepends = [ base base-orphans comonad free template-haskell th-abstraction transformers ]; testHaskellDepends = [ base HUnit template-haskell transformers ]; - description = "Generalized bananas, lenses and barbed wire"; + description = "Representing common recursion patterns as higher-order functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "recursion-schemes-ext" = callPackage @@ -172282,6 +178336,7 @@ self: { ]; description = "Count lines in files and display them hierarchically"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "recursors" = callPackage @@ -172297,6 +178352,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "red-black-record" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, profunctors + , sop-core, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "red-black-record"; + version = "1.1.0.0"; + sha256 = "12q3b44qcb8zp5m0zrbj88kigk00rm6ljrnpwd29wv1gdwzd15af"; + libraryHaskellDepends = [ base sop-core ]; + testHaskellDepends = [ + aeson base bytestring doctest profunctors sop-core tasty + tasty-hunit text + ]; + description = "Extensible records and variants indexed by a type-level Red-Black tree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "red-black-tree" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -172405,7 +178477,6 @@ self: { ]; description = "Yet another redis client"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "redis-job-queue" = callPackage @@ -172434,7 +178505,6 @@ self: { ]; description = "REdis Serialization Protocol (RESP) implementation"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "redis-simple" = callPackage @@ -172595,6 +178665,7 @@ self: { libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using functional dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ref-mtl" = callPackage @@ -172615,9 +178686,12 @@ self: { pname = "ref-tf"; version = "0.4.0.1"; sha256 = "03mywifasfvxlz7hy5bbq3i8zi3i99k5cb0kq38gndx4vk2j5dgw"; + revision = "1"; + editedCabalFile = "042nn6y3rbx9z88bkidy1ilp32grm6a1n0ny1wrzxdp46xi5r7in"; libraryHaskellDepends = [ base stm transformers ]; description = "A type class for monads with references using type families"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refact" = callPackage @@ -172705,15 +178779,15 @@ self: { }) {}; "refined" = callPackage - ({ mkDerivation, base, containers, exceptions, mtl, prettyprinter - , template-haskell, these, transformers + ({ mkDerivation, base, deepseq, exceptions, mtl, prettyprinter + , template-haskell, transformers }: mkDerivation { pname = "refined"; - version = "0.2.3.0"; - sha256 = "1xc4qg2xibf2j0k6dwjj2sp5s58cj4dwcri6zrn42460wxnvyjk6"; + version = "0.3.0.0"; + sha256 = "106gh7wv6nldgl8rw722n7cam59x34vnr2an6l9hkivfp4pgkkks"; libraryHaskellDepends = [ - base containers exceptions mtl prettyprinter template-haskell these + base deepseq exceptions mtl prettyprinter template-haskell transformers ]; description = "Refinement types with static and runtime checking"; @@ -172759,27 +178833,37 @@ self: { }) {}; "reflex" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq - , dependent-map, dependent-sum, exception-transformers - , haskell-src-exts, haskell-src-meta, MemoTrie, mtl, primitive - , ref-tf, semigroups, split, stm, syb, template-haskell, these - , transformers, transformers-compat + ({ mkDerivation, base, bifunctors, comonad, containers, criterion + , data-default, deepseq, dependent-map, dependent-sum, directory + , exception-transformers, filemanip, filepath, haskell-src-exts + , haskell-src-meta, hlint, lens, loch-th, MemoTrie, monad-control + , monoidal-containers, mtl, prim-uniq, primitive, process, random + , ref-tf, reflection, semigroupoids, semigroups, split, stm, syb + , template-haskell, these, time, transformers, transformers-compat + , unbounded-delays }: mkDerivation { pname = "reflex"; - version = "0.4.0.1"; - sha256 = "1v4wwy2qc1gb914w5nqjvf7gibdw9yakmhdg260yjxbv1fkg8gyc"; + version = "0.5"; + sha256 = "0c9idjkbnw822ky7dn374vq43kivdy0znf2k2w43q7yw7snjh09r"; + revision = "1"; + editedCabalFile = "1l5xsinln6wyj726ilqvvg4y0qk645j5ffiyhmda8qi9rmyk2a2x"; libraryHaskellDepends = [ - base containers dependent-map dependent-sum exception-transformers - haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups - syb template-haskell these transformers transformers-compat + base bifunctors comonad containers data-default dependent-map + dependent-sum exception-transformers haskell-src-exts + haskell-src-meta lens MemoTrie monad-control monoidal-containers + mtl prim-uniq primitive random ref-tf reflection semigroupoids + semigroups stm syb template-haskell these time transformers + transformers-compat unbounded-delays ]; testHaskellDepends = [ - base containers dependent-map MemoTrie mtl ref-tf + base bifunctors containers deepseq dependent-map dependent-sum + directory filemanip filepath hlint lens monoidal-containers mtl + ref-tf semigroups split these transformers ]; benchmarkHaskellDepends = [ - base containers criterion deepseq dependent-map dependent-sum mtl - primitive ref-tf split stm transformers + base containers criterion deepseq dependent-map dependent-sum + loch-th mtl primitive process ref-tf split stm time transformers ]; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; @@ -172804,25 +178888,17 @@ self: { }) {}; "reflex-dom" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, containers - , data-default, dependent-map, dependent-sum - , dependent-sum-template, directory, exception-transformers - , ghcjs-dom, glib, gtk3, lens, mtl, raw-strings-qq, ref-tf, reflex - , safe, semigroups, text, these, time, transformers, unix - , webkitgtk3, webkitgtk3-javascriptcore + ({ mkDerivation, base, bytestring, jsaddle-webkit2gtk, reflex + , reflex-dom-core, text }: mkDerivation { pname = "reflex-dom"; - version = "0.3"; - sha256 = "0fldnl2yamn24v0qnfr4hhy4q9nq6kxspiy39yk5kdfvxg8aqax5"; - revision = "2"; - editedCabalFile = "0mb0mi9czwaqp7vinc081j85gbdrmrgbx07nfdqs6wmcinqf4sdm"; + version = "0.4"; + sha256 = "0l559x7w1r1mz8j3ln6x0l2kkl1l494q8zm5gai0rcpz9r1nqn9z"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson base bifunctors bytestring containers data-default - dependent-map dependent-sum dependent-sum-template directory - exception-transformers ghcjs-dom glib gtk3 lens mtl raw-strings-qq - ref-tf reflex safe semigroups text these time transformers unix - webkitgtk3 webkitgtk3-javascriptcore + base bytestring jsaddle-webkit2gtk reflex reflex-dom-core text ]; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; @@ -172865,14 +178941,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reflex-dom-core" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder + , bytestring, constraints, containers, contravariant, data-default + , dependent-map, dependent-sum, dependent-sum-template, directory + , exception-transformers, ghcjs-dom, hlint, jsaddle, jsaddle-warp + , keycode, lens, linux-namespaces, monad-control, mtl, network-uri + , primitive, process, ref-tf, reflex, semigroups, stm + , template-haskell, temporary, text, these, transformers, unix + , zenc + }: + mkDerivation { + pname = "reflex-dom-core"; + version = "0.4"; + sha256 = "1p844d99zj3v54cn8ys12hbyan4f0y3nhgi42b03cq10az2pvsdv"; + libraryHaskellDepends = [ + aeson base bifunctors bimap blaze-builder bytestring constraints + containers contravariant data-default dependent-map dependent-sum + dependent-sum-template directory exception-transformers ghcjs-dom + jsaddle keycode lens monad-control mtl network-uri primitive ref-tf + reflex semigroups stm template-haskell text these transformers unix + zenc + ]; + testHaskellDepends = [ + base hlint jsaddle jsaddle-warp linux-namespaces process reflex + temporary unix + ]; + description = "Functional Reactive Web Apps with Reflex"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reflex-dom-fragment-shader-canvas" = callPackage ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens , reflex-dom, text, transformers }: mkDerivation { pname = "reflex-dom-fragment-shader-canvas"; - version = "0.1.0.1"; - sha256 = "17b023xjz29n673q4a5bd9r5bj8hb7b1q6ms6qppmwdimk3glz4z"; + version = "0.2"; + sha256 = "08ayk3y22mmgrpd03128h60wmg698d0c1cxack9akm636hp83y7z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173017,8 +179123,8 @@ self: { ({ mkDerivation, base, containers, mtl, semigroups, text }: mkDerivation { pname = "reform"; - version = "0.2.7.2"; - sha256 = "14as5chpwfrrqdfxk5g03f4zia0dx10npb802cphfq2j598mjczv"; + version = "0.2.7.3"; + sha256 = "18aqpbssm2cxjry567qc7ccvs0wy18gm292gjf5vgzl7gjk7k2n2"; libraryHaskellDepends = [ base containers mtl semigroups text ]; description = "reform is a type-safe HTML form generation and validation library"; license = stdenv.lib.licenses.bsd3; @@ -173152,8 +179258,8 @@ self: { }: mkDerivation { pname = "regex"; - version = "1.0.1.3"; - sha256 = "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb"; + version = "1.0.2.0"; + sha256 = "1f2z025hif1fr24b5khq3qxxyvpxrnhyx8xmbms332arw28rpkda"; libraryHaskellDepends = [ array base base-compat bytestring containers hashable regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text @@ -173162,7 +179268,6 @@ self: { ]; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-applicative" = callPackage @@ -173188,8 +179293,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; @@ -173304,8 +179409,8 @@ self: { }: mkDerivation { pname = "regex-examples"; - version = "1.0.1.3"; - sha256 = "0hmpq8w08n0vslnzqn6zsxp622dipg0ma42b4d47rjnv9ihl0jad"; + version = "1.0.2.0"; + sha256 = "0qpf4b2zxdlih1smlhybs923n2gjaxhx8i1rgjw6v7ng13vnriiy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173326,6 +179431,24 @@ self: { ]; description = "Tutorial, tests and example programs for regex"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -173591,8 +179714,8 @@ self: { }: mkDerivation { pname = "regex-with-pcre"; - version = "1.0.1.3"; - sha256 = "17pq70wiyq97rh6ba1zsl6rzifi8k5mykn6kwwxcvjqqs9n2nzh9"; + version = "1.0.2.0"; + sha256 = "19vn5w4vhgxv9s6nhlmj4xl8pa16d1a2ygxxyd5b0qg3q27vvisk"; libraryHaskellDepends = [ base base-compat bytestring containers regex regex-base regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text @@ -173600,7 +179723,6 @@ self: { ]; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-xmlschema" = callPackage @@ -173638,7 +179760,6 @@ self: { testHaskellDepends = [ base QuickCheck regexdot toolshed ]; description = "A POSIX, extended regex-engine"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regexdot" = callPackage @@ -173647,14 +179768,13 @@ 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 ]; description = "A polymorphic, POSIX, extended regex-engine"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regexp-tries" = callPackage @@ -173798,6 +179918,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "registry" = callPackage + ({ mkDerivation, async, base, containers, exceptions, hashable + , hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl + , protolude, random, resourcet, semigroupoids, semigroups, tasty + , tasty-discover, tasty-hedgehog, tasty-th, text, transformers-base + }: + mkDerivation { + pname = "registry"; + version = "0.1.2.6"; + sha256 = "0szzmk7rclzisz0ihs7cz6180wsfv6rkrfvvqk1v6das444y1bw3"; + libraryHaskellDepends = [ + base containers exceptions hashable mtl protolude resourcet + semigroupoids semigroups text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions hashable hedgehog hedgehog-corpus + io-memoize MonadRandom mtl protolude random resourcet semigroupoids + semigroups 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 { @@ -173966,6 +180111,7 @@ self: { libraryHaskellDepends = [ array base containers ]; description = "A relation data structure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relapse" = callPackage @@ -174192,53 +180338,23 @@ self: { ({ 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.1.1"; - sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0"; - revision = "1"; - editedCabalFile = "18vil2wa8xzpf0y5r5zdfylsqmphlappzc7a2ac9lmxngfkbzwyc"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable mtl stm text - transformers unordered-containers utf8-string - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - utf8-string - ]; - benchmarkHaskellDepends = [ - base containers gauge unordered-containers - ]; - description = "Custom prelude from Kowainik"; - license = stdenv.lib.licenses.mit; - }) {}; - - "relude_0_3_0" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty - , tasty-hedgehog, text, transformers, unordered-containers - , utf8-string }: mkDerivation { pname = "relude"; - version = "0.3.0"; - sha256 = "10cbgz1xzw67q3y9fw8px7wwxblv5qym51qpdljmjz4ilpy0k35j"; + 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 ]; description = "Custom prelude from Kowainik"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "remark" = callPackage @@ -174502,10 +180618,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 ]; @@ -174517,10 +180633,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; @@ -174604,10 +180718,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 = [ @@ -174665,8 +180779,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 ]; @@ -174844,8 +180958,8 @@ self: { ({ mkDerivation, base, containers, haskeline, mtl, process }: mkDerivation { pname = "repline"; - version = "0.1.7.0"; - sha256 = "1pjmkr5lnc6vdy8g90wnxlh1rzq6f3sc0j1facfc42iqi9fh6fjh"; + 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; @@ -174995,10 +181109,10 @@ self: { }: mkDerivation { pname = "req"; - version = "1.1.0"; - sha256 = "08jfq1fsqd57l7csw4fg22wppq06wddh8qxxms5z6bay55nqikc7"; - revision = "1"; - editedCabalFile = "1qb458sldda1msrx8hyp31a5ybny2kdymsxhmsyk9i9c5gk0qqib"; + version = "1.2.1"; + sha256 = "1s8gjifc9jixl4551hay013fwyhlamcyrxjb00qr76wwikqa0g8k"; + revision = "3"; + editedCabalFile = "1sbm2rk2q56gma2wja47q1rc8a2pizl8487g5z4fy1zynxm5inyj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -175017,29 +181131,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "req_1_2_1" = callPackage + "req_2_0_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder - , bytestring, case-insensitive, connection, data-default-class - , hspec, hspec-core, hspec-discover, http-api-data, http-client - , http-client-tls, http-types, monad-control, mtl, QuickCheck - , retry, text, time, transformers, transformers-base - , unordered-containers + , bytestring, case-insensitive, connection, hspec, hspec-core + , hspec-discover, http-api-data, http-client, http-client-tls + , http-types, monad-control, mtl, QuickCheck, retry, text, time + , transformers, transformers-base, unordered-containers }: mkDerivation { pname = "req"; - version = "1.2.1"; - sha256 = "1s8gjifc9jixl4551hay013fwyhlamcyrxjb00qr76wwikqa0g8k"; + version = "2.0.0"; + sha256 = "0avwvslsb689p9afbh3k0zwmqwkrqagicz26xcyfjsd5648mh3wr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring - case-insensitive connection data-default-class http-api-data - http-client http-client-tls http-types monad-control mtl retry text - time transformers transformers-base + case-insensitive connection http-api-data http-client + http-client-tls http-types monad-control mtl retry text time + transformers transformers-base ]; testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive - data-default-class hspec hspec-core http-client http-types - monad-control mtl QuickCheck text time unordered-containers + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-client http-types monad-control mtl QuickCheck + retry text time unordered-containers ]; testToolDepends = [ hspec-discover ]; doCheck = false; @@ -175056,8 +181169,8 @@ self: { pname = "req-conduit"; version = "1.0.0"; sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx"; - revision = "3"; - editedCabalFile = "1gnaq7ya4grjwadz58r9g10dybgg50ch89bhbnhyicdins2aa9b2"; + revision = "5"; + editedCabalFile = "1vbki857d5xj54s83r7kqirrg9a738xr55d40xqcaxxm7ki4s63i"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -175128,6 +181241,7 @@ self: { ]; description = "A local http server to catch the HTTP redirect"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "request-monad" = callPackage @@ -175143,39 +181257,13 @@ self: { }) {}; "require" = callPackage - ({ mkDerivation, base, bytestring, criterion, megaparsec, tasty - , tasty-hspec, text, universum - }: - mkDerivation { - pname = "require"; - version = "0.2.1"; - sha256 = "0cf19mcjmqn50gz2fc32b67s8za6bb7i2k0h6sj25b457xv9rdx2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring megaparsec text universum - ]; - executableHaskellDepends = [ - base bytestring megaparsec text universum - ]; - testHaskellDepends = [ - base bytestring megaparsec tasty tasty-hspec text universum - ]; - benchmarkHaskellDepends = [ - base bytestring criterion megaparsec text universum - ]; - description = "Scrap your qualified import clutter"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "require_0_4_0" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, inliterate , megaparsec, optparse-generic, tasty, tasty-hspec, text, universum }: mkDerivation { pname = "require"; - version = "0.4.0"; - sha256 = "1kfi0y46ycjsylzv73lxh721a45qz5ki9m6czv4r53scrpbaywig"; + version = "0.4.2"; + sha256 = "03dhj1j9gp6mmgaxxkd1bf2i6hw78ql2qpi0qrdmx5dinclkidk7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -175203,8 +181291,8 @@ 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; @@ -175274,12 +181362,11 @@ self: { ({ mkDerivation, base, ghc-prim, ralist, semigroupoids }: mkDerivation { pname = "resin"; - version = "0.2.0.2"; - sha256 = "01cllvyxiyqd0a8kg2whwrgmhgfb4akxmb2nx88l2z8lxa5nfz2j"; + version = "0.2.0.3"; + sha256 = "1arv9mcbg5xa6vzv6k85mcxdz38x26ipwhk8613qdd94a2hhf8nx"; libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ]; description = "High performance variable binders"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resistor-cube" = callPackage @@ -175304,10 +181391,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 ]; @@ -175315,7 +181400,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 @@ -175480,8 +181565,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 ]; @@ -175670,6 +181755,7 @@ self: { ]; description = "Maps with stringy keys that can be transcoded to JSON and XML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-types" = callPackage @@ -175681,6 +181767,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 @@ -175731,22 +181819,21 @@ 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 ]; description = "Easy Git repository serialization"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "restricted-workers" = callPackage @@ -175841,8 +181928,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 @@ -175916,6 +182003,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "retry_0_8_0_0" = callPackage + ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl + , random, stm, tasty, tasty-hedgehog, tasty-hunit, time + , transformers + }: + mkDerivation { + pname = "retry"; + version = "0.8.0.0"; + sha256 = "0m44firqn9bkspj2jjf88kksf7mjmbi00xz0855lnflc8b3377cf"; + libraryHaskellDepends = [ + base exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base exceptions ghc-prim hedgehog HUnit mtl random stm tasty + tasty-hedgehog tasty-hunit time transformers + ]; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -176148,6 +182256,8 @@ self: { pname = "rfc-prelude"; version = "0.0.0.2"; sha256 = "1d2kvmidbglc60p3zy6wd9af6w27b303znqh09rjms5ifri0k6kf"; + revision = "1"; + editedCabalFile = "1jvqvj93hc73wkjszfan5zc95sr8wmgwqzf3d2saa6fkzfclg23y"; libraryHaskellDepends = [ aeson base bifunctors bytestring classy-prelude containers data-default http-api-data integer-logarithms lens monad-control @@ -176227,11 +182337,29 @@ self: { pname = "rfc1413-types"; version = "0.0.0.0"; sha256 = "1lyf0wpjyzj43przl6k7mv1484aciizy03ch6ygbzkm0b0f70ha5"; + revision = "1"; + editedCabalFile = "1v55q9z4k4c4qb30hmavf3hvwi1i9a351i12ycwzmlj0vv382byk"; libraryHaskellDepends = [ base bytestring ]; description = "An rfc1413 parser and response renderer"; 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 { @@ -176242,15 +182370,14 @@ self: { doHaddock = false; description = "Parse and display time according to RFC3339 (deprecated)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rfc5051" = callPackage ({ 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 ]; @@ -176270,35 +182397,16 @@ self: { }) {}; "rhine" = callPackage - ({ mkDerivation, base, containers, dunai, free, time, transformers - }: - mkDerivation { - pname = "rhine"; - version = "0.4.0.1"; - sha256 = "00xmq61bgq84z8kvnjrh30zffm4q108gbxbndfkl6v63jl0346yj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers dunai free time transformers - ]; - executableHaskellDepends = [ base ]; - description = "Functional Reactive Programming with type-level clocks"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rhine_0_4_0_4" = callPackage - ({ mkDerivation, base, containers, dunai, free, time, transformers + ({ 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; @@ -176308,14 +182416,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 @@ -176367,6 +182476,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 @@ -176382,6 +182492,7 @@ self: { ]; description = "Haskell types for the Riak protocol buffer API"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riak-protobuf-lens" = callPackage @@ -176403,6 +182514,37 @@ self: { ]; description = "Lenses for riak-protobuf"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ribosome" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , data-default-class, deepseq, directory, either, filepath + , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs + , pretty-terminal, prettyprinter, process, resourcet, safe, split + , stm, strings, text, time, transformers, unliftio, utf8-string + }: + mkDerivation { + pname = "ribosome"; + version = "0.1.2.0"; + sha256 = "0sx4c7inv7dgy68wjnl13wmx6ybfjwl6flf2x9wz5aw1v5ssaw8z"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring containers data-default-class + deepseq directory either filepath hslogger lens messagepack + MissingH mtl nvim-hs pretty-terminal prettyprinter process + resourcet safe split stm strings text time transformers unliftio + utf8-string + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring containers data-default-class + deepseq directory either filepath hslogger HTF lens messagepack + MissingH mtl nvim-hs pretty-terminal prettyprinter process + resourcet safe split stm strings text time transformers unliftio + utf8-string + ]; + description = "api extensions for nvim-hs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "richreports" = callPackage @@ -176535,8 +182677,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.5.0"; - sha256 = "064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g"; + version = "0.1.8.0"; + sha256 = "1qgmvfc8whhg0qd6zh4jaqqbx5c4p11r8dskybanj6hs482ds4x0"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -176892,8 +183034,8 @@ self: { }: mkDerivation { pname = "rncryptor"; - version = "0.3.0.0"; - sha256 = "0878dn69my16y6nvz7nagx7pxb5wk5hq6mzj9qyzf284bqb4zcgp"; + version = "0.3.0.1"; + sha256 = "0j8y2iqxsin4gcgl85si7gl4bjrmdw9psvc7j3maa91fyh40dx49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176937,8 +183079,8 @@ self: { }: mkDerivation { pname = "rob"; - version = "0.0.2"; - sha256 = "1bbhv502c9r8d0kmrvl3q7yl12ykjwfvknlm0kmgnsv5lpz2zx59"; + version = "0.0.4"; + sha256 = "0ds0psp28fb5y21ycsxva1jqrbcvia94g3rk1b5p356php7zahsm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177039,6 +183181,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 @@ -177062,18 +183223,18 @@ self: { }) {inherit (pkgs) rocksdb;}; "rocksdb-query" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, hspec - , resourcet, rocksdb-haskell, unliftio + ({ mkDerivation, base, bytestring, cereal, conduit, data-default + , hspec, resourcet, rocksdb-haskell, unliftio }: mkDerivation { pname = "rocksdb-query"; - version = "0.1.1"; - sha256 = "17sgac07f6vc1ffp8ynlrjn1n0ww0dsdr43jha10d1n5564a2lyw"; + version = "0.2.0"; + sha256 = "01n2zlbpldhx8rxvq89i9hsp99dvlhm6s4rwlygxd3y989an8bcf"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet rocksdb-haskell unliftio ]; testHaskellDepends = [ - base cereal hspec rocksdb-haskell unliftio + base cereal data-default hspec rocksdb-haskell unliftio ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.publicDomain; @@ -177094,6 +183255,7 @@ self: { ]; description = "Sci-fi roguelike game. Client application."; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roguestar-engine" = callPackage @@ -177182,8 +183344,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 @@ -177212,6 +183374,7 @@ self: { ]; description = "Core Rollbar data types and APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roller" = callPackage @@ -177276,6 +183439,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ron" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , containers, criterion, 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.4"; + sha256 = "1y4nzsgc47aiirv387iwb0bmyr31pprian57ka2fwybw5dvlx84x"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring containers 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "roots" = callPackage ({ mkDerivation, base, tagged }: mkDerivation { @@ -177540,6 +183725,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 { @@ -177560,6 +183763,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 ]; @@ -177575,8 +183780,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 @@ -177878,6 +184083,7 @@ self: { testHaskellDepends = [ base QuickCheck safe ]; description = "Range set"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rspp" = callPackage @@ -177893,53 +184099,17 @@ 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; }) {}; "rss-conduit" = callPackage - ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring - , conduit, conduit-combinators, containers, data-default - , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck - , quickcheck-instances, resourcet, safe, safe-exceptions - , singletons, tasty, tasty-hunit, tasty-quickcheck, text, time - , timerep, uri-bytestring, vinyl, xml-conduit, xml-types - }: - mkDerivation { - pname = "rss-conduit"; - version = "0.4.2.2"; - sha256 = "1qaz3a9fjq5dqky6jvnnk68xbarrqng7bas9r10qzdpy7g1v17ps"; - revision = "3"; - editedCabalFile = "1fay2p90wx49b2yky0r6x70az3f0c1b2hwy3rzayza8am2i5r0bn"; - libraryHaskellDepends = [ - atom-conduit base conduit conduit-combinators containers - dublincore-xml-conduit lens-simple safe safe-exceptions singletons - text time timerep uri-bytestring vinyl xml-conduit xml-types - ]; - testHaskellDepends = [ - atom-conduit base blaze-builder bytestring conduit - conduit-combinators data-default dublincore-xml-conduit lens-simple - mono-traversable QuickCheck quickcheck-instances resourcet - safe-exceptions singletons tasty tasty-hunit tasty-quickcheck text - time uri-bytestring vinyl xml-conduit xml-types - ]; - description = "Streaming parser/renderer for the RSS standard"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "rss-conduit_0_4_3_0" = callPackage ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring , conduit, conduit-combinators, containers, data-default , dublincore-xml-conduit, lens-simple, mono-traversable, QuickCheck @@ -177991,6 +184161,18 @@ self: { ]; description = "watches an RSS/Atom feed and writes it to an IRC channel"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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 @@ -178001,8 +184183,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.2.17"; - sha256 = "0g40krmbjy4irrxs3iabbr296l8hr98driz75j3s0dhqqzdxv4vm"; + version = "0.2.36"; + sha256 = "0gvkah51mnqpy20v2f3n1gvad1abmbkxljm4pz3yh3x9mkscnc2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178030,6 +184212,7 @@ self: { libraryHaskellDepends = [ base ]; description = "dynamic linker tools for Haskell"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rtlsdr" = callPackage @@ -178101,7 +184284,6 @@ self: { ]; description = "Parsing and manipulation of rtorrent state file contents"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rts-loader" = callPackage @@ -178130,8 +184312,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 ]; @@ -178488,8 +184670,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; @@ -178503,8 +184685,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"; @@ -178623,28 +184805,6 @@ self: { }) {}; "safe-money" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cereal - , constraints, deepseq, hashable, serialise, store, tasty - , tasty-hunit, tasty-quickcheck, text, vector-space, xmlbf - }: - mkDerivation { - pname = "safe-money"; - version = "0.6"; - sha256 = "1l8gn9vscng92s1dkfj2fa55k63jnzcnw590r5a8n7dqwaycpz7r"; - libraryHaskellDepends = [ - aeson base binary cereal constraints deepseq hashable serialise - store text vector-space xmlbf - ]; - testHaskellDepends = [ - aeson base binary bytestring cereal constraints deepseq hashable - serialise store tasty tasty-hunit tasty-quickcheck text - vector-space xmlbf - ]; - description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "safe-money_0_7" = callPackage ({ mkDerivation, base, binary, bytestring, constraints, deepseq , hashable, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text , vector-space @@ -178681,6 +184841,7 @@ self: { ]; description = "Instances from the aeson library for the safe-money library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-money-cereal" = callPackage @@ -178698,6 +184859,7 @@ self: { ]; description = "Instances from the cereal library for the safe-money library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-money-serialise" = callPackage @@ -178715,6 +184877,7 @@ self: { ]; description = "Instances from the serialise library for the safe-money library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-money-store" = callPackage @@ -178732,6 +184895,7 @@ self: { ]; description = "Instances from the store library for the safe-money library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-money-xmlbf" = callPackage @@ -178749,6 +184913,7 @@ self: { ]; description = "Instances from the xmlbf library for the safe-money library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-plugins" = callPackage @@ -178794,8 +184959,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.9.4.1"; - sha256 = "110fa0x7dq4flaprwhzlwxa7j1465a6mnj9jl8xskb5s6p0whxhl"; + version = "0.9.4.3"; + sha256 = "020z2cdarpy8crz6b871lprgacwi6zsmmwml35ban93hdfjv2zbq"; libraryHaskellDepends = [ array base bytestring cereal containers old-time template-haskell text time vector @@ -178824,7 +184989,6 @@ self: { ]; description = "Making SafeCopy migrations easier"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safecopy-store" = callPackage @@ -179026,24 +185190,46 @@ self: { }) {}; "salak" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , filepath, hspec, QuickCheck, scientific, text + ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen + , mtl, QuickCheck, scientific, stm, text, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "salak"; - version = "0.1.4"; - sha256 = "17zlgk85yp6ihfppf0simrvc70sk2a3jkjzxzzsgibyxmsm2jmxr"; + version = "0.1.8"; + sha256 = "1y8vssnp8q9hmhf3jckj8c7pgjmvz4wmvm8m5xwlnn9ll8csxs0q"; libraryHaskellDepends = [ - aeson base directory filepath scientific text unordered-containers - vector yaml + aeson base directory filepath menshen mtl scientific stm text + transformers unordered-containers vector yaml ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - QuickCheck scientific text unordered-containers vector yaml + aeson base directory filepath hspec menshen mtl QuickCheck + scientific stm text transformers unordered-containers vector yaml + ]; + description = "Configuration Loader"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "salak_0_2_3" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen + , mtl, QuickCheck, scientific, stm, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "salak"; + version = "0.2.3"; + sha256 = "1ifa4gvwm3sri6nmgqsi7vrl7vafyzraz9v2y3a8k7gmn0izkmb5"; + libraryHaskellDepends = [ + aeson base directory filepath menshen mtl scientific stm text + transformers unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base directory filepath hspec menshen mtl QuickCheck + scientific stm text transformers unordered-containers vector yaml ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "saltine" = callPackage @@ -179053,8 +185239,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 = [ @@ -179089,8 +185275,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"; @@ -179329,18 +185515,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"; @@ -179482,6 +185665,7 @@ self: { testHaskellDepends = [ array base ]; description = "SAT encoding monad"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "satchmo-backends" = callPackage @@ -179627,34 +185811,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.3.17"; - sha256 = "1zwxq0x9g2l2nkyhbsdgz42wsnr1skm99x3vhd7f7azx17kv3lg6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring basic-prelude binary bytestring - data-binary-ieee754 lens lens-aeson monad-loops template-haskell - text - ]; - executableHaskellDepends = [ - aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra resourcet time yaml - ]; - testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; - description = "SwiftNav's SBP Library"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "sbp_2_4_0" = callPackage - ({ mkDerivation, aeson, array, base, base64-bytestring - , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml - }: - mkDerivation { - pname = "sbp"; - version = "2.4.0"; - sha256 = "13g14lj3ihn55v3cf40hzhp8ypzrl9a6lzarlsmqhr76g6szlpg8"; + version = "2.4.7"; + sha256 = "1ik254jzgazlbjm09nms8imansk8nb7hhghzyqjcgywg45i119i3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179669,7 +185827,6 @@ self: { testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sbp2udp" = callPackage @@ -179694,31 +185851,59 @@ 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, syb + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, z3 }: mkDerivation { pname = "sbv"; - version = "7.10"; - sha256 = "0bq3h0aidjdh7a9gp97mxfpng4x36mxyb4bgmj4pyjqdnbdgr05p"; + version = "7.13"; + sha256 = "0bk400swnb4s98c5p71ml1px6jndaiqhf5dj7zmnliyplqcgpfik"; 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 syb + template-haskell time ]; testHaskellDepends = [ - base bytestring containers data-binary-ieee754 directory doctest - filepath Glob hlint mtl QuickCheck random syb tasty tasty-golden - tasty-hunit tasty-quickcheck template-haskell + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell ]; testSystemDepends = [ z3 ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; + "sbv_8_0" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, 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, transformers, z3 + }: + mkDerivation { + pname = "sbv"; + version = "8.0"; + sha256 = "1bv5vf8r892q5ykh4xnzrczay6i423rbyk3rdz3z5ch4fyisvlrj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random syb + template-haskell time transformers + ]; + testHaskellDepends = [ + base bytestring containers crackNum directory doctest filepath Glob + hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell + ]; + testSystemDepends = [ z3 ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -179726,8 +185911,8 @@ self: { }: mkDerivation { pname = "sbvPlugin"; - version = "0.10"; - sha256 = "0yvvwkhvdfhy1i09br6ci8m4nchmmvn83glnqxd8s2zdmhmxsr54"; + version = "0.11"; + sha256 = "19gji0aqdi232x3y3vkpblwr6y63n7in92dq48ax67h6bqxwg5g2"; libraryHaskellDepends = [ base containers ghc ghc-prim mtl sbv template-haskell ]; @@ -179784,7 +185969,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "scalendar_1_1_1" = callPackage + "scalendar" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, text, time }: mkDerivation { pname = "scalendar"; @@ -179801,22 +185986,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "scalendar" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, SCalendar - , text, time - }: - mkDerivation { - pname = "scalendar"; - version = "1.2.0"; - sha256 = "1b33w7fh9jfsr9wrdvnhc7nvn7km69f4qb03d0hb4zlylf6mxj7m"; - libraryHaskellDepends = [ base containers text time ]; - testHaskellDepends = [ - base containers hspec QuickCheck SCalendar text time - ]; - description = "A library for handling calendars and resource availability over time"; - license = stdenv.lib.licenses.mit; - }) {}; - "scalp-webhooks" = callPackage ({ mkDerivation, aeson, async, base, bytestring, hastache, hspec , lens, lens-aeson, rainbow, random, regex-compat, shelly, Spock @@ -179917,23 +186086,6 @@ self: { }) {}; "scanner" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion - , hspec, text - }: - mkDerivation { - pname = "scanner"; - version = "0.2"; - sha256 = "1sd5czkfncadyxlbr13is44ad3kkk6rfwm9fqw8m4aipl1l0s0is"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring hspec ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring cereal criterion text - ]; - description = "Fast non-backtracking incremental combinator parsing for bytestrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scanner_0_3" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion , hspec, text }: @@ -179948,7 +186100,6 @@ self: { ]; description = "Fast non-backtracking incremental combinator parsing for bytestrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scanner-attoparsec" = callPackage @@ -180050,7 +186201,6 @@ self: { ]; description = "A Haskell library for writing SCGI programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "schedevr" = callPackage @@ -180472,17 +186622,17 @@ self: { "scotty" = callPackage ({ mkDerivation, aeson, async, base, blaze-builder, bytestring , case-insensitive, data-default-class, directory, exceptions, fail - , hpc-coveralls, hspec, hspec-discover, hspec-wai, http-types - , lifted-base, monad-control, mtl, nats, network, regex-compat - , text, transformers, transformers-base, transformers-compat, wai + , hspec, hspec-discover, hspec-wai, http-types, lifted-base + , monad-control, mtl, nats, network, regex-compat, text + , transformers, transformers-base, transformers-compat, wai , wai-extra, warp }: mkDerivation { pname = "scotty"; - version = "0.11.2"; - sha256 = "18lxgnj05p4hk7pp4a84biz2dn387a5vxwzyh1kslns1bra6zn0x"; + version = "0.11.3"; + sha256 = "14570k1klrlwra58zz7ip3j41nc75gaswrp8m4xwlrjzgpdqm70a"; revision = "1"; - editedCabalFile = "1h4fk7q8x7cvlqq4bbmdh465s6a8955bgchm121fvk08x7rm3yz3"; + editedCabalFile = "0pcaw6wr8nqs7pl64pb00zxd359np5x35159lqkqlcziiv0n2g3b"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types monad-control mtl @@ -180490,12 +186640,13 @@ self: { transformers-compat wai wai-extra warp ]; testHaskellDepends = [ - async base bytestring data-default-class directory hpc-coveralls - hspec hspec-wai http-types lifted-base network text wai + async base bytestring data-default-class directory hspec hspec-wai + http-types lifted-base network text wai ]; - testToolDepends = [ hpc-coveralls hspec-discover ]; + testToolDepends = [ hspec-discover ]; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-binding-play" = callPackage @@ -180548,6 +186699,7 @@ self: { ]; description = "Cookie management helper functions for Scotty framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-fay" = callPackage @@ -180621,6 +186773,20 @@ self: { ]; description = "HTTP-request's query parameters parser abstraction for \"scotty\""; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-resource" = callPackage @@ -180695,6 +186861,7 @@ self: { ]; description = "TLS for Scotty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-view" = callPackage @@ -180756,6 +186923,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "scrapbook" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, data-default, drinkery + , extensible, feed, gitrev, req, rio, tasty, tasty-hunit + , xml-conduit, xml-types, yaml + }: + mkDerivation { + pname = "scrapbook"; + version = "0.3.3"; + sha256 = "17xc7ljfxxwg4l2jiqf8ffwgwq3hq7lynf6p478jp0sxf54irjr1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base data-default extensible feed req rio + xml-conduit xml-types yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty base data-default drinkery extensible feed + gitrev req rio xml-conduit xml-types yaml + ]; + testHaskellDepends = [ + aeson aeson-pretty base data-default extensible feed req rio tasty + tasty-hunit xml-conduit xml-types yaml + ]; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + }) {}; + "scrape-changes" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, cron , directory, email-validate, filepath, hashable, hslogger @@ -180786,23 +186980,26 @@ 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, transformers + , unordered-containers, vector, wreq }: mkDerivation { pname = "script-monad"; - version = "0.0.1"; - sha256 = "0s1wb3wgkma7ia8mn4fl8jyl74vrx195m37n71fnbi22z56y8k5j"; + version = "0.0.3"; + sha256 = "18gwf2d8hzpgmkyjzr7p6f33qjcgr9lbj267s4bjf8476kk40ifg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring http-client http-types lens - lens-aeson QuickCheck text time unordered-containers vector wreq + lens-aeson QuickCheck text time transformers unordered-containers + vector wreq ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck + tasty-quickcheck-laws transformers ]; - description = "Transformer stack of error, reader, writer, state, and prompt monads"; + description = "Stack of error, reader, writer, state, and prompt monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -180911,6 +187108,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 @@ -180988,7 +187201,6 @@ self: { testHaskellDepends = [ base deepseq linear vector weigh ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -181050,7 +187262,6 @@ self: { libraryHaskellDepends = [ base sdl2 ]; description = "Run of the mill, frames per second timer implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdl2-gfx" = callPackage @@ -181072,7 +187283,6 @@ self: { executableHaskellDepends = [ base linear sdl2 vector ]; description = "Bindings to SDL2_gfx"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; "sdl2-image" = callPackage @@ -181092,7 +187302,6 @@ self: { executableHaskellDepends = [ base sdl2 text ]; description = "Bindings to SDL2_image"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; "sdl2-mixer" = callPackage @@ -181113,7 +187322,7 @@ self: { libraryPkgconfigDepends = [ SDL2_mixer ]; description = "Bindings to SDL2_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-sprite" = callPackage @@ -181132,7 +187341,6 @@ self: { ]; description = "Sprite previewer/animator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sdl2-ttf" = callPackage @@ -181151,7 +187359,7 @@ self: { libraryPkgconfigDepends = [ SDL2 SDL2_ttf ]; description = "Bindings to SDL2_ttf"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -181305,6 +187513,7 @@ self: { testHaskellDepends = [ base containers doctest hspec ]; description = "Common graph search algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sec" = callPackage @@ -181411,25 +187620,26 @@ self: { testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1 library from Bitcoin Core"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) secp256k1;}; "secp256k1-haskell" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cereal - , entropy, hspec, hspec-discover, HUnit, mtl, QuickCheck, secp256k1 - , string-conversions + , entropy, hashable, hspec, hspec-discover, HUnit, mtl, QuickCheck + , secp256k1, string-conversions }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.1.2"; - sha256 = "1kap1jjhqqmp8f067z9z8dw39gswn37bkj5j3byyvv4cn077ihva"; + version = "0.1.4"; + sha256 = "1vfbn0fvrbk4hmfhsm8gj3yxyijzfdqlywwir64zrafla4yry73l"; libraryHaskellDepends = [ - base base16-bytestring bytestring cereal entropy QuickCheck - string-conversions + base base16-bytestring bytestring cereal entropy hashable + QuickCheck string-conversions ]; librarySystemDepends = [ secp256k1 ]; testHaskellDepends = [ - base base16-bytestring bytestring cereal entropy hspec HUnit mtl - QuickCheck string-conversions + base base16-bytestring bytestring cereal entropy hashable hspec + HUnit mtl QuickCheck string-conversions ]; testToolDepends = [ hspec-discover ]; description = "Bindings for secp256k1 library from Bitcoin Core"; @@ -181553,51 +187763,17 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.2.0.0"; - sha256 = "1l9ad4d1m0ylfihg0hpfxanxil09c658jl1bmgzn8268akqay9nj"; - libraryHaskellDepends = [ - base bytestring exceptions hashable mtl psqueues text time - unordered-containers - ]; - description = "Multi-backend, high-level EDSL for interacting with SQL databases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda_0_3_3_1" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hashable, mtl - , psqueues, text, time, unordered-containers - }: - mkDerivation { - pname = "selda"; - version = "0.3.3.1"; - sha256 = "1rxwyls59mpmvb5f2l47ak5cnzmws847kgmn8fwbxb69h6a87bwr"; + version = "0.3.4.0"; + sha256 = "1ww4v30ywmdshcf4fpgqj5ycd9c197xdlvnby366hzsm7byqq8wj"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers ]; description = "Multi-backend, high-level EDSL for interacting with SQL databases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-postgresql" = callPackage - ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq - , selda, text - }: - mkDerivation { - pname = "selda-postgresql"; - version = "0.1.7.2"; - sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z"; - revision = "1"; - editedCabalFile = "08f2xdfpmbwhrwkjaqfmd9k25c3xn3p477d7a1mnnn7kf7328782"; - libraryHaskellDepends = [ - base bytestring exceptions postgresql-libpq selda text - ]; - description = "PostgreSQL backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda-postgresql_0_1_7_3" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text }: @@ -181612,27 +187788,9 @@ self: { ]; description = "PostgreSQL backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selda-sqlite" = callPackage - ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda - , text - }: - mkDerivation { - pname = "selda-sqlite"; - version = "0.1.6.0"; - sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; - revision = "2"; - editedCabalFile = "198pg9i0lfx3fwf7b7cw0x5kial6vbf0dqwh18jnh7na3pyn1jr6"; - libraryHaskellDepends = [ - base direct-sqlite directory exceptions selda text - ]; - description = "SQLite backend for the Selda database EDSL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selda-sqlite_0_1_6_1" = callPackage ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda , text }: @@ -181647,7 +187805,6 @@ self: { ]; description = "SQLite backend for the Selda database EDSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "select" = callPackage @@ -181727,8 +187884,8 @@ self: { }: mkDerivation { pname = "self-extract"; - version = "0.3.4"; - sha256 = "11v5d4sjbax5dncirmhgbvcj3a2ynnvlq34x4yamx0d9pm9b1idm"; + version = "0.4.1"; + sha256 = "1jhwarhab9mwgiv1rahn4spkpfqdnwfa31pwgjy1k9mw2xdxslgs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181823,6 +187980,7 @@ self: { testHaskellDepends = [ base ]; description = "A Haskell implementation of semibounded lattices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoid-extras" = callPackage @@ -181839,46 +187997,22 @@ self: { "semigroupoids" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, Cabal , cabal-doctest, comonad, containers, contravariant, distributive - , doctest, hashable, semigroups, tagged, template-haskell - , transformers, transformers-compat, unordered-containers - }: - mkDerivation { - pname = "semigroupoids"; - version = "5.2.2"; - sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; - revision = "4"; - editedCabalFile = "0pqfrxzypjq6z8lgdkzq4vhcyqkpk5326hny0r6snpc3gm78r4ij"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad containers contravariant - distributive hashable semigroups tagged template-haskell - transformers transformers-compat unordered-containers - ]; - testHaskellDepends = [ base doctest ]; - description = "Semigroupoids: Category sans id"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "semigroupoids_5_3_1" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, Cabal - , cabal-doctest, comonad, containers, contravariant, distributive - , doctest, hashable, semigroups, tagged, template-haskell - , transformers, transformers-compat, unordered-containers + , doctest, hashable, tagged, template-haskell, transformers + , transformers-compat, unordered-containers }: mkDerivation { pname = "semigroupoids"; - version = "5.3.1"; - sha256 = "13iqjckq3jzp6rxldrf3bcvk3061ssvsr6y0g5y9jq32z1hyr2fd"; + version = "5.3.2"; + sha256 = "01cxdcflfzx674bhdclf6c7lwgjpbj5yqv8w1fi9dvipyhyj3a31"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans bifunctors comonad containers contravariant - distributive hashable semigroups tagged template-haskell - transformers transformers-compat unordered-containers + distributive hashable tagged template-haskell transformers + transformers-compat unordered-containers ]; testHaskellDepends = [ base doctest ]; description = "Semigroupoids: Category sans id"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semigroupoids-syntax" = callPackage @@ -181931,8 +188065,8 @@ self: { }: mkDerivation { pname = "semilattices"; - version = "0.0.0.2"; - sha256 = "1f4xy2kl8mqvlrzv8y0qs2i3c095iprbzpa4j424sifsmms3ya89"; + version = "0.0.0.3"; + sha256 = "089vgwbcwa3hj53hh9djmilwfknsd9g9z9q1gbl0dad4lr39062f"; libraryHaskellDepends = [ base containers hashable unordered-containers ]; @@ -181941,6 +188075,7 @@ self: { ]; description = "Semilattices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semiring" = callPackage @@ -181967,6 +188102,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 @@ -182000,8 +188137,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 ]; @@ -182009,6 +188146,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semirings_0_3_1_1" = callPackage + ({ mkDerivation, base, containers, hashable, integer-gmp + , unordered-containers, vector + }: + mkDerivation { + pname = "semirings"; + version = "0.3.1.1"; + sha256 = "050vs4dn20llsj1nkf6jyni8798vj2bdxfp6d5icdr6xm2hlpkn4"; + libraryHaskellDepends = [ + base containers hashable integer-gmp unordered-containers vector + ]; + description = "two monoids as one, in holy haskimony"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semver" = callPackage ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty , tasty-hunit, text @@ -182022,6 +188175,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 @@ -182048,8 +188202,10 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "sendfile"; - version = "0.7.9"; - sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh"; + version = "0.7.10"; + sha256 = "1wnfmq64sq13siig0rrnln2bmk1aygnsgdwh5dh32agv9csrk4ab"; + revision = "1"; + editedCabalFile = "08k4clhyfa4h5ja9bz1mzg2wdx5337cg8bxd6lz25781f65llq7d"; libraryHaskellDepends = [ base bytestring network ]; description = "A portable sendfile library"; license = stdenv.lib.licenses.bsd3; @@ -182078,8 +188234,8 @@ self: { }: mkDerivation { pname = "sendgrid-v3"; - version = "0.1.1.0"; - sha256 = "1f8kxg6v6804qq7kl22ycff26kq6nh5n7kpkvbdx36pf54a6632w"; + version = "0.1.2.0"; + sha256 = "06j07c86560f4w4vpx6gbnmrbyhs9i69jksliifsd9a9flg93vx3"; libraryHaskellDepends = [ aeson base lens semigroups text wreq ]; testHaskellDepends = [ base semigroups tasty tasty-hunit text ]; description = "Sendgrid v3 API library"; @@ -182141,8 +188297,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.6.0.2"; - sha256 = "1lxz3cr04f4bqlm4jph66ckab494vqlaf6jc67dbmmwia6if2fpw"; + version = "0.6.1"; + sha256 = "1anxb5b8kmwf4bjzh49yxgnx3kkx37ydr4aw2xd46dph1gdk07mb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -182225,8 +188381,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 @@ -182290,11 +188446,12 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqid-streams_0_1_0" = callPackage @@ -182313,11 +188470,12 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqloc" = callPackage @@ -182485,34 +188643,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; @@ -182638,27 +188791,27 @@ self: { }) {}; "servant" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat + ({ 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, natural-transformation, network-uri, QuickCheck - , quickcheck-instances, singleton-bool, string-conversions, tagged - , text, vault + , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances + , singleton-bool, string-conversions, tagged, text, transformers + , vault }: mkDerivation { pname = "servant"; - version = "0.14.1"; - sha256 = "083layvq76llq3y49k27cdqzxka6mjgw541jhzndxx4avlcjzym7"; + version = "0.15"; + sha256 = "0fgsddg8yn23izk3g4bmax6rlh56qhx13j8h5n6fxr7mq34kagsg"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring case-insensitive - http-api-data http-media http-types mmorph mtl - natural-transformation network-uri singleton-bool - string-conversions tagged text vault + 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 aeson-compat base base-compat bytestring doctest hspec - QuickCheck quickcheck-instances string-conversions text + 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"; @@ -182673,6 +188826,8 @@ self: { pname = "servant-JuicyPixels"; version = "0.3.0.4"; sha256 = "10crrcrxap7751wifbc28kr1kv0rjvrx3wlnkajgv3xpr05g00kv"; + revision = "1"; + editedCabalFile = "185ym0ac6gx7f98pd92ykc1ib305lswzjzvykly4ij9vk85jn0ax"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182717,6 +188872,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; @@ -182733,6 +188890,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 @@ -182787,8 +188946,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 @@ -182800,6 +188959,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-hmac" = callPackage @@ -182840,28 +189000,26 @@ self: { "servant-auth-server" = 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 + , bytestring, case-insensitive, cookie, data-default-class, entropy + , hspec, hspec-discover, http-client, http-types, jose, lens + , lens-aeson, markdown-unlit, memory, 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.0.0"; - sha256 = "0fwa3v7nkyhrwxrp4sf0aikh5mgkdpn2grz8sr4sszhswp2js4ip"; + version = "0.4.3.0"; + sha256 = "1kzh4j6118qjzhfbxlszwi6ixgg9g4zn903n9qwrb5z8c2y6b9bl"; 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 + case-insensitive cookie data-default-class entropy http-types jose + lens memory 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 + jose lens lens-aeson mtl QuickCheck servant-auth servant-server + time transformers wai warp wreq ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; @@ -182876,6 +189034,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 ]; @@ -182886,20 +189046,22 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-swagger/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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"; @@ -182916,8 +189078,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 @@ -182935,8 +189097,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 @@ -182947,22 +189109,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; @@ -182971,19 +189132,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; @@ -183013,6 +189173,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-wordpress" = callPackage + ({ mkDerivation, base, mtl, servant-server, text, time, wai + , wordpress-auth + }: + mkDerivation { + pname = "servant-auth-wordpress"; + version = "1.0.0.0"; + sha256 = "0ns744n58irm2la9xz4nqxz3yyb69vwbw2h9nqcfhr66dmqd80ar"; + libraryHaskellDepends = [ + base mtl servant-server text time wai wordpress-auth + ]; + description = "Authenticate Routes Using Wordpress Cookies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-blaze" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant , servant-server, wai, warp @@ -183021,12 +189196,27 @@ 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"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-blaze_0_9" = callPackage + ({ mkDerivation, base, blaze-html, http-media, servant + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-blaze"; + version = "0.9"; + sha256 = "1pfnpc6m7i8knndc1734fbzpfgmvdcpkd8cj0jyw139b70siz63r"; libraryHaskellDepends = [ base blaze-html http-media servant ]; testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-cassava" = callPackage @@ -183037,8 +189227,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 ]; @@ -183096,54 +189286,57 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-client" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , exceptions, generics-sop, hspec, hspec-discover, http-api-data - , http-client, http-media, http-types, HUnit, markdown-unlit - , monad-control, mtl, network, QuickCheck, semigroupoids, servant - , servant-client-core, servant-server, stm, text, time - , transformers, transformers-base, transformers-compat, wai, warp + , 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.14"; - sha256 = "0jr2057y7vp6d2jcnisawkajinnqm68h024crh929r9fdka0p1n6"; + version = "0.15"; + sha256 = "098aaickq6j6f0d7bl2y72fcl53xp2w29qg3gy7yls4z8wd76v1a"; revision = "1"; - editedCabalFile = "1ywyb3mycpfcvv7dfgd72ajnkqr8cyiyp84hsfxcfvppq8cigmms"; + editedCabalFile = "1h3j8mpnrbpc1i4appf8g4zn7h30f6ybg6fg3w057kz18bk9y76f"; libraryHaskellDepends = [ - base base-compat bytestring containers exceptions http-client - http-media http-types monad-control mtl semigroupoids - servant-client-core stm text time transformers transformers-base - transformers-compat + 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 generics-sop hspec http-api-data - http-client http-types HUnit markdown-unlit mtl network QuickCheck - servant servant-client-core servant-server text transformers - transformers-compat wai warp + 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 = "automatical derivation of querying functions for servant webservices"; + 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 - , hspec-discover, http-api-data, http-media, http-types - , network-uri, QuickCheck, safe, servant, text + ({ 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.14.1"; - sha256 = "0qfpakwl6yj6l2br9wa9zs0v7nzmj4bngspw6p536swx39npnkn2"; + version = "0.15"; + sha256 = "0q3rrbdplzzj90kdb7cmb6qknsbd9dy4w5lkqcb95nndwgjlk3lv"; libraryHaskellDepends = [ - base base-compat base64-bytestring bytestring containers exceptions - free generics-sop http-api-data http-media http-types network-uri - safe servant text + 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 ]; @@ -183151,6 +189344,51 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-client-namedargs" = callPackage + ({ mkDerivation, async, base, hspec, http-client, named, QuickCheck + , servant, servant-client, servant-client-core, servant-namedargs + , servant-server, servant-server-namedargs, text, warp + }: + mkDerivation { + pname = "servant-client-namedargs"; + version = "0.1.0.0"; + sha256 = "0smf6ahmzkbsnvgkji5jzj99sy8bgqz0zxx5k1y1ar82pd6m4qnd"; + revision = "1"; + editedCabalFile = "0kfhrikja6rvrn3m4c6w7dg28l17f2jx8rwswxiwzvmg2zmwbc1n"; + libraryHaskellDepends = [ + base named servant servant-client-core servant-namedargs text + ]; + testHaskellDepends = [ + async base hspec http-client named QuickCheck servant + servant-client servant-namedargs servant-server + servant-server-namedargs warp + ]; + description = "Automatically derive API client functions with named and optional parameters"; + 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 @@ -183218,8 +189456,8 @@ self: { pname = "servant-dhall"; version = "0.1.0.1"; sha256 = "1yriifnflvh4f0vv2mrfv6qw0cv35isrq03q4h43g096ml2wl3ll"; - revision = "2"; - editedCabalFile = "1zdvk0cx8s1n107yx95vdv0xziwjmr1d6kypr36f1cqdvdh02jir"; + revision = "3"; + editedCabalFile = "13mq4pwffxqpjirb6rfhzd2xqhm0xyycl98h6kf4j0ic38g3saz1"; libraryHaskellDepends = [ base base-compat bytestring dhall http-media megaparsec prettyprinter servant text @@ -183230,20 +189468,20 @@ self: { ]; description = "Servant Dhall content-type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-docs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , case-insensitive, control-monad-omega, hashable, hspec - , hspec-discover, http-media, http-types, lens, servant - , string-conversions, text, unordered-containers + , 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.2"; - sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; - revision = "5"; - editedCabalFile = "10b463waaa75aawjdag52yjv2bhkpnp3xygb39zyifpaf6iix100"; + version = "0.11.3"; + sha256 = "0cys1h3m0aq77aw0szj7k6p7zqcr8074zrxzsjp58lss1daqisq7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183255,11 +189493,12 @@ self: { aeson base lens servant string-conversions text ]; testHaskellDepends = [ - aeson base hspec lens servant string-conversions + aeson base base-compat lens servant string-conversions tasty + tasty-golden tasty-hunit transformers ]; - testToolDepends = [ hspec-discover ]; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-ede" = callPackage @@ -183391,10 +189630,8 @@ self: { }: mkDerivation { pname = "servant-foreign"; - version = "0.11.1"; - sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735"; - revision = "3"; - editedCabalFile = "1ln18qi2bb9xfk3phydci5r2x0mf6dbgc9lc8k8qpx08bkid65x4"; + version = "0.15"; + sha256 = "0wxx9drycam46vcmf3kxp2lq1drlpxb1b6fxbxyb6dd7349py6gi"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -183410,11 +189647,12 @@ self: { pname = "servant-generate"; version = "0.1"; sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw"; - revision = "2"; - editedCabalFile = "00y5ji53sz59wys4nk2xcdpggydvkkqdxnm0aqj5raxzmakqnraq"; + revision = "3"; + editedCabalFile = "11hmn45fsl78kq6lladgz29yjycmr7lxmkswc8f41zbcb4m8rzyk"; libraryHaskellDepends = [ base servant servant-server ]; description = "Utilities for generating mock server implementations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-generic" = callPackage @@ -183478,6 +189716,7 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-haxl-client" = callPackage @@ -183532,6 +189771,32 @@ self: { 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 @@ -183541,8 +189806,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 ]; @@ -183577,10 +189842,8 @@ self: { }: mkDerivation { pname = "servant-js"; - version = "0.9.3.2"; - sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02"; - revision = "2"; - editedCabalFile = "1mz21yf77nzfb30hlqncyx3jwr50ab7qh0m0cv8pds6s76s6k9sj"; + version = "0.9.4"; + sha256 = "041wigqgn5ygcs49ndc39rk66j5bcvgpihshxk678jk470ysfszq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183593,7 +189856,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-kotlin" = callPackage @@ -183603,8 +189865,8 @@ self: { }: mkDerivation { pname = "servant-kotlin"; - version = "0.1.1.2"; - sha256 = "1ad1n1yp6b125fa5gjjnbksnjqf714jf9d8cvxrvpwkl9lxn9ppb"; + version = "0.1.1.6"; + sha256 = "0v16y6f956yf64npq8fm1q6j1q8yygci3amsxyvrggs1rdd8hi31"; libraryHaskellDepends = [ base containers directory formatting lens servant servant-foreign text time wl-pprint-text @@ -183629,12 +189891,48 @@ 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-lucid_0_9" = callPackage + ({ mkDerivation, base, http-media, lucid, servant, servant-server + , text, wai, warp + }: + mkDerivation { + pname = "servant-lucid"; + version = "0.9"; + sha256 = "1xamwcijd03cynml5c2hr577qairybyrqd90ixyb1a94lql6agbf"; + libraryHaskellDepends = [ base http-media lucid servant text ]; + testHaskellDepends = [ base lucid servant-server wai warp ]; + description = "Servant support for lucid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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 @@ -183680,10 +189978,8 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.8.4"; - sha256 = "1705fw63lrzw79w1ypcdlf35d8qxx247q8isiqh28wzmc4j3kmnr"; - revision = "2"; - editedCabalFile = "0brnvssfcg105kkkj646wih8apnhd5gvy25c576i93x0nxb0n39j"; + version = "0.8.5"; + sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183705,19 +190001,19 @@ self: { "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 @@ -183725,6 +190021,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 @@ -183745,6 +190042,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-namedargs" = callPackage + ({ mkDerivation, base, hspec, named, QuickCheck, servant, text }: + mkDerivation { + pname = "servant-namedargs"; + version = "0.1.0.1"; + sha256 = "0ylxcl11wmi3il5bpl7qc32qh2s210xfp37vfhhvnlxzgdzj84vh"; + revision = "1"; + editedCabalFile = "0nr11syaq0l04qdwh5ac0gnpfcgi9vakfjgv5i6p6kraag8za5k7"; + libraryHaskellDepends = [ base named servant text ]; + testHaskellDepends = [ base hspec named QuickCheck servant ]; + description = "Combinators for servant providing named parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-nix" = callPackage ({ mkDerivation, base, bytestring, hnix, http-client, http-media , servant, servant-client, servant-server, text, wai, warp @@ -183784,15 +190096,17 @@ self: { "servant-pagination" = callPackage ({ mkDerivation, base, hspec, QuickCheck, safe, servant - , servant-server, text + , servant-server, text, uri-encode }: mkDerivation { pname = "servant-pagination"; - version = "2.1.1"; - sha256 = "1kinql7rmwnrmqmlqkz1pakl52xl1pq32gr589dff00l55df2w2c"; + version = "2.2.0"; + sha256 = "15imbn6iyvbi80yainpi59q2r621r43d6cim3aydf6bbmz9pgnxd"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base safe servant servant-server text ]; + libraryHaskellDepends = [ + base safe servant servant-server text uri-encode + ]; testHaskellDepends = [ base hspec QuickCheck servant-server text ]; description = "Type-safe pagination for Servant APIs"; license = stdenv.lib.licenses.lgpl3; @@ -183813,6 +190127,29 @@ self: { ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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 @@ -183854,8 +190191,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 ]; @@ -183915,21 +190252,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.1"; + sha256 = "1w9a60pcgpbkab37310qjr7vbfjrmakhmfc8fv7sip0pz8pj0ijx"; 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; @@ -183946,10 +190282,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 @@ -184035,8 +190369,8 @@ self: { }: 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"; @@ -184074,8 +190408,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.14.1"; - sha256 = "1fnxmy6k0ml11035ac4x2knvpraxpc0g076wx3a9k013xyqi0h02"; + version = "0.15"; + sha256 = "1qlkdgls2z71sx09lbkrqcxwx1wam3hn7dnyps6z2i7qixhlw0wq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -184083,10 +190417,11 @@ self: { 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 transformers-compat wai - wai-app-static word8 + text transformers transformers-base wai wai-app-static word8 + ]; + executableHaskellDepends = [ + aeson base base-compat servant text wai warp ]; - executableHaskellDepends = [ aeson base servant text wai warp ]; testHaskellDepends = [ aeson base base-compat base64-bytestring bytestring directory doctest hspec hspec-wai http-types mtl QuickCheck resourcet safe @@ -184098,6 +190433,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-server-namedargs" = callPackage + ({ mkDerivation, base, http-api-data, http-types, named, servant + , servant-namedargs, servant-server, string-conversions, text, wai + }: + mkDerivation { + pname = "servant-server-namedargs"; + version = "0.1.0.0"; + sha256 = "0ncrrl91b8bcih4qf7gwl7m2qqmx6glwgvwcd4rvi1kdjrry8w0y"; + revision = "1"; + editedCabalFile = "1yf69y0w8miwcgdq9f88c2vabmqbn85rqsr8pqhijz24byyxnnl7"; + libraryHaskellDepends = [ + base http-api-data http-types named servant servant-namedargs + servant-server string-conversions text wai + ]; + description = "Automatically derive API server functions with named and optional parameters"; + 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 @@ -184216,6 +190570,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"; @@ -184232,6 +190588,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 @@ -184254,11 +190612,14 @@ self: { pname = "servant-streaming-docs"; version = "0.3.0.0"; sha256 = "0jy0na8cavym2vsy1a059n0yjzfb5a0xylyzxpz0i5apafv1xvlz"; + revision = "1"; + editedCabalFile = "02majkszg6d340mq07b9xyfd200xqpq9znl2j9dxqj7d9bqkrdrz"; libraryHaskellDepends = [ base lens servant servant-docs servant-streaming ]; description = "Client instances for the 'servant-docs' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-streaming-server" = callPackage @@ -184271,6 +190632,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 @@ -184283,6 +190646,7 @@ self: { ]; description = "Server instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-subscriber" = callPackage @@ -184295,8 +190659,8 @@ self: { }: mkDerivation { pname = "servant-subscriber"; - version = "0.6.0.1"; - sha256 = "0fbqmh0lzcb0ixw09ldjddz21xcfy7knfwhh3hfzlgy08xmqb89x"; + version = "0.6.0.2"; + sha256 = "0gi6cs5vhr3fw9cxaagsy0nxcav8irrva7rq4zvzlj7mwz1ikpz6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184313,31 +190677,30 @@ 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.7"; + sha256 = "0dnyh4g55x70cb6xwksm0rk23v5lawdws5bxgq27ja1walh106p3"; 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 base-compat 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui" = callPackage @@ -184346,16 +190709,17 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.3.0.3.13.2"; - sha256 = "0llkcag9bnhvni6ddar966i0pwql93s5icvw6pxa9ra5v14v7p5n"; - revision = "2"; - editedCabalFile = "0sz08w56f7p74saass6xdzmbpyk78hpa9d79kkd2nclwinajpkgr"; + 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 @@ -184365,10 +190729,10 @@ self: { }: mkDerivation { pname = "servant-swagger-ui-core"; - version = "0.3.1"; - sha256 = "05lnm9p86rd9rxsz7f1zm5vkqzjcq2fd8an7c8y5fk4kxj6rydxb"; - revision = "1"; - editedCabalFile = "10p5yjzvfdn764mszlsx49kb55ygzi5m2mq32l9m91imvj1926b1"; + version = "0.3.2"; + sha256 = "1a1wk90vm6mq8byxz4syr03l1rf6qj8zhda7lnp23pn5d270xkd2"; + revision = "2"; + editedCabalFile = "02yxnvd54wcykhswivhg5sr67njz0p3raxmp5nqmijwwxh0iqdvc"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -184376,6 +190740,7 @@ self: { ]; description = "Servant swagger ui core components"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger-ui-jensoleg" = callPackage @@ -184384,16 +190749,17 @@ self: { }: 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 @@ -184402,16 +190768,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 @@ -184488,10 +190855,8 @@ self: { }: mkDerivation { pname = "servant-yaml"; - version = "0.1.0.0"; - sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; - revision = "21"; - editedCabalFile = "1xrlhbgh54ny4xiqcdbka7i86wkyyqndwwv3r3k47xdr5683iyc1"; + version = "0.1.0.1"; + sha256 = "00gnbdlcq6cvmhsga8h0csd35pnfib038rqlhm445l4wa0cp8m01"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -184604,50 +190969,24 @@ self: { "serverless-haskell" = 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 - }: - mkDerivation { - pname = "serverless-haskell"; - version = "0.6.7"; - sha256 = "0p34wd3g1gg7c6yp018164ky1rqz67wq5fcax6fis0hn3g8qgjm9"; - 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 - ]; - 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 - ]; - testToolDepends = [ hspec-discover ]; - description = "Deploying Haskell code onto AWS Lambda using Serverless"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "serverless-haskell_0_7_5" = 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.5"; + sha256 = "0jnq2z5h7bqzbrppznw38vq9ibbijddw3jkx3vhrf0jzvk50gqqg"; 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"; @@ -184950,8 +191289,8 @@ self: { pname = "set-cover"; version = "0.0.9"; sha256 = "1qbk5y2pg6jlclszd2nras5240r0ahapsibykkcqrxhgq0hgvsxg"; - revision = "1"; - editedCabalFile = "0mcg15645maj1ymfrgs9ghi8n3hwwd72441zxcg9gn1w3pq7zsaw"; + revision = "2"; + editedCabalFile = "1jpg9iyq0mymdbq392nfmicwfmcmq5mg688ndmhvjx08ljdl54ha"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184959,6 +191298,7 @@ self: { ]; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "set-extra" = callPackage @@ -184976,11 +191316,22 @@ 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; + }) {}; + + "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; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -185019,6 +191370,7 @@ self: { executableToolDepends = [ alex happy ]; description = "Treating files as sets to perform rapid set manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setenv" = callPackage @@ -185114,32 +191466,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.1"; + sha256 = "15msfpnifcavbi5dgsrpl2v9b7hyv0c8lqkkcl0mz0rdm69l2p4q"; 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; }) {}; @@ -185219,6 +191574,7 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -185249,7 +191605,6 @@ self: { ]; description = "S-expression printer and parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sext" = callPackage @@ -185281,6 +191636,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 @@ -185323,8 +191679,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 @@ -185365,6 +191721,33 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sha-streams" = callPackage ({ mkDerivation, base, binary, bytestring, io-streams, SHA }: mkDerivation { @@ -185484,30 +191867,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.4"; + sha256 = "1akmhmkyzf689mf2z7k14az5p4kr5h66dapa00mwv7jmanyxzbdy"; 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"; @@ -185521,15 +191904,14 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.9.0.5"; - sha256 = "1j417h6nkwkjgprcaf59lilv6d151qhc8ibzd0jimkx08pv414rz"; + version = "1.10.2.0"; + sha256 = "0kc7yy2qv4d2n3j0qwsg37ga9yyb380d6zni08l1jabrl84maly8"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text ]; description = "Utilities for building ATS projects with shake"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-c" = callPackage @@ -185549,8 +191931,8 @@ self: { }: mkDerivation { pname = "shake-cabal"; - version = "0.1.0.5"; - sha256 = "1h8a3c3fwg2jz1p6k5253hjfaqbwwwdygrj2hdsgwn6laq75kd6s"; + version = "0.2.0.0"; + sha256 = "13fzc57jl52c6j1wjmp4z39jwbqrnlwl5l8vxqk6hz814apsd555"; libraryHaskellDepends = [ base Cabal composition-prelude directory filepath shake ]; @@ -185698,6 +192080,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 @@ -185752,8 +192135,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 ]; @@ -185769,33 +192152,8 @@ self: { }: mkDerivation { pname = "shakespeare"; - version = "2.0.15"; - sha256 = "1vk4b19zvwy4mpwaq9z3l3kfmz75gfyf7alhh0y112gspgpccm23"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_17" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.17"; - sha256 = "1j6habv4glf8bvxiil9f59b553lfsi7mr7i30r63sy3g85qi09jg"; + 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 @@ -185808,7 +192166,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -185905,6 +192262,20 @@ 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; + }) {}; + "shapefile" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754, dbf , filepath, rwlock @@ -185983,7 +192354,6 @@ self: { ]; description = "demos for the 'shapes' package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shapes-math" = callPackage @@ -186056,13 +192426,12 @@ 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"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sharedio" = callPackage @@ -186145,7 +192514,6 @@ self: { ]; description = "Write shell scripts with Conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shell-escape" = callPackage @@ -186165,12 +192533,11 @@ self: { ({ mkDerivation, base, containers, text, unix }: mkDerivation { pname = "shell-monad"; - version = "0.6.4"; - sha256 = "1wmihv2x4pbz9bkrjyyh4hqwsdmlldmyi5jlgxx6ry6z3jyx9i13"; + version = "0.6.8"; + sha256 = "0xv28s1b8rd1zd2mr5g6km8gwsy5ynsyji8fd68clq1rx9jjfcsc"; libraryHaskellDepends = [ base containers text unix ]; description = "shell monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shell-pipe" = callPackage @@ -186286,9 +192653,41 @@ self: { testHaskellDepends = [ base hspec ]; description = "Parse strings into words, like a shell would"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , system-fileio, system-filepath, text, time, transformers + , transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.8.0"; + sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk"; + revision = "1"; + editedCabalFile = "17achybammxg5i7zcmwlfcb7xk77q3lfvck3gqa9ljfb6ksgrxb7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath hspec hspec-contrib HUnit lifted-async + lifted-base monad-control mtl process system-fileio system-filepath + text time transformers transformers-base unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "shelly_1_8_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib , HUnit, lifted-async, lifted-base, monad-control, mtl, process @@ -186317,6 +192716,7 @@ self: { ]; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly-extra" = callPackage @@ -186353,22 +192753,42 @@ 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.2.0.0"; + sha256 = "1r3giir4l1l2pn4kamgmdqsw1j8qz9aaw741lq761yk1s3lciwim"; + 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; @@ -186380,8 +192800,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 @@ -186392,7 +192812,6 @@ self: { ]; description = "Run a sequence of functions on in-memory representations of files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shimmer" = callPackage @@ -186413,6 +192832,7 @@ self: { ]; description = "The Reflective Lambda Machine"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shine" = callPackage @@ -186421,8 +192841,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 ]; @@ -186524,8 +192944,8 @@ self: { ({ mkDerivation, base, text }: mkDerivation { pname = "shortcut-links"; - version = "0.4.2.0"; - sha256 = "09sh6c1cwhs9x49mim8z1pafb0sh1z3im0k5wvigkpagx72pasqy"; + version = "0.4.2.1"; + sha256 = "1zyy4jma61vg684sa66mpdlq9ylfrfv23d8m0163lbcfpkxfqdhd"; libraryHaskellDepends = [ base text ]; description = "Link shortcuts for use in text markup"; license = stdenv.lib.licenses.bsd3; @@ -186572,10 +192992,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "show-combinators"; - version = "0.1.0.0"; - sha256 = "11ihjlpa5hgqhcbwcyclldgddppzgdqsz8hx1hqvamchqx3mgi12"; - revision = "1"; - editedCabalFile = "09zd78jap17ralla3833gwv6bwmh93bpjgdshkyf7j06xg2c1mq8"; + version = "0.1.1.0"; + sha256 = "02h2fvmw22v1mpxlxn9c6p7as3xspvspdphybxapac4s50mvyfnm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; @@ -186883,6 +193301,7 @@ self: { ]; description = "Arithmetic over signs and sets of signs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "signal" = callPackage @@ -187038,6 +193457,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 { @@ -187086,6 +193522,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 @@ -187175,8 +193622,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 @@ -187270,8 +193719,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; @@ -187301,8 +193750,8 @@ self: { }: mkDerivation { pname = "simple-log"; - version = "0.9.7"; - sha256 = "018rzapbmkkfhqzwdv2vgj4wbqi4wn2bgml0kd3khq3p06mhpnc5"; + version = "0.9.11"; + sha256 = "1mqibcpcnwc0hqbcbvl32vv4458n02f2k2bnparh8ajm5n9h0cjk"; libraryHaskellDepends = [ async base base-unicode-symbols containers data-default deepseq directory exceptions filepath hformat microlens microlens-platform @@ -187343,8 +193792,8 @@ self: { }: mkDerivation { pname = "simple-logging"; - version = "0.2.0.4"; - sha256 = "13f6562rhk5bb5b2rmn0zsw2pil6qis463kx9d684j2m0qnqifdm"; + 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 @@ -187368,6 +193817,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Simple library to handle and interexchange money"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-neural-networks" = callPackage @@ -187449,12 +193899,15 @@ 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 ]; description = "simple pipeline library like conduit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-postgresql-orm" = callPackage @@ -187504,8 +193957,8 @@ self: { }: mkDerivation { pname = "simple-sendfile"; - version = "0.2.27"; - sha256 = "1bwwqzcm56m2w4ymsa054sxmpbj76h9pvb0jf8zxp8lr41cp51gn"; + version = "0.2.28"; + sha256 = "0w4qn8dslcky7cq36jjjnlqwl2s46m8q1cwk3hc9cf0wsiwhp059"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -187564,8 +194017,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; @@ -187577,8 +194030,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 ]; @@ -187587,7 +194040,6 @@ self: { ]; description = "A parser for SQL queries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-src-utils" = callPackage @@ -187700,6 +194152,7 @@ self: { ]; description = "UI library for terminal"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-vec3" = callPackage @@ -187708,8 +194161,8 @@ self: { }: mkDerivation { pname = "simple-vec3"; - version = "0.4.0.8"; - sha256 = "0jikq60ixk21gb7j3rayxqha73m9vn4n8kz4799rcw5qiii7rr4a"; + version = "0.4.0.10"; + sha256 = "0dyr9bg3y8613hd0zz7knkniq7p0hxm7w9pjs0jjhq586g0qh5ql"; libraryHaskellDepends = [ base QuickCheck vector ]; testHaskellDepends = [ base doctest doctest-driver-gen tasty tasty-quickcheck @@ -187878,6 +194331,7 @@ self: { librarySystemDepends = [ sqlite ]; description = "Simplest SQLite3 binding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) sqlite;}; "simplex" = callPackage @@ -187937,10 +194391,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; }) {}; @@ -187988,6 +194442,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; @@ -188009,8 +194465,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; @@ -188025,24 +194481,24 @@ self: { libraryHaskellDepends = [ base ]; description = "Singletons and induction over GHC TypeLits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singletons" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc-boot-th - , mtl, process, syb, tasty, tasty-golden, template-haskell, text - , th-desugar, transformers + ({ 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.4.1"; - sha256 = "1kzrl9njvkbvxylk9jg61vy3ksmxmzymci5hdp0ilpsah4620yjx"; + version = "2.5.1"; + sha256 = "0izi487dpn5dx5yzm0bqrrjj2fcy6y6jyk81848yq4i8fcx0mc10"; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ - base containers ghc-boot-th mtl syb template-haskell text + base containers ghc-boot-th mtl pretty syb template-haskell text th-desugar transformers ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-golden - ]; + testHaskellDepends = [ base filepath process tasty tasty-golden ]; description = "A framework for generating singleton types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -188118,24 +194574,23 @@ self: { }) {}; "siren-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, hspec, hspec-discover, http-media, http-types - , network-arbitrary, network-uri, network-uri-json, QuickCheck - , quickcheck-instances, test-invariant, text, unordered-containers + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-discover, http-media, http-types, network-arbitrary + , network-uri, network-uri-json, QuickCheck, quickcheck-instances + , test-invariant, text, unordered-containers }: mkDerivation { pname = "siren-json"; - version = "0.1.3.1"; - sha256 = "1chwf9kldwf039qad55la4yh13wjax64g0pi99hw2b46x7dx4qm1"; + version = "0.3.0.0"; + sha256 = "096a4ls4kqpslqsh499ykh7mkvnz3q7n00w1par69kmj4x3g9v0j"; libraryHaskellDepends = [ aeson base bytestring containers http-media http-types network-uri network-uri-json text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring case-insensitive containers hspec http-media - http-types network-arbitrary network-uri network-uri-json - QuickCheck quickcheck-instances test-invariant text - unordered-containers + aeson base bytestring containers hspec http-media http-types + network-arbitrary network-uri network-uri-json QuickCheck + quickcheck-instances test-invariant text unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Siren Tools for Haskell"; @@ -188179,8 +194634,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 @@ -188227,8 +194682,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 ]; @@ -188252,26 +194707,27 @@ self: { ]; description = "Sized sequence data-types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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"; @@ -188475,12 +194931,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 @@ -188496,6 +194955,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "skip-var" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "skip-var"; + version = "0.1.1.0"; + sha256 = "07nljfjd45fagisd99pqz2jhznfapk9cgd9lyy9cija7pmxfbg5z"; + libraryHaskellDepends = [ base ]; + description = "Skip variables"; + license = stdenv.lib.licenses.mit; + }) {}; + "skulk" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -188541,8 +195011,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.7.3"; - sha256 = "1pwawhfl2w9d06sv44lxa5hvh4lz9d5l0n8j7zjm08jibl30fc8g"; + version = "0.7.5"; + sha256 = "080kmpqaqh76qqjml34rfm7m6pchdmd2519g6y3kdb3x5vj01qbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188565,8 +195035,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.7.3"; - sha256 = "0qk2g86b0avd24q7hbkdjj0l2r5ma7kbzf3cj4sjwmh7wmx0ss7c"; + version = "0.7.5"; + sha256 = "129q860xk59n8dxsxl7prk0jk3ddl96r9i6r4lsk5l9pbpms41pp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188685,6 +195155,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "slack-verify" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite + , hspec + }: + mkDerivation { + pname = "slack-verify"; + version = "0.1.0.0"; + sha256 = "0rkanwf4q9mlhsxmxhpnn5svnrz0hkd9iw4yczjidm5mb0xrdqs1"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cryptonite + ]; + testHaskellDepends = [ + base base16-bytestring bytestring cryptonite hspec + ]; + description = "Slack API Request Verification HMAC"; + license = stdenv.lib.licenses.mit; + }) {}; + "slack-web" = callPackage ({ mkDerivation, aeson, base, containers, errors, hspec , http-api-data, http-client, http-client-tls, megaparsec, mtl @@ -188693,8 +195181,32 @@ 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 + servant-client-core text time transformers + ]; + testHaskellDepends = [ + aeson base containers errors hspec http-api-data megaparsec text + time + ]; + description = "Bindings for the Slack web API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "slack-web_0_2_0_10" = callPackage + ({ mkDerivation, aeson, base, containers, errors, hspec + , http-api-data, http-client, http-client-tls, megaparsec, mtl + , servant, servant-client, servant-client-core, text, time + , transformers + }: + mkDerivation { + pname = "slack-web"; + version = "0.2.0.10"; + sha256 = "0dcvy6x08xm3kgxh65p7kvp7r4f1n819g933vna37sjwy94mmqh1"; libraryHaskellDepends = [ aeson base containers errors http-api-data http-client http-client-tls megaparsec mtl servant servant-client @@ -188716,8 +195228,8 @@ self: { }: mkDerivation { pname = "slate"; - version = "0.11.0.0"; - sha256 = "0y6l3cjlh0hkc3nch7fwvxpv2i5r9qv6r1kdi3savi0vp0dvgdy8"; + version = "0.13.0.0"; + sha256 = "0b1mk6d79h4mkh71kgg208i15bik97a29hzs1j57qxipici680rj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188737,45 +195249,23 @@ self: { }) {}; "slave-thread" = callPackage - ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph - , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore - , stm-containers, transformers - }: - mkDerivation { - pname = "slave-thread"; - version = "1.0.2"; - sha256 = "04sbbdgzsi1ww642b9fgbhx348c0a4qim4ak6bivwpnnimcj0wg4"; - libraryHaskellDepends = [ - base base-prelude list-t mmorph partial-handler stm-containers - transformers - ]; - testHaskellDepends = [ - base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore - ]; - description = "A principal solution to ghost threads and silent exceptions"; - license = stdenv.lib.licenses.mit; - 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 + ({ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sleep" = callPackage @@ -188816,8 +195306,8 @@ self: { }: mkDerivation { pname = "slick"; - version = "0.1.1.0"; - sha256 = "0gqc9z8w9m1dvsnv7g1rsi367akkzp95w96lvx20sdg1gnzbx5rc"; + version = "0.2.0.0"; + sha256 = "0pxbrqykf11nrdc6zyjxvfc57dfajp5nm4qpqyk26l2jh1gaklz7"; libraryHaskellDepends = [ aeson base binary bytestring containers lens lens-aeson mustache pandoc shake text time @@ -188827,6 +195317,7 @@ self: { pandoc shake text time ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slidemews" = callPackage @@ -188902,6 +195393,7 @@ self: { ]; description = "Visualize mathematical function's slope fields"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slot-lambda" = callPackage @@ -188933,6 +195425,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 @@ -188952,6 +195456,7 @@ self: { ]; description = "Type-safe slugs for Yesod ecosystem"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallarray" = callPackage @@ -189270,8 +195775,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "smtLib"; - version = "1.0.9"; - sha256 = "19hfw5pgygka2wrnlr8s6wqpw92kz259lli83w1i7igw3v7vyzcc"; + version = "1.1"; + sha256 = "0bws90179vl2ycvnsmi0zni1vg71bdlhkgg0qdvqmls2rjyh5q3j"; libraryHaskellDepends = [ base pretty ]; description = "A library for working with the SMTLIB format"; license = stdenv.lib.licenses.bsd3; @@ -189435,8 +195940,8 @@ self: { }: mkDerivation { pname = "smuggler"; - version = "0.0.1"; - sha256 = "16f2s1gp5ww2ingil60fq5w6ghs3f1cscsl8qn7ibg0jqj0w5q89"; + version = "0.1.0"; + sha256 = "0iyisn5s39haik3g1wld67pdpnl8h3zafxhkgyd3ajx9lg9nf741"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189445,7 +195950,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; }) {}; @@ -189479,27 +195984,27 @@ self: { "snap" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal , clientsession, configurator, containers, deepseq, directory - , directory-tree, dlist, filepath, hashable, heist, http-streams - , HUnit, lens, lifted-base, map-syntax, monad-control, mtl - , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core + , directory-tree, dlist, fail, filepath, hashable, heist + , http-streams, HUnit, lens, lifted-base, map-syntax, monad-control + , mtl, mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core , snap-server, stm, syb, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-smallcheck, text, time , transformers, transformers-base, unordered-containers, xmlhtml }: mkDerivation { pname = "snap"; - version = "1.1.1.0"; - sha256 = "08kgvry18kfkspif2xn8j7w9jfinhrnl33g6ap74fz7rsrg68jz7"; + version = "1.1.2.0"; + sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator - containers directory directory-tree dlist filepath hashable heist - lens lifted-base map-syntax monad-control mtl mwc-random + containers directory directory-tree dlist fail filepath hashable + heist lens lifted-base map-syntax monad-control mtl mwc-random pwstore-fast snap-core snap-server stm text time transformers transformers-base unordered-containers xmlhtml ]; testHaskellDepends = [ aeson async attoparsec base bytestring cereal clientsession - configurator containers deepseq directory directory-tree dlist + configurator containers deepseq directory directory-tree dlist fail filepath hashable heist http-streams HUnit lens lifted-base map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck smallcheck snap-core snap-server stm syb test-framework @@ -189608,10 +196113,8 @@ self: { }: mkDerivation { pname = "snap-core"; - version = "1.0.3.2"; - sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; - revision = "1"; - editedCabalFile = "08ll71h3rv9bppr7xrflg4y627vnmxgfhby1kli9cj0a7ryspam1"; + version = "1.0.4.0"; + sha256 = "0dklxgrbqhnb6bc4ic358g4fyj11ywmjrkxxhqcjmci2hhpn00mr"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -189688,8 +196191,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; @@ -189722,6 +196225,7 @@ self: { ]; description = "Language handling for Snap"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-loader-dynamic" = callPackage @@ -189730,17 +196234,14 @@ self: { }: mkDerivation { pname = "snap-loader-dynamic"; - version = "1.0.0.0"; - sha256 = "12zvmdkypwflmc81i0sxbfmb3ja0vydycmaliyvrw0z32kg705wg"; - revision = "2"; - editedCabalFile = "1q5lal77sgxwcwbabw5rqwlrx84xv1c24zs2ry2gz57ccdr6n9qm"; + version = "1.0.0.1"; + sha256 = "1z0f0lsrqdsw7fmfaq8n0jcam8nh5nmpg72q4lapqazlna78ww7x"; libraryHaskellDepends = [ base directory directory-tree hint mtl snap-core template-haskell time unix ]; description = "Snap dynamic loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-loader-static" = callPackage @@ -189749,8 +196250,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; @@ -189814,8 +196315,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; @@ -189842,6 +196343,49 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-server_1_1_1_0" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, bytestring-builder, case-insensitive, clock + , containers, criterion, deepseq, directory, filepath, HsOpenSSL + , http-common, http-streams, HUnit, io-streams, io-streams-haproxy + , lifted-base, monad-control, mtl, network, old-locale + , openssl-streams, parallel, QuickCheck, random, snap-core + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, threads, time, transformers, unix, unix-compat, vector + }: + mkDerivation { + pname = "snap-server"; + version = "1.1.1.0"; + sha256 = "0kjdsdgpxxsp5r4gpx8wdq5qn1b1y80mgkl9ahjbhlahjf5xyf6k"; + revision = "2"; + editedCabalFile = "1p39ngr6ynmhwgln2cappkgmb5mfxn23i6qwwid6gak62wipldk4"; + configureFlags = [ "-fopenssl" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers filepath HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time unix unix-compat vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + bytestring-builder case-insensitive clock containers deepseq + directory filepath HsOpenSSL http-common http-streams HUnit + io-streams io-streams-haproxy lifted-base monad-control mtl network + old-locale openssl-streams parallel QuickCheck random snap-core + test-framework test-framework-hunit test-framework-quickcheck2 text + threads time transformers unix unix-compat vector + ]; + benchmarkHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + criterion io-streams io-streams-haproxy snap-core vector + ]; + description = "A web server for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-stream" = callPackage ({ mkDerivation, attoparsec, base, bytestring, io-streams , snap-core @@ -189855,6 +196399,7 @@ self: { ]; description = "Streaming Snap handlers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-templates" = callPackage @@ -189874,6 +196419,7 @@ self: { ]; description = "Scaffolding CLI for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-testing" = callPackage @@ -190056,8 +196602,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 @@ -190829,12 +197375,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; @@ -191071,6 +197617,7 @@ self: { ]; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-tls" = callPackage @@ -191125,15 +197672,14 @@ 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 ]; description = "An extensible socket library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-activation" = callPackage @@ -191156,7 +197702,6 @@ self: { libraryHaskellDepends = [ base socket ]; description = "Definitions for ICMP with the `socket` library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-io" = callPackage @@ -191165,14 +197710,13 @@ 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 ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-sctp" = callPackage @@ -191262,6 +197806,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sockets" = callPackage + ({ mkDerivation, async, base, ip, posix-api, primitive, tasty + , tasty-hunit + }: + mkDerivation { + pname = "sockets"; + version = "0.1.0.0"; + sha256 = "000j2bfjsa33l73pg57g4rignl7dy0jl072r3h9wl4d1f4qc3sim"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ip posix-api primitive ]; + testHaskellDepends = [ async base ip primitive tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ip primitive ]; + description = "High-level network sockets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "socketson" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , crypto-api, data-default, DRBG, either, errors, http-types @@ -191294,6 +197856,8 @@ self: { pname = "socks"; version = "0.5.6"; sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs"; + revision = "1"; + editedCabalFile = "19f6yzalxbvw0zi1z8wi0vz7s21p5anvfaqsaszppnkgk6j6nnvn"; libraryHaskellDepends = [ base bytestring cereal network ]; description = "Socks proxy (ver 5)"; license = stdenv.lib.licenses.bsd3; @@ -191334,6 +197898,7 @@ self: { librarySystemDepends = [ softfloat ]; description = "Haskell bindings for SoftFloat"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {softfloat = null;}; "solga" = callPackage @@ -191404,15 +197969,16 @@ self: { }) {}; "solve" = callPackage - ({ mkDerivation, base, containers, filepath }: + ({ mkDerivation, base, containers, filepath, QuickCheck }: mkDerivation { pname = "solve"; - version = "1.1"; - sha256 = "045bj6wskglwg0j0jk0jsqkp4m809g2fy350bi6m84smg64rr3y4"; + 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; }) {}; @@ -191438,6 +198004,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 @@ -191650,23 +198227,6 @@ self: { }) {}; "sox" = callPackage - ({ mkDerivation, base, containers, explicit-exception - , extensible-exceptions, process, sample-frame, semigroups - , transformers, unix, utility-ht - }: - mkDerivation { - pname = "sox"; - version = "0.2.3"; - sha256 = "145dmcj9vj58wrndidarnr7bbkybvzyda88awrxw4p3iqy8s2xb0"; - libraryHaskellDepends = [ - base containers explicit-exception extensible-exceptions process - sample-frame semigroups transformers unix utility-ht - ]; - description = "Play, write, read, convert audio signals using Sox"; - license = "GPL"; - }) {}; - - "sox_0_2_3_1" = callPackage ({ mkDerivation, base, containers, explicit-exception , extensible-exceptions, process, sample-frame, semigroups , transformers, unix, utility-ht @@ -191681,30 +198241,9 @@ self: { ]; description = "Play, write, read, convert audio signals using Sox"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soxlib" = callPackage - ({ mkDerivation, base, bytestring, containers, explicit-exception - , extensible-exceptions, sample-frame, sox, storablevector - , transformers, utility-ht - }: - mkDerivation { - pname = "soxlib"; - version = "0.0.3"; - sha256 = "12ydbn7l8zfnmbxx4jv551vlfs7cflss5vhgaljwxbzan2z5bd8q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers explicit-exception extensible-exceptions - sample-frame storablevector transformers utility-ht - ]; - libraryPkgconfigDepends = [ sox ]; - description = "Write, read, convert audio signals using libsox"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) sox;}; - - "soxlib_0_0_3_1" = callPackage ({ mkDerivation, base, bytestring, explicit-exception , extensible-exceptions, sample-frame, sox, storablevector , transformers, utility-ht @@ -191722,7 +198261,6 @@ self: { libraryPkgconfigDepends = [ sox ]; description = "Write, read, convert audio signals using libsox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) sox;}; "soyuz" = callPackage @@ -191906,8 +198444,8 @@ self: { }: mkDerivation { pname = "sparrow"; - version = "0.0.2.2"; - sha256 = "0y1s22nfy234jgvvkxc77x0gcrlqb1g5vqni6vdwls6ww9n1jwba"; + version = "0.0.3.1"; + sha256 = "1rhmj14z9ypv9z5pg6494kbp4mr5906cpjgsrn1cc5rkgj1xlv59"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable @@ -191917,7 +198455,7 @@ self: { 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; }) {}; @@ -192060,7 +198598,6 @@ self: { ]; description = "3d math including quaternions/euler angles/dcms and utility functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spatial-rotations" = callPackage @@ -192070,10 +198607,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 ]; @@ -192098,16 +198635,22 @@ 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; }) {}; "spe" = callPackage @@ -192200,14 +198743,32 @@ self: { pname = "species"; version = "0.4.0.1"; sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2"; - revision = "1"; - editedCabalFile = "1pvk34n7lsbpng9b6m6nrhhr44z1pilh292j3lfnx69hvxhvaq93"; + revision = "2"; + editedCabalFile = "03rzc0f11c60h899nxifz4300hlic2nnnya75rx2b5rigy41714r"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell ]; description = "Computational combinatorial species"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "spectral-clustering" = callPackage + ({ mkDerivation, base, clustering, eigen, hmatrix, hmatrix-svdlibc + , mwc-random, safe, sparse-linear-algebra, statistics, vector + }: + mkDerivation { + pname = "spectral-clustering"; + version = "0.2.2.3"; + sha256 = "017pf2sqw2p1ipflamlwsgkqsk83qm0y7sw672nkg4zvyck1arwc"; + libraryHaskellDepends = [ + base clustering eigen hmatrix hmatrix-svdlibc mwc-random safe + sparse-linear-algebra statistics vector + ]; + description = "Library for spectral clustering"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculate" = callPackage @@ -192232,6 +198793,7 @@ self: { libraryHaskellDepends = [ base ghc-prim stm transformers ]; description = "A framework for safe, programmable, speculative parallelism"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculation-transformers" = callPackage @@ -192244,6 +198806,7 @@ self: { doHaddock = false; description = "Merged into 'speculation'. Use that instead."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speechmatics" = callPackage @@ -192292,6 +198855,7 @@ self: { testHaskellDepends = [ base containers mwc-probability ]; description = "Speedy slice sampling"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spelling-suggest" = callPackage @@ -192634,6 +199198,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 @@ -192742,22 +199308,6 @@ self: { }) {}; "spreadsheet" = callPackage - ({ mkDerivation, base, explicit-exception, transformers, utility-ht - }: - mkDerivation { - pname = "spreadsheet"; - version = "0.1.3.7"; - sha256 = "180vv2bka5b97gl1g6vdsri2yrfyy6ivdq4jw98qiw50pz66c2l4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base explicit-exception transformers utility-ht - ]; - description = "Read and write spreadsheets from and to CSV files in a lazy way"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "spreadsheet_0_1_3_8" = callPackage ({ mkDerivation, base, explicit-exception, transformers, utility-ht }: mkDerivation { @@ -192771,52 +199321,51 @@ self: { ]; description = "Read and write spreadsheets from and to CSV files in a lazy way"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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 }: @@ -192877,29 +199426,29 @@ self: { ]; description = "Web interface to sproxy database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sproxy2" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, cereal, conduit, containers, cookie, docopt, entropy - , Glob, http-client, http-conduit, http-types - , interpolatedstring-perl6, network, postgresql-simple - , resource-pool, SHA, sqlite-simple, text, time, unix - , unordered-containers, wai, wai-conduit, warp, warp-tls, word8 - , yaml + , bytestring, cereal, conduit, cookie, docopt, entropy, Glob + , http-client, http-conduit, http-types, interpolatedstring-perl6 + , network, postgresql-simple, resource-pool, SHA, sqlite-simple + , text, time, unix, unordered-containers, wai, wai-conduit, warp + , warp-tls, word8, yaml }: mkDerivation { pname = "sproxy2"; - version = "1.96.0"; - sha256 = "0wzkh312d7h957vkf2qqsbnf9xm98vm8y5kzray87rn6rdc5k5x6"; + version = "1.97.0"; + sha256 = "1in8sb41bl46xwk49904xkm3k5s59xikvmyyani1p60l0zfrb2jk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring cereal - conduit containers cookie docopt entropy Glob http-client - http-conduit http-types interpolatedstring-perl6 network - postgresql-simple resource-pool SHA sqlite-simple text time unix - unordered-containers wai wai-conduit warp warp-tls word8 yaml + conduit cookie docopt entropy Glob http-client http-conduit + http-types interpolatedstring-perl6 network postgresql-simple + resource-pool SHA sqlite-simple text time unix unordered-containers + wai wai-conduit warp warp-tls word8 yaml ]; description = "Secure HTTP proxy for authenticating users via OAuth2"; license = stdenv.lib.licenses.mit; @@ -193186,37 +199735,6 @@ self: { }) {}; "squeal-postgresql" = callPackage - ({ mkDerivation, aeson, base, binary-parser, bytestring - , bytestring-strict-builder, deepseq, doctest, generics-sop - , lifted-base, mmorph, monad-control, mtl, network-ip - , postgresql-binary, postgresql-libpq, profunctors, resource-pool - , scientific, text, time, transformers, transformers-base - , uuid-types, vector - }: - mkDerivation { - pname = "squeal-postgresql"; - version = "0.3.2.0"; - sha256 = "022bh32r5cgkiical5jc7ax9im5a3nfl8v2cxc7v1rkq6ag2rclq"; - 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 profunctors - resource-pool scientific text time transformers transformers-base - uuid-types vector - ]; - executableHaskellDepends = [ - base bytestring generics-sop mtl text transformers - transformers-base vector - ]; - testHaskellDepends = [ base doctest ]; - description = "Squeal PostgreSQL Library"; - license = stdenv.lib.licenses.bsd3; - 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 @@ -193271,7 +199789,6 @@ self: { ]; description = "A file-packing application"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sr-extra" = callPackage @@ -193557,8 +200074,8 @@ 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; @@ -193645,34 +200162,6 @@ self: { }) {}; "stache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, directory, file-embed, filepath, hspec, hspec-megaparsec - , megaparsec, mtl, template-haskell, text, unordered-containers - , vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "1.2.1"; - sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; - revision = "8"; - editedCabalFile = "0jz9cg3w71nvxc4y6hrwjayxl2291q5xm5r4qrhz1ag1lvzk26yn"; - 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 - ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq megaparsec text - ]; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stache_2_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, hspec, hspec-discover , hspec-megaparsec, megaparsec, mtl, template-haskell, text @@ -193680,8 +200169,10 @@ self: { }: mkDerivation { pname = "stache"; - version = "2.0.0"; - sha256 = "11j8rvl9dqda73hwd4p7rwmf36w6xc86ls53v9ip6ag2052j1cll"; + version = "2.0.1"; + sha256 = "0awyh8zjvly18s4gnqy4970fj1hr4zpb38lisfy6px42m38g17vk"; + revision = "2"; + editedCabalFile = "17da7jih43nl3zqgpmlk3n2kpwjmb2np4w8ldpq2vyi9ab8p6vjm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -193697,7 +200188,6 @@ self: { ]; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack" = callPackage @@ -193706,11 +200196,11 @@ self: { , 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 @@ -193721,10 +200211,14 @@ self: { }: mkDerivation { pname = "stack"; - version = "1.7.1"; - sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r"; - revision = "10"; - editedCabalFile = "1985lm9m6pm9mi4h4m2nrn9v2rnnfh14slcnqgyxy6k934xqvg35"; + version = "1.9.3"; + sha256 = "01lbr9gp3djr5bzlchzb2rdw20855aganmczvq76fzzjyway64cf"; + revision = "4"; + editedCabalFile = "15mdzgxl82j1yyhxazr4sjr1qpnc83wcf5h4c7lf7iydz60jri79"; + configureFlags = [ + "-fdisable-git-info" "-fhide-dependency-versions" + "-fsupported-build" + ]; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -193750,15 +200244,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 ]; @@ -193916,6 +200410,7 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Stack prisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-run" = callPackage @@ -193966,6 +200461,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 { @@ -193975,6 +200491,7 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "The basic stack type"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-yaml" = callPackage @@ -193993,6 +200510,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stack2cabal" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, extra + , filepath, hpack, stackage-to-hackage, text + }: + mkDerivation { + pname = "stack2cabal"; + version = "1.0.2"; + sha256 = "0zdyjf55zda465ai6bjp13a4f4khgz59smmaa2nlbbrjknlb1kbl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory extra filepath hpack + stackage-to-hackage text + ]; + description = "Convert stack projects to cabal.project + cabal.project.freeze"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack2nix" = callPackage ({ mkDerivation, async, base, Cabal, cabal2nix, containers , directory, distribution-nixpkgs, filepath, hackage-db, hspec @@ -194001,8 +200537,8 @@ self: { }: mkDerivation { pname = "stack2nix"; - version = "0.2.1"; - sha256 = "0rwl6fzxv2ly20mn0pgv63r0ik4zpjigbkc4771ni7zazkxvx1gy"; + version = "0.2.2"; + sha256 = "0x5dsgq9mdibbbilc0wn86qqkdgjkm606y4ix57vwxpfgrgkd3wm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194201,22 +200737,23 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-sandbox" = callPackage @@ -194264,6 +200801,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stackage-to-hackage" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , extra, filepath, HsYAML, http-client, http-client-tls + , optparse-applicative, text + }: + mkDerivation { + pname = "stackage-to-hackage"; + version = "1.1.0"; + sha256 = "165g5vyxck8hh2523v4h0cwjl3yvp4wwzlsdrs9wvg9ca3ij0v85"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory extra filepath HsYAML + http-client http-client-tls text + ]; + executableHaskellDepends = [ + base bytestring Cabal containers directory extra filepath + optparse-applicative text + ]; + description = "Convert stack.yaml to cabal.project + cabal.project.freeze"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stackage-types" = callPackage ({ mkDerivation, aeson, base, Cabal, containers, exceptions , hashable, safe, semigroups, text, time, unordered-containers @@ -194350,6 +200911,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 { @@ -194359,6 +200939,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Numerical statistics for Foldable containers"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stagen" = callPackage @@ -194434,6 +201015,7 @@ self: { libraryHaskellDepends = [ base ]; description = "the * -> * types, operators, and covariant instances"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "star-to-star-contra" = callPackage @@ -194445,6 +201027,7 @@ self: { libraryHaskellDepends = [ base star-to-star ]; description = "contravariant instances for * -> * types and operators"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "starling" = callPackage @@ -194638,8 +201221,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 ]; @@ -194674,6 +201257,7 @@ self: { librarySystemDepends = [ libstatgrab ]; description = "Collect system level metrics and statistics"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libstatgrab;}; "static-canvas" = callPackage @@ -194687,6 +201271,7 @@ self: { libraryHaskellDepends = [ base double-conversion free mtl text ]; description = "DSL to generate HTML5 Canvas javascript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "static-closure" = callPackage @@ -194769,8 +201354,8 @@ self: { }: mkDerivation { pname = "static-text"; - version = "0.2.0.2"; - sha256 = "04sbf0zydgf18ajb20wd8wfbw4gdjmxx3f4h62w0qmafgvrr8w5c"; + version = "0.2.0.4"; + sha256 = "19d43v2cp6wg861lc6rvimzqq20via6fvradysapmilq7svs5kq7"; libraryHaskellDepends = [ base bytestring template-haskell text vector ]; @@ -194796,27 +201381,27 @@ self: { }) {}; "statistics" = callPackage - ({ mkDerivation, aeson, base, base-orphans, binary, deepseq, erf - , HUnit, ieee754, math-functions, monad-par, mwc-random, primitive + ({ 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.14.0.2"; - sha256 = "0y27gafkib0x0fn39qfn2rkgsfrm09ng35sbb5dwr7rclhnxz59l"; - revision = "2"; - editedCabalFile = "1bx70yqkn62ii17fjv3pig4hklrzkqd09zj67zzjiyjzmn04fir3"; + version = "0.15.0.0"; + sha256 = "0wk4pv4fjpqq49vf8zanb9801lbgcbbfhhvlpp3ka6p8jmfc9scm"; libraryHaskellDepends = [ - aeson base base-orphans binary deepseq erf math-functions monad-par - mwc-random primitive vector vector-algorithms - vector-binary-instances vector-th-unbox + 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 erf HUnit ieee754 math-functions mwc-random - primitive QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 vector vector-algorithms + 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; @@ -194944,26 +201529,51 @@ 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 - , template-haskell, transformers, vector + , template-haskell, text, transformers, vector }: mkDerivation { pname = "status-notifier-item"; - version = "0.3.0.0"; - sha256 = "18svwy4j6445n8apd0zx50cb9sc1z9n8rkvfkm4x7s7bgvmh49vv"; + version = "0.3.0.1"; + sha256 = "0wrw635r7c2qdb90hpm5lg3kb16c3dkw88ypbszf18m02f4dsk8h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers dbus filepath hslogger lens network - spool template-haskell transformers vector + spool template-haskell text transformers vector ]; executableHaskellDepends = [ base dbus dbus-hslogger hslogger optparse-applicative ]; description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statvfs" = callPackage @@ -195003,6 +201613,7 @@ self: { ]; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stb-image" = callPackage @@ -195098,8 +201709,8 @@ self: { }: mkDerivation { pname = "steeloverseer"; - version = "2.0.2.0"; - sha256 = "1jj8akshhns3azi9vgfclg9xhbl40nyr1lmf12pisw3mzbd7ld28"; + version = "2.1.0.0"; + sha256 = "1l2pfk6fdnc2ssmcjmwj8w5wfk6ra4n880nbxr670kzrlnr2vqg1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195118,7 +201729,6 @@ self: { ]; description = "A file watcher and development tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stego-uuid" = callPackage @@ -195153,6 +201763,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; @@ -195167,6 +201779,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; + revision = "1"; + editedCabalFile = "03ga9vwaxsf0c73fciavkm925l7lkgya1a6xghyb8ainrav0bfq4"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -195239,15 +201853,14 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "lightweight CSS DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stm_2_4_5_1" = callPackage + "stm_2_5_0_0" = callPackage ({ mkDerivation, array, base }: mkDerivation { pname = "stm"; - version = "2.4.5.1"; - sha256 = "1x53lg07j6d42vnmmk2f9sfqx2v4hxjk3hm11fccjdi70s0c5w3c"; + version = "2.5.0.0"; + sha256 = "1illcj8zgzmpl91hzgk0j74ha436a379gw13siq4gifbcrf6iqsr"; libraryHaskellDepends = [ array base ]; description = "Software Transactional Memory"; license = stdenv.lib.licenses.bsd3; @@ -195301,8 +201914,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 @@ -195318,35 +201931,6 @@ self: { }) {}; "stm-containers" = callPackage - ({ mkDerivation, async, base, base-prelude, containers, criterion - , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl - , mtl-prelude, mwc-random, mwc-random-monad, placeholders - , primitive, QuickCheck, text, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "stm-containers"; - version = "0.2.16"; - sha256 = "0bsha98j8ryzcrcs3n1iyrvx7b37ipc66f7qxkhnkp3wch32y139"; - libraryHaskellDepends = [ - base base-prelude focus hashable list-t primitive transformers - ]; - testHaskellDepends = [ - base base-prelude focus free hashable HTF list-t loch-th mtl - mtl-prelude placeholders primitive QuickCheck transformers - unordered-containers - ]; - benchmarkHaskellDepends = [ - async base base-prelude containers criterion focus free hashable - hashtables list-t loch-th mtl mtl-prelude mwc-random - mwc-random-monad placeholders text unordered-containers vector - ]; - description = "Containers for STM"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "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 @@ -195364,7 +201948,6 @@ self: { ]; description = "Containers for STM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-delay" = callPackage @@ -195433,7 +202016,6 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-io-hooks" = callPackage @@ -195447,6 +202029,7 @@ self: { libraryHaskellDepends = [ array base containers mtl stm ]; description = "STM with IO hooks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-lifted" = callPackage @@ -195455,9 +202038,12 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-linkedlist" = callPackage @@ -195521,8 +202107,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; @@ -195539,6 +202125,7 @@ self: { ]; description = "retry statistics for STM transactions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-supply" = callPackage @@ -195700,12 +202287,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; }) {}; @@ -195816,7 +202403,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 @@ -195827,8 +202414,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 @@ -195841,11 +202428,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 @@ -195901,6 +202488,21 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "str" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, Crypto , hashable, MissingH, text, utf8-string @@ -195925,8 +202527,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.24.4"; - sha256 = "0n4gry4vgqb64vy9ncyz3hcsjv31a869al5kbwgzi7pd7rp61zla"; + version = "0.29.1"; + sha256 = "0j3mb09k498xynhc82cnsknzkbjwn9lvvanrz78jpx4fhh73zrlz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195942,15 +202544,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_25_0" = callPackage + "stratosphere_0_30_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.30.1"; + sha256 = "1j2k4z5chi41fjf1shhci8yf6x5fyj1z5wa077n3n3m7hrlf3r76"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196129,6 +202731,7 @@ self: { libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Control library for the Elgato Stream Deck"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streamed" = callPackage @@ -196156,10 +202759,8 @@ self: { }: mkDerivation { pname = "streaming"; - version = "0.2.1.0"; - sha256 = "0xah2cn12dxqc54wa5yxx0g0b9n0xy0czc0c32awql63qhw5w7g1"; - revision = "2"; - editedCabalFile = "124nccw28cwzjzl82anbwk7phcyfzlz8yx6wyl4baymzdikvbpgq"; + version = "0.2.2.0"; + sha256 = "04fdw4f51yb16bv3b7z97vqxbns8rv2ag2aphglm29jsd527fsss"; libraryHaskellDepends = [ base containers ghc-prim mmorph mtl semigroups transformers transformers-base @@ -196176,8 +202777,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 ]; @@ -196397,6 +202998,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 @@ -196546,6 +203163,7 @@ self: { ]; description = "Sorting streams"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streaming-utils" = callPackage @@ -196602,29 +203220,34 @@ self: { }) {}; "streamly" = callPackage - ({ mkDerivation, atomic-primops, base, containers, deepseq - , exceptions, gauge, heaps, hspec, lockfree-queue, monad-control - , mtl, QuickCheck, random, transformers, transformers-base + ({ 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.3.0"; - sha256 = "0ssp66w8qbfbx9p6hdgvddp3d82i1b4b0n9jbji6cyvf7v8b7m1k"; + version = "0.5.2"; + sha256 = "1pla9356yhf6zv2yz4mh8g1dslzdkkych4jrjyi4rw66frvw0jg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - atomic-primops base containers exceptions heaps lockfree-queue - monad-control mtl transformers transformers-base + 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 = [ base deepseq gauge random ]; + benchmarkHaskellDepends = [ + 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"; license = stdenv.lib.licenses.bsd3; }) {}; - "streamly_0_5_0" = callPackage + "streamly_0_6_0" = callPackage ({ mkDerivation, atomic-primops, base, clock, containers, deepseq , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue , monad-control, mtl, QuickCheck, random, transformers @@ -196632,22 +203255,19 @@ self: { }: mkDerivation { pname = "streamly"; - version = "0.5.0"; - sha256 = "1kzgrwnr2w6w4yjmx4qm325d0hf4wy21gb7a1cv0db4jkha3672s"; + version = "0.6.0"; + sha256 = "05gwyzp03lz2gv5civg5dkqx1vab261iasrvfvr7sqi4xyj0kzns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - atomic-primops base clock containers exceptions ghc-prim heaps - lockfree-queue monad-control mtl transformers transformers-base + atomic-primops base clock containers deepseq 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 clock containers deepseq exceptions gauge - ghc-prim heaps lockfree-queue monad-control mtl random transformers - transformers-base - ]; + benchmarkHaskellDepends = [ base deepseq gauge random ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -196779,8 +203399,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; @@ -196846,21 +203466,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-tuple" = callPackage + ({ mkDerivation, base, deepseq, hashable }: + mkDerivation { + pname = "strict-tuple"; + version = "0.1.2"; + sha256 = "1897l4x7aqadwbvq26di2cd7bsj498dvm3lsshbc37p1f3qry3lj"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ 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 ]; description = "A type level predicate ranging over strict types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-writer" = callPackage @@ -197043,6 +203674,7 @@ self: { ]; description = "A library for generating random string from a regular experession"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-similarity" = callPackage @@ -197167,6 +203799,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; @@ -197216,29 +203850,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stripe-concepts" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "stripe-concepts"; + version = "1.0.0.0"; + sha256 = "0s518mlb181407w2gmlhaayaf3ypn03lzw3fmkzkiqz2c89kd1rw"; + libraryHaskellDepends = [ base bytestring text ]; + description = "Types for the Stripe API"; + license = stdenv.lib.licenses.mit; + }) {}; + "stripe-core" = callPackage ({ mkDerivation, aeson, base, bytestring, mtl, text, time , transformers, unordered-containers }: 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 ]; description = "Stripe API for Haskell - Pure Core"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-haskell" = callPackage ({ 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; @@ -197251,8 +203895,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 @@ -197271,8 +203915,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 @@ -197283,9 +203927,43 @@ self: { doCheck = false; description = "Stripe API for Haskell - http-streams backend"; license = stdenv.lib.licenses.mit; + }) {}; + + "stripe-scotty" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-types, scotty + , stripe-concepts, stripe-signature, text, unordered-containers + }: + mkDerivation { + pname = "stripe-scotty"; + version = "1.0.0.0"; + sha256 = "195v1a3sl5skz2jr71r1b4za033s6hib7ld59f4fdrfdr5658sbs"; + revision = "1"; + editedCabalFile = "0c3r39217650yjxxs1523ywvyiirrh2f209gl4hfznyigkx2kg41"; + libraryHaskellDepends = [ + aeson base bytestring http-types scotty stripe-concepts + stripe-signature text unordered-containers + ]; + description = "Listen for Stripe webhook events with Scotty"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stripe-signature" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, hex-text, memory + , stripe-concepts, text + }: + mkDerivation { + pname = "stripe-signature"; + version = "1.0.0.0"; + sha256 = "0hg5l9fyfr6yhna2awcyrfr38zlpd1q58b6q6fc3aq8qhbwk8zps"; + libraryHaskellDepends = [ + base bytestring cryptonite hex-text memory stripe-concepts text + ]; + testHaskellDepends = [ base bytestring text ]; + description = "Verification of Stripe webhook signatures"; + license = stdenv.lib.licenses.mit; + }) {}; + "stripe-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core , mtl, random, stripe-core, text, time, transformers @@ -197293,15 +203971,30 @@ 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 ]; description = "Tests for Stripe API bindings for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "stripe-wreq" = callPackage + ({ mkDerivation, aeson, base, bytestring, lens, stripe-concepts + , text, unordered-containers, wreq + }: + mkDerivation { + pname = "stripe-wreq"; + version = "1.0.0.0"; + sha256 = "1cm9fvkpanxydbbrk9s1yj3bkxd7wcschi40a4dhmh8h3wr89y8s"; + libraryHaskellDepends = [ + aeson base bytestring lens stripe-concepts text + unordered-containers wreq + ]; + description = "Use the Stripe API via Wreq"; + license = stdenv.lib.licenses.mit; }) {}; "strips" = callPackage @@ -197325,8 +204018,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "5.0.6"; - sha256 = "0dpf986nbsz5j47dl26073qyz290nznghi85mzj2gw0rlj9dp937"; + version = "5.0.8"; + sha256 = "0wfi3s8hv11xs0wpvbc9z4nsskdpg5q7ivcpci8cnhn20wffb0nn"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -197414,8 +204107,8 @@ self: { }: mkDerivation { pname = "structured-cli"; - version = "0.9.4.1"; - sha256 = "15dyr7a122d43ddkadn6syy356yccp0gk087bw5slv80isgp95zi"; + version = "2.5.0.3"; + sha256 = "14kmsh3n4d6zgpqkv1v4laz2sd52317i840szp9mw3i72f012gj0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197434,6 +204127,8 @@ self: { pname = "structured-haskell-mode"; version = "1.1.0"; sha256 = "1d1qv9d8qifcxbxqb6a6j0fsi65lg8sndn7hn2s38hgnxdb7llf5"; + revision = "1"; + editedCabalFile = "0z3rd0wpnw9xrz2jrda6n8lg0mnzmgkjrjc48vzdjsf76ysjnfka"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -197558,18 +204253,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 @@ -197591,8 +204287,8 @@ self: { }: mkDerivation { pname = "stylish-cabal"; - version = "0.4.0.1"; - sha256 = "00jwq35dr60c9gjwy8hg3i8b39gxknr92mrz21657gazl90cxy4z"; + version = "0.4.1.0"; + sha256 = "0yxxw22n2k4dpcxyzq140vg3l6338549qds1v3ggkwsykmz3469s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197607,6 +204303,7 @@ self: { doHaddock = false; description = "Format Cabal files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stylish-haskell" = callPackage @@ -197617,8 +204314,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.9.2.0"; - sha256 = "16r2nm1y0s5ybrq2pzsq00nfq7k0i70nyg7ynmhx76lld82i17yv"; + version = "0.9.2.1"; + sha256 = "1ls11fdx6snvfx8yykpidz142zzxwi5bazl49hgfqlwx50rqcp7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197668,6 +204365,34 @@ self: { license = "GPL"; }) {}; + "suavemente" = callPackage + ({ mkDerivation, base, blaze-markup, bytestring, diagrams-core + , diagrams-lib, diagrams-svg, interpolatedstring-perl6, lens, mtl + , servant, servant-blaze, servant-server, servant-websockets, stm + , streaming, svg-builder, transformers, warp, websockets + }: + mkDerivation { + pname = "suavemente"; + version = "0.1.0.0"; + sha256 = "1595jc7lqvdk60p0cc3vjag7lgd90ayfwb16n70i1j9sz3b2qvva"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup bytestring diagrams-core diagrams-lib + diagrams-svg interpolatedstring-perl6 lens mtl servant + servant-blaze servant-server servant-websockets stm streaming + svg-builder transformers warp websockets + ]; + executableHaskellDepends = [ + base blaze-markup bytestring diagrams-core diagrams-lib + diagrams-svg interpolatedstring-perl6 lens mtl servant + servant-blaze servant-server servant-websockets stm streaming + svg-builder transformers warp websockets + ]; + description = "An applicative functor that seamlessly talks to HTML inputs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sub-state" = callPackage ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances, sets , tasty, tasty-hunit, tasty-quickcheck @@ -197840,6 +204565,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Subword graph implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "subzero" = callPackage @@ -197966,39 +204692,15 @@ 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"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring directory filepath - generic-deriving 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"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "summoner_1_1_0_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring - , directory, filepath, generic-deriving, gitrev, hedgehog - , neat-interpolation, optparse-applicative, process, relude, tasty - , tasty-discover, tasty-hedgehog, text, time, tomland - }: - mkDerivation { - pname = "summoner"; - version = "1.1.0.1"; - sha256 = "0l9v85d9s5n6lz9k2k44pxx8yqqmrxnvz9q0pi5rhvwq53c50x83"; + version = "1.2.0"; + sha256 = "04shi46j44g81zylmrm807rlinfx6sjpdwvxxyw9rhnpx56b8r34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198006,12 +204708,12 @@ self: { generic-deriving gitrev neat-interpolation optparse-applicative process relude text time tomland ]; - executableHaskellDepends = [ base-noprelude relude ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - base-noprelude hedgehog relude tasty tasty-hedgehog tomland + base-noprelude filepath hedgehog hspec neat-interpolation relude + tomland ]; - testToolDepends = [ tasty-discover ]; - description = "Tool for creating completely configured production Haskell projects"; + description = "Tool for scaffolding completely configured production Haskell projects"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -198127,28 +204829,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; @@ -198167,6 +204868,7 @@ self: { testHaskellDepends = [ base containers hspec ]; description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "superbuffer" = callPackage @@ -198249,20 +204951,14 @@ 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; }) {}; "superevent" = callPackage @@ -198360,6 +205056,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "supervisors" = callPackage + ({ mkDerivation, async, base, containers, hspec, safe-exceptions + , stm + }: + mkDerivation { + pname = "supervisors"; + version = "0.2.0.0"; + sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i"; + libraryHaskellDepends = [ + async base containers safe-exceptions stm + ]; + testHaskellDepends = [ base hspec ]; + description = "Monitor groups of threads with non-hierarchical lifetimes"; + license = stdenv.lib.licenses.mit; + }) {}; + "supplemented" = callPackage ({ mkDerivation, base, base-prelude, QuickCheck , quickcheck-instances, rebase, tasty, tasty-hunit @@ -198404,15 +205116,15 @@ 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.3"; + sha256 = "19mf3sf3smza4yk21k98wb39mk3jg0nxr93nl924ivsyv514flgx"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -198422,6 +205134,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; @@ -198433,10 +205149,10 @@ self: { }: mkDerivation { pname = "sv-cassava"; - version = "0.2"; - sha256 = "01bhh3b85gsbgm3fb0ppb1ihcm2p0rkv6bsmw16l3b2jgj806zin"; + version = "0.3"; + sha256 = "1c4wacp7k5sgr5fy73h9if98d08apmcs6p4p3f3fvpqkm8jmf71b"; revision = "1"; - editedCabalFile = "1manx0gs4rzsrg9mg83g7ipv36bplxl466c2ypf5dx5f2pn1xvjx"; + editedCabalFile = "01xfdl296jcdh7c4yirzf6z0787z941h6p58dn5xhnsr965sncg1"; libraryHaskellDepends = [ attoparsec base bytestring cassava sv-core utf8-string validation vector @@ -198446,7 +205162,6 @@ self: { ]; description = "Integration to use sv with cassava's parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sv-core" = callPackage @@ -198458,8 +205173,8 @@ self: { }: mkDerivation { pname = "sv-core"; - version = "0.2.2"; - sha256 = "08wd9ajzzhkqg5ghqr3vilq1w8h8vypd3yy63ql6amnqdnjw02mf"; + version = "0.3.1"; + sha256 = "08j8qin7q04jvrb1gd870cylix7p81f4rws1k31b3azby2mdja6h"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq lens mtl parsec profunctors readable semigroupoids @@ -198472,6 +205187,31 @@ self: { ]; description = "Encode and decode separated values (CSV, PSV, ...)"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "sv-core_0_4" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , containers, contravariant, deepseq, double-conversion, lens, mtl + , parsec, profunctors, QuickCheck, readable, semigroupoids + , semigroups, tasty, tasty-quickcheck, text, transformers, trifecta + , utf8-string, validation, vector, void + }: + mkDerivation { + pname = "sv-core"; + version = "0.4"; + sha256 = "0m87rffkv5716dh6v00p4gc257fdc81fahjafs02kkf8fbiivmkh"; + libraryHaskellDepends = [ + attoparsec base bifunctors bytestring containers contravariant + deepseq double-conversion lens mtl parsec profunctors readable + semigroupoids semigroups text transformers trifecta utf8-string + validation vector void + ]; + testHaskellDepends = [ + base bytestring profunctors QuickCheck semigroupoids semigroups + tasty tasty-quickcheck text validation vector + ]; + description = "Encode and decode separated values (CSV, PSV, ...)"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -198481,8 +205221,10 @@ self: { }: mkDerivation { pname = "sv-svfactor"; - version = "0.1"; - sha256 = "0j97va25p30x3q07084mbv4lsls6p2yky8y7zmf9w6i7i42r3bi0"; + version = "0.2"; + sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; + revision = "1"; + editedCabalFile = "0g0bswas1y06k1yg9lgzwm36pyxd05s3pji3nsiqff6bhfph3d37"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -198512,6 +205254,7 @@ self: { ]; description = "Syntax-preserving CSV manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svg-builder" = callPackage @@ -198522,6 +205265,8 @@ self: { pname = "svg-builder"; version = "0.1.1"; sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g"; + revision = "1"; + editedCabalFile = "1bhp9gvid2iis411k1vvyj5krzc4ahxcqcd9cwx9h37jxg180xw1"; libraryHaskellDepends = [ base blaze-builder bytestring hashable text unordered-containers ]; @@ -198552,15 +205297,14 @@ 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 ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svg2q" = callPackage @@ -198596,6 +205340,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the libsvg-cairo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) librsvg;}; "svgutils" = callPackage @@ -198688,6 +205433,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 @@ -198749,63 +205495,31 @@ self: { }) {}; "swagger2" = 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 + ({ 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.2.2"; - sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2"; - revision = "3"; - editedCabalFile = "187jl8slpyr6blcxnhdp7wf85ab54pgqnbl11n816xg6fyqy7ylk"; + version = "2.3.1.1"; + sha256 = "19fslhjqcnk0da1c8sdflnnxjzbbzqb0nbknpgyd45q0psxr6xs7"; 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 - ]; - 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 + 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 ]; - testToolDepends = [ hspec-discover ]; - description = "Swagger 2.0 data model"; - 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 - , quickcheck-instances, scientific, template-haskell, text, time - , transformers, transformers-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "swagger2"; - version = "2.3"; - sha256 = "0r1bkx667727h4wvcq1l6295c78s24s6qk9p62jdiafq3844bwm3"; - 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 - ]; 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"; @@ -198886,33 +205600,8 @@ self: { }: mkDerivation { pname = "swish"; - version = "0.9.2.1"; - sha256 = "0zrzihgwn5lg23zmg2iqwilpfj6r77rh1am8g6rwkyf42bgvwhzg"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers directory filepath hashable intern mtl network-uri - old-locale polyparse semigroups text time - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers hashable HUnit network-uri old-locale semigroups - test-framework test-framework-hunit text time - ]; - description = "A semantic web toolkit"; - license = stdenv.lib.licenses.lgpl21; - }) {}; - - "swish_0_10_0_0" = 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; @@ -198927,7 +205616,6 @@ self: { ]; description = "A semantic web toolkit"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sws" = callPackage @@ -198937,8 +205625,8 @@ self: { }: mkDerivation { pname = "sws"; - version = "0.4.2.0"; - sha256 = "0bwfpw348g167a195f8g4cp3h553hkanm6s67bairhn8qprh8az4"; + version = "0.4.3.0"; + sha256 = "0zwh7az9pgsgvx9wbjnz8lzy2v8lrkkwv3h72jfy5sj50xylrzbr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -198948,7 +205636,6 @@ self: { ]; description = "A simple web server for serving directories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sxml" = callPackage @@ -198996,8 +205683,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 ]; @@ -199103,6 +205790,7 @@ self: { ]; description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symantic-cli" = callPackage @@ -199118,6 +205806,7 @@ self: { ]; description = "Library for Command Line Interface (CLI)"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symantic-document" = callPackage @@ -199150,6 +205839,7 @@ self: { ]; description = "Library for symantic grammars"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "symantic-lib" = callPackage @@ -199181,13 +205871,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 @@ -199226,8 +205927,8 @@ self: { ({ mkDerivation, base, containers, hspec, HUnit }: mkDerivation { pname = "symmetric-properties"; - version = "0.1.0.0"; - sha256 = "10q6w071fa9nyrg7kz9zil3jz7xpvp5l8ni4kddra10dp2hnwg80"; + version = "0.1.0.1"; + sha256 = "06gsplc7l3vc5gyqh0c7ih814x826zjamx6ngsjx5pj1jsbia1wm"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base hspec HUnit ]; description = "Monoids for sameness and uniqueness"; @@ -199860,25 +206561,6 @@ self: { }) {}; "system-fileio" = callPackage - ({ mkDerivation, base, bytestring, chell, system-filepath - , temporary, text, time, transformers, unix - }: - mkDerivation { - pname = "system-fileio"; - version = "0.3.16.3"; - sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i"; - libraryHaskellDepends = [ - base bytestring system-filepath text time unix - ]; - testHaskellDepends = [ - base bytestring chell system-filepath temporary text time - transformers unix - ]; - description = "Consistent filesystem interaction across GHC versions (deprecated)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "system-fileio_0_3_16_4" = callPackage ({ mkDerivation, base, bytestring, chell, system-filepath , temporary, text, time, transformers, unix }: @@ -199895,7 +206577,6 @@ self: { ]; description = "Consistent filesystem interaction across GHC versions (deprecated)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-filepath" = callPackage @@ -200249,9 +206930,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 @@ -200276,8 +206960,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 = [ @@ -200292,6 +206976,7 @@ self: { ]; description = "Layout text as grid or table"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "table-tennis" = callPackage @@ -200384,6 +207069,7 @@ self: { ]; description = "Pretty-printing of CSV files"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tabloid" = callPackage @@ -200432,35 +207118,35 @@ self: { }) {}; "taffybar" = callPackage - ({ mkDerivation, base, cairo, ConfigFile, containers, dbus + ({ mkDerivation, base, bytestring, ConfigFile, containers, dbus , dbus-hslogger, directory, dyre, either, enclosed-exceptions - , filepath, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-glib - , gi-gtk, gi-gtk-hs, gi-pango, glib, gtk-sni-tray, gtk-strut, gtk3 - , haskell-gi, haskell-gi-base, hslogger, HStringTemplate, HTTP - , multimap, network, network-uri, old-locale, optparse-applicative - , parsec, process, rate-limit, regex-compat, safe, split - , status-notifier-item, stm, template-haskell, text, time - , time-locale-compat, time-units, transformers, transformers-base - , tuple, unix, utf8-string, X11, xdg-basedir, xml, xml-helpers - , xmonad, xmonad-contrib + , filepath, gi-cairo, gi-cairo-connector, gi-cairo-render, gi-gdk + , gi-gdkpixbuf, gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango + , gtk-sni-tray, gtk-strut, gtk3, haskell-gi, haskell-gi-base + , hslogger, HStringTemplate, HTTP, multimap, network, network-uri + , old-locale, optparse-applicative, parsec, process, rate-limit + , regex-compat, safe, scotty, split, status-notifier-item, stm + , template-haskell, text, time, time-locale-compat, time-units + , transformers, transformers-base, tuple, unix, utf8-string, X11 + , xdg-basedir, xml, xml-helpers, xmonad }: mkDerivation { pname = "taffybar"; - version = "3.0.0"; - sha256 = "0p3gjpfsj3l5z1v62mf1j3ia0qd5b0dxn2s77dzrxj4qd4iwjnld"; + version = "3.1.1"; + sha256 = "1n8i15qnz3chls9y7mxhhpwmk9cl5ymd4p9s3hlqavnfxim7lnpj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base cairo ConfigFile containers dbus dbus-hslogger directory dyre - either enclosed-exceptions filepath gi-cairo gi-gdk gi-gdkpixbuf - gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango glib gtk-sni-tray - gtk-strut haskell-gi haskell-gi-base hslogger HStringTemplate HTTP - multimap network network-uri old-locale parsec process rate-limit - regex-compat safe split status-notifier-item stm template-haskell - text time time-locale-compat time-units transformers - transformers-base tuple unix utf8-string X11 xdg-basedir xml - xml-helpers xmonad xmonad-contrib + base bytestring ConfigFile containers dbus dbus-hslogger directory + dyre either enclosed-exceptions filepath gi-cairo + gi-cairo-connector gi-cairo-render gi-gdk gi-gdkpixbuf gi-gdkx11 + gi-glib gi-gtk gi-gtk-hs gi-pango gtk-sni-tray gtk-strut haskell-gi + haskell-gi-base hslogger HStringTemplate HTTP multimap network + network-uri old-locale parsec process rate-limit regex-compat safe + scotty split status-notifier-item stm template-haskell text time + time-locale-compat time-units transformers transformers-base tuple + unix utf8-string X11 xdg-basedir xml xml-helpers xmonad ]; libraryPkgconfigDepends = [ gtk3 ]; executableHaskellDepends = [ base hslogger optparse-applicative ]; @@ -200499,31 +207185,6 @@ self: { }) {}; "tagchup" = callPackage - ({ mkDerivation, base, bytestring, containers, data-accessor - , explicit-exception, non-empty, old-time, transformers, utility-ht - , xml-basic - }: - mkDerivation { - pname = "tagchup"; - version = "0.4.1"; - sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-accessor explicit-exception - non-empty transformers utility-ht xml-basic - ]; - testHaskellDepends = [ base xml-basic ]; - benchmarkHaskellDepends = [ - base bytestring containers data-accessor explicit-exception - old-time transformers utility-ht xml-basic - ]; - description = "alternative package for processing of tag soups"; - license = "GPL"; - }) {}; - - "tagchup_0_4_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , explicit-exception, non-empty, old-time, transformers, utility-ht , xml-basic @@ -200546,27 +207207,9 @@ self: { ]; description = "alternative package for processing of tag soups"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagged" = callPackage - ({ mkDerivation, base, deepseq, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "tagged"; - version = "0.8.5"; - sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74"; - revision = "2"; - editedCabalFile = "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5"; - libraryHaskellDepends = [ - base deepseq template-haskell transformers transformers-compat - ]; - description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tagged_0_8_6" = callPackage ({ mkDerivation, base, deepseq, template-haskell, transformers }: mkDerivation { pname = "tagged"; @@ -200577,7 +207220,6 @@ self: { ]; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagged-binary" = callPackage @@ -200775,14 +207417,13 @@ 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 ]; description = "Positional tags and tagsets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagshare" = callPackage @@ -200802,8 +207443,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 @@ -200934,25 +207575,25 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tak" = callPackage @@ -201159,6 +207800,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tapioca" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, cassava + , errors, hspec, lens, unordered-containers, vector + }: + mkDerivation { + pname = "tapioca"; + version = "0.1.1.0"; + sha256 = "12rx22dixl4i48jmicvax0ix5h2savcmdni4bxh5c3pm2ic1330m"; + libraryHaskellDepends = [ + attoparsec base binary bytestring cassava errors lens + unordered-containers vector + ]; + testHaskellDepends = [ base hspec vector ]; + description = "A tasty enhancement to cassava for easy csv exporting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tar_0_4_1_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, old-time }: mkDerivation { @@ -201184,6 +207842,8 @@ self: { pname = "tar"; version = "0.5.1.0"; sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8"; + revision = "1"; + editedCabalFile = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -201206,33 +207866,8 @@ self: { }: mkDerivation { pname = "tar-conduit"; - version = "0.2.5"; - sha256 = "0gnklkw9qv496m8nxm1mlfddyiw8c5lsj5pcshxv7c6rv9n3vva3"; - libraryHaskellDepends = [ - base bytestring conduit conduit-combinators directory filepath - safe-exceptions text unix - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators conduit-extra - containers deepseq directory filepath hspec QuickCheck weigh - ]; - benchmarkHaskellDepends = [ - base bytestring conduit conduit-combinators containers criterion - deepseq directory filepath hspec - ]; - description = "Extract and create tar files using conduit for streaming"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tar-conduit_0_3_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , conduit-extra, containers, criterion, deepseq, directory - , filepath, hspec, QuickCheck, safe-exceptions, text, unix, weigh - }: - mkDerivation { - pname = "tar-conduit"; - version = "0.3.0"; - sha256 = "0g35wiqn0bi31sqnzknq90iy265c7lw15rkyrzc6c2vp6nl86j08"; + version = "0.3.2"; + sha256 = "0bgn3hyf20g1gfnzy8f41s7nj54kfcyjk2izw99svrw8f3dphi80"; libraryHaskellDepends = [ base bytestring conduit conduit-combinators directory filepath safe-exceptions text unix @@ -201247,7 +207882,6 @@ self: { ]; description = "Extract and create tar files using conduit for streaming"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tardis" = callPackage @@ -201406,14 +208040,32 @@ self: { }: mkDerivation { pname = "tasty"; - version = "1.1.0.3"; - sha256 = "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22"; + 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; + }) {}; + + "tasty_1_2_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl + , optparse-applicative, stm, tagged, unbounded-delays, unix + , wcwidth + }: + mkDerivation { + pname = "tasty"; + version = "1.2.1"; + sha256 = "0yw8bb92x723md31nisd75mdbfsq9can1h5r4gchdjvwafxy98ia"; 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 @@ -201423,8 +208075,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.1.4"; - sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8"; + version = "1.1.5"; + sha256 = "1px562a9c3vn0qxy8zs8mkp73nfqca17hdwhv5p7qgawpjafxk32"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -201458,8 +208110,8 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.2.0.7"; - sha256 = "1wg6baw9rll5wajbr10av664i0dswy72flfha320137s6s3by2wc"; + version = "1.2.1.0"; + sha256 = "0a0iqc9vnrj4a44h77larcprydipwxy9qkh3zb6zk9mpn9fas498"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -201497,6 +208149,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; @@ -201566,8 +208220,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 @@ -201585,6 +208239,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 @@ -201594,6 +208250,7 @@ self: { ]; description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-hspec" = callPackage @@ -201602,10 +208259,10 @@ self: { }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.5"; - sha256 = "0m0ip2l4rg4pnrvk3mjxkbq2l683psv1x3v9l4rglk2k3pvxq36v"; - revision = "2"; - editedCabalFile = "0rya3dnhrci40nsf3fd5jdzn875n3awpy2xzb99jfl9i2cs3krc2"; + version = "1.1.5.1"; + sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y"; + revision = "1"; + editedCabalFile = "18k4p273qnvfmk5cbm89rjqr0v03v0q22q7bbl7z3bxpwnnkmhqf"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -201800,14 +208457,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.14"; + sha256 = "0s0zj8ds4g1w2cjzm2lh25ivg962jigqdrbj08v3dbz64lx4mlzr"; libraryHaskellDepends = [ base containers mtl optparse-applicative reducers split stm tagged tasty transformers @@ -201824,8 +208496,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 @@ -201863,6 +208535,7 @@ self: { ]; description = "Collect statistics of your Tasty testsuite"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-tap" = callPackage @@ -201882,6 +208555,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tasty-test-vector" = callPackage + ({ mkDerivation, base, tasty }: + mkDerivation { + pname = "tasty-test-vector"; + version = "0"; + sha256 = "1kgz9mp1h391rqj9n78bfvxl8pd3bxanbnwkc5l9gvlygly3fz8j"; + libraryHaskellDepends = [ base tasty ]; + description = "Test vector support for tasty"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tasty-th" = callPackage ({ mkDerivation, base, haskell-src-exts, tasty, tasty-hunit , template-haskell @@ -201911,6 +208595,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.1.0"; + sha256 = "1ix1ksibdkqrycrcnyi6vablp17kg3ajw5kghff1ia7wd2nb9fbk"; + 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 { @@ -202066,8 +208766,8 @@ self: { }: mkDerivation { pname = "tcp-streams"; - version = "1.0.1.0"; - sha256 = "0qa8dvlxg6r7f6qxq46xj1fq5ksbvznjqs624v57ay2nvgji5n3p"; + version = "1.0.1.1"; + sha256 = "1dz21ycm06d9mwc6dbjr8ansl212ril3i5jl73yzkdi9ngj16qqa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class io-streams network pem tls x509 @@ -202140,6 +208840,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 @@ -202151,6 +208853,7 @@ self: { ]; description = "On-line accumulation of rank-based statistics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tdigest-Chart" = callPackage @@ -202206,8 +208909,8 @@ self: { }: mkDerivation { pname = "teardown"; - version = "0.5.0.0"; - sha256 = "0p1rjvl36gl4dqpvcjsb06jyiwsxg2qyha8rfdiddljb4ixw1sjh"; + version = "0.5.0.1"; + sha256 = "1ian64cbmw18n75p2jx8d856d3gz5lahvfxy1xbsh1isz56jzh2d"; libraryHaskellDepends = [ base prettyprinter rio typed-process unliftio ]; @@ -202219,6 +208922,7 @@ self: { ]; description = "Build safe and composable teardown sub-routines for resources"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teeth" = callPackage @@ -202438,12 +209142,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; @@ -202498,21 +209202,22 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-yj" = callPackage @@ -202809,6 +209514,7 @@ self: { ]; description = "TensorFlow bindings"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libtensorflow;}; "tensorflow-core-ops" = callPackage @@ -202829,6 +209535,7 @@ self: { ]; description = "Haskell wrappers for Core Tensorflow Ops"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-logging" = callPackage @@ -202857,6 +209564,7 @@ self: { ]; description = "TensorBoard related functionality"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-mnist" = callPackage @@ -202909,6 +209617,7 @@ self: { ]; description = "Code generation for TensorFlow operations"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-ops" = callPackage @@ -202938,6 +209647,7 @@ self: { ]; description = "Friendly layer around TensorFlow bindings"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tensorflow-proto" = callPackage @@ -202955,6 +209665,7 @@ self: { libraryToolDepends = [ protobuf ]; description = "TensorFlow protocol buffers"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "tensorflow-records" = callPackage @@ -203000,14 +209711,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "tensors" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, reflection, singletons + , vector + }: + mkDerivation { + pname = "tensors"; + version = "0.1.2"; + sha256 = "19r1jjpb8vbjmjbcs0sgnn83mniihw2v1dwhpkm6alrxqdai1637"; + libraryHaskellDepends = [ base reflection singletons vector ]; + testHaskellDepends = [ + base hspec QuickCheck reflection 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 @@ -203015,7 +209742,6 @@ self: { testHaskellDepends = [ base containers HUnit QuickCheck ]; description = "Term Rewriting Library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "termbox" = callPackage @@ -203024,6 +209750,8 @@ self: { pname = "termbox"; version = "0.1.0"; sha256 = "1wylp818y65rwdrzmh596sn8csiwjma6gh6wm4fn9m9zb1nvzbsa"; + revision = "1"; + editedCabalFile = "0qwab9ayd9b8gmcnvy6pbbp16vwnqdzji9qi71jmgvviayqdlly5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; @@ -203042,6 +209770,7 @@ self: { libraryHaskellDepends = [ base reactive-banana stm termbox ]; description = "reactive-banana + termbox"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "termbox-bindings" = callPackage @@ -203075,24 +209804,64 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "terminal" = callPackage + ({ mkDerivation, async, base, bytestring, exceptions, prettyprinter + , stm, tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "terminal"; + version = "0.1.0.0"; + sha256 = "15km89sb94aqnyjvl1i63nqchqszd9hpa46sxrv2wbbn1dajcfbx"; + libraryHaskellDepends = [ + async base bytestring exceptions prettyprinter stm text + transformers + ]; + testHaskellDepends = [ + async base bytestring exceptions prettyprinter stm tasty + tasty-hunit tasty-quickcheck text transformers + ]; + description = "Portable terminal interaction library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "terminal-progress-bar" = callPackage - ({ mkDerivation, async, base, HUnit, stm, stm-chans, terminal-size - , test-framework, test-framework-hunit + ({ mkDerivation, base, criterion, deepseq, HUnit, terminal-size + , test-framework, test-framework-hunit, text, time }: mkDerivation { pname = "terminal-progress-bar"; - version = "0.2"; - sha256 = "052az3lxmhfssvm1i5md5d9la7vhfy560ls101kvw73vdzxk9cfn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ async base stm stm-chans terminal-size ]; + version = "0.4.0.1"; + sha256 = "0xz2kbjh83hcxxx6iaijckddfqawjziiwhqyapwq77fdrc7p5af5"; + revision = "1"; + editedCabalFile = "08wp7ac11qq1zbq0axb4xvzz6grl1jgg54sgq7i9dx3c1a7035zg"; + libraryHaskellDepends = [ base deepseq terminal-size text time ]; testHaskellDepends = [ - base HUnit test-framework test-framework-hunit + base HUnit test-framework test-framework-hunit text time ]; + benchmarkHaskellDepends = [ base criterion time ]; description = "A simple progress bar in the terminal"; license = stdenv.lib.licenses.bsd3; }) {}; + "terminal-punch" = callPackage + ({ mkDerivation, ansi-terminal, base, filepath, QuickCheck, text + , time + }: + mkDerivation { + pname = "terminal-punch"; + version = "0.1.1"; + sha256 = "11z6jb130300yjkrl511960anjac9ncc3g1yj6jqpah6j2imsa8s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base filepath text time + ]; + testHaskellDepends = [ base QuickCheck time ]; + description = "Simple terminal-based time tracker"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "terminal-size" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -203110,8 +209879,8 @@ self: { }: mkDerivation { pname = "terminal-text"; - version = "1.1.1"; - sha256 = "1jgdxqck3ck65mppi694w0f5x0547148y5agi100zggp8r3yxsy3"; + version = "1.1.2"; + sha256 = "1cfxkx3mfjxw8fh3gw4wqk5wwf10hi1aldhn6xc75mwfa6x7djjq"; libraryHaskellDepends = [ ansi-terminal base container layered-state prologue text ]; @@ -203132,12 +209901,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "terminfo_0_4_1_2" = callPackage + "terminfo_0_4_1_4" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.1.2"; - sha256 = "0g5y4s82bh26wj3x3f7g3s4qipnxvg71m3xw32rqy59inwxvvpsm"; + version = "0.4.1.4"; + sha256 = "170pnql6ycpk6gwy9v28mppm0w2n89l0n6fhnzph2za9kwrs9fqh"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; description = "Haskell bindings to the terminfo library"; @@ -203162,35 +209931,40 @@ 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.1.0.0"; + sha256 = "1xji47lpw560lj0lx79vab5bxcf96zgzsdjg0iyb02rsvjcsl5h4"; 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; - }) {gtk3 = pkgs.gnome3.gtk;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;}; "termplot" = callPackage ({ mkDerivation, base, brick, data-default, optparse-applicative @@ -203294,8 +210068,8 @@ self: { pname = "test-framework"; version = "0.8.2.0"; sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; - revision = "1"; - editedCabalFile = "1af61pnf2vrkvs3hcqla5ddsrd0hd2pylv6l545yn3dcvl665rcc"; + revision = "2"; + editedCabalFile = "1kmv576j1zbms6p3vffripvas87ca3ypdb42h7pqkxsxxfi1gb8j"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -203397,23 +210171,6 @@ self: { }) {}; "test-framework-quickcheck2" = callPackage - ({ mkDerivation, base, extensible-exceptions, QuickCheck, random - , test-framework - }: - mkDerivation { - pname = "test-framework-quickcheck2"; - version = "0.3.0.4"; - sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp"; - revision = "1"; - editedCabalFile = "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff"; - libraryHaskellDepends = [ - base extensible-exceptions QuickCheck random test-framework - ]; - description = "QuickCheck-2 support for the test-framework package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "test-framework-quickcheck2_0_3_0_5" = callPackage ({ mkDerivation, base, extensible-exceptions, QuickCheck, random , test-framework }: @@ -203426,7 +210183,6 @@ self: { ]; description = "QuickCheck-2 support for the test-framework package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-framework-sandbox" = callPackage @@ -203549,8 +210305,8 @@ self: { }: mkDerivation { pname = "test-karya"; - version = "0.0.2"; - sha256 = "16vrpp8qilhfk47fmcvbvdjfgzjh878kn1d4cq0bacihkv79zmf3"; + version = "0.0.3"; + sha256 = "1z9zyva8cqrz04ckg7dny297jp5k961nk1l7pp9kz8z78pd7p19q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203566,6 +210322,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 { @@ -203900,30 +210675,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.11.0.1"; - sha256 = "11dc09hfnyfsz20ch2c867w0zdgjkzq41506lm61i3dk87ngdisf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - description = "Conversion between formats used to represent mathematics"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "texmath_0_11_1" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.11.1"; - sha256 = "169jp9y6azpkkcbx0h03kbjg7f58wsk7bs18dn3h9m3sia6bnw99"; + version = "0.11.2"; + sha256 = "12jkv3wa5lmlik516fp6i429vlznzybhhw4843d55hdid5yhvihf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203935,7 +210688,6 @@ self: { ]; description = "Conversion between formats used to represent mathematics"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -203947,6 +210699,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 @@ -203958,7 +210712,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 @@ -203966,8 +210720,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 ]; @@ -204014,6 +210768,17 @@ 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; + }) {}; + "text-binary" = callPackage ({ mkDerivation, base, binary, text }: mkDerivation { @@ -204026,28 +210791,6 @@ self: { }) {}; "text-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion - , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty - , tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "text-builder"; - version = "0.5.4.3"; - sha256 = "1xcyi3bw44anzah5c4c0wm18vnyqsr3q7ww2kp2psk41ql6gan2h"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "An efficient strict text builder"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "text-builder_0_6_3" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion , deferred-folds, QuickCheck, quickcheck-instances, rerebase , semigroups, tasty, tasty-hunit, tasty-quickcheck, text @@ -204055,8 +210798,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.6.3"; - sha256 = "00i0p155sfii0pl3300xa4af57nhhcz690qr0drwby34xqjy2c1z"; + version = "0.6.5"; + sha256 = "1kf5r4cr4qw3awfshycnh9l7p3phssknlvwmkglabmdj3zf1xz5q"; libraryHaskellDepends = [ base base-prelude bytestring deferred-folds semigroups text transformers @@ -204068,7 +210811,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "An efficient strict text builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-containers" = callPackage @@ -204135,6 +210877,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 @@ -204149,14 +210893,13 @@ 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 ]; description = "Full-weight string formatting library, analog of Python's string.format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-format-simple" = callPackage @@ -204372,6 +211115,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 @@ -204400,8 +211144,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 ]; @@ -204555,8 +211299,8 @@ self: { }: mkDerivation { pname = "text-replace"; - version = "0.0.0.3"; - sha256 = "0dj024y7qmkmv31n5h6li6wna3gpayr5gmyl6jiiiprdvild2i1n"; + version = "0.0.0.4"; + sha256 = "18hiy0d18wxh8v4zd6vg69fwd8vp9b2yd3ngf04yh9y1bl8wwwhb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -204564,7 +211308,6 @@ self: { testHaskellDepends = [ base hedgehog neat-interpolation text ]; description = "Simple text replacements from a list of search/replace pairs"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-short" = callPackage @@ -204600,10 +211343,10 @@ self: { }: mkDerivation { pname = "text-show"; - version = "3.7.4"; - sha256 = "068yp74k4ybhvycivnr7x238dl1qdnkjdzf25pcz127294rn9yry"; + version = "3.7.5"; + sha256 = "1by89i3c6qyjh7jjld06wb2sphb236rbvwb1mmvq8f6mxliiyf1r"; revision = "1"; - editedCabalFile = "0002han9bgcc8m64a3k5wgfmzlma4j3qxqd7m2illyza19hijsj9"; + editedCabalFile = "1v8czpi9mn54850k0pilqh1f3yfr5n5vykmg5k57wmrdpx25vkws"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers contravariant generic-deriving @@ -204626,28 +211369,26 @@ self: { "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hoopl, 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 + , 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.6.5"; - sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql"; - revision = "2"; - editedCabalFile = "1lqvwm9ciazk13jabyr81rl4hsmwksjmks7ckxrdgz3jk201yr6i"; + version = "3.7"; + sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory - ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random + 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 hoopl hpc hspec + 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 @@ -204656,7 +211397,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -204731,6 +211471,7 @@ self: { ]; description = "An efficient packed UTF-8 backed Unicode text type"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-utils" = callPackage @@ -204806,10 +211547,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 @@ -204918,8 +211657,8 @@ self: { ({ mkDerivation, base, QuickCheck, utility-ht }: mkDerivation { pname = "tfp"; - version = "1.0.0.2"; - sha256 = "1njccng7gj8za3ywjydphw054nx6grmgnfzwmwj89xwirf8710cs"; + version = "1.0.1.1"; + sha256 = "1qkcm4l09qpxy9996lnfn79c1wn1ca45s3i2iz2x3kvp0f999d3i"; libraryHaskellDepends = [ base utility-ht ]; testHaskellDepends = [ base QuickCheck ]; description = "Type-level integers, booleans, lists using type families"; @@ -204979,10 +211718,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.8.0"; - sha256 = "0n17w4q2ykd0nica4sck2wng6md56rfad8x0icl0l8vnzb9nn4ya"; - revision = "1"; - editedCabalFile = "0yr4bj9ypbls0ysmwrgn2nsjb1xpsb12bjaiwbkzp6nf3kljwnnv"; + version = "0.2.10.0"; + sha256 = "1bql46ylr111g0pncdsf5mbhn6cpaw9xlqby89bz417dlk5gzny9"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -205087,10 +211824,8 @@ self: { }: mkDerivation { pname = "th-desugar"; - version = "1.8"; - sha256 = "0nbsgf3lxmjj43f1xdjb1z486h8av47mym6v1y5pzdv39wgiykdv"; - revision = "1"; - editedCabalFile = "13jvl6ijxjwbd7df0cq5pnijs3wrs8x5r9ykyyj180dak66909wd"; + version = "1.9"; + sha256 = "1vxg0jvc239ngmv53yx564b7wkgd0b10xvx5phxvnnpm9n2pljpi"; libraryHaskellDepends = [ base containers mtl syb template-haskell th-expand-syns th-lift th-orphans @@ -205121,6 +211856,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"; @@ -205298,6 +212035,7 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Template Haskell splice that expands to current time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-orphans" = callPackage @@ -205329,27 +212067,6 @@ self: { }) {}; "th-printf" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bytestring - , charset, containers, criterion, hspec, HUnit, QuickCheck - , template-haskell, text, transformers, trifecta, utf8-string - }: - mkDerivation { - pname = "th-printf"; - version = "0.5.1"; - sha256 = "0dgi93pb3zci1isxjmnzhn6apm4pyg12ayz8l1gxlilli8q1z4l6"; - libraryHaskellDepends = [ - ansi-wl-pprint attoparsec base charset containers template-haskell - text transformers trifecta utf8-string - ]; - testHaskellDepends = [ - base bytestring hspec HUnit QuickCheck template-haskell text - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Compile-time printf"; - license = stdenv.lib.licenses.mit; - }) {}; - - "th-printf_0_6_0" = callPackage ({ mkDerivation, base, charset, containers, hspec, HUnit , microlens-platform, mtl, parsec, QuickCheck, semigroups , template-haskell, th-lift, transformers @@ -205367,7 +212084,6 @@ self: { ]; description = "Quasiquoters for printf"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-reify-compat" = callPackage @@ -205479,8 +212195,8 @@ self: { }: mkDerivation { pname = "th-utilities"; - version = "0.2.0.1"; - sha256 = "1mki2s821b1zpdn5463qz5vl3kvxxam90iax1n6vznf0d7p4rik5"; + version = "0.2.1.0"; + sha256 = "1kc3zv43948whv47cpmwnqw90iz68dmi1bmw9b183bnd0yr7wnfb"; libraryHaskellDepends = [ base bytestring containers directory filepath primitive syb template-haskell text th-orphans @@ -205529,7 +212245,6 @@ self: { ]; description = "Minimalistic actor library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "themoviedb" = callPackage @@ -205539,8 +212254,8 @@ self: { }: mkDerivation { pname = "themoviedb"; - version = "1.1.4.0"; - sha256 = "0sx59hi3cv5b71x6gdm8vpj5hchw52vndhksnshblndm8kgxnfa6"; + version = "1.1.5.0"; + sha256 = "05za904yimkf9vpkksyxw6j488xyd0wigjdkj25hf2xx4nw36j0v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205632,30 +212347,30 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, aeson, base, bifunctors, binary, containers - , data-default-class, deepseq, hashable, keys, mtl, profunctors - , QuickCheck, quickcheck-instances, semigroupoids, tasty + ({ mkDerivation, aeson, base, base-compat, bifunctors, binary + , containers, data-default-class, deepseq, hashable, keys, lens + , mtl, QuickCheck, quickcheck-instances, semigroupoids, tasty , tasty-quickcheck, transformers, transformers-compat , unordered-containers, vector, vector-instances }: mkDerivation { pname = "these"; - version = "0.7.4"; - sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; - revision = "8"; - editedCabalFile = "0j3ps7ngrzgxvkbr5gf8zkfkd1ci4dnfh425ndbr2xp9ipy00nkd"; + version = "0.7.6"; + sha256 = "0in77b1g73m224dmpfc9khgcs0ajgsknp0yri853c9p6k0yvhr4l"; libraryHaskellDepends = [ - aeson base bifunctors binary containers data-default-class deepseq - hashable keys mtl profunctors QuickCheck semigroupoids transformers - transformers-compat unordered-containers vector vector-instances + aeson base base-compat bifunctors binary containers + data-default-class deepseq hashable keys lens mtl QuickCheck + semigroupoids transformers transformers-compat unordered-containers + vector vector-instances ]; testHaskellDepends = [ - aeson base bifunctors binary containers hashable QuickCheck - quickcheck-instances tasty tasty-quickcheck transformers + aeson base base-compat bifunctors binary containers hashable lens + QuickCheck quickcheck-instances tasty tasty-quickcheck transformers unordered-containers vector ]; description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "these-skinny" = callPackage @@ -205667,6 +212382,7 @@ self: { libraryHaskellDepends = [ base deepseq ]; description = "A fork of the 'these' package without the dependency bloat"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thespian" = callPackage @@ -205748,8 +212464,8 @@ self: { ({ mkDerivation, base, containers, hspec, stm }: mkDerivation { pname = "thread-hierarchy"; - version = "0.3.0.0"; - sha256 = "064s46pg3l015lp4zvz9kj0yki48hvwqccfjxqs52jz5pd9rd1z8"; + version = "0.3.0.1"; + sha256 = "0d2wbm75f59vj1h18afdhb1wqyclv5gpgj6pyrhbcnf7aa2490c1"; libraryHaskellDepends = [ base containers stm ]; testHaskellDepends = [ base containers hspec stm ]; description = "Simple Haskel thread management in hierarchical manner"; @@ -205791,6 +212507,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "(deprecated in favor of 'threads') Simple thread management"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threads" = callPackage @@ -205814,8 +212531,8 @@ self: { ({ mkDerivation, base, stm, threads }: mkDerivation { pname = "threads-extras"; - version = "0.1.0.2"; - sha256 = "0x95vsgsizkbidpkprbijqbgclryhbk31m8k0icbjrx7p2capvsd"; + version = "0.1.0.3"; + sha256 = "1dfbh04nb4zm96yzx7520lixks5v2y4w5ykcdcqm7w5s196pq858"; libraryHaskellDepends = [ base stm threads ]; testHaskellDepends = [ base ]; description = "Extends the threads package with a bounded thread group"; @@ -205854,6 +212571,7 @@ self: { ]; description = "Simple, IO-based library for Erlang-style thread supervision"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threadscope" = callPackage @@ -205875,6 +212593,7 @@ self: { ]; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threefish" = callPackage @@ -205895,21 +212614,20 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threepenny-gui" = callPackage @@ -205921,8 +212639,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; @@ -205968,24 +212686,24 @@ self: { "thrift" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network - , network-uri, QuickCheck, split, text, unordered-containers - , vector + , bytestring, containers, ghc-prim, hashable, hspec, hspec-core + , HTTP, network, network-uri, QuickCheck, split, text + , unordered-containers, vector }: mkDerivation { pname = "thrift"; - version = "0.10.0"; - sha256 = "01vxik64gnsnm0y9mh82dv48f711231dhc4kksdmgs7f352fc1k7"; + version = "0.12.0"; + sha256 = "1yzfq671apw3mjaws16a6agjw3vpm7yz0gdp3kyh8vvbp5d0czyf"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring containers - ghc-prim hashable HTTP network network-uri QuickCheck split text - unordered-containers vector + ghc-prim hashable hspec-core HTTP network network-uri QuickCheck + split text unordered-containers vector ]; testHaskellDepends = [ base bytestring hspec QuickCheck unordered-containers ]; description = "Haskell bindings for the Apache Thrift RPC system"; - license = "unknown"; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -205993,12 +212711,11 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "throttle" = callPackage @@ -206064,6 +212781,7 @@ self: { libraryHaskellDepends = [ base bytestring case-insensitive text ]; description = "Convert textual types through Text without needing O(n^2) instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "throwable-exceptions" = callPackage @@ -206104,6 +212822,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 @@ -206186,26 +212906,6 @@ self: { }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; "tibetan-utils" = callPackage - ({ mkDerivation, base, composition-prelude, either, hspec - , hspec-megaparsec, megaparsec, text, text-show - }: - mkDerivation { - pname = "tibetan-utils"; - version = "0.1.1.5"; - sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q"; - revision = "2"; - editedCabalFile = "17zyhdxwnq85kr60bnxirmyvw3b1679j5mhm3i30ri65896pjdwf"; - libraryHaskellDepends = [ - base composition-prelude either megaparsec text text-show - ]; - testHaskellDepends = [ - base hspec hspec-megaparsec megaparsec text - ]; - description = "Parse and display tibetan numerals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tibetan-utils_0_1_1_9" = callPackage ({ mkDerivation, base, composition-prelude, either, hspec , hspec-megaparsec, megaparsec, text, text-show }: @@ -206221,7 +212921,6 @@ self: { ]; description = "Parse and display tibetan numerals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tic-tac-toe" = callPackage @@ -206289,19 +212988,21 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, colour, containers, hashable, hosc - , mersenne-random-pure64, monad-loops, mtl, parsec, safe, tasty - , tasty-hunit, text, time, websockets + ({ mkDerivation, base, bifunctors, colour, containers, hosc + , microspec, mwc-random, network, parsec, text, transformers + , vector }: mkDerivation { pname = "tidal"; - version = "0.9.10"; - sha256 = "1fgana79fwmn2s3b50vs9wlri6z4f2b8lad5m4n4ggc4rginvlkw"; + version = "1.0.7"; + sha256 = "1p2h3g9fa3jd3133ryhcdpkb6a3a3994hrbr1ryd0gza8gd3bgv1"; + revision = "1"; + editedCabalFile = "16ingdhhc38zj1gixj3c7b01lr9lbnxkr8pf0x2j8z1jpbl7jg4a"; libraryHaskellDepends = [ - base colour containers hashable hosc mersenne-random-pure64 - monad-loops mtl parsec safe text time websockets + base bifunctors colour containers hosc mwc-random network parsec + text transformers vector ]; - testHaskellDepends = [ base tasty tasty-hunit ]; + testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -206347,6 +213048,7 @@ self: { libraryHaskellDepends = [ base cairo colour tidal ]; description = "Visual rendering for Tidal patterns"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tie-knot" = callPackage @@ -206426,6 +213128,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 @@ -206673,8 +213377,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 @@ -206871,6 +213575,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; @@ -207051,6 +213757,7 @@ self: { ]; description = "A tool for visualizing time series from log files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timeprint" = callPackage @@ -207073,6 +213780,8 @@ self: { pname = "timer-wheel"; version = "0.1.0"; sha256 = "0wjm767yxf3hg3p80nd0hi0bfvdssq0f3lj9pzkmrsnsqafngs2j"; + revision = "1"; + editedCabalFile = "0vk0p21x90wiazss30zkbzr5fnsc4gih9a6xaa9myyycw078600v"; libraryHaskellDepends = [ atomic-primops base ghc-prim primitive psqueues ]; @@ -207080,6 +213789,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timer-wheel_0_2_0" = callPackage + ({ mkDerivation, atomic-primops, base, ghc-prim, primitive + , psqueues, random + }: + mkDerivation { + pname = "timer-wheel"; + version = "0.2.0"; + sha256 = "0i1n9qbichgalrw9sp6qwhd9p4179havlp4gqbck2w9sbans05hp"; + libraryHaskellDepends = [ + atomic-primops base ghc-prim primitive psqueues + ]; + testHaskellDepends = [ base random ]; + description = "A timer wheel"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -207096,7 +213822,6 @@ self: { ]; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timers" = callPackage @@ -207124,6 +213849,7 @@ self: { testHaskellDepends = [ base hspec ]; description = "tick based timers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timers-updatable" = callPackage @@ -207294,8 +214020,8 @@ self: { }: mkDerivation { pname = "tintin"; - version = "1.9.2"; - sha256 = "1pid79ar85ajs6gi5d8smqn9ivfr8y50qys1n5zq68kpx2gmf3lq"; + version = "1.9.5"; + sha256 = "1z7yvp0c10gkxljg6lkn26niigx0wkdmzs7pqjd666lgzk0ji5hy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207310,6 +214036,7 @@ self: { testHaskellDepends = [ base require ]; description = "A softer alternative to Haddock"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tiny-scheduler" = callPackage @@ -207362,6 +214089,7 @@ self: { ]; description = "A fast DOM parser for a subset of XML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tinyfiledialogs" = callPackage @@ -207561,12 +214289,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 = [ @@ -207576,7 +214305,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; }) {}; @@ -207762,6 +214491,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 @@ -207940,17 +214670,33 @@ self: { }) {}; "tokenizer-monad" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "tokenizer-monad"; - version = "0.1.0.0"; - sha256 = "1n31n3wql93ljjgzfxpl5qd7kdb3dmr00yw0sz0wkkfgh2id1m99"; - libraryHaskellDepends = [ base text ]; + version = "0.2.2.0"; + sha256 = "0n8w923m8c803zcphims51q2xm6a0374zzh00d62mg92zbdsh9vn"; + libraryHaskellDepends = [ base bytestring text ]; description = "An efficient and easy-to-use tokenizer monad"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tokenizer-streaming" = callPackage + ({ mkDerivation, base, bytestring, mtl, streaming + , streaming-bytestring, streaming-commons, text, tokenizer-monad + }: + mkDerivation { + pname = "tokenizer-streaming"; + version = "0.1.0.1"; + sha256 = "0ml4fby87z1fgk2v3if3z6bf1h9gsdcjgmq6lr77qsri2yfcscla"; + libraryHaskellDepends = [ + base bytestring mtl streaming streaming-bytestring + streaming-commons text tokenizer-monad + ]; + description = "A variant of tokenizer-monad that supports streaming"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "tokstyle" = callPackage ({ mkDerivation, array, base, deepseq, filepath, language-c }: mkDerivation { @@ -207963,6 +214709,7 @@ self: { executableHaskellDepends = [ base ]; description = "TokTok C code style checker"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "toktok" = callPackage @@ -208042,83 +214789,310 @@ 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"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tomland" = callPackage - ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec - , megaparsec, mtl, parser-combinators, tasty, tasty-discover - , tasty-hedgehog, tasty-hspec, text, time, transformers - , unordered-containers + ({ 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.3.1"; - sha256 = "0kpgcqix32m0nik54rynpphm4mpd8r05mspypjiwj9sidjxn11gw"; + 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 ]; - description = "TOML parser"; + 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; }) {}; - "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 + "tomland_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , gauge, hashable, hedgehog, hspec-megaparsec, htoml + , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec + , parser-combinators, tasty, tasty-discover, tasty-hedgehog + , tasty-hspec, tasty-silver, text, time, toml-parser, transformers , unordered-containers }: mkDerivation { pname = "tomland"; - version = "0.4.0"; - sha256 = "1rkdlq6js5ia807wh9hga6y9r92bxj8j5g7nynba1ilc3x70znfr"; + version = "1.0.0"; + sha256 = "0zxal12gn6d2657a14idzzjxymwmnrzkkicf7gqwlgwpn0lnr4p6"; + revision = "1"; + editedCabalFile = "14n2zgnzfdg549pjrj7f8v02wz68mp5lr9gnyx3w1hv96jb9ksx6"; 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 ]; + executableToolDepends = [ markdown-unlit ]; testHaskellDepends = [ - base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog - tasty-hspec text time unordered-containers + base bytestring containers hashable hedgehog hspec-megaparsec + megaparsec tasty tasty-hedgehog tasty-hspec tasty-silver text time + unordered-containers ]; testToolDepends = [ tasty-discover ]; - description = "Bidirectional TOML parser"; + benchmarkHaskellDepends = [ + aeson base deepseq gauge htoml htoml-megaparsec parsec text time + toml-parser + ]; + description = "Bidirectional TOML serialization"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec - , optparse-generic, text + , optparse-applicative, text }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.36"; - sha256 = "16a15449pfdlan93ynrv3gh42vjlv95160nr1lwvqh91m7fvpnc3"; + 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; }) {}; + "tonalude" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }: + mkDerivation { + pname = "tonalude"; + version = "0.1.1.0"; + sha256 = "060hc1dydlq1zd1fn5scz7xhbflqm4fa86rz6275drymi5gwx82s"; + libraryHaskellDepends = [ base bytestring rio unliftio ]; + testHaskellDepends = [ base bytestring doctest Glob rio unliftio ]; + description = "A standard library for Tonatona framework"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonaparser" = callPackage + ({ mkDerivation, base, doctest, envy, Glob, rio, say, tonatona }: + mkDerivation { + pname = "tonaparser"; + version = "0.1.0.0"; + sha256 = "0v9qfc13lyjclk7pqsld1lzzbdhimz7gziix7w2x6v2rr2nia8j0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base envy rio say ]; + testHaskellDepends = [ base doctest envy Glob rio say tonatona ]; + description = "Scalable way to pass runtime configurations for tonatona"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona" = callPackage + ({ mkDerivation, base, doctest, Glob, rio, tonaparser }: + mkDerivation { + pname = "tonatona"; + version = "0.1.0.1"; + sha256 = "0vc2q0j26ig2qhrc8dfy0knsp0gj8p7yda4xaps5v51dsqpj9yfv"; + libraryHaskellDepends = [ base rio tonaparser ]; + testHaskellDepends = [ base doctest Glob rio tonaparser ]; + description = "meta application framework"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona-google-server-api" = callPackage + ({ mkDerivation, base, doctest, Glob, google-server-api + , monad-logger, persistent, persistent-sqlite, resource-pool + , servant-client, tonalude, tonaparser, tonatona + }: + mkDerivation { + pname = "tonatona-google-server-api"; + version = "0.1.1.0"; + sha256 = "094la1rd8527a398607rsq9z2hiay59biy9fnfiw7qyigwf4zlr0"; + libraryHaskellDepends = [ + base google-server-api monad-logger persistent persistent-sqlite + resource-pool servant-client tonalude tonaparser tonatona + ]; + testHaskellDepends = [ + base doctest Glob google-server-api monad-logger persistent + persistent-sqlite resource-pool servant-client tonalude tonaparser + tonatona + ]; + description = "tonatona plugin for google-server-api"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tonatona-logger" = callPackage + ({ mkDerivation, base, doctest, Glob, rio, tonaparser, tonatona }: + mkDerivation { + pname = "tonatona-logger"; + version = "0.2.0.0"; + sha256 = "14pirmflhyfmw6y7j1af7ryh8iq30prx7xsdjwmliacszhsqvvfa"; + libraryHaskellDepends = [ base rio tonaparser tonatona ]; + testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ]; + description = "tonatona plugin for logging"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona-persistent-postgresql" = callPackage + ({ mkDerivation, base, doctest, Glob, monad-logger, persistent + , persistent-postgresql, resource-pool, rio, tonaparser, tonatona + }: + mkDerivation { + pname = "tonatona-persistent-postgresql"; + version = "0.1.0.1"; + sha256 = "1fxf3h024bl02aldcwc9mhjish9l2y57ir9shra6liddk6065g5n"; + libraryHaskellDepends = [ + base monad-logger persistent persistent-postgresql resource-pool + rio tonaparser tonatona + ]; + testHaskellDepends = [ + base doctest Glob monad-logger persistent persistent-postgresql + resource-pool rio tonaparser tonatona + ]; + description = "tonatona plugin for accessing PostgreSQL database"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona-persistent-sqlite" = callPackage + ({ mkDerivation, base, doctest, Glob, monad-logger, persistent + , persistent-sqlite, resource-pool, rio, tonaparser, tonatona + }: + mkDerivation { + pname = "tonatona-persistent-sqlite"; + version = "0.1.0.1"; + sha256 = "0a0jgi01pdirr7ay2ah3cvf3nv2pnmvxag34zif04vc6sbs8pryb"; + libraryHaskellDepends = [ + base monad-logger persistent persistent-sqlite resource-pool rio + tonaparser tonatona + ]; + testHaskellDepends = [ + base doctest Glob monad-logger persistent persistent-sqlite + resource-pool rio tonaparser tonatona + ]; + description = "tonatona plugin for accessing Sqlite database"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tonatona-servant" = callPackage + ({ mkDerivation, base, doctest, exceptions, Glob, http-types + , monad-logger, rio, servant, servant-server, tonaparser, tonatona + , tonatona-logger, wai, wai-extra, warp + }: + mkDerivation { + pname = "tonatona-servant"; + version = "0.1.0.1"; + sha256 = "1202fxvjkmvj9sgy576y0ghpcqdca1bhagsxrrz3hcdkyvd2lr9s"; + libraryHaskellDepends = [ + base exceptions http-types monad-logger rio servant servant-server + tonaparser tonatona tonatona-logger wai wai-extra warp + ]; + testHaskellDepends = [ + base doctest exceptions Glob http-types monad-logger rio servant + servant-server tonaparser tonatona tonatona-logger wai wai-extra + warp + ]; + description = "tonatona plugin for servant"; + license = stdenv.lib.licenses.mit; + }) {}; + + "too-many-cells" = callPackage + ({ mkDerivation, aeson, base, birch-beer, bytestring, cassava + , colour, containers, deepseq, diagrams, diagrams-cairo + , diagrams-graphviz, diagrams-lib, differential, directory + , diversity, fgl, filepath, find-clumpiness, foldl, graphviz + , hierarchical-clustering, hierarchical-spectral-clustering + , hmatrix, inline-r, lens, managed, matrix-market-attoparsec + , mltool, modularity, mtl, optparse-generic, palette, parallel + , plots, safe, scientific, sparse-linear-algebra + , spectral-clustering, split, statistics, streaming + , streaming-bytestring, streaming-cassava, streaming-utils + , streaming-with, SVGFonts, terminal-progress-bar, text, text-show + , transformers, vector, vector-algorithms + }: + mkDerivation { + pname = "too-many-cells"; + version = "0.1.2.1"; + sha256 = "08ckcp8gyhq8nhr5l7qbmyl8csz5kl22qmwapwzi4jiffwwi9yca"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base birch-beer bytestring cassava colour containers deepseq + diagrams diagrams-cairo diagrams-graphviz diagrams-lib differential + directory diversity fgl filepath find-clumpiness foldl graphviz + hierarchical-clustering hierarchical-spectral-clustering hmatrix + inline-r lens managed matrix-market-attoparsec mltool modularity + mtl palette parallel plots safe scientific sparse-linear-algebra + split statistics streaming streaming-bytestring streaming-cassava + streaming-with SVGFonts text text-show vector vector-algorithms + ]; + executableHaskellDepends = [ + aeson base birch-beer bytestring cassava colour containers + diagrams-cairo diagrams-lib directory fgl filepath find-clumpiness + graphviz hierarchical-spectral-clustering inline-r lens + matrix-market-attoparsec mtl optparse-generic palette plots + spectral-clustering streaming streaming-bytestring streaming-utils + terminal-progress-bar text text-show transformers vector + ]; + description = "Cluster single cells and analyze cell clade relationships"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "toodles" = callPackage + ({ mkDerivation, aeson, base, blaze-html, cmdargs, directory, extra + , hspec, hspec-expectations, megaparsec, MissingH, regex-posix + , servant, servant-blaze, servant-server, strict, text, wai, warp + , yaml + }: + mkDerivation { + pname = "toodles"; + version = "1.0.3"; + sha256 = "1nzrfdbwz5ykiim76jr3v1666acrhh76k4q4gwix9bixcm8al2zf"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base blaze-html cmdargs directory extra hspec + hspec-expectations megaparsec MissingH regex-posix servant + servant-blaze servant-server strict text wai warp yaml + ]; + executableHaskellDepends = [ + aeson base blaze-html cmdargs directory extra hspec + hspec-expectations megaparsec MissingH regex-posix servant + servant-blaze servant-server strict text wai warp yaml + ]; + testHaskellDepends = [ + aeson base blaze-html cmdargs directory extra 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, extra, filepath, HUnit, QuickCheck, random @@ -208252,12 +215226,12 @@ self: { }) {}; "total-map" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, semiring-num }: mkDerivation { pname = "total-map"; - version = "0.0.7"; - sha256 = "0chcnvsn3bzjmmp2bq6kxli1c73d477i49jbvnmqwz56an84ink1"; - 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; @@ -208491,6 +215465,7 @@ self: { testHaskellDepends = [ base pretty text ]; description = "Data Type for Rewriting Systems"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trace" = callPackage @@ -208573,6 +215548,7 @@ self: { ]; description = "Visualize Haskell data structures as edge-labeled trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tracker" = callPackage @@ -208593,8 +215569,8 @@ self: { }: mkDerivation { pname = "trackit"; - version = "0.4"; - sha256 = "0dzcmb10imksryr6lpmnq8b7bzqkm9y1dkyx52k1ic5yms3rwxyx"; + version = "0.6"; + sha256 = "0944m0s1r2f53m9cmfw7jzv4xxgrfppy0cnh0a98j129n6xn39sq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -208624,6 +215600,7 @@ self: { base hedgehog mmorph postgresql-simple resource-pool text ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tracy" = callPackage @@ -208645,8 +215622,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 @@ -208796,12 +215775,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers_0_5_5_0" = callPackage + "transformers_0_5_6_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.5.5.0"; - sha256 = "198ric8gr1y58scckr468d11y2g45mzc5pkaa40shj7xgj1bh7mi"; + version = "0.5.6.2"; + sha256 = "0v66j5k0xqk51pmca55wq192qyw2p43s2mgxlz4f95q2c1fpjs5n"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -208966,8 +215945,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 ]; @@ -209133,6 +216112,7 @@ self: { ]; description = "Type Safe Web Routing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trasa-client" = callPackage @@ -209154,6 +216134,7 @@ self: { ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trasa-reflex" = callPackage @@ -209312,10 +216293,10 @@ self: { }: mkDerivation { pname = "tree-diff"; - version = "0.0.1"; - sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz"; - revision = "4"; - editedCabalFile = "1rqxxyj6hqllahs11693g855cxz8mgnb490s7j1ksd300i5xgjsp"; + version = "0.0.2"; + sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq"; + revision = "1"; + editedCabalFile = "1rl12a2ydg744s289lna4zb0sj0b16abmrngp6qd1kfkih2ygml0"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -209528,30 +216509,48 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "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; @@ -209570,6 +216569,8 @@ self: { pname = "trifecta"; version = "2"; sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk"; + revision = "1"; + editedCabalFile = "1qqkiwy0yvnj4yszsw9jrv83qf5hw87jdqdb34401dskaf81gwrm"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html @@ -209604,6 +216605,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "trim" = callPackage + ({ mkDerivation, base, directory, hspec, optparse-applicative }: + mkDerivation { + pname = "trim"; + version = "0.1.0.0"; + sha256 = "0zpn8w4fzswwcb081hvl6cy5gdid69wx3i1gj3sgkxf01347m23m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base directory optparse-applicative ]; + testHaskellDepends = [ base hspec ]; + description = "A command-line tool for trimming whitespace"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "trimpolya" = callPackage ({ mkDerivation, base, bio, bytestring, simpleargs }: mkDerivation { @@ -209640,8 +216656,8 @@ self: { }: mkDerivation { pname = "triplesec"; - version = "0.1.2.0"; - sha256 = "0qvhsn5l35mmm71j5g0kv955hfjyzywvwgnjfjl8illgf2g79f46"; + version = "0.2.2.0"; + sha256 = "1gxks45hjr3a1lnr2v75cl0iwsmlzaq3yzd3p9s0pn5227f34zh7"; libraryHaskellDepends = [ base cryptonite memory mtl transformers ]; @@ -209978,6 +216994,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ttl-hashtables" = callPackage + ({ mkDerivation, base, clock, containers, data-default, failable + , hashable, hashtables, hspec, mtl, transformers + }: + mkDerivation { + pname = "ttl-hashtables"; + version = "1.3.0.0"; + sha256 = "1qlwwxylj9d2p4jm4bi0a3x60cfzd6g982v6q0crs323zn8q5cj5"; + revision = "1"; + editedCabalFile = "0nbf825s51pls4y0nc9jzik8z6szfvqd66dfjp6ybbywrrdzckf3"; + libraryHaskellDepends = [ + base clock containers data-default failable hashable hashtables mtl + transformers + ]; + testHaskellDepends = [ + base clock containers data-default failable hashable hashtables + hspec mtl transformers + ]; + description = "Extends hashtables so that entries added can be expired after a TTL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ttn" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, hspec-expectations , raw-strings-qq, text, time, timerep @@ -209994,7 +217032,6 @@ self: { ]; description = "Things Tracker Network JSON Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ttn-client" = callPackage @@ -210360,8 +217397,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.10"; - sha256 = "0c2bfwfj1pf3s4kjr4k9g36166pj9wfpp2rrs5blzh77hjmak4rs"; + version = "1.5.13"; + sha256 = "1124yhw0l8924cwkmap1qn2z0hf4vn3r73h4pmi9icahg8zpc1hg"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -210432,6 +217469,7 @@ self: { ]; description = "An equational theorem prover"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twee-lib" = callPackage @@ -210458,8 +217496,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.42"; - sha256 = "1jf3w8cw9nmg6b2wxs5agxxi1igfsykj857cjkqjsfr04z060v37"; + version = "1.0.1.43"; + sha256 = "10bxkllxiwm1xbvpz4wh1gd24qkz8y0b7z4ciwqk13jz5ha966x0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210717,8 +217755,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 @@ -210732,6 +217770,7 @@ self: { doCheck = false; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twill" = callPackage @@ -210808,8 +217847,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 @@ -210820,7 +217859,6 @@ self: { ]; description = "A high level file watcher DSL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter" = callPackage @@ -210872,6 +217910,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-enumerator" = callPackage @@ -210936,6 +217975,7 @@ self: { ]; description = "Twitter JSON parser and types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twitter-types-lens" = callPackage @@ -210953,6 +217993,7 @@ self: { ]; description = "Twitter JSON types (lens powered)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tx" = callPackage @@ -211036,6 +218077,8 @@ self: { pname = "ty"; version = "0.1.7"; sha256 = "0nn9lr9q0vmkkw25j7yfi3js2qmfmsrhrkviipjj8y7hrhmkfimm"; + revision = "1"; + editedCabalFile = "0sxqrkqchr3zcks68wljp722f5sndxz1fw5a2qi599i984v91y0l"; libraryHaskellDepends = [ base ghc-prim ]; description = "Typed type representations and equality proofs"; license = stdenv.lib.licenses.bsd3; @@ -211045,8 +218088,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; @@ -211309,6 +218352,7 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Interpreter for Template Haskell types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-iso" = callPackage @@ -211424,12 +218468,13 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "type-level-sets"; - version = "0.8.7.0"; - sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7"; + version = "0.8.9.0"; + sha256 = "1acsr7g9ssli9yil9kws47gc6h3csmk2afncyki41pipa1vsriv4"; + revision = "1"; + editedCabalFile = "0cc0ws2plharq0gvindgmkp1fs82zd43zijkh7wf0ilfnr2l17z2"; libraryHaskellDepends = [ base ghc-prim ]; description = "Type-level sets and finite maps (with value-level counterparts)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-level-tf" = callPackage @@ -211461,15 +218506,14 @@ self: { }: mkDerivation { pname = "type-map"; - version = "0.1.2.0"; - sha256 = "0cm2b4xkassjh71ndc5nddpmqyr5bcf3fqxs74wzd11dycmfqfaa"; + version = "0.1.6.0"; + sha256 = "0zakl5bdzwng1r0x384w066zhwgwcf24s6jsm6d4zsx7xmngzmr5"; libraryHaskellDepends = [ base containers ghc-prim vector ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; description = "Type-indexed maps"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-natural" = callPackage @@ -211487,21 +218531,22 @@ self: { ]; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq - , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck - , random, temporary, text, weigh + ({ 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.4.0.1"; - sha256 = "1bcjpkrqa7pmgb7a48q2q8rkx15yz40d91mn7jhj91hzc1h2z6g3"; + version = "1.5.0.0"; + sha256 = "0bj05wmhsgn7x3437l6488mkalffn90c4g33njx6xy8p81ls26l9"; libraryHaskellDepends = [ - base bytestring double-conversion ghc-prim text + base bytestring containers double-conversion ghc-prim text ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; benchmarkHaskellDepends = [ base blaze-html bytestring criterion deepseq ghc ghc-paths random temporary text weigh @@ -211603,6 +218648,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-spec_0_4_0_0" = callPackage + ({ mkDerivation, base, pretty }: + mkDerivation { + pname = "type-spec"; + version = "0.4.0.0"; + sha256 = "0z94hgvmnpcv9va7spdkmbxz99ri1skdq3kwxbid77cpyh95xsxq"; + libraryHaskellDepends = [ base pretty ]; + testHaskellDepends = [ base ]; + description = "Type Level Specification by Example"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-spine" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -211692,6 +218750,8 @@ self: { pname = "type-unary"; version = "0.3.2"; sha256 = "12h20xjqr1abb5mb4fmij9j0vkfn7rwbidm2dr7ssbkk7cb5fv37"; + revision = "1"; + editedCabalFile = "0pj81qqwd6cvypn923jlqg42v9zb3sv5kjvd93z2cksy3k80mqk6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ applicative-numbers base constraints newtype-generics ty @@ -211714,6 +218774,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-admin" = callPackage + ({ mkDerivation, base, blaze-markup, bytestring, data-default-class + , exceptions, generic-lens, HDBC, HDBC-postgresql, HDBC-session + , heterocephalus, http-api-data, http-types, lucid, monad-control + , mtl, persistable-record, relational-query, relational-query-HDBC + , relational-record, template-haskell, text, time, transformers + , transformers-base, unordered-containers, utf8-string, wai + , wai-extra, warp, yaml + }: + mkDerivation { + pname = "typed-admin"; + version = "0.1.0.0"; + sha256 = "146dkmcrq1rsw7mpdyxa9vhnsr8rfgqz88r10f60chn1m7yhlk7q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup bytestring data-default-class exceptions + generic-lens HDBC HDBC-postgresql HDBC-session heterocephalus + http-api-data http-types lucid monad-control mtl persistable-record + relational-query relational-query-HDBC relational-record + template-haskell text time transformers transformers-base + unordered-containers utf8-string wai wai-extra warp yaml + ]; + description = "Admin console framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-duration" = callPackage ({ mkDerivation, base, lifted-base, monad-control , transformers-base @@ -211735,8 +218823,8 @@ self: { }: mkDerivation { pname = "typed-process"; - version = "0.2.3.0"; - sha256 = "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0"; + version = "0.2.4.0"; + sha256 = "02xvyaq4sxwjqbmkn29n5x58l4rni6gbqp526r3q7wn6jalgazwr"; libraryHaskellDepends = [ async base bytestring process stm transformers ]; @@ -211754,8 +218842,8 @@ self: { }: mkDerivation { pname = "typed-spreadsheet"; - version = "1.1.3"; - sha256 = "1y59kd92f5v116y26dlznvqi5kcb6y89rliwcs8ay9sk76606fa6"; + version = "1.1.4"; + sha256 = "16xbzwaiakimwwkbb0q0nxa08j7842z3894p04ijjvksllkdrlna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211842,6 +218930,7 @@ self: { ]; description = "Typed frontend to TensorFlow and higher-order deep learning"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typedquery" = callPackage @@ -211850,8 +218939,8 @@ self: { }: mkDerivation { pname = "typedquery"; - version = "0.1.1.1"; - sha256 = "1p6hlx2hsp7sjhspw3c95b1px6r2hylr31f4hcjq505z3i33gm7m"; + version = "0.1.1.2"; + sha256 = "1ziyc4bjxfndmfpmg8j2dl80nq1a9ay9nfpxh5856yar63lw16fi"; libraryHaskellDepends = [ aeson base bytestring haskell-src-meta parsec template-haskell text transformers @@ -211879,8 +218968,8 @@ self: { }: mkDerivation { pname = "typelevel"; - version = "1.2.2"; - sha256 = "0baigk89rd5cdy35v3abvdwh7g11fnz2rpnzfy4ahr0q1lj395f5"; + version = "1.2.3"; + sha256 = "02bvzgl0331xa4pwdclw08wyq8canmw06ps3xvgvhb5miy93rrwz"; libraryHaskellDepends = [ base constraints convert exceptions lens mtl pretty pretty-show primitive transformers @@ -211908,16 +218997,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; }) {}; @@ -211926,8 +219011,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"; @@ -211967,20 +219052,20 @@ self: { "typerep-map" = callPackage ({ mkDerivation, base, containers, criterion, deepseq , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat - , hedgehog, primitive, tasty, tasty-discover, tasty-hedgehog - , tasty-hspec, vector + , hedgehog, primitive, QuickCheck, tasty, tasty-discover + , tasty-hedgehog, tasty-hspec, vector }: mkDerivation { pname = "typerep-map"; - version = "0.3.0"; - sha256 = "0d5a2zfb75fallp9q8sz1av8ncvsnmqg6dfjqcghz0grfpwmn7bf"; - revision = "1"; - editedCabalFile = "102lwg5rl1628j3v331xj93cgvr9ppmphyjlqli4gm5vxgrkwsfv"; + version = "0.3.1"; + sha256 = "1ycyk47h578vf4kpf1y708zg9cc6i028jv1fdaw3zy59wrbl8y74"; + revision = "2"; + editedCabalFile = "0zcvg2kr3kcnhxdndw6fcjdd1421ncglr34mc8d9sw1hjjcb5w38"; libraryHaskellDepends = [ - base containers ghc-prim primitive vector + base containers deepseq ghc-prim primitive vector ]; testHaskellDepends = [ - base ghc-typelits-knownnat hedgehog tasty tasty-discover + base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover tasty-hedgehog tasty-hspec ]; testToolDepends = [ tasty-discover ]; @@ -211991,7 +219076,6 @@ self: { doHaddock = false; description = "Efficient implementation of a dependent map with types as keys"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "types-compat" = callPackage @@ -212026,8 +219110,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.0.1"; - sha256 = "1v8kzhjyxznj9xj4x5n34ybhzy5nmldsscawnmcaqf96f4w0i178"; + version = "0.7.2.1"; + sha256 = "1fdn7l9dayaii03n63cv3jgaqmblhskfyq3g3qrqw79z1jl755bk"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -212070,6 +219154,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.3"; + sha256 = "16491jhiw8yvs1491plf5c98rarxk0j2dfy76ggayxypzqdn2rmr"; + 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 = "Just let me draw nice text already"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typography-geometry" = callPackage ({ mkDerivation, base, containers, parallel, polynomials-bernstein , vector @@ -212083,6 +219194,7 @@ self: { ]; description = "Drawings for printed text documents"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tyro" = callPackage @@ -212115,8 +219227,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 @@ -212140,8 +219252,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 @@ -212161,8 +219273,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 @@ -212263,6 +219375,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 = "3"; + editedCabalFile = "01j0296a60hpw0n5d50327hnqpkxwzz7pngxq8da5ram0q13cfzw"; + 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 = "3"; + editedCabalFile = "1png0b60pfhx5gfwbmxxq42nfy9yj2zrcw8krq0vm45qgjw4gd8g"; + 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 { @@ -212284,6 +219446,8 @@ self: { pname = "udbus"; version = "0.2.3"; sha256 = "1ifl280n2ib26j4h7h46av6k7ms0j1n2wy4shbqk5xli5bbj3k9n"; + revision = "1"; + editedCabalFile = "036yscknrmc7dcm111bsjk7q0ghb6ih5b6z1ffsqf442dg83x8w7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -212445,8 +219609,8 @@ self: { pname = "uhttpc"; version = "0.1.1.0"; sha256 = "1knf8r8zq8nnidmbj1blazjxkpngczs55jjx0phnnxlc026ppynb"; - revision = "3"; - editedCabalFile = "1s35m2mrcaamj0293yb78ya185fzm71zdx0jq62im7rc5fdhfiry"; + revision = "4"; + editedCabalFile = "0g4rcm7kbanayv18bad7pakrnghqg2qpxq4aib1n4d8h7ximgly2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212557,6 +219721,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 @@ -212575,6 +219741,7 @@ self: { libraryHaskellDepends = [ base io-streams unagi-chan ]; description = "Unagi Chan IO-Streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unamb" = callPackage @@ -212583,6 +219750,8 @@ self: { pname = "unamb"; version = "0.2.7"; sha256 = "0v4c4zyr2fw6g86isa4n8mbflh7mwhzl70sp48mmpr1335n403xs"; + revision = "1"; + editedCabalFile = "0d1kjvxadb25mr7vmiilm3p5r7kgbfkkpklxkr6a136abdbv0pff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -212602,14 +219771,53 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unbeliever" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal + , chronologique, containers, deepseq, directory, exceptions + , fingertree, gauge, hashable, hourglass, hspec, mtl, prettyprinter + , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix, unordered-containers, vector + }: + mkDerivation { + pname = "unbeliever"; + version = "0.8.0.0"; + sha256 = "1cq7w09320nz6jcdg8gcapbsajlihx1836502m36rgm4w9vbxvqi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring Cabal chronologique containers deepseq + directory exceptions fingertree hashable hourglass mtl + prettyprinter prettyprinter-ansi-terminal safe-exceptions + scientific stm template-haskell terminal-size text text-short + transformers unix unordered-containers vector + ]; + testHaskellDepends = [ + aeson async base bytestring Cabal chronologique containers deepseq + directory exceptions fingertree hashable hourglass hspec mtl + prettyprinter prettyprinter-ansi-terminal safe-exceptions + scientific stm template-haskell terminal-size text text-short + transformers unix unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson async base bytestring Cabal chronologique containers deepseq + directory exceptions fingertree gauge hashable hourglass mtl + prettyprinter prettyprinter-ansi-terminal safe-exceptions + scientific stm template-haskell terminal-size text text-short + transformers unix unordered-containers vector + ]; + description = "Opinionated Haskell Interoperability"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unbound" = callPackage ({ mkDerivation, base, binary, containers, mtl, parsec, pretty , QuickCheck, RepLib, template-haskell, transformers }: mkDerivation { pname = "unbound"; - version = "0.5.1"; - sha256 = "0cjfd6fdxpi94dac5aslgfggm81fdspbywfyl5m20ah5drgpsr12"; + version = "0.5.1.1"; + sha256 = "1pr06iii1pm6dkdm4rxc4cr817p5iri877573p06kj53w1xk5scj"; libraryHaskellDepends = [ base binary containers mtl RepLib transformers ]; @@ -212630,8 +219838,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.3.3"; - sha256 = "06md35jmm8xas8dywxxc62nq4d6gi66m7bm4h3920jpvknqwbvbz"; + version = "0.4.0"; + sha256 = "04amv54wrabzdmlig1mxi51ikq1lmfcm504184y0nm0xjahfssmx"; libraryHaskellDepends = [ ansi-wl-pprint base containers contravariant deepseq exceptions mtl profunctors template-haskell transformers transformers-compat @@ -212667,6 +219875,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unboxed" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "unboxed"; + version = "0.1.0.0"; + sha256 = "1xk9x1viprvswjp62xrg2mvm34b0qamflb1phpyfh9bspy8f1qqd"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "All the standard sum types but strict and unboxed as possible"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unboxed-containers" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -212738,6 +219957,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unescaping-print" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unescaping-print"; + version = "0.1"; + sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5"; + revision = "1"; + editedCabalFile = "0w8fw1nymnj34lnm2q8nj1ymcbzw6q6jpp4c1h2w5b0q4rdw41jv"; + libraryHaskellDepends = [ base ]; + description = "Tiny package providing unescaping versions of show and print"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unexceptionalio" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -212747,6 +219979,7 @@ self: { libraryHaskellDepends = [ base ]; description = "IO without any non-error, synchronous exceptions"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unexceptionalio-trans" = callPackage @@ -212761,6 +219994,17 @@ 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; + }) {}; + "unfoldable" = callPackage ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck , random, transformers @@ -212769,8 +220013,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 ]; @@ -212814,7 +220058,6 @@ self: { libraryHaskellDepends = [ base containers uni-util ]; description = "Event handling for the uniform workbench"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-graphs" = callPackage @@ -212847,7 +220090,6 @@ self: { ]; description = "Graphical User Interface for Haskell Programs"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-posixutil" = callPackage @@ -212863,7 +220105,6 @@ self: { ]; description = "Posix utilities for the uniform workbench"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-reactor" = callPackage @@ -212878,7 +220119,6 @@ self: { ]; description = "Reactors for the uniform workbench"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uni-uDrawGraph" = callPackage @@ -212912,24 +220152,9 @@ self: { ]; description = "Utilities for the uniform workbench"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode" = callPackage - ({ mkDerivation, base, containers, semigroups, utility-ht }: - mkDerivation { - pname = "unicode"; - version = "0.0.1"; - sha256 = "10cv8kk3c028bylkjz8jx0xhmkzrjbmhm1hhbdsyvszl9mfykga9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers semigroups ]; - testHaskellDepends = [ base containers utility-ht ]; - description = "Construct and transform unicode characters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode_0_0_1_1" = callPackage ({ mkDerivation, base, containers, semigroups, utility-ht }: mkDerivation { pname = "unicode"; @@ -212941,7 +220166,6 @@ self: { testHaskellDepends = [ base containers utility-ht ]; description = "Construct and transform unicode characters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode-names" = callPackage @@ -213031,8 +220255,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 @@ -213064,7 +220288,6 @@ self: { testHaskellDepends = [ base text ]; description = "Make writing in unicode easy"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unidecode" = callPackage @@ -213127,16 +220350,18 @@ self: { }) {}; "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"; + revision = "2"; + editedCabalFile = "170dhg4z4jzi50nh4xx75r9k8zz5br7j2iqjjw2r1dx29ajqbcw9"; + libraryHaskellDepends = [ + base deepseq hashable profunctors tagged vinyl + ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; license = stdenv.lib.licenses.bsd3; @@ -213201,8 +220426,8 @@ self: { pname = "uniprot-kb"; version = "0.1.2.0"; sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l"; - revision = "1"; - editedCabalFile = "0kvw9mzgjz6m1sslywn09n4axkjnwqpi4c5p00p9c81mr9fpbild"; + revision = "3"; + editedCabalFile = "1a532yhvgs7n096f6mjwm7811d2c6xbgr45gscg7d4ys042c0586"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -213261,13 +220486,13 @@ self: { }: mkDerivation { pname = "unique-logic-tf"; - version = "0.5.0.1"; - sha256 = "1v37bv5bjpkm5085sg4rf7ssbigsivib6fdxjhxyd36zhh08pdjy"; + version = "0.5.1"; + sha256 = "0a2hjkm7kwfnqyscxxdw2r2cq3gsydv5ny91vpxxd3paknqqr0cb"; libraryHaskellDepends = [ base containers data-ref semigroups transformers utility-ht ]; testHaskellDepends = [ - base non-empty QuickCheck transformers utility-ht + base non-empty QuickCheck semigroups transformers utility-ht ]; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; @@ -213383,8 +220608,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 @@ -213392,7 +220617,6 @@ self: { ]; description = "A parser for units of measure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unittyped" = callPackage @@ -213512,6 +220736,7 @@ self: { ]; description = "Classes for types where we know all the values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-base" = callPackage @@ -213531,8 +220756,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; @@ -213553,6 +220778,7 @@ self: { ]; description = "Universe instances for types from select extra packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "universe-instances-trans" = callPackage @@ -213578,8 +220804,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 ]; @@ -213611,33 +220837,6 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, microlens - , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog - , text, transformers, type-operators, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "universum"; - version = "1.2.0"; - sha256 = "0645gvj1p33d0fnlk09i74l11sv11bidyv44hyb2m0dls22hr89p"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable microlens - microlens-mtl mtl safe-exceptions stm text transformers - type-operators unordered-containers utf8-string vector - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog tasty tasty-hedgehog text - utf8-string - ]; - benchmarkHaskellDepends = [ - base containers gauge unordered-containers - ]; - description = "Custom prelude used in Serokell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "universum_1_3_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -213645,8 +220844,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 @@ -213670,8 +220869,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; @@ -213788,17 +220987,18 @@ self: { }) {}; "unix-time" = callPackage - ({ mkDerivation, base, binary, bytestring, doctest, hspec + ({ mkDerivation, base, binary, bytestring, hspec, hspec-discover , old-locale, old-time, QuickCheck, time }: mkDerivation { pname = "unix-time"; - version = "0.3.8"; - sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw"; + version = "0.4.5"; + sha256 = "1bwg132x2613k93wxka17461fc72wrjy5vmgcyami0nn5b30ay7y"; libraryHaskellDepends = [ base binary bytestring old-time ]; testHaskellDepends = [ - base bytestring doctest hspec old-locale old-time QuickCheck time + base bytestring hspec old-locale old-time QuickCheck time ]; + testToolDepends = [ hspec-discover ]; description = "Unix time parser/formatter and utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -213810,10 +221010,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 @@ -213842,45 +221040,40 @@ self: { license = "GPL"; }) {}; - "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, hspec - , process, stm, time, transformers, unix, unliftio-core - }: + "unlifted-list" = callPackage + ({ mkDerivation, base, ghc-prim, semigroups }: mkDerivation { - pname = "unliftio"; - version = "0.2.7.1"; - sha256 = "1rif0r52qw2g8kxnbxpcdsmy925py47f8gspfvkbp16nrpxk7k63"; - libraryHaskellDepends = [ - async base deepseq directory filepath process stm time transformers - unix unliftio-core - ]; - testHaskellDepends = [ - async base deepseq directory filepath hspec process stm time - transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; + 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_0_2_8_0" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, hspec - , process, stm, time, transformers, unix, unliftio-core + "unliftio" = callPackage + ({ mkDerivation, async, base, containers, deepseq, directory + , filepath, gauge, hspec, process, QuickCheck, stm, time + , transformers, unix, unliftio-core }: mkDerivation { pname = "unliftio"; - version = "0.2.8.0"; - sha256 = "04i03j1ffa3babh0i79zzvxk7xnm4v8ci0mpfzc4dm7m65cwk1h5"; + version = "0.2.10"; + sha256 = "0p0vrw8yxfc5d31zybx08mp302fafs0a6lwq3n40qd1wiy2nw78l"; libraryHaskellDepends = [ async base deepseq directory filepath process stm time transformers unix unliftio-core ]; testHaskellDepends = [ - async base deepseq directory filepath hspec process stm time + async base containers 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 @@ -213889,6 +221082,8 @@ self: { pname = "unliftio-core"; version = "0.1.2.0"; sha256 = "0y3siyx3drkw7igs380a87h8qfbbgcyxxlcnshp698hcc4yqphr4"; + revision = "1"; + editedCabalFile = "0s6xfg9d0i3sfil5gjbamlq017wdxa69csk73bcqjkficg43vm29"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = stdenv.lib.licenses.mit; @@ -213909,6 +221104,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 { @@ -213975,6 +221184,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_10_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.10.0"; + sha256 = "0wy5hfrs880hh8hvp648bl07ws777n3kkmczzdszr7papnyigwb5"; + 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 + ]; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -214024,6 +221257,7 @@ self: { ]; description = "A specialization of `HashMap Int v`"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unpack-funcs" = callPackage @@ -214069,6 +221303,7 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked either data type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unpacked-maybe" = callPackage @@ -214081,6 +221316,20 @@ self: { testHaskellDepends = [ base QuickCheck quickcheck-classes ]; description = "An unpacked maybe data type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "unpacked-maybe-numeric" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, quickcheck-classes }: + mkDerivation { + pname = "unpacked-maybe-numeric"; + version = "0.1.0.0"; + sha256 = "19jz91jkbvnldy56kv9wb1nmbwvlxjh7nqlxc99nq6yi4whsh8gj"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base QuickCheck quickcheck-classes ]; + description = "maybes of numeric values with fewer indirections"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unpacked-these" = callPackage @@ -214117,6 +221366,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 { @@ -214317,6 +221586,7 @@ self: { executableHaskellDepends = [ base ports-tools process ]; description = "Software management tool"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "update-monad" = callPackage @@ -214461,11 +221731,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 @@ -214478,8 +221749,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 @@ -214495,19 +221766,21 @@ self: { ]; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-bytestring-aeson" = callPackage ({ 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 ]; description = "Aeson instances for URI Bytestring"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -214734,12 +222007,13 @@ self: { pname = "urlencoded"; version = "0.4.2.0"; sha256 = "1i88qf5dq52ra7hl29ka1i0bhyfic3sg7ksm1n6bpb2hj38hr139"; - revision = "1"; - editedCabalFile = "1bglhr4dsfw0yzm5kb6jwrx2dpz7zjyvg5341idncvmlc0f6wx7w"; + revision = "2"; + editedCabalFile = "1ylbxfd7p8kdlmsfbqsnisgdxk9livncin1bckp8m5a1mrw5ywk3"; libraryHaskellDepends = [ base mtl network network-uri split ]; testHaskellDepends = [ base network network-uri QuickCheck ]; description = "Generate or process x-www-urlencoded data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "urlpath" = callPackage @@ -214750,27 +222024,8 @@ self: { }: mkDerivation { pname = "urlpath"; - version = "9.0.0"; - sha256 = "1ysjhb42sk34j29xy7hgf9b4qp90p6hrkqcmwdalvsasbwk8kgwh"; - libraryHaskellDepends = [ - attoparsec-uri base exceptions mmorph monad-control - monad-control-aligned monad-logger mtl path path-extra resourcet - split strict text transformers transformers-base vector - ]; - description = "Painfully simple URL deployment"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "urlpath_9_0_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 - , transformers-base, vector - }: - 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 @@ -214892,6 +222147,7 @@ self: { ]; description = "A database of USB identifiers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "usb-iteratee" = callPackage @@ -214934,8 +222190,8 @@ self: { }: mkDerivation { pname = "userid"; - version = "0.1.3.2"; - sha256 = "0ym8r3jg7waypc74liv1v32sc1rv419axgbz97xznssb9wshcv3a"; + version = "0.1.3.3"; + sha256 = "1p1dfbr68bkn09zpy50i1xazvfblds46bs60vra2sqn4hv8vj0s9"; libraryHaskellDepends = [ aeson base boomerang cereal safecopy web-routes web-routes-th ]; @@ -215135,6 +222391,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 @@ -215162,6 +222419,7 @@ self: { libraryHaskellDepends = [ base primitive ]; description = "Primitive memory-related utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "util-primitive-control" = callPackage @@ -215177,6 +222435,7 @@ self: { 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 @@ -215301,8 +222560,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; }) {}; @@ -215390,6 +222651,7 @@ self: { executableHaskellDepends = [ base process ]; description = "A debugger for the UUAG system"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uuid" = callPackage @@ -215441,8 +222703,8 @@ self: { pname = "uuid-crypto"; version = "1.4.0.0"; sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn"; - revision = "4"; - editedCabalFile = "1rzvpkvjbvzwvks795998k8232pc41yvcblrq7f29abrvd0587xp"; + revision = "6"; + editedCabalFile = "146jxyrsnrcwsll6mhq8a67ms1wpbbbxmkbq7sh9wza6c4g2fbwy"; libraryHaskellDepends = [ base binary bytestring cryptoids cryptoids-class cryptoids-types exceptions uuid @@ -215559,6 +222821,7 @@ self: { libraryHaskellDepends = [ base json MissingH mtl ]; description = "Cross-language extensible representation for algebraic data type instances"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uzbl-with-source" = callPackage @@ -215603,6 +222866,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vabal" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cassava, containers + , directory, filepath, http-client, http-client-tls, http-types + , optparse-applicative, process, vabal-lib + }: + mkDerivation { + pname = "vabal"; + version = "2.0.0"; + sha256 = "1kcdnkm0yws0v2b7yiwiwfi7db9il678s8x1jnq61zwlrfz7bsjl"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal cassava containers directory filepath + http-client http-client-tls http-types optparse-applicative process + vabal-lib + ]; + testHaskellDepends = [ base process ]; + description = "the cabal companion"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "vabal-lib" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cassava, containers + , vector + }: + mkDerivation { + pname = "vabal-lib"; + version = "2.0.0"; + sha256 = "1apryz8dvc4lk5nls330hpmbn9cc1qrhair2xybsh666whpmmmxp"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring Cabal cassava containers vector + ]; + testHaskellDepends = [ base Cabal containers ]; + description = "Core algorithms and datatypes used by vabal"; + license = stdenv.lib.licenses.mit; + }) {}; + "vacuum" = callPackage ({ mkDerivation, array, base, containers, ghc-prim }: mkDerivation { @@ -215697,6 +222999,7 @@ self: { ]; description = "Runs commands on remote machines using ssh"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "valid-names" = callPackage @@ -215730,6 +223033,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 @@ -215746,8 +223051,8 @@ self: { }: mkDerivation { pname = "validated-literals"; - version = "0.2.0.1"; - sha256 = "0gvqsmyhcjf1l5a6vkhr7ffnw81l01y0dp05lzkmy8n177412pr4"; + version = "0.3.0"; + sha256 = "1k77jp19kl7h4v9hl2jhsmbq8dhzl8z9sgkw1jxx1rblm3fszjx1"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base bytestring deepseq tasty tasty-hunit tasty-travis @@ -215779,13 +223084,14 @@ self: { pname = "validation"; version = "1"; sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh"; + revision = "1"; + editedCabalFile = "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3"; libraryHaskellDepends = [ base bifunctors deepseq lens semigroupoids semigroups ]; testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validations" = callPackage @@ -215831,8 +223137,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; - version = "0.7.0.0"; - sha256 = "0xribw98amafihw87ddajk6vlirp7w9b26lrnjgq7jfm4710j95f"; + version = "0.9.0.0"; + sha256 = "1rm0gw049v7f9i5rqn8f8ps4ksawmmggmhw9yclgh4qhhql7gz3q"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; @@ -215856,17 +223162,6 @@ self: { }) {}; "validity-bytestring" = callPackage - ({ mkDerivation, base, bytestring, validity }: - mkDerivation { - pname = "validity-bytestring"; - version = "0.3.0.2"; - sha256 = "0bwixp9fcblqy6b8kxvzg9l2i9lksn9g71243m2zcan1kh7a1qb2"; - libraryHaskellDepends = [ base bytestring validity ]; - description = "Validity instances for bytestring"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-bytestring_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { pname = "validity-bytestring"; @@ -215875,7 +223170,6 @@ self: { libraryHaskellDepends = [ base bytestring validity ]; description = "Validity instances for bytestring"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-containers" = callPackage @@ -215903,6 +223197,7 @@ self: { ]; description = "Validity instances for Path"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-primitive" = callPackage @@ -216120,25 +223415,25 @@ self: { ]; description = "nominal value with possible variations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "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 ]; description = "FRP through value streams and monadic splines"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vault" = callPackage @@ -216207,6 +223502,7 @@ self: { ]; description = "A monad transformer for vault-tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vaultaire-common" = callPackage @@ -216400,8 +223696,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 @@ -216410,6 +223706,7 @@ self: { benchmarkHaskellDepends = [ base criterion fin vector ]; description = "Vec: length-indexed (sized) list"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vect" = callPackage @@ -216474,39 +223771,37 @@ 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, base, bytestring, containers, mwc-random + , primitive, QuickCheck, vector }: mkDerivation { pname = "vector-algorithms"; - version = "0.7.0.4"; - sha256 = "0mfa8ig9v69l41p2vb5jl4qmaln5y1rlzarr2mlgm8g1nvq8qqdg"; - isLibrary = true; - isExecutable = true; + version = "0.8.0.1"; + sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector ]; + benchmarkHaskellDepends = [ base mwc-random vector ]; description = "Efficient algorithms for vector arrays"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -216523,21 +223818,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; }) {}; @@ -216570,6 +223863,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "vector-builder_0_3_7" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, QuickCheck + , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-builder"; + version = "0.3.7"; + sha256 = "06n33dzszqx2yzf9q9n0ap0avb0ljfyx8b6mp7k80vmakxfxdxds"; + libraryHaskellDepends = [ base base-prelude semigroups vector ]; + testHaskellDepends = [ + attoparsec QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + description = "Vector builder"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-bytes-instances" = callPackage ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }: mkDerivation { @@ -216640,14 +223952,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"; @@ -216762,16 +224091,17 @@ self: { }) {}; "vector-sized" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, distributive - , finite-typelits, indexed-list-literals, primitive, vector + ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive + , finite-typelits, hashable, indexed-list-literals, primitive + , vector }: mkDerivation { pname = "vector-sized"; - version = "1.0.4.0"; - sha256 = "1rdryc5ykqvdpjgx3a895cx2i14ixg0ryhppn89fjzhann79mgk4"; + version = "1.2.0.0"; + sha256 = "04r43b30vayg56n88b5r3b5krh2kjxnqgmr4kx052bgpl8k6zh54"; libraryHaskellDepends = [ - adjunctions base deepseq distributive finite-typelits - indexed-list-literals primitive vector + adjunctions base comonad deepseq distributive finite-typelits + hashable indexed-list-literals primitive vector ]; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; @@ -216781,21 +224111,21 @@ self: { ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.13"; - sha256 = "05yn93vnhzhpp2i6qb4b3dasvmpk71rab6vhssqvpb3qhdvxb482"; + version = "0.15"; + sha256 = "03swlbn0x8gfb7bilxmh3zckprjc6v64bildmhwzlimjvd1v8jb8"; revision = "1"; - editedCabalFile = "0iakf0srv3lpkyjvivj7w5swv2ybwas0kx59igkq2b7bwp0y82wn"; + editedCabalFile = "19549mrhg3x0d1ancrxyvrskd6p4x11iprnv0b0d84q7sc40fa8w"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; }) {}; - "vector-space_0_14" = callPackage + "vector-space_0_16" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.14"; - sha256 = "1kfziqdnsjr540y8iajpfmdkarhmjnc5xm897bswjhrpgyh2k6h3"; + version = "0.16"; + sha256 = "17676s2f8i45dj5gk370nc8585aylah7m34nbf34al7r1492y2qc"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -216806,13 +224136,12 @@ self: { ({ 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"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space-opengl" = callPackage @@ -216844,6 +224173,7 @@ self: { libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-split" = callPackage @@ -216891,8 +224221,8 @@ self: { }: mkDerivation { pname = "vector-text"; - version = "1.1.5"; - sha256 = "1gd7dg9icr1211rf298ny60yjgyyxbxa62l16q28yd5z160sr3ir"; + version = "1.1.6"; + sha256 = "14ms8ach15c1pyaih92qi703vj9aanbrmcsfwzxb55vwfpbbm2f4"; libraryHaskellDepends = [ base binary prologue text vector vector-binary-instances ]; @@ -216941,6 +224271,7 @@ self: { ]; description = "GIS Vector Tiles, as defined by Mapbox"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verbalexpressions" = callPackage @@ -217018,6 +224349,7 @@ self: { ]; description = "An intermediate language for Hoare logic style verification"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verify" = callPackage @@ -217060,12 +224392,13 @@ self: { ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }: mkDerivation { pname = "versioning"; - version = "0.3.0.0"; - sha256 = "12d5xxc8i0ldbsb6y22f9gvk0d61nrgjz3yf7ppvqrzhilgs6yyf"; + version = "0.3.1.0"; + sha256 = "0m5hgl6n8znxn63pkvv7yb2nx7is4wivbzvbyh698cv5d92jb7cp"; libraryHaskellDepends = [ aeson base bytestring semigroupoids ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "Type-safe data versioning"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "versioning-servant" = callPackage @@ -217075,8 +224408,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 ]; @@ -217086,6 +224419,7 @@ self: { ]; description = "Servant combinators for the versioning library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "versions" = callPackage @@ -217095,8 +224429,10 @@ self: { }: mkDerivation { pname = "versions"; - version = "3.4.0.1"; - sha256 = "0r7crjnzllip9ya3lgf7cckfgz57daq379sh19z7adlzj8rxhimg"; + 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 @@ -217218,26 +224554,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.22"; - sha256 = "07sa15nrwdjyzqmzvrdvl0nggdx5ca6w7qijhv7na9ivr0p2h495"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick containers directory ghc-prof lens scientific text - vector vector-algorithms vty - ]; - description = "Text-based interactive GHC .prof viewer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "viewprof_0_0_0_23" = callPackage - ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens - , scientific, text, vector, vector-algorithms, vty - }: - mkDerivation { - pname = "viewprof"; - version = "0.0.0.23"; - sha256 = "0nxivlnzvnhsk9gn2d7x240n7803fy14pb5knjkxvsw0h0pj8kc6"; + version = "0.0.0.27"; + sha256 = "0yfrh7ifgn4vw9yqn0rif040sabbgs2j42rkds48fam30cdr12v6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -217311,8 +224629,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.4.0"; - sha256 = "1pa1l1rirj19cnvdaqkf5jscsfkfyam60yk3gqiypbpd102zas6d"; + version = "0.2.5.0"; + sha256 = "03ykd8pz7wn9dcj78zgq15ip04g8b4b7945g6fj5a7bfz0y9asbf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217379,19 +224697,19 @@ self: { }) {}; "vinyl" = callPackage - ({ mkDerivation, array, base, criterion, doctest, ghc-prim, hspec - , lens, linear, microlens, mwc-random, primitive - , should-not-typecheck, singletons, tagged, vector + ({ 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.8.1.1"; - sha256 = "0gwgsk7xf64291s6crvzlry1bvcvwaqmvxpl605id4bb099kqfnh"; - revision = "1"; - editedCabalFile = "0mb694y03r185r0p473zh6bl4j0l4na9km0r3x8czjil7x9yb0vr"; + 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 @@ -217400,7 +224718,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "vinyl_0_10_0" = callPackage + "vinyl_0_11_0" = callPackage ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random , primitive, should-not-typecheck, singletons, tagged, text @@ -217408,8 +224726,8 @@ self: { }: mkDerivation { pname = "vinyl"; - version = "0.10.0"; - sha256 = "1d1lm9mi9gkcaw0lczbmbn81c3kc5yji3jbp2rjabiwhyi61mj4m"; + version = "0.11.0"; + sha256 = "0sqa4x8cwg6hdx3lrnq9pbggsh5vv6rhng2az4grl60c4kw6zr08"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ aeson base doctest hspec lens lens-aeson microlens mtl @@ -217442,7 +224760,6 @@ self: { ]; description = "Utilities for working with OpenGL's GLSL shading language and vinyl records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vinyl-json" = callPackage @@ -217557,6 +224874,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Simple computation of visibility polygons"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vision" = callPackage @@ -217649,32 +224967,32 @@ self: { }) {}; "vivid" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hashable, MonadRandom, mtl, network, process, random + ({ 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.3.0.2"; - sha256 = "16dvg5yq26fkrq01mn3c4byz32xld3alxa8h9m16gi4g04f99q00"; + version = "0.4.2.3"; + sha256 = "0awm9cnjgfqx1qf6jsnwmf0kxqxwny82q1ddqna8ilqcdrbsxh0i"; libraryHaskellDepends = [ - base bytestring containers directory filepath hashable MonadRandom - mtl network process random random-shuffle split stm time - transformers utf8-string vivid-osc vivid-supercollider + 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 - }: + ({ mkDerivation, base, bytestring, cereal, microspec, time }: mkDerivation { pname = "vivid-osc"; - version = "0.3.0.0"; - sha256 = "152ai2j75hbjvws9k1ii2h32nnj8ak44agwpdcfkdf7nc1fgha57"; - libraryHaskellDepends = [ base binary bytestring cereal time ]; + 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"; @@ -217686,8 +225004,8 @@ self: { }: mkDerivation { pname = "vivid-supercollider"; - version = "0.3.0.0"; - sha256 = "15fkqjf3hfhc262slr5znh4f320lw68h318wr4sdprml0sy9xdw3"; + version = "0.4.1.2"; + sha256 = "1jr132l3zgwxz3vnnqbm1ycms29izsbn6kdddq7204zz9y7hx96j"; libraryHaskellDepends = [ base binary bytestring cereal split utf8-string vivid-osc ]; @@ -217697,6 +225015,7 @@ self: { ]; description = "Implementation of SuperCollider server specifications"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vk-aws-route53" = callPackage @@ -217745,24 +225064,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.2"; - sha256 = "1kw988gbx9vvrfybz3k1qxm3hyqxrfi0dyy5iwmq191y7x2scbj6"; + 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 @@ -217849,6 +225172,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) vrpn;}; + "vt-utils" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , case-insensitive, directory, http-client, http-types, HUnit + , parsec, process, text, time, transformers, unordered-containers + , vector, wai, warp + }: + mkDerivation { + pname = "vt-utils"; + version = "1.2.0.0"; + sha256 = "1mbc4a8s6h3f5w3da2ln95050c1ssnh7pyj4i34nvmm5gqrb3jb9"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring case-insensitive directory + http-client http-types HUnit parsec process text time transformers + unordered-containers vector wai + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring case-insensitive directory + http-client http-types HUnit parsec process text time transformers + unordered-containers vector wai warp + ]; + description = "Vector and Text utilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "vte" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools, pango , vte @@ -217896,8 +225243,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.21"; - sha256 = "0nvsjc5awr6kwrsv02sz64vgza6g8phk9g6g07dx1sm2yfsvhyas"; + version = "5.25.1"; + sha256 = "1x15jlf9x6c8nhdbp6alr17vigclkaf5qy5jpp14g5n568p7karw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217919,41 +225266,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_24" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , deepseq, directory, filepath, hashable, HUnit, microlens - , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck - , quickcheck-assertions, random, smallcheck, stm, string-qq - , terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; - version = "5.24"; - sha256 = "177yj12cgvmiq62z7kdkqbhmr98awyi3njp1xsbdr3p81k5arwrw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers deepseq directory filepath - hashable microlens microlens-mtl microlens-th mtl parallel parsec - stm terminfo text transformers unix utf8-string vector - ]; - executableHaskellDepends = [ - base containers microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers deepseq HUnit - microlens microlens-mtl mtl QuickCheck quickcheck-assertions random - smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -218033,6 +225345,7 @@ self: { librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -218044,6 +225357,42 @@ self: { libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "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.5.2.2"; + sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95"; + 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 @@ -218120,8 +225469,8 @@ self: { }: mkDerivation { pname = "wai"; - version = "3.2.1.2"; - sha256 = "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8"; + version = "3.2.2"; + sha256 = "1qbzq4k8b23pg1knw5y99rdvkfywnncwqkfrkp2w7g6p054xar1a"; libraryHaskellDepends = [ base bytestring http-types network text transformers vault ]; @@ -218312,6 +225661,7 @@ self: { ]; description = "Helpers to bind digestive-functors onto wai requests"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-dispatch" = callPackage @@ -218326,6 +225676,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-enforce-https" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, hspec + , http-types, network, text, wai, wai-extra, warp, warp-tls + }: + mkDerivation { + pname = "wai-enforce-https"; + version = "0.0.1"; + sha256 = "0gm4n57abmbawpij3hsn6ia283b75sn40387dimpp573q5nnnwmv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring case-insensitive http-types network text wai + ]; + executableHaskellDepends = [ base http-types wai warp warp-tls ]; + testHaskellDepends = [ + base bytestring case-insensitive hspec http-types wai wai-extra + ]; + description = "Enforce HTTPS in Wai server app safely"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-eventsource" = callPackage ({ mkDerivation, wai }: mkDerivation { @@ -218342,23 +225713,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.2"; - sha256 = "07gcgq59dki5drkjci9ka34xjsy3bqilbsx0lsc4905w9jlyfbci"; + version = "3.0.25"; + sha256 = "0caz1miwnyjqg6gdfgv7ibyfdyjzlq2i8v07zhan1nniv9pj3w6y"; 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 @@ -218382,7 +225752,6 @@ self: { ]; description = "Run CGI apps on WAI"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-git-http" = callPackage @@ -218600,16 +225969,16 @@ self: { }) {}; "wai-logger" = callPackage - ({ mkDerivation, base, byteorder, bytestring, case-insensitive - , doctest, fast-logger, http-types, network, unix, unix-time, wai + ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest + , doctest, fast-logger, http-types, network, wai }: mkDerivation { pname = "wai-logger"; - version = "2.3.2"; - sha256 = "0w5ldq4gplc16zzk5ikmbbjw79imaqvw8p6lylaw3hlsbn3zzm4d"; + version = "2.3.4"; + sha256 = "004ng1r1qij0frlsyps0nz9b0ijn0zlk3i6qbb7lq1f4209ikzlk"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base byteorder bytestring case-insensitive fast-logger http-types - network unix unix-time wai + base byteorder bytestring fast-logger http-types network wai ]; testHaskellDepends = [ base doctest ]; description = "A logging system for WAI"; @@ -218883,8 +226252,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 @@ -219089,6 +226458,7 @@ self: { ]; description = "A WAI middleware to collect EKG request metrics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-preprocessor" = callPackage @@ -219133,8 +226503,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 @@ -219244,21 +226614,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; @@ -219272,6 +226644,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 @@ -219319,6 +226693,7 @@ self: { ]; description = "WAI request predicates"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-request-spec" = callPackage @@ -219353,21 +226728,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; }) {}; @@ -219405,6 +226783,7 @@ self: { ]; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-routing" = callPackage @@ -219431,16 +226810,18 @@ self: { ]; description = "Declarative routing for WAI"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-secure-cookies" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, http-types, memory - , protolude, random, split, wai + ({ mkDerivation, base, bytestring, cryptonite, hspec + , hspec-expectations, hspec-wai, http-types, memory, protolude + , random, split, wai, wai-extra }: mkDerivation { pname = "wai-secure-cookies"; - version = "0.1.0.2"; - sha256 = "0lp8g8v122kqp2ps1w13hhcxm0p0xjkqjsdk9hm7xyc4k78x5lvb"; + version = "0.1.0.3"; + sha256 = "01jqwl9z7p3vkh7jvlxzvqcq2bgkcfx559pnc87qgp7ldh018z7f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219448,6 +226829,10 @@ self: { wai ]; executableHaskellDepends = [ base bytestring cryptonite memory ]; + testHaskellDepends = [ + base bytestring hspec hspec-expectations hspec-wai http-types wai + wai-extra + ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -219467,6 +226852,7 @@ self: { ]; description = "Flexible session middleware for WAI"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-session-alt" = callPackage @@ -219500,6 +226886,7 @@ self: { ]; description = "Session store based on clientsession"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-session-mysql" = callPackage @@ -219685,6 +227072,7 @@ self: { ]; description = "Collection of utility functions for use with WAI"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-websockets" = callPackage @@ -219730,6 +227118,7 @@ self: { libraryHaskellDepends = [ base containers ]; description = "A wrapping library for waitfree computation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "waitra" = callPackage @@ -219809,6 +227198,7 @@ self: { testHaskellDepends = [ base ]; description = "A library and executable for creating wallpaper, frieze, and rosette patterns"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warc" = callPackage @@ -219821,6 +227211,8 @@ self: { pname = "warc"; version = "1.0.4"; sha256 = "1mxfm8kdvm0l1lnzma4n9mriz94ypckxqcz1f34fa3n1j3ckc45b"; + revision = "1"; + editedCabalFile = "1mdd3r1lg92rchy1zv4jwvrsn6x3wnplhbnwavpx0nivf3xp7m8q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219847,8 +227239,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.23"; - sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0"; + version = "3.2.26"; + sha256 = "1s83313cs6w84a8yfwqkixfz4a94aszma4phsqv7x1ivi9b3i8sc"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -219871,41 +227263,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "warp_3_2_25" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, doctest - , gauge, ghc-prim, hashable, hspec, http-client, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - 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 - http2 iproute network simple-sendfile stm streaming-commons text - unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory doctest ghc-prim hashable - hspec http-client http-date http-types http2 HUnit iproute - lifted-base network process QuickCheck silently simple-sendfile stm - streaming-commons text time transformers unix unix-compat vault wai - word8 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network unix unix-compat - ]; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -219931,6 +227288,8 @@ self: { 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 @@ -220001,8 +227360,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 @@ -220120,8 +227479,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 @@ -220134,14 +227493,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wave_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, hspec + , hspec-discover, QuickCheck, temporary, transformers + }: + mkDerivation { + pname = "wave"; + version = "0.2.0"; + sha256 = "149kgwngq3qxc7gxpkqb16j669j0wpv2f3gnvfwp58yg6m4259ki"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring cereal containers transformers + ]; + testHaskellDepends = [ + base bytestring containers hspec QuickCheck temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Work with WAVE and RF64 files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wavefront" = callPackage ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text , transformers, vector }: 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 ]; @@ -220219,6 +227599,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 @@ -220302,8 +227694,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.2.1"; - sha256 = "0pdbcc9mg2wrc3jm7g2dcsqgqv89dgjcnxs810gzw3d3rh418i5m"; + version = "0.1.2.2"; + sha256 = "0cbf46d1a55y7j2d84crhfdsgy0c2x0rfmvhhwxxh5pigg846cd2"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -220312,6 +227704,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 @@ -220376,8 +227769,8 @@ self: { ({ mkDerivation, base, containers, mtl, stm, text }: mkDerivation { pname = "web-plugins"; - version = "0.2.9"; - sha256 = "0l3s98l69yg8gvx4bxqa95f4mvsvvij0q1rajvzwfh3bcrzzsfz6"; + version = "0.2.9.1"; + sha256 = "13wbfl8v5milx2s4lyiw4b44gk5syqbaaqwdxz5sclpxs2ilxvq2"; libraryHaskellDepends = [ base containers mtl stm text ]; description = "dynamic plugin system for web applications"; license = stdenv.lib.licenses.bsd3; @@ -220506,8 +227899,8 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.6.3"; - sha256 = "1zamjbvjxryc43wac95cdavbq4czjlfx5kgxykadx8sw63vfnk4x"; + version = "0.22.6.4"; + sha256 = "0r0z39hdxm3ggqq9n71wy0k44gb27zpka4pnmp07855czc4l61ca"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; @@ -220567,22 +227960,29 @@ self: { ({ mkDerivation, aeson, async, base, basement, bytestring, cereal , cryptonite, data-default, exceptions, generics-sop, hspec , hspec-contrib, hspec-discover, hspec-expectations, http-client - , machines, memory, mtl, parsec, split, stm, tagged - , template-haskell, text, time, transformers + , http-client-tls, machines, memory, microlens, microlens-aeson + , microlens-mtl, microlens-th, mtl, OneTuple, parsec, random + , relapse, split, stm, tagged, template-haskell, text, time + , transformers, uuid-types, vinyl }: mkDerivation { pname = "web3"; - version = "0.7.3.0"; - sha256 = "1ff52krn6vylz8fjbj6224q48lg6cz4glg6xl9sgrz36ayliv0mg"; + version = "0.8.3.1"; + sha256 = "1pvyyvaamxjz2pyxz25sw3f8hv8605qg99qpgx40bhbhrfvg8zpi"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default - exceptions generics-sop http-client machines memory mtl parsec - tagged template-haskell text transformers + exceptions generics-sop http-client http-client-tls machines memory + microlens microlens-aeson microlens-mtl microlens-th mtl OneTuple + parsec relapse tagged template-haskell text transformers uuid-types + vinyl ]; testHaskellDepends = [ - async base bytestring data-default generics-sop hspec hspec-contrib - hspec-discover hspec-expectations memory split stm tagged text time - transformers + 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 split stm tagged template-haskell text time + transformers uuid-types vinyl ]; testToolDepends = [ hspec-discover ]; description = "Ethereum API for Haskell"; @@ -220796,28 +228196,30 @@ self: { , http-types, JuicyPixels, lens, lens-aeson, network-uri, parsec , QuickCheck, random, scientific, script-monad, SHA, stm, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text, time - , unordered-containers, uri-encode, vector, wreq + , transformers, unordered-containers, uri-encode, vector, wreq }: mkDerivation { pname = "webdriver-w3c"; - version = "0.0.1"; - sha256 = "0ynidfwhyarbfhiq8m284l6489ribmakx8p8gx6cz7kvh44qa1cv"; + version = "0.0.2"; + sha256 = "04ca4j880dpivlascckp386r0jj8cwsw9mfq4jala0b59pkz8z6y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring containers directory exceptions http-client http-types JuicyPixels lens lens-aeson network-uri QuickCheck random scientific script-monad - SHA stm tasty tasty-expected-failure text time unordered-containers - uri-encode vector wreq + SHA stm tasty tasty-expected-failure text time transformers + unordered-containers uri-encode vector wreq + ]; + executableHaskellDepends = [ + base tasty tasty-expected-failure transformers ]; - executableHaskellDepends = [ base tasty tasty-expected-failure ]; testHaskellDepends = [ aeson base base64-bytestring bytestring containers directory exceptions http-client http-types JuicyPixels lens lens-aeson parsec QuickCheck random scientific script-monad tasty tasty-expected-failure tasty-hunit tasty-quickcheck text time - unordered-containers vector wreq + transformers unordered-containers vector wreq ]; description = "Bindings to the WebDriver API"; license = stdenv.lib.licenses.gpl3; @@ -221001,13 +228403,14 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; - version = "0.14.2.1"; - sha256 = "1y22whxgyjkhmh4nxgkxfzwk3nkkbnrx70qn5h57fv7r2c012jxj"; + version = "0.14.3.0"; + sha256 = "1gsa7lvv0xidy4i9d8bjqc0hpbzx1vvp9npzj2q8x1l68f9vjj5j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) webkitgtk;}; "webkitgtk3" = callPackage @@ -221050,13 +228453,13 @@ self: { ({ mkDerivation, base, blaze-html, data-default, lucid, text }: mkDerivation { pname = "webpage"; - version = "0.0.5"; - sha256 = "1b8s7nnzyadla3wl6p58dwhinscajp5p0ajkrfz5hzqxjgzr4gi1"; + version = "0.0.5.1"; + sha256 = "1nbnpqbknfgw9pyj0phgc9g5srwdzzga3vy58yin25xvkzj2grfr"; libraryHaskellDepends = [ base blaze-html data-default lucid text ]; description = "Organized and simple web page scaffold for blaze and lucid"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -221112,8 +228515,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.12.5.1"; - sha256 = "1v9zmd34bmh0y02njff4n1vkp1d5jdpq9dlva0z7sr0glv8c3drz"; + version = "0.12.5.3"; + sha256 = "0mkxl7iwl5pl2w0svji9248v4c0hi45k725jj5ybaknb73650ns4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221173,8 +228576,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 @@ -221187,7 +228590,6 @@ self: { ]; description = "Composable websockets clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-snap" = callPackage @@ -221242,20 +228644,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 @@ -221282,8 +228685,8 @@ self: { ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: mkDerivation { pname = "weigh"; - version = "0.0.12"; - sha256 = "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x"; + version = "0.0.13"; + sha256 = "1ylfx0y9m8h3c2lwdil5l9mvngad419zd8qk7kw85s4hvnss9fp4"; libraryHaskellDepends = [ base deepseq mtl process split temporary ]; @@ -221539,15 +228942,18 @@ self: { }) {}; "wide-word" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec - , QuickCheck + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog + , primitive, QuickCheck, quickcheck-classes, semirings }: mkDerivation { pname = "wide-word"; - version = "0.1.0.6"; - sha256 = "0y3wdd5kslz71nlk32nvmi3yqd331jjl49njm58bixqanyc0k30x"; - libraryHaskellDepends = [ base deepseq ghc-prim ]; - testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ]; + version = "0.1.0.8"; + sha256 = "1n6g9kn7k8gi2qi8fbik5pi2yj5mbzzj62512as1gjysv3y3l2dj"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ + base bytestring ghc-prim hedgehog QuickCheck quickcheck-classes + semirings + ]; description = "Data types for large but fixed width signed and unsigned integers"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -221625,8 +229031,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 ]; @@ -221651,6 +229057,7 @@ self: { ]; description = "Graphical indicator for WildBind"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-task-x11" = callPackage @@ -221667,6 +229074,7 @@ self: { testHaskellDepends = [ base ]; description = "Task to install and export everything you need to use WildBind in X11"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-x11" = callPackage @@ -221675,8 +229083,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 @@ -221692,8 +229100,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { pname = "wilton-ffi"; - version = "0.3.0.2"; - sha256 = "1qnsdj9676ifg9z67qdzblsszrzvhihwaww4s03jpy2324q42qhk"; + 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; @@ -221717,14 +229125,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;}; @@ -221794,7 +229200,6 @@ self: { ]; description = "Sustainable serialisation library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "winio" = callPackage @@ -221837,7 +229242,6 @@ self: { ]; description = "Fast binary io-streams adapter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wires" = callPackage @@ -221855,6 +229259,7 @@ self: { ]; description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wiring" = callPackage @@ -221888,6 +229293,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 { @@ -221925,19 +229340,20 @@ self: { testHaskellDepends = [ base conduit hspec HUnit mtl ]; description = "Run computations that depend on one or more elements in a stream"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witherable" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable - , transformers, unordered-containers, vector + , transformers, transformers-compat, unordered-containers, vector }: mkDerivation { pname = "witherable"; - version = "0.2"; - sha256 = "0bga2vx3bkg1m6pwdvnxbqjbljpwr6mxyq94fi87j3zy08mmmnwx"; + version = "0.3"; + sha256 = "1h0rvygjr76avrpp8dzhama1accm2i9q3245m54543nm6yfn23v2"; libraryHaskellDepends = [ base base-orphans containers hashable transformers - unordered-containers vector + transformers-compat unordered-containers vector ]; description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; @@ -221986,10 +229402,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 ]; @@ -222016,6 +229430,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wkt-geom" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base16-bytestring, binary + , bytestring, containers, geojson, hedgehog, hlint, hspec + , hw-hspec-hedgehog, lens, QuickCheck, scientific, trifecta + , utf8-string, vector + }: + mkDerivation { + pname = "wkt-geom"; + version = "0.0.5"; + sha256 = "1l762yyga2lxs2m42rq9zr4k1kkpp39w9z2qgmkcg5yj9p4pqg9w"; + libraryHaskellDepends = [ + base base16-bytestring binary bytestring containers geojson + scientific trifecta utf8-string vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base base16-bytestring binary bytestring containers + geojson hedgehog hlint hspec hw-hspec-hedgehog lens QuickCheck + scientific trifecta vector + ]; + description = "A parser of WKT, WKB and eWKB"; + license = stdenv.lib.licenses.asl20; + }) {}; + "wl-pprint" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -222092,6 +229529,7 @@ self: { ]; description = "A free monad based on the Wadler/Leijen pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-terminfo" = callPackage @@ -222109,6 +229547,7 @@ self: { ]; description = "A color pretty printer with terminfo support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-text" = callPackage @@ -222215,8 +229654,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.45"; - sha256 = "0l3jp2qqscy2fq5fvaq83hsh68f1d5xg97k2dhyc01zc6fd5jqi8"; + version = "0.3.46"; + sha256 = "1d0i1611458dpqih73x8gcxq7lkwpxdc1c3pgj3hqb6gwjhjnxyj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222426,6 +229865,25 @@ self: { ]; description = "Dictionary-based password generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wordpress-auth" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cookie + , cryptohash-md5, cryptohash-sha256, hs-php-session, http-types + , mtl, text, time, uri-encode + }: + mkDerivation { + pname = "wordpress-auth"; + version = "1.0.0.0"; + sha256 = "150rri8lrl6j3f9q7wc34ajg06rakgk8a5npzz7vdap64994wy5c"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cookie cryptohash-md5 + cryptohash-sha256 hs-php-session http-types mtl text time + uri-encode + ]; + description = "Validate Wordpress Cookies & Nonces; Build Wordpress Hashes & Salts"; + license = stdenv.lib.licenses.bsd3; }) {}; "words" = callPackage @@ -222485,6 +229943,7 @@ self: { executableHaskellDepends = [ base text ]; description = "A library for parsing a chat-based work hour reporting scheme"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "workdays" = callPackage @@ -222759,8 +230218,10 @@ self: { }: mkDerivation { pname = "wreq"; - version = "0.5.2.1"; - sha256 = "0dqj94lky93jwrkq65pn4nfl2cv8yjgqaxdwbvfyr6vhinrnkl5k"; + version = "0.5.3.1"; + sha256 = "1i2f2bxx84l8qzkz9v3qhx5sbl78ysc3vqadfhrxk3h0ljklwfz3"; + revision = "1"; + editedCabalFile = "016sf02sm58fjsa7nmj12y8m2rwg34md8cnn533kdxm831jc9zyb"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -222783,6 +230244,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq_0_5_3_2" = 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.2"; + sha256 = "16xls71aby6jqc1frhwnlfvz1iwj1ms0rw9xzif02sn84470gn36"; + 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 @@ -222877,6 +230377,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 @@ -222981,8 +230496,8 @@ self: { }: mkDerivation { pname = "ws"; - version = "0.0.4"; - sha256 = "00jz7a7x260ix2rg46bmp6c3rjnra9c7j4p0in7cpk2iap28106q"; + version = "0.0.5"; + sha256 = "1qj4yq2z7ml88jgcqfy8i1cn1cbmdv56vg7v6b2inh4b4h41yax6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -222996,6 +230511,7 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ws-chans" = callPackage @@ -223064,8 +230580,8 @@ self: { }: mkDerivation { pname = "wsjtx-udp"; - version = "0.1.3.4"; - sha256 = "0krn5ams62dh4f0gfyx7ss7ymm438s9bf4m329pqnhj11p2fiazf"; + version = "0.1.3.5"; + sha256 = "1x2975pj2i0c4w1s00s4qc24sa24y29magilfxbhy8v1w1hfqcv7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223074,7 +230590,6 @@ self: { executableHaskellDepends = [ base ]; description = "WSJT-X UDP protocol"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wss-client" = callPackage @@ -223085,6 +230600,8 @@ self: { pname = "wss-client"; version = "0.2.1.1"; sha256 = "1wgqd8hh22ld72c1ccfr191ydqb5fija6c1l0vbg7n8pldhmi92w"; + revision = "1"; + editedCabalFile = "03q6mpdy93y8kjmjcxpjasg6q1mg64az28z99gm2w2iih3mqa702"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223093,6 +230610,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 @@ -223207,8 +230725,8 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.1.10"; - sha256 = "0l4mlmr3b8ndx4nmb3rf0n0bpjxhzxmqv1mslxl432kf02312z09"; + version = "1.1.12"; + sha256 = "1xnnyavkgf2cdnsm494bl1z275l9rynh9s3djq3mqk6lrr4bvsix"; libraryHaskellDepends = [ base bytestring connection network websockets ]; @@ -223455,10 +230973,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 @@ -223478,8 +230996,10 @@ self: { }: mkDerivation { pname = "x509-store"; - version = "1.6.6"; - sha256 = "0dbndqmnmyixxc7308nyq3zlkhz9dff4rbcw2a49c77rbicny9va"; + version = "1.6.7"; + sha256 = "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp"; + revision = "1"; + editedCabalFile = "04h2h8kdzhd2fp3w4a834xc1n88b1jgrxlgcsynfn0iwpbsb41x7"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytestring containers cryptonite directory filepath mtl pem x509 @@ -223507,18 +231027,18 @@ 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; @@ -223531,17 +231051,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; @@ -223582,7 +231101,7 @@ self: { ]; description = "Haskell extended file attributes interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) attr;}; "xbattbar" = callPackage @@ -223753,8 +231272,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 ]; @@ -223934,6 +231453,7 @@ self: { executableHaskellDepends = [ base directory process ]; description = "The Lava system for Xilinx FPGA design with layout combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xine" = callPackage @@ -224163,28 +231683,14 @@ self: { pname = "xml"; version = "1.3.14"; sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j"; + revision = "1"; + editedCabalFile = "130xwqmgmg9vp988mppm5ivz1r5qbivb270fz2rwl4q0x04czdzd"; libraryHaskellDepends = [ base bytestring text ]; description = "A simple XML library"; license = stdenv.lib.licenses.bsd3; }) {}; "xml-basic" = callPackage - ({ mkDerivation, base, containers, data-accessor - , explicit-exception, semigroups, utility-ht - }: - mkDerivation { - pname = "xml-basic"; - version = "0.1.3"; - sha256 = "0ma3bjjsvijknmdnywfk5ch9v5pymxbmkwgzzq58iiv26hkd3n4q"; - libraryHaskellDepends = [ - base containers data-accessor explicit-exception semigroups - utility-ht - ]; - description = "Basics for XML/HTML representation and processing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xml-basic_0_1_3_1" = callPackage ({ mkDerivation, base, containers, data-accessor , explicit-exception, semigroups, utility-ht }: @@ -224198,7 +231704,6 @@ self: { ]; description = "Basics for XML/HTML representation and processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-catalog" = callPackage @@ -224245,20 +231750,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"; @@ -224306,6 +231811,7 @@ self: { ]; description = "Streaming XML parser based on conduits"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-writer" = callPackage @@ -224424,6 +231930,7 @@ self: { ]; description = "Optics for xml-conduit and html-conduit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-html-qq" = callPackage @@ -224718,6 +232225,7 @@ self: { libraryHaskellDepends = [ base containers mtl QuickCheck text ]; description = "Typed XML encoding (core library)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-types" = callPackage @@ -224884,8 +232392,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 @@ -224897,7 +232405,6 @@ self: { ]; description = "XML parser and renderer with HTML 5 quirks mode"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmltv" = callPackage @@ -224954,39 +232461,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.4"; + sha256 = "08kis4pxw073cixpfv9ccnarxl425mxszsni5cqzbns1gl8qydsr"; 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; @@ -225001,8 +232512,8 @@ self: { }: mkDerivation { pname = "xmonad"; - version = "0.14.2"; - sha256 = "0gqyivpw8z1x73p1l1fpyq1wc013a1c07r6xn1a82liijs91b949"; + version = "0.15"; + sha256 = "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225050,8 +232561,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 @@ -225107,7 +232618,6 @@ self: { ]; description = "XMonad config entry point wrapper"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-eval" = callPackage @@ -225133,8 +232643,8 @@ self: { }: mkDerivation { pname = "xmonad-extras"; - version = "0.14"; - sha256 = "1p1xc8qcrrdv3hhvlmg6l6mcywz7q2i81y6frnf3iz00n01b3d9f"; + version = "0.15.1"; + sha256 = "1x61s81rnmh26i8bwd7jlpsa5jn7fsas2fsibg46bsszs5ln225q"; configureFlags = [ "-f-with_hlist" "-fwith_parsec" "-fwith_split" ]; @@ -225144,7 +232654,6 @@ self: { ]; description = "Third party extensions for xmonad with wacky dependencies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-screenshot" = callPackage @@ -225163,8 +232672,8 @@ self: { ({ mkDerivation, base, containers, dbus, X11 }: mkDerivation { pname = "xmonad-spotify"; - version = "0.1.0.1"; - sha256 = "11j2kd3l8yh3fn7smcggmi8jv66x80df52vwa7kmxchbsxf5qrpi"; + 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; @@ -225190,16 +232699,16 @@ self: { }: mkDerivation { pname = "xmonad-vanessa"; - version = "2.0.0.0"; - sha256 = "1j1sd4lvhcg2g5s4bx9pmjnvsj495lksm3v6p4v8y8g5gc488njf"; + version = "2.1.0.1"; + sha256 = "15ym244y33bg842y9bajbnfvqhbrj49472aij136h7dy92kn2lxg"; 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 + base composition-prelude containers xmonad xmonad-contrib + xmonad-spotify xmonad-volume ]; testHaskellDepends = [ base hspec xmonad ]; description = "Custom xmonad, which builds with stack or cabal"; @@ -225213,8 +232722,8 @@ self: { }: mkDerivation { pname = "xmonad-volume"; - version = "0.1.0.1"; - sha256 = "0lv1009d8w2xyx98c6g65z4mxp31jz79lqayvdw26a02kq63cild"; + version = "0.1.1.0"; + sha256 = "0bc52vy142hn75k52zz8afjfxwv86p73kmqmi48rqiws10kpnclw"; libraryHaskellDepends = [ alsa-mixer base composition-prelude containers X11 ]; @@ -225228,10 +232737,11 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmonad-windownames" = callPackage @@ -225278,6 +232788,24 @@ self: { license = "LGPL"; }) {}; + "xorshift-plus" = callPackage + ({ mkDerivation, base, doctest, gauge, ghc-prim, hspec + , hspec-discover, QuickCheck, random, xorshift, Xorshift128Plus + }: + mkDerivation { + pname = "xorshift-plus"; + version = "0.1.0.0"; + sha256 = "1m0wilg47jv9zsklghcs1h9bf4vykn8r4bwl0ncr7cqrlfa8d94l"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base gauge random xorshift Xorshift128Plus + ]; + description = "Simple implementation of xorshift+ PRNG"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xosd" = callPackage ({ mkDerivation, base, xosd }: mkDerivation { @@ -225519,7 +233047,6 @@ self: { ]; description = "turtle like LOGO"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xxhash" = callPackage @@ -225713,6 +233240,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 { @@ -225724,6 +233268,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yam" = callPackage + ({ mkDerivation, base, base16-bytestring, binary, bytestring + , data-default, fast-logger, hspec, http-client, http-types, lens + , monad-logger, mtl, mwc-random, QuickCheck, reflection, salak + , scientific, servant-client, servant-server, servant-swagger + , servant-swagger-ui, swagger2, text, unliftio-core + , unordered-containers, vault, vector, wai, warp + }: + mkDerivation { + pname = "yam"; + version = "0.5.11"; + sha256 = "0k9y8zg1sbdxb6c3fdmlz0dswb8yam5x812avfw6rg3as8sp1pcf"; + libraryHaskellDepends = [ + base base16-bytestring binary bytestring data-default fast-logger + http-client http-types lens monad-logger mtl mwc-random reflection + salak scientific servant-client servant-server servant-swagger + servant-swagger-ui swagger2 text unliftio-core unordered-containers + vault vector wai warp + ]; + testHaskellDepends = [ + base base16-bytestring binary bytestring data-default fast-logger + hspec http-client http-types lens monad-logger mtl mwc-random + QuickCheck reflection salak scientific servant-client + servant-server servant-swagger servant-swagger-ui swagger2 text + unliftio-core unordered-containers vault vector wai warp + ]; + description = "Yam Web"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yam-app" = callPackage ({ mkDerivation, aeson, base, conduit, containers, ctrie , data-default, directory, exceptions, fast-logger, monad-control @@ -225763,6 +233338,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yam-datasource" = callPackage + ({ mkDerivation, base, conduit, persistent, resource-pool + , resourcet, unliftio-core, yam + }: + mkDerivation { + pname = "yam-datasource"; + version = "0.5.11"; + sha256 = "170xpd1kw403g9zds795zbxkaz0qy7lfgzppx4q0ri42ky59z8pl"; + libraryHaskellDepends = [ + base conduit persistent resource-pool resourcet unliftio-core yam + ]; + description = "Yam DataSource Middleware"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yam-job" = callPackage ({ mkDerivation, base, cron, yam-app }: mkDerivation { @@ -225771,6 +233362,7 @@ self: { sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895"; libraryHaskellDepends = [ base cron yam-app ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yam-logger" = callPackage @@ -225895,34 +233487,6 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , 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 = [ "-f-system-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit mockery resourcet scientific - semigroups template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_10_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, mtl, raw-strings-qq, resourcet, scientific @@ -225931,27 +233495,25 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.10.1.1"; - sha256 = "1rbmflr1yfcg147v544laq9vybn4kidjlc7v96ddaamx8sg32192"; + 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 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 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 @@ -226152,15 +233714,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 @@ -226181,6 +233742,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 @@ -226218,6 +233793,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 { @@ -226404,6 +233998,57 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yaya" = callPackage + ({ mkDerivation, base, bifunctors, comonad, constraints, containers + , deriving-compat, distributive, either, errors, free, hedgehog + , kan-extensions, lens, profunctors, template-haskell, transformers + , yaya-hedgehog + }: + mkDerivation { + pname = "yaya"; + version = "0.2.1.0"; + sha256 = "0wm01cspfpnfhijmbxpr4n0nr1qgc8g8cg9lqpz8n4lkd8i8bfds"; + libraryHaskellDepends = [ + base bifunctors comonad constraints containers distributive either + errors free kan-extensions lens profunctors template-haskell + transformers + ]; + testHaskellDepends = [ + base deriving-compat hedgehog yaya-hedgehog + ]; + description = "Total recursion schemes"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yaya-hedgehog" = callPackage + ({ mkDerivation, base, deriving-compat, hedgehog, yaya }: + mkDerivation { + pname = "yaya-hedgehog"; + version = "0.1.1.0"; + sha256 = "070xv97j402li75fzhs03svankg0nl2fb1g223kjkq7a704f3dk1"; + libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; + description = "Hedgehog testing support for the Yaya recursion scheme library"; + license = stdenv.lib.licenses.agpl3; + }) {}; + + "yaya-unsafe" = callPackage + ({ mkDerivation, base, bifunctors, comonad, either, free, hedgehog + , lens, yaya, yaya-hedgehog + }: + mkDerivation { + pname = "yaya-unsafe"; + version = "0.1.1.0"; + sha256 = "081lha6m5c3iyy61xfrj237g0098l5jsm94yqjbaddl4qixk697q"; + libraryHaskellDepends = [ + base bifunctors comonad either free lens yaya + ]; + testHaskellDepends = [ base hedgehog yaya yaya-hedgehog ]; + description = "Non-total extensions to the Yaya recursion scheme library"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ycextra" = callPackage ({ mkDerivation, base, containers, csv, mtl, uniplate, yhccore }: mkDerivation { @@ -226501,8 +234146,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 ]; @@ -226520,8 +234165,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 @@ -226540,8 +234185,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 @@ -226690,8 +234335,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 @@ -226833,14 +234478,15 @@ 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 ]; description = "Authentication backend for Yesod using Facebook"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-hashdb" = callPackage @@ -226852,8 +234498,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 @@ -226975,15 +234621,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; @@ -226996,8 +234642,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.5.1.0"; - sha256 = "18mm1394rs93cchzglwdhzh5sc025bglgrqi4c0hi5hhw893k38z"; + version = "0.6.1.0"; + sha256 = "148w2cn6f0mn6qyymxr2zlw8jnhyjqhzhszhy1faca8ziqsi9mas"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227078,8 +234724,8 @@ self: { pname = "yesod-bin"; version = "1.6.0.3"; sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4"; - revision = "3"; - editedCabalFile = "0v3bwg26ghxa1wdvwyvrffd8wwxhv1qk9g8f64ax1n8gz53k6an7"; + revision = "4"; + editedCabalFile = "1iw9m3z6m4n9dlwamf1kwr7pp2wpk6awf1m63zjkgw5j4vwxlcpg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -227127,6 +234773,7 @@ self: { ]; description = "Helper functions for using yesod with colonnade"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-comments" = callPackage @@ -227156,8 +234803,8 @@ self: { }: mkDerivation { pname = "yesod-content-pdf"; - version = "0.2.0.3"; - sha256 = "0c1jh0rcbbdh0ld9j2pq79pifs30gadz4p10xmphz9s68bjp8n4c"; + version = "0.2.0.4"; + sha256 = "1n51prhxbbjrkvnvf2v4nk6vs8zxvwrnb1826r2vkhq0j1pyyi2k"; libraryHaskellDepends = [ base blaze-builder blaze-html bytestring conduit data-default directory network-uri process temporary transformers yesod-core @@ -227240,20 +234887,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.11"; + sha256 = "1cpl8g2sdvv751vvs68169w9nki43h6rmj2i2wqkfzijwgd8djwr"; 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 ]; @@ -227476,8 +235123,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 @@ -227537,8 +235184,8 @@ self: { }: mkDerivation { pname = "yesod-form"; - version = "1.6.2"; - sha256 = "1p1x1hffvarplc82ykdk7rm6p5isqgqf78bvxzpfhncxs4kwx057"; + version = "1.6.4"; + sha256 = "0iqcrbmwhgfk78qi2n1n3i39izqr7km4i8fa1zmvplqkcbyi149c"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html blaze-markup byteable bytestring containers data-default email-validate @@ -227554,23 +235201,11 @@ self: { ({ mkDerivation, base, text, yesod-core, yesod-form }: mkDerivation { pname = "yesod-form-bootstrap4"; - version = "1.0.2"; - sha256 = "0y68k6xnb8i7wa2c1c0msc3p69azs4z0iwjdgkr0kaqzahw56scq"; - libraryHaskellDepends = [ base text yesod-core yesod-form ]; - description = "renderBootstrap4"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form-bootstrap4_2_0_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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-bulma" = callPackage @@ -227781,8 +235416,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 @@ -227807,6 +235442,7 @@ self: { ]; description = "Simple display of media types, served by yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-newsfeed" = callPackage @@ -227859,17 +235495,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"; @@ -227919,8 +235555,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 @@ -228164,19 +235800,19 @@ self: { }) {}; "yesod-recaptcha2" = callPackage - ({ mkDerivation, base, classy-prelude-yesod, http-conduit - , yesod-auth + ({ mkDerivation, aeson, base, classy-prelude, http-conduit + , yesod-auth, yesod-core, yesod-form }: mkDerivation { pname = "yesod-recaptcha2"; - version = "0.2.4"; - sha256 = "1aw104i2v9m6dc5z5iqzihjfybfxg90l0rj0pazb672qzp9yqj18"; + version = "0.3.0"; + sha256 = "12bgj16vfmvk6ri55wmx444njhlmf11v4cins8c1a6isjk8alhhc"; libraryHaskellDepends = [ - base classy-prelude-yesod http-conduit yesod-auth + 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 @@ -228357,33 +235993,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; @@ -228477,8 +236111,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.6.5"; - sha256 = "1n03h7rx9ixgvlf8isnr7b1g73fkpg8paiklr20b40x0yzvlc0my"; + version = "1.6.6"; + sha256 = "1h82njqkbr6h6saixkzim83srx794s6x6qrcmr0w82z5mfl2nfjf"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html bytestring case-insensitive conduit containers cookie hspec-core html-conduit @@ -228486,8 +236120,8 @@ self: { transformers wai wai-extra xml-conduit xml-types yesod-core ]; testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit text - unliftio wai wai-extra xml-conduit yesod-core yesod-form + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; @@ -228647,8 +236281,8 @@ self: { }: mkDerivation { pname = "yet-another-logger"; - version = "0.3.0"; - sha256 = "0j58lamn7rxvkl0nha9mqpykwiklfg2hj9rm1cxfjlxciz1wg0ri"; + version = "0.3.1"; + sha256 = "1dbwrkya2c7wf5ccsvhnk7isc90pp7vwi8ff6yq15vsn4jbirpsq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228666,7 +236300,6 @@ self: { ]; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yggdrasil" = callPackage @@ -228683,6 +236316,7 @@ self: { testHaskellDepends = [ base cryptonite hspec QuickCheck ]; description = "Executable specifications of composable cryptographic protocols"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yhccore" = callPackage @@ -228945,33 +236579,6 @@ self: { }) {}; "yi-language" = callPackage - ({ mkDerivation, alex, array, base, binary, containers - , data-default, hashable, microlens-platform, oo-prototypes - , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec - , tasty-quickcheck, template-haskell, transformers-base - , unordered-containers - }: - mkDerivation { - pname = "yi-language"; - version = "0.17.1"; - sha256 = "17mnjfhxr6vhpfx7l4zg606f2vffjr39ga4j5qmnp7cf4y5n5vja"; - libraryHaskellDepends = [ - array base binary containers data-default hashable - microlens-platform oo-prototypes pointedlist regex-base regex-tdfa - template-haskell transformers-base unordered-containers - ]; - libraryToolDepends = [ alex ]; - testHaskellDepends = [ - array base binary containers data-default hashable - microlens-platform pointedlist regex-base regex-tdfa tasty - tasty-hspec tasty-quickcheck template-haskell transformers-base - unordered-containers - ]; - description = "Collection of language-related Yi libraries"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-language_0_18_0" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -228996,7 +236603,6 @@ self: { ]; description = "Collection of language-related Yi libraries"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-misc-modes" = callPackage @@ -229228,7 +236834,6 @@ self: { libraryHaskellDepends = [ base HaXml ]; description = "make SVG string from Haskell data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yjtools" = callPackage @@ -229264,11 +236869,22 @@ 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; + }) {}; + + "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; }) {}; @@ -229276,14 +236892,13 @@ self: { ({ 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 ]; description = "Bindings to Facebook's Yoga layout library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yoko" = callPackage @@ -229502,6 +237117,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yx" = callPackage + ({ mkDerivation, array, base, bytestring, hspec }: + mkDerivation { + pname = "yx"; + version = "0.0.2.0"; + sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z"; + libraryHaskellDepends = [ array base bytestring ]; + testHaskellDepends = [ array base bytestring hspec ]; + description = "Row-major coordinates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yxdb-utils" = callPackage ({ mkDerivation, array, attoparsec, base, bimap, binary , binary-conduit, bytestring, Codec-Compression-LZF, conduit @@ -229570,6 +237198,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "z85" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , pipes, pipes-bytestring, pipes-text, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , vector-sized + }: + mkDerivation { + pname = "z85"; + version = "0.0.2"; + sha256 = "0wy58m3l027saz5v4x76g63cpbm1n1cxx1bsdy4z71fdiscfi4hm"; + libraryHaskellDepends = [ + attoparsec attoparsec-binary base bytestring pipes pipes-bytestring + pipes-text QuickCheck text vector-sized + ]; + testHaskellDepends = [ + attoparsec attoparsec-binary base bytestring pipes pipes-bytestring + pipes-text QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text vector-sized + ]; + description = "Implementation of the z85 binary codec"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zabt" = callPackage ({ mkDerivation, base, containers, tasty, tasty-hspec }: mkDerivation { @@ -229695,13 +237347,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 = [ @@ -229719,8 +237372,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; @@ -229923,6 +237576,7 @@ self: { ]; description = "More constrained extensions to zeromq4-haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zeroth" = callPackage @@ -230082,6 +237736,7 @@ self: { testHaskellDepends = [ base bytestring mtl QuickCheck random ]; description = "XBee ZNet 2.5 (ZigBee) wireless modem communications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zim-parser" = callPackage @@ -230113,14 +237768,19 @@ self: { }: mkDerivation { pname = "zip"; - version = "1.1.0"; - sha256 = "1p6r4rmagq2x44wizpxk3844vh5nv2k51wl3h6vx5xnf5im2v535"; + 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 @@ -230130,17 +237790,16 @@ self: { }) {}; "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process - , temporary, text, time, unix, unzip, zlib + , temporary, text, time, unix, unzip, which, zlib }: mkDerivation { pname = "zip-archive"; - version = "0.3.3"; - sha256 = "0kf8xyac168bng8a0za2jwrbss7a4ralvci9g54hnvl0gkkxx2lq"; + version = "0.4"; + sha256 = "06fs9959w807iy4xmngpnv1rps5sr1kqr2pd7b3iw6xfjlfskgjz"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base binary bytestring containers digest directory filepath mtl pretty text time unix zlib @@ -230149,10 +237808,10 @@ self: { base bytestring directory filepath HUnit process temporary time unix ]; - testToolDepends = [ unzip ]; + testToolDepends = [ unzip which ]; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) unzip;}; + }) {inherit (pkgs) unzip; inherit (pkgs) which;}; "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra @@ -230187,21 +237846,22 @@ self: { "zip-stream" = callPackage ({ mkDerivation, base, binary, binary-conduit, bytestring, conduit , conduit-extra, digest, directory, exceptions, filepath, mtl - , primitive, resourcet, time, transformers, transformers-base, zlib + , primitive, resourcet, text, time, transformers, transformers-base + , zlib }: mkDerivation { pname = "zip-stream"; - version = "0.1.1"; - sha256 = "1wnjj1sp5y24iqd1ffmz6lmsvh0527v05zhzygqaf65j8sny535q"; + 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 time transformers-base zlib + exceptions mtl primitive resourcet text time transformers-base zlib ]; executableHaskellDepends = [ base bytestring conduit conduit-extra directory filepath resourcet - time transformers + text time transformers ]; description = "ZIP archive streaming using conduits"; license = stdenv.lib.licenses.bsd3; @@ -230240,12 +237900,11 @@ 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; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zippers" = callPackage @@ -230670,6 +238329,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zsyntax" = callPackage + ({ mkDerivation, base, constraints, containers, mtl, multiset }: + mkDerivation { + pname = "zsyntax"; + version = "0.2.0.0"; + sha256 = "1pv2slz9r305lal25gh5zhr0lnkf4nzsg6vib6i576m83d3pcsgx"; + libraryHaskellDepends = [ + base constraints containers mtl multiset + ]; + testHaskellDepends = [ base containers mtl multiset ]; + description = "Automated theorem prover for the Zsyntax biochemical calculus"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ztail" = callPackage ({ mkDerivation, array, base, bytestring, filepath, hinotify , process, regex-posix, time, unix, unordered-containers @@ -230692,20 +238366,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.1"; + sha256 = "13nqbl1bakyw0nn7nihs49qfqz3lx78h3nvq8d9pxm2jvp9x32j9"; 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 8dae7c8d72c0f0375989e25cbdc2f4805a6ad69e..9f18db1e6e95289d7d760d9e41bbef198bd0051d 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 # @@ -407,4 +357,62 @@ rec { in builtins.listToAttrs (map toKeyVal haskellPaths); + + addOptparseApplicativeCompletionScripts = exeName: pkg: + builtins.trace "addOptparseApplicativeCompletionScripts is deprecated in favor of generateOptparseApplicativeCompletion. Please change ${pkg.name} to use the latter or its plural form." + (generateOptparseApplicativeCompletion exeName pkg); + + /* + Modify a Haskell package to add shell completion scripts for the + given executable produced by it. These completion scripts will be + picked up automatically if the resulting derivation is installed, + e.g. by `nix-env -i`. + + Invocation: + generateOptparseApplicativeCompletions command pkg + + + command: name of an executable + pkg: Haskell package that builds the executables + */ + generateOptparseApplicativeCompletion = exeName: pkg: overrideCabal pkg (drv: { + postInstall = (drv.postInstall or "") + '' + bashCompDir="$out/share/bash-completion/completions" + zshCompDir="$out/share/zsh/vendor-completions" + fishCompDir="$out/share/fish/vendor_completions.d" + mkdir -p "$bashCompDir" "$zshCompDir" "$fishCompDir" + "$out/bin/${exeName}" --bash-completion-script "$out/bin/${exeName}" >"$bashCompDir/${exeName}" + "$out/bin/${exeName}" --zsh-completion-script "$out/bin/${exeName}" >"$zshCompDir/_${exeName}" + "$out/bin/${exeName}" --fish-completion-script "$out/bin/${exeName}" >"$fishCompDir/${exeName}.fish" + + # Sanity check + grep -F ${exeName} <$bashCompDir/${exeName} >/dev/null || { + echo 'Could not find ${exeName} in completion script.' + exit 1 + } + ''; + }); + + /* + Modify a Haskell package to add shell completion scripts for the + given executables produced by it. These completion scripts will be + picked up automatically if the resulting derivation is installed, + e.g. by `nix-env -i`. + + Invocation: + generateOptparseApplicativeCompletions commands pkg + + + commands: name of an executable + pkg: Haskell package that builds the executables + */ + generateOptparseApplicativeCompletions = commands: pkg: + pkgs.lib.foldr generateOptparseApplicativeCompletion pkg commands; + + # Don't fail at configure time if there are multiple versions of the + # same package in the (recursive) dependencies of the package being + # built. Will delay failures, if any, to compile time. + allowInconsistentDependencies = drv: overrideCabal drv (drv: { + allowInconsistentDependencies = true; + }); } diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index b33b29e82effaef1dde6bd87cbf490d7d50f4bc4..b4cd7fee311b2bffe28eeacccbd46d1943a110e7 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -43,10 +43,9 @@ let mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; nodejs = buildPackages.nodejs-slim; - inherit buildHaskellPackages; - inherit (self) ghc; - inherit (buildHaskellPackages) jailbreak-cabal; - hscolour = overrideCabal buildHaskellPackages.hscolour (drv: { + inherit (self) buildHaskellPackages ghc shellFor; + inherit (self.buildHaskellPackages) jailbreak-cabal; + hscolour = overrideCabal self.buildHaskellPackages.hscolour (drv: { isLibrary = false; doHaddock = false; hyperlinkSource = false; # Avoid depending on hscolour for this build. @@ -126,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,6 +176,17 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); + # This function does not depend on all-cabal-hashes and therefore will work + # for any version that has been released on hackage as opposed to only + # versions released before whatever version of all-cabal-hashes you happen + # to be currently using. + callHackageDirect = {pkg, ver, sha256}@args: + let pkgver = "${pkg}-${ver}"; + in self.callCabal2nix pkg (pkgs.fetchzip { + url = "http://hackage.haskell.org/package/${pkgver}/${pkgver}.tar.gz"; + inherit sha256; + }); + # Creates a Haskell package from a source package by calling cabal2nix on the source. callCabal2nixWithOptions = name: src: extraCabal2nixOptions: args: let @@ -195,19 +206,21 @@ in package-set { inherit pkgs stdenv callPackage; } self // { 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 @@ -217,7 +230,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); @@ -260,20 +273,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 0000000000000000000000000000000000000000..b7b057f2dc202d44189ef62726fb3852b5a5fdb1 --- /dev/null +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -0,0 +1,15 @@ +# 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 { }; +} diff --git a/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch new file mode 100644 index 0000000000000000000000000000000000000000..e5ad00ee009fab31737796b5ca0f94bd9c28570c --- /dev/null +++ b/pkgs/development/haskell-modules/patches/beam-core-fix-ghc-8.6.x-build.patch @@ -0,0 +1,72 @@ +diff --git a/beam-core/Database/Beam/Backend/SQL.hs b/beam-core/Database/Beam/Backend/SQL.hs +index e2cd37d0..6f9db126 100644 +--- a/Database/Beam/Backend/SQL.hs ++++ b/Database/Beam/Backend/SQL.hs +@@ -10,6 +10,7 @@ + import Database.Beam.Backend.Types + + import Control.Monad.IO.Class ++import Control.Monad.Fail (MonadFail) + + -- * MonadBeam class + +@@ -29,7 +30,7 @@ + -- strategies. More complicated strategies (for example, Postgres's @COPY@) + -- are supported in individual backends. See the documentation of those + -- backends for more details. +-class (BeamBackend be, Monad m, MonadIO m, Sql92SanityCheck syntax) => ++class (BeamBackend be, Monad m, MonadIO m, MonadFail m, Sql92SanityCheck syntax) => + MonadBeam syntax be handle m | m -> syntax be handle where + + {-# MINIMAL withDatabaseDebug, runReturningMany #-} +diff --git a/Database/Beam/Backend/SQL/Builder.hs b/Database/Beam/Backend/SQL/Builder.hs +index 9e734036..e9849912 100644 +--- a/Database/Beam/Backend/SQL/Builder.hs ++++ b/Database/Beam/Backend/SQL/Builder.hs +@@ -33,6 +33,7 @@ + import Data.Hashable + import Data.Int + import Data.String ++import qualified Control.Monad.Fail as Fail + #if !MIN_VERSION_base(4, 11, 0) + import Data.Semigroup + #endif +@@ -507,8 +508,10 @@ + type BackendFromField SqlSyntaxBackend = Trivial + + newtype SqlSyntaxM a = SqlSyntaxM (IO a) +- deriving (Applicative, Functor, Monad, MonadIO) ++ deriving (Applicative, Functor, Monad, MonadIO, Fail.MonadFail) + + instance MonadBeam SqlSyntaxBuilder SqlSyntaxBackend SqlSyntaxBackend SqlSyntaxM where +- withDatabaseDebug _ _ _ = fail "absurd" +- runReturningMany _ _ = fail "absurd" ++ withDatabaseDebug _ _ _ = Fail.fail "absurd" ++ runReturningMany _ _ = Fail.fail "absurd" ++ ++ +diff --git a/Database/Beam/Schema/Lenses.hs b/Database/Beam/Schema/Lenses.hs +index b21dddb6..5df0654c 100644 +--- a/Database/Beam/Schema/Lenses.hs ++++ b/Database/Beam/Schema/Lenses.hs +@@ -1,4 +1,5 @@ + {-# LANGUAGE PolyKinds #-} ++{-# LANGUAGE UndecidableInstances #-} + module Database.Beam.Schema.Lenses + ( tableLenses + , TableLens(..) +diff --git a/beam-core.cabal b/beam-core.cabal +index 4bf4ffd9..251d4d85 100644 +--- a/beam-core.cabal ++++ b/beam-core.cabal +@@ -64,8 +64,8 @@ + time >=1.6 && <1.10, + hashable >=1.1 && <1.3, + network-uri >=2.6 && <2.7, +- containers >=0.5 && <0.6, +- vector-sized >=0.5 && <1.1, ++ containers >=0.5 && <0.7, ++ vector-sized >=0.5 && <1.3, + tagged >=0.8 && <0.9 + Default-language: Haskell2010 + default-extensions: ScopedTypeVariables, OverloadedStrings, GADTs, RecursiveDo, FlexibleInstances, FlexibleContexts, TypeFamilies, diff --git a/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch new file mode 100644 index 0000000000000000000000000000000000000000..b715140be0a534102504cc3540eee18f4d643838 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/beam-migrate-fix-ghc-8.6.x-build.patch @@ -0,0 +1,29 @@ +diff --git a/Database/Beam/Migrate/Generics/Types.hs b/Database/Beam/Migrate/Generics/Types.hs +index 553e208b..0cf9b2c8 100644 +--- a/Database/Beam/Migrate/Generics/Types.hs ++++ b/Database/Beam/Migrate/Generics/Types.hs +@@ -1,3 +1,5 @@ ++{-# LANGUAGE UndecidableInstances #-} ++ + module Database.Beam.Migrate.Generics.Types where + + import Database.Beam.Migrate.Types +diff --git a/beam-migrate.cabal b/beam-migrate.cabal +index f53b280d..9cf3722c 100644 +--- a/beam-migrate.cabal ++++ b/beam-migrate.cabal +@@ -69,13 +69,12 @@ library + mtl >=2.2 && <2.3, + scientific >=0.3 && <0.4, + vector >=0.11 && <0.13, +- containers >=0.5 && <0.6, + unordered-containers >=0.2 && <0.3, + hashable >=1.2 && <1.3, + parallel >=3.2 && <3.3, + deepseq >=1.4 && <1.5, + ghc-prim >=0.5 && <0.6, +- containers >=0.5 && <0.6, ++ containers >=0.5 && <0.7, + haskell-src-exts >=1.18 && <1.21, + pretty >=1.1 && <1.2, + dependent-map >=0.2 && <0.3, diff --git a/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch new file mode 100644 index 0000000000000000000000000000000000000000..ede2bce125705462b0f3e8f8a90bcd96f6a64d6c --- /dev/null +++ b/pkgs/development/haskell-modules/patches/beam-postgres-fix-ghc-8.6.x-build.patch @@ -0,0 +1,45 @@ +diff --git a/Database/Beam/Postgres/Connection.hs b/Database/Beam/Postgres/Connection.hs +index 433f55b9..5836c53d 100644 +--- a/Database/Beam/Postgres/Connection.hs ++++ b/Database/Beam/Postgres/Connection.hs +@@ -52,6 +52,8 @@ import qualified Database.PostgreSQL.Simple.Types as Pg (Null(..), Query(..)) + + import Control.Monad.Reader + import Control.Monad.State ++import Control.Monad.Fail (MonadFail) ++import qualified Control.Monad.Fail as Fail + + import Data.ByteString (ByteString) + import Data.ByteString.Builder (toLazyByteString, byteString) +@@ -302,6 +304,9 @@ deriving instance Functor PgF + newtype Pg a = Pg { runPg :: F PgF a } + deriving (Monad, Applicative, Functor, MonadFree PgF) + ++instance MonadFail Pg where ++ fail e = fail $ "Internal Error with: " <> show e ++ + instance MonadIO Pg where + liftIO x = liftF (PgLiftIO x id) + +diff --git a/beam-postgres.cabal b/beam-postgres.cabal +index e14b84f5..d29a5b67 100644 +--- a/beam-postgres.cabal ++++ b/beam-postgres.cabal +@@ -31,7 +31,7 @@ library + beam-migrate >=0.3 && <0.4, + + postgresql-libpq >=0.8 && <0.10, +- postgresql-simple >=0.5 && <0.6, ++ postgresql-simple >=0.5 && <0.7, + + text >=1.0 && <1.3, + bytestring >=0.10 && <0.11, +@@ -38,7 +38,7 @@ library + + hashable >=1.1 && <1.3, + lifted-base >=0.2 && <0.3, +- free >=4.12 && <5.1, ++ free >=4.12 && <5.2, + time >=1.6 && <1.10, + monad-control >=1.0 && <1.1, + mtl >=2.1 && <2.3, diff --git a/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch b/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch new file mode 100644 index 0000000000000000000000000000000000000000..ebfca8a2f65578a25d1142a1ddb80dc7487882f6 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/beam-sqlite-fix-ghc-8.6.x-build.patch @@ -0,0 +1,21 @@ +diff --git a/Database/Beam/Sqlite/Connection.hs b/Database/Beam/Sqlite/Connection.hs +index f034b272..4e459ea3 100644 +--- a/Database/Beam/Sqlite/Connection.hs ++++ b/Database/Beam/Sqlite/Connection.hs +@@ -37,6 +37,7 @@ import Database.SQLite.Simple.Types (Null) + + import Control.Exception (bracket_, onException, mask) + import Control.Monad (forM_, replicateM_) ++import Control.Monad.Fail (MonadFail) + import Control.Monad.Free.Church + import Control.Monad.IO.Class (MonadIO(..)) + import Control.Monad.Identity (Identity) +@@ -143,7 +144,7 @@ newtype SqliteM a + { runSqliteM :: ReaderT (String -> IO (), Connection) IO a + -- ^ Run an IO action with access to a SQLite connection and a debug logging + -- function, called or each query submitted on the connection. +- } deriving (Monad, Functor, Applicative, MonadIO) ++ } deriving (Monad, Functor, Applicative, MonadIO, MonadFail) + + newtype BeamSqliteParams = BeamSqliteParams [SQLData] + instance ToRow BeamSqliteParams where diff --git a/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch b/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch new file mode 100644 index 0000000000000000000000000000000000000000..1e9ac5aa66a432a817d417d95a2236d7f825455b --- /dev/null +++ b/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch @@ -0,0 +1,25 @@ +diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal +index 0e8923a..bfbbec4 100644 +--- a/insert-ordered-containers.cabal ++++ b/insert-ordered-containers.cabal +@@ -21,8 +21,8 @@ tested-with: + GHC==7.10.3, + GHC==8.0.1, + GHC==8.2.2, +- GHC==8.4.3, +- GHC==8.6.1 ++ GHC==8.4.4, ++ GHC==8.6.3 + + extra-source-files: + CHANGELOG.md +@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests + , unordered-containers + , base + , insert-ordered-containers +- , tasty >= 0.10.1.2 && <1.2 ++ , tasty >= 0.10.1.2 && <1.3 + , tasty-quickcheck >= 0.8.3.2 && <0.11 + , QuickCheck >=2.7.6 && <2.13 + default-language: Haskell2010 + 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 0000000000000000000000000000000000000000..bf89d8daf9fcf3c1c08ef6d1ba49b8c79907529c --- /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/haskell-modules/stack-hook.sh b/pkgs/development/haskell-modules/stack-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..d942662294c21de4d592f4b023394931ad234ae1 --- /dev/null +++ b/pkgs/development/haskell-modules/stack-hook.sh @@ -0,0 +1,11 @@ +addStackArgs () { + if [ -d "$1/lib" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-lib-dirs=$1/lib"* ]]; then + STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$1/lib" + fi + + if [ -d "$1/include" ] && [[ "$STACK_IN_NIX_EXTRA_ARGS" != *"--extra-include-dirs=$1/include"* ]]; then + STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$1/include" + fi +} + +addEnvHooks "$hostOffset" addStackArgs diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix index d16d9b2245d69891583cc32d1a037cb558a70f46..844ce98cd4c33f158fbb5d8c9f0499a507db980b 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 53b4fb0a004fa40fc7fabc6402ad952728327fa9..3a915cd67f41dc7a6d811140a99275d42fb6edb2 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 3ed1404fef7ce63583e0952b7cdcff5d108630ba..5e1288685a7ea6f8f8c02b49da19afb403fceae5 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 72e5e3f5be7e5208d5d5654001ae389594c13fb6..0f6e258ee202ed52702a4c389370f89cede9e010 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 1e234b3f6934db5ca8ca71df77ea2a206c27ebe0..91ee174dadffeb67cef4f3a1f8990d320705d837 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 7dbd12110888a617dffb586badef96037ea9de7b..c5e33f4594f2c86aae5ece6acc0a6fec8fe31de5 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 c12ea54f5f9f7fa5ba7474144f833bfac46b2ee9..2fe783da4486cbb0b3a43d294c63aa680dbd5cef 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/curses.nix b/pkgs/development/idris-modules/curses.nix deleted file mode 100644 index 98b42f827b9c72278c0f6487a1515bda3a7dd783..0000000000000000000000000000000000000000 --- a/pkgs/development/idris-modules/curses.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ build-idris-package -, fetchFromGitHub -, effects -, lib -, ncurses -}: -build-idris-package { - name = "curses"; - version = "2017-10-12"; - - idrisDeps = [ effects ]; - - extraBuildInputs = [ ncurses ]; - - postUnpack = '' - sed -i 's/^libs = curses$/libs = ncurses/g' source/curses.ipkg - sed -i 's/\#include /#include \/g' source/src/cursesrun.h - ''; - - src = fetchFromGitHub { - owner = "JakobBruenker"; - repo = "curses-idris"; - rev = "ea4bbcfcf691f0dc731f2dfa676011809db084cb"; - sha256 = "17q8hg5f61lk2kh3j4cwrwja282sihlcjdrx233z4237alp9w4g1"; - }; - - meta = { - description = "libusb binding for idris and Effectful curses programming"; - homepage = https://github.com/JakobBruenker/curses-idris; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.brainrape ]; - }; -} diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 0368c00d123808cee0c9346812990bbfa0721171..47c6998a587d66966bef9c51e50aa23800cf8ee3 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -75,8 +75,6 @@ cube = callPackage ./cube.nix {}; - curses = callPackage ./curses.nix {}; - data = callPackage ./data.nix {}; derive = callPackage ./derive.nix {}; diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index 7b6cb64cfe37004e188043a13a65834fec885c40..7f3164f3160d096bf2c27efb51ed2799ba126950 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 3989b8f411357c43230cd362ee5be3f7f264a241..8b968c9732abfff89ed948d90b7b5b1faf45e657 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 8e979ea796ec2f60344705de71655ecf6c05a815..06b8ec5e82d2ccca489b28a02b0b1bb43517b921 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 17706d1b0969118b1176a094340a577eb27b6103..79df925323ed30016c4d737027925461b377bb12 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 09fabb6715dbede78e15723cadf646e99e02d0ed..9e9736d25661e37d05818b56b3870531c75f6f3e 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 d8b469ca76894e5edba96a571c3ab1f336a7693a..5629221d601b58a17ae3441b7ad387017d5a5698 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 2281e4821f7afb9f9000566b990540a879db469b..dae310cda053b5fd274717b2450338bf31647b81 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 9f4af7cc3b854b1d2195199cfe8d200eab126f59..197cb1552cbdc73c7e7a2a78a83129c3a0a4d0c9 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 9ba8c6bb2d4d37608c141bbb1176085b58d64bf9..5ce9ad7e915d4d2a40cc5050394010d78d8bd18a 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 8bcb67fa759a4aaf698afafaafc9f0afc24743a9..21b81f4a95c574de7b5dfbbda675680f9756be4d 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 78f3674aeabd0923bd8855e883ce3332bb05b5e3..dab6913ee8bc233cb8f60d2467b61ec03ece45f3 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 00252b6a7cd68356dec60a84580f821a2e5f4f20..433fdf647697346a35c8faaaa5ff2649755f4cc3 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 c8d993ccb8a28549d06a1e91fb25d206704b11ec..6d752fed0f98a4382684151747aac82c6f190a2a 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 7f80a1ce3c505b0685a1d0217c8f4fe3470c73b6..98f4b4ea4d63abe610663f1428ccdd00ca0a24dc 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 bd895a33bae3fdd1f1151b086a410a7010d71610..8aa413b51c315cc57f6d30b945ee629d821b8092 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -4,13 +4,15 @@ }: build-idris-package { name = "tparsec"; - version = "2018-06-26"; + version = "2018-12-21"; + + ipkgName = "TParsec"; src = fetchFromGitHub { owner = "gallais"; repo = "idris-tparsec"; - rev = "ca32d1a83f3de95f8979d48016e79d010f47b3c2"; - sha256 = "1zjzk8xjmyyx1qwrdwwg7yjzcgj5wkbwpx8a3wpbj5sv4b5s2r30"; + rev = "6fafcaa894def6f2af86bc799e507013b56e7741"; + sha256 = "0alnw0hqjs200gvb5f58lb16rna48j1v6wnvq4q7zbw99dcxsxwn"; }; meta = { diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix index 7f1ecb61c8ecd66de51fa4eeba411e1a04f4ac3d..f6fdaf7a75e2464a65786e00838662f9a6f4e713 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 ec689ce4805a839d229189c46d88cae0b0d614c2..61efb8cd575e493cd2fbb901c87f1d56d134bd37 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 0231555b4ad6664cdb91be097d00334432708a10..ebe92f46898248bd49745d44e5fe931b0cf07e84 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 14b9a78af46e1c4ab39de6b8b22486f81e8bff53..cc88b32119e75c020422e295940a1bd04b054055 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/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix index c9097bec5dc8e08e5e120ecd50b887c06956abf2..0449572da024a77e1001240fc0da9215574d7410 100644 --- a/pkgs/development/interpreters/angelscript/2.22.nix +++ b/pkgs/development/interpreters/angelscript/2.22.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.zlib ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + badPlatforms = [ "aarch64-linux" ]; downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; homepage="http://www.angelcode.com/angelscript/"; }; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 01348c753484857c8aab52c843de5f0805deddd4..adbfbaf48a43fef2b96c95d8f907e5c52b1d65a9 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="angelscript"; - version = "2.32.0"; + version = "2.33.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "0675hza06v3grxyqfy70gzm57idmbbm7qvi6bg5vf8m6mpw757dl"; + sha256 = "18qywbi1k53xgnlr9v6ycin669j5v5qspq7lli4jhf6l4c5hk49n"; }; buildInputs = [ unzip diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 081f1a547d69d03b4197f34e2792c519e727bd4a..85794b09ae0b8d13e5d2bf115312c16bbbdc9992 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 0a54a916ba7367fb9298902e812aa14d6ab5dea0..f850a9f57b8080b67566084165db1c68f6474f84 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -4,7 +4,7 @@ # by default # - full: contains base plus modules in withModules { stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 -, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto +, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext , libffi , libffcall , coreutils @@ -21,7 +21,7 @@ }: assert x11Support -> (libX11 != null && libXau != null && libXt != null - && libXpm != null && xproto != null && libXext != null && xextproto != null); + && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { v = "2.49"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi ++ stdenv.lib.optional ffcallAvailable libffcall ++ stdenv.lib.optionals x11Support [ - libX11 libXau libXt libXpm xproto libXext xextproto + libX11 libXau libXt libXpm xorgproto libXext ]; patches = [ @@ -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/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 47dbf8a225cfea6041d0201956308414f0542147..550535f30aeeda6600431dedbfe64d13fce5d540 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -4,7 +4,7 @@ # by default # - full: contains base plus modules in withModules { stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 -, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto +, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext , libffi, libffcall, automake , coreutils # build options @@ -20,7 +20,7 @@ }: assert x11Support -> (libX11 != null && libXau != null && libXt != null - && libXpm != null && xproto != null && libXext != null && xextproto != null); + && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { v = "2.50pre20171114"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi ++ stdenv.lib.optional ffcallAvailable libffcall ++ stdenv.lib.optionals x11Support [ - libX11 libXau libXt libXpm xproto libXext xextproto + libX11 libXau libXt libXpm xorgproto libXext ]; # First, replace port 9090 (rather low, can be used) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 845b5b1f1c0c7cf06d28962fdfaac1e0e0d50a04..6018d92bbcab21f510e78f07413e2af4ff2c4f7f 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "clojure-${version}"; - version = "1.9.0.391"; + version = "1.10.0.411"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1720nbp891mhdjp37z1ns7rg8yapk3a7h1a1rkzhx7abngpwwjcz"; + sha256 = "00bhn6w9iwhgmyx89lk97q19phpm9vh45m3m1pi7d31gldb6v0zh"; }; buildInputs = [ makeWrapper ]; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { substituteInPlace clojure --replace PREFIX $prefix install -Dt $out/bin clj clojure - wrapProgram $out/bin/clj --prefix PATH : ${binPath} - wrapProgram $out/bin/clojure --prefix PATH : ${binPath} + wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath} + wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..bc2d0e5be5a8c85f2612d0dd0fe09c88018df19a --- /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 0000000000000000000000000000000000000000..e1563599a8cc660b33a4acf5ba046bf35735e484 --- /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 0000000000000000000000000000000000000000..3e53c7f98dd796c55d4bd5b50fa17d8eea5a0e6a --- /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 0000000000000000000000000000000000000000..358595ef1eb8ef0c482bf8e8440db03fad16299c --- /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 4c697ec4e802454c70dd90fa572e6c461ba0d758..fa8996f0fb56788ac50e04033a28717fd7b135bd 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/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index 2178f859007f379a310be2ed5a7b8556c978168a..f3b253bfd22015c71691b31e54e3af18609c44b9 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An embeddable Javascript engine, with a focus on portability and compact footprint"; - homepage = "http://duktape.org/"; - downloadPage = "http://duktape.org/download.html"; + homepage = https://duktape.org/; + downloadPage = https://duktape.org/download.html; license = licenses.mit; maintainers = [ maintainers.fgaz ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/elixir/1.3.nix b/pkgs/development/interpreters/elixir/1.3.nix deleted file mode 100644 index 43d48e2cf7cd8300c2daa39d461e0b9679d63e0b..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/elixir/1.3.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation rec { - version = "1.3.4"; - sha256 = "01qqv1ghvfadcwcr5p88w8j217cgaf094pmpqllij3l0q1yg104l"; - minimumOTPVersion = "18"; -} diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix index d97d416bc27d0efb7979880752b2dd8646783c7b..adbbbaff890bac43372449f5b3905086519ac6db 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/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix new file mode 100644 index 0000000000000000000000000000000000000000..40136fd22de85a6b86336601b74518b373e6ba9e --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.8.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.8.1"; + sha256 = "1npnrkn21kqqfqrsn06mr78jxs6n5l8c935jpxvnmj7iysp50pf9"; + minimumOTPVersion = "20"; +} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index b4e1cacfe26712a2560d2c45cfd8f61c4e07bd18..844d6eeb4fb9d6fdb839bd45bf4a510ea7929040 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -7,7 +7,7 @@ , sha256 ? null , rev ? "v${version}" , src ? fetchFromGitHub { inherit rev sha256; owner = "elixir-lang"; repo = "elixir"; } -}: +} @ args: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -62,6 +62,7 @@ in --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir" ''; + pos = builtins.unsafeGetAttrPos "sha256" args; meta = with stdenv.lib; { homepage = https://elixir-lang.org/; description = "A functional, meta-programming aware language built on top of the Erlang VM"; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index ee524feb4c6c9c0d3da5a4a2acd5c4ad84daa041..58b7fd71f0be8f4152c157cf1201901b1770bd50 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 d94d4a5a14d09e41d25961801c6ab5aaa46762e6..e0d4ecbc95ac9fa8e6bdc4cbe48f7749440b9064 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 19ac6d3559265bd219288e122aa058239e316645..c408d21d9b318d9a5b2d0c3f2807abdc7628fbb7 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 e9aa2a3dc426b09c054853cbee9be4d077b00e3e..28166dfc0b0a4951793a78706a1e699e8a5882f7 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.3"; + sha256 = "1v47c7bddbp31y6f8yzdjyvgcx9sskxql33k7cs0p5fmr05hhxws"; 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 eb685f1d718566f7cf94ed763524234d058739d2..bc0b728ecce4b0c6be4b83d2b12892b444a9b7e3 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,11 +54,13 @@ 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; - enableParallelBuilding = true; + # On some machines, parallel build reliably crashes on `GEN asn1ct_eval_ext.erl` step + enableParallelBuilding = false; # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense prePatch = '' @@ -84,6 +87,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 +121,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/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 2478493d41d79d7a9647178796f92162c62dbbec..5481c4e7d05af636a9f0d794366aa7cadc4a5a8a 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "gauche-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "mirror://sourceforge/gauche/Gauche-${version}.tgz"; - sha256 = "1bwwwvyxsrp2a4cfib6hn0hcgwzmp2znylm088w09f331miji2fd"; + sha256 = "181nycikma0rwrb1h6mi3kys11f8628pq8g5r3fg5hiz5sabscrd"; }; nativeBuildInputs = [ pkgconfig texinfo ]; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 599126d2eff9efd3fa0ef8fa4840044847e51991..f60e5d2861404428748317285dc86e89acd93e4d 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 95484c9258a6450321b87e2c9d105a65742585b9..dc04e72c7411ca9310f66a85b01e4dac9859ee26 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.6"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "0bi85gvgpwd9ndg0kiwlrp560934dzy1072zpf587vrmpvqrcps9"; + sha256 = "14lfxnc03hmakwagvl3sb6c0b298v3awcdr1gafwnmsqv03hhkdn"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index ab295dab4443ae80f6e4cfc4618b54590326d6ba..6f5a5ec0f19882518bcb751dde6c0c08ce2d3c12 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { configureOptions = [ "--with-gtk2" ]; + NIX_LDFLAGS = [ + "-ldl" + ]; + meta = { description = "gtk-server for interpreted GUI programming"; homepage = http://www.gtk-server.org/; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 13a0d45dbe4130c80bf06363936493cb018dd677..fd270dedefcc1e52cc26a4c6fbdd7ed14f1ce65a 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 ea34fd61f3b72661e307074b84c4bfd845d09061..b65dfb1d4a1e3a65d1ff80c471e666bef5aad036 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 aacc5dc49a10aec577f38a87e82b968b9e9e7f3f..1943b10bdcafe0c58ff99c3f845c428131c55cea 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 3f08ca8f7c22bd7bbd80d644adc94790670d792a..02ce07bdf471961b161cc19f5449a6f4b5dfcd10 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 cb351446301d4bd82bba01c81aa886f98a8278c8..11feb1170c2ce79de526abfcccd7411430841876 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 1342d6c34d2e96fb3334bf47901e549e5be939e6..21a7cfba4064a325bf99d7fb89c28868dbe5fa83 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.7"; + version = "0.10.1"; goPackagePath = "github.com/candid82/joker"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "0fl04xdpqmr5xpd4pvj72gdy3v1fr9z6h3ja7dmkama8fw2x4diz"; + sha256 = "1c3p61jmlljljbiwsylmfa75pi00y7yj5wabx1rxmpswc41g5mab"; }; preBuild = "go generate ./..."; diff --git a/pkgs/development/interpreters/joker/deps.nix b/pkgs/development/interpreters/joker/deps.nix index ee99aeab69f8874e589dcaa6998c3ef83d7a0021..4eff988796b3e10d430e6e8cb40fb986a7ba414a 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 c67fae936ce749f55a2cf03c79662f76fe5770a8..cfefa8c95dc52fb9b0a75fcdfe9c6470bbef8b73 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.5.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "1106s1vmcm36gm3vrl1sjrrr2wj6splgik1zrfb7c2y9bzm8swa2"; + sha256 = "0jgkpp90x4v3izl58r53lg5ndf9pm6q6qgwqvxhkb9zcha00ibgl"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index e92a84b40b86c35d1bcfe79d8bed24584b4260e1..7adaca7b86566246400a62dc1d643ed20c29ac70 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 = "0q1lsgc1621czrg49nmabq6am9sgxa9syxrwzlksqqr4dyzw4nmf"; }; 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 be49d2dd921567ed6639434d9d42de6b78c53347..0000000000000000000000000000000000000000 --- 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 d343ec6c63b1103c256e6f2aabd9b5cca9ce9469..0000000000000000000000000000000000000000 --- 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.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 09af492490cf20555e30cdeb2712669a10a3216f..b2948b392d5e2742faf7900ea512616e7ac7a417 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, readline }: +{ stdenv, fetchurl, readline +, self +, callPackage +, packageOverrides ? (self: super: {}) +}: let dsoPatch = fetchurl { @@ -6,6 +10,7 @@ let sha256 = "11fcyb4q55p4p7kdb8yp85xlw8imy14kzamp2khvcyxss4vw8ipw"; name = "lua-arch.patch"; }; + luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; in stdenv.mkDerivation rec { name = "lua-${version}"; @@ -17,6 +22,10 @@ stdenv.mkDerivation rec { sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; }; + LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; + LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion; + setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; + buildInputs = [ readline ]; patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ]) @@ -39,6 +48,16 @@ stdenv.mkDerivation rec { rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua ''; + passthru = rec { + buildEnv = callPackage ./wrapper.nix { + lua=self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/lua"; + }; + meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; @@ -51,6 +70,7 @@ stdenv.mkDerivation rec { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; + platforms = with stdenv.lib.platforms; linux ++ darwin; hydraPlatforms = 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 6d8de7bae27eebd26529313cdd1eed9bbb197178..e89a2cbece6d10230acc15ae83926b5c389f45de 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, readline, compat ? false }: +{ stdenv, fetchurl, readline +# compiles compatibility layer with lua5.1 +, compat ? false +, callPackage +, self +, packageOverrides ? (self: super: {}) +}: let dsoPatch = fetchurl { @@ -6,21 +12,39 @@ let sha256 = "1by1dy4ql61f5c6njq9ibf9kaqm3y633g2q8j54iyjr4cxvqwqz9"; name = "lua-arch.patch"; }; + luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; in stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.2"; - version = "${luaversion}.3"; + version = "${luaversion}.4"; + + LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; + LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion; + setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; src = fetchurl { url = "https://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"; + sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; }; buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else [ dsoPatch ]; + + passthru = rec { + buildEnv = callPackage ./wrapper.nix { + lua = self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/lua"; + }; + + enableParallelBuilding = true; + configurePhase = if stdenv.isDarwin then '' diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index eb34391e1993cb62547823a63670ecc83254e147..c1fdc0fd9904a1ab274452b52f9677a6c68b6f5e 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchurl, readline, compat ? false }: - +{ stdenv, fetchurl, readline, compat ? false +, callPackage +, self +, packageOverrides ? (self: super: {}) +}: +let + luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; +in stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.3"; @@ -10,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"; }; + LuaPathSearchPaths = luaPackages.getLuaPathList luaversion; + LuaCPathSearchPaths = luaPackages.getLuaCPathList luaversion; + setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; + buildInputs = [ readline ]; patches = if stdenv.isDarwin then [ ./5.2.darwin.patch ] else []; @@ -54,6 +64,16 @@ stdenv.mkDerivation rec { ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc" ''; + passthru = rec { + buildEnv = callPackage ./wrapper.nix { + lua = self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ./with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/lua"; + }; + meta = { homepage = http://www.lua.org; description = "Powerful, fast, lightweight, embeddable scripting language"; diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix new file mode 100644 index 0000000000000000000000000000000000000000..0bed5efe4f793cd894d7f9ad9eb1c7550c6718fa --- /dev/null +++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -0,0 +1,182 @@ +# Generic builder for lua packages +{ lib +, lua +, stdenv +, wrapLua +, unzip +, writeText +# Whether the derivation provides a lua module or not. +, toLuaModule +}: + +{ +name ? "${attrs.pname}-${attrs.version}" + +, version + +# by default prefix `name` e.g. "lua5.2-${name}" +, namePrefix ? "lua" + lua.luaversion + "-" + +# Dependencies for building the package +, buildInputs ? [] + +# Dependencies needed for running the checkPhase. +# These are added to buildInputs when doCheck = true. +, checkInputs ? [] + +# propagate build dependencies so in case we have A -> B -> C, +# C can import package A propagated by B +, propagatedBuildInputs ? [] +, propagatedNativeBuildInputs ? [] + +# used to disable derivation, useful for specific lua versions +, disabled ? false + +# Additional arguments to pass to the makeWrapper function, which wraps +# generated binaries. +, makeWrapperArgs ? [] +, external_deps ? propagatedBuildInputs ++ buildInputs + +# Skip wrapping of lua programs altogether +, dontWrapLuaPrograms ? false + +, meta ? {} + +, passthru ? {} +, doCheck ? false + +# appended to the luarocks generated config +# in peculiar variables like { EVENT_INCDIR } can be useful to work around +# luarocks limitations, ie, luarocks consider include/lib folders to be subfolders of the same package in external_deps_dirs +# as explained in https://github.com/luarocks/luarocks/issues/766 +, extraConfig ? "" + +# relative to srcRoot, path to the rockspec to use when using rocks +, rockspecFilename ? "../*.rockspec" + +# must be set for packages that don't have a rock +, knownRockspec ? null + +, ... } @ attrs: + + +# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. +if disabled +then throw "${name} not supported for interpreter ${lua}" +else + +let + + deps_dirs= lib.concatStringsSep ", " ( + map (x: "\"${builtins.toString x}\"") external_deps + ); + + # TODO + # - add rocktrees (look at torch-distro.nix/https://github.com/luarocks/luarocks/wiki/Config-file-format) + # - silence warnings + luarocks_config = "luarocksConfig"; + luarocks_content = '' + local_cache = "" + -- array of strings + external_deps_dirs = { + ${deps_dirs} + } + rocks_trees = { + } + ${extraConfig} + ''; +in +toLuaModule ( lua.stdenv.mkDerivation ( +builtins.removeAttrs attrs ["disabled" "checkInputs"] // { + + name = namePrefix + name; + + buildInputs = [ wrapLua lua.pkgs.luarocks ] + ++ buildInputs + ++ lib.optionals doCheck checkInputs + ; + + # propagate lua to active setup-hook in nix-shell + propagatedBuildInputs = propagatedBuildInputs ++ [ lua ]; + doCheck = false; + + # enabled only for src.rock + setSourceRoot= let + name_only=(builtins.parseDrvName name).name; + in + lib.optionalString (knownRockspec == null) '' + # format is rockspec_basename/source_basename + # rockspec can set it via spec.source.dir + folder=$(find . -mindepth 2 -maxdepth 2 -type d -path '*${name_only}*/*'|head -n1) + sourceRoot="$folder" + ''; + + configurePhase = '' + runHook preConfigure + + cat > ${luarocks_config} <= 1 )); then + LUAROCKS="$LUAROCKS --verbose" + fi + + patchShebangs . + + runHook postBuild + ''; + + postFixup = lib.optionalString (!dontWrapLuaPrograms) '' + wrapLuaPrograms + '' + attrs.postFixup or ''''; + + installPhase = attrs.installPhase or '' + runHook preInstall + + # luarocks make assumes sources are available in cwd + # After the build is complete, it also installs the rock. + # If no argument is given, it looks for a rockspec in the current directory + # but some packages have several rockspecs in their source directory so + # we force the use of the upper level since it is + # the sole rockspec in that folder + # maybe we could reestablish dependency checking via passing --rock-trees + + nix_debug "ROCKSPEC $rockspecFilename" + nix_debug "cwd: $PWD" + $LUAROCKS make --deps-mode=none --tree $out ''${rockspecFilename} + + # to prevent collisions when creating environments + # also added -f as it doesn't always exist + # don't remove the whole directory as + rm -rf $out/lib/luarocks/rocks/manifest + + runHook postInstall + ''; + + passthru = { + inherit lua; # The lua interpreter + } // passthru; + + meta = with lib.maintainers; { + platforms = lua.meta.platforms; + # add extra maintainer(s) to every package + maintainers = (meta.maintainers or []) ++ [ ]; + } // meta; +})) diff --git a/pkgs/development/interpreters/lua-5/build-rocks.nix b/pkgs/development/interpreters/lua-5/build-rocks.nix new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pkgs/development/interpreters/lua-5/build-rockspec.nix b/pkgs/development/interpreters/lua-5/build-rockspec.nix new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/pkgs/development/interpreters/lua-5/setup-hook.nix b/pkgs/development/interpreters/lua-5/setup-hook.nix new file mode 100644 index 0000000000000000000000000000000000000000..62caffd8d8a0ff9fb8ba4b183c36e62b1928e5f3 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/setup-hook.nix @@ -0,0 +1,15 @@ +{ runCommand, lib, }: + +LuaPathSearchPaths: LuaCPathSearchPaths: + +let + hook = ./setup-hook.sh; +in runCommand "lua-setup-hook.sh" { + # hum doesn't seem to like caps !! BUG ? + luapathsearchpaths=lib.escapeShellArgs LuaPathSearchPaths; + luacpathsearchpaths=lib.escapeShellArgs LuaCPathSearchPaths; +} '' + cp ${hook} hook.sh + substituteAllInPlace hook.sh + mv hook.sh $out +'' diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/pkgs/development/interpreters/lua-5/setup-hook.sh new file mode 100644 index 0000000000000000000000000000000000000000..3989bedffdb1e38445e44cb7dae1be1d7b9fca43 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/setup-hook.sh @@ -0,0 +1,47 @@ +# set -e + +nix_print() { + if [ ${NIX_DEBUG:-0} -ge $1 ]; then + echo "$2" + fi +} + +nix_debug() { + nix_print 3 "$1" +} + +addToLuaSearchPathWithCustomDelimiter() { + local varName="$1" + local absPattern="$2" + # delete longest match starting from the lua placeholder '?' + local topDir="${absPattern%%\?*}" + + # export only if the folder exists else LUA_PATH grows too big + if [ ! -d "$topDir" ]; then return; fi + + export "${varName}=${!varName:+${!varName};}${absPattern}" +} + +addToLuaPath() { + local dir="$1" + + if [[ ! -d "$dir" ]]; then + nix_debug "$dir not a directory abort" + return 0 + fi + cd "$dir" + for pattern in @luapathsearchpaths@; + do + addToLuaSearchPathWithCustomDelimiter NIX_LUA_PATH "$PWD/$pattern" + done + + # LUA_CPATH + for pattern in @luacpathsearchpaths@; + do + addToLuaSearchPathWithCustomDelimiter NIX_LUA_CPATH "$PWD/$pattern" + done + cd - >/dev/null +} + +addEnvHooks "$hostOffset" addToLuaPath + diff --git a/pkgs/development/interpreters/lua-5/with-packages.nix b/pkgs/development/interpreters/lua-5/with-packages.nix new file mode 100644 index 0000000000000000000000000000000000000000..0e0fbd3973583cf2be088bb2fd38812dd7dcd89c --- /dev/null +++ b/pkgs/development/interpreters/lua-5/with-packages.nix @@ -0,0 +1,4 @@ +{ buildEnv, luaPackages }: + +# this is a function that returns a function that returns an environment +f: let packages = f luaPackages; in buildEnv.override { extraLibs = packages; } diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix new file mode 100644 index 0000000000000000000000000000000000000000..f00e0d5ac336e1cd6ab163dd394f2b1064396bca --- /dev/null +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -0,0 +1,19 @@ +{ lib +, lua +, makeSetupHook +, makeWrapper +}: + +with lib; + +# defined in trivial-builders.nix +# imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput +makeSetupHook { + deps = makeWrapper; + substitutions.executable = lua.interpreter; + substitutions.lua = lua; + substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; + substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; + +} ./wrap.sh + diff --git a/pkgs/development/interpreters/lua-5/wrap.sh b/pkgs/development/interpreters/lua-5/wrap.sh new file mode 100644 index 0000000000000000000000000000000000000000..545a0ae271c4e14d9e3ab9a8ba35c1178093a176 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/wrap.sh @@ -0,0 +1,99 @@ +# Inspired by python/wrapper.nix +# Wrapper around wrapLuaProgramsIn, below. The $luaPath +# variable is passed in from the buildLuarocksPackage function. +set -e + +wrapLuaPrograms() { + wrapLuaProgramsIn "$out/bin" "$out $luaPath" +} + +# Builds environment variables like LUA_PATH and PATH walking through closure +# of dependencies. +buildLuaPath() { + local luaPath="$1" + local path + + # Create an empty table of paths (see doc on loadFromPropagatedInputs + # for how this is used). Build up the program_PATH and program_LUA_PATH + # variables. + declare -A luaPathsSeen=() + program_PATH= + luaPathsSeen["@lua@"]=1 + addToSearchPath program_PATH @lua@/bin + for path in $luaPath; do + addToLuaPath "$path" + done +} + + +# with an executable shell script which will set some environment variables +# and then call into the original binary (which has been given a .wrapped suffix). +# luaPath is a list of directories +wrapLuaProgramsIn() { + local dir="$1" + local luaPath="$2" + local f + + buildLuaPath "$luaPath" + + if [ ! -d "$dir" ]; then + nix_debug "$dir not a directory" + return + fi + + nix_debug "wrapping programs in [$dir]" + + # Find all regular files in the output directory that are executable. + find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do + # Rewrite "#! .../env lua" to "#! /nix/store/.../lua". + # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which + # Lua to use besides one with this hook anyway. + if head -n1 "$f" | grep -q '#!.*/env.*\(lua\)'; then + sed -i "$f" -e "1 s^.*/env[ ]*\(lua\)[^ ]*^#! @executable@^" + fi + + # wrapProgram creates the executable shell script described + # above. The script will set LUA_(C)PATH and PATH variables! + # (see pkgs/build-support/setup-hooks/make-wrapper.sh) + local -a wrap_args=("$f" + --prefix PATH ':' "$program_PATH" + --prefix LUA_PATH ';' "$NIX_LUA_PATH" + --prefix LUA_CPATH ';' "$NIX_LUA_CPATH" + ) + + # Add any additional arguments provided by makeWrapperArgs + # argument to buildLuaPackage. + # makeWrapperArgs + local -a user_args="($makeWrapperArgs)" + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") + + # see setup-hooks/make-wrapper.sh + wrapProgram "${wrapProgramArgs[@]}" + + done +} + +# Adds the lib and bin directories to the LUA_PATH and PATH variables, +# respectively. Recurses on any paths declared in +# `propagated-native-build-inputs`, while avoiding duplicating paths by +# flagging the directories it has visited in `luaPathsSeen`. +loadFromPropagatedInputs() { + local dir="$1" + # Stop if we've already visited here. + if [ -n "${luaPathsSeen[$dir]}" ]; then + return; + fi + luaPathsSeen[$dir]=1 + + addToLuaPath "$dir" + addToSearchPath program_PATH $dir/bin + + # Inspect the propagated inputs (if they exist) and recur on them. + local prop="$dir/nix-support/propagated-native-build-inputs" + if [ -e "$prop" ]; then + local new_path + for new_path in $(cat $prop); do + loadFromPropagatedInputs "$new_path" + done + fi +} diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix new file mode 100644 index 0000000000000000000000000000000000000000..7f584c0f0aff6de70175e4028f8d0de05b2c065b --- /dev/null +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -0,0 +1,73 @@ +{ stdenv, lua, buildEnv, makeWrapper +, extraLibs ? [] +, extraOutputsToInstall ? [] +, postBuild ? "" +, ignoreCollisions ? false +, lib +, requiredLuaModules +, makeWrapperArgs ? [] +}: + +# Create a lua executable that knows about additional packages. +let + env = let + paths = requiredLuaModules (extraLibs ++ [ lua ] ); + in buildEnv { + name = "${lua.name}-env"; + + inherit paths; + inherit ignoreCollisions; + extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; + + # we create wrapper for the binaries in the different packages + postBuild = '' + + . "${makeWrapper}/nix-support/setup-hook" + + # get access to lua functions + . ${lua}/nix-support/setup-hook + + if [ -L "$out/bin" ]; then + unlink "$out/bin" + fi + mkdir -p "$out/bin" + + addToLuaPath "$out" + + # take every binary from lua packages and put them into the env + for path in ${stdenv.lib.concatStringsSep " " paths}; do + nix_debug "looking for binaries in path = $path" + if [ -d "$path/bin" ]; then + cd "$path/bin" + for prg in *; do + if [ -f "$prg" ]; then + rm -f "$out/bin/$prg" + if [ -x "$prg" ]; then + nix_debug "Making wrapper $prg" + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$NIX_LUA_PATH" --suffix LUA_CPATH ';' "$NIX_LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs} + fi + fi + done + fi + done + '' + postBuild; + + inherit (lua) meta; + + passthru = lua.passthru // { + interpreter = "${env}/bin/lua"; + inherit lua; + env = stdenv.mkDerivation { + name = "interactive-${lua.name}-environment"; + nativeBuildInputs = [ env ]; + + buildCommand = '' + echo >&2 "" + echo >&2 "*** lua 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + }; + }; + }; +in env diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix new file mode 100644 index 0000000000000000000000000000000000000000..0889b7fefe685a6064ad1072401c76c191c9d985 --- /dev/null +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -0,0 +1,10 @@ +{ self, callPackage, lib }: +callPackage ./default.nix { + inherit self; + version = "2.0.5"; + isStable = true; + sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; + extraMeta = { + platforms = lib.filter (p: p != "aarch64-linux") lib.meta.platforms; + }; +} diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix new file mode 100644 index 0000000000000000000000000000000000000000..0f223963132efc9a5469b8e0ed9aa3c260d38f45 --- /dev/null +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -0,0 +1,7 @@ +{ self, callPackage, lib }: +callPackage ./default.nix { + inherit self; + version = "2.1.0-beta3"; + isStable = false; + sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; +} diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 9ee628f498ee6a9f0695c3ab5ab14452b14e238a..c95b9e8b8e37e8862d88035619cb94236c78eab1 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,71 +1,74 @@ -{ stdenv, lib, fetchurl }: -rec { +{ stdenv, lib, fetchurl +, name ? "luajit-${version}" +, isStable +, sha256 +, version +, extraMeta ? {} +, callPackage +, self +, packageOverrides ? (self: super: {}) +}: +let + luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; +in +stdenv.mkDerivation rec { + inherit name version; + src = fetchurl { + url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; + inherit sha256; + }; - luajit = luajit_2_1; + luaversion = "5.1"; - luajit_2_0 = generic { - version = "2.0.5"; - isStable = true; - sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; - meta = genericMeta // { - platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms; - }; - }; + patchPhase = '' + substituteInPlace Makefile \ + --replace /usr/local "$out" + + substituteInPlace src/Makefile --replace gcc cc + '' + stdenv.lib.optionalString (stdenv.cc.libc != null) + '' + substituteInPlace Makefile \ + --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig + ''; + + configurePhase = false; - luajit_2_1 = generic { - version = "2.1.0-beta3"; - isStable = false; - sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; + buildFlags = [ "amalg" ]; # Build highly optimized version + enableParallelBuilding = true; + + installPhase = '' + make install PREFIX="$out" + ( cd "$out/include"; ln -s luajit-*/* . ) + ln -s "$out"/bin/luajit-* "$out"/bin/lua + '' + + stdenv.lib.optionalString (!isStable) '' + ln -s "$out"/bin/luajit-* "$out"/bin/luajit + ''; + + LuaPathSearchPaths = [ + "lib/lua/${luaversion}/?.lua" "share/lua/${luaversion}/?.lua" + "share/lua/${luaversion}/?/init.lua" "lib/lua/${luaversion}/?/init.lua" + "share/${name}/?.lua" + ]; + LuaCPathSearchPaths = [ "lib/lua/${luaversion}/?.so" "share/lua/${luaversion}/?.so" ]; + setupHook = luaPackages.lua-setup-hook LuaPathSearchPaths LuaCPathSearchPaths; + + passthru = rec { + buildEnv = callPackage ../lua-5/wrapper.nix { + lua = self; + inherit (luaPackages) requiredLuaModules; + }; + withPackages = import ../lua-5/with-packages.nix { inherit buildEnv luaPackages;}; + pkgs = luaPackages; + interpreter = "${self}/bin/lua"; }; - genericMeta = with stdenv.lib; { + meta = with stdenv.lib; extraMeta // { description = "High-performance JIT compiler for Lua 5.1"; homepage = http://luajit.org; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ]; }; - - generic = - { version, sha256 ? null, isStable - , name ? "luajit-${version}" - , src ? - (fetchurl { - url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - inherit sha256; - }) - , meta ? genericMeta - }: - - stdenv.mkDerivation rec { - inherit name version src meta; - - luaversion = "5.1"; - - patchPhase = '' - substituteInPlace Makefile \ - --replace /usr/local "$out" - - substituteInPlace src/Makefile --replace gcc cc - '' + stdenv.lib.optionalString (stdenv.cc.libc != null) - '' - substituteInPlace Makefile \ - --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig - ''; - - configurePhase = false; - - buildFlags = [ "amalg" ]; # Build highly optimized version - enableParallelBuilding = true; - - installPhase = '' - make install PREFIX="$out" - ( cd "$out/include"; ln -s luajit-*/* . ) - ln -s "$out"/bin/luajit-* "$out"/bin/lua - '' - + stdenv.lib.optionalString (!isStable) - '' - ln -s "$out"/bin/luajit-* "$out"/bin/luajit - ''; - }; } + diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 9575409f9868c70e9284cc985a43e1da12bc59c5..5a241fbf83eecdc616ee278367d86f2097386ea9 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, libGLU_combined, SDL +{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU_combined, SDL , blas, libbfd, intltool, gettext, zlib, libSM}: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 libSM xproto indent readline gsl freeglut libGLU_combined SDL blas libbfd + libX11 libSM xorgproto indent readline gsl freeglut libGLU_combined SDL blas libbfd intltool gettext zlib ]; diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream index 4a94595f7723d247056a275c4bb9919aa69cdc09..8a8b08fcd68ab7f821c0362f08d396099186fa1d 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 9ead7176d4ed3614af5e94d5a284b57037edccff..30013946886b2d274d24f1fd21a8116a2d7b9e48 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 0000000000000000000000000000000000000000..e8e23cee830a470a730a0dbe9e245162d40fd6b5 --- /dev/null +++ b/pkgs/development/interpreters/metamath/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "metamath-${version}"; + version = "0.172"; + + 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 = "43141cd17638f8efb409dc5d46e7de6a6c39ec42"; + sha256 = "07c7df0zl0wsb0pvdgkwikpr8kz7fi3mshxzk61vkamyp68djjb5"; + }; + + 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/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index c7663a1167638e1b7c2de24927fae9b2806954bc..918b2c2515e234ff67de601e61fd3bd7c5382c69 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchgit, clang }: +{ stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "mujs-2017-01-24"; + name = "mujs-${version}"; + version = "1.0.5"; - src = fetchgit { - url = git://git.ghostscript.com/mujs.git; - rev = "4006739a28367c708dea19aeb19b8a1a9326ce08"; - sha256 = "0wvjl8lkh0ga6fkmxgjqq77yagncbv1bdy6hpnxq31x3mkwn1s51"; + src = fetchurl { + url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; + sha256 = "02cqrfnww2s3ylcvqin1951f2c5nzpby8gxb207p2hbrivbg8f0l"; }; - buildInputs = [ clang ]; + buildInputs = [ readline ]; makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { homepage = http://mujs.com/; description = "A lightweight, embeddable Javascript interpreter"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index f6bd96af40f5709968671f08efe979f319668e11..cbe919c70929874e5a50fd11f1e705adbe0f40d7 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 ec4f971eeeff0d5c791e813621c0a087322d2f55..5e8f5e2d59b6d83cb60350a041304b19d0e8124c 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -37,20 +37,21 @@ 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. + (if (versionOlder version "5.29.6") then ./no-sys-dirs-5.26.patch else ./no-sys-dirs-5.29.patch) + ] + ++ optional (versionOlder version "5.29.6") # 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 +78,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 +120,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 +154,11 @@ let platforms = platforms.all; }; } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.2"; + crossVersion = "276849e62f472c1b241d9e7b38a28e4cc9f98563"; # Dez 02, 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 = "1fpr1m9lgkwdp1vmdr0s6gvmcpd0m8q6jwn024bkczc2h37bdynd"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -171,23 +174,15 @@ 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.1"; + sha256 = "0iy3as4hnbjfyws4in3j9d6zhhjxgl5m95i5n9jy2bnzcpz8bgry"; }; - perl528 = common { - version = "5.28.0"; - sha256 = "1a3f822lcl8dr8v0hk80yyhpzqlljg49z9flb48rs3nbsij9z4ky"; + # the latest Devel version + perldevel = common { + version = "5.29.6"; + sha256 = "0wj2bia8s30788f69mf5s533l72zbhqpdr85kkk97yrh1c9sgcd6"; }; } diff --git a/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch b/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch new file mode 100644 index 0000000000000000000000000000000000000000..0ccf6254b782be598267aeaf151da7a5a9bfc584 --- /dev/null +++ b/pkgs/development/interpreters/perl/no-sys-dirs-5.29.patch @@ -0,0 +1,251 @@ +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 +@@ -134,12 +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 +- $linux_errno_h +- ) { ++ } elsif (0) { + $file{$linux_errno_h} = 1; + } elsif ($^O eq 'haiku') { + # hidden in a special place +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 +- + if ${sh:-/bin/sh} -c exit; then + echo '' + echo 'You appear to have a working bash. Good.' +@@ -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/perl/no-sys-dirs.patch b/pkgs/development/interpreters/perl/no-sys-dirs.patch deleted file mode 100644 index 1793273a76f922f2040867a895834a6f6dd60c3c..0000000000000000000000000000000000000000 --- 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 8310f381fcf08e5bf62d98a2e2aef88ad8098f5a..39f8d251410881fafbed1ed46cd03771b20d5ef3 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 -, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds -, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy +, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash +, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip }: with lib; @@ -12,10 +12,11 @@ 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 - , mysqlSupport ? (config.php.mysql or true) , mysqlndSupport ? config.php.mysqlnd or true , mysqliSupport ? config.php.mysqli or true , pdo_mysqlSupport ? config.php.pdo_mysql or true @@ -25,35 +26,37 @@ let , bcmathSupport ? config.php.bcmath or true , socketsSupport ? config.php.sockets or true , curlSupport ? config.php.curl or true - , curlWrappersSupport ? config.php.curlWrappers or true , gettextSupport ? config.php.gettext or true , pcntlSupport ? config.php.pcntl or true , postgresqlSupport ? config.php.postgresql or true , pdo_pgsqlSupport ? config.php.pdo_pgsql or true , readlineSupport ? config.php.readline or true , sqliteSupport ? config.php.sqlite or true - , soapSupport ? config.php.soap or true + , soapSupport ? (config.php.soap or true) && (libxml2Support) , zlibSupport ? config.php.zlib or true , opensslSupport ? config.php.openssl or true , mbstringSupport ? config.php.mbstring or true , gdSupport ? config.php.gd or true - # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826 - # We need to disable the intl support on darwin. Whenever the upstream bug is - # fixed we should revert this to just just "config.php.intl or true". - , intlSupport ? (config.php.intl or true) && (!stdenv.isDarwin) + , 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 , fpmSupport ? config.php.fpm or true , gmpSupport ? config.php.gmp or true - , mssqlSupport ? config.php.mssql or (!stdenv.isDarwin) , ztsSupport ? config.php.zts or false , 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 + , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support) }: let @@ -67,9 +70,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 ] @@ -85,7 +90,6 @@ let ++ optional postgresqlSupport postgresql ++ optional pdo_pgsqlSupport postgresql ++ optional pdo_mysqlSupport mysqlBuildInputs - ++ optional mysqlSupport mysqlBuildInputs ++ optional mysqliSupport mysqlBuildInputs ++ optional gmpSupport gmp ++ optional gettextSupport gettext @@ -93,19 +97,20 @@ let ++ optional xslSupport libxslt ++ optional mcryptSupport libmcrypt' ++ 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" @@ -121,19 +126,27 @@ let ++ optional embedSupport "--enable-embed" ++ optional mhashSupport "--with-mhash" ++ optional curlSupport "--with-curl=${curl.dev}" - ++ optional curlWrappersSupport "--with-curlwrappers" ++ optional zlibSupport "--with-zlib=${zlib.dev}" ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}" + ++ optional (!libxml2Support) [ + "--disable-dom" + "--disable-libxml" + "--disable-simplexml" + "--disable-xml" + "--disable-xmlreader" + "--disable-xmlwriter" + "--without-pear" + ] ++ optional pcntlSupport "--enable-pcntl" ++ optional readlineSupport "--with-readline=${readline.dev}" ++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}" ++ optional postgresqlSupport "--with-pgsql=${postgresql}" ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}" - ++ optional mysqlSupport "--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}" ++ optionals mysqliSupport [ "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}" ] + ++ optional ( pdo_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 [ @@ -156,12 +169,18 @@ let ++ optional zipSupport "--enable-zip" ++ optional ftpSupport "--enable-ftp" ++ optional fpmSupport "--enable-fpm" - ++ optional (mssqlSupport && !stdenv.isDarwin) "--with-mssql=${freetds}" ++ 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" + ++ optional xmlrpcSupport "--with-xmlrpc"; hardeningDisable = [ "bindnow" ]; @@ -181,9 +200,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 ''; @@ -209,7 +231,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++" @@ -223,12 +245,26 @@ let in { php71 = generic { - version = "7.1.22"; - sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8"; + version = "7.1.26"; + sha256 = "1riaaizyl0jv9p6b8sm8xxj8iqz4p4dddwdag03n1r67dfl1qdav"; + + # https://bugs.php.net/bug.php?id=76826 + extraPatches = optional stdenv.isDarwin ./php71-darwin-isfinite.patch; }; php72 = generic { - version = "7.2.10"; - sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1"; + version = "7.2.15"; + sha256 = "0m05dmad138qfxcb2z4czf9pfv1746g9yzlch48kjikajhb7cgn9"; + + # https://bugs.php.net/bug.php?id=76826 + extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; + }; + + php73 = generic { + version = "7.3.2"; + sha256 = "1p8amf91i6lrrphd6ypfh3kic64bpqf04dxp7dj1xxnjrgd50vwl"; + + # https://bugs.php.net/bug.php?id=76826 + extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }; } diff --git a/pkgs/development/interpreters/php/fix-paths-php7.patch b/pkgs/development/interpreters/php/fix-paths-php7.patch index 2b9e4ad0ebbf78b5a3254b4b5f69a5ba116e262b..908f06ec49abb74c7a235258134a57821d88c1fd 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 0000000000000000000000000000000000000000..ebfcd94f8d4b0f44306d4b9d4e5e9df5ab93ee57 --- /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 0000000000000000000000000000000000000000..ea2e3e28f2cce5702a538e641ab56e4b1a1c0336 --- /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 0000000000000000000000000000000000000000..7f784e0f5a95cf77681d72bf6d14d0fdc967185b --- /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/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 37a5bdd0ce94dbd6a1746e47f35569db6c180d15..058a83b6b436d3a1025ebfa2fdd9642357a0175d 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchurl, jdk }: +{ stdenv, fetchurl, jdk, makeWrapper }: with stdenv.lib; stdenv.mkDerivation rec { name = "picoLisp-${version}"; - version = "16.12"; + version = "18.12"; src = fetchurl { url = "https://www.software-lab.de/${name}.tgz"; - sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75"; + sha256 = "0hvgq2vc03bki528jqn95xmvv7mw8xx832spfczhxc16wwbrnrhk"; }; - buildInputs = optional stdenv.is64bit jdk; - patchPhase = optionalString stdenv.isAarch32 '' - sed -i s/-m32//g Makefile - cat >>Makefile <>Makefile <"$out/bin/pil" <&2 + export PYTHONPATH="$tmp_path/${python.pythonForBuild.sitePackages}:$PYTHONPATH" + mkdir -p $tmp_path/${python.pythonForBuild.sitePackages} + ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install -e . --prefix $tmp_path >&2 fi ${postShellHook} ''; diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index b55d6d874bbb7182c3b175c552f644b1f6c9f3d3..b664cf0b14f4692c7d1b8ae9168d6d48326f6a46 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -10,17 +10,19 @@ , ensureNewerSourcesForZipFilesHook , toPythonModule , namePrefix -, bootstrapped-pip , flit +, writeScript +, update-python-libraries }: let - setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; }; + setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python; }; flit-specific = import ./build-python-package-flit.nix { inherit python flit; }; wheel-specific = import ./build-python-package-wheel.nix { }; - common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; + common = import ./build-python-package-common.nix { inherit python; }; 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 7d6f2541d3d1e160322cac8eda9f4e0d576fd426..ccb366903c5c3898547ffe068281d682157617b6 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 = '' @@ -68,8 +77,6 @@ stdenv.mkDerivation rec { '' ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} - paxmark E $out/bin/python2.7 - rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev ''; 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 0000000000000000000000000000000000000000..c83b56437a497c3d6aaa03a823522c12aaf3b3ee --- /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 df8e6ebf89ffde2930793da4e54c0ce53222c72a..249c4ac9cf79036ba54c01c5355828e2e79b8d6c 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,7 +1,9 @@ -{ stdenv, buildPackages, fetchurl +{ stdenv, fetchurl, fetchpatch , bzip2 +, expat +, libffi , gdbm -, fetchpatch +, db , ncurses , openssl , readline @@ -10,15 +12,16 @@ , zlib , callPackage , self -, db -, expat -, libffi , CF, configd, coreutils , python-setup-hook # Some proprietary libs assume UCS2 unicode, especially on darwin :( , ucsEncoding ? 4 # For the Python package set , packageOverrides ? (self: super: {}) +, buildPackages +, sourceVersion +, sha256 +, passthruFun }: assert x11Support -> tcl != null @@ -29,16 +32,26 @@ assert x11Support -> tcl != null with stdenv.lib; let - majorVersion = "2.7"; - minorVersion = "15"; - minorVersionSuffix = ""; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "python${majorVersion}"; - sitePackages = "lib/${libPrefix}/site-packages"; + + pythonForBuild = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}; + + passthru = passthruFun rec { + inherit self sourceVersion packageOverrides; + implementation = "cpython"; + libPrefix = "python${pythonVersion}"; + executable = libPrefix; + pythonVersion = with sourceVersion; "${major}.${minor}"; + sitePackages = "lib/${libPrefix}/site-packages"; + inherit pythonForBuild; + } // { + inherit ucsEncoding; + }; + + version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92"; + url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; + inherit sha256; }; hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -74,6 +87,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 +123,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,15 +197,18 @@ 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 { - name = "python-${version}"; - pythonVersion = majorVersion; +in with passthru; stdenv.mkDerivation ({ + pname = "python"; + inherit version; - inherit majorVersion version src patches buildInputs nativeBuildInputs - preConfigure configureFlags; + inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; @@ -203,7 +227,7 @@ in stdenv.mkDerivation { '' # needed for some packages, especially packages that backport # functionality to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do + for item in $out/lib/${libPrefix}/test/*; do if [[ "$item" != */test_support.py* && "$item" != */test/support && "$item" != */test/regrtest.py* ]]; then @@ -212,13 +236,11 @@ in stdenv.mkDerivation { echo $item fi done - touch $out/lib/python${majorVersion}/test/__init__.py - ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb - ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} + touch $out/lib/${libPrefix}/test/__init__.py + ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb + ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb${sourceVersion.major}.${sourceVersion.minor} ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} - 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 @@ -239,18 +261,7 @@ in stdenv.mkDerivation { cp libpython2.7.dll.a $out/lib ''; - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; - in rec { - inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch ucsEncoding; - executable = libPrefix; - buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - isPy2 = true; - isPy27 = true; - interpreter = "${self}/bin/${executable}"; - }; + inherit passthru; enableParallelBuilding = true; @@ -275,4 +286,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 c8a544c601af00a88668e69ab3a0293d1b07ceeb..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ /dev/null @@ -1,211 +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 3172eb6d18e4bf0c84a4132901fb9aa9cc9fb10a..0000000000000000000000000000000000000000 --- 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 3cb77a10725494abbcbdf5024393c7603e22ebd2..0000000000000000000000000000000000000000 --- 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 b73f62b97ec502a8d2d94bd56b9bbbc9551acfe8..0000000000000000000000000000000000000000 --- 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.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix deleted file mode 100644 index 2de337a83955723cb3d22fe927919dcf9d3d49b6..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ /dev/null @@ -1,210 +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.5"; - minorVersion = "6"; - 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 = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0pqmf51zy2lzhbaj4yya2py2qr653j9152d0rg3p7wi1yl2dwp7m"; - }; - - 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 stdenv.isDarwin [ - # Fix for https://bugs.python.org/issue24658 - (fetchpatch { - url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; - sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; - }) - ] ++ 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_external.py" --replace "source_mtime = int(st['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'" - ''; - - 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; - isPy35 = true; - 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.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix deleted file mode 100644 index 6b9e26e99fcd803d2e71ebe2d4b48abd87b0fc19..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ /dev/null @@ -1,232 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, buildPackages -, 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.6"; - minorVersion = "6"; - 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 ]; - - nativeBuildInputs = - optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.python3; - - hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - -in stdenv.mkDerivation { - name = "python3-${version}"; - pythonVersion = majorVersion; - inherit majorVersion version; - - inherit buildInputs nativeBuildInputs; - - src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0vz1wqg50zq6g15givdx1s2rq5752y5g2f1978bs6wvf8mfw36yp"; - }; - - 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 - ] ++ optionals stdenv.isDarwin [ - # Fix for https://bugs.python.org/issue24658 - (fetchpatch { - url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; - sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; - }) - ] ++ 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/file47669/python-3.8-distutils-C++.patch"; - sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; - }) - ]; - - 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_external.py" --replace "source_mtime = int(st['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'" - ''; - - 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" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "ac_cv_buggy_getaddrinfo=no" - # Assume little-endian IEEE 754 floating point when cross compiling - "ac_cv_little_endian_double=yes" - "ac_cv_big_endian_double=no" - "ac_cv_mixed_endian_double=no" - "ac_cv_x87_double_rounding=yes" - "ac_cv_tanh_preserves_zero_sign=yes" - # Generally assume that things are present and work - "ac_cv_posix_semaphores_enabled=yes" - "ac_cv_broken_sem_getvalue=no" - "ac_cv_wchar_t_signed=yes" - "ac_cv_rshift_extends_sign=yes" - "ac_cv_broken_nice=no" - "ac_cv_broken_poll=no" - "ac_cv_working_tzset=yes" - "ac_cv_have_long_long_format=yes" - "ac_cv_have_size_t_format=yes" - "ac_cv_computed_gotos=yes" - "ac_cv_file__dev_ptmx=yes" - "ac_cv_file__dev_ptc=yes" - ] - # 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 - '' + optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - # 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; - isPy36 = 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 kragniz ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix deleted file mode 100644 index adee8d594f18be579a08c35dd44ce8592c47971e..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ /dev/null @@ -1,193 +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.7"; - minorVersion = "0"; - 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 = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3"; - }; - - NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; - - # 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 - # Fix darwin build https://bugs.python.org/issue34027 - (fetchpatch { - url = https://bugs.python.org/file47666/darwin-libutil.patch; - sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa"; - }) - ] ++ 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/file47669/python-3.8-distutils-C++.patch"; - sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; - }) - ]; - - postPatch = '' - '' + optionalString (x11Support && (tix != null)) '' - substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - ''; - - 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" - "--with-openssl=${openssl.dev}" - ]; - - 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 - ''} - ''; - - 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 - # Python 3.7 implements PEP 552, introducing support for deterministic bytecode. - # This is automatically used when `SOURCE_DATE_EPOCH` is set. - 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; - isPy37 = true; - is_py3k = true; # deprecated - interpreter = "${self}/bin/${executable}"; - }; - - enableParallelBuilding = true; - - 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 kragniz ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1b4a5e7513770543b7c957d581eb0d451643eb51 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -0,0 +1,260 @@ +{ stdenv, fetchurl, fetchpatch +, bzip2 +, expat +, libffi +, gdbm +, lzma +, ncurses +, openssl +, readline +, sqlite +, tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false +, zlib +, callPackage +, self +, CF, configd +, python-setup-hook +, nukeReferences +# For the Python package set +, packageOverrides ? (self: super: {}) +, buildPackages +, sourceVersion +, sha256 +, passthruFun +, bash +}: + +assert x11Support -> tcl != null + && tk != null + && xorgproto != null + && libX11 != null; +with stdenv.lib; + +let + + passthru = passthruFun rec { + inherit self sourceVersion packageOverrides; + implementation = "cpython"; + libPrefix = "python${pythonVersion}"; + executable = libPrefix; + pythonVersion = with sourceVersion; "${major}.${minor}"; + sitePackages = "lib/${libPrefix}/site-packages"; + inherit pythonForBuild; + }; + + version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; + + nativeBuildInputs = [ + nukeReferences + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + buildPackages.stdenv.cc + pythonForBuild + ]; + + buildInputs = filter (p: p != null) [ + zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] + ++ optionals x11Support [ tcl tk libX11 xorgproto ] + ++ optionals stdenv.isDarwin [ CF configd ]; + + hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); + + pythonForBuild = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}; + + pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then + "$out/bin/python" + else pythonForBuild.interpreter; + +in with passthru; stdenv.mkDerivation { + pname = "python3"; + inherit version; + + inherit buildInputs nativeBuildInputs; + + src = fetchurl { + url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz"; + inherit sha256; + }; + + prePatch = optionalString stdenv.isDarwin '' + substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' + substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' + ''; + + patches = [ + # Disable the use of ldconfig in ctypes.util.find_library (since + # ldconfig doesn't work on NixOS), and don't use + # ctypes.util.find_library during the loading of the uuid module + # (since it will do a futile invocation of gcc (!) to find + # libuuid, slowing down program startup a lot). + (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch") + ] ++ optionals isPy35 [ + # Backports support for LD_LIBRARY_PATH from 3.6 + ./3.5/ld_library_path.patch + ] ++ optionals isPy37 [ + # Fix darwin build https://bugs.python.org/issue34027 + (fetchpatch { + url = https://bugs.python.org/file47666/darwin-libutil.patch; + sha256 = "0242gihnw3wfskl4fydp2xanpl8k5q7fj4dp7dbbqf46a4iwdzpa"; + }) + ] ++ optionals (isPy3k && 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/file48016/python-3.x-distutils-C++.patch"; + sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; + }) + ]; + + postPatch = '' + '' + optionalString (x11Support && (tix != null)) '' + substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + ''; + + 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"}"; + NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; + # Determinism: We fix the hashes of str, bytes and datetime objects. + PYTHONHASHSEED=0; + + configureFlags = [ + "--enable-shared" + "--with-threads" + "--without-ensurepip" + "--with-system-expat" + "--with-system-ffi" + "--with-openssl=${openssl.dev}" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_buggy_getaddrinfo=no" + # Assume little-endian IEEE 754 floating point when cross compiling + "ac_cv_little_endian_double=yes" + "ac_cv_big_endian_double=no" + "ac_cv_mixed_endian_double=no" + "ac_cv_x87_double_rounding=yes" + "ac_cv_tanh_preserves_zero_sign=yes" + # Generally assume that things are present and work + "ac_cv_posix_semaphores_enabled=yes" + "ac_cv_broken_sem_getvalue=no" + "ac_cv_wchar_t_signed=yes" + "ac_cv_rshift_extends_sign=yes" + "ac_cv_broken_nice=no" + "ac_cv_broken_poll=no" + "ac_cv_working_tzset=yes" + "ac_cv_have_long_long_format=yes" + "ac_cv_have_size_t_format=yes" + "ac_cv_computed_gotos=yes" + "ac_cv_file__dev_ptmx=yes" + "ac_cv_file__dev_ptc=yes" + ] ++ optionals stdenv.hostPlatform.isLinux [ + # Never even try to use lchmod on linux, + # don't rely on detecting glibc-isms. + "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 (isPy3k && pythonOlder "3.7") '' + # Determinism: The interpreter is patched to write null timestamps when compiling python files. + # This way python does not try to update them when we freeze timestamps in nix store. + export DETERMINISTIC_BUILD=1; + '' + 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/${libPrefix}/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/${libPrefix}/test/__init__.py + + ln -s "$out/include/${executable}m" "$out/include/${executable}" + + # 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/${libPrefix}/_sysconfigdata*.py $out/lib/${libPrefix}/config-${sourceVersion.major}${sourceVersion.minor}*/Makefile; do + sed -i $i -e "s|$TMPDIR|/no-such-path|g" + done + + # Further get rid of references. https://github.com/NixOS/nixpkgs/issues/51668 + find $out/lib/python*/config-* -type f -print -exec nuke-refs '{}' + + find $out/lib -name '_sysconfigdata*.py*' -print -exec nuke-refs '{}' + + + # Determinism: rebuild all bytecode + # We exclude lib2to3 because that's Python 2 code which fails + # We rebuild three times, once for each optimization level + # Python 3.7 implements PEP 552, introducing support for deterministic bytecode. + # This is automatically used when `SOURCE_DATE_EPOCH` is set. + find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - + find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - + ''; + + preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # Ensure patch-shebangs uses shebangs of host interpreter. + export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH + ''; + + # Enforce that we don't have references to the OpenSSL -dev package, which we + # explicitly specify in our configure flags above. + disallowedReferences = [ + openssl.dev + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Ensure we don't have references to build-time packages. + # These typically end up in shebangs. + pythonForBuild buildPackages.bash + ]; + + inherit passthru; + + enableParallelBuilding = true; + + 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/default.nix b/pkgs/development/interpreters/python/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f1461d784be0636ef8d4454ff15d5b59ae5bc73f --- /dev/null +++ b/pkgs/development/interpreters/python/default.nix @@ -0,0 +1,156 @@ +{ pkgs, lib }: + +with pkgs; + +(let + + # Common passthru for all Python interpreters. + passthruFun = + { implementation + , libPrefix + , executable + , sourceVersion + , pythonVersion + , packageOverrides + , sitePackages + , pythonForBuild + , self + }: let + pythonPackages = callPackage ../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; + in rec { + isPy27 = pythonVersion == "2.7"; + isPy33 = pythonVersion == "3.3"; # TODO: remove + isPy34 = pythonVersion == "3.4"; # TODO: remove + isPy35 = pythonVersion == "3.5"; + isPy36 = pythonVersion == "3.6"; + isPy37 = pythonVersion == "3.7"; + isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; + isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; + isPy3k = isPy3; + isPyPy = interpreter == "pypy"; + + buildEnv = callPackage ./wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; + withPackages = import ./with-packages.nix { inherit buildEnv pythonPackages;}; + pkgs = pythonPackages; + interpreter = "${self}/bin/${executable}"; + inherit executable implementation libPrefix pythonVersion sitePackages; + inherit sourceVersion; + pythonAtLeast = lib.versionAtLeast pythonVersion; + pythonOlder = lib.versionOlder pythonVersion; + inherit pythonForBuild; + }; + +in { + + python27 = callPackage ./cpython/2.7 { + self = python27; + sourceVersion = { + major = "2"; + minor = "7"; + patch = "15"; + suffix = ""; + }; + sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + + python35 = callPackage ./cpython { + self = python35; + sourceVersion = { + major = "3"; + minor = "5"; + patch = "6"; + suffix = ""; + }; + sha256 = "0pqmf51zy2lzhbaj4yya2py2qr653j9152d0rg3p7wi1yl2dwp7m"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + + python36 = callPackage ./cpython { + self = python36; + sourceVersion = { + major = "3"; + minor = "6"; + patch = "8"; + suffix = ""; + }; + sha256 = "14qi6n5gpcjnwy165wi9hkfcmbadc95ny6bxxldknxwmx50n4i1m"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + + python37 = callPackage ./cpython { + self = python37; + sourceVersion = { + major = "3"; + minor = "7"; + patch = "2"; + suffix = ""; + }; + sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq"; + inherit (darwin) CF configd; + inherit passthruFun; + }; + + pypy27 = callPackage ./pypy { + self = pypy27; + sourceVersion = { + major = "6"; + minor = "0"; + patch = "0"; + }; + sha256 = "1qjwpc8n68sxxlfg36s5vn1h2gdfvvd6lxvr4lzbvfwhzrgqahsw"; + pythonVersion = "2.7"; + db = db.override { dbmSupport = true; }; + python = python27; + inherit passthruFun; + }; + + pypy35 = callPackage ./pypy { + self = pypy35; + sourceVersion = { + major = "6"; + minor = "0"; + patch = "0"; + }; + sha256 = "0lwq8nn0r5yj01bwmkk5p7xvvrp4s550l8184mkmn74d3gphrlwg"; + pythonVersion = "3.5"; + db = db.override { dbmSupport = true; }; + python = python27; + inherit passthruFun; + }; + + pypy27_prebuilt = callPackage ./pypy/prebuilt.nix { + # Not included at top-level + self = pythonInterpreters.pypy27_prebuilt; + sourceVersion = { + major = "6"; + minor = "0"; + patch = "0"; + }; + sha256 = "0rxgnp3fm18b87ln8bbjr13g2fsf4ka4abkaim6m03y9lwmr9gvc"; # linux64 + pythonVersion = "2.7"; + inherit passthruFun; + ncurses = ncurses5; + }; + + pypy35_prebuilt = callPackage ./pypy/prebuilt.nix { + # Not included at top-level + self = pythonInterpreters.pypy35_prebuilt; + sourceVersion = { + major = "6"; + minor = "0"; + patch = "0"; + }; + sha256 = "0j3h08s7wpglghasmym3baycpif5jshvmk9rpav4pwwy5clzmzsc"; # linux64 + pythonVersion = "3.5"; + inherit passthruFun; + ncurses = ncurses5; + }; + +}) \ No newline at end of file diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 63ffdbb8c0ac41c4a8ed80dd1a22246a9418e595..4951ae4499f8ec020fe1e5d62adf5ac46e117d53 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,20 +66,23 @@ 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" ] // { name = namePrefix + name; - nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ] - ++ nativeBuildInputs; + nativeBuildInputs = [ + python + wrapPython + ensureNewerSourcesForZipFilesHook + setuptools +# ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools + ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ + unzip + ] ++ nativeBuildInputs; - buildInputs = [ wrapPython ] - ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip - ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools - ++ buildInputs - ++ pythonPath; + buildInputs = buildInputs ++ pythonPath; # Propagate python and setuptools. We should stop propagating setuptools. propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; @@ -98,12 +103,20 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ # Check if we have two packages with the same name in the closure and fail. # If this happens, something went wrong with the dependencies specs. # Intentionally kept in a subdirectory, see catch_conflicts/README.md. - ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py + ${python.pythonForBuild.interpreter} ${./catch_conflicts}/catch_conflicts.py '' + attrs.postFixup or ''''; + # Python packages built through cross-compilation are always for the host platform. + disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + meta = { # default to python's platforms platforms = python.meta.platforms; isBuildPythonPackage = python.meta.platforms; } // meta; -})) +})); + +passthru.updateScript = let + filename = builtins.head (lib.splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; +in lib.extendDerivation true passthru self diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix deleted file mode 100644 index d95707ecb22d8eaa97f07305734115d4dfccbc14..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ stdenv, substituteAll, fetchurl -, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 -, makeWrapper, callPackage, self, gdbm, db -, python-setup-hook -# For the Python package set -, packageOverrides ? (self: super: {}) -}: - -assert zlibSupport -> zlib != null; - -let - majorVersion = "6.0"; - minorVersion = "0"; - minorVersionSuffix = ""; - pythonVersion = "2.7"; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "pypy${majorVersion}"; - sitePackages = "site-packages"; - - pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); - -in stdenv.mkDerivation rec { - name = "pypy-${version}"; - inherit majorVersion version pythonVersion; - - src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; - sha256 = "1qjwpc8n68sxxlfg36s5vn1h2gdfvvd6lxvr4lzbvfwhzrgqahsw"; - }; - - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ - bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db - ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc - ++ stdenv.lib.optional zlibSupport zlib; - - hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; - - C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs; - LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); - - patches = [ - (substituteAll { - src = ./tk_tcl_paths.patch; - inherit tk tcl; - tk_dev = tk.dev; - tcl_dev = tcl; - tk_libprefix = tk.libPrefix; - tcl_libprefix = tcl.libPrefix; - }) - ]; - - postPatch = '' - substituteInPlace "lib-python/2.7/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - - # hint pypy to find nix ncurses - substituteInPlace pypy/module/_minimal_curses/fficurses.py \ - --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ - --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ - --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \ - --replace "libraries=['curses']" "libraries=['ncurses']" - - sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py - ''; - - buildPhase = '' - ${pythonForPypy.interpreter} rpython/bin/rpython \ - --make-jobs="$NIX_BUILD_CORES" \ - -Ojit \ - --batch pypy/goal/targetpypystandalone.py \ - --withmod-_minimal_curses \ - --withmod-unicodedata \ - --withmod-thread \ - --withmod-bz2 \ - --withmod-_multiprocessing - ''; - - setupHook = python-setup-hook sitePackages; - - doCheck = true; - checkPhase = '' - export TERMINFO="${ncurses.out}/share/terminfo/"; - export TERM="xterm"; - export HOME="$TMPDIR"; - # disable shutils because it assumes gid 0 exists - # disable socket because it has two actual network tests that fail - # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) - # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure - # disable test_zipfile64 because it causes ENOSPACE - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 )' lib-python - ''; - - installPhase = '' - mkdir -p $out/{bin,include,lib,pypy-c} - - cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c - cp libpypy-c.so $out/lib/ - ln -s $out/pypy-c/pypy-c $out/bin/pypy - chmod +x $out/bin/pypy - - # other packages expect to find stuff according to libPrefix - ln -s $out/pypy-c/include $out/include/${libPrefix} - ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} - - # We must wrap the original, not the symlink. - # PyPy uses argv[0] to find its standard library, and while it knows - # how to follow symlinks, it doesn't know about wrappers. So, it - # will think the wrapper is the original. As long as the wrapper has - # the same path as the original, this is OK. - wrapProgram "$out/pypy-c/pypy-c" \ - --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ - --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" - - # verify cffi modules - $out/bin/pypy -c "import Tkinter;import sqlite3;import curses" - - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - ''; - - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; - in rec { - inherit zlibSupport libPrefix sitePackages; - executable = "pypy"; - isPypy = true; - buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; - interpreter = "${self}/bin/${executable}"; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - }; - - enableParallelBuilding = true; # almost no parallelization without STM - - meta = with stdenv.lib; { - homepage = http://pypy.org/; - description = "Fast, compliant alternative implementation of the Python language (2.7.13)"; - license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..193f134e5c6cc3f171107501705a02c2d707d5d3 --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -0,0 +1,148 @@ +{ stdenv, substituteAll, fetchurl +, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi +, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11 +, callPackage, self, gdbm, db, lzma +, python-setup-hook +# For the Python package set +, packageOverrides ? (self: super: {}) +, sourceVersion +, pythonVersion +, sha256 +, passthruFun +}: + +assert zlibSupport -> zlib != null; + +with stdenv.lib; + +let + isPy3k = substring 0 1 pythonVersion == "3"; + passthru = passthruFun rec { + inherit self sourceVersion pythonVersion packageOverrides; + implementation = "pypy"; + libPrefix = "pypy${pythonVersion}"; + executable = "pypy${if isPy3k then "3" else ""}"; + pythonForBuild = self; # No cross-compiling for now. + sitePackages = "site-packages"; + }; + pname = passthru.executable; + version = with sourceVersion; "${major}.${minor}.${patch}"; + pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); + +in with passthru; stdenv.mkDerivation rec { + inherit pname version; + + src = fetchurl { + url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db + ] ++ optionals isPy3k [ + lzma + ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ + stdenv.cc.libc + ] ++ optionals zlibSupport [ + zlib + ]; + + hardeningDisable = optional stdenv.isi686 "pic"; + + C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = makeLibraryPath buildInputs; + LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); + + patches = [ + (substituteAll { + src = ./tk_tcl_paths.patch; + inherit tk tcl; + tk_dev = tk.dev; + tcl_dev = tcl; + tk_libprefix = tk.libPrefix; + tcl_libprefix = tcl.libPrefix; + }) + ]; + + postPatch = '' + substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" + + # hint pypy to find nix ncurses + substituteInPlace pypy/module/_minimal_curses/fficurses.py \ + --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \ + --replace "libraries=['curses']" "libraries=['ncurses']" + + sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py + ''; + + buildPhase = '' + ${pythonForPypy.interpreter} rpython/bin/rpython \ + --make-jobs="$NIX_BUILD_CORES" \ + -Ojit \ + --batch pypy/goal/targetpypystandalone.py + ''; + + setupHook = python-setup-hook sitePackages; + + doCheck = true; + checkPhase = let + disabledTests = [ + # disable shutils because it assumes gid 0 exists + "test_shutil" + # disable socket because it has two actual network tests that fail + "test_socket" + ] ++ optionals (!isPy3k) [ + # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) + "test_urllib2net" + "test_urllibnet" + "test_urllib2_localnet" + ] ++ optionals isPy3k [ + # disable asyncio due to https://github.com/NixOS/nix/issues/1238 + "test_asyncio" + # disable os due to https://github.com/NixOS/nixpkgs/issues/10496 + "test_os" + # disable pathlib due to https://bitbucket.org/pypy/pypy/pull-requests/594 + "test_pathlib" + # disable tarfile because it assumes gid 0 exists + "test_tarfile" + ]; + in '' + export TERMINFO="${ncurses.out}/share/terminfo/"; + export TERM="xterm"; + export HOME="$TMPDIR"; + + ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${concatStringsSep " or " disabledTests})' lib-python + ''; + + installPhase = '' + mkdir -p $out/{bin,include,lib,${executable}-c} + + cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c + cp lib${executable}-c.so $out/lib/ + ln -s $out/${executable}-c/${executable}-c $out/bin/${executable} + + # other packages expect to find stuff according to libPrefix + ln -s $out/${executable}/include $out/include/${libPrefix} + ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} + + # verify cffi modules + $out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + ''; + + inherit passthru; + enableParallelBuilding = true; # almost no parallelization without STM + + meta = with stdenv.lib; { + homepage = http://pypy.org/; + description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix new file mode 100644 index 0000000000000000000000000000000000000000..ee556ba05bf5548df3ac5a34a2aac7d340fb40c1 --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -0,0 +1,123 @@ +{ stdenv +, fetchurl +, python-setup-hook +, self +, which +# Dependencies +, bzip2 +, zlib +, openssl +, expat +, libffi +, ncurses +, tcl +, tk +# For the Python package set +, packageOverrides ? (self: super: {}) +, sourceVersion +, pythonVersion +, sha256 +, passthruFun +}: + +# This version of PyPy is primarily added to speed-up translation of +# our PyPy source build when developing that expression. + +with stdenv.lib; + +let + isPy3k = majorVersion == "3"; + passthru = passthruFun rec { + inherit self sourceVersion pythonVersion packageOverrides; + implementation = "pypy"; + libPrefix = "pypy${pythonVersion}"; + executable = "pypy${if isPy3k then "3" else ""}"; + pythonForBuild = self; # Not possible to cross-compile with. + sitePackages = "site-packages"; + }; + pname = "${passthru.executable}_prebuilt"; + version = with sourceVersion; "${major}.${minor}.${patch}"; + + majorVersion = substring 0 1 pythonVersion; + + setupHook = python-setup-hook sitePackages; + + deps = [ + bzip2 + zlib + openssl + expat + libffi + ncurses + tcl + tk + ]; + +in with passthru; stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url= "https://bitbucket.org/pypy/pypy/downloads/pypy${majorVersion}-v${version}-linux64.tar.bz2"; + inherit sha256; + }; + + buildInputs = [ which ]; + + installPhase = '' + mkdir -p $out/lib + echo "Moving files to $out" + mv -t $out bin include lib-python lib_pypy site-packages + + mv $out/bin/libpypy*-c.so $out/lib/ + + rm $out/bin/*.debug + + echo "Patching binaries" + interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf))) + patchelf --set-interpreter $interpreter \ + --set-rpath $out/lib \ + $out/bin/pypy* + + pushd $out + find {lib,lib_pypy*} -name "*.so" -exec patchelf --replace-needed "libbz2.so.1.0" "libbz2.so.1" {} \; + find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps} {} \; + + echo "Removing bytecode" + find . -name "__pycache__" -type d -depth -exec rm -rf {} \; + popd + ''; + + doInstallCheck = true; + + # Check whether importing of (extension) modules functions + installCheckPhase = let + modules = [ + "ssl" + "sys" + "curses" + ] ++ optionals (!isPy3k) [ + "Tkinter" + ] ++ optionals isPy3k [ + "tkinter" + ]; + imports = concatMapStringsSep "; " (x: "import ${x}") modules; + in '' + echo "Testing whether we can import modules" + $out/bin/${executable} -c '${imports}' + ''; + + setupHook = python-setup-hook sitePackages; + + donPatchElf = true; + dontStrip = true; + + inherit passthru; + + meta = with stdenv.lib; { + homepage = http://pypy.org/; + description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; + +} \ No newline at end of file diff --git a/pkgs/development/interpreters/python/pypy/2.7/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch similarity index 100% rename from pkgs/development/interpreters/python/pypy/2.7/tk_tcl_paths.patch rename to pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch 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 0000000000000000000000000000000000000000..762ca2bdd34be4b182c0c47c1390aa36c0249dff --- /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 0000000000000000000000000000000000000000..9292a93070309816d35e7f974418bba0571e4fc8 --- /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/wrap-python.nix b/pkgs/development/interpreters/python/wrap-python.nix index 1efd777bb0527768725e76eeeca7639973bbdd68..6a19a215241907b6bcdfeb237e276b2845b4d5df 100644 --- a/pkgs/development/interpreters/python/wrap-python.nix +++ b/pkgs/development/interpreters/python/wrap-python.nix @@ -7,9 +7,10 @@ with lib; makeSetupHook { deps = makeWrapper; - substitutions.libPrefix = python.libPrefix; + substitutions.sitePackages = python.sitePackages; substitutions.executable = python.interpreter; - substitutions.python = python; + substitutions.python = python.pythonForBuild; + substitutions.pythonHost = python; substitutions.magicalSedExpression = let # Looks weird? Of course, it's between single quoted shell strings. # NOTE: Order DOES matter here, so single character quotes need to be diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index 01b573e6ad5d870e5665a3a6e7a93a0e87b4d253..b2d65422db459c6733ca92713f4ff77a8e139927 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -16,8 +16,8 @@ buildPythonPath() { declare -A pythonPathsSeen=() program_PYTHONPATH= program_PATH= - pythonPathsSeen["@python@"]=1 - addToSearchPath program_PATH @python@/bin + pythonPathsSeen["@pythonHost@"]=1 + addToSearchPath program_PATH @pythonHost@/bin for path in $pythonPath; do _addToPythonPath $path done @@ -53,7 +53,13 @@ wrapPythonProgramsIn() { # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which # Python to use besides one with this hook anyway. if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then - sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^" + sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#!@executable@^" + fi + + if head -n1 "$f" | grep -q '#!.*'; then + # Cross-compilation hack: ensure shebangs are for the host + echo "Rewriting $(head -n 1 $f) to #!@pythonHost@" + sed -i "$f" -e "1 s^#!@python@^#!@pythonHost@^" fi # catch /python and /.python-wrapped @@ -92,7 +98,7 @@ _addToPythonPath() { pythonPathsSeen[$dir]=1 # addToSearchPath is defined in stdenv/generic/setup.sh. It will have # the effect of calling `export program_X=$dir/...:$program_X`. - addToSearchPath program_PYTHONPATH $dir/lib/@libPrefix@/site-packages + addToSearchPath program_PYTHONPATH $dir/@sitePackages@ addToSearchPath program_PATH $dir/bin # Inspect the propagated inputs (if they exist) and recur on them. @@ -113,9 +119,9 @@ createBuildInputsPth() { if $(echo -n $x |grep -q python-recursive-pth-loader); then continue fi - if test -d "$x"/lib/@libPrefix@/site-packages; then - echo $x/lib/@libPrefix@/site-packages \ - >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth + if test -d "$x"/@sitePackages@; then + echo $x/@sitePackages@ \ + >> "$out"/@sitePackages@/${name}-nix-python-$category.pth fi done fi diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 8d4e68bf57cae090d628daa9bd16318cabac0fd2..27d01e4e1f51dc2c7f572139f16eac5396b1c04a 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 1f2a28cb8fb8ed047e48152c860115a3d062d570..2d4008d69b98397733502b27e2d219cebf3e6e35 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,11 +1,16 @@ { 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 , CoreFoundation , gsettings-desktop-schemas +, wrapGAppsHook }: let @@ -36,7 +41,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "7.0"; # always change at once with ./minimal.nix + version = "7.2"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { @@ -45,7 +50,7 @@ stdenv.mkDerivation rec { } )) { inherit name; - sha256 = "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a"; + sha256 = "12cq0kiigmf9bxb4rcgxdhwc2fcdwvlyb1q3f8x4hswcpgq1ybg4"; }; FONTCONFIG_FILE = fontsConf; @@ -55,16 +60,20 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; preConfigure = '' unset AR - for f in src/configure src/racket/src/string.c; do + for f in src/lt/configure src/cs/c/configure src/racket/src/string.c; do substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname done mkdir src/build cd src/build + + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) ''; shared = if stdenv.isDarwin then "dylib" else "shared"; @@ -76,13 +85,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - postInstall = '' - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}" \ - --prefix XDG_DATA_DIRS ":" "$GSETTINGS_SCHEMAS_PATH"; - done - ''; meta = with stdenv.lib; { description = "A programmable programming language"; @@ -98,6 +100,7 @@ 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" ]; + broken = stdenv.isDarwin; # No support yet for setting FFI lookup path }; } diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index ba4e94cbf13f8945a4351a1473ad6a62fe5ea222..0710c4e2d2a6bffc97b5d41d7061f920959eccec 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 = "01wsiyqfiiwn2n4xxk8d8di92l2ng7yhc4bfmgrvkgaqzy3zfhhx"; }; meta = oldAttrs.meta // { @@ -15,5 +15,6 @@ racket.overrideAttrs (oldAttrs: rec { and the pkg library are still bundled. ''; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + broken = false; # Minimal build does not require working FFI }; }) diff --git a/pkgs/development/interpreters/regina/default.upstream b/pkgs/development/interpreters/regina/default.upstream index 7b3c6905a1caa333ce5de3265110fc4d1c2f9a22..481d9848f8301e99606f639a00f48b5053470946 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 4dff7e6974ef4eb139e5494b556527931ca52d85..947f058090343c635f6d1a4db3b9215de6518ab3 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 9e6d35b818f406611cc04ecd52583c7fb5dad6d7..2a2392011d13a6fda2b9370b2259b1ed2c275f7e 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -32,7 +32,7 @@ let generic = { version, sha256 }: let ver = version; tag = ver.gitTag; - isRuby25 = ver.majMin == "2.5"; + atLeast25 = lib.versionAtLeast ver.majMin "2.5"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( { stdenv, buildPackages, lib @@ -56,7 +56,7 @@ let rev = tag; sha256 = sha256.git; } else fetchurl { - url = "http://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz"; + url = "https://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz"; sha256 = sha256.src; }; in @@ -73,20 +73,17 @@ let # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. NROFF = if docSupport then "${groff}/bin/nroff" else null; - nativeBuildInputs = - ops useRailsExpress [ autoreconfHook bison ] - ++ ops (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.ruby - ]; + nativeBuildInputs = [ autoreconfHook bison ] + ++ (op docSupport groff) + ++ op (stdenv.buildPlatform != stdenv.hostPlatform) buildPackages.ruby; buildInputs = (op fiddleSupport libffi) ++ (ops cursesSupport [ ncurses readline ]) - ++ (op docSupport groff) ++ (op zlibSupport zlib) ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) - ++ (op isRuby25 autoconf) + ++ (op atLeast25 autoconf) # Looks like ruby fails to build on darwin without readline even if curses # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're @@ -109,10 +106,10 @@ let popd ''; - postPatch = if isRuby25 then '' + postPatch = if atLeast25 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' @@ -149,7 +146,7 @@ let postInstall = '' # Update rubygems pushd rubygems - ${buildRuby} setup.rb + ${buildRuby} setup.rb --destdir $GEM_HOME popd # Remove unnecessary groff reference from runtime closure, since it's big @@ -202,26 +199,34 @@ 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 = "0v4442aqqlzxwc792kbkfs2k61qg97r680is6gx20z63a8wd0a4q"; + git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2"; + }; + }; + + ruby_2_6 = generic { + version = rubyVersion "2" "6" "1" ""; sha256 = { - src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s"; - git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj"; + src = "1f0w37jz2ryvlx260rw3s3wl0wg7dkzphb54lpvrqg90pfvly0hp"; + git = "07gp7df1izw9rdbp9ciw4q5kq8icx3zd5w1xrhwsw0dfbsmmnsrj"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index ca180b3c2294fb99663a7454e0a297318f237e65..fae76c7061216e85607ba81b148808b9b293bf83 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,19 +1,21 @@ { 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" ]; + "2.6.1" = ops useRailsExpress [ # no Rails Express patchset yet (2019-01-30) + ]; } diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 4663719558681501c152e20af2ec2ce68c847755..9c81b230ada2f7266d48f160f3444d5ee35cb63a 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # so the failure of that test does not matter much. configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [ - "--with-cpu-arch=armv5t" + "--with-cpu-arch=armv5t" "--disable-tracejit" ]; # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 @@ -59,9 +59,6 @@ stdenv.mkDerivation rec { preCheck = '' rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 - - paxmark mr shell/js - paxmark mr jsapi-tests/jsapi-tests ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix deleted file mode 100644 index e2eef0fab695f98e21cb5b55dcfd2f0eb0d10948..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi -, enableReadline ? (!stdenv.isDarwin), readline -, libobjc }: - -stdenv.mkDerivation rec { - version = "17.0.0"; - name = "spidermonkey-${version}"; - - src = fetchurl { - url = "mirror://mozilla/js/mozjs${version}.tar.gz"; - sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"; - }; - - outputs = [ "out" "dev" "lib" ]; - - propagatedBuildInputs = [ nspr ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl python2 zip libffi readline ] - ++ stdenv.lib.optional enableReadline readline - ++ stdenv.lib.optional stdenv.isDarwin libobjc; - - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; - - patches = [ - (fetchurl { - name = "jsoptparse-gcc7.patch"; - url = "https://src.fedoraproject.org/cgit/rpms/mozjs17.git/plain/" - + "mozjs17.0.0-gcc7.patch?id=43b846629a299f"; - sha256 = "17plyaq0jwf9wli4zlgvh4ri3zyk6nj1fiakh3wnd37nsl90raf9"; - }) - ]; - patchFlags = "-p3"; - - postPatch = '' - # Fixes an issue with version detection under perl 5.22.x - sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl - '' + stdenv.lib.optionalString stdenv.isAarch64 '' - patch -p1 -d ../.. < ${./aarch64-double-conversion.patch} - patch -p1 -d ../.. < ${./aarch64-48bit-va-fix.patch} - ''; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - export LIBXUL_DIST=$out - ''; - - setOutputFlags = false; - configureFlags = [ - "--libdir=$(lib)/lib" - "--includedir=$(dev)/include" - "--enable-threadsafe" - "--with-system-nspr" - "--with-system-ffi" - (if enableReadline then "--enable-readline" else "--disable-readline") - ]; - - # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 - preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; - - enableParallelBuilding = true; - - doCheck = true; - preCheck = '' - rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 - - # Test broken on ARM. Fedora disables it. - # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html - echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls - - '' + stdenv.lib.optionalString stdenv.isLinux '' - paxmark m shell/js17 - paxmark mr jsapi-tests/jsapi-tests - ''; - - postInstall = '' - rm "$lib"/lib/*.a # halve the output size - moveToOutput "bin/js*-config" "$dev" # break the cycle - ''; - - meta = with stdenv.lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; - # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/interpreters/spidermonkey/31.nix b/pkgs/development/interpreters/spidermonkey/31.nix deleted file mode 100644 index e64ab1b39a7cf83efdaa55a12c7f3506bc16e91a..0000000000000000000000000000000000000000 --- a/pkgs/development/interpreters/spidermonkey/31.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, nspr, icu, readline }: - -stdenv.mkDerivation rec { - version = "31.5.0"; - name = "spidermonkey-${version}"; - - # the release notes point to some guys home directory, see - # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/31 - # probably it would be more ideal to pull a particular tag/revision - # from the mercurial repo - src = fetchurl { - url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-31.5.0.tar.bz2"; - sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd"; - }; - - buildInputs = [ libffi readline nspr icu ]; - nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; - - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; - - preConfigure = '' - export CXXFLAGS="-fpermissive" - export LIBXUL_DIST=$out - ''; - - configureFlags = [ - "--enable-threadsafe" - "--with-system-ffi" - "--with-system-nspr" - "--with-system-icu" - "--enable-readline" - - # enabling these because they're wanted by 0ad. They may or may - # not be good defaults for other uses. - "--enable-gcgenerational" - "--enable-shared-js" - - # Due to a build-system bug, this means the exact opposite of what it says. - # It is required by gcgenerational. - "--disable-exact-rooting" - ]; - - # This addresses some build system bug. It's quite likely to be safe - # to re-enable parallel builds if the source revision changes. - enableParallelBuilding = false; - - postFixup = '' - # The headers are symlinks to a directory that doesn't get put - # into $out, so they end up broken. Fix that by just resolving the - # symlinks. - for i in $(find $out -type l); do - cp --remove-destination "$(readlink "$i")" "$i"; - done - ''; - - meta = with stdenv.lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; - # TODO: MPL/GPL/LGPL tri-license. - - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 133679495a5970a42ec6999e54b1c410243c55b4..d48cf841b04871f30c9ae583d53ab2f6a903d4b2 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -2,16 +2,12 @@ , libobjc }: stdenv.mkDerivation rec { - version = "38.2.1.rc0"; + version = "38.8.0"; name = "spidermonkey-${version}"; - # the release notes point to some guys home directory, see - # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38 - # probably it would be more ideal to pull a particular tag/revision - # from the mercurial repo src = fetchurl { - url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-${version}.tar.bz2"; - sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681"; + url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2"; + sha256 = "10lrync6cxnjlnadc0j3vg8r2dq9b3wwanw8qj1h6ncxwb7asxcl"; }; buildInputs = [ libffi readline icu zlib nspr ] diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 7c6844fdec09c383982fb3fcbaf0dd9285e1b11b..ea96e5ed334a91bef876f6836baf87e4e3c95372 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 @@ -49,6 +53,12 @@ in stdenv.mkDerivation rec { 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 0000000000000000000000000000000000000000..1dfaf9a22860ccc472c6c96aee5950b8bbd48ba1 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip +, which, readline, zlib, icu }: + +let + version = "60.4.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 = "11gzxd82grc3kg1ha4yni6ag6b97n46qycvv6x15s91ziia5hli0"; + }; + + buildInputs = [ readline zlib icu ]; + 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 + ''; + + configureFlags = [ + "--with-system-zlib" + "--with-system-icu" + "--with-intl-api" + "--enable-readline" + "--enable-shared-js" + "--enable-posix-nspr-emulation" + "--disable-jemalloc" + # Fedora and Arch disable optimize, but it doesn't seme to be necessary + # It turns on -O3 which some gcc version had a problem with: + # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e + "--enable-optimize" + "--enable-release" + ]; + + # Remove unnecessary static lib + preFixup = '' + rm $out/lib/libjs_static.ajs + ''; + + 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 2737fd6fae0434079d8dcf394985423e8b0d634d..c16b57dcb9c5f5b78ee54cf5122249dbbef0fbdc 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/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index a472ccaafbf2dc404fd254148cdfe1dfb8e2ed73..11c02acf1de3dc7b3271d91bbca2153d2eb9f4b0 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -15,15 +15,19 @@ stdenv.mkDerivation rec { setOutputFlags = false; preConfigure = '' - # Note: using $out instead of $man to prevent a runtime dependency on $man. - configureFlagsArray+=(--mandir=$out/share/man --enable-man-symlinks) - - # Don't install tzdata because NixOS already has a more up-to-date copy. - configureFlagsArray+=(--with-tzdata=no) - cd unix ''; + configureFlags = [ + "--enable-threads" + # Note: using $out instead of $man to prevent a runtime dependency on $man. + "--mandir=${placeholder "out"}/share/man" + "--enable-man-symlinks" + # Don't install tzdata because NixOS already has a more up-to-date copy. + "--with-tzdata=no" + "tcl_cv_strtod_unbroken=ok" + ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"; + enableParallelBuilding = true; postInstall = '' @@ -36,7 +40,7 @@ stdenv.mkDerivation rec { homepage = http://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ wkennington vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; passthru = rec { diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f2c5fd938cec39e364808fc8960e52c40399e7c2 --- /dev/null +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "tinyscheme-${version}"; + version = "1.41"; + + src = fetchurl { + url = "mirror://sourceforge/tinyscheme/${name}.tar.gz"; + sha256 = "168rk4zrlhsknbvldq2jsgabpwlqkx6la44gkqmijmf7jhs11h7a"; + }; + + patchPhase = '' + substituteInPlace scheme.c --replace "init.scm" "$out/lib/init.scm" + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp init.scm $out/lib + cp scheme $out/bin/tinyscheme + ''; + + meta = with stdenv.lib; { + description = "Lightweight Scheme implementation"; + longDescription = '' + TinyScheme is a lightweight Scheme interpreter that implements as large a + subset of R5RS as was possible without getting very large and complicated. + ''; + homepage = http://tinyscheme.sourceforge.net/; + license = licenses.bsdOriginal; + maintainers = [ maintainers.ebzzry ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..cf0fad18d1ca4fd46b3df56df6db2d2894e25234 --- /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 0000000000000000000000000000000000000000..3144dd898374e9f6ad3162fa09ff26a770dca14a --- /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/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..c67d72705482cd4090a7279027b1d78a682d2830 --- /dev/null +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchMavenArtifact }: + +stdenv.mkDerivation rec { + name = "postgresql-jdbc-${version}"; + version = "42.2.5"; + + src = fetchMavenArtifact { + artifactId = "postgresql"; + groupId = "org.postgresql"; + sha256 = "1p0cbb7ka41xxipzjy81hmcndkqynav22xyipkg7qdqrqvw4dykz"; + inherit version; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + install -m444 -D $src/share/java/*postgresql-${version}.jar $out/share/java/postgresql-jdbc.jar + ''; + + meta = with stdenv.lib; { + homepage = https://jdbc.postgresql.org/; + description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; + license = licenses.bsd2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 23a539491d0e26e5258d60903606fde6e3b8fddc..787c54c1b0a3a663753c6457d2b17082061ecc61 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 7bbb1a5e1c92e54bbf1e5583aadf9bd861c90161..e2ff66a47084435f40ae9a7238fd9e84bb099f96 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 7d8f5b2caee659c0ab0b85993dc1f07fe5618e82..d82b25fb8926e518ed30e0cfcd4c640dffd37d00 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 +, openglSupport ? libGLSupported, libGL +, alsaSupport ? stdenv.isLinux, alsaLib +, x11Support ? !stdenv.isCygwin, libX11, xorgproto, 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" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ./find-headers.patch ]; - nativeBuildInputs = [ pkgconfig pruneLibtoolFiles ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # Propagated for #include in SDL_opengles.h. ++ optional openglSupport libGL # Propagated for #include and in SDL_syswm.h. - ++ optionals x11Support [ libX11 xproto ]; + ++ optionals x11Support [ libX11 xorgproto ]; dlopenBuildInputs = [ ] ++ optional alsaSupport alsaLib @@ -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 17a2dd14b272fa3b5dc3d43f430dca54ee036caa..5ab4a0dc6c7fb8c2f09230f9257e16a29281b772 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 3819aeb3c316c1f2d08c9971403035ea01cb74be..61e15d621bcd5c2af6d7f861d91b86131ec0e398 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 2a009a3b7104a0ff4d6f6ee803469081a1fa6021..0e717c53035732fccf95c69304f0989ef88db58a 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 0a7f02f17e593ce439a52be7efe10d4b77a86f45..3e496b7e981fdf091c7c54e6a726ca0ec6ebce8a 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/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index ef1307c971124549397d7f2330654e5b0c992a94..5ff5e609723ee0c5cd1925d9164c52569b81d780 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2"; }; + configureFlags = [ + "--enable-shared" + ]; + # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686 # which can also be fixed with # hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic"; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 36d7912d0f8a86855fc07a7432acc76813de0bc1..b42240a26c4edc4ea9085828c194c2814a312a02 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 f26f5c73822729e4e1a9ef40f0a20f9038e4076e..ef1a59b0249fddbff110e63ea6c170b125323c85 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 a1741513642fbad52921fc37aa99537b4f4fa428..27997540c0627e4f465bd12150992b0d86e5a9fa 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.3"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "1vwhyk0lrpnn78xx212d16lf7vl2q6651wc8vxqbd296x6wbnh2y"; + sha256 = "06lvy5ylcg4vsc58p1yqr5607n542a57n0whpchmrlab74bagmmi"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index f9bb982a7842a68d689aa89576bf4d03681f1c03..4b280cc186217478f667acda0c6afc16242c38f5 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, attr }: stdenv.mkDerivation rec { - name = "acl-2.2.52"; + name = "acl-2.2.53"; src = fetchurl { - url = "mirror://savannah/acl/${name}.src.tar.gz"; - sha256 = "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p"; + url = "mirror://savannah/acl/${name}.tar.gz"; + sha256 = "1ir6my3w74s6nfbgbqgzj6w570sn0qjf3524zx8xh67lqrjrigh6"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -22,12 +22,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ZIP=gzip" "ECHO=echo" "SED=sed" "AWK=gawk" ]; - - 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/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 0f0e30ef0f3b4b52610ace6ec0e9a4e50a77c0a3..76e49768d53dca2fabf9a1141d3f28f213c83a5b 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure"; - # http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details. + # https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details. doCheck = false; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index a1c466605228ec702a65e93ae0acc61e6675441e..5ccb7f95ee19e42b35031a8f215416758ee8ae6d 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/aften/default.nix b/pkgs/development/libraries/aften/default.nix index fb16c71fd1954057c8c144efddb81fc4ff6145cc..22e91ee61d7a16805bcbb07f167b5cf60f0b3ab9 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; homepage = "http://aften.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index ce25521ad2e551e7c4ab7d60da044ad01aabc745..3ab4ed3e9623392f66d2cf7324c3c557ee3333f0 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 bd4270e8b9358f0e59567ed9642ff01af0f55df4..276e1531acdd5f77c8ff57473f727e81beb05907 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.17"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "0kqfx6742vbyyr8glqm5bkvj0z0y0dkaajlw10p3pzidrc17767r"; + sha256 = "05c5zgj9fcaqz7z2l70jh48b3g4811vm7bccj0vd9r82wi02g3p1"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 015c48d01411f91c8c17e61a32d91be506452216..48ca86aaa4b7bd6f498331af4b4077fb2918c4ec 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.10"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "1xmndhcliz25cgdzb7ybkvb05w4klmngpk76fzghamwyi79zfs2c"; + sha256 = "186wwlbz90gmzr4vsykk4z8bgkd45yhbyfpn8bqwidf9fcimcr2a"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 5e82a1a3c6be88d360f2aacd388e32a986021e5f..9f8ca69a70f1c2d1dd176d7d8f9c99d2c81b5e2e 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto +{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac -, inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora +, libXxf86dga, libXxf86misc +, libXxf86vm, openal, libGLU_combined, libjpeg, flac +, libXi, libXfixes, freetype, libopus, libtheora , physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs , libXdmcp }: @@ -19,16 +19,24 @@ stdenv.mkDerivation rec { }; buildInputs = [ - texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor + texinfo libXext xorgproto libX11 libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined - kbproto libjpeg flac - inputproto libXi fixesproto libXfixes + libXxf86vm openal libGLU_combined + libjpeg flac + libXi libXfixes enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp libpulseaudio libpthreadstubs ]; - patchPhase = '' + patches = [ + # fix compilation with mesa 18.2.5 + (fetchpatch { + url = "https://github.com/liballeg/allegro5/commit/a40d30e21802ecf5c9382cf34af9b01bd3781e47.patch"; + sha256 = "1f1xlj5y2vr6wzmcz04s8kxn8cfdwrg9kjlnvpz9dix1z3qjnd4m"; + }) + ]; + + postPatch = '' sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c ''; diff --git a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch b/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch new file mode 100644 index 0000000000000000000000000000000000000000..c49ebb550f3f27b8cae10c75142882963e2bd4b6 --- /dev/null +++ b/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch @@ -0,0 +1,26 @@ +--- a/addons/allegrogl/include/alleggl.h ++++ b/addons/allegrogl/include/alleggl.h +@@ -63,9 +63,11 @@ typedef __int64 INT64; + /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ + #define __glext_h_ + #define __glxext_h_ ++#define __glx_glxext_h_ + #include + #undef __glext_h_ + #undef __glxext_h_ ++#undef __glx_glxext_h_ + + #endif /* ALLEGRO_MACOSX */ + +--- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h ++++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h +@@ -1,7 +1,9 @@ + /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ + #define __glxext_h_ ++#define __glx_glxext_h_ + #include + #undef __glxext_h_ ++#undef __glx_glxext_h_ + + #ifndef GLX_VERSION_1_3 + #define AGLX_VERSION_1_3 diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 21d9ce23d319b63c1e4a354a53af7c13421d9232..eca32b740e35718a15b3e6ba09d87918c86c24e7 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto +{ stdenv, fetchurl, texinfo, libXext, xorgproto, libX11 , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined }: +, libXxf86dga, libXxf86misc +, libXxf86vm, openal, libGLU_combined }: stdenv.mkDerivation rec { name = "allegro-${version}"; 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"; }; patches = [ + ./allegro4-mesa-18.2.5.patch ./nix-unstable-sandbox-fix.patch ]; buildInputs = [ - texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor + texinfo libXext xorgproto libX11 libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined + libXxf86vm openal libGLU_combined ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 39b3d6aba6bd872f1e571ef42f79d2cec3fa81ae..9569f51ba7924fd4380a5e47e81c376e73f09567 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.12"; + 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 = "0kqhm3j0nmf9pp9mpykzs2hg3nr6126ibrq1ap21hpasnq4rzlax"; + 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 5e4218852e5187e9e09001a83d69251443d111cd..5b9b4beed7ab3191691b60c25bf7ea28a8a36e59 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.5"; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; - sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb"; + sha256 = "1h68raflp04r79c58vyy3mmcixs5bqffm2d1js7mxfypmi4mvv6r"; }; 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 4e2de01e9adb9d3f1f4f6e869eef0862f76195d1..87563d6a9cbf1e86e7189dd8f5b4a6a93d3b4181 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, apr, expat, gnused , sslSupport ? true, openssl -, bdbSupport ? false, db +, bdbSupport ? true, db , ldapSupport ? !stdenv.isCygwin, openldap , libiconv , cyrus_sasl, autoreconfHook @@ -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 705f61445b59f1beec8f50fdb431279e8613997c..ea84609868cf1916d8cfde7dde53e76d449590c8 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 0000000000000000000000000000000000000000..dc98de1c2cb6e5fc948388b486570abd7b29f792 --- /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 bca519c762833b48e827cb45195ef6b98f1c04e2..4c34e40586f32a7e84d86c3fa16292e070feaccd 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.16.0"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = "${pname}"; rev = "${version}"; - sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554"; + sha256 = "0478671wfwy3gl26sbxh1jq1ih36z4k72waa8y2y2lvn649gb7cd"; }; 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 a281e2a085febc3cd71a934220c7149e7f1185c4..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..f14c77f666bdfb53d53a70ec7f70409fe7d66a69 --- /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 60fafd60ad0b65ccfc2cb6a995523b089ccf9f51..ebef604e1be6cd7f63fd0151eeaf1679a228a09d 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 16ba6b32382a23e6da27d511d1baea3257787727..b006cb403879e3eeca0a376abea95e2972bc14f9 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.7"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby"; + sha256 = "1y3xrchykwddlrnzgf7xjdmbkf6c4gayz92vyrqdyvnlpi07sy72"; }; 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 0000000000000000000000000000000000000000..de9b1986ffedc379357135fd5787047e0780aa19 --- /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 952f7435c0694376584b99ba1ab81552430d58d3..cff960b29a737d66406330d864cb1413b012a401 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,39 +1,73 @@ -{ stdenv, symlinkJoin, fetchurl, boost, brotli, cmake, flatbuffers, gtest, gflags, lz4, python, rapidjson, snappy, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, 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.9.0"; + version = "0.12.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy"; + sha256 = "163s4i2cywq95jgrxbaq48qwmww0ibkq61k1aad4w9z9vpjfgnil"; }; sourceRoot = "apache-arrow-${version}/cpp"; - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost python.pkgs.python python.pkgs.numpy ]; + patches = [ + # patch to fix python-test + ./darwin.patch + ]; + + nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]; + 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 = symlinkJoin { name="gtest-wrap"; paths = [ gtest gtest.dev ]; }; 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_BUILD_TESTS=ON" "-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/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index d62e22fe0e00559581b2001f621b7bf30a6a642f..4e23001fc9f999a101c3d586efc24816822948d9 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -146,11 +146,11 @@ in rec { }; en = buildDict rec { - shortName = "en-2016.06.26-0"; + shortName = "en-2018.04.16-0"; fullName = "English"; src = fetchurl { url = "mirror://gnu/aspell/dict/en/aspell6-${shortName}.tar.bz2"; - sha256 = "1clzsfq2cbgp6wvfr2qwfsd2nziipml5m5vqm45r748wczlxihv1"; + sha256 = "0bxxdzkk9g27plg22y9qzsx9cfjw3aa29w5bmzs561qc9gkp247i"; }; }; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index f1db64cc9ea55923bdeed098f9c6c93488c7c278..2962e099f255076e73630613946c78cbf9c192be 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 d9251c2bdc5d449981e16ba6e40d1354f566524f..cae674809644eb8ea8f93083671b5679b7316643 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 813f8c3c9640be3bbf455590431e49a66894ae85..b56c84f57bd05156193979c4ab9f4328eb7b357e 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/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 9ec9e6284f83ba0da70da496e251d916a030f0a6..5338aa683a7c365a0d8f0caa7c978481d659aa4b 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, atk, glibmm, pkgconfig }: -let - ver_maj = "2.24"; - ver_min = "2"; -in +{ stdenv, fetchurl, atk, glibmm, pkgconfig, gnome3 }: + stdenv.mkDerivation rec { - name = "atkmm-${ver_maj}.${ver_min}"; + pname = "atkmm"; + version = "2.28.0"; src = fetchurl { - url = "mirror://gnome/sources/atkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c"; }; outputs = [ "out" "dev" ]; @@ -19,6 +17,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "C++ wrappers for ATK accessibility toolkit"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index 944f33b7a3f99c44f773e7fab83c4c739a5c8ac5..623864529f0fb6eb4dd7ae2c6bb613c0be86b00a 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -1,23 +1,17 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "attr-2.4.47"; + name = "attr-2.4.48"; src = fetchurl { - url = "mirror://savannah/attr/${name}.src.tar.gz"; - sha256 = "0nd8y0m6awc9ahv0ciiwf8gy54c8d3j51pw9xg7f7cn579jjyxr5"; + url = "mirror://savannah/attr/${name}.tar.gz"; + sha256 = "1rr4adzwax4bzr2c00f06zcsljv5y6p9wymz1g89ww7cb2rp5bay"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; nativeBuildInputs = [ gettext ]; - configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ECHO=echo" "SED=sed" "AWK=gawk" ]; - - installTargets = [ "install" "install-lib" "install-dev" ]; - - patches = if (stdenv.hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null; - postPatch = '' for script in install-sh include/install-sh; do patchShebangs $script @@ -25,7 +19,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/attr/fix-headers-musl.patch b/pkgs/development/libraries/attr/fix-headers-musl.patch deleted file mode 100644 index e969f640eeeff5a278c9e08e9bdbc3b0dfad2cfa..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/attr/fix-headers-musl.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- attr-2.4.47/include/xattr.h -+++ attr-2.4.47/include/xattr.h -@@ -31,33 +31,37 @@ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - - --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - extern int setxattr (const char *__path, const char *__name, -- const void *__value, size_t __size, int __flags) __THROW; -+ const void *__value, size_t __size, int __flags); - extern int lsetxattr (const char *__path, const char *__name, -- const void *__value, size_t __size, int __flags) __THROW; -+ const void *__value, size_t __size, int __flags); - extern int fsetxattr (int __filedes, const char *__name, -- const void *__value, size_t __size, int __flags) __THROW; -+ const void *__value, size_t __size, int __flags); - - extern ssize_t getxattr (const char *__path, const char *__name, -- void *__value, size_t __size) __THROW; -+ void *__value, size_t __size); - extern ssize_t lgetxattr (const char *__path, const char *__name, -- void *__value, size_t __size) __THROW; -+ void *__value, size_t __size); - extern ssize_t fgetxattr (int __filedes, const char *__name, -- void *__value, size_t __size) __THROW; -+ void *__value, size_t __size); - - extern ssize_t listxattr (const char *__path, char *__list, -- size_t __size) __THROW; -+ size_t __size); - extern ssize_t llistxattr (const char *__path, char *__list, -- size_t __size) __THROW; -+ size_t __size); - extern ssize_t flistxattr (int __filedes, char *__list, -- size_t __size) __THROW; -+ size_t __size); - --extern int removexattr (const char *__path, const char *__name) __THROW; --extern int lremovexattr (const char *__path, const char *__name) __THROW; --extern int fremovexattr (int __filedes, const char *__name) __THROW; -+extern int removexattr (const char *__path, const char *__name); -+extern int lremovexattr (const char *__path, const char *__name); -+extern int fremovexattr (int __filedes, const char *__name); - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* __XATTR_H__ */ diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index adcb86cedf844ce2d94914e9a70d98e5479535b9..db5ecf3b01694a84be2ccaa6f0ccc3d5fed50482 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.9"; src = fetchurl { url = "https://aubio.org/pub/${name}.tar.bz2"; - sha256 = "1yvwskahx1bf3x2fvi6cwah1ay11iarh79fjlqz8s887y3hkpixx"; + sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - 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 f28e374c852ace30098a57593fc49ebf24c26350..373d50a0a434be0a96960f309cb38785bdf3175a 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 3df8f5e307894fee190296938d2e02909b255e28..5b98a88a8fb5d1a2466267a334e8481ed707a10a 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 4a632d07006bbe1686ca5b04adc4314766d223fb..81cc868f52ca5ccd5d2b9cbb0ad0cee6114d9541 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 c74c8caa23fd4b3c528bb5f7817e9a6b4c4b3ab2..b6203a159e6ce962c5e0703bdee9507121e7785d 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 6e7cb8d020bdfa3dd5e0de9210e49b3ab26ed5d2..ddd3940098a43215909c03fbe2400a5090258965 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 63e3ae36028b0218355481cd9d7010238289b093..51234a415fd711cabcf691998509e6a7f4826e5c 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 acfbced527207ec266160ead152e3a2dd55c6206..09a6230184af041ad89403703113a8faa78a50ae 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 e29c7b5cb122719e0968ddd33ac8360fcc7113b6..10d650d6642598350de1e777c9f9c10877b031ab 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 e3c0f039477239b60ae3811b56ed85f73376b2a3..320fc41f76c57eec4a8b724d70ca3a0eed5b514a 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 11a06d4f39acec35bb4ceac1f12910be53bc109a..4fc5c12ccc4c64005254e4ac4a117d38a409e237 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 00a0a5082137a5e357771edbe04813ea9e970b42..e9cccab39f020c41a97e04853b800f2dd7b9f639 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 53e3f5468abc86357b4669ecb29fbe68fb26c00a..fc67035ce20453e852f26e09b58fc9c4c232188b 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser +{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv +, gtk3Support ? false, gtk3 ? null , qt4 ? null , qt4Support ? false , withLibdnssdCompat ? false }: @@ -17,14 +18,17 @@ 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 gtk3Support gtk3) ++ (stdenv.lib.optional qt4Support qt4); nativeBuildInputs = [ pkgconfig gettext intltool glib ]; configureFlags = [ "--disable-qt3" "--disable-gdbm" "--disable-mono" - "--disable-gtk" "--disable-gtk3" + "--disable-gtk" + (stdenv.lib.enableFeature gtk3Support "gtk3") "--${if qt4Support then "enable" else "disable"}-qt4" "--disable-python" "--localstatedir=/var" "--with-distro=none" # A systemd unit is provided by the avahi-daemon NixOS module diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9afb03e0d0c60774455a7276a769b08e8541c3c3..a5517a2522dc8fa12bfd69de1e98b92778db3c8c 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib +, CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. customMemoryManagement ? true -, darwin }: let @@ -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 @@ -34,10 +34,10 @@ in stdenv.mkDerivation rec { ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) - (with darwin.apple_sdk.frameworks; [ CoreAudio AudioToolbox ]); + [ CoreAudio AudioToolbox ]; cmakeFlags = - lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" + lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF" ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; @@ -60,6 +60,8 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=noexcept-type" ]; + __darwinAllowLocalNetworking = true; + meta = { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 1e341d3124b410944a5e80115b29622b918f1b98..4c942cac3f699994ceab59ee396dfec5331301ef 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 0a2badea7cbfb6e0d3d65675d02f6f371d3c795f..e741305f9913c38bbabc42fb7883a2c8c1d5178c 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 = [ + glib libgtop - libwnck3 libstartup_notification - glib + libwnck3 ]; # Fix hard-coded path # https://bugs.launchpad.net/bamf/+bug/1780557 postPatch = '' - substituteInPlace data/Makefile.in \ + substituteInPlace data/Makefile.am \ --replace '/usr/lib/systemd/user' '@prefix@/lib/systemd/user' ''; configureFlags = [ "--enable-headless-tests" + "--enable-gtk-doc" ]; # fix paths makeFlags = [ - "INTROSPECTION_GIRDIR=$(dev)/share/gir-1.0/" - "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + "INTROSPECTION_GIRDIR=${placeholder ''dev''}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" ]; + preConfigure = '' + ./autogen.sh + ''; + # TODO: Requires /etc/machine-id doCheck = false; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 02c67d7dbf8b11bfa79e6b43f04e60becc789eea..ba6fc7cb541b1eef580641a515fc852f5bf6a4f2 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -107,5 +107,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ artuuge zimbatm ]; platforms = platforms.linux; + # Requires libdrm_intel + badPlatforms = [ "aarch64-linux" ]; }; } 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 0000000000000000000000000000000000000000..68f5d7afcf49a9e37a8f9ce3d51be9212be847f4 --- /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 da71e40187f4a36d3fec8d657d52feeb723f6b2f..c40fa044cfe44805fbd3ff9502ed43ead9d6f15b 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.2"; 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" + "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" ]; - sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79"; + sha256 = "1jsixcpdwy5cgq5s9fi3bdlid9zh46vakymf3nbjffianyss932f"; }; buildInputs = [ libatomic_ops ]; @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" + 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"; + name = "boehm-gc-7.6.0-sys_select.patch"; + url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch?id=85b6a600996bdd71162b357e9ba93d8559342432"; sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3"; }) ] ++ # https://github.com/ivmai/bdwgc/pull/208 diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix new file mode 100644 index 0000000000000000000000000000000000000000..798db8dd46e41276a5d292a71c0257879c6cab4e --- /dev/null +++ b/pkgs/development/libraries/boost/1.69.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.69_0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_69_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_69_0.html + sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; + }; +}) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 617484e5a403382d5cfa39f416f242af425988d7..dd383bd01231832d24eaa2b3f093be7fa2188354 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,22 +101,19 @@ 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; - maintainers = with maintainers; [ peti wkennington ]; + platforms = (platforms.unix ++ platforms.windows); + badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux"; + maintainers = with maintainers; [ peti ]; }; preConfigure = '' @@ -124,7 +136,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 +169,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 b64cdd5245fd3c309e66dedb3aaca8fbec23b57f..3c27281571afe9bfeebf24050ab8bb4fd4ae256c 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; platforms = stdenv.lib.platforms.all; + # Build uses `-msse` and `-mfpmath=sse` + badPlatforms = [ "aarch64-linux" ]; }; src = fetchFromGitHub { @@ -23,21 +25,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}"; - - buildInputs = [ premake4 ]; + }) ]; + + # 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 ( ".." )' + ''; - 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 ff48ffe67f0ac82ada7c4509e4df8992bab0047e..9d65fb554ffe19e86cc8f98b4711786b89a33bbe 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/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index e65980be320eb963e04f5e522e831d6278dde33d..102e7bfcc12b5534e2a24b308ed7ac8bf2705547 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xproto, inputproto +{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xorgproto , libXi, pkgconfig }: stdenv.mkDerivation rec { name = "box2d-${version}"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz"; - sha256 = "1dmbswh4x2n5l3c9h0k72m0z4rdpzfy1xl8m8p3rf5rwkvk3bkg2"; + sha256 = "0llpcifl8zbjbpxdwz87drd01m3lwnv82xb4av6kca1xn4w2gmkm"; }; sourceRoot = "Box2D-${version}/Box2D"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - unzip cmake libGLU_combined freeglut libX11 xproto inputproto libXi + unzip cmake libGLU_combined freeglut libX11 xorgproto libXi ]; - cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ]; + cmakeFlags = [ + "-DBOX2D_INSTALL=ON" + "-DBOX2D_BUILD_SHARED=ON" + "-DBOX2D_BUILD_EXAMPLES=OFF" + ]; prePatch = '' substituteInPlace Box2D/Common/b2Settings.h \ diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b4a57396cc8b95370827881ba7abba4cec944ffd --- /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/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index a8555a349d08e41fa5f95b2d9331429e6af70fe0..fb25b0a58108e3a7747af2798be7ddb892d46860 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; patches = [ ./gcc-4.3.3-fixes.patch ]; configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ]; + NIX_LDFLAGS = [ + "-lm" + ]; doCheck = true; meta = { diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 99168fbe9e3ea3ae762b340d7b8f7689ed934733..1e2bda285a70c4f961e88b4f6a15e0cf61eda09c 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwidget-${version}"; - version = "1.9.12"; + version = "1.9.13"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "0qrj8k4zzrnhwgdn5dpa6j0q5j739myhwn60ssnqrzq77sljss1g"; + sha256 = "109s81hzd86vwzs18v4s03asn3l395wl64kd311045p7h0ig9n3n"; }; dontBuild = true; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 1835356e627d7300a0c888630c040b39bd9bd368..9e38398dfad1fe634ea66f09849a9f5257837078 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 397e80961e064b6bd4b9bd64a050219f7505076a..15744744067ccb35749889a495c494ccba564199 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.3"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = "${version}"; - sha256 = "0qmb18k162xdvf8z03mybjazkwb2vqda5xd1qh5bwkvxracwq3sb"; + sha256 = "0nqw1cv7wxbcn2qwm08qffb6k4n3kgvdiaphks5gjgm305jk4vnx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index db46412ceb554006b6e5f7227cb218c97e655d6e..8f7a04cbb68f1761367eed5f5141d30a72e137c0 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 78fcad5c1fe2deaf49c0e9ddf586b347c3ed9a45..b175250872f398a6066ac1b689c66f2d343a98ad 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/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 880a2824fb0a8a6d09314297b271b05b49ca36c3..c02633d880c42b4bd9df679f94fbf7b00ab3568c 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "capstone-${version}"; - version = "3.0.5"; + version = "4.0.1"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "1wbd1g3r32ni6zd9vwrq3kn7fdp9y8qwn9zllrrbk8n5wyaxcgci"; + sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; }; configurePhase = '' patchShebangs make.sh ''; diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 116216d500e25367f999e619c03e1c26872ed5ee..d83060fc24d8c5dd0d7e1d70de27dd407133a68f 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 0000000000000000000000000000000000000000..54f1c459212df38f86f54c2435143ac9dccc0557 --- /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.6.0"; + + src = fetchFromGitHub { + owner = "catchorg"; + repo = "Catch2"; + rev = "v${version}"; + sha256="1p2y6fhxfmb48nl03xdg62nfrwssaaiw10vzr194z6srcj90n2r7"; + }; + + 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 bd83a5c79d55255c18669c45ff7583c2f035436d..db2d177b710c06199e7bcf5da53887e5cea627c2 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 5df7c2279c55fede9241823da9dfe87a0a502342..cd9d031788a89924b0c73d69795dda3395d99aaf 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/check/default.nix b/pkgs/development/libraries/check/default.nix index ddaf022edfd409803dc1220e17d6571abd4f534a..ae8b6ca18df34ddc4767187e531350e072817396 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index ad233402f1982761c9796c3dbfc6eb6937e553e3..f460b69a4f841949b705f987ee7e71981c5c74c9 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xproto -, inputproto, libXi, libXmu +{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xorgproto +, libXi, libXmu }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = - [ freeglut libGLU_combined glfw2 glew libX11 xproto inputproto libXi libXmu ]; + [ freeglut libGLU_combined glfw2 glew libX11 xorgproto libXi libXmu ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 7cb75d8de0f39fd3d63ea573298b1876706c9861..1890d2b25a0dca56cf0e3926e219bbd0de25b48b 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 e39386dca3f43fb473f31b96fc3272c345c4bdfb..7764e9c67ed208e3decc31988e46d112a7fe80f7 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 0db253bbec2639378443edb9061739ef6ec6d94a..6eb310550bcd77a6d127a0422da6a30bb230697b 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -12,7 +12,19 @@ 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" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0" + "-D_CL_HAVE_NAMESPACES_EXITCODE=0" + "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0" + "-D_CL_HAVE_NO_SNWPRINTF_BUG_EXITCODE=0" + "-D_CL_HAVE_TRY_BLOCKS_EXITCODE=0" + "-D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE=0" + "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0" + ]; patches = # From debian [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch @@ -20,15 +32,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 +49,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 b65e794a92aa77791cdf69a5b8eedc58f02b18b0..8451b08537291c97506523df75086dbe0b23fd69 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 a06691d5c715b5a89c37f5cacabe08a64273e341..428114986d1bfa06140a6b9e2365f832590a3ea6 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 9759e4904b2943df395f2df2158583211f89a782..d59bc5161af55968073ada4ab0332e6a03434841 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 d8150fd115085aa0436a855194f0ad6be6af6bfd..7095a808540fbb81a649f9bd7e96df0bf66e4018 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, libinput, libgudev, libxkbcommon +, 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 libinput libgudev libxkbcommon + 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 81df7e8631936328a80c392209fdc94b4a8612c5..a7b604bc0d2e3321e4ca13861b671591c5866881 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 c624f9537fb3f79b3f9dccf08463227d98fa4e8a..e4296810f35f289585f6ecd7ffa97994dad5abab 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl -, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland, gnome3 +, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 , mesa_noglu , gstreamerSupport ? true, gst_all_1 }: @@ -10,7 +10,7 @@ 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"; }; @@ -31,6 +31,8 @@ in stdenv.mkDerivation rec { }) ]; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkgconfig libintl ]; configureFlags = [ @@ -42,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 @@ -73,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 f578cd2f87d5cc1f99944b11d32941f69deebb1d..0c5ab7585833be2e3c782ab6e033dbf400fb4ec9 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 3257dfe5d37c2f8b2cccfd20bac0f3dc0713ba09..0000000000000000000000000000000000000000 --- 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 1f4b43db16c3e1d440b37a126a875c7a2b6996ec..c2f3ce9b9b4a0bf33d852032cfc68edcc0b1f1fb 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/ctl/default.nix b/pkgs/development/libraries/ctl/default.nix index a4f49dea59af020a8f87a0706271bc884a844144..ac6c9657dde64be5a3cd30f2f122065079110fbe 100644 --- a/pkgs/development/libraries/ctl/default.nix +++ b/pkgs/development/libraries/ctl/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation { homepage = http://ampasctl.sourceforge.net; license = "A.M.P.A.S"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; passthru.source = source; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index d50aca1679b883b38f6f0fd155e118b9c8d2a629..fd81de5139d6c5994f3ea94b36ea13ed77a54b03 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 55835cdb63dbca76e7e59aa8e14865414e784e69..5a2a53ef24d5f55d7cd3b3d5c93c2a316656fc1b 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/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 6cb003720bb1224511d3d8df36e4d379eee88bcd..4bc5d7227e17c6a0b023b3ee1ce1ccb6b790fe38 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -1,19 +1,20 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, makeWrapper -, qtbase, libuuid, libcap, uwsgi, grantlee }: +, qtbase, libuuid, libcap, uwsgi, grantlee, pcre +}: stdenv.mkDerivation rec { name = "cutelyst-${version}"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "0iamavr5gj213c8knrh2mynhn8wcrv83x6s46jq93x93kc5127ks"; + sha256 = "092qzam3inmj3kvn1s0ygwf3jcikifzkk5hv02b5ym18nqz1025d"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; - buildInputs = [ qtbase libuuid libcap uwsgi grantlee ]; + buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ]; cmakeFlags = [ "-DPLUGIN_UWSGI=ON" diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index ee646b24c81a35ef4ff5ea17d7717417a1fe3c3b..246dd009820c12cc6572bf3768863b2876397201 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; + NIX_LDFLAGS = [ + "-lbluetooth" + ]; + postInstall = '' # Some programs (for example, cabal-install) have problems with the double 0 sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc 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 0000000000000000000000000000000000000000..8662e812e995639f79948fcda6fd7a2aae38badf --- /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 7a9e3991aadb52540f7f15436f4e864bed57e0b1..7b130d48928e5204761da9e1844a0a3374ea83b7 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,62 +1,48 @@ -{ 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"; + urls = + [ "http://www.cyrusimap.org/releases/${name}.tar.gz" + "http://www.cyrusimap.org/releases/old/${name}.tar.gz" + ]; + 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/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix index 9c9d8513422423fac6176a4154ab928fd7785a9d..d418b879d1ddd3f15606c279e21c85dc5cba55db 100644 --- a/pkgs/development/libraries/czmq/3.x.nix +++ b/pkgs/development/libraries/czmq/3.x.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index 840fa34d6ae1bab919df8aa9ca07988ab74d0ead..32bce3ba4b3565f04d2902b9a92d137cd96dc24d 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 ]; @@ -24,6 +17,5 @@ stdenv.mkDerivation rec { description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 6190f6ddc52a1c0a4c8ff797ef9a848491a5e567..163b0f4be883ddd0fed07a854aef74235e4640da 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus glib expat ]; - configureFlags = [ "--disable-ecore" ]; + configureFlags = [ "--disable-ecore" "--disable-tests" ]; meta = with stdenv.lib; { homepage = http://dbus-cplusplus.sourceforge.net; 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 208288bfca1deda33ab194ee22a5ff67cd5ad85a..0f897d97467f2bc58498a9517f14ee643b834ea4 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 ef1ddd9bfff560b0ca2ea428a8b72190edc46319..cd020317f4c2baff55fb04f42ea8d1d081e3ae6d 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 013913e52972560181a4da6531ccb0bedd2ac973..18ea3ad3ecb75ea868da11e36ffad1a366c57757 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 855dd9f3832ef544ce3514dc62cd93f9146d29cc..14db5baea3fbe5df26a78f23ca8ea5b1f22e9d45 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; @@ -16,12 +16,13 @@ stdenv.mkDerivation rec { # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged # See: https://github.com/NixOS/nixpkgs/pull/46060 - buildInputs = [ mono48 ]; + buildInputs = [ mono4 ]; dontStrip = true; meta = with stdenv.lib; { description = "D-Bus for .NET"; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 3ca2bdd9abef4b62f2aa6b64891f933c092328cd..6d85fe1233cfd41de6b6e4e7100df1cc121c40da 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.12.10"; - sha256 = "1xywijmgfad4m3cxp0b4l6kvypwc53ckmhwwzbrc6n32jwj3ssab"; + version = "1.12.12"; + sha256 = "1y7mxhkw2shd9mi9s62k81lz8npjkrafapr4fyfms7hs04kg4ilm"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index 47f3794f5ad50c9921a351608a407a94430d68de..cd78d6d8a6abaf831fede8241d0d234ace31b7ed 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://github.com/agl/dclxvi; 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 1288f4ac2f57636f244be64a8d2794fcd002672a..fb7ec512319e0982ca75e3514639d0976fe08f88 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/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index fc533c277bb08943b459b49ad7860edac8aae85d..3d831efbcb7de562ae0f6471259fe0cd38c45fa0 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation { buildInputs = [ zlib libjpeg freetype giflib libpng ] ++ stdenv.lib.optional enableSDL SDL ++ stdenv.lib.optionals enableX11 (with xorg; [ - xproto libX11 libXext #xextproto - #renderproto libXrender + xorgproto libX11 libXext + libXrender ]); NIX_LDFLAGS="-lgcc_s"; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index e5e3c2d662c2b81e8357c87e521e08bf4bf1b3fb..a88b3f1b9b68afa657c5699027830b1e29eb5d21 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 7a33559cbc7958fe1712ecb7f5feb7169a7e5766..96375fcd5beba76ff4e547289960219308f490b2 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 0000000000000000000000000000000000000000..edb8c968aae6e59ca548cce9efdc7fd43e533723 --- /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.5"; + + src = fetchFromGitHub { + owner = "CanonicalLtd"; + repo = "dqlite"; + rev = "v${version}"; + sha256 = "0pv7nf4siijlcy5asrl8j1ib3viifk65yzqzckarm2mcl16y7fc3"; + }; + + 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/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index ab25a651844a5e64384732053a8b45aeb2e3afcd..c85f6de0405c7116c3ab0e3a934968c57d0c8524 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "drumstick-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2"; - sha256 = "0avwxr6n9ra7narxc5lmkhdqi8ix10gmif8rpd06wp4g9iv46xrn"; + sha256 = "0kljqyqj7s1i2z52i24x7ail1bywn6dcxxfbad5c59drm8wv94bp"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 49d570c8896a38112dc935c57c4c9d740f2336c0..9be19f51e7e8ec9d98cf4a94891ae4938b8f7743 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ladspaH, libjack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM -, libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig +, libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkgconfig }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ladspaH libjack2 liblo alsaLib qt4 libX11 libsndfile libSM - libsamplerate libtool autoconf automake xproto libICE pkgconfig + libsamplerate libtool autoconf automake xorgproto libICE pkgconfig ]; meta = with stdenv.lib; { @@ -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 8c6337cfaf60aa2acb37e04ee5d42e134d7a28d5..4ca9eab51bbee89ebde270b6bf93ad53855a9177 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.7"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "0l0b8cssxkj0wlfqjj8hfnfvrjcxa81h947d54w86iadrilrsprb"; + sha256 = "0nhszn0yyjwpnv7swm4vqs3i7admgbnifi5dvq5h01fk5nc8yjqz"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 5cd004c8d136f89b3981a1627ef2356f462c0837..c26956f6ea24af40c7c623bb6e751f1d7e0d6198 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.10.0"; src = fetchurl { - url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "0aki7llrdfj6273yjy8yv0d027sdbv8xs3iv68fb69s0clyygrin"; + url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; + sha256 = "1n429najxlq6y76wyx1mbw41b0l4prdhfmy4id9ni8zwm96cp8xy"; }; + 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 d9b5a2b64d6358368ca824e689bf851b6dc28f27..4e228f8f432543e81818d31e6026014175c030b1 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,18 +1,27 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: 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"; }; + patches = [ + # will be in 1.17.0 + (fetchpatch { + name = "redisplay-clear-screen.patch"; + url = "https://github.com/troglobit/editline/commit/a4b67d226829a55bc8501f36708d5e104a52fbe4.patch"; + sha256 = "0dbgdqxa4x9wgr9kx89ql74np4qq6fzdbph9j9c65ns3gnaanjkw"; + }) + ]; + 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 e6d13a5915a10056036b5abe96a4b1a41c092b6f..0000000000000000000000000000000000000000 --- 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 c120132dcb8bab40d80398b369982bb6a9eba036..25d0760a32d12e2dfed05e5b80c55e389a32fef0 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.7"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,16 +9,14 @@ stdenv.mkDerivation { src = fetchurl { url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04"; + sha256 = "1nnh0v82a5xibcjaph51mx06mxbllk77fvihnd5ba0kpl23yz13y"; }; - nativeBuildInputs = [ cmake ]; - - doCheck = false; # a couple of tests fail with "Child aborted" + patches = [ + ./include-dir.patch + ]; - postInstall = '' - sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc - ''; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; diff --git a/pkgs/development/libraries/eigen/include-dir.patch b/pkgs/development/libraries/eigen/include-dir.patch new file mode 100644 index 0000000000000000000000000000000000000000..7f3bd88557ec98b84d088fb9c3a0c9053c496a2d --- /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 48e5b73d9e72e4d3819589273c631e039bba22a3..47b39eeb7e97151063e0ce107bd3dd15ba9e0b7f 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 c51475ecc2a9efdec6708c21686776b2218d6880..dc0967ef61ef2147cfafbc63342d372007188d7c 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 cc62b2776edebaab04f2411c0fc94b8dc5904420..7c3dd19a4795a6b16368c9196417201e001d4df1 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 6f50b9d262b50c33ba07bec1d78904d6bbb791a2..8f38ee27174b6ab9db36ec0e8f29a55446c691f8 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/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix deleted file mode 100644 index 7b40359837a3780940077a2e6bafbf6b5d436a9b..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/esdl/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, SDL, libGLU_combined, rebar, erlang}: - -stdenv.mkDerivation rec { - name = "esdl-1.3.1"; - - src = fetchurl { - url = "mirror://sourceforge/esdl/${name}.src.tgz"; - sha256 = "0f5ad519600qarsa2anmnaxh6b7djzx1dnwxzi4l36pxsq896y01"; - }; - - buildInputs = [ erlang rebar ]; - propagatedBuildInputs = [ SDL libGLU_combined ]; - - buildPhase = '' - rebar compile - ''; - - # 'cp' line taken from Arch recipe - # https://projects.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/erlang-sdl - installPhase = '' - DIR=$out/lib/erlang/lib/${name} - mkdir -p $DIR - cp -ruv c_src doc ebin include priv src $DIR - ''; - - meta = { - homepage = http://esdl.sourceforge.net/; - description = "Erlang binding to SDL that includes a binding to OpenGL"; - license = "BSD"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index ac2c21d4cf0eb47523c9e65f288db95dea8df1df..3bc5270f053783af8b4c62009a91d3e29504fabe 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/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index c26a2a20a81411a79fbd68ddff20cbb711a4c646..ea782fc6986fa9ccf81d9994a8d76519bcfa3094 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -2,38 +2,16 @@ , autoconf }: stdenv.mkDerivation rec { - name = "exiv2-0.26.2018.06.09"; + name = "exiv2-0.26.2018.12.30"; #url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz"; src = fetchFromGitHub rec { owner = "exiv2"; repo = "exiv2"; - rev = "4aa57ad"; - sha256 = "1kblpxbi4wlb0l57xmr7g23zn9adjmfswhs6kcwmd7skwi2yivcd"; + rev = "f5d0b25"; # https://github.com/Exiv2/exiv2/commits/0.26 + sha256 = "1blaz3g8dlij881g14nv2nsgr984wy6ypbwgi2pixk978p0gm70i"; }; - patches = [ - (fetchurl rec { - name = "CVE-2017-9239.patch"; - url = let patchname = "0006-1296-Fix-submitted.patch"; - in "https://src.fedoraproject.org/lookaside/pkgs/exiv2/${patchname}" - + "/sha512/${sha512}/${patchname}"; - sha512 = "3f9242dbd4bfa9dcdf8c9820243b13dc14990373a800c4ebb6cf7eac5653cfef" - + "e6f2c47a94fbee4ed24f0d8c2842729d721f6100a2b215e0f663c89bfefe9e32"; - }) - # Two backports from master, submitted as https://github.com/Exiv2/exiv2/pull/398 - (fetchpatch { - name = "CVE-2018-12264.diff"; - url = "https://github.com/vcunat/exiv2/commit/fd18e853.diff"; - sha256 = "0y7ahh45lpaiazjnfllndfaa5pyixh6z4kcn2ywp7qy4ra7qpwdr"; - }) - (fetchpatch { - name = "CVE-2018-12265.diff"; - url = "https://github.com/vcunat/exiv2/commit/9ed1671bd4.diff"; - sha256 = "1cn446pfcgsh1bn9vxikkkcy1cqq7ghz2w291h1094ydqg6w7q6w"; - }) - ]; - postPatch = "patchShebangs ./src/svn_version.sh"; preConfigure = "make config"; # needed because not using tarball diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 020d04542864a31d6283fb84287add1b915ae67a..e884bb41e20e86ec3585892b41b46a71b2d9859f 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/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 63adb5afd1ca808a0f7714bdee6835c348559c92..de78647dc483c4f9bf089298f8508434acaa7933 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { homepage = http://www.fastcgi.com/; license = "FastCGI see LICENSE.TERMS"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 660cdfa6414b1589d57b36e3c0d49baf2e443071..a37ebe7c5e06df1fdf4f502727ab3cc86ee65361 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, catch2 }: stdenv.mkDerivation rec { name = "fcppt-${version}"; - version = "2.5.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; rev = version; - sha256 = "0pjldwwxgnzjfd04cy29a9mn2szq4v2mjnw0367kxd141q2iglqi"; + sha256 = "0l78fjhy9nl3afrf0da9da4wzp1sx3kcyc2j6b71i60kvk44v4in"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ]; + buildInputs = [ boost catch2 ]; - cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ]; + cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" "-DBrigand_INCLUDE_DIR=${brigand}/include" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 903f43b1e6854519db626118115b58ed147bc96b..9b7cea3ebbcb12caba8f923aec99a61b874c3441 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fdk-aac-${version}"; - version = "0.1.6"; + version = "2.0.0"; src = fetchurl { url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz"; - sha256 = "1bfkpqba0v2jgxqwaf9xsrr63a089wckrir497lm6nbbmi11pdma"; + sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp"; }; configureFlags = [ ] diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index bf7630608f7d9cdac928df48229e853ed5b721e4..2dd58e64585aca9ffe00aa1d32738d2d0cb0d899 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas +, fetchpatch , gmpxx , optimize ? false # impure }: @@ -14,6 +15,15 @@ stdenv.mkDerivation rec { sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl"; }; + patches = [ + # https://github.com/linbox-team/fflas-ffpack/issues/146 + (fetchpatch { + name = "fix-flaky-test-fgemm-check.patch"; + url = "https://github.com/linbox-team/fflas-ffpack/commit/d8cd67d91a9535417a5cb193cf1540ad6758a3db.patch"; + sha256 = "1gnfc616fvnlr0smvz6lb2d445vn8fgv6vqcr6pwm3dj4wa6v3b3"; + }) + ]; + checkInputs = [ gmpxx ]; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 4c1ad34f6da3742a291c09dbdbd64494d9069eac..e0cd1227f7eaec5a336c18754fca17127ca1dc94 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -95,8 +95,9 @@ , libxcbxfixesExtlib ? true # X11 grabbing mouse rendering , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support +, libXext ? null # Xlib support , lzma ? null # xz-utils -, nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support +, nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers , openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code @@ -139,7 +140,7 @@ * Darwin frameworks */ , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, CF +, VideoDecodeAcceleration, cf-private }: /* Maintainer notes: @@ -176,8 +177,6 @@ let inherit (stdenv) isCygwin isFreeBSD isLinux; inherit (stdenv.lib) optional optionals optionalString enableFeature; - - nv-codec-headers = callPackage ./nv-codec-headers.nix { }; in /* @@ -232,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0.2"; + version = "4.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59"; + sha256 = "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3"; }; prePatch = '' @@ -357,7 +356,7 @@ stdenv.mkDerivation rec { (enableFeature (libvorbis != null) "libvorbis") (enableFeature (libvpx != null) "libvpx") (enableFeature (libwebp != null) "libwebp") - (enableFeature (libX11 != null && libXv != null) "xlib") + (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib") (enableFeature (libxcb != null) "libxcb") (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") @@ -410,7 +409,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr + libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib libGLU_combined @@ -433,7 +432,7 @@ stdenv.mkDerivation rec { FILES+=($(ls $out/lib/*.dylib)) for f in ''${FILES[@]}; do if [ ! -h "$f" ]; then - install_name_tool -change ${CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" + install_name_tool -change ${cf-private}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" fi done ''; diff --git a/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix b/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix deleted file mode 100644 index 03599c91bf04f508ab5cf6fce7f160f8d47d33ff..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchgit }: - -stdenv.mkDerivation rec { - name = "nv-codec-headers-${version}"; - version = "n8.1.24.2"; - - src = fetchgit { - url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; - rev = "${version}"; - sha256 = "122i3f6whiz5yp44dhk73ifr1973z8vvfbg4216vb782bl8b5bam"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "ffmpeg nvidia headers for NVENC"; - homepage = http://ffmpeg.org/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.MP2E ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix deleted file mode 100644 index 4eebad6b307d91caf493d160be791823cf4745c5..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.16"; - branch = "0.10"; - sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; - patches = [ ./vpxenc-0.10-libvpx-1.5.patch ]; -}) diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix deleted file mode 100644 index 312eb70fdf20be9076e644a82ff091769429630a..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/ffmpeg/1.2.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "${branch}.12"; - branch = "1.2"; - sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; - patches = [ ./vpxenc-1.2-libvpx-1.5.patch ]; -}) diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index b99c7240daec3b84d3bbab3b2309c92b63ce3fd2..f8343e668a67d7c5446d7d98307fd48cab56c875 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.4"; - sha256 = "0xmcijcpa7b59ws5ycmnp0a3pjmnpgly0zv8yff6if4p7pw7406f"; + branch = "3.4.5"; + sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index b470d45ba43fe1c2ce0b6fc3ecc33a249f938eff..9821357de3b90dad25736083e71b6d6e9221d8e6 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0.2"; - sha256 = "0mnh41j3kzi3x3clai1yhqasr1kc8zvd5cz0283pxhs2bxrm2v1l"; + branch = "4.1"; + sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7d72de2a2dedb2b61fe56b425fa4b17bde69ae38..d11ef732a01f6e9b2c9010180e7f2e6c96ad7e05 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 fb74c4ff4d2441f92ec2f10917cde25c04792e00..504b58b6aa4d7810c9b9d2db8dc3f0dc2d92a174 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 c8cd420f6e7b755c7d1a35f1c6e882b1c66e1e1a..ebf55dcd194c699b0780cb207a2b3c65b4e47d7d 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,26 +1,24 @@ { 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, 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 }: +, 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, gettext, python2, hicolor-icon-theme +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3 }: -let - version = "1.0.2"; - desktop_schemas = gnome3.gsettings-desktop-schemas; -in stdenv.mkDerivation rec { - name = "flatpak-${version}"; +stdenv.mkDerivation rec { + pname = "flatpak"; + version = "1.1.3"; # 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 = "0d0nnymb4p3njc24j0p6f74x7cdfi7jac714gxzzz5y5lrd651gn"; + url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "12xqhszx50pmw2nx7n1pym7n47z95ddwwkyx35bfgmxsd9hjpmh2"; }; patches = [ (substituteAll { src = ./fix-test-paths.patch; - inherit coreutils glibcLocales; + inherit coreutils gettext glibcLocales; hicolorIconTheme = hicolor-icon-theme; }) (substituteAll { @@ -33,19 +31,24 @@ in stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection - gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper + 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 wrapGAppsHook ]; buildInputs = [ - bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp + bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp libsoup lzma ostree polkit python3 systemd xorg.libXau + gnome3.gsettings-desktop-schemas glib-networking ]; checkInputs = [ valgrind ]; doCheck = false; # TODO: some issues with temporary files + NIX_LDFLAGS = [ + "-lpthread" + ]; + enableParallelBuilding = true; configureFlags = [ @@ -65,12 +68,6 @@ in stdenv.mkDerivation rec { patchShebangs tests ''; - postFixup = '' - wrapProgram $out/bin/flatpak \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}" - ''; - meta = with stdenv.lib; { description = "Linux application sandboxing and distribution framework"; homepage = https://flatpak.org/; diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index d00e4fa7f895d556e98bb9f50a32ef8fbcca119d..f987899e3bcb86484a11e39148260f0712e1dc22 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,14 +1,14 @@ --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -296,7 +296,7 @@ - # running installed-tests: assume we know what we're doing - : - elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ -- --ro-bind / / /bin/true > bwrap-result 2>&1; then -+ --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then - sed -e 's/^/# /' < bwrap-result - echo "1..0 # SKIP Cannot run bwrap" - exit 0 +@@ -328,7 +328,7 @@ + # running installed-tests: assume we know what we're doing + _flatpak_bwrap_works=true + elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ +- --ro-bind / / /bin/true > bwrap-result 2>&1; then ++ --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then + _flatpak_bwrap_works=false + else + _flatpak_bwrap_works=true @@ -309,12 +309,12 @@ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -24,6 +24,24 @@ gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true fusermount -u $XDG_RUNTIME_DIR/doc || : if test -n "${TEST_SKIP_CLEANUP:-}"; then +--- a/tests/make-test-app.sh ++++ b/tests/make-test-app.sh +@@ -114,13 +114,13 @@ msgid "Hello world" + msgstr "Hallo Welt" + EOF + mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES +-msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po ++@gettext@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po + cat > fr.po < @@ -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 8dd78c41b14a90baa8a04f144af842244cdecff0..40430f34334c6b9d3199b24b72f4375b5447cd81 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 4f07316bd3f19592509d49c295ea37d51af1556b..5c70df02cdc8fbe81a633d71d56fc3613c0d6d61 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.111"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "1r03ns0jp2sbbivys5bks376vbdqbnx8v764kjh74gpbajjmkksz"; + sha256 = "17vn95bjiib3ia3h64b7akcmgmj6wfjx7w538iylhf9whqvssi4j"; }; buildInputs = [ diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index fce052aeb223aef43d90de52be90c3bd5d55214a..76df9514cf4a685db2725040bd233f0d7693962e 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 @@ -13,7 +14,7 @@ let in stdenv.mkDerivation rec { name = "freetype-${version}"; - version = "2.9"; + version = "2.9.1"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -32,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6"; + sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype @@ -48,7 +49,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; + configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ]; + + # 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"; @@ -58,7 +62,11 @@ in stdenv.mkDerivation rec { doCheck = true; postInstall = glib.flattenInclude + '' + substituteInPlace $dev/bin/freetype-config \ + --replace ${buildPackages.pkgconfig} ${pkgconfig} + wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" ''; + } diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 08b0a87e3e208e74879fdf61ad8705a924a5e3eb..b60f4be245e2cc29b996d312c82895ba74332faa 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 0000000000000000000000000000000000000000..68f3c9d0ee5949e74e2513702b621df1734b921d --- /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/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 8808af49f9e42605044f7aa41281d304fc77a38c..289a57399854843f126698a088ead47f0d9e38d2 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, freetype, libGLU_combined}: +{ stdenv, fetchurl, freetype, libGLU_combined, OpenGL }: let name = "ftgl-2.1.3-rc5"; @@ -11,7 +11,12 @@ stdenv.mkDerivation { sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"; }; - buildInputs = [ freetype libGLU_combined ]; + buildInputs = [ freetype ] + ++ (if stdenv.isDarwin then + [ OpenGL ] + else + [ libGLU_combined ]) + ; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 5a21af6a2b33c91514e4d70c2d2a0834e893306b..58356f0bc6760d89b31bfc53e38d373b27047dfe 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 dc0ca5fffa3a59c92fad2a4c45bf706d0fe30d7f..2b9b59e7baf6eaed1ff4debfc66b1562fd81d06b 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig +{ stdenv, fetchurl, gettext, gobject-introspection, pkgconfig , meson, ninja, glibcLocales, git, vala, glib, zlib }: stdenv.mkDerivation rec { name = "gcab-${version}"; - version = "1.1"; + version = "1.2"; LC_ALL = "en_US.UTF-8"; src = fetchurl { url = "mirror://gnome/sources/gcab/${version}/${name}.tar.xz"; - sha256 = "0l19sr6pg0cfcddmi5n79d08mjjbhn427ip5jlsy9zddq9r24aqr"; + sha256 = "038h5kk41si2hc9d9169rrlvp8xgsxq27kri7hv2vr39gvz9cbas"; }; - 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 f8397052b7709f22b4fdd7a3f016c46fd65c176e..4762d1fb119f5624a82aa0536eed2d8567d74aa3 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/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..56c52e1e368885957956ff1e7f01b1e1b56ef758 --- /dev/null +++ b/pkgs/development/libraries/gcr/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib +, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk_pixbuf, atk +, gobject-introspection, makeWrapper, libxslt, vala, gnome3 +, python2 }: + +stdenv.mkDerivation rec { + pname = "gcr"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "02xgky22xgvhgd525khqh64l5i21ca839fj9jzaqdi3yvb8pbq8m"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = pname; }; + }; + + postPatch = '' + patchShebangs . + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkgconfig intltool gobject-introspection libxslt makeWrapper vala ]; + + buildInputs = let + gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome + in [ + gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk + ]; + + propagatedBuildInputs = [ glib gtk3 p11-kit ]; + + checkInputs = [ python2 ]; + doCheck = false; # fails 21 out of 603 tests, needs dbus daemon + + #enableParallelBuilding = true; issues on hydra + + preFixup = '' + wrapProgram "$out/bin/gcr-viewer" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index f6d8cd6fa4c23a128b3069865d5b779df4e144ea..6b7a58fa30d942f9a96f9bbaed868c58fca537d5 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.4.0"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "0nkjnznrp7dr41zsh8j923c9zpc3i5vj3wjfc2df9rrybb22ailw"; + sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; }; 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 "") ]; @@ -50,6 +51,20 @@ stdenv.mkDerivation rec { #ifdef swap\ #undef swap\ #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h + + # poppler 0.73.0 support + patch -lp2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; + sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734"; + } + } || true + patch -p2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; + sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj"; + } + } ''; # - Unset CC and CXX as they confuse libtool. diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 685775e2918da76bd00bd9dbbb01ce2e2fd81f21..9b1fc2b4ac562f23f33c684ae3471d4fdf58114d 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 cba31f45d5572311b9ee09804656f6a710e5d44e..91c384b249a4fb846af5ac3bf381c33c469b72aa 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 3fb50e98c1c8d9430747e8887c41fbea007f9e23..20f05d28bfe465ea9195d68bde62fe7aa93e7fba 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"; - }) + # Move installed tests to a separate output + ./installed-tests-path.patch - # Add missing test file bug753605-atsize.jpg (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch; - sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0"; + url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/a7d582f75a71320554b881e063a65f4ced679c1c.patch; + sha256 = "0z0w52bh4hcrdllbgrqvh12iqzr7k1pb0wdr9vz2qslg1kjk4j92"; }) - - # Move installed tests to a separate output - ./installed-tests-path.patch ]; 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/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..45a29e15ede8d81b429c5b51b125b1108ca3ec3a --- /dev/null +++ b/pkgs/development/libraries/gdl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: + +stdenv.mkDerivation rec { + pname = "gdl"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ libxml2 gtk3 ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gdl"; + }; + }; + + meta = with stdenv.lib; { + description = "Gnome docking library"; + homepage = https://developer.gnome.org/gdl/; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 83ec0edfb49fde0a39550efa90d1c96e50df353c..2d5556b350219ec885d4d3101490f91a0646b832 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: stdenv.mkDerivation rec { name = "gecode-${version}"; - version = "6.0.0"; + version = "6.1.0"; - src = fetchurl { - url = "http://www.gecode.org/download/${name}.tar.gz"; - sha256 = "0dp7bm6k790jx669y4jr0ffi5cdfpwsqm1ykj2c0zh56jsgs6hfs"; + src = fetchFromGitHub { + owner = "Gecode"; + repo = "gecode"; + rev = "release-${version}"; + sha256 = "1ijjy8ppx7djnkrkawsd00rmlf24qh1z13aap0h1azailw1pbrg4"; }; enableParallelBuilding = true; - buildInputs = [ perl ]; + nativeBuildInputs = [ bison flex ]; + buildInputs = [ perl gmp mpfr ] + ++ stdenv.lib.optional enableGist qtbase; meta = with stdenv.lib; { license = licenses.mit; homepage = http://www.gecode.org; description = "Toolkit for developing constraint-based systems"; platforms = platforms.all; - maintainers = [ maintainers.manveru ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index c8b7b3b8eca51d8de819327e9989f537c482e8ab..cb7f2621353d33c4b4b8629807af5f6cf636e128 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 fa3aa77cd3add34dec9b9eedec9b64577074c109..e1f243f8fd3bdf4810c7ce857779dbac86ff50e7 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 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { [ 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/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch new file mode 100644 index 0000000000000000000000000000000000000000..629ea102971b2e5d099c2778902f74147fe2266a --- /dev/null +++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch @@ -0,0 +1,55 @@ +--- a/data/meson.build ++++ b/data/meson.build +@@ -7,7 +7,7 @@ + conf.set('demo_agent', '') + endif + +- conf_dir = join_paths(get_option('sysconfdir'), 'geoclue') ++ conf_dir = join_paths(sysconfdir_install, 'geoclue') + configure_file(output: 'geoclue.conf', + input: 'geoclue.conf.in', + configuration: conf, +@@ -26,7 +26,7 @@ + # DBus Service policy file + dbus_service_dir = get_option('dbus-sys-dir') + if dbus_service_dir == '' +- dbus_service_dir = join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d') ++ dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d') + endif + configure_file(output: 'org.freedesktop.GeoClue2.conf', + input: 'org.freedesktop.GeoClue2.conf.in', +--- a/demo/meson.build ++++ b/demo/meson.build +@@ -56,8 +56,7 @@ + install_dir: desktop_dir) + + # Also install in the autostart directory. +- autostart_dir = join_paths(get_option('prefix'), +- get_option('sysconfdir'), ++ autostart_dir = join_paths(sysconfdir_install, + 'xdg', 'autostart') + meson.add_install_script('install-file.py', + desktop_file.full_path(), +--- a/meson.build ++++ b/meson.build +@@ -22,6 +22,11 @@ + datadir = join_paths(get_option('prefix'), get_option('datadir')) + conf.set_quoted('LOCALEDIR', datadir + '/locale') + conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) ++if get_option('sysconfdir_install') != '' ++ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install')) ++else ++ sysconfdir_install = get_option('sysconfdir') ++endif + + configure_file(output: 'config.h', configuration : conf) + configinc = include_directories('.') +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -34,3 +34,6 @@ + option('dbus-srv-user', + type: 'string', value: 'root', + description: 'The user (existing) as which the service will run') ++option('sysconfdir_install', ++ type: 'string', value: '', ++ description: 'sysconfdir to use during installation') diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index da7041b6786f59d1f8d472744889754b05c26c11..5e83ba71c1bc29ad967a7f38dfb997df74e5fe71 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,24 @@ 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"; }; + patches = [ + ./add-option-for-installation-sysconfdir.patch + ]; + 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,27 +37,23 @@ 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"; - }) - ]; - - configureFlags = [ - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--enable-introspection" - "--enable-gtk-doc" - "--enable-demo-agent=${if withDemoAgent then "yes" else "no"}" + mesonFlags = [ + "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system" + "-Ddemo-agent=${if withDemoAgent then "true" else "false"}" + "--sysconfdir=/etc" + "-Dsysconfdir_install=${placeholder "out"}/etc" ] ++ optionals stdenv.isDarwin [ - "--disable-silent-rules" - "--disable-3g-source" - "--disable-cdma-source" - "--disable-modem-gps-source" - "--disable-nmea-source" + "-D3g-source=false" + "-Dcdma-source=false" + "-Dmodem-gps-source=false" + "-Dnmea-source=false" ]; + postPatch = '' + chmod +x demo/install-file.py + patchShebangs demo/install-file.py + ''; + meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2d308add87adc3ad65c09c954c91d4450f17fb23 --- /dev/null +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -0,0 +1,37 @@ +{ fetchurl, stdenv, meson, ninja, pkgconfig, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib }: + +stdenv.mkDerivation rec { + pname = "geocode-glib"; + version = "3.26.0"; + + outputs = [ "out" "dev" "devdoc" "installedTests" ]; + + src = fetchurl { + url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a"; + }; + + nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; + buildInputs = with gnome3; [ glib libsoup json-glib ]; + + patches = [ + ./installed-tests-path.patch + ]; + + postPatch = '' + substituteInPlace geocode-glib/tests/meson.build --subst-var-by "installedTests" "$installedTests" + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; + license = licenses.lgpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch b/pkgs/development/libraries/geocode-glib/installed-tests-path.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/geocode-glib/installed-tests-path.patch rename to pkgs/development/libraries/geocode-glib/installed-tests-path.patch diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index cb8138dc115e07aedd776270c0100f004b072b8c..1b1f7373709f830cd88e42d653b7715329469dd3 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -17,6 +17,11 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + postConfigure = '' find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index c1b4c88aa4799793f650e6caeae898bc821ceca8..d857c9931fe9486e88cb1f31735efd04467c3236 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.1"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0jrypv61rbyp7vi9qpnnaiigjj8cgdqvyk8ymik8h1ppcw5am7mb"; + sha256 = "1312m02xk4sp6f1xdpb9w0ic0zbxg90p5y66qnwidl5fksscf1h0"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix index 66fc0138ef9bc76e3f320b3105631cb139606ee0..0493071ee22840fbfafe3b7f35fd4cdb85566a7d 100644 --- a/pkgs/development/libraries/getdns/default.nix +++ b/pkgs/development/libraries/getdns/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "getdns"; name = "${pname}-${version}"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { - url = "https://getdnsapi.net/releases/${pname}-1-4-2/${pname}-${version}.tar.gz"; - sha256 = "100fzjpvajvnv0kym8g5lkwyv8w8vhy7g2p0pb2gyz19zqnvi18n"; + url = "https://getdnsapi.net/releases/${pname}-1-5-1/${pname}-${version}.tar.gz"; + sha256 = "5686e61100599c309ce03535f9899a5a3d94a82cc08d10718e2cd73ad3dc28af"; }; nativeBuildInputs = [ libtool m4 autoreconfHook automake file ]; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 4531a5a01d4ca07ca4c32d67735237ddfe66e267..8ed898813aef0bb1f8278233e1acb7e93bda451f 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/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index 0a6bc0dd253af4d17c687aa13b0b6d7044cf191e..ad3763c29b64344114bc6d6faca650f80f3db26c 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -10,7 +10,7 @@ addEnvHooks "$hostOffset" gettextDataDirsHook # libintl must be listed in load flags on non-Glibc # it doesn't hurt to have it in Glibc either though -if [ ! -z "@gettextNeedsLdflags@" ]; then +if [ -n "@gettextNeedsLdflags@" -a -z "$dontAddExtraLibs" ]; then # See pkgs/build-support/setup-hooks/role.bash getHostRole export NIX_${role_pre}LDFLAGS+=" -lintl" diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..350f38d870304d3199ff7321510c76967f39b716 --- /dev/null +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: + +stdenv.mkDerivation rec { + pname = "gexiv2"; + version = "0.10.10"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; + buildInputs = [ glib ]; + propagatedBuildInputs = [ exiv2 ]; + + mesonFlags = [ + "-Denable-gtk-doc=true" # TODO: change to gtk_doc in a next release + ]; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/gexiv2; + description = "GObject wrapper around the Exiv2 photo metadata library"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1bdcb7d8b28d4419537e1aaa99c80576a1733e1e --- /dev/null +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, glib, librest +, gnome3, libsoup, json-glib, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "gfbgraph"; + version = "0.2.3"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"; + }; + + nativeBuildInputs = [ pkgconfig gobject-introspection ]; + buildInputs = [ glib gnome3.gnome-online-accounts ]; + propagatedBuildInputs = [ libsoup json-glib librest ]; + + configureFlags = [ "--enable-introspection" ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GFBGraph; + description = "GLib/GObject wrapper for the Facebook Graph API"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index 357ca751ccf114cf37c89e389e8a884447ec43dc..6336d30aebada76cfc2daa31ff33b82427d91884 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 bafd6be37df6e3bfed9b39bceefda13cfa5e4e75..510f53f24b17f8d7827289f2ee07b5e851890b09 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.8"; name = "libgit2-${version}"; src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "1cmc8ldhpyp62pswb7dmjjya3ng0ssaggcsxs1labvp6xyxjvp6s"; + sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9"; }; cmakeFlags = [ "-DTHREADSAFE=ON" ]; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 48d595137b3dd3c1e292896dd090c38ac8c257fa..358fc31fc80f583c43712bf0dd2b73b8a5d8801f 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (rec { name = "libgit2-${version}"; version = "0.26.6"; - # keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib + # keep the version in sync with pythonPackages.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 339e0d8d60b9e7c2ae2bd26a9b61116cf49831c9..60778df663a0848208340d5e9a9d18105b10abf9 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 8d4d4d10038a247c379de77be4103ce5c8d90181..668fe436e9154a1da1f3af241fd5ee0845981b98 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 3deaf28373dd9ab603d1cc29a9112fd329c73b81..e8105ef08237b50909bac60e5014628b79f06bbd 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 428b9ee482ec0435822fb493a81bb9998be30059..62963283f93775ac60cb5f8904db4f45ceeb2e44 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, gettext, pkgconfig, perl, python -, libiconv, zlib, libffi, pcre, libelf, gnome3 +{ stdenv, fetchurl, fetchpatch, 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 +, buildPackages # this is just for tests (not in the closure of any regular package) , doCheck ? stdenv.config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info +, darwin }: with stdenv.lib; @@ -43,15 +45,16 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - version = "2.56.0"; + binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; + version = "2.58.2"; 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 = "0jrxfm4gn1qz3y1450z709v74ys2bkjr8yffkgy106kgagb4xcn7"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -59,59 +62,97 @@ stdenv.mkDerivation rec { ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch - ] ++ [ ./schema-override-variable.patch ]; - - outputs = [ "out" "dev" "devdoc" ]; + ] ++ [ + ./schema-override-variable.patch + # Require substituteInPlace in postPatch + ./fix-gio-launch-desktop-path.patch + # https://gitlab.gnome.org/GNOME/glib/issues/1626 + # https://gitlab.gnome.org/GNOME/glib/merge_requests/557 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch; + sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877"; + }) + # https://gitlab.gnome.org/GNOME/glib/issues/1645 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff; + sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w"; + }) + ]; + + outputs = [ "bin" "out" "dev" "devdoc" ]; outputBin = "dev"; setupHook = ./setup-hook.sh; - buildInputs = [ libelf setupHook pcre ] - ++ optionals stdenv.isLinux [ utillinuxMinimal ]; # for libmount - - nativeBuildInputs = [ pkgconfig perl python gettext ]; + buildInputs = [ + libelf setupHook pcre + bash gnum4 # install glib-gettextize and m4 macros for other apps to use + ] ++ optionals stdenv.isLinux [ + libselinux + utillinuxMinimal # for libmount + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit Carbon Cocoa CoreFoundation CoreServices Foundation + # Needed for CFURLCreateFromFSRef, etc. which have deen deprecated + # since 10.9 and are not part of swift-corelibs CoreFoundation. + darwin.cf-private + ]); + + 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 = [ + # Avoid the need for gobject introspection binaries in PATH in cross-compiling case. + # Instead we just copy them over from the native output. + "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}" + ]; + + 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," + + # substitute fix-gio-launch-desktop-path.patch + substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin" - postConfigure = '' - patchShebangs ./gobject/ + 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 ${concatStringsSep " " binPrograms}; do + mv "$dev/bin/$app" "$bin/bin" + done + + '' + optionalString (!stdenv.isDarwin) '' + # 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 + '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + cp -r ${buildPackages.glib.devdoc} $devdoc ''; checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; 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 0000000000000000000000000000000000000000..4fdec2dd7e7d2040ff1a07628d5a2a9a35a022b4 --- /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 233845c6541fe19fc55bc99837f0fe751aa9c41c..a1cb1f40c58a20b751227770f61017b5097cc612 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -9,15 +9,15 @@ 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" glibPreFixupPhase() { # Move gschemas in case the install flag didn't help - if [ -d "${!outputLib}/share/glib-2.0/schemas" ]; then + if [ -d "$prefix/share/glib-2.0/schemas" ]; then mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0" - mv "${!outputLib}/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/" + mv "$prefix/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/" fi addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name" diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index a7a4c2fbacdb4f3a1915310f104e3dbbf6b22c4e..50d8c6e268c2d21d2b0f513fd66d14e41d341a15 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 c74c27598ee069cbbbb0cfe136ac58439de39d60..27a1267f0cfe1f42b67ef9262f098dd8f2522f44 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 @@ -94,8 +103,7 @@ callPackage ./common.nix { inherit stdenv; } { mv $bin/bin/getconf_ $bin/bin/getconf ''; - # Hack to get around eval issue. - separateDebugInfo = !stdenv.isDarwin; + separateDebugInfo = true; meta.description = "The GNU C Library"; } diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index ee77f4b498e419c7cb7fef5f0b900f6306ab2dd5..054e6df0e4c9d21397529cceebd2d3f787319252 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,34 +1,32 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, glib, libsigcxx }: +{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3, darwin }: -let - ver_maj = "2.56"; - ver_min = "0"; -in stdenv.mkDerivation rec { - name = "glibmm-${ver_maj}.${ver_min}"; + pname = "glibmm"; + version = "2.58.0"; src = fetchurl { - url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "1abrkqhca5p8n6ly3vp1232rny03s7lrd8f8iz2m2m141nxgqx3f"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0idnaii4h3mdym2a55gkavipyxigwvbgfmzmwql85s4rgciqjhfk"; }; outputs = [ "out" "dev" ]; - patchFlags = "-p0"; - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/e864b2340be9ef003d8ff4aef92e7151d06287dd/devel/glibmm/files/0001-ustring-Fix-wchar-conversion-on-macOS-with-libc.patch"; - sha256 = "02qvnailw1i59cjbj3cy7y02kfcivsvkdjrf4njkp4plarayyqp9"; - }) - ]; - nativeBuildInputs = [ pkgconfig gnum4 ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + ]); propagatedBuildInputs = [ glib libsigcxx ]; enableParallelBuilding = true; doCheck = false; # fails. one test needs the net, another /etc/fstab + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "C++ interface to the GLib library"; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index b030eab7c3ad735595c4fda4d9be97212a82fb36..791588942bab42cfe42f03db6a3e36da3c7c3f78 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index eeeff731a6e3a669b4136900f13cac7a85f134e2..d532e906a5107076d2adab92d60d5410e405753a 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -11,14 +11,14 @@ assert idnSupport -> libidn != null; with stdenv.lib; let - version = "1.0.21"; + version = "1.0.22"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "1k57qgif1yii515m6jaqaibkdysfab6394bpawd2l67321f1a4rw"; + sha256 = "0r69gq8if9yy1amjzl7qrq9lzhhna7qgz905ln4wvkwchha1ppja"; }; buildInputs = [ ] diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 481ae32bdc6107815c2e8f9c75dc336977349832..1d35c0696d2775c524f9fed412720b395f604cd8 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 b25f5c90bfaec036057633adcc1db281b6fda889..1c6dfc4a85246da59f116cc5097c1acdc23f0a02 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 65c99610a5c7375c0b781647e5630363b5f94827..d036140567fe133e96bae1999f02e98e9c514f28 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 7f8a2276ef25ce10c9b0f9b76b69cd7ddd2d0c2c..6423e1fce981d2de13be109bbb3d9292f7203d11 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/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 3b9fbc35a768f5d243f569f3a07b05a9f1f24ec6..00bfb55520dca5d4ae2eaa47fd1851f1b7186bae 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -29,17 +29,14 @@ let self = stdenv.mkDerivation rec { # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + # The config.guess in GMP tries to runtime-detect various + # ARM optimization flags via /proc/cpuinfo (and is also + # broken on multicore CPUs). Avoid this impurity. + "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ; - # The config.guess in GMP tries to runtime-detect various - # ARM optimization flags via /proc/cpuinfo (and is also - # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isAarch32 '' - configureFlagsArray+=("--build=$(./configfsf.guess)") - ''; - doCheck = true; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 23a69282b41c59962ae737804e44124a5fb67b2d..ce78f3230882414a4bcbc4137383cca9782ba14b 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -30,18 +30,15 @@ let self = stdenv.mkDerivation rec { # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") + # The config.guess in GMP tries to runtime-detect various + # ARM optimization flags via /proc/cpuinfo (and is also + # broken on multicore CPUs). Avoid this impurity. + "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" ++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly" ; - # The config.guess in GMP tries to runtime-detect various - # ARM optimization flags via /proc/cpuinfo (and is also - # broken on multicore CPUs). Avoid this impurity. - preConfigure = optionalString stdenv.isAarch32 '' - configureFlagsArray+=("--build=$(./configfsf.guess)") - ''; - doCheck = true; # not cross; dontDisableStatic = withStatic; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..171c6d40fac1f30c39d9d923e016c305e69c134e --- /dev/null +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, glib, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "gnome-menus"; + version = "3.31.4"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1iihxcibjg22jxsw3s1cxzcq0rhn1rdmx4xg7qjqij981afs8dr7"; + }; + + makeFlags = [ + "INTROSPECTION_GIRDIR=${placeholder ''out''}/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=${placeholder ''out''}/lib/girepository-1.0" + ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib gobject-introspection ]; + + meta = { + homepage = https://www.gnome.org; + description = "Library that implements freedesktops's Desktop Menu Specification in GNOME"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch b/pkgs/development/libraries/gnome-sharp/Makefile.in.patch deleted file mode 100644 index 46b644f2471a1cb3ab0255d6b939d7d23725e06a..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/gnome-sharp/Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sample/gnomevfs/Makefile.in 2009-03-03 16:09:52.000000000 +0000 -+++ b/sample/gnomevfs/Makefile.in 2014-10-14 13:35:51.020427244 +0100 -@@ -218,7 +218,7 @@ - - @ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS = - @ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS = --@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe -+@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = - assemblies = ../../gnomevfs/gnome-vfs-sharp.dll - references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies)) - noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS) diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index d80144b3d71917d7a13080b6156b9445d52b507f..db93bdf27af31529bb0ada82823e7b7c766b02f3 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -1,17 +1,35 @@ -{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}: +{ stdenv +, lib +, fetchFromGitHub +, pkgconfig +, gtk2 +, mono +, gtk-sharp-2_0 +, gnome2 +, autoconf +, automake +, libtool +, which +}: -stdenv.mkDerivation { - name = "gnome-sharp-2.24.1"; - src = fetchurl { - url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz; - sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p"; +stdenv.mkDerivation rec { + name = "gnome-sharp-${version}"; + version = "2.24.4"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "gnome-sharp"; + rev = "${version}"; + sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; buildInputs = [ gtk2 mono gtk-sharp-2_0 ] - ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); + ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); - patches = [ ./Makefile.in.patch ]; + preConfigure = '' + ./bootstrap-${lib.versions.majorMinor version} + ''; dontStrip = true; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index a14d7486e96fe8e7a9526b6e5f079c79429ce489..3f0fcafa44753533d4cfc3f33e6e0071130d2cb4 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 1f8a518d69e4bc7d0588479921eb9ffc5dd6f5c0..036863c9c0bff8c00df3dfa1e0a8fb4f4fcfb8e5 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 a81cd91fdc76c05bbadfafe4ec9ad392ca26d6da..d1d3c8575b0fa7776fa31d8f72a38b7a092b61ca 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 081d896a6e0b8ef4d5ebe793df36abbbd5823e37..7dc45edd6369bac50d0c9f2d826f6c2d10ceaf14 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -82,9 +82,9 @@ 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 ]; + maintainers = with maintainers; [ eelco 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 f7e1bedd3e183d1260a80ce8f2ab1b488f3d37a3..d4160b51d68c3211815f2b2241d461735214bf70 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 f5ab5005bad46bf8200128db84e6ca47f68dd124..c00b5eca300bb39cc835d0029d2b561b5edea085 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.3"; 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 = "1j63rll0s608s0v4kqxkjapkpf46l069mlahzh8wykclplmn6nq2"; }; - 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 0000000000000000000000000000000000000000..9941878c427b5632c9b945f5fdb5af9b8297e91f --- /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 0000000000000000000000000000000000000000..c3152982d1991a1a33745b1aa7b29a0b31f94863 --- /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/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix deleted file mode 100644 index e050a615dd170f74b60d35feccdb335e0508e64a..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/goffice/0.8.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk2, libglade, bzip2 -, pango, libgsf, libxml2, libart, intltool, gettext -, cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }: - -stdenv.mkDerivation rec { - name = "goffice-0.8.17"; - - src = fetchurl { - url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz"; - sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"; - }; - - # fix linking error: undefined reference to pcre_info - patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986 - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libglade bzip2 libart intltool gettext - gconf libgnomeui pcre - ]; - - propagatedBuildInputs = [ - # All these are in the "Requires:" field of `libgoffice-0.6.pc'. - glib libgsf libxml2 gtk2 libglade libart cairo pango - ]; - - postInstall = - '' - # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig. - substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires - ''; - - doCheck = true; - - meta = goffice.meta // { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 4795f45812b2c5cc095b01b5854b90bd24a065ff..3d3275b041f1e28cede1e447b8ae40456e2ef6bc 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,18 +1,21 @@ -{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3 -, libgsf, libxml2, libxslt, cairo, pango, librsvg }: +{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3, lasem +, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }: stdenv.mkDerivation rec { - name = "goffice-0.10.43"; + pname = "goffice"; + version = "0.10.44"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "550fceefa74622b8fe57dd0b030003e31db50edf7f87068ff5e146365108b64e"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1fd7cm6j0g0mqgpqs4y22b4gd2ll4mcyvg4d0q22d5ndjapl4q3d"; }; nativeBuildInputs = [ pkgconfig intltool ]; - propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection? - glib gtk3 libxml2 cairo pango libgsf + propagatedBuildInputs = [ + glib gtk3 libxml2 cairo pango libgsf lasem ]; buildInputs = [ libxslt librsvg ]; @@ -20,6 +23,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = { description = "A Glib/GTK+ set of document centric objects and utilities"; diff --git a/pkgs/development/libraries/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch deleted file mode 100644 index cd4ef3c9fed7ce81ff838dbd8b68cf9d2a4f56ea..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/goffice/pcre_info.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c -index bc4aae4..3adb696 100644 ---- a/goffice/utils/regutf8.c -+++ b/goffice/utils/regutf8.c -@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags) - default: return GO_REG_BADPAT; - } - } else { -- gor->re_nsub = pcre_info (r, NULL, NULL); -+ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL); - gor->nosub = (cflags & GO_REG_NOSUB) != 0; - return 0; - } diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index ef36a9c076fba28f67a7ec7c59da8dd4cd5a694b..99b1307179a54d15ab71244a67669d3ae3cf7060 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/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b7f56837686dbba9079e5111a8671ce93095eaa5 --- /dev/null +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, goocanvas2, gtkmm3, gnome3 }: + +stdenv.mkDerivation rec { + pname = "goocanvasmm"; + version = "1.90.11"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0vpdfrj59nwzwj8bk4s0h05iyql62pxjzsxh72g3vry07s3i3zw0"; + }; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ gtkmm3 goocanvas2 ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "C++ bindings for GooCanvas"; + homepage = https://wiki.gnome.org/Projects/GooCanvas; + license = licenses.lgpl2; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix index dbcb0342156b885d4783aae9bdff60dd1f2e5f13..a6f062b8126a4299ca84e0c7d47247614f49e20c 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/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index de71704cff85fa75a0f75381d93aebaa67da321b..44339c3dfedd409957f77624d7b3435d3242d90a 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; - maintainers = with maintainers; [ vcunat wkennington ]; + maintainers = with maintainers; [ vcunat ]; }; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 71fe23ea6b0d101e013f5cb3537981e5f10cc9f0..fc98af8b2cae421035d5ead740b22f3a5705b047 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 -, autoreconfHook +, file, which, ncurses +, autoreconfHook, fetchpatch , 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,16 @@ 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 ]; + + patches = [ + (fetchpatch { + name = "fix-key-expiry.patch"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60"; + sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02"; + }) + ]; postPatch ='' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file @@ -38,7 +46,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 +57,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/02-datetime-clock-format-gsettings.patch b/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch new file mode 100644 index 0000000000000000000000000000000000000000..7b7c9871133a1bbf9106ed533bb9ccff7a4827d7 --- /dev/null +++ b/pkgs/development/libraries/granite/02-datetime-clock-format-gsettings.patch @@ -0,0 +1,129 @@ +From 698e34dd6e8d98a1818ae00d3313b69a86340771 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Mon, 17 Dec 2018 14:58:14 +0100 +Subject: DateTime: include "clock-format" gsettings key here + +--- + data/io.elementary.granite.gschema.xml | 15 +++++++++++++++ + data/meson.build | 4 ++++ + lib/DateTime.vala | 4 ++-- + meson.build | 11 +++++++++++ + meson/post_install.py | 5 +++++ + 5 files changed, 37 insertions(+), 2 deletions(-) + create mode 100644 data/io.elementary.granite.gschema.xml + create mode 100644 data/meson.build + +diff --git a/data/io.elementary.granite.gschema.xml b/data/io.elementary.granite.gschema.xml +new file mode 100644 +index 0000000..1540fb0 +--- /dev/null ++++ b/data/io.elementary.granite.gschema.xml +@@ -0,0 +1,15 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ "12h" ++ Whether the clock displays in 12h or 24h format ++ Whether the clock displays in 12h or 24h format ++ ++ ++ +diff --git a/data/meson.build b/data/meson.build +new file mode 100644 +index 0000000..96cc3b1 +--- /dev/null ++++ b/data/meson.build +@@ -0,0 +1,4 @@ ++install_data( ++ rdnn + '.gschema.xml', ++ install_dir: schema_dir ++) +diff --git a/lib/DateTime.vala b/lib/DateTime.vala +index aea2ec6..3d81191 100644 +--- a/lib/DateTime.vala ++++ b/lib/DateTime.vala +@@ -104,13 +104,13 @@ namespace Granite.DateTime { + } + + /** +- * Gets the //clock-format// key from //org.gnome.desktop.interface// schema ++ * Gets the //clock-format// key from //io.elementary.granite// schema + * and determines if the clock format is 12h based + * + * @return true if the clock format is 12h based, false otherwise. + */ + private static bool is_clock_format_12h () { +- var h24_settings = new Settings ("io.elementary.desktop.wingpanel.datetime"); ++ var h24_settings = new Settings ("io.elementary.granite"); + var format = h24_settings.get_string ("clock-format"); + return (format.contains ("12h")); + } +diff --git a/meson.build b/meson.build +index 8b98eeb..f0abcdf 100644 +--- a/meson.build ++++ b/meson.build +@@ -4,6 +4,8 @@ project( + version: '5.2.2' + ) + ++rdnn = 'io.elementary.' + meson.project_name() ++ + if meson.get_compiler('vala').version().version_compare('<0.40.0') + error('vala compiler version 0.40.0 or newer is required.') + endif +@@ -52,10 +54,18 @@ icons_dir = join_paths( + 'hicolor' + ) + ++schema_dir = join_paths( ++ get_option('prefix'), ++ get_option('datadir'), ++ 'glib-2.0', ++ 'schemas' ++) ++ + pkgconfig = import('pkgconfig') + i18n = import('i18n') + + subdir('lib') ++subdir('data') + subdir('demo') + subdir('icons') + subdir('po') +@@ -68,5 +78,6 @@ endif + meson.add_install_script( + join_paths(meson.current_source_dir(), 'meson', 'post_install.py'), + '--iconsdir', icons_dir, ++ '--schemadir', schema_dir, + ) + +diff --git a/meson/post_install.py b/meson/post_install.py +index 1864515..5313f96 100755 +--- a/meson/post_install.py ++++ b/meson/post_install.py +@@ -6,11 +6,16 @@ import subprocess + + parser = argparse.ArgumentParser() + parser.add_argument("--iconsdir", action="store", required=True) ++parser.add_argument("--schemadir", action="store", required=True) + args = vars(parser.parse_args()) + + icons_dir = args["iconsdir"] ++schema_dir = args["schemadir"] + + if not os.environ.get('DESTDIR'): + print('Compiling icon cache ...') + subprocess.run(['gtk-update-icon-cache', icons_dir]) + ++ print('Compiling GSettings schemas ...') ++ subprocess.run(['glib-compile-schemas', schema_dir]) ++ +-- +2.20.1 + diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 1ee0970ffad2305b7713f696ee2f01b15a9ea1fa..eacb84e33616acb723485b6052db3c1c23320f6d 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,41 +1,62 @@ -{ stdenv, fetchFromGitHub, perl, cmake, ninja, vala_0_40, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala_0_40, pkgconfig, gobject-introspection, gnome3, gtk3, glib, gettext, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "granite-${version}"; - version = "5.1.0"; + pname = "granite"; + version = "5.2.2"; src = fetchFromGitHub { owner = "elementary"; - repo = "granite"; + repo = pname; rev = version; - sha256 = "1v1yhz6rp616xi417m9r8072s6mpz5i8vkdyj264b73p0lgjwh40"; + sha256 = "1zp0pp5v3j8k6ail724p7h5jj2zmznj0a2ybwfw5sspfdw5bfydh"; }; - cmakeFlags = [ - "-DINTROSPECTION_GIRDIR=share/gir-1.0/" - "-DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0" + patches = [ + # Add Meson support that hit after 5.2.2 + (fetchpatch { + url = "https://github.com/elementary/granite/commit/2066b377226cf327cb2d5399b6b40a2d36d47b11.patch"; + sha256 = "1bxjgq8wvl1sb79cwhmh9kwawnkkfn7c5q67cyz1fjxmamwyyi85"; + }) + (fetchpatch { + url = "https://github.com/elementary/granite/commit/f1b29f52e3aaf0f5d6bba44c42617da265f679c8.patch"; + sha256 = "0cdp9ny6fj1lpcirab641p1qn1rbsvnsaa03hnr6zsdpim96jlvs"; + }) + # Resolve the circular dependency between granite and the datetime wingpanel indicator + # See: https://github.com/elementary/granite/pull/242 + ./02-datetime-clock-format-gsettings.patch ]; nativeBuildInputs = [ - cmake gettext - gobjectIntrospection + gobject-introspection + meson ninja - perl pkgconfig - vala_0_40 + python3 + vala_0_40 # should be `elementary.vala` when elementary attribute set is merged + wrapGAppsHook ]; + buildInputs = [ glib - gnome3.libgee gtk3 + hicolor-icon-theme + gnome3.libgee ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + 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 aa670cd4c86b32f973694585e66d6b32b2db044e..52c087b19147fcc54bed75ccc0f5e7de9ed2e8cc 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 9dde67b5c7958fbacf617ed5b3b69071ebcecc97..1446e339745eabfc8161a39d2d776369dd0c4d4f 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/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index c8ce99dc90dd64263c78c0cbb57d014b373e35c1..224cd125dce6d72ec7793a09e969d69177fbf55b 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec{ name = "grib-api-${version}"; - version = "1.27.0"; + version = "1.28.0"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz"; - sha256 = "1vx6bx9jhz5vdh2vx5y532ihwgyylagqz6pbx2p2bsx4kmj4pxdd"; + sha256 = "0qbj12ap7yy2rl1pq629chnss2jl73wxdj1lwzv0xp87r6z5qdfl"; }; preConfigure = '' diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 7f680b6b59bfb03bc937746d1321ffefaac146f7..3b4cc86aaaa4babcb2bd5d2c06d418dad06991fc 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.18.0"; name = "grpc-${version}"; - src = fetchurl { - url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz"; - sha256 = "0l721r24d6wz889vz4g6i67ijz0zc0ah967i3immi90zdmjwlyjg"; + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc"; + rev = "v${version}"; + sha256 = "0pf8q1z3qhlljlj6h7isvqvsxhh4612z780xcbv1h9lj7cdpr77m"; }; 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 71da2c716f84460006b25eb49548c3e7f2e6e1da..899aa116b2ca0d73c3f7482e92b99a267f770d9d 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 9e893932a64c6eeae57f89d8a9878dfc51ac57b4..3f9cd8120d89c10de1da8456141cb18ef18f9f42 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 0000000000000000000000000000000000000000..0aa2034e3996be0a3b28691949eaeba245a531f3 --- /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 0000000000000000000000000000000000000000..a81e72bf66fb706b06978c544f7cf4c4546bd3c6 --- /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 0000000000000000000000000000000000000000..5da2b4c157e85e0d0f6373de73fa758cbd60c779 --- /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 0000000000000000000000000000000000000000..7c15e10620a5290b99f278d916af34348f2fdadf --- /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 0000000000000000000000000000000000000000..c4d23bd834c9f6392f01152893d987b6bfba80c5 --- /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 0000000000000000000000000000000000000000..6182ea283cbad10adef580d9c489c4918ef91206 --- /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 0000000000000000000000000000000000000000..d1fa37939a78dd0d91fdfb70f57935092b45d866 --- /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 0000000000000000000000000000000000000000..04463aac37968f243e939c52a4d8f73b7cb499c8 --- /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 8a419d6786553bfac3349c228eb410e808d566b4..9fd3f8a7a998ba9c3ee8133e47ea123cb47f6351 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 ede2b51c5599693fe7a06015f830c818fa19f619..69fe1b0db554f5c30443247691dc9b87f60506ff 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 = '' @@ -36,5 +36,7 @@ stdenv.mkDerivation rec { extensive test suite. ''; platforms = stdenv.lib.platforms.unix; + # Failing "eigen" tests on aarch64. + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..337a2472babd4902faa488ac2ae25124e2f23fc0 --- /dev/null +++ b/pkgs/development/libraries/gsound/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobject-introspection, libtool, gnome3 }: + +stdenv.mkDerivation rec { + pname = "gsound"; + version = "1.0.2"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; + }; + + nativeBuildInputs = [ pkgconfig gobject-introspection libtool gnome3.vala ]; + buildInputs = [ glib libcanberra ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Projects/GSound; + description = "Small library for playing system sounds"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 051228aeb15293996eba11650d3962fde7ee5232..776125a7537d9f92b39ee80eda7d595047993e1f 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 0cc6a07e083944817213227e9f74b46e719af553..a9ee776d441cf402bc5e1308f9f0b1c80f19fbd1 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -26,10 +26,10 @@ 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 ]; + maintainers = with maintainers; [ bjg ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 0d77018eee5f243847efcb0822898a6828aef19b..ed1e5b6faabbfde30362e1de79b9ab4bf4bc8126 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }: +{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }: stdenv.mkDerivation rec { name = "gssdp-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1"; }; - nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ libsoup gtk3 ]; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 96e02c605f540fd35404457115361db504bccb7a..8179806859c978670c69301402089672aa1ad940 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 @@ -9,6 +9,7 @@ , libwebp, xvidcore, gnutls, mjpegtools , libGLU_combined, libintl, libgme , openssl, x265, libxml2 +, srt }: assert faacSupport -> faac != null; @@ -17,7 +18,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 +55,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 @@ -73,6 +75,7 @@ stdenv.mkDerivation rec { libwebp xvidcore gnutls libGLU_combined libgme openssl x265 libxml2 libintl + srt ] ++ optional faacSupport faac ++ optional stdenv.isLinux wayland diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index dd4007bd142bd6f6ae9292b00dd21b7435fa06e7..0acdf71fb72fcf99e556f00f93a45e793d45635c 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 5845c8c50db23b5ca97e56cc501ac3d86a360789..2c1faac387e61542da5208daefc518b2a969e0ba 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 895f298c826966176fb13a28f9d9236864c6f0a1..fb7a37a4f448044b48cf8cd9174c1dd24ffe5027 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 ]; @@ -31,4 +32,8 @@ stdenv.mkDerivation rec { }) ./fix_pkgconfig_includedir.patch ]; + + postPatch = '' + sed -i -r -e 's/p(bad|good) = .*/p\1 = pbase/' tests/check/meson.build + ''; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 99d27523b1c9d385980a7d8bf1c1fb2b5eff135a..d4e7b8c5da429f382a5fa4622b62fe27c0f346e4 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/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix deleted file mode 100644 index 9c9243a1c6837a518384dff902120a5af3ea63b0..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gst-plugins-base, bzip2, yasm, orc -, useInternalFfmpeg ? false, ffmpeg ? null }: - -stdenv.mkDerivation rec { - name = "gst-ffmpeg-0.10.13"; - - src = fetchurl { - urls = [ - "https://gstreamer.freedesktop.org/src/gst-ffmpeg/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" - ]; - sha256 = "0qmvgwcfybci78sd73mhvm4bsb7l0xsk9yljrgik80g011ds1z3n"; - }; - - # Upstream strongly recommends against using --with-system-ffmpeg, - # but we do it anyway because we're so hardcore (and we don't want - # multiple copies of ffmpeg). - configureFlags = stdenv.lib.optional (!useInternalFfmpeg) "--with-system-ffmpeg"; - - buildInputs = - [ pkgconfig bzip2 gst-plugins-base orc ] - ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]); - - meta = { - homepage = https://gstreamer.freedesktop.org/releases/gst-ffmpeg; - description = "GStreamer's plug-in using FFmpeg"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index d4d4082509e4b95123d5f69bd19883498aac2f76..96c9d8e0c8e136b770db4c186a7287fd9d34848b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { postInstall = '' # Hm, apparently --disable-gtk-doc is ignored... rm -rf $out/share/gtk-doc - - paxmark m $out/bin/gst-launch* $out/libexec/gstreamer-*/gst-plugin-scanner ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 564b37fab7945d14e1a02665bd1d3f41827fa3e5..7f7393bba28efaa7981e18d8a386b2665fdb7dc6 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 a9e7f9fcff3e91dc1692e4058e25952a7c36fcca..a099643061a1d1fea479771f4ec1e496f85f5d5f 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 9ff799b0a27b5d4f749067201b837b86b4108f1a..6236edec6a4009e6ccfc6c23d3579b9622540da1 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 004bb0715f263d8724def76d6e4a0f29bc371be0..0cdfd1f4a7b6969ac4d7bd6a2ae17d81a2c14eec 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" ]; @@ -38,4 +39,6 @@ stdenv.mkDerivation rec { libintl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit CoreFoundation DiskArbitration ]); + + NIX_LDFLAGS = [ "-lm" ]; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 7255894f3b1fe9b78cbd46ed8e28921895343c29..e84f8dce912524a8fa0e846a009e06b29e1dc019 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 bd33d9c528078dc70c0960a71397493a61d223a7..916185bf7ecf64e45150346d69d482a2679907e5 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 f5fc635a5a43281b138a5cb045216c19cb5fc8d7..9ceb571983e2c067793cc7c81390b982b5dc70b8 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,33 +1,26 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub +, static ? false }: + stdenv.mkDerivation rec { name = "gtest-${version}"; - version = "1.8.0"; + version = "1.8.1"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "google"; repo = "googletest"; rev = "release-${version}"; - sha256 = "0bjlljmbf8glnd9qjabx73w6pd7ibv43yiyngqvmvgxsabzr8399"; + sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk"; }; - buildInputs = [ cmake ]; + patches = [ + ./fix-cmake-config-includedir.patch + ]; - configurePhase = '' - mkdir build - cd build - cmake ../ -DCMAKE_INSTALL_PREFIX=$out - ''; + nativeBuildInputs = [ cmake ninja ]; - 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 - ''; + cmakeFlags = stdenv.lib.optional (!static) "-DBUILD_SHARED_LIBS=ON"; meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch new file mode 100644 index 0000000000000000000000000000000000000000..c05e3a9326ae12675407a1c66289b1680d3f7b27 --- /dev/null +++ b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch @@ -0,0 +1,30 @@ +--- a/googlemock/CMakeLists.txt ++++ b/googlemock/CMakeLists.txt +@@ -106,10 +106,10 @@ + if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + target_include_directories(gmock SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + target_include_directories(gmock_main SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + endif() + + ######################################################################## +--- a/googletest/CMakeLists.txt ++++ b/googletest/CMakeLists.txt +@@ -126,10 +126,10 @@ + if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + target_include_directories(gtest SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + target_include_directories(gtest_main SYSTEM INTERFACE + "$" +- "$/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$") + endif() + target_link_libraries(gtest_main PUBLIC gtest) + diff --git a/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch b/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch new file mode 100644 index 0000000000000000000000000000000000000000..9725cfb84260ce812044e6007614c09b1cb9571a --- /dev/null +++ b/pkgs/development/libraries/gtk+/2.0-darwin-x11.patch @@ -0,0 +1,22 @@ +--- a/gdk/x11/gdkapplaunchcontext-x11.c ++++ b/gdk/x11/gdkapplaunchcontext-x11.c +@@ -26,7 +26,6 @@ + #include + + #include +-#include + + #include "gdkx.h" + #include "gdkapplaunchcontext.h" +@@ -363,10 +362,7 @@ + else + workspace_str = NULL; + +- if (G_IS_DESKTOP_APP_INFO (info)) +- application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info)); +- else +- application_id = NULL; ++ application_id = NULL; + + startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu", + g_get_prgname (), diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 4bf42e1b5b650b2f698687b7d575ec159aa6514d..c7638ea5fe5fc091267eda1a0eb0525bca77e6c0 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,15 +27,18 @@ 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 ./gtk2-theme-paths.patch - ] ++ optional stdenv.isDarwin (fetchpatch { - url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; - sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; - }); + ] ++ optionals stdenv.isDarwin [ + (fetchpatch { + url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; + sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; + }) + ./2.0-darwin-x11.patch + ]; propagatedBuildInputs = with xorg; [ glib cairo pango gdk_pixbuf atk ] diff --git a/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch b/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch new file mode 100644 index 0000000000000000000000000000000000000000..86631634b5bdd19095ab4f414588729de31cbc61 --- /dev/null +++ b/pkgs/development/libraries/gtk+/3.0-darwin-x11.patch @@ -0,0 +1,28 @@ +--- a/gdk/x11/gdkapplaunchcontext-x11.c ++++ b/gdk/x11/gdkapplaunchcontext-x11.c +@@ -27,7 +27,9 @@ + #include "gdkprivate-x11.h" + + #include ++#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__) + #include ++#endif + + #include + #include +@@ -352,10 +354,15 @@ + else + workspace_str = NULL; + ++#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__) + if (G_IS_DESKTOP_APP_INFO (info)) + application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info)); + else + application_id = NULL; ++#else ++ application_id = NULL; ++#warning Please add support for creating AppInfo from id for your OS ++#endif + + startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu", + g_get_prgname (), diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 27052d1922f6f87590b87719cbcad9a7d6c9fb96..dc0675db2cde26cd8fd5837604806519ac2e3d41 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 +{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes +, 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.3"; 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 = "1g839289bxakq4nn3m3ihi1rl6ym563pa5cxlswiyjwn9m9zl22p"; }; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl makeWrapper ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection perl makeWrapper ]; patches = [ ./3.0-immodules.cache.patch @@ -35,9 +35,14 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) + ] ++ optionals stdenv.isDarwin [ + # X11 module requires which is not installed on Darwin + # let’s drop that dependency in similar way to how other parts of the library do it + # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 + ./3.0-darwin-x11.patch ]; - buildInputs = [ libxkbcommon epoxy json-glib ] + buildInputs = [ libxkbcommon epoxy json-glib isocodes ] ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 0171a4b6833b071db23143ca1374a35f257ed653..26d0b5c359583d0af555a7e0f3a78b4e1d106415 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 b92bbf64514ef674cd0290edb2c813fbe16fb901..7f35f088da2b0efecf6717e652814515bba2ef1d 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 5b3ca828a3f814426c39ea1b5c3f721d6779e439..659dc14800e12d30ab66505e4685d88134c6087c 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, mono +{ stdenv +, lib +, fetchFromGitHub +, pkgconfig +, mono , glib , pango , gtk2 @@ -12,32 +16,44 @@ , libgnomeprintui ? null , libxml2 , monoDLLFixer +, autoconf +, automake +, libtool +, which }: -stdenv.mkDerivation { - name = "gtk-sharp-2.12.10"; +stdenv.mkDerivation rec { + name = "gtk-sharp-${version}"; + version = "2.12.45"; builder = ./builder.sh; - src = fetchurl { - url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz; - sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc"; + src = fetchFromGitHub { + owner = "mono"; + repo = "gtk-sharp"; + rev = version; + sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg"; }; - # patches = [ ./dllmap-glue.patch ]; - - # patch bad usage of glib, which wasn't tolerated anymore - prePatch = '' - for f in glib/glue/{thread,list,slist}.c; do - sed -i 's,#include ,#include ,g' "$f" + postInstall = '' + pushd $out/bin + for f in gapi2-* + do + substituteInPlace $f --replace mono ${mono}/bin/mono done + popd ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool which ]; + buildInputs = [ mono glib pango gtk2 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; + preConfigure = '' + ./bootstrap-${lib.versions.majorMinor version} + ''; + dontStrip = true; inherit monoDLLFixer; @@ -46,7 +62,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 3a473d6303adf13cc572100d30329610b0a8678e..f8f1f20cc2fd7db2a7a810cd104605dad79289e1 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 c0dc0753cd01317968eb2d423142c694fa35b381..d1ba18739e93087930677179de8a6418f694427f 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, which }: +, pango, pkgconfig, which, vte }: stdenv.mkDerivation rec { name = "gtkd-${version}"; - version = "3.8.3"; + version = "3.8.5"; src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "10jhwy1421bypq62ki1dzv8irvlgwr7s40z6l6vxallm4jkgk9gj"; + sha256 = "12n2njsaplra7x15nqwrj2hrf8a27pfjj2mck4mkzxv03qk6mqky"; stripRoot = false; }; @@ -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 @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { dontStrip = true; inherit atk cairo gdk_pixbuf librsvg pango; - inherit (gnome3) glib gtk3 gtksourceview libgda libpeas vte; + inherit (gnome3) glib gtk3 gtksourceview libgda libpeas; inherit (gst_all_1) gstreamer; gst_plugins_base = gst_all_1.gst-plugins-base; diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index d074f51d3ca0e7b93f74b5c42872d835948a7552..1caac3914a58f507ec7c48dfba6e92c80e00d19c 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2 }: stdenv.mkDerivation rec { - name = "gtkdatabox-0.9.3.0"; + name = "gtkdatabox-0.9.3.1"; src = fetchurl { url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz"; - sha256 = "1wigd4bdlrz4pma2l2wd3z8sx7pqmsvq845nya5vma9ibi96nhhz"; + sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 7845143ebeb56e868678e1cb1a7db0432c666598..ba20af1caf518906910dc974fd1b9bda68d7fa62 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,15 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy }: +{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: -let - ver_maj = "3.22"; - ver_min = "2"; -in stdenv.mkDerivation rec { - name = "gtkmm-${ver_maj}.${ver_min}"; + pname = "gtkmm"; + version = "3.24.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "91afd98a31519536f5f397c2d79696e3d53143b80b75778521ca7b48cb280090"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0hxaq4x9jqj8vvnv3sb6nwapz83v8lclbm887qqci0g50llcjpyg"; }; outputs = [ "out" "dev" ]; @@ -24,6 +21,13 @@ stdenv.mkDerivation rec { # https://bugzilla.gnome.org/show_bug.cgi?id=764521 doCheck = false; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "${pname}3"; + }; + }; + meta = with stdenv.lib; { description = "C++ interface to the GTK+ graphical user interface library"; diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index fe81c97ab6eb3bca66d3cee1aeac4252e139dd8f..0f9dd30d20461ddbb0fe7459164b869b140f311d 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.9"; 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 = "1hh7brcvpip96mkf9460ksy2qpx2pwynwd0634rx78z6afj7d7b9"; }; 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 2501e0253b39d53f33877446f51bdecc4848cb31..4ff1e999145f7dba09918a5fca0030bc79bac3e4 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/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix new file mode 100644 index 0000000000000000000000000000000000000000..d60bb29c47ae7395720cd82402f7bf825bf4504b --- /dev/null +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview4, gnome3 }: + +stdenv.mkDerivation rec { + pname = "gtksourceviewmm"; + version = "3.91.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "088p2ch1b4fvzl9416nw3waj0pqgp31cd5zj4lx5hzzrq2afgapy"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glibmm gtkmm3 gtksourceview4 ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = https://developer.gnome.org/gtksourceviewmm/; + description = "C++ wrapper for gtksourceview"; + license = licenses.lgpl2; + maintainers = gnome3.maintainers; + }; +} + diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..455cc4d4b81eb17176c6a3bd1b0f11d4a4576a71 --- /dev/null +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }: + +stdenv.mkDerivation rec { + name = "gtksourceviewmm-${version}"; + version = "3.21.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gtksourceviewmm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1danc9mp5mnb65j01qxkwj92z8jf1gns41wbgp17qh7050f0pc6v"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtksourceviewmm"; + attrPath = "gnome3.gtksourceviewmm"; + versionPolicy = "none"; + }; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + homepage = https://developer.gnome.org/gtksourceviewmm/; + description = "C++ wrapper for gtksourceview"; + license = licenses.lgpl2; + maintainers = [ maintainers.juliendehos ]; + }; +} + diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index d5fc094844a781bbd74cfc114d2c4ea3b5af0a72..6d428837680048cc6698b3bfb16453be20cac590 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 22094f3a3f64970bfb825498dc56407af67776c1..14676be0dcb97f8533897ef2720a8490034eae03 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 04456b4401936967d0b08a34d8e4000f77f587a2..cb141f8c55691c069bed60b564ca320ad3dda408 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 7491da7c3e2f99e3ce76d5a243c1c19c537bf3a2..cf04ca73f9e0d7d53ae718eddcd2a3ed0a03c972 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, 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}"; - version = "0.12.10"; + version = "0.12.11"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40"; + sha256 = "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8"; }; - nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ gupnp glib libxml2 ]; configureFlags = [ diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index aba95889b698392bd62aaabe546fc12f383670bf..a6c11a569cfa36bd8140c7e78cf3773064474417 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, gupnp, gst_all_1 }: +{ 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}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0spzd2saax7w776p5laixdam6d7smyynr9qszhbmq7f14y13cghj"; }; - nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ gupnp gst_all_1.gst-plugins-base ]; configureFlags = [ diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 50107959786df1f41071846ea8ea115f775534ac..05c8522aebc866ad0c82deea388c0fca77a6af15 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, 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}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; }; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkgconfig gettext gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; propagatedBuildInputs = [ glib gupnp ]; configureFlags = [ diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 45adf46ff36fb0f5617b37630e9b8a09ad6e6cde..648209125fe3f269140c9cc7edf3d8a494865690 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, 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}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./fix-requires.patch ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ]; + nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 ]; propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ]; configureFlags = [ diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 4da9db3ef0472cdc8b475ced046ab94537fe1208..78a2d365033ea2ff31788e8b8e9cd6f13c62c5e7 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 360c1fb41f4e5fce60c14c82a7cefef08eeba1bb..f7fda1a382feead2d2356eab97ae1f9f28e51a8e 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,94 +1,63 @@ -{ 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 +, gnomeSupport ? false, gnome, gcr, wrapGAppsHook , 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 - pkgconfig gettext makeWrapper + meson ninja python3 + pkgconfig gettext wrapGAppsHook 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 - ]); - - # Remove when switching back to meson - configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr"; + 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 + glib-networking # TLS support + gnome-online-accounts libsecret libgdata + ]); - # 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; + 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" + ]; - checkInputs = [ python3 ]; doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'" doInstallCheck = doCheck; - preFixup = '' - for f in $out/libexec/*; do - wrapProgram $f \ - ${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : \"${stdenv.lib.getLib gnome.dconf}/lib/gio/modules\""} \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 383f7f60f9bf253d5eae25eaefd7677cb2ca6922..198e26b39dd689f29065a5fdff268b796b07e96a 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.3.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 = "0r37z5cn04ig0q47y8c26gvadz15z9jj8c8q3r41j7d4anv4sc9v"; }; 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 75dd8693d2cf6f6369dc10f7e859213f1dd984eb..a5f8f00a6bfd06ef3672cf3b2114eb7827dd7529 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/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 51c369f7c2d46f43544768c16f6c013757e197b0..05e180161c0b987e7847cae5e0c341376ab17a33 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal) license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 7ff8ed61cab3d5acd303493bdb5e4f76a3df5f72..13f7c4219069c7d5564d86f003250c2745fc259c 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}"; @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Minimalistic C client for Redis >= 1.2"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index b2e2dbd35a4030e80498bca7348306399d5f6dd9..7a42ff94fc0fc6a0b07728ede5efbe621850f40f 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper -, perl, libxml2, IOStringy }: +, perlPackages, libxml2 }: stdenv.mkDerivation rec { name = "hivex-${version}"; - version = "1.3.15"; + version = "1.3.18"; src = fetchurl { url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; - sha256 = "02vzipzrp1gr87rn7mkhyzr4zdjkp2dzcvvb223x7i0ch8ci7r4c"; + sha256 = "0ibl186l6rd9qj4rqccfwbg1nnx6z07vspkhk656x6zav67ph7la"; }; patches = [ ./hivex-syms.patch ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - autoreconfHook makeWrapper - perl libxml2 IOStringy - ]; + autoreconfHook makeWrapper libxml2 + ] ++ (with perlPackages; [ perl IOStringy ]); postInstall = '' for bin in $out/bin/*; do diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index edb1dc01aa80b0a7deea7a7f5bade59d2d9215e0..db7dab1b6a7d4f268fc2e85202b35f7b2c13ee1a 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 20dda589b9cc8d7f8b4440f39b9f7489199e7917..32743e61797042e2efcbf4be55a51131a951b43d 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 5d4eae4e06392fecfadeef210e093d79bb9bf20f..4bae9793c38cbd18018f8d73e8c0c7764575f2a4 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,47 +1,27 @@ -{ stdenv, fetchurl, python2Packages, utillinux, fixDarwinDylibNames }: +{ stdenv, fetchurl }: let - version = "2.8.1"; + version = "2.9.0"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "15ids8k2f0xhnnxh4m85w2f78pg5ndiwrpl24kyssznnp1l5yqai"; + sha256 = "0gv1dhzwlv1anbzrba20l39gzzmz818yv8jbclbls268aj62c9pg"; }; + 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 b3914a4438b3c23604fd17a7eb9587a074c845bc..3728c05e516c0bdc5c07a1b2ae1d133072b15ae2 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/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 9f0a6c34512ff38ad3db51b4682550d705188367..aeb4253826b804dfb8443ef6d0b36d623868dd44 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -137,7 +137,7 @@ let { shortName, shortDescription, dictFileName, src }: mkDict rec { inherit src dictFileName; - version = "2014.11.17"; + version = "2018.04.16"; name = "hunspell-dict-${shortName}-wordlist-${version}"; readmeFile = "README_" + dictFileName + ".txt"; meta = with stdenv.lib; { @@ -250,6 +250,35 @@ let }; }; + mkDictFromLibreOffice = + { shortName + , shortDescription + , dictFileName + , license + , readmeFile ? "README_${dictFileName}.txt" + , sourceRoot ? dictFileName }: + mkDict rec { + name = "hunspell-dict-${shortName}-libreoffice-${version}"; + version = "6.2.0.3"; + inherit dictFileName readmeFile; + src = fetchFromGitHub { + owner = "LibreOffice"; + repo = "dictionaries"; + rev = "libreoffice-${version}"; + sha256 = "0rw9ahhynia5wsgyd67lrhinqqn1s1rizgiykb3palbyk0lv72xj"; + }; + buildPhase = '' + cp -a ${sourceRoot}/* . + ''; + meta = with stdenv.lib; { + homepage = https://wiki.documentfoundation.org/Development/Dictionaries; + description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; + license = license; + maintainers = with maintainers; [ vlaci ]; + platforms = platforms.all; + }; + }; + in { /* ENGLISH */ @@ -259,8 +288,8 @@ in { shortDescription = "English (United States)"; dictFileName = "en_US"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_US-2014.11.17.zip; - sha256 = "4ce88a1af457ce0e256110277a150e5da798213f611929438db059c1c81e20f2"; + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip; + sha256 = "18hbncvqnckzqarrmnzk58plymjqyi93k4qj98fac5mr71jbmzaf"; }; }; @@ -269,8 +298,8 @@ in { shortDescription = "English (Canada)"; dictFileName = "en_CA"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_CA-2014.11.17.zip; - sha256 = "59950448440657a6fc3ede15720c1b86c0b66c4ec734bf1bd9157f6a1786673b"; + url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip; + sha256 = "06yf3s7y1215jmikbs18cn4j8a13csp4763w3jfgah8zlim6vc47"; }; }; @@ -279,8 +308,8 @@ in { shortDescription = "English (United Kingdom, 'ise' ending)"; dictFileName = "en_GB-ise"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_GB-ise-2014.11.17.zip; - sha256 = "97f3b25102fcadd626ae4af3cdd97f017ce39264494f98b1f36ad7d96b9d5a94"; + url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ise-2018.04.16.zip; + sha256 = "0ylg1zvfvsawamymcc9ivrqcb9qhlpgpnizm076xc56jz554xc2l"; }; }; @@ -289,8 +318,8 @@ in { shortDescription = "English (United Kingdom, 'ize' ending)"; dictFileName = "en_GB-ize"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2014.11.17/hunspell-en_GB-ize-2014.11.17.zip; - sha256 = "84270673ed7c014445f3ba02f9efdb0ac44cea9ee0bfec76e3e10feae55c4e1c"; + url = mirror://sourceforge/wordlist/speller//hunspell-en_GB-ize-2018.04.16.zip; + sha256 = "1rmwy6sxmd400cwjf58az6g14sq28p18f5mlq8ybg8y33q9m42ps"; }; }; @@ -510,6 +539,15 @@ in { ]; }; + /* HUNGARIAN */ + + hu-hu = mkDictFromLibreOffice { + shortName = "hu-hu"; + dictFileName = "hu_HU"; + shortDescription = "Hungarian (Hungary)"; + license = with stdenv.lib.licenses; [ mpl20 lgpl3 ]; + }; + /* SWEDISH */ sv-se = mkDictFromDSSO rec { diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 90a16bcf7f940f16a406f47778a95f566e1aef66..81e30d675d2872d252e4ac426674f4a63bfbcec4 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -6,16 +6,22 @@ assert x11Support -> libX11 != null && cairo != null; with stdenv.lib; -stdenv.mkDerivation rec { - name = "hwloc-1.11.10"; +let + version = "2.0.3"; + versmm = versions.major version + "." + versions.minor version; + name = "hwloc-${version}"; + +in stdenv.mkDerivation { + inherit name; 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/v${versmm}/downloads/${name}.tar.bz2"; + sha256 = "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3"; }; configureFlags = [ "--localstatedir=/var" + "--enable-netloc" ]; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. @@ -75,7 +81,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 f99aa0b6f0cfa27c1a401dcba0f11100c8815aa0..516e4184623afb9135d903dcfc017f44058c83ec 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 0000000000000000000000000000000000000000..35966442da2df873e8de040fe15a8881b3f38ce7 --- /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/icu/63.nix b/pkgs/development/libraries/icu/63.nix new file mode 100644 index 0000000000000000000000000000000000000000..719318990c62406384430c53a30abaec717aa4d1 --- /dev/null +++ b/pkgs/development/libraries/icu/63.nix @@ -0,0 +1,14 @@ +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }: + +import ./base.nix { + version = "63.1"; + sha256 = "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05"; + patches = [ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398 + (fetchpatch { + url = https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch; + sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb"; + }) + ]; + patchFlags = [ "-p3" ]; +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; } diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 8ad58c5f90b0259700a2e72640fcd74913f5f7c8..0a8cb7d4684339fd9e33b97fe035905fbee9d49c 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,5 +1,5 @@ { version, sha256, patches ? [], patchFlags ? "" }: -{ stdenv, fetchurl, fixDarwinDylibNames +{ stdenv, lib, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot }: @@ -20,7 +20,7 @@ let ''; # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") + postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") && lib.versionOlder version "62.1" then "substituteInPlace i18n/digitlst.cpp --replace '' ''" else null; # won't find locale_t on darwin diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index dda1435c1dac7689f897999be94398903d381963..ddce76b10f7247bf16a52e30f5d526314839db17 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/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 442da700f34554eb3466a8fcd74912fa63b4749d..d4ebb5534d9c900c7ded6de8c4e3c962716ab3e3 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 4ac3ebc098891a75ee7421d469347f6371d94f92..aab64b941caa9a6a2ac4d3ae623aafbb3b288d04 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/ilmbase/cross.patch b/pkgs/development/libraries/ilmbase/cross.patch new file mode 100644 index 0000000000000000000000000000000000000000..207a440a0d850c5956086211a214099fba260244 --- /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 3989e941b6b2721e23a91c459b706fc3152c2cf2..42cf7780262579adc2e8617749bbc7debe1f0471 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" @@ -31,6 +32,5 @@ stdenv.mkDerivation rec { homepage = http://www.openexr.com/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index 2b95742c44c0629b68fd3dc6bc88e5a23ccfa650..a6281156afa17b36e917b09775d5d9c5494ead14 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libXext, xextproto, libjpeg, libungif, libtiff, libpng}: +{stdenv, fetchurl, libX11, libXext, xorgproto, libjpeg, libungif, libtiff, libpng}: stdenv.mkDerivation { name = "imlib-1.9.15"; @@ -13,9 +13,11 @@ stdenv.mkDerivation { "--x-libraries=${libX11.out}/lib" ]; - buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; + buildInputs = [libjpeg libXext libX11 xorgproto 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 18b42ea4b4fa41c01180b187213fc2b2d1db495c..2576580908a310337f6abc9038e15d5ccec6cc73 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 b9781ba9aa084b604df78fd06666b3ac3c4958d1..a4a009c66580be34c841231e6a2a6a85f66e38ff 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 0000000000000000000000000000000000000000..61d7b067ae820cee5a4c41d2b75acedd33d4ccc3 --- /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.4.1"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "gmmlib"; + rev = name; + sha256 = "1nxbz54a0md9hf0asdbyglvi6kiggksy24ffmk4wzvkai6vinm17"; + }; + + 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 0000000000000000000000000000000000000000..b1c9f59b019e204c88ec4fab700d50723ad62876 --- /dev/null +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub +, cmake, pkgconfig +, libva, libpciaccess, intel-gmmlib, libX11 +}: + +stdenv.mkDerivation rec { + name = "intel-media-driver-${version}"; + version = "18.4.1"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "media-driver"; + rev = "intel-media-${version}"; + sha256 = "192rfv6dk9jagx0q92jq6n1slc1pllgcc7rm85fgachq9rjl7szh"; + }; + + cmakeFlags = [ + "-DINSTALL_DRIVER_SYSCONF=OFF" + "-DLIBVA_DRIVERS_PATH=${placeholder "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 880f91fccedc931de5eb8b2f7b522c6cc9121461..0000000000000000000000000000000000000000 --- 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.15.0.nix deleted file mode 100644 index 8b6080c2880a8c2736a146214aa0ae3df382427a..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/isl/0.15.0.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, gmp }: - -stdenv.mkDerivation rec { - name = "isl-0.15"; - - src = fetchurl { - url = "http://isl.gforge.inria.fr/${name}.tar.xz"; - sha256 = "1m922l5bz69lvkcxrib7lvjqwfqsr8rpbzgmb2aq07bp76460jhh"; - }; - - 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.20.0.nix b/pkgs/development/libraries/isl/0.20.0.nix new file mode 100644 index 0000000000000000000000000000000000000000..72ef581725b9ae6d68a3f2bb7563e2d908b29b81 --- /dev/null +++ b/pkgs/development/libraries/isl/0.20.0.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, gmp }: + +stdenv.mkDerivation rec { + name = "isl-0.20"; + + src = fetchurl { + url = "http://isl.gforge.inria.fr/${name}.tar.xz"; + sha256 = "1akpgq0rbqbah5517blg2zlnfvjxfcl9cjrfc75nbcx5p2gnlnd5"; + }; + + buildInputs = [ gmp ]; + + enableParallelBuilding = true; + + meta = { + 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/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 36eedadc4c2e793083a78cb308f6279f1bb4bcc2..29fabdbb3b63a2783d5f9c2717ddbdd5eb97d265 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/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index b1167efdfee68e55f4116f21b66d06cfb0fcff2c..25b55f00311bf4a48606aad3b0dfeacfddb416d4 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.11"; + name = "jansson-2.12"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "1x5jllzzqamq6kahx9d9a5mrarm9m3f30vfxvcqpi6p4mcnz91bf"; + sha256 = "1jfj4xq3rdgnkxval1x2gqwhaam34qdxbplsj5fsrvs8a1vfr3az"; }; meta = with stdenv.lib; { @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "C library for encoding, decoding and manipulating JSON data"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index de4848c7dda403cd2841656c3e74258250ecbda8..eb9282274328b2e92ee9d11bf96c87755cf3e092 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 cf9c554d57f4a53c0907defdf38aef72f6d5059b..3c729f42320a0a746796cd2e597184ccf02210c5 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/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index a336ab503646c42292dbab6562b882aac50455d3..e46f22fadfb935f1a3523a7b675a8427813f28e0 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3.2"; + version = "3.6"; name = "commons-lang-${version}"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "1fmcx52h4cd2b7bplm7wy3725vh8bix64j3ykkxcn357y4j8ddzr"; + sha256 = "0r1wdjw48k2mk2wzyq5c3cx2zmark4q9psw52ma6v2i0sh6a9il0"; }; installPhase = '' diff --git a/pkgs/development/libraries/java/commons/math/default.nix b/pkgs/development/libraries/java/commons/math/default.nix index d43dcd2a91d5b87e865997369051effd8f4e2ffb..10c39f037890125e19178efccc5fd149f223a136 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 daee9adb1fdceadaca61a08924b989297ac5900a..5ec10cc7e0dfdb0243ad9511460f8a1f80b2aab0 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 b9d66fdc971691c7abb1219b379a590b51f69a3e..e34699d7740ed5f7c54c59f744cc5f45011bc3f1 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 b182964f657902ab5f20989613a174ffe79ff74b..ec407076906d0ccb7fb4375fcb8b71687e2e33f1 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 97ffcb647d621fc060cfe131d8da999c5b128437..a478ab0fc5028ed1ebe8dfe9b9e1cd5ffa76487d 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 221a2e93e4fca23739d9027a859eb1be709eb5d5..500c575f73aa95186f29226b9881f04fb21d0e8f 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 99d213a01dac03b1a5425f609d86468fdef151d5..16755471acd7688f6d8262e479ec5d22dbf56348 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 6947536fafb7f4fc4fedc09a9a935659f554dfcb..1bc918af8352d781acf355b1c3c4429db51aef8f 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 ad5192f94ce226b9589ac63a874f28105b2e8f7f..98291a7763cab11fa53bd8949d50388243ca545d 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 5ec4634d6323ee72208614c94634b76fa961afba..7f932d52dc411027a2418cab3962d54abdca6bc9 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 6f6534cee3eafc287f6ee783d7037a8eb3edf671..691b9905b04f60f8f1038c7fb206cf444f75d197 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 551375d33bd648eb70d834b048d2def30cc7dd55..ae93765ff9818caac0e1e072e667d431f1b9b7d1 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 ca9aa8fc36e8be7471b53613a31cae6fdd349efd..687e1e8a1deb5cb5a0bd2914806cb7a710319994 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/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 321ebb46e4634adb558ebbd7d91414e2dfdc62b2..2b2f75abfd1741ffbb5e756dbdb78af21be54d9d 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { description = "A software implementation of the JBIG1 data compression standard"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index d8866ae3ff8919d8bbf6f3a92ff4279675b37ac3..c14ac7c65abd76a8e4132ff5e58e8c22b0ade71b 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -1,6 +1,17 @@ -{ 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. +, stripPrefix ? stdenv.hostPlatform.isDarwin +, disableInitExecTls ? false +}: -stdenv.mkDerivation (rec { +with stdenv.lib; + +stdenv.mkDerivation rec { name = "jemalloc-${version}"; inherit version; @@ -9,14 +20,12 @@ 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 = [] + ++ optional stripPrefix "--with-jemalloc-prefix=" + ++ optional disableInitExecTls "--disable-initial-exec-tls" + ; + doCheck = true; enableParallelBuilding = true; @@ -30,6 +39,5 @@ stdenv.mkDerivation (rec { ''; license = licenses.bsd2; 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 40c06cbffdf019661beb7f19032aea508fb923d8..7ea7bccd6b8724ef45c241cd0f272c097944bb8a 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 00b38a855532f6cec531fddcb1f3bdfb8ef0144d..d328ab8016a18115b8fb96d7879e5b473f858434 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 0000000000000000000000000000000000000000..175097ef78550d3c12b29cbbfb14359c832b46a1 --- /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 be83dbc52f4550c8c9ac129217109f880c7a35dc..9a18b025fabe48dbb0be5bb39ec2fc7bc70e5ee0 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 a73122d8253e4b2628f584678ca5187a99caba2e..2324f1280a5e9d9e4f6ec689de38354990ca5543 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 1e687ff722b3366afb89109e6cc5e9eb5047c941..01ba605b506c815c91a9842f19877169b41f26c1 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 0000000000000000000000000000000000000000..47c87da065bad20b1149efcc305c6ebee0a01586 --- /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/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 1292d9cc7b33a29a5618685bfd531020d17529c9..9822bf4f725e22a2b283d0446b62c60ba75f8996 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.50/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.53/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index e4e4c90bfe142cbc419926b51e0b1ad6e00eb0d8..281778d9d07fb1b874bb57f76a56b7ed62880edf 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/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch index c9ad46b41bb76616539e2635f2d711c948b74c06..3e18d304c307dd221ee45defbf627c50fadb0ead 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch @@ -14,7 +14,7 @@ Index: kio-5.17.0/src/core/ksambashare.cpp + QLatin1Char pathSep(':'); + QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); + for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { -+ it->append("/smbd"); ++ it->append(QStringLiteral("/smbd")); + if (QFile::exists(*it)) { + return true; + } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 278de2d2a1ffd846d98fb4a60ff81d4efcedc35b..4b5cc3a37527d93bf4de6fb8941e38edc258105d 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/attica-5.50.0.tar.xz"; - sha256 = "0iyaxh92qsh25dl3y18235x9c39jvxgzvfmz96vs5rjkyjnnh88w"; - name = "attica-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/attica-5.53.0.tar.xz"; + sha256 = "0qn2x5551zv8547v20wcjhf123c4432651rdxz25p398wsm9ixlg"; + name = "attica-5.53.0.tar.xz"; }; }; baloo = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/baloo-5.50.0.tar.xz"; - sha256 = "07n90b2mz1d0anknwf271dp2w9hn2kdb0903zqsqnhmix1jqpfy6"; - name = "baloo-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/baloo-5.53.0.tar.xz"; + sha256 = "1jvxx7ggraaciw5i6vwda2jh41gqvjy19bjkcqwrmg59ggwzc1g8"; + name = "baloo-5.53.0.tar.xz"; }; }; bluez-qt = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/bluez-qt-5.50.0.tar.xz"; - sha256 = "028rdw97c042c1xcb2gwa6n4fcpn0wx4ilgh5j584afps6rg2k3b"; - name = "bluez-qt-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/bluez-qt-5.53.0.tar.xz"; + sha256 = "11i3xjaxqvczh8hky71jq20g2k4ipl0sxnaw8f1xix6h0v79m810"; + name = "bluez-qt-5.53.0.tar.xz"; }; }; breeze-icons = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/breeze-icons-5.50.0.tar.xz"; - sha256 = "1zhlylry01w3x72q8ipjgijkicjp3wyv9p183awvg3znkblghhgw"; - name = "breeze-icons-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/breeze-icons-5.53.0.tar.xz"; + sha256 = "1612kr0mrns3w5pydvfvcjdpfcvyw35bnzm44y286n99213w3cdf"; + name = "breeze-icons-5.53.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/extra-cmake-modules-5.50.0.tar.xz"; - sha256 = "1284gv6l1cck0y6phc9xphs1bl4ayk5a0nwzykhc8ncnkjqb0cyx"; - name = "extra-cmake-modules-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/extra-cmake-modules-5.53.0.tar.xz"; + sha256 = "07dllz7r00jm7n37wnz6zvjin304affaj69d8ji4v2wxhkxpg89d"; + name = "extra-cmake-modules-5.53.0.tar.xz"; }; }; frameworkintegration = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/frameworkintegration-5.50.0.tar.xz"; - sha256 = "14nq6v5xnznc7c7zdfvals4998cmlgdw4i7pz9hfbs35v0pswd03"; - name = "frameworkintegration-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/frameworkintegration-5.53.0.tar.xz"; + sha256 = "0a5szgknj96mphiczddl0l4c79ajszhyy3f19rqacj1z1kwrx9pj"; + name = "frameworkintegration-5.53.0.tar.xz"; }; }; kactivities = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kactivities-5.50.0.tar.xz"; - sha256 = "0jbri8whf91skxc0zg72bx0m7aym8ka801ncp9kxbjdcj1mbz451"; - name = "kactivities-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kactivities-5.53.0.tar.xz"; + sha256 = "1pjfh8ii4y9kpjr12z3zs9hmc8n5r0phkp40dclsrjsdpm9n8bf6"; + name = "kactivities-5.53.0.tar.xz"; }; }; kactivities-stats = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kactivities-stats-5.50.0.tar.xz"; - sha256 = "0h6dl0522sl7glzk4rz7qj5642il2nr2jwmknbwv3ljhxba9qdrs"; - name = "kactivities-stats-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kactivities-stats-5.53.0.tar.xz"; + sha256 = "0bd6km50h0jlpi8z1dhh9jvx2wqgh3sa473n7bsyd2dgzyibs52n"; + name = "kactivities-stats-5.53.0.tar.xz"; }; }; kapidox = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kapidox-5.50.0.tar.xz"; - sha256 = "11hp0qpndy9s8g6x95s8lk7abkp1yvqraa1cdvvsdhn71izmsmqz"; - name = "kapidox-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kapidox-5.53.0.tar.xz"; + sha256 = "1snsql5scq6licrlqf9w77085s4992f1ij6w7rwj8d5x4cyxc9ca"; + name = "kapidox-5.53.0.tar.xz"; }; }; karchive = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/karchive-5.50.0.tar.xz"; - sha256 = "1jh1cyvdg680swyq2nmcpk4cfqmy67v49jl76nm1b5399zcs282l"; - name = "karchive-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/karchive-5.53.0.tar.xz"; + sha256 = "0jbr19azrkxywf9dwrfdw5qi47g7h5m92m4f93skccr11a1m0hvr"; + name = "karchive-5.53.0.tar.xz"; }; }; kauth = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kauth-5.50.0.tar.xz"; - sha256 = "15pk78a76897y4rym5ln1l5zm3n64rprl7k5bwkp4qzhwy7gzv7p"; - name = "kauth-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kauth-5.53.0.tar.xz"; + sha256 = "0c41azn8c6wr5rc7f0v1bxvka9i4z3c346814mlim3i62842fz3b"; + name = "kauth-5.53.0.tar.xz"; }; }; kbookmarks = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kbookmarks-5.50.0.tar.xz"; - sha256 = "1lvsarcwjkmx14bni9akxrrr11zsvr9fv47ahw97kj9p3wdb1sy9"; - name = "kbookmarks-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kbookmarks-5.53.0.tar.xz"; + sha256 = "1mrzbwsirma1bzazamilh3r5a04m6x5902gjs1sd7bc0ijs85dr9"; + name = "kbookmarks-5.53.0.tar.xz"; }; }; kcmutils = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kcmutils-5.50.0.tar.xz"; - sha256 = "1q9z8p20fn6k8yrhy0nq77yg4ra5vnpq6hq9mr7jkjqni9b0h3np"; - name = "kcmutils-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kcmutils-5.53.0.tar.xz"; + sha256 = "0xsg50pywawzzw2fb0bhhmjp2z3w4572knfq8s4jki3iidixp3kv"; + name = "kcmutils-5.53.0.tar.xz"; }; }; kcodecs = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kcodecs-5.50.0.tar.xz"; - sha256 = "13gh7vys0xxpfqzjbxwr65p6d6jgcg0wr9ir1xqbkc368kay4n7b"; - name = "kcodecs-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kcodecs-5.53.0.tar.xz"; + sha256 = "0wmilqkcw1dvvrw56r8virp7zscy0g04ry8j7h812nfzhfz9z4vs"; + name = "kcodecs-5.53.0.tar.xz"; }; }; kcompletion = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kcompletion-5.50.0.tar.xz"; - sha256 = "1n0frkk2phf6a0rcrsf011jb2f66sisjy9lmmiy1czy533y3iraz"; - name = "kcompletion-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kcompletion-5.53.0.tar.xz"; + sha256 = "00df0pa28glf4w5zyjmnzasbip1q2cyyyply1f6k0xpfg0qwgxf9"; + name = "kcompletion-5.53.0.tar.xz"; }; }; kconfig = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kconfig-5.50.0.tar.xz"; - sha256 = "0jb4lq3k8lyjksgj728hgf0h81v6fxy1kyp17sv0cjrs6n3z8ry8"; - name = "kconfig-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kconfig-5.53.0.tar.xz"; + sha256 = "0xyxycpbi680sfrfzdzhwi95dqd4xsc42zxn5clzvfbgapbw2db7"; + name = "kconfig-5.53.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kconfigwidgets-5.50.0.tar.xz"; - sha256 = "102al35g2c6v091zm086lvhbym0j0f81zpn6wsk5wr0xc569lagj"; - name = "kconfigwidgets-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kconfigwidgets-5.53.0.tar.xz"; + sha256 = "0bpylj1faki7f55cf82ljmgll17vz1irqna1i9rzkbb28kvqf2kv"; + name = "kconfigwidgets-5.53.0.tar.xz"; }; }; kcoreaddons = { - version = "5.50.0"; + version = "5.53.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kcoreaddons-5.50.0.tar.xz"; - sha256 = "1b7m4an322hk89n1svy3345106kphhn0ha7q21k5b3bwphszrx28"; - name = "kcoreaddons-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kcoreaddons-5.53.1.tar.xz"; + sha256 = "18rhih779sxrlvg8sxyw31v3h58arvk2vsmvr0bmpnrnnfwv3vak"; + name = "kcoreaddons-5.53.1.tar.xz"; }; }; kcrash = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kcrash-5.50.0.tar.xz"; - sha256 = "00n2ynhp1dbp75wkx9wm4mlyf5q3cbrk7k563mdihw88mzmmyvl4"; - name = "kcrash-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kcrash-5.53.0.tar.xz"; + sha256 = "1nnfn71kl97d5ywg2xjacr48mh9khrgszm9cifdn2jdk6vxssmlb"; + name = "kcrash-5.53.0.tar.xz"; }; }; kdbusaddons = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kdbusaddons-5.50.0.tar.xz"; - sha256 = "0ijvg4j97j4fv063phg086s9db6nj5gfgic5gcqg99h9hznbqkym"; - name = "kdbusaddons-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kdbusaddons-5.53.0.tar.xz"; + sha256 = "05zf41m3j4ckjk68dqv2rw8abg22x6m6bwiwp8rm6ac1p33hqayh"; + name = "kdbusaddons-5.53.0.tar.xz"; }; }; kdeclarative = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kdeclarative-5.50.0.tar.xz"; - sha256 = "1fwfzvadqh4rfyklygs17mkikh5m0m4flka91wbhw6jg6w7bvc4c"; - name = "kdeclarative-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kdeclarative-5.53.0.tar.xz"; + sha256 = "0c7sxz733c9gfarjbrphrvn5v9bkx1i7vhn97xp7b3w22892ab7w"; + name = "kdeclarative-5.53.0.tar.xz"; }; }; kded = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kded-5.50.0.tar.xz"; - sha256 = "1hfh2l40s2mz4qh2wirfa8lnixvvl6y0agh3l5ii0jw93wvyci01"; - name = "kded-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kded-5.53.0.tar.xz"; + sha256 = "18yh27ddp4aldpmkflj9q6anrpnzawhn7nrykvayxxbgmdg4gn48"; + name = "kded-5.53.0.tar.xz"; }; }; kdelibs4support = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/portingAids/kdelibs4support-5.50.0.tar.xz"; - sha256 = "12ilp1cnpfhd8f4zsnwwq428cip43yq3xj0px91ndfrgq8chg05l"; - name = "kdelibs4support-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/portingAids/kdelibs4support-5.53.0.tar.xz"; + sha256 = "1ai1k1m08zq04rxi5px1agmqzmv59lic7qqiqg4iwnm5i8q2z2i0"; + name = "kdelibs4support-5.53.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kdesignerplugin-5.50.0.tar.xz"; - sha256 = "00dhhars7ab7zjsz992yswcns5zijzyy84fpym2hg1avxinm31x5"; - name = "kdesignerplugin-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kdesignerplugin-5.53.0.tar.xz"; + sha256 = "1m0ysmpysjpmnmmmyp5xkfzygi1w0dnn7j707c6nj31y2s7078q6"; + name = "kdesignerplugin-5.53.0.tar.xz"; }; }; kdesu = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kdesu-5.50.0.tar.xz"; - sha256 = "095vddhhlc8kyhrmygccvhzbhl6bkscnfrx3vf96anm68zyk4g3f"; - name = "kdesu-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kdesu-5.53.0.tar.xz"; + sha256 = "18kd19y95gllyarjlm0768s3b9q67ia6dajdw89rrk1qgvbw42xy"; + name = "kdesu-5.53.0.tar.xz"; }; }; kdewebkit = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kdewebkit-5.50.0.tar.xz"; - sha256 = "0p5h58mcwyjkrbyq66360blx001j4997dk7z85a3hf64hhv7k10h"; - name = "kdewebkit-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kdewebkit-5.53.0.tar.xz"; + sha256 = "1x5b85lr6ck2vklj641ra6sx1fvz2daiy8vsgpziii0752a0ayf2"; + name = "kdewebkit-5.53.0.tar.xz"; }; }; kdnssd = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kdnssd-5.50.0.tar.xz"; - sha256 = "05d2y205mvdbgmmm0h4agbg4xf48x1xc2lgfvjnpgx8ilb5136pi"; - name = "kdnssd-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kdnssd-5.53.0.tar.xz"; + sha256 = "0hghpamkxwjvfh87y2qcy20bmxvglzwrzmfg26hycmxgj0l3frhb"; + name = "kdnssd-5.53.0.tar.xz"; }; }; kdoctools = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kdoctools-5.50.0.tar.xz"; - sha256 = "1zgjf7ib8qlgjkkhkgd3b679b672cgsbiqsshbp0f1hn25ig4dqy"; - name = "kdoctools-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kdoctools-5.53.0.tar.xz"; + sha256 = "0kjijwc66rg737z6z8c275wfb2gn7xgslgmrys5dxaqqzrinbn1j"; + name = "kdoctools-5.53.0.tar.xz"; }; }; kemoticons = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kemoticons-5.50.0.tar.xz"; - sha256 = "194rhxwf7h3mmb990l0p6l6lrf181c0scikj4h2ngmnjklgvajsg"; - name = "kemoticons-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kemoticons-5.53.0.tar.xz"; + sha256 = "0x9jrc5pswmcj36qs3283c5bz63sbgr87m7dn9ykas7a50xgyv0w"; + name = "kemoticons-5.53.0.tar.xz"; }; }; kfilemetadata = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kfilemetadata-5.50.0.tar.xz"; - sha256 = "063148xbnrgplzfgqdiwyzdj2rix97xln1x72kn3qprxzc5y257l"; - name = "kfilemetadata-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kfilemetadata-5.53.0.tar.xz"; + sha256 = "18wgzhg146iscg7nm7xabmzsw73x0by2imkh6wgky87nwry7020s"; + name = "kfilemetadata-5.53.0.tar.xz"; }; }; kglobalaccel = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kglobalaccel-5.50.0.tar.xz"; - sha256 = "1dwp9h7lf1lagwhm2yd2wx130s1kacjinw95f4sznxdw943vp1b3"; - name = "kglobalaccel-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kglobalaccel-5.53.0.tar.xz"; + sha256 = "1h60kl309pz4i6jr6a444d14i2dzqhjapga837my2mylsdjj3wqi"; + name = "kglobalaccel-5.53.0.tar.xz"; }; }; kguiaddons = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kguiaddons-5.50.0.tar.xz"; - sha256 = "1apz11issmj8c8zw4l88grl38m6nhgwpxb1j9h9v6khjvkwxr987"; - name = "kguiaddons-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kguiaddons-5.53.0.tar.xz"; + sha256 = "1kj1jvq7lqlnr00fmlfrj7vkvlwav7b5r4bpifysx1l4285y5y76"; + name = "kguiaddons-5.53.0.tar.xz"; }; }; kholidays = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kholidays-5.50.0.tar.xz"; - sha256 = "0zjkmsjq4m7d2gmsa0m613ny92xcb3w9zbkbsvnh8ci7ghiscz1j"; - name = "kholidays-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kholidays-5.53.0.tar.xz"; + sha256 = "1zn581ibv4wg5c4q97l40wdpj18p5kwxk4zxl3cl4l445ivv04p5"; + name = "kholidays-5.53.0.tar.xz"; }; }; khtml = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/portingAids/khtml-5.50.0.tar.xz"; - sha256 = "1r1qz3pyqifrzinjz83rhb5fgw5si8xmac7jkmn8w82j2kb41bxa"; - name = "khtml-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/portingAids/khtml-5.53.0.tar.xz"; + sha256 = "07cmpqk92z4b631q6ngg7sdw4p56r11mdqf2fvbcwmqksx6b11fy"; + name = "khtml-5.53.0.tar.xz"; }; }; ki18n = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/ki18n-5.50.0.tar.xz"; - sha256 = "1y6baizaynphbsfc2b93dh2nah23jh8a3rcbqn7whrdln0f31z19"; - name = "ki18n-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/ki18n-5.53.0.tar.xz"; + sha256 = "052c7rvqqb2hx9wn91sdp4wcz5vdym5iszb1vnpr9wdc3psqq41x"; + name = "ki18n-5.53.0.tar.xz"; }; }; kiconthemes = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kiconthemes-5.50.0.tar.xz"; - sha256 = "0ip0py0lx3rhjg6wzhdxrbzckmq4n1pnfbzm996wqka6aa4dwzry"; - name = "kiconthemes-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kiconthemes-5.53.0.tar.xz"; + sha256 = "1h54mqda05x4p1kplhxnqa488pvqn354qnk1qg2l851lh69ail9q"; + name = "kiconthemes-5.53.0.tar.xz"; }; }; kidletime = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kidletime-5.50.0.tar.xz"; - sha256 = "1kqghslwvis72h1sw6r4vrwsz0mwqzf5shj6m5mxqk6jv9wbfni1"; - name = "kidletime-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kidletime-5.53.0.tar.xz"; + sha256 = "04jbig9mf45mzajwgi66vz3b2zqg4p1gca1jkcl4yk6a4csg43ri"; + name = "kidletime-5.53.0.tar.xz"; }; }; kimageformats = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kimageformats-5.50.0.tar.xz"; - sha256 = "0kndxzkcjm9syb6k7zzw2jxdfm1gw6gasq78issypxwc1zci5nvb"; - name = "kimageformats-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kimageformats-5.53.0.tar.xz"; + sha256 = "0b59sa5x58mxzkv9h9xxfzb89k27cpyqzfgf4kl7zbxklxxszafj"; + name = "kimageformats-5.53.0.tar.xz"; }; }; kinit = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kinit-5.50.0.tar.xz"; - sha256 = "1lgalvd81skdncdhd0pwng0vvy54f5wi2wwpqcil22y3860jfb4i"; - name = "kinit-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kinit-5.53.0.tar.xz"; + sha256 = "14dd165al0gn1y3jhlk3jgz3px8rcccn3hp5isywa2xxzl7v5raw"; + name = "kinit-5.53.0.tar.xz"; }; }; kio = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kio-5.50.0.tar.xz"; - sha256 = "1bnjal43rpsbabwq756xswj1cbhbrqxgjpjccjgxqml7csa3yhh1"; - name = "kio-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kio-5.53.0.tar.xz"; + sha256 = "1hr4875v1ph8jbsqbyrhk5vxa908kv7xic7ymk9rmaqrkc0dy83k"; + name = "kio-5.53.0.tar.xz"; }; }; kirigami2 = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kirigami2-5.50.0.tar.xz"; - sha256 = "0jc4xrs0il5b7s7hzi4ff7jn30r8kgg4fzqxrhwqix9rcxn3nrxl"; - name = "kirigami2-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kirigami2-5.53.0.tar.xz"; + sha256 = "0avr7slzww3fpdyczi0y3djvrccs3jq2jyq82r02xfw8mwb93zii"; + name = "kirigami2-5.53.0.tar.xz"; }; }; kitemmodels = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kitemmodels-5.50.0.tar.xz"; - sha256 = "1c4yfqibizrm0zw9kijgkx4pq0r9f12nrw2dnw90g8q7s0pg7q36"; - name = "kitemmodels-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kitemmodels-5.53.0.tar.xz"; + sha256 = "1gkw57fgm6dcy9jssaq9d1mkgd1g6jxk2aqpf4lq1nvqkr7jqzbl"; + name = "kitemmodels-5.53.0.tar.xz"; }; }; kitemviews = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kitemviews-5.50.0.tar.xz"; - sha256 = "0wghvj5f1xkm9rf6rg50m399z25m1rfvd67ixr0lqwnhag1r32n8"; - name = "kitemviews-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kitemviews-5.53.0.tar.xz"; + sha256 = "0r60mp90k7psa9maz3dhhq3npbl95cckvmk51fpljcb8c3rpjymq"; + name = "kitemviews-5.53.0.tar.xz"; }; }; kjobwidgets = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kjobwidgets-5.50.0.tar.xz"; - sha256 = "0jc7hiid2b2bpj0xw2clrzkplnqi7x1lhh5za2c37dlynndy609q"; - name = "kjobwidgets-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kjobwidgets-5.53.0.tar.xz"; + sha256 = "161wq1s1a1cb5a47wswg6g6qrmczgzwikp1cjsgxfykpgrxkp620"; + name = "kjobwidgets-5.53.0.tar.xz"; }; }; kjs = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/portingAids/kjs-5.50.0.tar.xz"; - sha256 = "1jfdcg725mwcfigqhp2srshvj7vhzxb3yhpwij8c0gwmzm0h1lxv"; - name = "kjs-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/portingAids/kjs-5.53.0.tar.xz"; + sha256 = "1jic7xyfmd829i82kbjin2xf9f3cir2s9v04r7ri7bq6gi2iw4c9"; + name = "kjs-5.53.0.tar.xz"; }; }; kjsembed = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/portingAids/kjsembed-5.50.0.tar.xz"; - sha256 = "1iacz8x0idlswg0lwiv2i1k2qklhkk6ih6nhkajq4dy6ajnpbn7a"; - name = "kjsembed-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/portingAids/kjsembed-5.53.0.tar.xz"; + sha256 = "0j3jzn7qwh9sw9gxk1f435vijkrgnzpsqx3a4yx7w3n93h96h36r"; + name = "kjsembed-5.53.0.tar.xz"; }; }; kmediaplayer = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/portingAids/kmediaplayer-5.50.0.tar.xz"; - sha256 = "0wz8ln45wkslh5c7dq8dijj19xr1xqxi5svv58a3hr5vbcyw3sjm"; - name = "kmediaplayer-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/portingAids/kmediaplayer-5.53.0.tar.xz"; + sha256 = "1r6cl6paap7hmpqr05mj8qxcb2sa16kdc0zqj8g6gqb32xj6wk0k"; + name = "kmediaplayer-5.53.0.tar.xz"; }; }; knewstuff = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/knewstuff-5.50.0.tar.xz"; - sha256 = "1imh0hl056hpmrvdlmb68v0wclx3isr6l8sdqrzh3snmjm3jdwhd"; - name = "knewstuff-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/knewstuff-5.53.0.tar.xz"; + sha256 = "0d5yszf6fj8qjmr50jfa9f34xcn9k8n4bj4c3h635ccwb7l3i6q3"; + name = "knewstuff-5.53.0.tar.xz"; }; }; knotifications = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/knotifications-5.50.0.tar.xz"; - sha256 = "0xj62kbrlq4ib7kibwrmsbf84nv6klbh3v7rb34alacvvaf5lljs"; - name = "knotifications-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/knotifications-5.53.0.tar.xz"; + sha256 = "0fbjg48ck6mr98gl3075vf9mn8fwdrsz0jm9hbnzr2vn9yrg57nz"; + name = "knotifications-5.53.0.tar.xz"; }; }; knotifyconfig = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/knotifyconfig-5.50.0.tar.xz"; - sha256 = "01l4wn9khdd28rbi2qbpaqrgjp6achg6wbpaixwph2y2g9zgixdz"; - name = "knotifyconfig-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/knotifyconfig-5.53.0.tar.xz"; + sha256 = "1f3hq2l8fkff4dnkf6klj60jv946yfaw84i50q192blwqfkij896"; + name = "knotifyconfig-5.53.0.tar.xz"; }; }; kpackage = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kpackage-5.50.0.tar.xz"; - sha256 = "0bx1hzjl5m9893s97mlhrrshagfkng36rxa0bwm7y8sbh4rnnj8p"; - name = "kpackage-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kpackage-5.53.0.tar.xz"; + sha256 = "1gllbi7y4svlkwhvp0sh3bdhiah2f55spg7wh149sqwmnmvj09ra"; + name = "kpackage-5.53.0.tar.xz"; }; }; kparts = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kparts-5.50.0.tar.xz"; - sha256 = "1zwa0pyy0sa3j0yrdggl33gx3a48zvz68nl8r7b7ak445iwmx821"; - name = "kparts-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kparts-5.53.0.tar.xz"; + sha256 = "0cfzbf706dn4kjz8mz53b1a0dzk0f540n0j144x4701c4gfajnim"; + name = "kparts-5.53.0.tar.xz"; }; }; kpeople = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kpeople-5.50.0.tar.xz"; - sha256 = "0vc81g2i5wznfav4nh5c8cp31aridiwg9ksg0gaa2q41882w560b"; - name = "kpeople-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kpeople-5.53.0.tar.xz"; + sha256 = "1bsnj5r47azl889izxdlwcbfrfmg921cpapicn7klynmsw58lpdg"; + name = "kpeople-5.53.0.tar.xz"; }; }; kplotting = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kplotting-5.50.0.tar.xz"; - sha256 = "18xw8q426sapim7532f0syb5nwf0vhx9h6xp52lyljj98l88vydw"; - name = "kplotting-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kplotting-5.53.0.tar.xz"; + sha256 = "0cnnzyybzsrdrnhhcc47i6jakhrixdxakfv2ib0fpsiif3fn3jpx"; + name = "kplotting-5.53.0.tar.xz"; }; }; kpty = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kpty-5.50.0.tar.xz"; - sha256 = "0slk8nwh94p8xp3q91wmda2v3ipmsvd4fpdsdfz4w2j0kh6nd6w5"; - name = "kpty-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kpty-5.53.0.tar.xz"; + sha256 = "01qy5pvd5j014zh455sh0qb8x0g1yc60bbdqh34nk84s8mx3mz9z"; + name = "kpty-5.53.0.tar.xz"; }; }; kross = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/portingAids/kross-5.50.0.tar.xz"; - sha256 = "1g0i34z4rhrsnq41plavq880r3c17fki69vs3wjvzmybfn0klha2"; - name = "kross-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/portingAids/kross-5.53.0.tar.xz"; + sha256 = "1q69pppmnxmjfmi73ks6mrkib76nhhffn0c3j93qq7cq3ingjzjy"; + name = "kross-5.53.0.tar.xz"; }; }; krunner = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/krunner-5.50.0.tar.xz"; - sha256 = "03igg111n7c6ys0xm075hlr8k0g599pwgha7wi02k8dbbc2q20g8"; - name = "krunner-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/krunner-5.53.0.tar.xz"; + sha256 = "09n824q8k1ihfgz6yzb5xv99p241733574yhhv1y47cyrp7d904l"; + name = "krunner-5.53.0.tar.xz"; }; }; kservice = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kservice-5.50.0.tar.xz"; - sha256 = "0y0yk1gr7nd0svk4vkbyy1igy2klmwmsv8wwx1bvfkkg3yshz199"; - name = "kservice-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kservice-5.53.0.tar.xz"; + sha256 = "06b35zynmlhidgzxp7mqv20fcw6wvdsszfam1phv7wji1xhhpnk2"; + name = "kservice-5.53.0.tar.xz"; }; }; ktexteditor = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/ktexteditor-5.50.0.tar.xz"; - sha256 = "00h75yy17npwzhz572k1784h2gw5gynhl9gxbj0i9zbis1nfi1m2"; - name = "ktexteditor-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/ktexteditor-5.53.0.tar.xz"; + sha256 = "1hcn4dk6gw96aknh6dn9yi1fwq7s90kjmcvn3wgf4ig1408q6b7g"; + name = "ktexteditor-5.53.0.tar.xz"; }; }; ktextwidgets = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/ktextwidgets-5.50.0.tar.xz"; - sha256 = "18z108si2cr38np3wcd7hkjjqhs661j2xv0zf8837mm9di4bgjiz"; - name = "ktextwidgets-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/ktextwidgets-5.53.0.tar.xz"; + sha256 = "025z1x7mp7wdm62h6igbsvb99l09jsdzna4m30h586h7rhn8kvdc"; + name = "ktextwidgets-5.53.0.tar.xz"; }; }; kunitconversion = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kunitconversion-5.50.0.tar.xz"; - sha256 = "0f37ap98rzc575vjf1hhh51bbjvgn00g9mdnp9x3lmi5l6npvwj4"; - name = "kunitconversion-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kunitconversion-5.53.0.tar.xz"; + sha256 = "1yr6dfcqabkv2r7p9f814hd1x8c1bfy2k2f83zj4qlahzb91mw6v"; + name = "kunitconversion-5.53.0.tar.xz"; }; }; kwallet = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kwallet-5.50.0.tar.xz"; - sha256 = "14hlcly6x9ybczxg63nwsgv7kah1sx0haxlyllma4rwmh8a85ji5"; - name = "kwallet-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kwallet-5.53.0.tar.xz"; + sha256 = "135vc52zx0ikb684z6ds2hlr39vj2z8g2rp9f51py52pf7fxkwc0"; + name = "kwallet-5.53.0.tar.xz"; }; }; kwayland = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kwayland-5.50.0.tar.xz"; - sha256 = "021pqsv59svj6j4g6alcgrsdi5bybx8i1skpf1v5nf5fc6f17bqb"; - name = "kwayland-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kwayland-5.53.0.tar.xz"; + sha256 = "0k6j8w3ccx9kkqnp757z2g5y4jcl2y2ppvx8vvl7z97jjn66563h"; + name = "kwayland-5.53.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kwidgetsaddons-5.50.0.tar.xz"; - sha256 = "0yvd1b15vjk03jdwpyd97z1wn892amp3jkx3s7ff8nc8ax7fyc4m"; - name = "kwidgetsaddons-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kwidgetsaddons-5.53.0.tar.xz"; + sha256 = "1k9y3gcpzgdzd4ps8m4gx3wz166k0jqzccn8z8p2jr2nfjdwp4mc"; + name = "kwidgetsaddons-5.53.0.tar.xz"; }; }; kwindowsystem = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kwindowsystem-5.50.0.tar.xz"; - sha256 = "0gmk7hp4z7ly6hm0z479hv5vqlmzfr4c9p6r572agzbpc8m682v9"; - name = "kwindowsystem-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kwindowsystem-5.53.0.tar.xz"; + sha256 = "1z89b3my3wsncbq16bqsncbf9grji77sb0j17lj7w5hm36d01clz"; + name = "kwindowsystem-5.53.0.tar.xz"; }; }; kxmlgui = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kxmlgui-5.50.0.tar.xz"; - sha256 = "1ga81jd0ad5jkb9wdh5hwzzq9axw6pcy4jz1vlc9s2xywyaq931l"; - name = "kxmlgui-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kxmlgui-5.53.0.tar.xz"; + sha256 = "1acppl4wzqrpa8iys8z2qqxrw4xy61q02vybn0ysspa0yrdxga9f"; + name = "kxmlgui-5.53.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/kxmlrpcclient-5.50.0.tar.xz"; - sha256 = "03xqxb08kbzs1m0sxpgq8lzf4809kkhl7yc17svq7y00xgq3h36r"; - name = "kxmlrpcclient-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/kxmlrpcclient-5.53.0.tar.xz"; + sha256 = "07ns1fj5vq0fzqhrrmbm7cjnnzkl1jlgcf1lv3kfik1y13fd9zkd"; + name = "kxmlrpcclient-5.53.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/modemmanager-qt-5.50.0.tar.xz"; - sha256 = "1w7im3ihcpqvjiw7rj7iakxpyhzlaams0r900kh0mv4zfdyl9szs"; - name = "modemmanager-qt-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/modemmanager-qt-5.53.0.tar.xz"; + sha256 = "1lgvj086k21sm6b0pf9k51zv4fy5i4wlnsjwv2zfvapdrndl8kdp"; + name = "modemmanager-qt-5.53.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/networkmanager-qt-5.50.0.tar.xz"; - sha256 = "168bzsvsh3i1w3840nickg7rv0hncaiiv6sc1sycg4n6v7773dzl"; - name = "networkmanager-qt-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/networkmanager-qt-5.53.0.tar.xz"; + sha256 = "11vqmx11lgyagbq9zvaw4s9k7wyyyigpd8d0i3w49h34nyv0p5yi"; + name = "networkmanager-qt-5.53.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/oxygen-icons5-5.50.0.tar.xz"; - sha256 = "1ajx9y4wqzi55dmz360j7ha987m3wzs2zbnrm49lipgd55c8n3nc"; - name = "oxygen-icons5-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/oxygen-icons5-5.53.0.tar.xz"; + sha256 = "13pcvzskng2mc8cwwhmq6p428nc9qzllxykx95z2s2k3b8nh726m"; + name = "oxygen-icons5-5.53.0.tar.xz"; }; }; plasma-framework = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/plasma-framework-5.50.0.tar.xz"; - sha256 = "01p0friqdhzjkssd655rdsfxp2hdqaf34ypqzx7xwnw3wj1971r8"; - name = "plasma-framework-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/plasma-framework-5.53.0.tar.xz"; + sha256 = "0swyn04w61dvdkmb2fahb6k93vlggh7xv4k2yygshqrkmwk6ilym"; + name = "plasma-framework-5.53.0.tar.xz"; }; }; prison = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/prison-5.50.0.tar.xz"; - sha256 = "1v62dq44li0wwrgiiwad2hjj2vzcypa3i9qp0gwc8kkzg162b62d"; - name = "prison-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/prison-5.53.0.tar.xz"; + sha256 = "0ydm36jkwc2x53kf5n0xswh72g2cixd5444xfrhcwiyq905z3db1"; + name = "prison-5.53.0.tar.xz"; }; }; purpose = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/purpose-5.50.0.tar.xz"; - sha256 = "11m5391mjf4r89frvvdq9jlkylp67h87x0g3mx00yfc004bsyi6f"; - name = "purpose-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/purpose-5.53.0.tar.xz"; + sha256 = "1y6v51p9j9gm9pad38h6dqxav4m7ryxp4h35qjz46wisacgvpfkf"; + name = "purpose-5.53.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/qqc2-desktop-style-5.50.0.tar.xz"; - sha256 = "0ml88m6hb1llzl7kaykkny7v717grvzh8jnlwdyla2lv4rvvz7d8"; - name = "qqc2-desktop-style-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/qqc2-desktop-style-5.53.0.tar.xz"; + sha256 = "1f17f3mqwzn5s0a08xh68dmvzkvn2g8ah7810hd25l2hvmkfvm04"; + name = "qqc2-desktop-style-5.53.0.tar.xz"; }; }; solid = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/solid-5.50.0.tar.xz"; - sha256 = "1y8sclp8lqf4hkqvbm1mmklrjvkxpvz3bb8qqbi5xhd5p9vf6z0h"; - name = "solid-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/solid-5.53.0.tar.xz"; + sha256 = "1x9qc8vm16vlqws9jb2pynw705mx6xvbb617lkdwdb60fzlrjkln"; + name = "solid-5.53.0.tar.xz"; }; }; sonnet = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/sonnet-5.50.0.tar.xz"; - sha256 = "13ddp5l9vnyqg05xadc4d1j0xfl8ain4qprq3iw82ygrchyrzm0d"; - name = "sonnet-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/sonnet-5.53.0.tar.xz"; + sha256 = "0jk8kcsdzjg7x37cw95n3wdnjg403x3plzw0zwa3r3xkg8vlqv18"; + name = "sonnet-5.53.0.tar.xz"; }; }; syndication = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/syndication-5.50.0.tar.xz"; - sha256 = "1i73blq2fdzvzfg1p6715fv5m40yd6vcvnbg1pfmbr3696qy4mb3"; - name = "syndication-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/syndication-5.53.0.tar.xz"; + sha256 = "0znj8rgdh14ci3nx1h7s9v8kl208z8zlcq3c99bh216rznxvzr6b"; + name = "syndication-5.53.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/syntax-highlighting-5.50.0.tar.xz"; - sha256 = "10iw8fhqgvsn4jgf81d9xy8aac07acn45rysnvj9wpm3cmxqxmd4"; - name = "syntax-highlighting-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/syntax-highlighting-5.53.0.tar.xz"; + sha256 = "1ar50an84pcb090zh50ni2d3ck6dxvbij9d6qa091hd66rwm2cda"; + name = "syntax-highlighting-5.53.0.tar.xz"; }; }; threadweaver = { - version = "5.50.0"; + version = "5.53.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.50/threadweaver-5.50.0.tar.xz"; - sha256 = "11j82nq5pr7rk94bnfzanpj3b41dqjl9cgk2b3h326y7bphcrkyf"; - name = "threadweaver-5.50.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.53/threadweaver-5.53.0.tar.xz"; + sha256 = "0wlpbnan5g2nhs0fc9l3p0c1gcs9ak7m83hfcibg7vsq9kqvcs6p"; + name = "threadweaver-5.53.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 5b92458d89e96f9af537dce18ffb0ae9e4d9d402..fc3a8d64a473f571fee989f99985bd94d0fa5f25 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -48,7 +48,7 @@ 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 + sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac ''; preConfigure = '' @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { description = "An implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; passthru.implementation = "heimdal"; diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 4e3ba399cc3f748a139b2c893db00346286aa46a..6ff6bb955913bfeff4b8e4678785393a9b4f8c7c 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"; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { # not via outputBin, due to reference from libkrb5.so postInstall = '' - moveToOutput bin "$dev" + moveToOutput bin/krb5-config "$dev" ''; enableParallelBuilding = true; @@ -75,8 +75,7 @@ stdenv.mkDerivation rec { description = "MIT Kerberos 5"; homepage = http://web.mit.edu/kerberos/; license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + platforms = platforms.unix ++ platforms.windows; }; passthru.implementation = "krb5"; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 20ab104874dc5209143686a1800996c08f7913d3..abbb2457f6aecb012aaba846c80d75fc446d52d9 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 194b57c0534263b92b95d21972092a83f4e1d4b3..91ad59ad27a03b12a8c683bd7102b1284ef5b7a0 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/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 445f65b9202eced78e199699638d7118f51112c2..2e4a4d54dd4e4714f049a300e265cb5418c74470 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -54,6 +54,5 @@ stdenv.mkDerivation rec { description = "Code for producing C and C++ kinetic clients"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index d270e2f0678d1b1b12dcc2147a4a50fcf11fbb32..d3733ea5f720085da140ab9e8f76949220b3604b 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 = "2018-09-10"; + version = "2018-10-23"; name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; repo = "kmsxx"; fetchSubmodules = true; - rev = "524176c33ee2b79f78d454fa621e0d32e7e72488"; - sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8"; + rev = "c0093c91f0fa2fd6a5b9d1b206a6f44dcd55bfb5"; + sha256 = "03rv92r938nxb4k4gwcvxy76jnhxdx6x60b58jws83285hd9rgkf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 935f52eeb71c2f7fbc5c29a72d4c422446361734..897f33953afb8a45f22a9297f20aaa54d4517801 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"; })]; @@ -37,6 +37,5 @@ stdenv.mkDerivation rec { description = "A library of routines for managing a database"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..aa1172029d2e1a1359481e4f816dcb5adc655a7a --- /dev/null +++ b/pkgs/development/libraries/lasem/default.nix @@ -0,0 +1,38 @@ +{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk_pixbuf +, libxml2, cairo, pango, gnome3 }: + +stdenv.mkDerivation rec { + pname = "lasem"; + version = "0.4.3"; + + outputs = [ "bin" "out" "dev" "man" "doc" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "13ym5pm2y3wk5hh9zb2535i3lnhnzyzs0na1knxwgvwxazwm1ng7"; + }; + + nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + + propagatedBuildInputs = [ + glib gdk_pixbuf libxml2 cairo pango + ]; + + enableParallelBuilding = true; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = { + description = "SVG and MathML rendering library"; + + homepage = https://wiki.gnome.org/Projects/Lasem; + license = stdenv.lib.licenses.gpl2Plus; + + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index 873ccc5665df9c512e10c5718d35692476484769..54d33e5f425e651cd4ba874e5267acfe899dbc63 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/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 10441b9b871e5a71b09d67d4d71783cd2b23df52..5566b1f4f0e272e0e611e12e5c4abc0fcafa5ac5 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { description = "A LDAP-like embedded database"; homepage = https://ldb.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index c4120e5bb0eb8dd186745109e2a69bc3467bedda..468ab90edb5ba8fbbdc93a2242c9af622e7abaaa 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; homepage = http://www.nlnetlabs.nl/projects/ldns/; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index a269069fb048f56bd1924cd63dc53a3289b0a65a..ad59674b3ed71de6acc253e781a82cc04d453801 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.4"; src = fetchFromGitHub { - sha256 = "0lhdncwg2xbd3gy65rx8w2qcxvcwfirzkl762zdwqxf6bj6p2hvb"; + sha256 = "08hd6j8w4mgnxj84y26vip1vgrg668jnil5jzq2dk4pfapigfz8l"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 824c685ce932eddff5eed24e897ab4e3934f709d..f4018cbf9614cf3aba8c60c055b5550dba29368a 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 04e8eab4d28722b868e3f405c12536568621accb..b678a0893867c22e641a5c9a716e44d4c2705739 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 2b50c09af5cceb39ce4a7e5ecfc972866f64a747..b18af4cf8344c2eb4017e533fab3643fc4171b95 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; { @@ -37,6 +38,5 @@ stdenv.mkDerivation rec { description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 7de72ed73a65d9d54420bb463aa30e3a4c5dee1c..39f493d821c3cb3529f4ac37264d873ca5d5116c 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 7bd2a1ec5738e87ed00a1f74cf0d03fbaf8d2720..15ef9ee890a6efc16008dac864c5b383a20fb5ef 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DWITH_LASZIP=ON" "-DLASZIP_INCLUDE_DIR=${LASzip}/include" + "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index 4bb806b91d8ae25af4c3c2c3b0d3cec7563d6b73..525ec6e35f609662d84d992ad12911fc33cc1de7 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 ]; + + nativeBuildInputs = [ + check + docbook_xml_dtd_43 + docbook_xsl + glibcLocales + gobject-introspection + gtk-doc + meson + ninja + pkgconfig + vala + ]; - postPatch = '' - NOCONFIGURE=1 ./autogen.sh - ''; + buildInputs = [ + glib + libxml2 + libxslt + python3.pkgs.pygobject3 + sqlite + ]; - configurePhase = '' - HAVE_GCOV_FALSE="#" ./configure $configureFlags --prefix=$out - ''; + LC_ALL = "en_US.UTF-8"; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # since glib-2.46 + mesonFlags = [ + "-Dpy-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Library for managing accounts which can be used from GLib applications"; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libaccounts-glib/py-override.patch b/pkgs/development/libraries/libaccounts-glib/py-override.patch new file mode 100644 index 0000000000000000000000000000000000000000..4179f4fa0af0e316ef244546a9568b621bb30c43 --- /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/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 85972e67e103168b50789844d84179508bc2883c..cc6c9464de36697e9f282088fdd8c2656ba6447b 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libamqpcpp-${version}"; - version = "3.0.0"; + version = "4.1.3"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "0n93wy2v2hx9zalpyn8zxsxihh0xpgcd472qwvwsc253y97v8ngv"; + sha256 = "0qk431ra7vcklc67fdaddrj5a7j50znjr79zrwvhkcfy82fd56zw"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index b94c845479aaab7e0bb685698a14cf5d249c2875..c7d7bfb1e8243bf74f06c7d15c9c34ef5cbdac93 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,22 +1,34 @@ -{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3Packages }: +{ stdenv, fetchgit, yasm, perl, cmake, pkgconfig, python3, writeText }: stdenv.mkDerivation rec { name = "libaom-${version}"; - version = "1.0.0"; + version = "1.0.0-errata1"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82"; + sha256 = "090phh4jl9z6m2pwpfpwcjh6iyw0byngb2n112qxkg6a3gsaa62f"; }; - buildInputs = [ perl yasm ]; - nativeBuildInputs = [ cmake pkgconfig python3Packages.python ]; + nativeBuildInputs = [ + yasm perl cmake pkgconfig python3 + ]; + + preConfigure = '' + # build uses `git describe` to set the build version + cat > $NIX_BUILD_TOP/git << "EOF" + #!${stdenv.shell} + echo v${version} + EOF + chmod +x $NIX_BUILD_TOP/git + export PATH=$NIX_BUILD_TOP:$PATH + ''; meta = with stdenv.lib; { description = "AV1 Bitstream and Decoding Library"; 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 0000000000000000000000000000000000000000..e63bfd20c797547ddfc557f5f48af52ff36c745e --- /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 8bf0e4bcb93c54de7382581fd3a33cae652e2eb1..46cc30a8944f016b8c634d7d20995788302ae6bf 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 b729ae41e0ad70cd6e1900a39492067c92aedb59..0000000000000000000000000000000000000000 --- 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 dad8a93a8a81efd08d164a229673219d0216a195..0000000000000000000000000000000000000000 --- 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 7625abf38fb39214af47bb743b97c1721ef0e2e2..029be971ac176ea01f1d98ec9e80c0bd9349ff98 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/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 91ceb959779e29bf7339245d4829d7b414946c26..540aef9edf2588a67e1c5c61937264614a5a8d3f 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gettext, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.5.1"; + name = "libassuan-2.5.2"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0jb4nb4nrjr949gd3lw8lh4v5d6qigxaq6xwy24w5apjnhvnrya7"; + sha256 = "1rw8nw6fx6ppxga6m4cqcp898lnlzf7vn3s5c2lzfxg3fzr1nswq"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index bafcc5210b38d98d81f2e73dde2e84ca50d3f225..f7805c9f375f5b6a904a49221909d9d993915750 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "A C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 0c0fc3861c9ea23d90141d3aefa4a8be7f2d2615..ea1df23182d3537ac0b3dac288e8b6eca13a98dd 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.8"; 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 = "0rgni7056gnbn105lln629gwd6s51779yb5ds9s7wxl1vyg2fshx"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 54fb89df0451812fbde2e06e8824d972bb17b700..5153b63e91c5a312d1edc66fd031d0993481c6b3 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 c02e2108f2376194488e1ea8d7d06ff713971d42..57c3e123377a3b36fc2c5c5fdca1ef3e2c5e6710 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/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 04bd3f3d71ed3a8eac4cb7537fd140ec8c3616e5..d908a8af85da836d8bbb209a1aeb586ba5d380db 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,15 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: -stdenv.mkDerivation rec { - version = "1.9.0"; +let + # fetch submodule + noos = fetchFromGitHub { + owner = "analogdevicesinc"; + repo = "no-OS"; + rev = "0bba46e6f6f75785a65d425ece37d0a04daf6157"; + sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c"; + }; + + version = "2.2.0"; + +in stdenv.mkDerivation { name = "libbladeRF-${version}"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "0frvphp4xxdxwzmi94b0asl7b891sd3fk8iw9kfk8h6f3cdhj8xa"; + sha256 = "0mdj5dkqg69gp0xw6gkhp86nxnm9g7az5rplnncxkp4p1kr35rnl"; }; nativeBuildInputs = [ pkgconfig ]; @@ -18,11 +28,16 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ udev ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; + + postUnpack = '' + cp -r ${noos}/* source/thirdparty/analogdevicesinc/no-OS/ + ''; + # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; # Let us avoid nettools as a dependency. - patchPhase = '' + postPatch = '' sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash ''; @@ -31,6 +46,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" + "-DBLADERF_GROUP=bladerf" ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 585f6f18bbab01a886e03e92836eff7df2df9e41..eb38c2e38a69ac8743cbe5df45008321308829eb 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 81822654aeb436aeadd9d7b89ca4dfa361524cf7..0000000000000000000000000000000000000000 --- 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 4bddec6b0ffd91caf77d3718f6ee848a799d3c32..0f9cc9aaf964a326112f9e95a6274573dc61f44c 100644 --- a/pkgs/development/libraries/libbsd/darwin.patch +++ b/pkgs/development/libraries/libbsd/darwin.patch @@ -1,497 +1,103 @@ diff --git a/configure.ac b/configure.ac -index 88ccd91..0857782 100644 +index 55fcfe6..1e26c93 100644 --- a/configure.ac +++ b/configure.ac -@@ -59,7 +59,7 @@ AS_CASE([$host_os], - ) +@@ -51,15 +51,19 @@ AS_CASE([$host_os], + AC_SEARCH_LIBS([clock_gettime], [rt], [CLOCK_GETTIME_LIBS="-lrt"]) + AC_SUBST([CLOCK_GETTIME_LIBS]) + LIBS="$saved_LIBS" ++ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1]) + ], + [*-musl*], [ + # Upstream refuses to define this, we will do it ourselves then. + AC_DEFINE([__MUSL__], [1], [Define to 1 if we are building for musl]) ++ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1]) + ], +-) ++ [ ++ AM_CONDITIONAL([BUILD_LINK_VERSION_SCRIPT], [1]) ++ ]) # Checks for header files. -AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h]) -+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h]) ++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h nlist.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE -@@ -146,6 +146,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ - pstat_getproc sysconf]) +@@ -143,7 +147,8 @@ AC_LINK_IFELSE( + + AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ + getauxval getentropy getexecname getline \ +- pstat_getproc sysconf]) ++ pstat_getproc sysconf \ ++ strlcpy strlcat strnstr strmode fpurge]) AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) -+HostOS=`echo "$host" | sed 's/.*-//'` -+os_is_macosx=false -+nonLinuxOS=false -+AC_SUBST(HostOS) -+case ${HostOS} in -+ darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*) -+ os_is_macosx=true -+ nonLinuxOS=true -+ echo HostOS="$HostOS" -+ ;; -+ *) -+ echo host="$host" -+ echo HostOS="$HostOS" -+ os_is_macosx=false -+ nonLinuxOS=false -+ ;; -+esac -+AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue]) -+AM_COND_IF([IS_DARWIN], -+ [AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])]) -+ -+AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue]) -+AM_COND_IF([NON_LINUX], -+ [AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])]) -+ AC_CONFIG_FILES([ - Makefile - include/Makefile -diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h -index 45b3b15..d0d4043 100644 ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -39,7 +39,9 @@ - #ifndef LIBBSD_LIBUTIL_H - #define LIBBSD_LIBUTIL_H - -+#ifdef HAVE_FEATURES_H - #include -+#endif - #include - #include - #include -diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h -index 4b69983..c75151b 100644 ---- a/include/bsd/stdio.h -+++ b/include/bsd/stdio.h -@@ -48,12 +48,16 @@ - __BEGIN_DECLS - const char *fmtcheck(const char *, const char *); - -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) - /* XXX: The function requires cooperation from the system libc to store the - * line buffer in the FILE struct itself. */ - char *fgetln(FILE *fp, size_t *lenp) -- LIBBSD_DEPRECATED("This functions cannot be safely ported, " -- "use getline(3) instead, as it is supported " -- "by GNU and POSIX.1-2008."); -+ __attribute__((deprecated("This functions cannot be safely ported, " -+ "use getline(3) instead, as it is supported " -+ "by GNU and POSIX.1-2008."))); -+#else -+char *fgetln(FILE *fp, size_t *lenp); -+#endif - - /* - * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations, -diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h -index ebc9638..6cd7943 100644 ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb, - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ) -+#if !__GLIBC_PREREQ(2, 26) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif -+#endif - - long long strtonum(const char *nptr, long long minval, long long maxval, - const char **errstr); diff --git a/include/bsd/string.h b/include/bsd/string.h -index 6798bf6..6baaa14 100644 +index f987fee..a1e17ed 100644 --- a/include/bsd/string.h +++ b/include/bsd/string.h -@@ -37,6 +37,12 @@ +@@ -41,10 +41,21 @@ #include __BEGIN_DECLS -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+size_t bsd_strlcpy(char *dst, const char *src, size_t siz); -+size_t bsd_strlcat(char *dst, const char *src, size_t siz); -+char *bsd_strnstr(const char *str, const char *find, size_t str_len); -+void bsd_strmode(mode_t mode, char *str); -+#else ++#if !HAVE_STRLCPY size_t strlcpy(char *dst, const char *src, size_t siz); ++#endif ++ ++#if !HAVE_STRLCAT size_t strlcat(char *dst, const char *src, size_t siz); ++#endif ++ ++#if !HAVE_STRNSTR char *strnstr(const char *str, const char *find, size_t str_len); -@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str); - #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) - void explicit_bzero(void *buf, size_t len); - #endif +#endif - __END_DECLS ++ ++#if !HAVE_STRMODE + void strmode(mode_t mode, char *str); ++#endif - #endif + #if !defined(__GLIBC__) || \ + (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) diff --git a/src/Makefile.am b/src/Makefile.am -index ad83dbf..0f2a7ee 100644 +index f3cc0fa..3aaecd4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \ - libbsd.map +@@ -56,8 +56,10 @@ libbsd_la_DEPENDENCIES = \ libbsd_la_LIBADD = \ $(CLOCK_GETTIME_LIBS) -+ -+if IS_DARWIN -+libbsd_la_LDFLAGS = \ -+ -Wl \ -+ -version-number $(LIBBSD_ABI) -+else libbsd_la_LDFLAGS = \ - -Wl,--version-script=$(srcdir)/libbsd.map \ +- -Wl,--version-script=$(srcdir)/libbsd.map \ -version-number $(LIBBSD_ABI) ++if BUILD_LINK_VERSION_SCRIPT ++libbsd_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libbsd.map +endif -+ libbsd_la_SOURCES = \ arc4random.c \ -- arc4random.h \ -- arc4random_unix.h \ -- arc4random_openbsd.h \ - arc4random_uniform.c \ - bsd_getopt.c \ -- chacha_private.h \ - closefrom.c \ - dehumanize_number.c \ - err.c \ -@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \ - $(nil) - endif - -+noinst_HEADERS = \ -+ arc4random.h \ -+ arc4random_bsd.h \ -+ arc4random_linux.h \ -+ arc4random_unix.h \ -+ arc4random_osx.h \ -+ arc4random_openbsd.h \ -+ chacha_private.h -+ - libbsd_ctor_a_SOURCES = \ - setproctitle_ctor.c \ - $(nil) -diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h -new file mode 100644 -index 0000000..ece2f85 ---- /dev/null -+++ b/src/arc4random_bsd.h -@@ -0,0 +1,86 @@ -+/* $OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $ */ -+ -+/* -+ * Copyright (c) 1996, David Mazieres -+ * Copyright (c) 2008, Damien Miller -+ * Copyright (c) 2013, Markus Friedl -+ * Copyright (c) 2014, Theo de Raadt -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Stub functions for portability. -+ */ -+ -+#include -+ -+#include -+#include -+ -+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) -+ -+/* -+ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if -+ * a program does not link to -lthr. Callbacks registered with pthread_atfork() -+ * appear to fail silently. So, it is not always possible to detect a PID -+ * wraparound. -+ */ -+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) -+ -+static inline void -+_getentropy_fail(void) -+{ -+ raise(SIGKILL); -+} -+ -+static volatile sig_atomic_t _rs_forked; -+ -+static inline void -+_rs_forkhandler(void) -+{ -+ _rs_forked = 1; -+} -+ -+static inline void -+_rs_forkdetect(void) -+{ -+ static pid_t _rs_pid = 0; -+ pid_t pid = getpid(); -+ -+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { -+ _rs_pid = pid; -+ _rs_forked = 0; -+ if (rs) -+ memset(rs, 0, sizeof(*rs)); -+ } -+} -+ -+static inline int -+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) -+{ -+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) -+ return (-1); -+ -+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { -+ munmap(*rsp, sizeof(**rsp)); -+ return (-1); -+ } -+ -+ _ARC4_ATFORK(_rs_forkhandler); -+ return (0); -+} -diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h -new file mode 100644 -index 0000000..d61a8db ---- /dev/null -+++ b/src/arc4random_linux.h -@@ -0,0 +1,86 @@ -+/* $OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $ */ -+ -+/* -+ * Copyright (c) 1996, David Mazieres -+ * Copyright (c) 2008, Damien Miller -+ * Copyright (c) 2013, Markus Friedl -+ * Copyright (c) 2014, Theo de Raadt -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Stub functions for portability. -+ */ -+ -+#include -+ -+#include -+#include -+ -+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) -+ -+#ifdef __GLIBC__ -+extern void *__dso_handle; -+extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *); -+#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle) -+#else -+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) -+#endif -+ -+static inline void -+_getentropy_fail(void) -+{ -+ raise(SIGKILL); -+} -+ -+static volatile sig_atomic_t _rs_forked; -+ -+static inline void -+_rs_forkhandler(void) -+{ -+ _rs_forked = 1; -+} -+ -+static inline void -+_rs_forkdetect(void) -+{ -+ static pid_t _rs_pid = 0; -+ pid_t pid = getpid(); -+ -+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { -+ _rs_pid = pid; -+ _rs_forked = 0; -+ if (rs) -+ memset(rs, 0, sizeof(*rs)); -+ } -+} -+ -+static inline int -+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) -+{ -+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) -+ return (-1); -+ -+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { -+ munmap(*rsp, sizeof(**rsp)); -+ return (-1); -+ } -+ -+ _ARC4_ATFORK(_rs_forkhandler); -+ return (0); -+} -diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h -new file mode 100644 -index 0000000..14771a6 ---- /dev/null -+++ b/src/arc4random_osx.h -@@ -0,0 +1,82 @@ -+/* $OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $ */ -+ -+/* -+ * Copyright (c) 1996, David Mazieres -+ * Copyright (c) 2008, Damien Miller -+ * Copyright (c) 2013, Markus Friedl -+ * Copyright (c) 2014, Theo de Raadt -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+/* -+ * Stub functions for portability. -+ */ -+ -+#include -+ -+#include -+#include -+#include -+ -+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; -+#define _ARC4_LOCK() pthread_mutex_lock(&arc4random_mtx) -+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx) -+ -+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f)) -+ -+static inline void -+_getentropy_fail(void) -+{ -+ raise(SIGKILL); -+} -+ -+static volatile sig_atomic_t _rs_forked; -+ -+static inline void -+_rs_forkhandler(void) -+{ -+ _rs_forked = 1; -+} -+ -+static inline void -+_rs_forkdetect(void) -+{ -+ static pid_t _rs_pid = 0; -+ pid_t pid = getpid(); -+ -+ if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) { -+ _rs_pid = pid; -+ _rs_forked = 0; -+ if (rs) -+ memset(rs, 0, sizeof(*rs)); -+ } -+} -+ -+static inline int -+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp) -+{ -+ if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) -+ return (-1); -+ -+ if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE, -+ MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) { -+ munmap(*rsp, sizeof(**rsp)); -+ *rsp = NULL; -+ return (-1); -+ } -+ -+ _ARC4_ATFORK(_rs_forkhandler); -+ return (0); -+} -diff --git a/src/fgetln.c b/src/fgetln.c -index 4d1726e..9c73788 100644 ---- a/src/fgetln.c -+++ b/src/fgetln.c -@@ -30,7 +30,9 @@ - #include - #include - -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) - #include "local-link.h" -+#endif - - #ifdef HAVE_GETLINE - struct filebuf { -@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len) - return fb->buf; - } - } -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) - libbsd_link_warning(fgetln, - "This functions cannot be safely ported, use getline(3) " - "instead, as it is supported by GNU and POSIX.1-2008.") -+#endif - #else - #error "Function fgetln() needs to be ported." - #endif + arc4random.h \ diff --git a/src/fpurge.c b/src/fpurge.c -index 462535a..e7eb46f 100644 +index 462535a..a8941db 100644 --- a/src/fpurge.c +++ b/src/fpurge.c -@@ -26,9 +26,11 @@ +@@ -26,9 +26,10 @@ #include #include -+#if HAVE___FPURGE - #include -+#endif +-#include --#ifdef HAVE___FPURGE -+#ifdef HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7 */ + #ifdef HAVE___FPURGE ++#include ++ int fpurge(FILE *fp) { -@@ -42,5 +44,55 @@ fpurge(FILE *fp) +@@ -41,6 +42,36 @@ fpurge(FILE *fp) + return 0; } - #else --#error "Function fpurge() needs to be ported." -+#define fp_ fp -+//#error "Function fpurge() needs to be ported." -+//#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ ++/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */ ++#elif HAVE_FPURGE +int +fpurge(FILE *fp) +{ @@ -501,12 +107,13 @@ index 462535a..e7eb46f 100644 + } + + /* Call the system's fpurge function. */ -+# undef fpurge -+# if !HAVE_DECL_FPURGE ++#undef fpurge ++#if !HAVE_DECL_FPURGE + extern int fpurge (FILE *); -+# endif ++#endif + int result = fpurge (fp); -+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ ++/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ ++#if defined(__sferror) || defined(__DragonFly__) + if (result == 0) + /* Correct the invariants that fpurge broke. + on BSD systems says: @@ -514,69 +121,35 @@ index 462535a..e7eb46f 100644 + If this invariant is not fulfilled and the stream is read-write but + currently reading, subsequent putc or fputc calls will write directly + into the buffer, although they shouldn't be allowed to. */ -+ if ((fp_->_flags & __SRD) != 0) -+ fp_->_w = 0; ++ if ((fp->_flags & __SRD) != 0) ++ fp->_w = 0; +#endif + return result; +} -+//#endif -+#endif -+ -+#ifdef TEST -+int -+main() -+{ -+ static FILE fp_bad; -+ FILE *fp; -+ -+ if (fpurge(&fp_bad) == 0) -+ return 1; -+ -+ fp = fopen("/dev/zero", "r"); -+ if (fpurge(fp) < 0) -+ return 1; -+ -+ fclose(fp); -+ -+ return 0; -+} + #else + #error "Function fpurge() needs to be ported." #endif diff --git a/src/funopen.c b/src/funopen.c -index 1e05c7e..75e61ea 100644 +index 1e05c7e..65ba5a8 100644 --- a/src/funopen.c +++ b/src/funopen.c @@ -143,6 +143,7 @@ funopen(const void *cookie, * they will not add the needed support to implement it. Just ignore this * interface there, as it has never been provided anyway. */ -+#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#elif defined(__MACH__) #else #error "Function funopen() needs to be ported or disabled." #endif -diff --git a/src/getentropy.c b/src/getentropy.c -index 3f11a1e..8a23a07 100644 ---- a/src/getentropy.c -+++ b/src/getentropy.c -@@ -28,9 +28,7 @@ - #include "getentropy_linux.c" - #elif defined(__GNU__) - #include "getentropy_hurd.c" --#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) --#include "getentropy_bsd.c" --#elif defined(__NetBSD__) -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) - #include "getentropy_bsd.c" - #elif defined(__sun) - #include "getentropy_solaris.c" diff --git a/src/hash/sha512.h b/src/hash/sha512.h -index 4f368a1..ab22fc1 100644 +index 4f368a1..7632e25 100644 --- a/src/hash/sha512.h +++ b/src/hash/sha512.h @@ -29,7 +29,11 @@ #ifndef _SHA512_H_ #define _SHA512_H_ -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#ifdef __MACH__ +#include +#else #include @@ -585,16 +158,15 @@ index 4f368a1..ab22fc1 100644 #define SHA512_DIGEST_LENGTH 64 diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c -index b3c8d5e..f69013d 100644 +index b3c8d5e..602f54e 100644 --- a/src/hash/sha512c.c +++ b/src/hash/sha512c.c -@@ -25,7 +25,13 @@ +@@ -25,7 +25,12 @@ */ #include -+__FBSDID("$FreeBSD$"); + -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) ++#ifdef __MACH__ +#include +#else #include @@ -602,102 +174,188 @@ index b3c8d5e..f69013d 100644 #include #include +diff --git a/src/local-link.h b/src/local-link.h +index d518dcf..84694a2 100644 +--- a/src/local-link.h ++++ b/src/local-link.h +@@ -27,7 +27,11 @@ + #ifndef LIBBSD_LOCAL_LINK_H + #define LIBBSD_LOCAL_LINK_H + ++#ifdef __MACH__ ++#define libbsd_link_warning(symbol, msg) ++#else + #define libbsd_link_warning(symbol, msg) \ + static const char libbsd_emit_link_warning_##symbol[] \ + __attribute__((used,section(".gnu.warning." #symbol))) = msg; + #endif ++#endif diff --git a/src/nlist.c b/src/nlist.c -index 0932f59..598a329 100644 +index 0932f59..4502048 100644 --- a/src/nlist.c +++ b/src/nlist.c -@@ -27,6 +27,10 @@ - * SUCH DAMAGE. - */ +@@ -41,6 +41,7 @@ + #include + #include -+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX) -+#if defined(LIBC_SCCS) && !defined(lint) -+static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93"; -+#endif /* LIBC_SCCS and not lint */ - #include ++#if !HAVE_NLIST_H + #include "local-elf.h" - #include -@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list) + #define SIZE_T_MAX 0xffffffffU +@@ -265,3 +266,4 @@ nlist(const char *name, struct nlist *list) (void)close(fd); return (n); } -+#endif /* _NLIST_DO_ELF */ ++#endif +diff --git a/src/readpassphrase.c b/src/readpassphrase.c +index f9f6195..2bc5fb4 100644 +--- a/src/readpassphrase.c ++++ b/src/readpassphrase.c +@@ -36,6 +36,14 @@ + #define TCSASOFT 0 + #endif + ++#ifndef _SIGMAX ++#define _SIGMAX 64 ++#endif ++ ++#ifndef _NSIG ++#define _NSIG (_SIGMAX + 1) ++#endif ++ + static volatile sig_atomic_t signo[_NSIG]; + + static void handler(int); diff --git a/src/setproctitle.c b/src/setproctitle.c -index 038ac7d..d0ef01b 100644 +index 038ac7d..e9ee09c 100644 --- a/src/setproctitle.c +++ b/src/setproctitle.c -@@ -32,6 +32,11 @@ +@@ -32,6 +32,10 @@ #include #include -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+#define __asm__(x) ++#ifdef __MACH__ +extern char **environ; +#endif + static struct { /* Original value. */ const char *arg0; -@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5"); +@@ -280,16 +284,22 @@ setproctitle_impl(const char *fmt, ...) + *++nul = '\0'; + } + } ++#ifndef __MACH__ + __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5"); ++#endif + + /* The original function introduced in 0.2 was a stub, it only got implemented + * in 0.5, make the implementation available in the old version as an alias * for code linking against that version, and change the default to use the * new version, so that new code depends on the implemented version. */ - #ifdef HAVE_TYPEOF -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+// -+// HACK: even weak aliasing breaks in clang so just comment this out for now -+// -+// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl"))); -+#else +-#ifdef HAVE_TYPEOF ++#ifdef __MACH__ ++void setproctitle_stub(const char *fmt, ...); ++#elif HAVE_TYPEOF extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl"))); -+#endif #else void setproctitle_stub(const char *fmt, ...) __attribute__((alias("setproctitle_impl"))); + #endif ++#ifndef __MACH__ + __asm__(".symver setproctitle_stub,setproctitle@LIBBSD_0.2"); ++#endif diff --git a/src/strlcat.c b/src/strlcat.c -index 14c53a1..e01cb60 100644 +index 14c53a1..5961c17 100644 --- a/src/strlcat.c +++ b/src/strlcat.c -@@ -27,7 +27,11 @@ +@@ -26,6 +26,7 @@ + * Returns strlen(src) + MIN(dsize, strlen(initial dst)). * If retval >= dsize, truncation occurred. */ ++#if !HAVE_STRLCAT size_t -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+bsd_strlcat(char *dst, const char *src, size_t dsize) -+#else strlcat(char *dst, const char *src, size_t dsize) -+#endif { - const char *odst = dst; - const char *osrc = src; +@@ -53,3 +54,4 @@ strlcat(char *dst, const char *src, size_t dsize) + + return(dlen + (src - osrc)); /* count does not include NUL */ + } ++#endif diff --git a/src/strlcpy.c b/src/strlcpy.c -index e9a7fe4..10a855f 100644 +index e9a7fe4..5137acb 100644 --- a/src/strlcpy.c +++ b/src/strlcpy.c -@@ -25,7 +25,11 @@ +@@ -24,6 +24,7 @@ + * chars will be copied. Always NUL terminates (unless dsize == 0). * Returns strlen(src); if retval >= dsize, truncation occurred. */ ++#if !HAVE_STRLCPY size_t -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+bsd_strlcpy(char *dst, const char *src, size_t dsize) -+#else strlcpy(char *dst, const char *src, size_t dsize) -+#endif { - const char *osrc = src; - size_t nleft = dsize; +@@ -48,3 +49,4 @@ strlcpy(char *dst, const char *src, size_t dsize) + + return(src - osrc - 1); /* count does not include NUL */ + } ++#endif diff --git a/src/strmode.c b/src/strmode.c -index e6afde5..c463243 100644 +index e6afde5..da680c9 100644 --- a/src/strmode.c +++ b/src/strmode.c -@@ -33,7 +33,11 @@ +@@ -32,6 +32,7 @@ + #include #include ++#if !HAVE_STRMODE void -+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX) -+bsd_strmode(mode_t mode, char *p) -+#else strmode(mode_t mode, char *p) + { +@@ -141,3 +142,4 @@ strmode(mode_t mode, char *p) + *p++ = ' '; /* will be a '+' if ACL's implemented */ + *p = '\0'; + } ++#endif +diff --git a/src/unvis.c b/src/unvis.c +index 94e3e7a..fba4c66 100644 +--- a/src/unvis.c ++++ b/src/unvis.c +@@ -565,11 +565,15 @@ strnunvis_openbsd(char *dst, const char *src, size_t dlen) + { + return strnunvisx(dst, dlen, src, 0); + } ++#ifndef __MACH__ + __asm__(".symver strnunvis_openbsd,strnunvis@@LIBBSD_0.2"); ++#endif + + int + strnunvis_netbsd(char *dst, size_t dlen, const char *src) + { + return strnunvisx(dst, dlen, src, 0); + } ++#ifndef __MACH__ + __asm__(".symver strnunvis_netbsd,strnunvis@LIBBSD_0.9.1"); +#endif +diff --git a/src/vis.c b/src/vis.c +index c2cd2d8..2d84330 100644 +--- a/src/vis.c ++++ b/src/vis.c +@@ -723,14 +723,18 @@ strnvis_openbsd(char *mbdst, const char *mbsrc, size_t dlen, int flags) { - /* print type */ - switch (mode & S_IFMT) { + return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL); + } ++#ifndef __MACH__ + __asm__(".symver strnvis_openbsd,strnvis@@LIBBSD_0.2"); ++#endif + + int + strnvis_netbsd(char *mbdst, size_t dlen, const char *mbsrc, int flags) + { + return istrsenvisxl(&mbdst, &dlen, mbsrc, flags, "", NULL); + } ++#ifndef __MACH__ + __asm__(".symver strnvis_netbsd,strnvis@LIBBSD_0.9.1"); ++#endif + + int + stravis(char **mbdstp, const char *mbsrc, int flags) diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 36410e842a5ddacf640990122988715b7b9a5e1b..a8d1925e5c0d30292cf830237e78651fa1333462 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 66bd1e9232bad2d803e1ca1f559720b9213ea718..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..fc07cfb6e855735cec1e99699a865849eb8f7aa1 --- /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 f61e0d242943af4a10a2feaa7b28ad3169bb47b4..0000000000000000000000000000000000000000 --- 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 76977b745197f93b702b83f6a5824676962fece1..f68141ef3b472a8241de9d1b531ae71ba5e0bbbf 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 0000000000000000000000000000000000000000..f116360474e40b2b723222b1549f3f78badc3b54 --- /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 8addb6128f0cf4c7f6cc728da92ae023f21ac84b..460a58a19a70d5fda41ed647b0109074a27e4a58 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 9dc3c1d11ba1d5a2fcedd8e3193cde527abdc918..5c50d093243c6a9b24b158848ddbce4f716eb05c 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/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index 5e46f4dc699d2448663b6d823ae3ad0321c30941..f7276d39b14a8453baaf38eaaca2ddeb44f01f72 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -1,25 +1,17 @@ { stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }: stdenv.mkDerivation rec { - name = "libcdr-0.1.4"; + name = "libcdr-0.1.5"; src = fetchurl { url = "https://dev-www.libreoffice.org/src/${name}.tar.xz"; - sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7"; + sha256 = "0j1skr11jwvafn0l6p37v3i4lqc8wcn489g8f7c4mqwbk94mrkka"; }; buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ]; nativeBuildInputs = [ pkgconfig ]; - # Boost 1.59 compatability fix - # Attempt removing when updating - postPatch = '' - sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in - ''; - - configureFlags = stdenv.lib.optional stdenv.cc.isClang "--disable-werror"; - CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h meta = { diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index e60f5e316bd07285d78cb0e6eab86a249b7bc34d..e016484e6779910bccf24e48aff58e69be35d406 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.4"; in stdenv.mkDerivation { name = "libcec-${version}"; src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "09xsw9hfymzl9fi9r2r8n5cxk80fc00x9drsy1r59pgbycqxvf5q"; + sha256 = "02j09y06csaic4m0fyb4dr9l3hl15nxbbniwq0i1qlccpxjak0j3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 22debc6d68aaf212f54a2924a1694ef2a8583fbf..9e7d608b5124f4c7a5b60f8e55db747eb24f588e 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 e4864aded279fe6bd827abae9bdb85b1bd305da1..b8d25f48b3b7e63fa325a0eaea823609867df249 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 f524c940255857091bd9b1543e7b497589274b0d..c802bd68ab08e1558d55329148b5fec12684e887 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/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index a83a3c672c0fc52ee3530e837519f502eeec753a..78f5e9d233cad7b200b84330c303e1e03036c1ba 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation { description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index fc857bf1ad4642f940cac2ba21b1faa1137ca6c5..2814d6c5c1ead9fac5a3dd940b372e926ef588df 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -1,35 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, gtk-doc, docbook_xsl, glib }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, glib }: -# TODO: Add installed tests once https://gitlab.gnome.org/Incubator/libcloudproviders/issues/4 is fixed +# TODO: Add installed tests once https://gitlab.gnome.org/World/libcloudproviders/issues/4 is fixed -let +stdenv.mkDerivation rec { pname = "libcloudproviders"; - version = "0.2.5"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.3.0"; src = fetchurl { - url = "https://gitlab.gnome.org/Incubator/${pname}/repository/archive.tar.gz?ref=${version}"; - sha256 = "1c3vfg8wlsv0fmi1lm9qhsqdvp4k33yvwn6j680rh49laayf7k3g"; + url = "https://gitlab.gnome.org/World/${pname}/repository/archive.tar.gz?ref=${version}"; + sha256 = "1hby7vhxn6fw4ih3xbx6ab9vqp3a3dmlhr0z7mrwr73b7ankly0l"; }; - patches = [ - ./fix-include.patch - ]; - outputs = [ "out" "dev" "devdoc" ]; mesonFlags = [ "-Denable-gtk-doc=true" ]; - nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl ]; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl ]; buildInputs = [ glib ]; meta = with stdenv.lib; { description = "DBus API that allows cloud storage sync clients to expose their services"; - homepage = https://gitlab.gnome.org/Incubator/libcloudproviders; + homepage = https://gitlab.gnome.org/World/libcloudproviders; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libcloudproviders/fix-include.patch b/pkgs/development/libraries/libcloudproviders/fix-include.patch deleted file mode 100644 index d6f626436a62240c963ad812a6dcddc4efc71275..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libcloudproviders/fix-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -46,7 +46,7 @@ - bindir = get_option ('bindir') - datadir = get_option ('datadir') - servicedir = join_paths (datadir, 'dbus-1', 'services') --incdir = join_paths (prefix, 'include', 'cloudproviders') -+incdir = join_paths (prefix, get_option('includedir'), 'cloudproviders') - - gnome = import('gnome') - diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index 6d37eb19c712262719ac3b37ba1be85346431cfa..a2f6858a05c9b562299d372671b5350393a0896d 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 ce67a8efa80e657895f00ceb2883060daef7636c..49bc2347ba776cce5af4cde7b6a7d7015004c0a3 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 ]; + buildInputs = [ libclthreads libX11 libXft xorg.xorgproto ]; - NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft.dev}/include"; + nativeBuildInputs = [ pkgconfig ]; + + NIX_CFLAGS_COMPILE = "-I${xorg.xorgproto}/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/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 4f4007649d04c63559ba8aa6d2ac85443dda643d..0f1cbeb2f96f34256d174b0232806805a290e9bd 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -5,11 +5,7 @@ collectd.overrideAttrs (oldAttrs: { name = "libcollectdclient-${collectd.version}"; buildInputs = [ ]; - NIX_CFLAGS_COMPILE = oldAttrs.NIX_CFLAGS_COMPILE ++ [ - "-Wno-error=unused-function" - ]; - - configureFlags = oldAttrs.configureFlags ++ [ + configureFlags = (oldAttrs.configureFlags or []) ++ [ "--disable-daemon" "--disable-all-plugins" ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 347e3218c1dc6321dbec7d93d615745326b90c63..77f495e32b84e34dbb4c856cac9fafc1dff75839 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.3"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "1ca3jp1nr5dk2w35wwyhsf96pblbw6n6n7a3ja264ivc9nhpkz4z"; + sha256 = "0a3fin5rcwa3xwd980mrzrkr7dpjdwbri81mqwxw1fkppjqw23z4"; }; 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/libcroco/default.nix b/pkgs/development/libraries/libcroco/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..dc4a967e7ac6511090bac317fd57673fe8515052 --- /dev/null +++ b/pkgs/development/libraries/libcroco/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch, gnome3 }: + +stdenv.mkDerivation rec { + pname = "libcroco"; + version = "0.6.12"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x"; + }; + + patches = [ + (fetchpatch { + name = "CVE-2017-7960.patch"; + url = https://gitlab.gnome.org/GNOME/libcroco/commit/898e3a8c8c0314d2e6b106809a8e3e93cf9d4394.patch; + sha256 = "1xjwdqijxf4b7mhdp3kkgnb6c14y0bn3b3gg79kyrm82x696d94l"; + }) + (fetchpatch { + name = "CVE-2017-7961.patch"; + url = https://gitlab.gnome.org/GNOME/libcroco/commit/9ad72875e9f08e4c519ef63d44cdbd94aa9504f7.patch; + sha256 = "0zakd72ynzjgzskwyvqglqiznsb93j1bkvc1lgyrzgv9rwrbwv9s"; + }) + ]; + + outputs = [ "out" "dev" ]; + outputBin = "dev"; + + configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxml2 glib ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "GNOME CSS2 parsing and manipulation toolkit"; + homepage = https://gitlab.gnome.org/GNOME/libcroco; + license = licenses.lgpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 59e576fd39231e85582d1feb35f2a3def9dd45fa..5dc153dd5ccc2e8831278834b1acb69000da6413 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 5a0006ad6c6e3e9ae43e975c934e2b40a4d7f048..c0ec9d927a8332a267cbad590f9bf8796ca4e4c0 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.2"; 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 = "0kp35ghj48wqgy67xyplwhmw21r8r0p00y2hw0fv65g4yrsgvsk0"; }; 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 0b06aef952405317849b99284dcc2a106e83f057..bef7a161dd3bcea0249578d59c9daf193f805b74 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/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 2a03efd632ff1b14dce4ab2fcfd775cb3e303a16..99cd636b03b8e8242cb0f0abb6788ac29bb110cd 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -52,12 +52,11 @@ stdenv.mkDerivation rec { # Remove the unneeded var/lib directories rm -rf $out/var ''; - + meta = { homepage = http://libdbi-drivers.sourceforge.net/; description = "Database drivers for libdbi"; platforms = platforms.all; license = licenses.lgpl21; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index 4f6b9dd099dd54762eb7b822377a0162bc7aa89c..b242bd8613ef64d6969c44053b936d5297244468 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "DB independent interface to DB"; license = licenses.lgpl21; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 1342ee6773f71fe832ea490d2673a961186c0b68..72c3ca0e2b053da139a1e3d61781d03d36dea23d 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 9c25757efb032495fa5f4bc0f3aa69cba0ef1b09..32b0c9758f73ab2384651c14eacf4f1143165fb4 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 730cef6f6960ee947e9a31b47a34c2125dec0bb8..8fbbae43f61942088e614d70d4859bcfdbde4c16 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/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..db5448caa10286839e3af3c473adf7f2075cb35f --- /dev/null +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libdeflate-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "ebiggers"; + repo = "libdeflate"; + rev = "v${version}"; + sha256 = "0kmp38s7vahvbgzzhs5v0bfyjgas1in7jn69gpyh70kl08279ly0"; + }; + + postPatch = '' + substituteInPlace Makefile --replace /usr $out + ''; + + configurePhase = '' + make programs/config.h + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Fast DEFLATE/zlib/gzip compressor and decompressor"; + license = licenses.mit; + homepage = https://github.com/ebiggers/libdeflate; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 3df820bc12631386b1e65290fe5e730b41ac8020..e3172c2fc1f8d2e7a8892a181e5c0e10c90941f1 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 5107d8898d463be9c0962d65fef77420866c4622..3d236ab5851a6092e9cc12f581880bb9e7b6ac00 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 649541e22627ed7dfd3a4f02c55ff501b033c929..edd84d5a9515c097f7dbaf0dbf36978c7fd72410 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 30a6d390787710ae68cb9cc38ae83686ce4428d7..a06a9af99bb449bb6069047f0cd267c3587505b7 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/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..59780699fd1302ef1f7fe11f0c0b76dc7de9486d --- /dev/null +++ b/pkgs/development/libraries/libepc/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: + +let + avahiWithGtk = avahi.override { gtk3Support = true; }; +in stdenv.mkDerivation rec { + pname = "libepc"; + version = "0.4.6"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + gtk-doc + ]; + buildInputs = [ + glib + libuuid + gtk3 + ]; + propagatedBuildInputs = [ + avahiWithGtk + gnutls + libsoup + ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "Easy Publish and Consume Library"; + homepage = https://wiki.gnome.org/Projects/libepc; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libestr/default.nix b/pkgs/development/libraries/libestr/default.nix index 96de7eb7b3c2d487720111512dd1e7ade9bdfb9b..33d835d691965a2b41b9536983e23e46bc207bff 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; { @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "Some essentials for string handling"; license = licenses.lgpl21; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 2ef1d3965ce9a3f4e2456ce0baa702ed63f78489..7998655e46b673a245655d963fa2cc2a8304f982 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/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index d1b4e06dbc18eb394d1988e39ab771998b208925..39d2c29b0127cf9187aba7144ee191f971dc1acd 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -68,6 +68,5 @@ stdenv.mkDerivation rec { homepage = http://libevent.org/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index e3f3604f94e3deaa637c4a0bf424d15f868802ef..b2d9af657a9357286eba201b53b2d4ce78ed08e4 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.7"; + name = "libextractor-1.8"; src = fetchurl { url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "13wf6vj7mkv6gw8h183cnk7m24ir0gyf198pyb2148ng4klgv9p0"; + sha256 = "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2"; }; preConfigure = diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 8d264c929a5bc519460f159e479bc2cfe016549c..7b3df42c24c3f78989f6c520d5666cf34d7ec06b 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/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index fa04655341d4ebbfe48c5026fd7d396a0ccb0f0b..e36c4ee12b942829c389835fd42bb2943193bb8c 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xextproto }: +{ stdenv, fetchurl, libX11, libXi, libXtst, pkgconfig, xorgproto }: stdenv.mkDerivation rec { name = "libfakekey-${version}"; @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 libXi libXtst xextproto ]; + buildInputs = [ libX11 libXi libXtst xorgproto ]; + NIX_LDFLAGS = [ + "-lX11" + ]; meta = with stdenv.lib; { description = "X virtual keyboard library"; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 215f587bb6b4a1ddf3b38b9ba62f3907b70ae8fd..384e3370ec9c6e65c702694dad1f025e5cad6f31 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 2c3085fc384fb1e1bd5dc1d77a564a1b82c47c90..4b02d651929b52d598463401be5c83aa680ab2c8 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/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 796c03dab5ee8816c20b8d97e0071a14d806d280..a0323481be9af057463dea40c12feaa33e5aa859 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -9,23 +9,29 @@ stdenv.mkDerivation rec { name = if extraOnly then "libfm-extra-${version}" else "libfm-${version}"; - version = "1.3.0.2"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q"; + sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"; }; nativeBuildInputs = [ vala pkgconfig intltool ]; buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; - configureFlags = optional extraOnly "--with-extra-only" + configureFlags = [ + "--sysconfdir=/etc" + ] ++ optional extraOnly "--with-extra-only" ++ optional withGtk3 "--with-gtk=3"; + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; + enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://blog.lxde.org/?cat=28/; + homepage = https://blog.lxde.org/category/pcmanfm/; license = licenses.lgpl21Plus; description = "A glib-based library for file management"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 8b384a51f01859a89ec09a7b3915301c888a6c15..3f3062e3c0815c5cad85215978d781dd1586d518 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3 +, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { - name = "libfprint-0.7.0"; + name = "libfprint-${version}"; + version = "0.99.0"; src = fetchurl { - url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz"; - sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6"; + url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; + sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; }; - buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb pixman glib nss gtk3 ]; + nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; + mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ]; + + preConfigure = '' + substituteInPlace libfprint/meson.build \ + --replace /bin/echo ${coreutils}/bin/echo + ''; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/fprint/libfprint/; + homepage = https://fprint.freedesktop.org/; description = "A library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl2; + license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 28e1ad895b458d06ef51289ea0b08db0b74bfe1a..f4863eb33f2641f449908e0fff8ede57eb2cc206 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { description = "A library for manipulating FlashPIX images"; license = "Flashpix"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index b59bf9a06ac5fcfc513356ba41c775a081483d58..1b00ff4c0fbbb9cb6fcc962630a8c88a14cc5af1 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 0000000000000000000000000000000000000000..a6fe2bc1435f4f0de3d406f6a3afee84e7230793 --- /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/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index 4139af2eac2a41241a5e469d0b0a6fc5b90929b6..2ccdd14874a151ad2e7cbb2faeac08ece10188d8 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; repositories.git = git://git.gnupg.org/libgcrypt.git; }; } diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index d8708114c8e663ebe2498f53440176a9e2219835..4d8a7eac27c8b6f55b428c0f6bdc91df7df58520 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 @@ -59,7 +51,7 @@ stdenv.mkDerivation rec { description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.wkennington maintainers.vrthra ]; + maintainers = with maintainers; [ vrthra ]; repositories.git = git://git.gnupg.org/libgcrypt.git; }; } 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 5394e51468e651d946b843f599f55124b051b437..0000000000000000000000000000000000000000 --- 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/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9bf03f25c9c9c2b7633e20f12652d2bdc7af25a1 --- /dev/null +++ b/pkgs/development/libraries/libgda/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3, gobject-introspection, vala +, overrideCC, gcc6 +, mysqlSupport ? false, mysql ? null +, postgresSupport ? false, postgresql ? null +}: + +assert mysqlSupport -> mysql != null; +assert postgresSupport -> postgresql != null; + +(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec { + pname = "libgda"; + version = "5.2.8"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0id4my5wh2m6rd7ijqp2azsjdb4l4yjrv3imq71kly00gjc6v1z2"; + }; + configureFlags = with stdenv.lib; [ "--enable-gi-system-install=no" ] + ++ (optional (mysqlSupport) "--with-mysql=yes") + ++ (optional (postgresSupport) "--with-postgres=yes"); + + enableParallelBuilding = true; + + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 gobject-introspection 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/; + license = [ licenses.lgpl2 licenses.gpl2 ]; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..012400a49abcd4a34dda901b478fdc200a0b031c --- /dev/null +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, glibmm, libgda, libxml2, gnome3 +, mysqlSupport ? false, mysql ? null +, postgresSupport ? false, postgresql ? null }: + +let + gda = libgda.override { + inherit mysqlSupport postgresSupport; + }; +in stdenv.mkDerivation rec { + pname = "libgdamm"; + version = "4.99.11"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1fyh15b3f8hmwbswalxk1g4l04yvvybksn5nm7gznn5jl5q010p9"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glibmm libxml2 ]; + propagatedBuildInputs = [ gda ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "C++ bindings for libgda"; + homepage = http://www.gnome-db.org/; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..f22cc568a97c9de8bd6cd11a1b55ccaeb2452a1b --- /dev/null +++ b/pkgs/development/libraries/libgdata/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json-glib, gcr +, gobject-introspection, liboauth, gnome3, p11-kit, openssl, uhttpmock }: + +stdenv.mkDerivation rec { + pname = "libgdata"; + version = "0.17.9"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0fj54yqxdapdppisqm1xcyrpgcichdmipq0a0spzz6009ikzgi45"; + }; + + NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gcr}/include/gcr-3 -I${gcr}/include/gck-1"; + + nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + + buildInputs = with gnome3; + [ libsoup libxml2 glib liboauth gcr gnome-online-accounts p11-kit openssl uhttpmock ]; + + propagatedBuildInputs = [ json-glib ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; # Stable version has not been updated for a long time. + }; + }; + + meta = with stdenv.lib; { + description = "GData API library"; + homepage = https://wiki.gnome.org/Projects/libgdata; + maintainers = with maintainers; [ raskin lethalman ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 5e94d00dcdb7dfa04c537db51402a723e0f517fd..70353d68ca775e0181e6a06f4ab53df2282e8208 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -1,31 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig +{ stdenv, fetchFromGitHub, pkgconfig, glib, cairo, Carbon, fontconfig , libtiff, giflib, libjpeg, libpng -, libXrender, libexif }: +, libXrender, libexif, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { - name = "libgdiplus-2.10.9"; + name = "libgdiplus-5.6"; - src = fetchurl { - url = "https://download.mono-project.com/sources/libgdiplus/${name}.tar.bz2"; - sha256 = "0klnbly2q0yx5p0l5z8da9lhqsjj9xqj06kdw2v7rnms4z1vdpkd"; + src = fetchFromGitHub { + owner = "mono"; + repo = "libgdiplus"; + rev = "5.6"; + sha256 = "11xr84kng74j3pd8sx74q80a71k6dw0a502qgibcxlyqh666lfb7"; }; NIX_LDFLAGS = "-lgif"; - patches = - [ (fetchurl { - url = "https://raw.github.com/MagicGroup/MagicSpecLib/master/libgdiplus/libgdiplus-2.10.1-libpng15.patch"; - sha256 = "130r0jm065pjvbz5dkx96w37vj1wqc8fakmi2znribs14g0bl65f"; - }) - ./giflib.patch - ]; - - patchFlags = "-p0"; + patches = [ # Series of patches cherry-picked from master, all fixes various sigsegv (or required by other patch) + (fetchpatch { + url = "https://github.com/mono/libgdiplus/commit/d33a2580a94701ff33abe28c22881d6173be57d0.patch"; + sha256 = "0rr54jylscn4icqjprqhwrncyr92r0d7kmfrrq3myskplpqv1c11"; + }) + (fetchpatch { + url ="https://github.com/mono/libgdiplus/commit/aa6aa53906935572f52f519fe4ab9ebedc051d08.patch"; + sha256 = "1wg0avm8qv5cb4vk80baflfzszm6q7ydhn89c3h6kq68hg6zsf1f"; + }) + (fetchpatch { + url = "https://github.com/mono/libgdiplus/commit/81e45a1d5a3ac3cf035bcc3fabb2859818b6cc04.patch"; + sha256 = "07wmc88cd1lqifs5x6npryni65jyy9gi8lgr2i1lb7v0fhvlyswg"; + }) + ]; hardeningDisable = [ "format" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = - [ pkgconfig glib cairo fontconfig libtiff giflib + [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif ] ++ stdenv.lib.optional stdenv.isDarwin Carbon; @@ -34,7 +43,14 @@ stdenv.mkDerivation rec { ln -s $out/lib/libgdiplus.0.dylib $out/lib/libgdiplus.so ''; - meta = { - platforms = stdenv.lib.platforms.unix; + checkPhase = '' + make check -w + ''; + + 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/libgdiplus/giflib.patch b/pkgs/development/libraries/libgdiplus/giflib.patch deleted file mode 100644 index 7b90d9863fd6e85ae4704626d6df559b0161331d..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libgdiplus/giflib.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -Naur libgdiplus-2.10.9-orig/src/gifcodec.c libgdiplus-2.10.9/src/gifcodec.c ---- src/gifcodec.c -+++ src/gifcodec.c -@@ -39,8 +39,10 @@ - - #include "gifcodec.h" - -+#if GIFLIB_MAJOR < 5 - /* giflib declares this incorrectly as EgifOpen */ - extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); -+#endif - - /* Data structure used for callback */ - typedef struct -@@ -105,7 +107,7 @@ - */ - - static int --AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) -+AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[]) - { - ExtensionBlock *ep; - -@@ -129,7 +131,7 @@ - - if (ExtData) { - memcpy(ep->Bytes, ExtData, Len); -- ep->Function = New->Function; -+ ep->Function = func; - } - - return (GIF_OK); -@@ -232,20 +234,20 @@ - } - - case EXTENSION_RECORD_TYPE: { -- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) { -+ int func; -+ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) { - return (GIF_ERROR); - } - - while (ExtData != NULL) { - /* Create an extension block with our data */ -- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) { -+ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) { - return (GIF_ERROR); - } - - if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) { - return (GIF_ERROR); - } -- temp_save.Function = 0; - } - break; - } -@@ -303,12 +305,19 @@ - result = NULL; - loop_counter = FALSE; - -+#if GIFLIB_MAJOR < 5 - if (from_file) { - gif = DGifOpen(stream, &gdip_gif_fileinputfunc); - } else { - gif = DGifOpen (stream, &gdip_gif_inputfunc); - } -- -+#else -+ if (from_file) -+ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL); -+ else -+ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL); -+#endif -+ - if (gif == NULL) { - goto error; - } -@@ -581,7 +590,7 @@ - } - - FreeExtensionMono(&global_extensions); -- DGifCloseFile (gif); -+ DGifCloseFile (gif, NULL); - - *image = result; - return Ok; -@@ -597,7 +606,7 @@ - - if (gif != NULL) { - FreeExtensionMono (&global_extensions); -- DGifCloseFile (gif); -+ DGifCloseFile (gif, NULL); - } - - *image = NULL; -@@ -660,11 +669,22 @@ - return InvalidParameter; - } - -+#if GIFLIB_MAJOR < 5 - if (from_file) { - fp = EGifOpenFileName (stream, 0); - } else { - fp = EGifOpen (stream, gdip_gif_outputfunc); - } -+#else -+ if (from_file) -+ fp = EGifOpenFileName (stream, 0, NULL); -+ else -+ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL); -+#define MakeMapObject GifMakeMapObject -+#define FreeMapObject GifFreeMapObject -+#define QuantizeBuffer GifQuantizeBuffer -+#define BitSize GifBitSize -+#endif - - if (!fp) { - return FileNotFound; -@@ -848,8 +868,15 @@ - Buffer[0] = 1; - Buffer[1] = ptr[0]; - Buffer[2] = ptr[1]; -+#if GIFLIB_MAJOR < 5 - EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0"); - EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer); -+#else -+ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE); -+ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0"); -+ EGifPutExtensionBlock(fp, 3, Buffer); -+ EGifPutExtensionTrailer(fp); -+#endif - } - } - -@@ -923,7 +950,7 @@ - } - } - -- EGifCloseFile (fp); -+ EGifCloseFile (fp, NULL); - - return Ok; - diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..260c3a3d97bf1bb9ebce7b346b649aa544874745 --- /dev/null +++ b/pkgs/development/libraries/libgee/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }: + +stdenv.mkDerivation rec { + pname = "libgee"; + version = "0.20.1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; + }; + + doCheck = true; + + nativeBuildInputs = [ pkgconfig autoconf vala gobject-introspection ]; + buildInputs = [ glib ]; + + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + homepage = https://wiki.gnome.org/Projects/Libgee; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..70ec222f88fb46f78a158945037ff3d690db6224 --- /dev/null +++ b/pkgs/development/libraries/libgepub/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, gnome3 +, webkitgtk, libsoup, libxml2, libarchive }: + +stdenv.mkDerivation rec { + pname = "libgepub"; + version = "0.6.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "16dkyywqdnfngmwsgbyga0kl9vcnzczxi3lmhm27pifrq5f3k2n7"; + }; + + doCheck = true; + + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with stdenv.lib; { + description = "GObject based library for handling and rendering epub documents"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..498858d52e91bfb2f14f9059978e5b9abf877aed --- /dev/null +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, vala, libssh2 +, gtk-doc, gobject-introspection, libgit2, glib, python3 }: + +stdenv.mkDerivation rec { + pname = "libgit2-glib"; + version = "0.27.7"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1hpgs8dx0dk25mc8jsizi2cwwhnmahrn3dyry9p7a1g48mnxyc8i"; + }; + + postPatch = '' + for f in meson_vapi_link.py meson_python_compile.py; do + chmod +x $f + patchShebangs $f + done + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig vala gtk-doc gobject-introspection + ]; + + propagatedBuildInputs = [ + # Required by libgit2-glib-1.0.pc + libgit2 glib + ]; + + buildInputs = [ + libssh2 + python3.pkgs.pygobject3 # this should really be a propagated input of python output + ]; + + meta = with stdenv.lib; { + description = "A glib wrapper library around the libgit2 git access library"; + homepage = https://wiki.gnome.org/Projects/Libgit2-glib; + license = licenses.lgpl21; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 29f346e9acfbbd57d077cf8bca7d458921c9d0b3..9bec00b9f52dc000cdc1879569d032e0c49a4d10 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/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 27c1cb0e390a40612070cd8445402f518aa56bf4..15efdd4fd4e448e343f422ad50342eb665b04211 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, glproto }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto }: let driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; - buildInputs = [ libX11 libXext glproto ]; + buildInputs = [ libX11 libXext xorgproto ]; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/GLX/Makefile.am \ diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index e7157afbaee53fe515b70ae363accf0f6f71916c..8dcbab95e9766f1f08cf39355edefe06709c196b 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/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..20a9bb91604ec90b83cc0a3fd914fab91485fb6d --- /dev/null +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: + +stdenv.mkDerivation rec { + pname = "libgnomekbd"; + version = "3.26.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = pname; }; + }; + + nativeBuildInputs = [ pkgconfig file intltool makeWrapper ]; + buildInputs = [ glib gtk3 libxklavier ]; + + preFixup = '' + wrapProgram $out/bin/gkbd-keyboard-display \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = with stdenv.lib; { + description = "Keyboard management library"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 33276b424e7cdbb5fc99cac4322af469ee9b0d8d..1a00822f66d34fb9f6c77906d52b4c97cab47ca0 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.63.0"; 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 = "15y4yjy67n3c57kp0yszklcrz2nickrvjvd6laizs6kdbpixjdfl"; }; - 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 9d1427f7f451c8f51e370e32c20b215644359845..05ae29358fa46e00772899cc3412d5346971d897 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.33"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry"; + sha256 = "1zq3pw93d0ani8bam7f4qjivll1b0zg9qbblwwvcjip7ark84f2x"; }; - 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 0000000000000000000000000000000000000000..c498ef3460acd5e9dac473862e8415eec364434c --- /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 74aee0f39c7ecf83699de3f6f25b4d860a664929..7126d027c7a0621149af75fa6b913d0582b0efa9 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,7 +1,7 @@ -{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 + monoSupport ? false, mono, gtk-sharp-2_0 }: let @@ -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 548114b642fa52def60ed717e99c9229f8a5bc1f..8fc44fb6a8dc9086ff9f82d405da3b4160c88d7b 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 = [ @@ -26,6 +26,7 @@ stdenv.mkDerivation { passthru = { updateScript = gnome3.updateScript { packageName = pname; + versionPolicy = "none"; }; }; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 20a08885142a6d914b72154aef8c6fa36d1af9b8..4e7ff03143817cf0ef4b4d099bc5208878ccd73d 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,12 +1,13 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, perl, gdk_pixbuf, libiconv, libintl }: +, python, perl, gdk_pixbuf, libiconv, libintl, gnome3 }: stdenv.mkDerivation rec { - name = "libgsf-1.14.42"; + pname = "libgsf"; + version = "1.14.45"; src = fetchurl { - url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "1hhdz0ymda26q6bl5ygickkgrh998lxqq4z9i8dzpcvqna3zpzr9"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1yk91ccf7z9b8d8ac6vip3gc5c0pkwgabqy6l0pj0kf43l7jrg2w"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; @@ -21,6 +22,12 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = "patchShebangs ./tests/"; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "GNOME's Structured File Library"; homepage = https://www.gnome.org/projects/libgsf; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index d0be9e25b87e758dabb8baacff18617120e8084a..fcc76938b3ed3b0869252976bd33dc5b78561686 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 54760549a1641c30ee20590e4891498ecf124974..d3dea766cbbbebe43e9389f2af3fc5d617216407 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/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 6001946cb9700fafe76e6cce79e4954fed4ea81d..4e43ef91e79fa1a3fe1128f81ce8e19190640739 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper -, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 +, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex -, gmp, readline, file, libintl_perl, GetoptLong, SysVirt, numactl, xen, libapparmor +, gmp, readline, file, numactl, xen, libapparmor , getopt, perlPackages, ocamlPackages , appliance ? null , javaSupport ? false, jdk ? null }: @@ -11,20 +11,21 @@ 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 ]; buildInputs = [ - makeWrapper autoreconfHook ncurses cpio gperf perl + makeWrapper autoreconfHook ncurses cpio gperf cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex libintl_perl GetoptLong - SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild - ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) + systemd fuse yajl libvirt gmp readline file hivex + numactl xen libapparmor getopt perlPackages.ModuleBuild + ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) + ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) ++ stdenv.lib.optional javaSupport jdk; prePatch = '' @@ -52,7 +53,7 @@ stdenv.mkDerivation rec { for bin in $out/bin/*; do wrapProgram "$bin" \ --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \ - --prefix PERL5LIB : "$out/lib/perl5/site_perl" + --prefix PERL5LIB : "$out/${perlPackages.perl.libPrefix}" done ''; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b5fda25a8c559f09fc332a670c36b814342de656 --- /dev/null +++ b/pkgs/development/libraries/libgweather/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, libxml2, glib, gtk3, gettext, libsoup +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }: + +stdenv.mkDerivation rec { + pname = "libgweather"; + version = "3.28.2"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0xfy5ghwvnz2g9074dy6512m4z2pv66pmja14vhi9imgacbfh708"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; + buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ]; + + postPatch = '' + chmod +x meson/meson_post_install.py + patchShebangs meson/meson_post_install.py + ''; + + mesonFlags = [ + "-Dzoneinfo_dir=${tzdata}/share/zoneinfo" + "-Denable_vala=true" + "-Dgtk_doc=true" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A library to access weather information from online services for numerous locations"; + homepage = https://wiki.gnome.org/Projects/LibGWeather; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..30e5e247ab2be28b6e4ef247543c5f5aaabe6eec --- /dev/null +++ b/pkgs/development/libraries/libgxps/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobject-introspection, cairo +, libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 +}: + +stdenv.mkDerivation rec { + pname = "libgxps"; + version = "0.3.1"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + buildInputs = [ glib cairo freetype libjpeg libtiff lcms2 ]; + propagatedBuildInputs = [ libarchive ]; + + mesonFlags = [ + "-Denable-test=false" + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with stdenv.lib; { + description = "A GObject based library for handling and rendering XPS documents"; + homepage = https://wiki.gnome.org/Projects/libgxps; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1c50a28f0a4d2c8597a0056fd1d1d7f53236e1ec --- /dev/null +++ b/pkgs/development/libraries/libhandy/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala +, gtk-doc, docbook_xsl, docbook_xml_dtd_43 +, gtk3, gnome3 +, dbus, xvfb_run, libxml2 +, hicolor-icon-theme +}: + +let + pname = "libhandy"; + version = "0.0.7"; +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 = "1k9v6q2dz9x8lfcyzmsksrkq6md7m9jdkjlfan7nqlcj3mqhd7m9"; + }; + + 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 hicolor-icon-theme ]; + + mesonFlags = [ + "-Dgtk_doc=true" + "-Dglade_catalog=enabled" + "-Dintrospection=enabled" + ]; + + 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 5d120f61e08686b6a03197a38f5edf3c12ae722b..0830b45b308b057d8c5334dc9fdddc495fb27b1b 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/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index cdc03c01a022bd4405fb2f8e6e0d27a41ffeac61..25cee4ef8daa91e69253a4bdc3392297d1a8a153 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pruneLibtoolFiles, libde265, x265, libpng, libjpeg }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig pruneLibtoolFiles ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 91e8e2d50f196122841344ffbc0cae0939388b1e..c1ec533ba5b831c20ecf99b628a47e3e661096fd 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 bcc85abbd3efc1404d367fbf22df894723df7a2b..ab1858c51a6121306d13e7691b3f04eabf7d369c 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/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index 970cb8a530f758931ed9b8cb046cbb53da88447a..00bd7e6eeea7e9d8df3dc3d25d797754176e1c87 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -14,6 +14,5 @@ stdenv.mkDerivation rec { homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libibumad/default.nix b/pkgs/development/libraries/libibumad/default.nix index a7950de3aef07f66dd83dc6f6b1d1c5ddc6213d5..689e9a0be5dddf7dccd3d93149371a8763a0036f 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -12,6 +12,5 @@ stdenv.mkDerivation rec { homepage = https://www.openfabrics.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix deleted file mode 100644 index 2243f832b7a6b20a82f7fb89cd010d57ee0e9807..0000000000000000000000000000000000000000 --- 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 < doxygen != null && graphviz != null; +assert documentationSupport -> doxygen != null && graphviz != null && python3 != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; -assert testsSupport -> check != null && valgrind != null && python3Packages != null; +assert testsSupport -> check != null && valgrind != null && python3 != null; let mkFlag = optSet: flag: "-D${flag}=${stdenv.lib.boolToString optSet}"; + + sphinx-build = if documentationSupport then + python3.pkgs.sphinx.overrideAttrs (super: { + propagatedBuildInputs = super.propagatedBuildInputs ++ (with python3.pkgs; [ recommonmark sphinx_rtd_theme ]); + + postFixup = super.postFixup or "" + '' + # Do not propagate Python + rm $out/nix-support/propagated-build-inputs + ''; + }) + else null; in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.11.3"; + version = "1.12.5"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "01nb1shnl871d939wgfd7nc9svclcnfjfhlq64b4yns2dvcr24gk"; + sha256 = "08vid3q1la3qiv9d5xcgxznjahzs8w01fhabvxlvzwqf04qnhjvx"; }; - outputs = [ "out" "dev" ]; + outputs = [ "bin" "out" "dev" ]; mesonFlags = [ (mkFlag documentationSupport "documentation") (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") + "--libexecdir=${placeholder "bin"}/libexec" ]; nativeBuildInputs = [ pkgconfig meson ninja ] - ++ optionals documentationSupport [ doxygen graphviz ] - ++ optionals testsSupport [ check valgrind python3Packages.pyparsing ]; + ++ optionals documentationSupport [ doxygen graphviz sphinx-build ] + ++ optionals testsSupport [ valgrind ]; - buildInputs = [ libevdev mtdev libwacom ] - ++ optionals eventGUISupport [ cairo glib gtk3 ]; + buildInputs = [ libevdev mtdev libwacom (python3.withPackages (pkgs: with pkgs; [ evdev ])) ] + ++ optionals eventGUISupport [ cairo glib gtk3 ] + ++ optionals testsSupport [ check ]; propagatedBuildInputs = [ udev ]; patches = [ ./udev-absolute-path.patch ]; - preBuild = '' - # meson setup-hook changes the directory so the files are located one level up - patchShebangs ../udev/parse_hwdb.py - patchShebangs ../test/symbols-leak-test.in + postPatch = '' + patchShebangs tools/helper-copy-and-exec-from-tmp.sh + patchShebangs test/symbols-leak-test + patchShebangs test/check-leftover-udev-rules.sh ''; - doCheck = testsSupport; + doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ codyopel wkennington ]; + maintainers = with maintainers; [ codyopel ]; }; } diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index fb22fea40e80280c49df89735f2dd90383adff8e..5c85b8639486e7c6c7ec7bf03701c37481d399ca 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -5,7 +5,7 @@ udev_rules_config = configuration_data() -udev_rules_config.set('UDEV_TEST_PATH', '') -+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/') ++udev_rules_config.set('UDEV_TEST_PATH', dir_udev + '/') configure_file(input : 'udev/80-libinput-device-groups.rules.in', output : '80-libinput-device-groups.rules', install : true, diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 738c11161955649b36fe779353e92de247236b93..faa070b3468cca75fe447cd8f5e726e71caba78f 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }: +{ stdenv, fetchurl, pkgconfig, gtk2, Carbon, useGTK ? false }: stdenv.mkDerivation rec { name = "libiodbc-3.52.12"; @@ -9,16 +9,18 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]; + buildInputs = stdenv.lib.optionals useGTK [ gtk2 ] + ++ stdenv.lib.optional stdenv.isDarwin Carbon; preBuild = '' export NIX_LDFLAGS_BEFORE="-rpath $out/lib" ''; - meta = { + meta = with stdenv.lib; { description = "iODBC driver manager"; homepage = http://www.iodbc.org; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.unix; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index 9d7bd273d8db472c63bc11d1307abcc79dd29536..fea5a86da4461227801c95f954fa312eb4496fae 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libipfix-${version}"; version = "110209"; src = fetchurl { - url = "http://sourceforge.net/projects/libipfix/files/libipfix/libipfix_110209.tgz"; + url = "mirror://sourceforge/libipfix/files/libipfix/libipfix_110209.tgz"; sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index 6e77641760919c574f1999a75962e503158a1643..ce2028e805dc3b804f46e375bf4870c274995e71 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisoburn-${version}"; - version = "1.4.8"; + version = "1.5.0"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "19d53j17pn18vfxxqqlqwam5lm21ljyp8nai5434068g7x3m1kwi"; + sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs"; }; buildInputs = [ attr zlib libburn libisofs ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index d0217a908b9f79d8482bd97802907bb6794f6058..d528144838702175ba1a8f770689f5f27b7a43fb 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libisofs-${version}"; - version = "1.4.8"; + version = "1.5.0"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${name}.tar.gz"; - sha256 = "0scvqb72qq24wcg814p1iw1dknldl21hr1hxsc1wy9vc6vgyk7fw"; + sha256 = "001l3akf3wb6msl9man776w560iqyvsbwwzs7d7y7msx13irspys"; }; buildInputs = [ attr zlib ]; diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix index 7580c1b092e26b926988a787c256251aa3619dd3..0b00cf90ba00912126bbd8a93017a67f780c051b 100644 --- a/pkgs/development/libraries/libite/default.nix +++ b/pkgs/development/libraries/libite/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; + license = with licenses; [ mit isc bsd2 bsd3 ]; }; } diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 84c6c96ea5de317bcf44e5b981492879ac95f7a5..ebcf51dfd03007f6ed618c6290487a71408d33c6 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,27 +1,47 @@ -{ stdenv, fetchurl, nasm -}: +{ stdenv, fetchurl, fetchpatch, cmake, nasm }: stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; - version = "1.5.3"; + version = "2.0.1"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j"; - }; # github releases still need autotools, surprisingly + sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75"; + }; patches = stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") - ./mingw-boolean.patch; + ./mingw-boolean.patch + ++ [ + ./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321 + (fetchpatch { + name = "cve-2018-19664.diff"; + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff"; + sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5"; + }) + (fetchpatch { + name = "CVE-2018-20330.patch"; + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff"; + sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji"; + }) + ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; - nativeBuildInputs = [ nasm ]; + nativeBuildInputs = [ cmake nasm ]; - enableParallelBuilding = true; + preConfigure = '' + cmakeFlagsArray+=( + "-DCMAKE_INSTALL_BINDIR=$bin/bin" + "-DENABLE_STATIC=0" + ) + ''; doCheck = true; # not cross; checkTarget = "test"; + preCheck = '' + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}:$LD_LIBRARY_PATH" + ''; meta = with stdenv.lib; { homepage = http://libjpeg-turbo.virtualgl.org/; diff --git a/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch b/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch new file mode 100644 index 0000000000000000000000000000000000000000..c0f7fef449385a6470e3a4bd1c3b6b85c04a9ac7 --- /dev/null +++ b/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES}) + + add_test(djpeg-${libtype}-rgb-islow-icc-cmp + ${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc) ++ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES ++ DEPENDS djpeg-${libtype}-rgb-islow) + + add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc" + testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2}) diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index a53918fd5f774ed1b1b9aad75acdc5a519705c78..c83143dd6b137247e9753c768ffccf2bda82ee9a 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -11,10 +11,17 @@ in stdenv.mkDerivation rec { buildInputs = [ unzip ]; makeFlags = [ "prefix=$(out)" ]; preInstall = "mkdir -p $out/lib"; - meta = { + + meta = with stdenv.lib; { homepage = http://libjson.sourceforge.net/; description = "A JSON reader and writer"; - longDescription = "A JSON reader and writer which is super-effiecient and usually runs circles around other JSON libraries. It's highly customizable to optimize for your particular project, and very lightweight. For Windows, OSX, or Linux. Works in any language."; - platforms = stdenv.lib.platforms.unix; + longDescription = '' + A JSON reader and writer which is super-efficient and + usually runs circles around other JSON libraries. + It's highly customizable to optimize for your particular project, and + very lightweight. For Windows, OSX, or Linux. Works in any language. + ''; + platforms = platforms.unix; + license = licenses.bsd2; }; } diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 6c7e5881a784ebcb87cac83764e15fec7aba3fd5..7eff302397aaa0e3df5dba364bec2d46bad1b6bc 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libogg libpng ]; - meta = { + meta = with stdenv.lib; { description = "A library for encoding and decoding Kate streams"; longDescription = '' This is libkate, the reference implementation of a codec for the Kate @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { in an Ogg container. It can carry Unicode text, images, and animate them.''; homepage = https://code.google.com/archive/p/libkate/; - maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 0611e0e57e7b24c9a10ff31e583090a2c0456383..c83a3e40df27ac9e2f131f2e380dfe944d4fbabb 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, libgpgerror }: +{ buildPackages, stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { name = "libksba-1.3.5"; @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ]; propagatedBuildInputs = [ libgpgerror ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]; postInstall = '' mkdir -p $dev/bin @@ -24,6 +27,5 @@ stdenv.mkDerivation rec { description = "CMS and X.509 access library"; platforms = platforms.all; license = licenses.lgpl3; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index a3c809c3bd6b6dcdc2a71bf8055954cde9439151..92e7d26f5afa0d047895933332e90c306fde3343 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { description = "Keyless Signature Infrastructure API library"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 8ebfa53b7d137f98a183812578305d40e8d36743..6a9cab16e7ed76c858d6e27accbf980c9301fa79 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtkdoc, gettext -, pkgconfig, glib, libxml2, gobjectIntrospection, gnome-common, unzip +, pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { language_subtag_registry = fetchurl { url = "http://www.iana.org/assignments/language-subtag-registry"; - sha256 = "1qfkvllyqcy40vmnvjn5w9fxw7g6ww46cb306vkgcfghnjjfhv3b"; + sha256 = "0y9x5gra6jri4sk16f0dp69p06almnsl48rs85605f035kf539qm"; }; postPatch = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias'' ]; - buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common + buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common unzip ]; nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ]; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 331422dd8929cb200ad7c1cd2abed75fba3fc2ad..b7d90100837c294212ab2c8647bf1cdfaed32e11 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -18,11 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/lastfm/liblastfm; repositories.git = git://github.com/lastfm/liblastfm.git; description = "Official LastFM library"; inherit (qt4.meta) platforms; - maintainers = with stdenv.lib.maintainers; [ phreedom ]; + maintainers = [ maintainers.phreedom ]; + license = licenses.gpl3; }; } diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 73d996c5ec861e28be8d76b70df0842fedb35cc0..d9f460d44e8ceb7b777e51e185d03ec3d6f03e7b 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://liblastfm.sourceforge.net; description = "Unofficial C lastfm library"; + license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 95b6b657fa2bedf9c7d8c95b3f74bf203c379e76..8154a74aef5dfd3be6f22885315343d8a5fc2df2 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { name = "liblcf-${version}"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; rev = version; - sha256 = "1y3pbl3jxan9f0cb1rxkibqjc0h23jm3jlwlv0xxn2pgw8l0fk34"; + sha256 = "1842hns0rbjncrhwjj7fzg9b3n47adn5jp4dg2zz34gfah3q4ig8"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ expat icu ]; + propagatedBuildInputs = [ expat icu ]; meta = with stdenv.lib; { + description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; homepage = https://github.com/EasyRPG/liblcf; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index ea05df45169f6d711904e7c19c7cc2653dee88c5..5f295009b9940c00b178155ef0a136fb09139556 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "liblinear-${version}"; - version = "2.20"; + version = "2.21"; src = fetchurl { url = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/liblinear-${version}.tar.gz"; - sha256 = "13q48azqy9pd8jyhk0c2hzj5xav1snbdrj8pp38vwrv2wwhfz7rz"; + sha256 = "0jp0z3s32czf748i6dnlabs1psqx1dcn9w96c56m24xq5l789chs"; }; buildPhase = '' diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index dd852e1de85aec05d19dde8c88df2d8857b12458..d0aaebadbaad6bcc884ab019cd7ccf0fc5cb1733 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Lightweight signal-safe logging library"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index a21b65170d390dd9fd330e949f6897304d4971d5..b03ab0e3fabbcb7458f97b6970a51083917f8962 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libestr, json_c, pcre, fastJson }: stdenv.mkDerivation rec { - name = "liblognorm-2.0.5"; + name = "liblognorm-2.0.6"; src = fetchurl { url = "http://www.liblognorm.com/files/download/${name}.tar.gz"; - sha256 = "145i1lrl2n145189i7l2a62yazjg9rkyma5jic41y0r17fl1s5f8"; + sha256 = "1wpn15c617r7lfm1z9d5aggmmi339s6yn4pdz698j0r2bkl5gw6g"; }; nativeBuildInputs = [ pkgconfig ]; @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; license = licenses.lgpl21; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 4b445c93175fff3254cfdad06decadeab2b1db34..aa6922ea3421e9084b1972b8924b4f462509f03c 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://liblqr.wikidot.com; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; - maintainers = [ ]; + license = with licenses; [ gpl3 lgpl3 ]; }; } diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 51d2e49eb3503df4f9e8461aef98363d180d30d4..258fbc2657ba8cfa1696331264affc0804493a5c 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection +{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobject-introspection , glib, libgudev, libevdev, gnome3 }: let @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "14vqz30p4693yy3yxs0gj858x25sl2kawib1g9lj8g5frgl0hd82"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection ]; + nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection ]; buildInputs = [ glib libgudev libevdev ]; doCheck = true; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 798aef8e7da7cdeeebd49847efd22591b2aec181..8ff02b49e5845cb47d422eaf166ccddc63e05812 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -6,6 +6,9 @@ stdenv.mkDerivation rec { buildInputs = [ libXft libICE pango libjpeg ]; propagatedBuildInputs = [ libX11 libXext libpng ]; + NIX_LDFLAGS = [ + "-lX11" + ]; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 8e429875b36b3a6584e20b4763b27005409c4155..0f43c0d461642cfbc2a40d0df797e18747fe766e 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -15,26 +15,26 @@ stdenv.mkDerivation rec { # Patches coming from debian package # https://packages.debian.org/source/sid/libs/libmatheval patches = [ (fetchpatch { - url = "http://anonscm.debian.org/cgit/debian-science/packages/libmatheval.git/plain/debian/patches/002-skip-docs.patch"; + url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/002-skip-docs.patch"; sha256 = "1nnkk9aw4jj6nql46zhwq6vx74zrmr1xq5ix0xyvpawhabhgjg62"; } ) (fetchpatch { - url = "http://anonscm.debian.org/cgit/debian-science/packages/libmatheval.git/plain/debian/patches/003-guile2.0.patch"; + url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/003-guile2.0.patch"; sha256 = "1xgfw4finfvr20kjbpr4yl2djxmyr4lmvfa11pxirfvhrdi602qj"; } ) (fetchpatch { - url = "http://anonscm.debian.org/cgit/debian-science/packages/libmatheval.git/plain/debian/patches/disable_coth_test.patch"; + url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/disable_coth_test.patch"; sha256 = "0bai8jrd5azfz5afmjixlvifk34liq58qb7p9kb45k6kc1fqqxzm"; } ) ]; - + meta = { description = "A library to parse and evaluate symbolic expressions input as text"; longDescription = '' - GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic - expressions input as text. It supports expressions in any number of variables of arbitrary - names, decimal and symbolic constants, basic unary and binary operators, and elementary - mathematical functions. In addition to parsing and evaluation, libmatheval can also compute + GNU libmatheval is a library (callable from C and Fortran) to parse and evaluate symbolic + expressions input as text. It supports expressions in any number of variables of arbitrary + names, decimal and symbolic constants, basic unary and binary operators, and elementary + mathematical functions. In addition to parsing and evaluation, libmatheval can also compute symbolic derivatives and output expressions to strings. ''; homepage = https://www.gnu.org/software/libmatheval/; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index d0784097779562ca74cc7f45be076082ebbcd918..17632c678c4666b8efeba118eaffe6cfe0c1f4a3 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libmd/default.nix b/pkgs/development/libraries/libmd/default.nix index 2da8e5ebf738b66f1fbf5c7b645c086e3eb4b758..de8baa7ad198c67099964e0263f0268c798467fa 100644 --- a/pkgs/development/libraries/libmd/default.nix +++ b/pkgs/development/libraries/libmd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libmd"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "https://archive.hadrons.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1iv45npzv0gncjgcpx5m081861zdqxw667ysghqb8721yrlyl6pj"; + sha256 = "0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..64d2cc7577c392ec2079ddb1285de7abe0183dd6 --- /dev/null +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk_pixbuf, gobject-introspection, gnome3 }: + +stdenv.mkDerivation rec { + pname = "libmediaart"; + version = "1.9.4"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; + buildInputs = [ glib gdk_pixbuf ]; + + # FIXME: Turn on again when https://github.com/NixOS/nixpkgs/issues/53701 + # is fixed on master. + doCheck = false; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with stdenv.lib; { + description = "Library tasked with managing, extracting and handling media art caches"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index c4f41663c848914a9411a3ec107757b9b53b8679..1ef2c6914ae42762089ca668ac019eb173a05a19 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "18.08"; + version = "18.08.1"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0h9fkfkil9y5xjxa7q4gxxihkn9kv9hak6ral2isvks5x3sy0ca8"; + sha256 = "1h6brg98i39xprcl54gvs1scmv8d6f3iw5h2diwz5bbz4lspy8vs"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 1becd0ee8ef64d5554eaad3799e049f7bf31820d..e46eb9208de601c06009d26b70fa013e3fb350c5 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libmesode-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "boothj5"; repo = "libmesode"; rev = version; - sha256 = "1zb1x422zkpnxrz9d2b7pmi8ms60lbw49yh78mydqfypsmj2iyfh"; + sha256 = "06f5nfaypvxrbsinxa1k2vrxrs7kqmg38g4wwwk5d63hpn1pj8ak"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 041e0d98d654fbf8fdb42e78da2b13cdefb6e41e..3f678e0eb96bf48df75a3dabafb2c689e5b4d95a 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmicrohttpd-${version}"; - version = "0.9.59"; + version = "0.9.62"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "0g4jgnv43yddr9yxrqg11632rip0lg5c53gmy5wy3c0i1dywv74v"; + sha256 = "0jfvi1fb4im3a3m8qishbmzx3zch993c0mhvl2k92l1zf1yhjgmx"; }; outputs = [ "out" "dev" "devdoc" "info" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; - homepage = http://www.gnu.org/software/libmicrohttpd/; + homepage = https://www.gnu.org/software/libmicrohttpd/; maintainers = with maintainers; [ eelco vrthra fpletz ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index c509fcd2b4f898dffe496be1d22b4694e08415d2..c83d2610dbfa773e98c82f8a3f55af17f98dafa3 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ optionals stdenv.isLinux [ alsaLib libpulseaudio ] + ++ optional stdenv.isLinux alsaLib ++ optional stdenv.isDarwin CoreAudio; propagatedBuildInputs = optional stdenv.isLinux libpulseaudio; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index bd0cd9fe9041d18c58670e25f17cfb2d4d9b567a..aa606e2a177ea284213fe3f7a067e19f638afb70 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { mkdir -p $out/lib cd libmilter cat > a.m4 < 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/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index f642ad5ccfab893963a8d6626bd184f0b3e9f6a2..ba116e20177f6078b709eeb36d8dc76060822085 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Portable framework for low-level network packet construction"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..95533696ddf2d185a715c0c0ba40136ec1a34be7 --- /dev/null +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libmnl }: + +stdenv.mkDerivation rec { + version = "1.0.3"; + name = "libnetfilter_acct-${version}"; + + src = fetchurl { + url = "https://www.netfilter.org/projects/libnetfilter_acct/files/${name}.tar.bz2"; + sha256 = "06lsjndgfjsgfjr43px2n2wk3nr7whz6r405mks3887y7vpwwl22"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl ]; + + meta = with stdenv.lib; { + homepage = http://www.netfilter.org/projects/libnetfilter_acct/; + description = "Userspace library providing interface to extended accounting infrastructure."; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 12a45d088ef6d06f9157b9ed5a93e19064aeedbc..94b3dc90a0b64e9274c7255ecceb807a2aed2d4d 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/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 0d4d6504142ad43395ff85c61a88513779ecab61..f94af349842132962a65b78c533d46f7a73feb77 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.1.2"; name = "libnftnl-${version}"; src = fetchurl { url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "1wmgjfcb35mscb2srzia5931srygywrs1aznxmg67v177x0nasjx"; + sha256 = "0pffmsv41alsn5ac7mwnb9fh3qpwzqk13jrzn6c5i71wq6kbgix5"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://netfilter.org/projects/libnftnl; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index b6d5912581ba0e3e603ce7954c5fc85f7c44eedb..c6348b7b2e67d2fbe31f5342b07d7d560231e7bb 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -2,12 +2,13 @@ # Note that this does not provide the ngspice command-line utility. For that see # the ngspice derivation. -stdenv.mkDerivation { - name = "libngspice-26"; +stdenv.mkDerivation rec { + name = "libngspice-${version}"; + version = "30"; src = fetchurl { - url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz"; - sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108"; + url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; + sha256 = "15v0jdfy2a2zxp8dmy04fdp7w7a4vwvffcwa688r81b86wphxzh8"; }; nativeBuildInputs = [ flex bison ]; @@ -18,7 +19,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 1f58545574cd31fddd630f1ff1364e4b322d101a..e71bcd0e368025f8327c9b15256e984030546ac5 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,20 +1,56 @@ -{ stdenv, fetchurl, pkgconfig, glib, gupnp-igd, gst_all_1, gnutls }: +{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }: stdenv.mkDerivation rec { - name = "libnice-0.1.14"; + name = "libnice-0.1.15"; + + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://nice.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my"; + sha256 = "1nl7fn07f4i513s9c1s1ic3rki8rm2d000wsf6f4157mb0zhya7p"; }; - nativeBuildInputs = [ pkgconfig ]; + patches = [ + # Fix generating data + # Note: upstream is not willing to merge our fix + # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35#note_98871 + (fetchpatch { + url = https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch; + sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg"; + }) + + # Fix test-different-number-streams + # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/36 + (fetchpatch { + url = https://gitlab.freedesktop.org/libnice/libnice/commit/a38c2adfc4bed2a69dc02568417f0926dd555b9a.patch; + sha256 = "1rh4z4iknrimmm3b3v8ln8vl3dsqi91g4vf0dl85348kvnf0sv6z"; + }) + # Fix test-gstreamer + # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35 + (fetchpatch { + url = https://gitlab.freedesktop.org/libnice/libnice/commit/02de1fa1956105b09d9db4fd6331452b0ff0b8a2.patch; + sha256 = "12dymq1v20wj5n1cway4n3y8fkra1ffnpj5w7pbz38i612b82qw0"; + }) + ]; + + nativeBuildInputs = [ meson ninja pkgconfig python3 gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; propagatedBuildInputs = [ glib gupnp-igd ]; - doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory" + mesonFlags = [ + "-Dgupnp=enabled" + "-Dgstreamer=enabled" + "-Dignored-network-interface-prefix=enabled" + "-Dexamples=enabled" + "-Dtests=enabled" + "-Dgtk_doc=enabled" + "-Dintrospection=enabled" + ]; + + # TODO; see #53293 etc. + #doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = https://nice.freedesktop.org/wiki/; description = "The GLib ICE implementation"; longDescription = '' @@ -24,6 +60,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 22eb8ed64dd8a504ba3601f4f595e1c5554d8d32..a4b0b26a345b17710c52bb4d0919f0a5d6a15690 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 fbde49a54d08b0484563110daa2a7ada4ba62f17..d427f7decf8b88ddff4436e42c8c30a8c507bfda 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 a66a1a88c743ceb97bf25ee0f20a9a6237d8cd37..cb70d803ac0c68c6876a6de729b41c1d848cba94 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 855d921206e992eb8d12a10eec19abd6ce067c48..ea792b007bae3bce48d965e29636fcb961fb5d3c 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 44f66561bd815ed49dd316cfd9f0036d5f4fb040..bd78e974e42fda4d2c92bc33f6acd2c38b73f33c 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 531e30ba75527989033e5f746736ebfe52bf2cdf..8131420cfd656e5edd638b9f57cefdeedfab830c 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/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 8bf62890fac444fd9463b2f9dba4775910a8e489..71a8e528771b668b0cc76dbf57f3912911c31c53 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; meta = with stdenv.lib; { + description = "Media container library to manipulate Ogg files"; + longDescription = '' + Library to work with Ogg multimedia container format. + Ogg is flexible file storage and streaming format that supports + plethora of codecs. Open format free for anyone to use. + ''; homepage = https://xiph.org/ogg/; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index f6fe9ecd03a0cd50fa3192b60d0a7cd51b1481ea..d7c3b747924a8b92dc9d72303975d919c0e86f26 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/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 68302acac29fc9e19c4e7033c5ba421878f19dfb..d53b1dc083083e89ed11de91b13a971741c11d68 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index 2c59fa03ea06a48edfe7459c57c2b7eb9331f6a7..a1db11d9a8e77bd0b099ca13b89729a2dc79cbdd 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/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..a29f8dc4a8042acbb29a82f7cd76c8514c636550 --- /dev/null +++ b/pkgs/development/libraries/libopenaptx/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libopenaptx-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "pali"; + repo = "libopenaptx"; + rev = version; + sha256 = "0996qmkmbax7ccknxrd3bx8xibs79a1ffms69scsj59f3kgj6854"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Audio Processing Technology codec (aptX)"; + license = licenses.lgpl21Plus; + homepage = https://github.com/pali/libopenaptx; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 135f1caf97e2f5324ebe0c0c19f044db98a42957..4369169014ccd9b7945a194e9aab4776453ddca3 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" ]; @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; homepage = http://www.opus-codec.org/; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..4ca0849447f38c641c059e2e385eee9584ae1b83 --- /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 111bea61eb654ee20eac9caadfcd5a5bff4785ca..e0f3be230709362d634cab547daa3d92cfdca923 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 0000000000000000000000000000000000000000..1b7bcc8fa89674bf882b2295757b1992cc5e783c --- /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.15.0"; + + src = fetchFromGitHub { + owner = "osmcode"; + repo = "libosmium"; + rev = "v${version}"; + sha256 = "0s51qk7py5dzr07q4a78b4mjjrpgbghnj2r8yjq1hnn6pgafbjv0"; + }; + + 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/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 9be217a800d323371f8771e56bbf2c51f72eaab4..080a194521549e63c655f108141254d0eeaf7a5c 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { repositories.git = git://git.code.sf.net/p/otr/libotr; license = licenses.lgpl21; description = "Library for Off-The-Record Messaging"; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 1304aff9e3b3ca6e67426828415c63a160f9d4b0..8c0094a3152b75428d99be6d2ae313b22969bccc 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 54e2616e782ff63256db79039e1b36150d3e6808..cb675f4d3e58bccf8f41187ad78550af40071682 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 f94f327ea02ef73ba424321b8751faa791314897..f7cbfeab4709c2e1964b5dda7d2a2b6b34c63e6b 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, flex, bison }: stdenv.mkDerivation rec { - name = "libpcap-1.8.1"; + name = "libpcap-1.9.0"; src = fetchurl { url = "https://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7"; + sha256 = "06bhydl4vr4z9c3vahl76f2j96z1fbrcl7wwismgs4sris08inrf"; }; nativeBuildInputs = [ flex bison ]; @@ -28,27 +28,19 @@ stdenv.mkDerivation rec { ''; patches = [ + # https://github.com/the-tcpdump-group/libpcap/pull/735 (fetchpatch { - url = "https://sources.debian.net/data/main/libp/libpcap/1.8.1-3/debian/patches/disable-remote.diff"; - sha256 = "0dvjax9c0spvq8cdjnkbnm65wlzaml259yragf95kzg611vszfmj"; - }) - # See https://github.com/wjt/bustle/commit/f62cf6bfa662af4ae39effbbd4891bc619e3b4e9 - (fetchpatch { - url = "https://github.com/the-tcpdump-group/libpcap/commit/2be9c29d45fb1fab8e9549342a30c160b7dea3e1.patch"; - sha256 = "1g8mh942vr0abn48g0bdvi4gmhq1bz0l80276603y7064qhy3wq5"; - }) - (fetchpatch { - url = "https://github.com/the-tcpdump-group/libpcap/commit/1a6b088a88886eac782008f37a7219a32b86da45.patch"; - sha256 = "1n5ylm7ch3i1lh4y2q16b0vabgym8g8mqiqxpqcdkjdn05c1wflr"; + name = "add-missing-limits-h-include-pr735.patch"; + url = https://github.com/the-tcpdump-group/libpcap/commit/aafa3512b7b742f5e66a5543e41974cc5e7eebfa.patch; + sha256 = "05zb4hx9g24gx07bi02rprk2rn7fdc1ss3249dv5x36qkasnfhvf"; }) ]; - preInstall = ''mkdir -p $out/bin''; - meta = with stdenv.lib; { - homepage = http://www.tcpdump.org; + homepage = https://www.tcpdump.org; description = "Packet Capture Library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..314d5884501fe118791ca769d82f57c6fb4392a8 --- /dev/null +++ b/pkgs/development/libraries/libpeas/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome3 +, glib, gtk3, gobject-introspection, python3, ncurses +}: + +stdenv.mkDerivation rec { + pname = "libpeas"; + version = "1.22.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv"; + }; + + configureFlags = [ "--enable-python3" ]; + + nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ]; + propagatedBuildInputs = [ + # Required by libpeas-1.0.pc + gobject-introspection + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A GObject-based plugins engine"; + homepage = https://wiki.gnome.org/Projects/Libpeas; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 25e55e45d1e28ce0869f908953ee206f6be4e894..d64591273bcc6effd6798f6cc1fafb378a24f8e6 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -9,7 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0jabhjx77yppr7x38bkfww6n2a480gj62rw0qp7prhdmg19mf766"; }; - installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true"; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "LDCONFIG=true" + "ARCH=${stdenv.targetPlatform.uname.processor}" + "SYS=${stdenv.targetPlatform.uname.system}" + ]; + + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; meta = with stdenv.lib; { description = "Helper library to program the performance monitoring events"; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 0e5a4a866e8ffeb776eecf06ce86994fed69377c..9c1ed80e51ed837e5aa4f3b94be581bc91852530 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 5afed2b2a2f507d29a0d030728cd4efb8c9de8ef..f88543744da056f78ba4f99ff016e3a4ae5c02b1 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, postgresql, doxygen, xmlto, python2, gnused }: stdenv.mkDerivation rec { - name = "libpqxx-${version}"; - version = "6.2.4"; + pname = "libpqxx"; + version = "6.3.1"; src = fetchFromGitHub { owner = "jtv"; - repo = "libpqxx"; + repo = pname; rev = version; - sha256 = "18fkyfa3a917ljmarf3jy8ycdhqzpc47cj87542sjpxnpaj9hy59"; + sha256 = "15na6iq4mspfa5vgayqzs0wqkqq9nk23d05qwn6xc3gpna2kyqsv"; }; 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 f5c92e11c357566f870bc2216ead1b5b53baa136..65da1f8e9d1d055de6f904fb17259f763a4ae9ae 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 377d9fe50be742475788a2793171a656e8ee3764..96b926d3d2b97303cb67a833010f638aaf9b9282 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.9.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1wfffki5ib65z9ndph2c4a17qx62f07q12adzabs7ij9gv94y9j5"; + sha256 = "1w4fbcc6hh63dp88fy4wvys6i1ydj7ya50r1l69a64qbzby1w32i"; }; 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/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index c19dc73abfa6a8a7a032e0c81e3bfef83fc791be..25b088f99ec83b116c07d73956244770cd1e5cfd 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -15,6 +15,5 @@ stdenv.mkDerivation rec{ description = "A library providing high performance logging, tracing, ipc, and poll"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 8cca5333d084d6ab6132bdad2d15e1de29d4ad9a..160ce9fcabf66598c57dcafa54b4a3d91cfe8bd9 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.2.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5"; + sha256 = "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 5bfa1427ab6575fba307ec2134df5f1a196ea8ed..99383fe6450ce39cf9e7a6c920440a34a073867c 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { description = "Modem protocol helper library"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix deleted file mode 100644 index 7c1844bf281e18b9fb04f838cf83a5c9fc085c98..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libqrencode/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig, - libtool, SDL2, libpng }: - -stdenv.mkDerivation rec { - name = "libqrencode-${version}"; - version = "4.0.0"; - - src = fetchurl { - url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; - sha1 = "644054a76c8b593acb66a8c8b7dcf1b987c3d0b2"; - sha256 = "10da4q5pym7pzxcv21w2kc2rxmq7sp1rg58zdklwfr0jjci1nqjv"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool SDL2 libpng ]; - - propagatedBuildInputs = [ SDL2 libpng ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://fukuchi.org/works/qrencode/; - description = "A C library for encoding data in a QR Code symbol"; - - longDescription = '' - Libqrencode is a C library for encoding data in a QR Code symbol, - a kind of 2D symbology that can be scanned by handy terminals - such as a mobile phone with CCD. - ''; - - license = licenses.gpl2Plus; - maintainers = [ maintainers.adolfogc ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index b291ec2fdf0b9aa044deb0b9028ab60cd0239b1f..048ba48bb6743e6d1f4192c161f6c1a7cb728bcd 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 9803e09610e65601b7b895acca6693824ed5517c..1a998c04435911e1008ebb857b34ed426d84548b 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.2"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "1m2khr2cij8z6lawgbmdksjn14fpnjsy8ad4qahnpqapm1slsxap"; + sha256 = "0i4nhjm5556xgn966x0i503ygk2wafq6z83kg0lisacjjab4f3a0"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index 39d5c64f64fcc4b9e6d56b1c1d44de42e887b634..a99e4d22077e0c770413b496deeff84368bbf05b 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 422ace462a942f17280c6a08720a4f84cd664968..30d8d8a94e9d5c3436f581a904a595398099c12a 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 3b84ead7cec15e4afdc64d0c53d9843a80ac3b72..0000000000000000000000000000000000000000 --- 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/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index b5ab9d310da338fed35bb3774bd221bdbeef153a..81bd35ff293c36bc40b8f6653f196b645168a972 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = https://www.theora.org/; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; - maintainers = with maintainers; [ spwhitt wkennington ]; + maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index bf0393fd89a611c2b80bf3c3063a6af39e224235..55c747540f775c5a79863d490760b5a442ef0008 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 bd0084dbaaf795dfbe3f3138ba52040dd3e7d45f..7a72fa2b7a319ecefc17e33c33f63e496724d3ff 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 efd63148fb10b5bca06cbc8011909832f673e18c..1af7548ac962ccb78ac3748053e2b4f954ebd37c 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/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 8c88dd97ec411c08ca072ca512e6eee383de8cf2..15c392fa792325e997720b41d0a479b4397f855b 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libtommath-${version}"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz"; - sha256 = "0sbccdwbkfc680id2fi0x067j23biqcjqilwkk7y9339knrjy0s7"; + sha256 = "1bbyagqzfdbg37k1n08nsqzdf44z8zsnjjinqbsyj7rxg246qilh"; }; nativeBuildInputs = [ libtool ]; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index f19e9d274313d64b3d07d2fc88464d616e684dee..cd8192e34fb99f3498bff2375f63b67090b0cef1 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 b3636eef262126db52f279c7d43d9c3d64b9efaa..1605abf6efa1c1a5f117d2973017c346a73f855e 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.9"; + sha256 = "0aljr9hqybla6p61af6fdkv0x8gph7c2wacqqa9hq2z9w0p4fs5j"; }; } diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 21e3a15449c222b0e95b9c8ba700ac5b1c607e72..b0be3cb3c12d4a676b289153a9f95d18accd9be4 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/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 675ca1cd220b4de220d250383fc60bab9da0cb84..8430c462ca6edbce897b3bfc912c0f4aa91ba2f7 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.1.6"; + name = "libu2f-host-1.1.7"; src = fetchurl { url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "19xxwwqfzg3njfpxvhlyxd05wjwsdw3m4lpn7gk31cna6agbp82d"; + sha256 = "1zyws91b1fsbfwn3f23ry9a9zr0i1a1hqmhk3v1qnlvp56gjayli"; }; nativeBuildInputs = [ pkgconfig ]; @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { description = "A C library and command-line tool that implements the host-side of the U2F protocol"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 52bc0ac5cfd4ccac436aa5797682a684a84179d1..5aa26a749e4ffea932848f75e7e42085fcbb8f98 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "libuchardet-${version}"; + pname = "uchardet"; + version = "0.0.6"; - version = "0.0.5"; + outputs = [ "bin" "out" "man" "dev" ]; - src = fetchFromGitHub { - owner = "BYVoid"; - repo = "uchardet"; - rev = "v${version}"; - sha256 = "0rkym5bhq3hn7623fy0fggw0qaghha71k8bi41ywqd2lchpahrrm"; + src = fetchurl { + url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; + sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"; }; buildInputs = [ cmake ]; - doCheck = false; # fails all the tests (ctest) + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests + # TODO: move the following to CMake setup hook + "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" + "-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man" + ]; + + doCheck = true; meta = with stdenv.lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; - homepage = https://www.byvoid.com/zht/project/uchardet; - license = licenses.mpl11; + homepage = https://www.freedesktop.org/wiki/Software/uchardet/; + license = licenses.mpl11; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index b1e6938a149428027967be2878787393845ad692..dcc406accbd75239db03c51bc0162eea16392b88 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 0000000000000000000000000000000000000000..e21f9400848d8ab8a085787d80c0e34b1f91497e --- /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 1a4f16046fc16fb54fe08ab2b8a98be90c4ccf1c..a072591ca9db94cd3f7bcc3f7b3089368ae31a8a 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 2bb53dd2b97f718f39515913606da04983a1528f..8559731d707cb3a3113d731f605ea9fd1b2a8e74 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 24da3a8e2c7d55d4ec2ac746f6c2de13c30c0c8e..e066c07236794d1c5434175358808028fac24731 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 f9f0b2b6555107649b065799fe3c64cd1fa4f5cd..52f01229c4af358f0cf0c249ca138303c8e4784f 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 6a32ccf5c1b14876d35b744e05e0d03ae481890c..9bea14bd8e859a603b15a794b53eaf83d3f4d228 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -2,17 +2,14 @@ stdenv.mkDerivation rec { name = "libunwind-${version}"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { url = "mirror://savannah/libunwind/${name}.tar.gz"; - sha256 = "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz"; + sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3"; }; - patches = [ - ./version-1.2.1.patch - ./backtrace-only-with-glibc.patch - ]; + patches = [ ./backtrace-only-with-glibc.patch ]; nativeBuildInputs = [ autoreconfHook ]; @@ -29,7 +26,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/libunwind/version-1.2.1.patch b/pkgs/development/libraries/libunwind/version-1.2.1.patch deleted file mode 100644 index 63202937084c1401e7ecd6a34741dd1decc22044..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libunwind/version-1.2.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a254bbe..fe0247b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,6 +1,6 @@ - define(pkg_major, 1) --define(pkg_minor, 2.1) --define(pkg_extra, ) -+define(pkg_minor, 2) -+define(pkg_extra, 1) - define(pkg_maintainer, libunwind-devel@nongnu.org) - define(mkvers, $1.$2$3) - dnl Process this file with autoconf to produce a configure script. diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 58da13044523e96b5c8f9a09f04757364757dff5..0cc18d82720b90d7e696236d2dfa1d18f3c4004c 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.10.1"; + version = "0.10.2"; name = "liburcu-${version}"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw"; + sha256 = "1k31faqz9plx5dwxq8g1fnczxda1is4s1x4ph0gjrq3gmy6qixmk"; }; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 4704a1e5c331f5b7fdccd2da9f4f29b964bc56ef..adf354c45f2e120de8daebaac958b01a63b86732 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 69afd9d4c691ca86643034a1e63fc5d203abafcd..ac5c38a34f113f535d6bbc931c37d6cc5d149416 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.unix; + 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 50b43c4e043d0e120a9110c71a04790d23560108..10a2124199b2a13857371a34db3d1a0e30b6a0ba 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,23 +1,16 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.21.0"; + version = "1.24.1"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1jjg34ppnlrnb634q9mla7whl7rm9xmjgnzckrznqcycwzir074b"; + sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab"; }; - patches = [ - (fetchpatch { - url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch"; - sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj"; - }) - ]; - postPatch = let toDisable = [ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent @@ -40,7 +33,7 @@ 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 @@ -52,6 +45,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; preConfigure = '' LIBTOOLIZE=libtoolize ./autogen.sh @@ -66,6 +60,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 6868e5c8cfa9c1632c5c8b375fd14a4881ac4ff0..e41ca206c51031a23fa7d13b377e3ec41d43d3bc 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, libdrm, libva +{ stdenv, fetchFromGitHub, pkgconfig +, libdrm, libva, libX11, libXext, libXfixes, wayland, meson, ninja }: stdenv.mkDerivation rec { @@ -10,12 +10,18 @@ stdenv.mkDerivation rec { owner = "01org"; repo = "libva-utils"; rev = version; - sha256 = "113wdmi4r0qligizj9zmd4a8ml1996x9g2zp2i4pmhb8frv9m8j2"; + sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = [ libdrm libva ]; + buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ]; + + mesonFlags = [ + "-Ddrm=true" + "-Dx11=true" + "-Dwayland=true" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 0ba49da06cfed655e459c1cf561a89963fc8f89e..7f17b9af08b3baa860faf0f997287a54bda6a16b 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.4.0"; # update libva-utils and vaapiIntel as well src = fetchFromGitHub { owner = "01org"; repo = "libva"; rev = version; - sha256 = "1a60lrgr65hx9b2qp0gjky1298c4d4zp3ap6vnmmz850sxx5rm8w"; + sha256 = "1b58n6rjfsfjfw1s5kdfa0jpfiqs83g2w14s7sfp1qkckkz3988l"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 35c339b45d09fc5ea9c11c6805be8ef6bcc34679..52359a3a4cd66dd70653fb3bdc4e059bdc95d5aa 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -12,13 +12,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = with xorg; [ dri2proto libXext ]; + buildInputs = with xorg; [ xorgproto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; configureFlags = stdenv.lib.optional stdenv.isLinux "--with-module-dir=${libGL_driver.driverLink}/lib/vdpau"; + NIX_LDFLAGS = if stdenv.isDarwin then "-lX11" else null; + installFlags = [ "moduledir=$(out)/lib/vdpau" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 6e7005195bf0f7508c7fcb4e22130ff815472384..0ace54582ebcd67b5b560b8baef3247dafef3a48 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 2d83955de6962e181597511afe47338a36818a63..74c3d24560cd60ff6781304ac52ec8ca10e6adb7 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 fd35864fe343ee0c7bcb0c0eeb0de6f7fc5d398a..85b8b128d208400764a7cf04f9337c73eead14fa 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -7,6 +7,7 @@ , curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode , enableXen ? false, xen ? null , enableIscsi ? false, openiscsi +, enableCeph ? false, ceph }: with stdenv.lib; @@ -16,19 +17,19 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.5.0"; + version = "4.10.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "02dbfyi80im37gdsxglb4fja78q63b8ahmgdc5kh8lx51kf5xsg7"; + sha256 = "0v17zzyyb25nn9l18v5244myg7590dp6ppwgi8xysipifc0q77bz"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "0ija9a02znajsa2pbxamrmz87zwpmba9s29vdzzqqqw5c1rdpcr6"; + sha256 = "0dlpv3v6jpbmgvhpn29ryp0w2a1xny8ciqid8hnlf3klahz9kwz9"; fetchSubmodules = true; }; @@ -45,6 +46,8 @@ in stdenv.mkDerivation rec { xen ] ++ optionals enableIscsi [ openiscsi + ] ++ optionals enableCeph [ + ceph ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; @@ -85,6 +88,8 @@ in stdenv.mkDerivation rec { "--with-storage-zfs" ] ++ optionals enableIscsi [ "--with-storage-iscsi" + ] ++ optionals enableCeph [ + "--with-storage-rbd" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" ]; diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index b325c9b246c21e03927dd4f5c940acfa30a16540..0a7819743e0362d2a28be2c6089fc85775d0d3dd 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, +{stdenv, fetchurl, fetchpatch, libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng, systemd }: @@ -18,6 +18,13 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + patches = [ + # CVE-2018-7225. Remove with the next release + (fetchpatch { + url = https://salsa.debian.org/debian/libvncserver/raw/master/debian/patches/CVE-2018-7225.patch; + sha256 = "1hj1lzxsrdmzzl061vg0ncdpvfmvvkrpk8q12mp70qvszcqa7ja3"; + }) + ]; preConfigure = '' sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure ''; diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix deleted file mode 100644 index a39113e05b67c45a839c4203c151c5d40f3ab14d..0000000000000000000000000000000000000000 --- 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 cc3f19ab7d31c06e5ce478744dfa02b6f768fded..da367b52cc0d342b317ae93f0c4a254a5d254759 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.32"; - src = fetchurl { - url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2"; - sha256 = "1diklgcjhmvcxi9p1ifp6wcnyr6k7z9jhrlzfhzjqd6zipk01slw"; + src = fetchFromGitHub { + owner = "linuxwacom"; + repo = "libwacom"; + rev = "libwacom-${version}"; + sha256 = "15fz2z2h2awh2l08cv663s1zk4z8bmvvivwnnfvx2q8lkqgfkr7f"; }; - 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 8cd0536e294612e4283502503ac230466d834e16..0e8533a5639f8e8854fb0835999e0b13070abb5b 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 9cd0aabcf097ed5c3ed603c9bf4df9b2872b2889..023e08c336be159771e020e2529eea4bd4e82702 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.1.0"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; - sha256 = "0cz4f05qd9b2bm27h5pkwym2cl7ff73lgirzwjppwf9b18if58yv"; + sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl"; }; buildInputs = [ cmake openssl zlib libuv ]; diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index eed0c77af80418a45be7c4d60528a06b3142553a..bf685862adf17d334369a511fea11baee991433d 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 f2d05d14d6931ae5ccde8d45b9e304cc1c707f6a..9c35d3373505420fcc347e26b6f0be42e199f2e4 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobjectIntrospection, gnome3}: +{ stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool, gobject-introspection, gnome3 }: let pname = "libwnck"; - version = "3.24.1"; + version = "3.30.0"; in stdenv.mkDerivation rec{ name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0f9lvhm3w25046dqq8xyg7nzggxpmdriwrb661nng05a8qk0svdc"; }; outputs = [ "out" "dev" "devdoc" ]; @@ -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"; @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec{ description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = []; + maintainers = [ maintainers.worldofpeace ]; }; } diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index 49012f8bddf8322c7dd0245de44c2350b2d67b2c..736b1a45fa20b68ef0f18e05de317f56ac10c767 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 9d262910e14f878ddd167b7360419cd9cf550d1f..99808be2b216656e5da39286cf6267aef2770472 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/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix new file mode 100644 index 0000000000000000000000000000000000000000..e730cc6eaabfc3e9c7f9e11e1d5f9f5102fc2913 --- /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 263796cdc783bfb902cf05a8e984213af660d6f2..773389e60f5469703807e6cfd6640eec34dd1179 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 035bfa8d6dc3c4205753f5432e15137ce9803537..471789d3e0f6b262bd836d95b53e56610c29a933 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 81c5b5e2891b22dad66b3c4d3dbccd92f157a9b9..aff5f8ac44512a02855ef5794b52641cbd522956 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 c359ea10b6651b825b308dafd23d2ec8ecc58a77..de131052314a64ca11a4b6b3677b2c9cc7ac229a 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" @@ -11,32 +11,20 @@ let in stdenv.mkDerivation rec { name = "libxml2-${version}"; - version = "2.9.8"; + version = "2.9.9"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b"; + sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl"; }; - patches = [ - (fetchpatch { - name = "CVE-2018-14567_CVE-2018-9251.patch"; - url = https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74.patch; - sha256 = "1xpqsfkzhrqasza51c821mnds5l317djrz8086fmzpyf68vld03h"; - }) - (fetchpatch { - name = "CVE-2018-14404.patch"; - url = https://gitlab.gnome.org/GNOME/libxml2/commit/a436374994c47b12d5de1b8b1d191a098fa23594.patch; - sha256 = "19vp7p32vrninnfa7vk9ipw7n4cl1gg16xxbhjy2d0kwp1crvzqh"; - }) - ]; - 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 +54,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 0000000000000000000000000000000000000000..cce73ba89bcde1db57fad2e0f4b2d5f21bff1a23 --- /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.6"; + + outputs = [ "out" "lib" "dev" "devdoc" ]; + + src = fetchFromGitHub { + owner = "hughsie"; + repo = "libxmlb"; + rev = version; + sha256 = "194slg11lp2i8zvc4a3zkzshps7qglzmrabp5k0r92rampx4dbwa"; + }; + + 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/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 226fe5be536a7d73bb4df5d307a18ca2d880106e..07ed1cba8be08bc348b425d6b627b23658505a8d 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ phreedom wkennington ]; + maintainers = with maintainers; [ phreedom ]; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 6dc40bd45a0a9e5bf002f5dbc2de2135e53b9c4e..ce79b2ac5ff93199322abadc39b1bd258087d9fe 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2 +{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: @@ -10,25 +10,19 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.32"; + version = "1.1.33"; name = pname + "-" + version; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "0q2l6m56iv3ysxgm2walhg4c9wp7q183jb328687i9zlp85csvjj"; + sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf"; }; - patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; - - # fixes: can't build x86_64-unknown-cygwin shared library unless -no-undefined is specified - postPatch = optionalString stdenv.hostPlatform.isCygwin '' - substituteInPlace tests/plugins/Makefile.in \ - --replace 'la_LDFLAGS =' 'la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS)' - ''; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; - buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]; + buildInputs = [ libxml2.dev ] + ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ] + ++ stdenv.lib.optionals cryptoSupport [ libgcrypt ]; propagatedBuildInputs = [ findXMLCatalogs ]; diff --git a/pkgs/development/libraries/libxslt/patch-ah.patch b/pkgs/development/libraries/libxslt/patch-ah.patch deleted file mode 100644 index ea75b01178e30d15f58c810d754986e175e26bdd..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/libxslt/patch-ah.patch +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2012/11/27 12:17:51 adam Exp $ - -Fix syms file for stricter solaris ld - ---- libxslt-1.1.28/libxslt/libxslt.syms.orig 2012-11-27 12:04:43.000000000 +0000 -+++ libxslt-1.1.28/libxslt/libxslt.syms -@@ -107,7 +107,7 @@ LIBXML2_1.0.11 { - xsltFreeCompMatchList; - xsltFreeTemplateHashes; - xsltGetTemplate; -- xsltMatchPattern; -+# xsltMatchPattern; - xsltTestCompMatchList; - - # preproc -@@ -407,7 +407,7 @@ LIBXML2_1.1.18 { - global: - - # xsltInternals -- xsltConstNamespaceNameXSLT; # variable -+# xsltConstNamespaceNameXSLT; # variable - xsltExtensionInstructionResultFinalize; - xsltExtensionInstructionResultRegister; - xsltInitCtxtKey; -@@ -416,24 +416,24 @@ LIBXML2_1.1.18 { - xsltInit; - - # xsltInternals -- xsltParseAnyXSLTElem; -- xsltParseSequenceConstructor; -- xsltPointerListAddSize; -- xsltPointerListClear; -- xsltPointerListCreate; -- xsltPointerListFree; -+# xsltParseAnyXSLTElem; -+# xsltParseSequenceConstructor; -+# xsltPointerListAddSize; -+# xsltPointerListClear; -+# xsltPointerListCreate; -+# xsltPointerListFree; - xsltRegisterLocalRVT; - xsltReleaseRVT; -- xsltRestoreDocumentNamespaces; -+# xsltRestoreDocumentNamespaces; - - # extensions -- xsltStyleStylesheetLevelGetExtData; -+# xsltStyleStylesheetLevelGetExtData; - - # xsltInternals - # xsltTransStorageAdd; removed in 1.1.28 - # xsltTransStorageRemove; removed in 1.1.28 - xsltUninit; -- xsltXSLTAttrMarker; # variable -+# xsltXSLTAttrMarker; # variable - } LIBXML2_1.1.9; - - LIBXML2_1.1.20 { -@@ -476,6 +476,10 @@ LIBXML2_1.1.26 { - - # transform - xsltProcessOneNode; -+ -+# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") -+ local: -+ *; - } LIBXML2_1.1.25; - - LIBXML2_1.1.27 { diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 671c077b034706eeefa4496aaecc753cff915900..c1f34bd33980cb1e5b7bc10cae94d10d782250df 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation { description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index ba179e54fe0c36dc2ae0926417b03535259b2118..be493828486cfc562601c072bb2e595961d66ea8 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { description = "A C library to interact with the CCID-part of the Yubikey NEO"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 5b10e62deee78c8e92526105f2488a411f3b6702..010eecb0fa97733486ebe80a5e4af36eef48077d 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { homepage = http://opensource.yubico.com/yubico-c/; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..2ad017dc90be67dc26608d8f473b840450b92220 --- /dev/null +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "libzapojit"; + version = "0.0.3"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; + }; + + nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; + propagatedBuildInputs = [ glib json-glib librest libsoup gnome3.gnome-online-accounts ]; # zapojit-0.0.pc + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; + homepage = https://wiki.gnome.org/Projects/Zapojit; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 2ad14efa322337838a7299033763c5ba01d94d94..3f963c7ca19a8f1f8dd63ea8790e43d8c2b25123 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 f2a8d75a9cbbfe14c74506c2e3bc08415ba310eb..ab0e51bae2616c28da2a966bda4057fe772fb55f 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 ad6d2df1d8bdf8c1b05796248502fcbed5daeee6..13fbe2b55b6785d665343eb6eb3af8bfc8c07195 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 4dd5d8bcd26f932275a3d3d33938e60af8c0f1d0..31056d0a4ed614a8484cb93daec2f7997769c505 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.12.14"; 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 = "0irafygp23m2xmjv06qgs1sccymbwqvn51wggk0c60lnj1v1zhwd"; }; 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 0bb3a67d9502a3bcf1b7c0b6926cdd66e74af41a..047a74f08409c7c217f44700e1c666c019283d03 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.22"; + version = "0.9.23"; src = fetchFromGitHub { owner = "LMDB"; repo = "lmdb"; rev = "LMDB_${version}"; - sha256 = "0lng4ra2qrbqcf8klvqp68qarha0z4bkqhhv8lhh45agsxyrhfkj"; + sha256 = "0ag7l5180ajvm73y59m7sn3p52xm8m972d08cshxhpwgwa4v35k6"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; @@ -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 34dfe26ad70becbfc6f7ba596da23a3371b8e3eb..232a67c23f3b3cf5b99b7199e821aa51c9309f78 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 7a390021d1fa55e9a075ea28817ff5a91a6afcdb..7fb79c549be8ade9882861db19002467b5241322 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-2.0.2"; + name = "log4cplus-2.0.3"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "0y9yy32lhgrcss8i2gcc9incdy55rcrr16dx051gkia1vdzfkay4"; + sha256 = "0rwzwskvv94cqg2nn7jsvzlak7y01k37v345fcm040klrjvkbc3w"; }; meta = { diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index 7b672aebe4457a1da72c6fab5e9451a7790891a9..b2fba7df509bdd11e9853ef8125b535854cd4aa6 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 aecd75656dae62185b5e3a23ca7cb8ba7eb4124c..cad5d0d7ecad96256f67e8d5259548f8c415ad98 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/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 367c4e96384224832096cf77bda420e147849f07..c7794b1a8bfbfdbd84f89abf9d2265a89c8e0c75 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "mailcore2-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "MailCore"; repo = "mailcore2"; rev = version; - sha256 = "1d0wmnkk9vnjqc28i79z3fwaaycdbprfspagik4mzdkgval5r5pm"; + sha256 = "0yxynvfmifpw9hdhv499a813hb2ynan74r353lhcdajkkm7w8br5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 0546bdc6359b56f68f786a1d1e22f4d91ca1bace..0c88cff77732c32060d844f76aef9491bebdb4cf 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" - ''; - - buildPhase = false; + prefixKey = "PREFIX="; - 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 3b61027153915fa37efe694a82eb8b323f33c9e0..064f04f220cd277cfa9eab5931caa928f91ee594 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 573215227369b9f8789b308d93d619994d7d2603..f28ff1b0a21f0e28e26a66611bf54758beefc594 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 764d50190b9e7cb9a61ce07aad1c070f24017cc4..8b8d8cd0be80a3672ef7ecf00703c98ba610c571 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 ]; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Portable cryptographic and SSL/TLS library, aka polarssl"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index d99944228c739e626202fe06f534b049d92881c8..b5bfb4af0bdb5eddd1793861fc4a62e79bbf5f52 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.15.1"; src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = name; - sha256 = "09snlzlbn8yq95dnfbj2g5bh6y4q82xkaph7qp9ddnlqiaqcji2h"; + sha256 = "0w6cm2f7d43wp8cx6r5h4icq8zcix1jnvivshypir1rbk1q83gx8"; }; - 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 @@ -33,6 +34,6 @@ stdenv.mkDerivation rec { description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } 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 11bd437d377e224d6825e778c52729fa1168e45c..0000000000000000000000000000000000000000 --- 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 8ff1d6d5e9a247ff2b67af6a9a904b0bd52e81e7..0000000000000000000000000000000000000000 --- 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 43fee9ccead8288b91eed52d074b82395299ca51..3b0a0441cc4e606ccf1c1f4fc9f549f4abe59cb0 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/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 5a29a9219fb8b8f35132fde1fdf5d1c0a5d55adb..8f0a6317a25710366ed6436e269e2d0541ede3c3 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -2,14 +2,17 @@ stdenv.mkDerivation rec { name = "medfile-${version}"; - version = "3.3.1"; + version = "4.0.0"; src = fetchurl { url = "http://files.salome-platform.org/Salome/other/med-${version}.tar.gz"; - sha256 = "1215sal10xp6xirgggdszay2bmx0sxhn9pgh7x0wg2w32gw1wqyx"; + sha256 = "017h9p0x533fm4gn6pwc8kmp72rvqmcn6vznx72nkkl2b05yjx54"; }; - buildInputs = [ cmake hdf5 ]; + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ hdf5 ]; checkPhase = "make test"; diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index c92b6a4e7287d9335c042494f7c99c2a8d8d84fc..d64b7f123127ec070a02bcf5177dabb6a7c3b933 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation { buildInputs = [ glib libfm-extra ]; meta = with stdenv.lib; { - homepage = http://blog.lxde.org/?tag=menu-cache; - license = licenses.gpl2Plus; description = "Library to read freedesktop.org menu files"; + homepage = https://blog.lxde.org/tag/menu-cache/; + license = licenses.gpl2Plus; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix deleted file mode 100644 index 2bfdb679156cf0cc5b6249db4480d1cfa97fd6e0..0000000000000000000000000000000000000000 --- 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 5466ffc9085817e189ae993de0f4ac4bed58dbe9..0000000000000000000000000000000000000000 --- 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 ff933b2ec2840ca3eb6dbe3a95e2c82ebef633de..0000000000000000000000000000000000000000 --- 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 919443045e46b06118807b73e1e4a1b93d8b19da..0000000000000000000000000000000000000000 --- 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 565d5e6c27372619bafb54876d0086545df6e858..0000000000000000000000000000000000000000 --- 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 58ac66bd55110536c6b84310858bb5b308f8f5d6..0000000000000000000000000000000000000000 --- 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 5ec0d9024effc2942df43cda47cb8effbe3c00a7..0000000000000000000000000000000000000000 --- 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 372ce4a27a39b5825d13ed3a0ad356ff6b79c61a..0000000000000000000000000000000000000000 --- 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 4818ee63d4c95d56b24e9bc099765d330d7c13a8..0000000000000000000000000000000000000000 --- 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 72841e2a2ccedef26f62c1bf223e334f3addd97b..0000000000000000000000000000000000000000 --- 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 e29a8464076da570caa7bc2fe23948ac56b3d66d..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..94e90a1c5871c8ad0dc921f79aa25ac6608d1080 --- /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 0a8a3c75a1c064b113b8992c8f21b6ebc797e3aa..e54df3562da179d164ae6ba839e55b9fbdb4ecd3 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -2,12 +2,14 @@ , pkgconfig, intltool, autoreconfHook , file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal -, libelf, libvdpau, valgrind-light, python2 +, libelf, libvdpau, valgrind-light, python2, python2Packages , libglvnd , enableRadv ? true , 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.3.1"; 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 = "0qyw9dj2p9n91qzc4ylck2an7ibssjvzi2bjcpv2ajk851yq47sv"; }; 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,34 +119,38 @@ 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" ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig file ]; + nativeBuildInputs = [ + autoreconfHook intltool pkgconfig file + python2 python2Packages.Mako + ]; - propagatedBuildInputs = with xorg; - [ libXdamage libXxf86vm ] - ++ optional stdenv.isLinux libdrm; + propagatedBuildInputs = with xorg; [ + libXdamage libXxf86vm + ] ++ 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*/ - valgrind-light python2 python2.pkgs.Mako - ]; + expat llvmPackages.llvm libglvnd xorgproto + libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr + libffi libvdpau libelf libXvMC + libpthreadstubs openssl /*or another sha1 provider*/ + ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] + ++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ]; enableParallelBuilding = true; doCheck = false; @@ -162,6 +163,9 @@ let self = stdenv.mkDerivation { # TODO: probably not all .la files are completely fixed, but it shouldn't matter; postInstall = '' + # Some installs don't have any drivers so this directory is never created. + mkdir -p $drivers + '' + optionalString (galliumDrivers != []) '' # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM mv -t "$drivers/lib/" \ $out/lib/libXvMC* \ @@ -215,7 +219,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 +239,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 +263,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 +273,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 47391567fb9b97355720b5b4c416ec9189165421..37813db893471edd4ad63ded0af8025c289e8dca 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 feb6ffe428c07853bdaf9e7e9308f2d300927c95..18e7d5437b1509a06da05cf98ca4c67b92de7e29 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 6779268dbdc1202e0d30ce69178ad39c2493eabe..c2a61ec6fc1cfba0ad167d331698e41b3df6bb76 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/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 804c3f8ed22891c3aa3f59040de40986b0b5cec9..1f41696a4e33a08fcad4a116dbc91e0cdc800936 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.10.0"; + version = "6.12.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; + sha256 = "0pzm3mjbbdl2rkbswgyfkx552xlxh2qrwzsi2a4dicfr92rfgq6w"; }; buildInputs = [ diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..78ae8875fcf3c121af04a71a3d8550d5357417d4 --- /dev/null +++ b/pkgs/development/libraries/mm-common/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, gnome3 }: + +stdenv.mkDerivation rec { + pname = "mm-common"; + version = "0.9.12"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "02vwgv404b56wxy0gnm9xq9fvzgn9dhfqcy2hhl78ljv3v7drzyf"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with stdenv.lib; { + description = "Common build files of GLib/GTK+ C++ bindings"; + longDescription = '' + The mm-common module provides the build infrastructure and utilities + shared among the GNOME C++ binding libraries. It is only a required + dependency for building the C++ bindings from the gnome.org version + control repository. An installation of mm-common is not required for + building tarball releases, unless configured to use maintainer-mode. + ''; + homepage = http://www.gtkmm.org; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 780f68e7d485c4b172ff8ed50803251be7e78678..43311c29659bcea13d30acdb7ce3c965bd55d8e9 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, 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 ]; # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged - buildInputs = [ mono48 gtk-sharp-2_0 ]; + buildInputs = [ mono4 gtk-sharp-2_0 ]; dontStrip = true; @@ -27,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 d96f90b4bfd673a0f3f7ae95121461a1ca194fe0..37195d385627799ca897b3c942475e1f389e92bd 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 b5188cb66d29c744b4e16d260dd3e5d1ff1d10fa..849da2e6cad5ff44642eba15650cfeae141fc89b 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/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index e55d9989bffcf463c727b5ba1936e931a7185e98..51081f25bf2d20cebab1da66d514006a44aa97fc 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -25,8 +25,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { + description = "Abandoned library. Provides functions to read, create, and modify mp4 files"; + longDescription = '' + MP4v2 library provides an API to work with mp4 files + as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. + This container format is derived from Apple's QuickTime format. + ''; homepage = https://code.google.com/archive/p/mp4v2/; - maintainers = [ ]; + maintainers = [ lib.maintainers.Anton-Latukha ]; platforms = lib.platforms.unix; license = lib.licenses.mpl11; }; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 87d24854255ae8224c0c5c3a85662d88cb8e77dd..ffe6b5edf961307749b3bb353ffce8f9fbc0a353 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 = [ @@ -23,17 +23,18 @@ stdenv.mkDerivation rec { doCheck = true; preFixup = '' + # Ensure the default compilers are the ones mpich was built with + sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc + sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx + sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort + '' + + stdenv.lib.optionalString (!stdenv.isDarwin) '' # /tmp/nix-build... ends up in the RPATH, fix it manually for entry in $out/bin/mpichversion $out/bin/mpivars; do echo "fix rpath: $entry" patchelf --set-rpath "$out/lib" $entry done - - # Ensure the default compilers are the ones mpich was built with - sed -i 's:CC="gcc":CC=${stdenv.cc}/bin/gcc:' $out/bin/mpicc - sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx - sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort - ''; + ''; meta = with stdenv.lib; { description = "Implementation of the Message Passing Interface (MPI) standard"; @@ -49,6 +50,6 @@ stdenv.mkDerivation rec { fullName = "MPICH license (permissive)"; }; maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index aac9dc7f727a13342ec381eb311d36c1a3ae7d97..1430a3dfca156b5354f9c1224c851f40a709c7f5 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mps-${version}"; - version = "1.116.0"; + version = "1.117.0"; src = fetchurl { url = "https://www.ravenbrook.com/project/mps/release/${version}/mps-kit-${version}.tar.gz"; - sha256 = "1k7vnanpgawnj84x2xs6md57pfib9p7c3acngqzkl3c2aqw8qay0"; + sha256 = "04ix4l7lk6nxxk9sawpnxbybvqb82lks5606ym10bc1qbc2kqdcz"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { # needed for 1.116.0 to build with gcc7 NIX_CFLAGS_COMPILE = [ "-Wno-implicit-fallthrough" + "-Wno-error=clobbered" ]; diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index 306becf0c180c77672ce4c13fe67a874631dca3a..29ec205d7a11267e2ae93f58c786612ff7741d92 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -15,15 +15,13 @@ 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; { description = "MessagePack implementation for C and C++"; homepage = https://msgpack.org; license = licenses.asl20; - maintainers = with maintainers; [ redbaron wkennington ]; + maintainers = with maintainers; [ redbaron ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index cfb02ddbf9ddb5aa2b6371c66026a8c549208218..601e70427a138a984a40aace94c6a4114250559f 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/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 0e1327e9e761f225f32c8b01c02128199e24cb17..e999ea73ae2e2b9318f698301c05b08e47cb6373 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -16,10 +16,9 @@ stdenv.mkDerivation rec { kernel MT events to the slotted type B protocol. The events put into mtdev may be from any MT device, specifically type A without contact tracking, type A with contact tracking, or type B with contact tracking. - See the kernel documentation for further details. + See the kernel documentation for further details. ''; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 465a7057635615883fdfa886bf4ac9343b44aeb6..15c82cb128258b9e3ee111201c3b74118baf53f9 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "mtxclient-${version}"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mujx"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "0i58y45diysayjzy5ick15356972z67dfxm0w41ay88nm42x1imp"; + sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs"; }; postPatch = '' diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index dd40a396244994b52b16ba46ecac97842e6ae058..01bf863bbbb147bca1a054347e44eb5cbe33f4f2 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 b5d4ea0f4ebf7d93b9315dd334e40f053598e6ca..f29fb9564f316ff1860e45eeb742b88827f0b4db 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 f50b64fca3ed2be0d8e1665add4e0160336036ab..8f72b333aa480b5cf16f05ca724d3a816299b701 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 6293efcca8b249b38f7619b8361e465843f82777..ef3ff13bac6d612438c68f3c961cd7bb90ac1506 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -4,6 +4,7 @@ , mouseSupport ? false , unicode ? true , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt +, enableShared ? !enableStatic , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt , gpm @@ -12,26 +13,29 @@ }: 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 configureFlags = [ - "--with-shared" + (lib.withFeature enableShared "shared") "--without-debug" "--enable-pc-files" "--enable-symlinks" + "--with-manpage-format=normal" + "--disable-stripping" ] ++ lib.optional unicode "--enable-widec" ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5" @@ -157,11 +161,10 @@ 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; - maintainers = [ lib.maintainers.wkennington ]; }; passthru = { 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 956f9b68d68fea4a66db4397b3afcbcc57341c67..0000000000000000000000000000000000000000 --- 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 1040cb9a9343b355e83027e9ecbb96b65bbad658..923bc61f67dac886ff5606dff793c32315663667 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 d0f992efb2bca0b8090c1af0744b4f0309fe5694..87f9b5effacd12fc5cd8e6ccb7e70afe0829ab08 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 7aad5be36f7055d5b3f7a9290afcc77fa0ac1c09..61a40753a56f03ade1f08f4e69f5c017db933f0c 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-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 8af2a7aa36823886233c7493c2a301d033d86a69..bb621a3eda6c522aa0beba55b42d0862312635a4 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { name = "netcdf-fortran-${version}"; - version = "4.4.4"; + version = "4.4.5"; src = fetchurl { url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz"; - sha256 = "0rwybszj1jjb25cx8vfyrd77x5qsdjzwspcjz56n12br89n9ica4"; + sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01"; }; buildInputs = [ netcdf hdf5 curl gfortran ]; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 7d0e934d911c272648d44533fc7f76b1d834d92f..0c597fc4b3358ec1c90eeb42401f0a9b3079a6fa 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/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 5b998926f0a5f950af548a53a0fbd5790eff7b08..900451351c8241d08b8c544f44070e7871db0072 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.4"; + version = "3.4.1"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "150y8655h629wn946dvzasq16qxsc1m9nf58mifvhl350bgl4ymf"; + sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr"; }; }) diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 2ef367b6c53acf763acbd8ec613219986c21d1a6..d78a31d65cd36808b5738fdfbdd2f3f389456595 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (rec { homepage = http://www.lysator.liu.se/~nisse/nettle/; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index a10f52462a8e3e9ebb660a2a690f3b3fcd769c43..1a5656b7ca166b5a2d56200cb225dafb357757f7 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 68bffd4032d2b8058270faa8295c47a1b7519f60..fdc21b26271fa2bd37206788ac7014610b6ac402 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.1"; src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "0jlndbp4bnyvdg8b59pznrzz0bvwb9nmag7zgcflg51lm1pq2q06"; + sha256 = "020k9xkca386yfs47zypb4x83f4l6vqpf8qw1xrhmrd29x4wxvam"; }; 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 @@ -45,6 +50,5 @@ stdenv.mkDerivation rec { description = "A C implementation of HTTP/2"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index d3a4b21b4b613589c6565a3ea280211b058b17b2..cc5a115ed71e4c6f5d8b0f385eb02b2a16010f85 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 = "5.0.0"; 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 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv"; + sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 15bdbb1b48e891b5ee6fe7850b82b46d2032c5f0..eb737c0757d910459ed9a3237b3b7f5973c85a14 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.5.0"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "0585r6ai9x1bhspffn5w5620wxfl1q1gj476brsnaf7wwnr60hwk"; + sha256 = "1jq522d48bvfrxr4f6jnijwx2dwqfb8w9k636j4kxlg1hka27lji"; }; 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 904cdc6a3daa995fdbe28de85060c30b0d575e9e..bbbc818db63df79acc188aebd9d9d843a803df30 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 c7e133d94b23a751465211993ca77a20f93d550f..3c5ae8537a414ed87c0a7a751f7baa75e36baf26 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 ce18498ee858a5272647cc8cf9a943a94df570d5..56804d54667320c555aabdde8d67c4a47ed31890 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 3089e6da23ae3ed4ef9796a8ad14eee505d37319..57eab750695b31bfedc0e9ebef8d43fe47e76ab6 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.42"; + 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 = "04rg0yar0plbx1sajrzywprqyhlskczkqxxsgxmcc0qqy64y8g2x"; }; 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 969e7534eac43d33e86b74fff01755971e3b43a2..e165f037be63dc59def27306aca8c47267d4a698 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 ]; @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=nss_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index a70cba625a89745bcb8bdf8631f37d4c75c50b54..a310d2f278029178df9fac13d1d5cfd194262b06 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { description = "The not-so trivial database"; homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 63a51a90ccd2453038c768e45d10352f0bcf5b8d..12d3c9ad9420096f0209d7288f06b3131ced818c 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 44c8f51e856a4d95744512d7262198f5d17e2f9f..a2361b0188eb594ee95a2cda53c558a24ca1329e 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/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1d92a15ce0051a055d082e2d1fc40e9c3ac65572 --- /dev/null +++ b/pkgs/development/libraries/nuspell/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, icu, catch2 }: + +stdenv.mkDerivation rec { + name = "nuspell-${version}"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "nuspell"; + repo = "nuspell"; + rev = "v${version}"; + sha256 = "0gcw3p1agnx474r7kv27y9jyab20p4j4xx7j9a2yssg54qabm71j"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ boost icu ]; + + enableParallelBuilding = true; + + preBuild = '' + ln -s ${catch2}/include/catch2/*.hpp tests/ + ''; + + meta = with stdenv.lib; { + description = "Free and open source C++ spell checking library"; + homepage = "https://nuspell.github.io/"; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/nuspell/wrapper.nix b/pkgs/development/libraries/nuspell/wrapper.nix new file mode 100644 index 0000000000000000000000000000000000000000..4386542ff20e5e1806de66d3fd743fc16ef8f391 --- /dev/null +++ b/pkgs/development/libraries/nuspell/wrapper.nix @@ -0,0 +1,13 @@ +{ stdenv, lib, nuspell, makeWrapper, dicts ? [] }: +with lib; +let + searchPath = makeSearchPath "share/hunspell" dicts; +in +stdenv.mkDerivation { + name = (appendToName "with-dicts" nuspell).name; + buildInputs = [ makeWrapper ]; + buildCommand = '' + makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${searchPath} + ''; + meta = removeAttrs nuspell.meta ["outputsToInstall"]; +} diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..07ec502cd12a39cf6e2dd5797ac72192a14c0aac --- /dev/null +++ b/pkgs/development/libraries/nv-codec-headers/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "nv-codec-headers-${version}"; + version = "8.2.15.6"; + + src = fetchgit { + url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; + rev = "n${version}"; + sha256 = "0216ww8byjxz639kagyw0mr9vxxwj89xdnj448d579vjr54jychv"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "FFmpeg version of headers for NVENC"; + homepage = http://ffmpeg.org/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.MP2E ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index b672882966064426cf69eb4638d5a97a56726bb8..aa188650860957444a86f6c31276be7776f03f86 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/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index 2715ff4dfaffc9a6f8ce51329c8f7ad6b2b3d936..931ecc186be65ba321c20ec47a169c3cbdb34df0 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "odpic-${version}"; - version = "2.4.2"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/oracle/odpi/archive/v${version}.tar.gz"; - sha256 = "0hw6b38vnh0cgm1iwpgkqa2am86baal6irp9bglacblwh8sshqdi"; + sha256 = "0m6g7lbvfir4amf2cnap9wz9fmqrihqpihd84igrd7fp076894c0"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index 0f6495f0c9c153ca9f894b7f92b4bc7e4ef19390..42babc32ecdb43fc0d8db9b36d280805a41ef41c 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -1,10 +1,10 @@ { fetchFromGitHub, stdenv, lib , cmake, libGLU_combined -, freetype, freeimage, zziplib, randrproto, libXrandr +, freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, xproto, libX11, libXmu, libSM, pkgconfig -, libXxf86vm, xf86vidmodeproto, libICE -, renderproto, libXrender +, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, libICE +, libXrender , withNvidiaCg ? false, nvidia_cg_toolkit , withSamples ? false }: @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libGLU_combined - freetype freeimage zziplib randrproto libXrandr + freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - xproto libX11 libXmu libSM pkgconfig - libXxf86vm xf86vidmodeproto libICE - renderproto libXrender + libX11 libXmu libSM pkgconfig + libXxf86vm libICE + libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 0b7202459f9ee49e56f2b57bbeb0d3c19e514814..d847f447048d3aa1f1747f06afa76ced18ccd19e 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, lib , cmake, libGLU_combined -, freetype, freeimage, zziplib, randrproto, libXrandr +, freetype, freeimage, zziplib, xorgproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois -, xproto, libX11, libXmu, libSM, pkgconfig -, libXxf86vm, xf86vidmodeproto, libICE -, renderproto, libXrender +, libX11, libXmu, libSM, pkgconfig +, libXxf86vm, libICE +, libXrender , withNvidiaCg ? false, nvidia_cg_toolkit , withSamples ? false }: @@ -25,11 +25,11 @@ stdenv.mkDerivation { buildInputs = [ cmake libGLU_combined - freetype freeimage zziplib randrproto libXrandr + freetype freeimage zziplib xorgproto libXrandr libXaw freeglut libXt libpng boost ois - xproto libX11 libXmu libSM pkgconfig - libXxf86vm xf86vidmodeproto libICE - renderproto libXrender + libX11 libXmu libSM pkgconfig + libXxf86vm libICE + libXrender ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 25bb7a365f2849728cdfbfbb6808ba4e95825c26..253d185fa0cdcb31ae99ac7df2627b06b80db50a 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xproto -, libXi, inputproto, libXaw, libXmu, libXt }: +{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xorgproto +, libXi, libXaw, libXmu, libXt }: let majorVersion = "1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; buildInputs = [ - autoconf automake libtool libX11 xproto libXi inputproto libXaw + autoconf automake libtool libX11 xorgproto libXi libXaw libXmu libXt ]; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 05888ad60bb17ccbf4d7f40a36ff1fc967ab11fa..4749efb5f0067e24fb14b7ecef0f360d49d4a88a 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "olm-${version}"; - version = "2.3.0"; + version = "3.0.0"; meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz"; - sha256 = "1y2yasq94zjw3nadn1915j85xwc5j3pic3brhp0h83l6hkxi8dsk"; + sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c"; }; doCheck = true; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 956c8b58ffc13a659917bbc932563d3d9d117aae..4c994d596ba1b0711321ae58b14697f022532d4b 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.9.0"; + version = "6.9.1"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "064nk8nxygqrk5b6n7zvrksf5shrsapn12zdi6crbbfbw0s7pn8h"; + sha256 = "0dbdd9r15fsqn0rimkjwlv8v68v4i1830h0m7dw56b335wwl6bbg"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index f86e4d120976483da7c6ddded1404e84bea1ff4a..1658e831ddd1d1620567f50a5180cfb24f687a84 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 8d1a2876a375d0730288f39fbcb903f341ee7c3c..3835822673ce4fbe3b3330527b0b30222416d800 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/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index bfbf6f1212fbbd1f07c73123669182ab28f52eef..81754ffad4d20b1e97f7c949ab19a7ebccf0f295 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: +{stdenv, fetchurl, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkgconfig }: stdenv.mkDerivation rec { name = "openbabel-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0xm7y859ivq2cp0q08mwshfxm0jq31xkyr4x8s0j6l7khf57yk2r"; }; + patches = [ + # ARM / AArch64 fixes. + (fetchpatch { + url = https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch; + sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g"; + }) + ]; + # TODO : perl & python bindings; # TODO : wxGTK: I have no time to compile # TODO : separate lib and apps diff --git a/pkgs/development/libraries/opencascade-occt/default.nix b/pkgs/development/libraries/opencascade-occt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..d57c10b41e95797b1ae5f3a9732802d52d934ebd --- /dev/null +++ b/pkgs/development/libraries/opencascade-occt/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchurl +, cmake +, tcl +, tk +, vtk +, mesa_glu +, libXext +, libXmu +, libXi +, doxygen +}: + +let version = "7.3.0p2"; + commit = "V${builtins.replaceStrings ["."] ["_"] version}"; + +in stdenv.mkDerivation { + + name = "opencascade-occt-${version}"; + + src = fetchurl { + name = "occt-${commit}.tar.gz"; + url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=${commit};sf=tgz"; + sha256 = "0nc9k1nqpj0n99pr7qkva79irmqhh007dffwghiyzs031zhd7i6w"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ tcl tk vtk mesa_glu libXext libXmu libXi doxygen ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; + homepage = "https://www.opencascade.org/"; + license = licenses.lgpl21; # essentially... + # The special exception defined in the file OCCT_LGPL_EXCEPTION.txt + # are basically about making the license a little less share-alike. + maintainers = with maintainers; [ amiloradovsky ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 6af15d90cefda6e3a39bbb25c41cb1ec86c94a6d..05d78488957ace7f14d1573044c7aa847f5584c3 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 358c8cda592fbf7cbde14e16fb3a4e87117d3a4c..d3e1482feb4d6a24453ed0b2ad18329684f5aa61 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 2724976c5ae8c276485484b886f22b6416ce9f8d..e0a6c6a5705e91ce0bca188783174b13db83cc2d 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/openct/default.nix b/pkgs/development/libraries/openct/default.nix index bddb0e1479e2b1f8fcc7ba2497edefed22680126..5ad7eecace1b0505e82df4bc6433f24df75605ed 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "openct-${version}"; version = "0.6.20"; - + src = fetchFromGitHub { owner = "OpenSC"; repo = "openct"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am ''; - + configureFlags = [ "--enable-api-doc" "--enable-usb" @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/OpenSC/openct/; license = licenses.lgpl21; description = "Drivers for several smart card readers"; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index dd87fa932604af1ef7919fd888052fa7f7ef054d..cca820e2f37170337768c65ed5afcc7014a8af22 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.3"; + version = "3.4.5"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "138q3wiv4g4xvqzsp93xaqayv7kz7bl2vrgppp8jm8w6m25cd4i2"; + sha256 = "0hz9316ys2qi0lx9dcbsk3mkn8cn08q12hc96p6zz2d4is6d5wsc"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "1f334glf39nk42mpqq6j732h3ql2mpz89jd4mcl678s8n73nfjh2"; + sha256 = "1fw7qwgibiznqal2dg4alkw8hrrrpjc0jaicf2406604rjm2lx6h"; }; # 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 { @@ -165,8 +167,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 @@ -192,7 +200,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; @@ -206,8 +214,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" @@ -229,6 +237,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" + ] ++ lib.optionals enablePython [ + "-DOPENCV_SKIP_PYTHON_LOADER=ON" ]; enableParallelBuilding = true; @@ -249,7 +259,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 0000000000000000000000000000000000000000..3f21ee15bf3fac1f53b3c85980e93101e245a01b --- /dev/null +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -0,0 +1,292 @@ +{ lib, stdenv +, fetchurl, fetchFromGitHub +, 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.1"; + + src = fetchFromGitHub { + owner = "opencv"; + repo = "opencv"; + rev = version; + sha256 = "1f0n2a57sn47w55vaxlwhr3g6xgchvr3gxicxbkyzai3pvj55k48"; + }; + + contribSrc = fetchFromGitHub { + owner = "opencv"; + repo = "opencv_contrib"; + rev = version; + sha256 = "0svw8f6nvnzmrc0baj6priq4hbijla4kl6gzy8yif1jfvcwb1syy"; + }; + + # 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" + ''; + + # 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 66a840fa2a9ebb795987205635dba06b7202582b..4532285e53dc0a3e4c8c3c9b04e9e94cddb43444 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/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index a073a29b507deabb188384d2aff445851b1db21c..f954aaf72457e5bb177f4c9e85939a66b062ab9a 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 49d70bc211a63bf0e7007246546805c86b9da8ed..17e2c9098a10891d98ac2b27bdc3ceb351a99188 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.7.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "1wqib5plak9bw2bla7y4qyjqi0b00kf8mfwlml16qj3i0aq6h2cp"; + sha256 = "1mj3zsywxphh9wcazyqsldwwn14r77xv9cjsmc0nmcybsl2bwnpl"; }; nativeBuildInputs = diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 71c2e56f54106197a62523b2daf57178199dae81..3d110910b1592257eb6249ce2738ff69be993329 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823"; }; - configureFlags= [ "--with-milter=${libmilter}" ]; + configureFlags= [ + "--with-milter=${libmilter}" + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index bb9d163dc4ac6e23913473aa48f0893109c32a62..b575fa0ef08c56462d9042c770b78c97d5dcad38 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { homepage = http://www.openexr.com/; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index a4e15f5dbafc550bc5b6b53212ac450467e4fb13..6a4a033e1c2701bad8c01feb7bdc59b4f5c08eed 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://www.openfst.org/twiki/bin/view/FST/WebHome; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.dfordivam ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 0a0b4c8d549830777768c5b8efb79fabd6f569ae..c8208ce27bae872c7ab383df34ba3bf56c05aed8 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/openhmd/default.nix b/pkgs/development/libraries/openhmd/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..66656a142342e52f41400f3a9e614da9a8b193e7 --- /dev/null +++ b/pkgs/development/libraries/openhmd/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, hidapi +, withExamples ? true, SDL2 ? null, libGL ? null, glew ? null +}: + +with lib; + +let onoff = if withExamples then "ON" else "OFF"; in + +stdenv.mkDerivation { + pname = "openhmd"; + version = "0.3.0-rc1-20181218"; + + src = fetchFromGitHub { + owner = "OpenHMD"; + repo = "OpenHMD"; + rev = "80d51bea575a5bf71bb3a0b9683b80ac3146596a"; + sha256 = "09011vnlsn238r5vbb1ab57x888ljaa34xibrnfbm5bl9417ii4z"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ + hidapi + ] ++ optionals withExamples [ + SDL2 libGL glew + ]; + + cmakeFlags = [ + "-DBUILD_BOTH_STATIC_SHARED_LIBS=ON" + "-DOPENHMD_EXAMPLE_SIMPLE=${onoff}" + "-DOPENHMD_EXAMPLE_SDL=${onoff}" + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; + + postInstall = optionalString withExamples '' + mkdir -p $out/bin + install -D examples/simple/simple $out/bin/openhmd-example-simple + install -D examples/opengl/openglexample $out/bin/openhmd-example-opengl + ''; + + meta = { + homepage = "http://www.openhmd.net"; + description = "Library API and drivers immersive technology"; + longDescription = '' + OpenHMD is a very simple FLOSS C library and a set of drivers + for interfacing with Virtual Reality (VR) Headsets aka + Head-mounted Displays (HMDs), controllers and trackers like + Oculus Rift, HTC Vive, Windows Mixed Reality, and etc. + ''; + license = licenses.boost; + maintainers = [ maintainers.oxij ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix deleted file mode 100644 index d18c971dc11295d906cbb8947f2f5dc8288a5472..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..3aa2fdf0dd25b067e3b934e70e7538b12a175726 --- /dev/null +++ b/pkgs/development/libraries/openjpeg/2.x.nix @@ -0,0 +1,31 @@ +{ callPackage, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "2.3.0"; + branch = "2.3"; + revision = "v${version}"; + sha256 = "08plxrnfl33sn2vh5nwbsngyv6b1sfpplvx881crm1v1ai10m2lz"; + + extraFlags = [ + "-DOPENJPEG_INSTALL_INCLUDE_DIR=${placeholder "dev"}/include/openjpeg-${branch}" + "-DOPENJPEG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/openjpeg-${branch}" + ]; + + 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"; + }) + (fetchpatch { + url = https://github.com/uclouvain/openjpeg/commit/24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97.patch; + sha256 = "1sl5wplgdfiqw8qbd8s5j5hq3ynbwgsnv8nxqfrk5s7vyrzx9pxv"; + }) + ./fix-cmake-config-includedir.patch + ]; +}) diff --git a/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch b/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch new file mode 100644 index 0000000000000000000000000000000000000000..6ff720ead4e10e9b0978f81f99f1e874d33d0a4e --- /dev/null +++ b/pkgs/development/libraries/openjpeg/fix-cmake-config-includedir.patch @@ -0,0 +1,55 @@ +--- a/cmake/OpenJPEGConfig.cmake.in ++++ b/cmake/OpenJPEGConfig.cmake.in +@@ -32,7 +32,7 @@ + set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") + file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") + +- get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) ++ get_filename_component(OPENJPEG_INCLUDE_DIRS "@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE) + + else() + if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) +--- a/src/lib/openjp2/libopenjp2.pc.cmake.in ++++ b/src/lib/openjp2/libopenjp2.pc.cmake.in +@@ -3,7 +3,7 @@ + mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ + docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ + libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ +-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ ++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ + + Name: openjp2 + Description: JPEG2000 library (Part 1 and 2) +--- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in ++++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in +@@ -3,7 +3,7 @@ + mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ + docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ + libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ +-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ ++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ + + Name: openjp3d + Description: JPEG2000 Extensions for three-dimensional data (Part 10) +--- a/src/lib/openjpip/libopenjpip.pc.cmake.in ++++ b/src/lib/openjpip/libopenjpip.pc.cmake.in +@@ -3,7 +3,7 @@ + mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ + docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ + libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ +-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ ++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ + + Name: openjpip + Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9) +--- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in ++++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in +@@ -3,7 +3,7 @@ + mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ + docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ + libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ +-includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ ++includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@ + + Name: openjpwl + Description: JPEG2000 Wireless library (Part 11) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 96cf0451ebf4e987c4b87ec60470a495c8572725..d3130a64b0308e3409ae048f589933eb285f11d8 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -11,7 +11,7 @@ , testsSupport ? false , jdk ? null # Inherit generics -, branch, version, revision, sha256, patches ? [], ... +, branch, version, revision, sha256, patches ? [], extraFlags ? [], ... }: assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { (mkFlag jp3dSupport "BUILD_JP3D") (mkFlag thirdPartySupport "BUILD_THIRDPARTY") (mkFlag testsSupport "BUILD_TESTING") - ]; + ] ++ extraFlags; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 16e00e9f2b9504bd35d14abfd66860d3928389a8..0a5f83d1c7c69811af6689ecc56ba94d9611bc4f 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -13,18 +13,27 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ openssl cyrus_sasl db groff libtool ]; - - configureFlags = - [ "--enable-overlays" - "--disable-dependency-tracking" # speeds up one-time build - "--enable-modules" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--enable-crypt" - ] ++ stdenv.lib.optional (openssl == null) "--without-tls" - ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" - ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + nativeBuildInputs = [ groff ]; + + buildInputs = [ openssl cyrus_sasl db libtool ]; + + # Disable install stripping as it breaks cross-compiling. + # We strip binaries anyway in fixupPhase. + makeFlags= [ "STRIP=" ]; + + configureFlags = [ + "--enable-overlays" + "--disable-dependency-tracking" # speeds up one-time build + "--enable-modules" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--enable-crypt" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--with-yielding_select=yes" + "ac_cv_func_memcmp_working=yes" + ] ++ stdenv.lib.optional (openssl == null) "--without-tls" + ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" + ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; doCheck = false; # needs a running LDAP server diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index a279fe79940f8ae31a48e35d7f73243c856cdb81..345dffa87f5be53615af038e14c4a4c63c973959 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 7d84392d204aed7d88bc4cb47a8bb47d789e8ecc..339f6064999707287bffb21148bff31ec50d71e5 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 0000000000000000000000000000000000000000..8d0839041890a589e6c70c303a6756632bf9f767 --- /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 cddc2038791ec1adbe5a7912ed3f29c664e321bb..9f5ef3ff68c85ac8357e51039f549ca5f76fda74 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/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 0000000000000000000000000000000000000000..5765409fdd5797f151ece0cff530e998bfa0662d --- /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 0000000000000000000000000000000000000000..9e871cfb1d316566279bffd55332d9abd5d9e740 --- /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/1.1/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..2c98ccfa7ed0df8926eb4548b6d7ab621171863e --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h +index 329ef62..9a8df64 100644 +--- a/include/internal/cryptlib.h ++++ b/include/internal/cryptlib.h +@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch new file mode 100644 index 0000000000000000000000000000000000000000..67d199681f96066dd00427fb8ec9c35e10f4a6d9 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch @@ -0,0 +1,13 @@ +diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h +index 329ef62..9a8df64 100644 +--- a/include/internal/cryptlib.h ++++ b/include/internal/cryptlib.h +@@ -56,7 +56,7 @@ DEFINE_LHASH_OF(MEM); + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" + # else diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index 86015abb9817f48ac8da192fddd35f4a026a6c0b..f07ebad9e81040ae64b73de0a6f88b10303417b5 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 63db3efc0846ede114e4ec292814a82599a3c8fc..0000000000000000000000000000000000000000 --- 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 87751188a03a9c6ed5f5bc83fe6766e993cae9f3..0954e1b70bb72ac16db23f73da7976838fd82573 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildPackages, perl, coreutils -, withCryptodev ? false, cryptodevHeaders +, 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 @@ -39,18 +33,20 @@ let '!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" @@ -91,6 +87,7 @@ let '' + '' mkdir -p $bin + substituteInPlace $out/bin/c_rehash --replace ${buildPackages.perl} ${perl} mv $out/bin $bin/ mkdir $dev @@ -123,13 +120,28 @@ 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 = common { - version = "1.1.1"; - sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8"; + version = "1.1.1a"; + sha256 = "0hcz7znzznbibpy3iyyhvlqrq44y88plxwdj32wjzgbwic7i687w"; + patches = [ + ./1.1/nix-ssl-cert-file.patch + + (if stdenv.hostPlatform.isDarwin + then ./1.1/use-etc-ssl-certs-darwin.patch + else ./1.1/use-etc-ssl-certs.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 893fb3eb6643aaf29ff125be8ab9a256593e1074..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..3b0354b9fe8e679953359476b88907ff17748667 --- /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/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index c11a93373dd116683b9653bc5142b11e3876ab62..8058891615f2d680582e1810e0ee1f1badc5677a 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openvdb-${version}"; - version = "5.2.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "1yykrbc3nnnmpmmk0dz4b4y5xl4hl3ayjpqw0baq8yx2614r46b5"; + sha256 = "07m012a966l821f09jmrrhs25cs2rcmhlxcicywibllaac10wk5k"; }; outputs = [ "out" ]; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 2122a7b23f1b8d75ede78fb0a489aa33c0bfa58b..a986b71bc1dd1b24a91eae4649b40a53b9037476 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "openwsman-${version}"; - version = "2.6.5"; + version = "2.6.9"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; rev = "v${version}"; - sha256 = "1r0zslgpcr4m20car4s3hsccy10xcb39qhpw3dhpjv42xsvvs5xv"; + sha256 = "19s5h551ppxmi2kljf8z58jjc6yrpczbxdrl4hh2l4jxv7iphk5i"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_RUBY_GEM=no" + "-DBUILD_PYTHON=no" + "-DBUILD_PYTHON3=yes" ]; preConfigure = '' diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 087a22dd61ba0114972c6959f1215cf4cce37646..5a5e8ffaef7ca653148a1b1765656b8c3eadb17d 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-13"; 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 = "0679daef6aa5a39e2441a68f7b45cfe022c4d961"; + 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 b485fa3e947bd306dc74160a2e1d4ec197dae49e..0000000000000000000000000000000000000000 --- 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 814158276ce46374b4f8ae3214c75e3d9214307e..6ee934c60c3aac0dc5788f1e770fe3873e67631a 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 b7033ea4ddf6923696ad97dc8615dbd8d2fdf992..981ec2f0a3a5969ba49d255654d57cef98845552 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 e0e0b59a9a9fe658f16e8bf30c037260de2c1db2..e70d20dd93da14d44ee13dabb1cbb5401cb9b439 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"]; @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://p11-glue.freedesktop.org/; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index 367cef46dc4455559439e4d8e01bf8506d21823b..842fae5ea93890c4fa596386c4d4d78e1a23fab5 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -11,36 +11,34 @@ stdenv.mkDerivation rec { name = "pagmo2-${version}"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; - sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z"; + sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400"; }; - buildInputs = [ cmake eigen nlopt ipopt boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen nlopt ipopt boost ]; - preBuild = '' - cp -r $src/* . - ''; + cmakeFlags = [ + "-DPAGMO_BUILD_TESTS=no" + "-DPAGMO_WITH_EIGEN3=yes" + "-DPAGMO_WITH_NLOPT=yes" + "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt.so" + "-DPAGMO_WITH_IPOPT=yes" + "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" + ]; - cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no" - "-DPAGMO_WITH_EIGEN3=yes" "-DPAGMO_WITH_NLOPT=yes" - "-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) + # tests pass but take 30+ minutes doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = https://esa.github.io/pagmo2/; description = "Scientific library for massively parallel optimization"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 28f8a221700d7aeb9233cb493ac8d7d95d3c0ae1..7b1d69ed42b0e07e6cd46b5463efa8024887ac7f 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; # /layout/valid-1.markup: FAIL - doCheck = false; # fails 1 out of 12 tests with "Fontconfig error: Cannot load default config file" + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; meta = with stdenv.lib; { description = "A library for laying out and rendering of text, with an emphasis on internationalization"; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 93c2501a6203370cc3ae11b468b1e6f2f2db9e10..064ebf71cc32a3b660d7429c1779512cd089f1cf 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,16 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, gnome3 , ApplicationServices }: -let - ver_maj = "2.40"; - ver_min = "1"; -in stdenv.mkDerivation rec { - name = "pangomm-${ver_maj}.${ver_min}"; + pname = "pangomm"; + version= "2.42.0"; src = fetchurl { - url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz"; - sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa"; }; outputs = [ "out" "dev" ]; @@ -22,6 +19,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; homepage = https://www.pango.org/; diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index aae6ed0f688a6361efa3a1d14b9f904903543e8f..b69ded64839734dee262cd66886d73fdfdc847e2 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 0000000000000000000000000000000000000000..3fd567ea098f303dfac3cff146c08295610b73a2 --- /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 e281e604380bfe0a1e823ac94a4a9b65f2389193..0000000000000000000000000000000000000000 --- 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/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index efaf2cfd429a836518eeeca9d3b68526805dc2a2..2050e5cdfe79bb2c70f1aad0f5a4750bc867370d 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,6 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, which, libtool, pkgconfig, - alsaLib, portaudio, - pulseaudioSupport ? true, libpulseaudio }: +{ config, stdenv, lib, fetchFromGitHub +, autoconf, automake, which, libtool, pkgconfig +, portaudio, alsaLib +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { name = "pcaudiolib-${version}"; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 9fb2e0b7fedb2f600409f1e8c04ea578a302b4e1..14eff45e4a1782faf8c39a551ca0acd4657fd7d3 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/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index bbc4dfae86cfc5ebb9c63c46f4797d81075c76aa..89649f0bf308c5999305fbe54e3e7db80a899c8b 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pcre2-${version}"; - version = "10.31"; + version = "10.32"; src = fetchurl { url = "https://ftp.pcre.org/pub/pcre/${name}.tar.bz2"; - sha256 = "1b389pzw91k1hzydsh4smdsxyppwz4pv74m3nrvy8rda0j3m6zg0"; + sha256 = "0bkwp2czcckvvbdls7b331cad11rxsm020aqhrbz84z8bp68k7pj"; }; configureFlags = [ diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index b29388790d029cacb012a065a78b0d4eb552aa89..67f343d6038065e095a7796d91f9f5f442090746 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 0487886a8966570ddc49fd8f0d9d2d681bc7a232..773478f4dc03e0dc1caf1ccda6d29c520f48a691 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 0000000000000000000000000000000000000000..3eb4ddaab693ee91fe0dd0871652872891ade23b --- /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 0000000000000000000000000000000000000000..983523e1f2fb123e6716153fe7b9de3e434fd062 --- /dev/null +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: + +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 root5 ]; + + 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 0000000000000000000000000000000000000000..c1c8f618fbb3a493e6e7dd2ee286f6ea797310d8 --- /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 0000000000000000000000000000000000000000..1ad5dcb8b25b57f21c0a64b3a3f8ed9b06e0ad25 --- /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 92d2ab962323954d223fa6463d0a682c73af42a0..f01fab74635b86cc8d8438140449b7965f405e52 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 = '' @@ -57,7 +59,7 @@ stdenv.mkDerivation rec { homepage = http://cernlib.web.cern.ch; description = "Legacy collection of libraries and modules for data analysis in high energy physics"; broken = stdenv.isDarwin; - platforms = stdenv.lib.platforms.unix; + 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 7a65da25890f0b85d21d43371f0c571569a3b4c9..3828cfda2aff486f631de4a9638ddf214df99aa1 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/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index 551d61af3ada029573ae5d7860627a6c50fa3766..f28f0fd642030a080c0061478d48bcbde1ee413f 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { 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})" + --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.pythonVersion})" for f in `find . -name CMakeLists.txt`; do substituteInPlace "$f" \ --replace "boost_python" "\''${Boost_LIBRARIES}" diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..972dfdd7ad1a6cd210e9ecc539ec3a5933e09dbf --- /dev/null +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake, coreutils, root }: + +stdenv.mkDerivation rec { + name = "hepmc3-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; + sha256 = "12kzdqdbq7md0nn58jvilhh00yddfir65f0q2026k0ym37bfwdyd"; + }; + + buildInputs = [ cmake root ]; + + postInstall = '' + substituteInPlace "$out"/bin/HepMC3-config \ + --replace 'greadlink' '${coreutils}/bin/readlink' + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation"; + license = licenses.gpl3; + homepage = http://hepmc.web.cern.ch/hepmc/; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index a8655c2dcbe3b58204b2c66953a5b9cfe82c01c2..722dccaea7be8eb5e84f80d9135641a49e85492c 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 0000000000000000000000000000000000000000..9c379f6a3474acfe2d97ac5a167677ea0ed8a470 --- /dev/null +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, gfortran, perl }: + +stdenv.mkDerivation rec { + name = "hoppet-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "https://hoppet.hepforge.org/downloads/${name}.tgz"; + sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; + }; + + buildInputs = [ gfortran ]; + nativeBuildInputs = [ perl ]; + + enableParallelBuilding = true; + + preConfigure = '' + patchShebangs . + ''; + + 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 7f89c92772c3964cadca471cb201f0cc58522efd..11a2640e97c8dc89a78335e97b3210a36c54b0af 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 0000000000000000000000000000000000000000..a608a7f6b0f71ab5c288451aa418c842b9a731ab --- /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/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 3f9f3f8498bd2602cb27d804349c5a56dd3a997c..e84aaf3732551e572e8625f46109a4f27ac7c3bc 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pythia-${version}"; - version = "8.235"; + version = "8.240"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "17cfgs7v469pdnnzvlmdagcdhi0h419znqmaws90l9d8cmhhsbz8"; + sha256 = "13cd86030j1f00n4xw30g26cgir3a5lsn9n0z13dh1vprbc9ax6j"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..620f227250dda4dd91464df75434b730fed19fa1 --- /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-13"; + + src = fetchurl { + url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz"; + sha256 = "0568rjviwvjkfihq2ka7g91vmialr31ryn7c69iqf13rcv5vzcw7"; + }; + + 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 639da1687a72f78fa606cdd200c9c6eebd254175..30f8ad8e8a326c7e842695fe0d370d1aa940b84d 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 feffa5c11d5454495aeeb051d304a8b009e54e96..63bc3c06e1028b2dd3f59f8973929fa7698dfe13 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 c86b0ed3d1c821ba937fe334fd7d1fbdbc552cfd..6e4ffb9745d0031a560d79f499ed0a2eab5fdf6a 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 96b5239b7dbe24e18452678e0e2f8e12eda8b06d..dc9fe52cf51f32f1e4c0e931400637fdb602f69c 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.2.3"; + version = "0.2.5"; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { owner = "PipeWire"; repo = "pipewire"; rev = version; - sha256 = "1y04brfi5bv4y0hdyqzrcbayr674njf6a5hiwjfv2yi6lazkqv1k"; + sha256 = "0hxm89ps6p75zm7rndrdr715p4ixx4f521fkjkyi7q2wh0b769s7"; }; outputs = [ "out" "lib" "dev" "doc" ]; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" - "-Dgstreamer=true" + "-Dgstreamer=enabled" ]; 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 af4e12a014b7c0660c2f84891925627217e34dba..61af6e7fdab811a16d196ec7e763e9a70caf2eda 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 ef4b3ea7e010af305530e55960bb612c01f09265..54a563c518fcc04444eb29f25acad8f55b5f8ec3 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 9a43470de3b72422a61d966c5c782176d3670181..ce3f5ab6b78938f01b2d95294f4f0f3577580f12 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 51cc72ffd4029ee4e7536450effb5dec34bad0e7..0000000000000000000000000000000000000000 --- 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.sourceforge.net; - 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 54e10b965926b4cab40a02ddb90e3d8310d994ff..b13335561ac0a04ffa550a7627b9f96893bcef65 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 6675bbf91836c9d491585a46e6907470978dae0b..83f19e442c6059a83bfa23d413c7a3e324ca4560 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 @@ -20,6 +20,14 @@ stdenv.mkDerivation rec { sha256 = "0c91y61y4gy6p91cwbzg32dhavw4b7fflg370rimqhdxpzdfr1rg"; }; + patches = [ + # CVE-2018-19788 - high UID fixup + (fetchpatch { + url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5230646dc6876ef6e27f57926b1bad348f636147.patch"; + name = "CVE-2018-19788.patch"; + sha256 = "1y3az4mlxx8k1zcss5qm7k102s7k1kqgcfnf11j9678fh7p008vp"; + }) + ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i -e "s/-Wl,--as-needed//" configure.ac @@ -28,10 +36,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 @@ -64,13 +72,6 @@ stdenv.mkDerivation rec { makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - # The following is required on grsecurity/PaX due to spidermonkey's JIT - postBuild = stdenv.lib.optionalString stdenv.isLinux '' - paxmark mr src/polkitbackend/.libs/polkitd - '' + stdenv.lib.optionalString (stdenv.isLinux && doCheck) '' - paxmark mr test/polkitbackend/.libs/polkitbackendjsauthoritytest - ''; - installFlags=["datadir=$(out)/share" "sysconfdir=$(out)/etc"]; inherit doCheck; diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index 4456cd7ff28581ecb7bf98b5a8d6edaab2cfca2f..633c3d69618bfdc6ea110f9f19c29f4751b60805 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 acfae1fc888359a35e357c55b8b5ed4eae267ad1..f1b6c002488efb684cd127a816f3b8f77b2074d2 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -2,13 +2,13 @@ , 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" }: let # beware: updates often break cups-filters build - version = "0.67.0"; + version = "0.73.0"; mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1yb6agmcxf0ixqm65d4aknl0hgmswf94x0k59ic0qqav1wd4yjm3"; + sha256 = "00yv7011y40jc5iw9b7zjyg8ij5wsfbjm32kli5qha1ij11majz4"; }; outputs = [ "out" "dev" ]; @@ -29,15 +29,17 @@ 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 ]; - # Not sure when and how to pass it. It seems an upstream bug anyway. - CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + # Workaround #54606 + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt + ''; cmakeFlags = [ - (mkFlag true "XPDF_HEADERS") + (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS" (mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "CPP") (mkFlag (!minimal) "LIBCURL") diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index edec0b7f0699f26dcdb98030ab53c512fab13855..592a1f1470a44b68cb2eac65c293c98fbf27dc74 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 deleted file mode 100644 index a577d318523dbdc881972de87580d479e99ec169..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/postgis/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ fetchurl -, stdenv -, perl -, libxml2 -, postgresql -, geos -, proj -, gdal -, json_c -, pkgconfig -, file -}: - - /* - - ### NixOS - usage: - ================== - - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ]; - - - ### important Postgis implementation details: - ============================================= - - Postgis provides a shared library implementing many operations. They are - exposed to the Postgres SQL interpreter by special SQL queries eg: - - CREATE FUNCTION [...] - AS '[..]liblwgeom', 'lwhistogram2d_in' LANGUAGE 'C' IMMUTABLE STRICT; -- WITH (isstrict); - - where liblwgeom is the shared library. - Postgis < 1.5 used absolute paths, in NixOS $libdir is always used. - - Thus if you want to use postgresql dumps which were created by non NixOS - systems you have to adopt the library path. - - - ### TODO: - ========= - the bin commands to have gtk gui: - */ - - -let - version = "2.4.4"; - sha256 = "1hm8migjb53cymp4qvg1h20yqllmy9f7x0awv5450391i6syyqq6"; -in stdenv.mkDerivation rec { - name = "postgis-${version}"; - - src = fetchurl { - url = "https://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; - inherit sha256; - }; - - # don't pass these vars to the builder - removeAttrs = ["sql_comments" "sql_srcs"]; - - preInstall = '' - mkdir -p $out/bin - ''; - - # create aliases for all commands adding version information - postInstall = '' - sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) - - for prog in $out/bin/*; do # */ - ln -s $prog $prog-${version} - done - - cp -r doc $out - ''; - - buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; - - sql_comments = "postgis_comments.sql"; - - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - - # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - - dontDisableStatic = true; - preConfigure = '' - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" - ''; - postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; - ''; - - meta = with stdenv.lib; { - description = "Geographic Objects for PostgreSQL"; - homepage = http://postgis.refractions.net; - license = licenses.gpl2; - maintainers = [ maintainers.marcweber ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index 29ff988a226671534975e37b8e1bba1610463c21..d40b4442e38eefb06f63e7a5e5e60a754a6f35f8 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 0ebf299a8bfb397a4ec22b9d4d99fd4fde74223a..55af1d8573a1da7a832e894ce1f5f6333de6ed09 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 0000000000000000000000000000000000000000..0009209d9ceffe069c51819a3ea21026ca898b47 --- /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 5f0006c058946b9fe2b04e4cbc9877e6e73c7f12..883dff56f2eea4a9598530ec981ce7365b48292c 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 803f5a9ba79c67570614a44f67a797d4a85df96c..4d53c42a3478139e3dab15a929b144df87ea58a2 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/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index ce0b2506c572a4f300cbc95d5ffb01bafe191b6f..e0c5d4db930578c6c8766548c376e2433016bb36 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..74e040e94ab0240cc63609da50ab9f287ce7c3a5 --- /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/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix similarity index 100% rename from pkgs/servers/sql/postgresql/psqlodbc/default.nix rename to pkgs/development/libraries/psqlodbc/default.nix diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index 90dc647233d889af6e7737eaa3cec62d0e0f84ef..7a0eba2d67a4fe7bc03cdafb66def25b11259ef8 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 ae60a6f69d63ffd9a602ef1ab6968c5645ad519d..d425de243f50cbb91103705f39dd830fd20b9f51 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 018a57ad0571b88446d5dc492dd66d4784c561af..b5a01698e5e95e820828e98323872d73bf475e18 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/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix index d7bca0de249897bed1a8a33d2b4589c1b8541c30..0a8972d4876d6bfdca6d3ac0f5c852b0173fee60 100644 --- a/pkgs/development/libraries/pybind11/default.nix +++ b/pkgs/development/libraries/pybind11/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, python }: +{ stdenv, fetchFromGitHub, cmake, catch, python, eigen }: stdenv.mkDerivation rec { name = "pybind-${version}"; - version = "2.2.2"; + version = "2.2.4"; + src = fetchFromGitHub { owner = "pybind"; repo = "pybind11"; rev = "v${version}"; - sha256 = "0x71i1n5d02hjbdcnkscrwxs9pb8kplmdpqddhsimabfp84fip48"; + sha256 = "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv"; }; nativeBuildInputs = [ cmake ]; + checkInputs = with python.pkgs; [ catch eigen pytest numpy scipy ]; + + # Disable test_cmake_build test, as it fails in sandbox + # https://github.com/pybind/pybind11/issues/1355 + patches = [ ./no_test_cmake_build.patch ]; - # disable tests as some tests (test_embed/test_interpreter) are failing at the moment - cmakeFlags = [ - "-DPYTHON_EXECUTABLE=${python.interpreter}" - "-DPYBIND11_TEST=0" + doCheck = true; + + cmakeFlags = [ + "-DPYTHON_EXECUTABLE=${python.interpreter}" + "-DPYBIND11_TEST=${if doCheck then "ON" else "OFF"}" ]; - doCheck = false; meta = { homepage = https://github.com/pybind/pybind11; @@ -31,5 +37,4 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; }; - } diff --git a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch b/pkgs/development/libraries/pybind11/no_test_cmake_build.patch new file mode 100644 index 0000000000000000000000000000000000000000..c5d6ecc4481eadcfe3151feefe5fe68734e2b6b6 --- /dev/null +++ b/pkgs/development/libraries/pybind11/no_test_cmake_build.patch @@ -0,0 +1,7 @@ +--- a/tests/CMakeLists.txt 2019-01-28 14:13:55.822119328 +0100 ++++ b/tests/CMakeLists.txt 2019-01-28 14:14:06.741161928 +0100 +@@ -233,4 +233,3 @@ + add_subdirectory(test_embed) + + # Test CMake build using functions and targets from subdirectory or installed location +-add_subdirectory(test_cmake_build) diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..0c2d4fa2b28b29ecf339f523fa8c1ca543c502ca --- /dev/null +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub +, python3, qmake, qtbase, qtquickcontrols, qtsvg, ncurses }: + +stdenv.mkDerivation rec { + pname = "pyotherside"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "thp"; + repo = "pyotherside"; + rev = version; + sha256 = "1xaw1aarj8gpgpm4z3lk8klbssadrsf3xdyzqx10zcwy16amka7k"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ + python3 qtbase qtquickcontrols qtsvg ncurses + ]; + + patches = [ ./qml-path.patch ]; + installTargets = [ "sub-src-install_subtargets" ]; + + meta = with stdenv.lib; { + description = "Asynchronous Python 3 Bindings for Qt 5"; + homepage = https://thp.io/2011/pyotherside/; + license = licenses.isc; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/libraries/pyotherside/qml-path.patch b/pkgs/development/libraries/pyotherside/qml-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..9f7208909970f3a1b0f25e381695f87021eda098 --- /dev/null +++ b/pkgs/development/libraries/pyotherside/qml-path.patch @@ -0,0 +1,12 @@ +diff -Naur --strip-trailing-cr source.org/src/src.pro source/src/src.pro +--- source.org/src/src.pro 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/src.pro 2019-01-17 19:14:46.256821852 +0000 +@@ -10,7 +10,7 @@ + CONFIG += qt plugin + QT += qml quick svg + +-target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH ++target.path = $$NIX_OUTPUT_QML/$$PLUGIN_IMPORT_PATH + INSTALLS += target + + qmldir.files += $$_PRO_FILE_PWD_/qmldir $$_PRO_FILE_PWD_/pyotherside.qmltypes diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..e1f2596f87c10196ccf5713dbe63fef4cbcff8c0 --- /dev/null +++ b/pkgs/development/libraries/python-qt/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, python, qmake, + qtwebengine, qtxmlpatterns, + qttools, unzip }: + +stdenv.mkDerivation rec { + version = "3.2"; + name = "python-qt-${version}"; + + src = fetchurl { + url="mirror://sourceforge/pythonqt/PythonQt${version}.zip"; + sha256="13hzprk58m3yj39sj0xn6acg8796lll1256mpd81kw0z3yykyl8c"; + }; + + hardeningDisable = [ "all" ]; + + nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools ]; + + buildInputs = [ python unzip ]; + + qmakeFlags = [ "PythonQt.pro" + "INCLUDEPATH+=${python}/include/python3.6" + "PYTHON_PATH=${python}/bin" + "PYTHON_LIB=${python}/lib"]; + + unpackCmd = "unzip $src"; + + installPhase = '' + mkdir -p $out/include/PythonQt + cp -r ./lib $out + cp -r ./src/* $out/include/PythonQt + cp extensions/PythonQt_QtAll/PythonQt_QtAll.h $out/include/PythonQt + cp extensions/PythonQt_QtAll/PythonQt_QtAll.cpp $out/include/PythonQt + ''; + + meta = with stdenv.lib; { + description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications."; + homepage = http://pythonqt.sourceforge.net/; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ hlolli ]; + }; +} diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..1fb3a415dc6c4be95f01b6e8ecb60525488039f9 --- /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 29202396c058c9520c34833c03f7d894a75116ee..a7077c69dd8db721790cd705c0f8f4fd847b5b8d 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/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index 630f606c2e542eeddfeefa995ba55717f9ab294d..083e0a51b813e7bb32b08adad8bfb7036823022c 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,11 +1,11 @@ {stdenv, qtdeclarative, fetchFromGitHub, qmake }: stdenv.mkDerivation rec { - name = "qml-box2d-2018-03-16"; + name = "qml-box2d-2018-04-06"; src = fetchFromGitHub { owner = "qml-box2d"; repo = "qml-box2d"; - sha256 = "1fbsvv28b4r0szcv8bk5gxpf8v534jp2axyfp438384sy757wsq2"; - rev = "21e57f1"; + sha256 = "0gb8limy6ck23z3k0k2j7c4c4s95p40f6lbzk4szq7fjnnw22kb7"; + rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 79ed37dd2a9a0aeb5ccc59850be587b4f9d14a06..ba62324d586ed6e1c30aa38953313efc07f71171 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 d09c0d9a6ce084758477ac99502478f9aee529a0..0d9ae21e87e329157c459e95be1535529ed00e6d 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 79deb482161f6246b35160c34492b78ffc452eeb..30383dda50cf90d8f35e21fcad81a54f6f52f8a7 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -1,27 +1,19 @@ { stdenv, fetchurl, fetchpatch, libjpeg, zlib, perl }: -let version = "8.2.1"; +let version = "8.4.0"; in stdenv.mkDerivation rec { name = "qpdf-${version}"; src = fetchurl { url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz"; - sha256 = "1jdb0jj72fjdp6xip4m7yz31r5x13zs7h4smnxsycgw3vbmx6igl"; + sha256 = "1864p952m8vzxk6v500a42psbqj2g2gyli3d3zj6h33hzwxqy09r"; }; nativeBuildInputs = [ perl ]; 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/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..9e8d9ce239bf01583027c1865f09073d14ff9e2b --- /dev/null +++ b/pkgs/development/libraries/qrencode/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, SDL2, libpng, libiconv }: + +stdenv.mkDerivation rec { + pname = "qrencode"; + version = "4.0.2"; + + outputs = [ "bin" "out" "man" "dev" ]; + + src = fetchurl { + url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; + sha256 = "079v3a15ydpr67zdi3xbgvic8n2kxvi0m32dyz8jaik10yffgayv"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + + configureFlags = [ + "--with-tests" + ]; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + pushd tests + ./test_basic.sh + popd + + runHook postCheck + ''; + + meta = with stdenv.lib; { + homepage = https://fukuchi.org/works/qrencode/; + description = "C library for encoding data in a QR Code symbol"; + + longDescription = '' + Libqrencode is a C library for encoding data in a QR Code symbol, + a kind of 2D symbology that can be scanned by handy terminals + such as a mobile phone with CCD. + ''; + + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ adolfogc yegortimoshenko ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index c8b01c460803ff7f3640a519eab9f42f99a4275c..85e45d3fad030a34e5f685cd038c526e388939b0 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 0691f26b47126d6ac487f6036777f58fdf74f501..3f3e9158622a36db89d9e68d2338cab0faff62e8 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl , xftSupport ? true, libXft ? null , xrenderSupport ? true, libXrender ? null -, xrandrSupport ? true, libXrandr ? null, randrproto ? null +, xrandrSupport ? true, libXrandr ? null , xineramaSupport ? true, libXinerama ? null , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, mysql ? null , openglSupport ? false, libGLU_combined ? null, libXmu ? null -, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which +, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; assert xrenderSupport -> xftSupport && libXrender != null; -assert xrandrSupport -> libXrandr != null && randrproto != null; +assert xrandrSupport -> libXrandr != null; assert cursorSupport -> libXcursor != null; assert mysqlSupport -> mysql != null; assert openglSupport -> libGLU_combined != null && libXmu != null; @@ -40,7 +40,7 @@ stdenv.mkDerivation { "-v" "-system-zlib" "-system-libpng" "-system-libjpeg" "-qt-gif" - "-I${xextproto}/include" + "-I${xorgproto}/include" (mk threadSupport "thread") (mk xrenderSupport "xrender") (mk xrandrSupport "xrandr") @@ -55,7 +55,6 @@ stdenv.mkDerivation { "-L${libXrender.out}/lib" "-I${libXrender.dev}/include" ] ++ stdenv.lib.optionals xrandrSupport [ "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include" - "-I${randrproto}/include" ] ++ stdenv.lib.optionals xineramaSupport [ "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include" ] ++ stdenv.lib.optionals cursorSupport [ @@ -84,7 +83,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 f7ddf8ff780ccab3788a3ade14d980c7bd416543..8715aaaa44d0d639d74ea7eebf9ac77189c3810d 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 0000000000000000000000000000000000000000..c1338e98d85155d2ce245c8304ee109fdcea5d1d --- /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 d65fe9d219c0faecf198c14ab91e6afa0ce03fa0..59dab2beabd0a2d2acb7154febae789dd303657a 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,7 +34,7 @@ let qtCompatVersion = "5.11"; - mirror = "http://download.qt.io"; + mirror = "https://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { # Community port of the now unmaintained upstream qtwebkit. qtwebkit = { @@ -52,14 +53,18 @@ let ./qtbase.patch ./qtbase-darwin.patch ./qtbase-revert-no-macos10.10.patch + ./qtbase-fixguicmake.patch ] ++ optionals stdenv.isDarwin [ ./qtbase-darwin-nseventtype.patch + ./qtbase-darwin-revert-69221.patch ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + qtwebengine = + optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch + ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch; qtwebkit = [ ./qtwebkit.patch ]; }; @@ -95,7 +100,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; }; @@ -113,6 +120,7 @@ let qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix {}; + qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; qtx11extras = callPackage ../modules/qtx11extras.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh index ce82e243af77d05b1f962544bef13e6f0bb69334..dc1088fc371cd7c1914106fe39a568a6fe6f02ee 100644 --- a/pkgs/development/libraries/qt-5/5.11/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.11/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch new file mode 100644 index 0000000000000000000000000000000000000000..73eea435f847f0374bf51165f834bdf54275cc6d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch @@ -0,0 +1,73 @@ +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index 00c3f7c22c..94d35f59d6 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -1355,15 +1355,6 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + { + QMacAutoReleasePool pool; + +- Qt::WindowType type = window()->type(); +- Qt::WindowFlags flags = window()->flags(); +- +- // Note: The macOS window manager has a bug, where if a screen is rotated, it will not allow +- // a window to be created within the area of the screen that has a Y coordinate (I quadrant) +- // higher than the height of the screen in its non-rotated state, unless the window is +- // created with the NSWindowStyleMaskBorderless style mask. +- NSWindowStyleMask styleMask = windowStyleMask(flags); +- + QRect rect = geometry(); + + QScreen *targetScreen = nullptr; +@@ -1375,22 +1366,26 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + } + + if (!targetScreen) { +- qCWarning(lcQpaCocoaWindow) << "Window position" << rect << "outside any known screen, using primary screen"; ++ qCWarning(lcQpaCocoaWindow) << "Window position outside any known screen, using primary screen"; + targetScreen = QGuiApplication::primaryScreen(); +- // AppKit will only reposition a window that's outside the target screen area if +- // the window has a title bar. If left out, the window ends up with no screen. +- // The style mask will be corrected to the original style mask in setWindowFlags. +- styleMask |= NSWindowStyleMaskTitled; + } + + rect.translate(-targetScreen->geometry().topLeft()); + QCocoaScreen *cocoaScreen = static_cast(targetScreen->handle()); + NSRect frame = QCocoaScreen::mapToNative(rect, cocoaScreen); + ++ // Note: The macOS window manager has a bug, where if a screen is rotated, it will not allow ++ // a window to be created within the area of the screen that has a Y coordinate (I quadrant) ++ // higher than the height of the screen in its non-rotated state, unless the window is ++ // created with the NSWindowStyleMaskBorderless style mask. ++ ++ Qt::WindowType type = window()->type(); ++ Qt::WindowFlags flags = window()->flags(); ++ + // Create NSWindow + Class windowClass = shouldBePanel ? [QNSPanel class] : [QNSWindow class]; + QCocoaNSWindow *nsWindow = [[windowClass alloc] initWithContentRect:frame +- styleMask:styleMask ++ styleMask:windowStyleMask(flags) + // Deferring window creation breaks OpenGL (the GL context is + // set up before the window is shown and needs a proper window) + backing:NSBackingStoreBuffered defer:NO +@@ -1399,9 +1394,6 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + Q_ASSERT_X(nsWindow.screen == cocoaScreen->nativeScreen(), "QCocoaWindow", + "Resulting NSScreen should match the requested NSScreen"); + +- if (targetScreen != window()->screen()) +- QWindowSystemInterface::handleWindowScreenChanged(window(), targetScreen); +- + nsWindow.delegate = [[QNSWindowDelegate alloc] initWithQCocoaWindow:this]; + + // Prevent Cocoa from releasing the window on close. Qt +@@ -1421,6 +1413,9 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) + }); + } + ++ if (targetScreen != window()->screen()) ++ QWindowSystemInterface::handleWindowScreenChanged(window(), targetScreen); ++ + nsWindow.restorable = NO; + nsWindow.level = windowLevel(flags); + 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 0000000000000000000000000000000000000000..8b46d432812a8b457deda428f33f44195ca8aae1 --- /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.11/qtbase.patch b/pkgs/development/libraries/qt-5/5.11/qtbase.patch index fa0b2c51c46e5729c0387e5e09b26df4a9467a1c..7d8407f6daf86dcbe636f7d2b4abef3661d22596 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtbase.patch @@ -1,8 +1,7 @@ -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 5208379f9a..92fe29a0ac 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf 2019-01-31 00:42:55.843577249 +0100 +@@ -23,7 +23,7 @@ QMAKE_FIX_RPATH = install_name_tool -id @@ -11,11 +10,10 @@ index 5208379f9a..92fe29a0ac 100644 QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ed708e085..05e60ff45f 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf 2019-01-31 00:42:55.843577249 +0100 +@@ -21,7 +21,7 @@ # at cmake time whether package has been found via a symlink, and correct # that to an absolute path. This is only done for installations to # the /usr or / prefix. @@ -24,7 +22,7 @@ index 2ed708e085..05e60ff45f 100644 contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -51,45 +51,20 @@ split_incpath { +@@ -51,45 +51,20 @@ $$cmake_extra_source_includes.output } @@ -81,7 +79,7 @@ index 2ed708e085..05e60ff45f 100644 static|staticlib:CMAKE_STATIC_TYPE = true -@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { +@@ -169,7 +144,7 @@ cmake_target_file cmake_qt5_plugin_file.files = $$cmake_target_file.output @@ -90,7 +88,7 @@ index 2ed708e085..05e60ff45f 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { +@@ -316,7 +291,7 @@ cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -99,11 +97,10 @@ index 2ed708e085..05e60ff45f 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 27f4c277d6..18b4813e25 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-01-31 00:42:55.843577249 +0100 +@@ -3,30 +3,6 @@ message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") endif() @@ -134,7 +131,7 @@ index 27f4c277d6..18b4813e25 100644 !!IF !equals(TEMPLATE, aux) # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -52,11 +28,7 @@ endmacro() +@@ -52,11 +28,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -146,7 +143,7 @@ index 27f4c277d6..18b4813e25 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" -@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -69,11 +41,7 @@ ) !!IF !isEmpty(CMAKE_WINDOWS_BUILD) @@ -158,7 +155,7 @@ index 27f4c277d6..18b4813e25 100644 _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -89,24 +57,13 @@ !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS @@ -187,7 +184,7 @@ index 27f4c277d6..18b4813e25 100644 ) !!ELSE set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -122,7 +79,6 @@ set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") !!ENDIF !!ENDIF @@ -195,7 +192,7 @@ index 27f4c277d6..18b4813e25 100644 !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF -@@ -269,25 +225,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -269,25 +225,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_DEBUG_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -221,7 +218,7 @@ index 27f4c277d6..18b4813e25 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -306,25 +250,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -306,25 +250,13 @@ !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_RELEASE_TYPE) !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -247,7 +244,7 @@ index 27f4c277d6..18b4813e25 100644 _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD endif() -@@ -343,11 +275,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -343,11 +275,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -259,11 +256,10 @@ index 27f4c277d6..18b4813e25 100644 _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/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 21d487f1f9..a0e5c68b7e 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -24,196 +24,3 @@ qt { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf 2019-01-31 00:45:14.585621324 +0100 +@@ -62,199 +62,3 @@ } } } @@ -458,12 +454,15 @@ index 21d487f1f9..a0e5c68b7e 100644 -xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX -isEmpty(xcode_product_bundle_identifier_setting.value): \ - xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +-xcode_product_bundle_target = $$QMAKE_BUNDLE +-isEmpty(xcode_product_bundle_target): \ +- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf +Only in qtbase-everywhere-src-5.11.3/mkspecs/features/mac: default_post.prf.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf 2019-01-31 00:42:55.843577249 +0100 @@ -1,60 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) @@ -525,10 +524,9 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 8360dd8b38..8b13789179 100644 ---- a/mkspecs/features/mac/sdk.prf -+++ b/mkspecs/features/mac/sdk.prf +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf 2019-01-31 00:42:55.843577249 +0100 @@ -1,58 +1 @@ -isEmpty(QMAKE_MAC_SDK): \ @@ -588,11 +586,10 @@ index 8360dd8b38..8b13789179 100644 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} -diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf -index 4db0040dc5..65d6da1f4d 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -23,13 +23,8 @@ for(qmlf, AUX_QML_FILES): fq_aux_qml_files += $$absolute_path($$qmlf, $$_PRO_FIL +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf 2019-01-31 00:42:55.843577249 +0100 +@@ -23,13 +23,8 @@ load(qt_build_paths) @@ -608,11 +605,10 @@ index 4db0040dc5..65d6da1f4d 100644 !qml1_target:static: CONFIG += builtin_resources -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index d49f4c49c1..097dcd7d39 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -48,13 +48,8 @@ exists($$QMLTYPEFILE): AUX_QML_FILES += $$QMLTYPEFILE +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -48,13 +48,8 @@ load(qt_build_paths) @@ -628,11 +624,10 @@ index d49f4c49c1..097dcd7d39 100644 target.path = $$instbase/$$TARGETPATH INSTALLS += target -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 883f8ca215..81db8eb2d4 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -33,7 +33,7 @@ host_build:force_bootstrap { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -33,7 +33,7 @@ target.path = $$[QT_HOST_BINS] } else { !build_pass:qtConfig(debug_and_release): CONFIG += release @@ -641,11 +636,10 @@ index 883f8ca215..81db8eb2d4 100644 CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable } INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 1848f00e90..2af93675c5 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -23,6 +23,6 @@ exists($$MODULE_BASE_INDIR/.git): \ +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -24,6 +24,6 @@ !force_independent { # If the module is not built independently, everything ends up in qtbase. # This is the case in non-prefix builds, except for selected modules. @@ -654,11 +648,11 @@ index 1848f00e90..2af93675c5 100644 + MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT } -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index 415044bb64..7163ef56cd 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { +Only in qtbase-everywhere-src-5.11.3/mkspecs/features: qt_build_paths.prf.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -32,8 +32,8 @@ qqt_libdir = \$\$\$\$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS] } else { @@ -669,11 +663,10 @@ index 415044bb64..7163ef56cd 100644 } contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { lib_replace.match = "[^ ']*$$rplbase/lib" -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 3139c443c6..1b4f2fddd8 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -45,7 +45,7 @@ QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) !build_online_docs: \ @@ -682,7 +675,7 @@ index 3139c443c6..1b4f2fddd8 100644 PREP_DOC_INDEXES = DOC_INDEXES = !isEmpty(QTREPOS) { -@@ -64,8 +64,8 @@ DOC_INDEXES = +@@ -64,8 +64,8 @@ DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) } else { prepare_docs: \ @@ -693,7 +686,7 @@ index 3139c443c6..1b4f2fddd8 100644 } qtattributionsscanner.target = qtattributionsscanner -@@ -88,12 +88,12 @@ prepare_docs { +@@ -88,12 +88,12 @@ qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR @@ -708,11 +701,10 @@ index 3139c443c6..1b4f2fddd8 100644 inst_qch_docs.CONFIG += no_check_exist no_default_install no_build INSTALLS += inst_qch_docs -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 43b58817fe..e635b8f67a 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -88,7 +88,7 @@ sourcefiles += \ +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -88,7 +88,7 @@ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$DBUS_ADAPTORS $$DBUS_INTERFACES addInstallFiles(sources.files, $$sourcefiles) @@ -721,11 +713,10 @@ index 43b58817fe..e635b8f67a 100644 INSTALLS += sources check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..ae7b585989 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -69,7 +69,7 @@ defineTest(qtPrepareTool) { cmd = $$eval(QT_TOOL.$${2}.binary) isEmpty(cmd) { @@ -734,10 +725,9 @@ index 1903e509c8..ae7b585989 100644 exists($${cmd}.pl) { $${1}_EXE = $${cmd}.pl cmd = perl -w $$system_path($${cmd}.pl) -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 8f98987b99..21b3bb8b32 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf 2019-01-31 00:42:55.844577264 +0100 @@ -12,16 +12,10 @@ #library !qt_no_install_library { @@ -797,11 +787,10 @@ index 8f98987b99..21b3bb8b32 100644 privpritarget.files = $$MODULE_PRIVATE_PRI INSTALLS += privpritarget } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index bf90adcf1e..b3de698ff7 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { +diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf +--- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf 2019-01-31 00:42:55.844577264 +0100 +@@ -88,7 +88,7 @@ } } @@ -810,11 +799,30 @@ index bf90adcf1e..b3de698ff7 100644 INSTALLS += target TARGET = $$qt5LibraryTarget($$TARGET) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index e0652fdcf9..450b2a2d28 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -2612,6 +2612,15 @@ + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); +Only in qtbase-everywhere-src-5.11.3/src/corelib/kernel: qcoreapplication.cpp.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-01-31 00:42:55.844577264 +0100 +@@ -3,7 +3,7 @@ add_executable(Qt5::qmake IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -823,7 +831,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) +@@ -18,7 +18,7 @@ add_executable(Qt5::moc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -832,7 +840,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) +@@ -35,7 +35,7 @@ add_executable(Qt5::rcc IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) @@ -841,7 +849,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") !!ENDIF -@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) +@@ -116,7 +116,7 @@ !!IF !isEmpty(CMAKE_RELEASE_TYPE) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -850,7 +858,7 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") !!ENDIF -@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) +@@ -130,7 +130,7 @@ set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -859,10 +867,9 @@ index e0652fdcf9..450b2a2d28 100644 !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-01-31 00:42:55.844577264 +0100 @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) @@ -871,10 +878,9 @@ index c357237d0e..6f0c75de3c 100644 !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-01-31 00:42:55.844577264 +0100 @@ -1,6 +1,6 @@ !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) @@ -883,31 +889,10 @@ index 706304cf34..546420f6ad 100644 !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index 4e32f90964..503aeffd0c 100644 ---- a/src/corelib/kernel/qcoreapplication.cpp -+++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2613,6 +2613,15 @@ QStringList QCoreApplication::libraryPaths() - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); -+ } -+ } -+ - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); - if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); -diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp -index 6a5df6272a..a6136ca4cd 100644 ---- a/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; +diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -70,7 +70,11 @@ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() { @@ -920,7 +905,7 @@ index 6a5df6272a..a6136ca4cd 100644 if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) +@@ -644,12 +648,16 @@ if (!tzif.open(QIODevice::ReadOnly)) return; } else { @@ -942,10 +927,9 @@ index 6a5df6272a..a6136ca4cd 100644 } } -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +diff -ur qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100 @@ -2,11 +2,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) @@ -959,7 +943,7 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() +@@ -17,11 +13,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) add_executable(Qt5::qdbusxml2cpp IMPORTED) @@ -972,10 +956,9 @@ index 1d947159e2..b36865fc48 100644 _qt5_DBus_check_file_exists(${imported_location}) set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..fb4183bada 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in +diff -ur qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100 @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -985,7 +968,7 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO +@@ -17,13 +17,13 @@ set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) @@ -1001,11 +984,10 @@ index 07869efd7d..fb4183bada 100644 !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -index b5a0a5bbeb..6c20305f4d 100644 ---- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -265,12 +265,9 @@ m_possibleLocations.reserve(7); if (qEnvironmentVariableIsSet("QTCOMPOSE")) m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); @@ -1019,11 +1001,10 @@ index b5a0a5bbeb..6c20305f4d 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -index cc982b3379..0c5005d3d7 100644 ---- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -648,9 +648,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2019-01-31 00:42:55.845577279 +0100 +@@ -650,9 +650,14 @@ #if QT_CONFIG(library) extern const QString qt_gl_library_name(); // QLibrary lib(qt_gl_library_name()); @@ -1040,11 +1021,11 @@ index cc982b3379..0c5005d3d7 100644 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); #endif } -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index b401100dd4..b45a290065 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) +Only in qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx: qglxintegration.cpp.orig +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-01-31 00:42:55.846577295 +0100 +@@ -316,10 +316,10 @@ #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) static bool function_ptrs_not_initialized = true; if (function_ptrs_not_initialized) { @@ -1057,10 +1038,9 @@ index b401100dd4..b45a290065 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp +diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp +--- qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp 2019-01-31 00:42:55.846577295 +0100 @@ -39,6 +39,7 @@ #include @@ -1069,7 +1049,7 @@ index fb1c425d8e..bb8bab9795 100644 QT_BEGIN_NAMESPACE -@@ -54,8 +55,22 @@ public: +@@ -54,8 +55,22 @@ QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); @@ -1093,10 +1073,9 @@ index fb1c425d8e..bb8bab9795 100644 return 0; } -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h +diff -ur qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h +--- qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h 2019-01-31 00:42:55.846577295 +0100 @@ -44,10 +44,13 @@ QT_BEGIN_NAMESPACE @@ -1113,11 +1092,10 @@ index 6498ea84ef..d821ced7fc 100644 QT_END_NAMESPACE -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) +diff -ur qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in +--- qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100 ++++ qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-01-31 00:42:55.846577295 +0100 +@@ -3,7 +3,7 @@ add_executable(Qt5::uic IMPORTED) !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) diff --git a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch index 8f5b5d4790fb15778a446d0b08d86361803bf8ac..cfa68eb8102ce248b46f0d8b34af246e68758a78 100644 --- a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch +++ b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch @@ -18,6 +18,19 @@ index 005db4248..685c5b1b2 100644 // env import paths if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); +diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +index 56cb3fb55..74509d601 100644 +--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake ++++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +@@ -17,7 +17,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles) + + find_package(Qt5 COMPONENTS Qml Core) + +- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen") ++ set(compiler_path "qmlcachegen") + + get_target_property(rcc_path ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION) + diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index 537eaf62e..e21de58f6 100644 --- a/tools/qmlcachegen/qmlcache.prf diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..8dafd65cd34330af704e0f3520cb30f60b726407 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch @@ -0,0 +1,30 @@ +Fix a following build error: + +In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: +../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|." + static_assert( + ^ +../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here + : AssertConstructible, Unwrapped, Params>... { + ^ +../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity, base::internal::TypeList, long>, base::internal::TypeList, base::internal::TypeList >' requested here + static_assert(internal::AssertBindArgsValidity< + ^ +../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating, long>' requested here + return base::BindRepeating(std::forward(functor), + ^ +../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind, long>' requested here + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, + ^ + +--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm ++++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm +@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, +- weak_ptr_factory_.GetWeakPtr(), nil)); ++ weak_ptr_factory_.GetWeakPtr(), nullptr)); + } + } + diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch new file mode 100644 index 0000000000000000000000000000000000000000..d43b09b953833f793baaf88fe61b7097cfa28959 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch @@ -0,0 +1,160 @@ +Fix build against 10.10 SDK + +The SecKey part perhaps could be fixed by implementing a revert to +https://chromium.googlesource.com/chromium/src.git/+/8418e098b9cbedf884878b61dcd3292c515845cf%5E%21/#F0 + +--- a/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm ++++ b/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm +@@ -1,3 +1,4 @@ ++#define NSEventTypeScrollWheel 22 + // Copyright 2015 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. +--- a/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc ++++ b/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc +@@ -48,21 +48,6 @@ namespace net { + + namespace { + +-// TODO(davidben): Remove this when we switch to building to the 10.13 +-// SDK. https://crbug.com/780980 +-#if !defined(MAC_OS_X_VERSION_10_13) || \ +- MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13 +-API_AVAILABLE(macosx(10.13)) +-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA256 = +- CFSTR("algid:sign:RSA:digest-PSS:SHA256:SHA256:32"); +-API_AVAILABLE(macosx(10.13)) +-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA384 = +- CFSTR("algid:sign:RSA:digest-PSS:SHA384:SHA384:48"); +-API_AVAILABLE(macosx(10.13)) +-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA512 = +- CFSTR("algid:sign:RSA:digest-PSS:SHA512:SHA512:64"); +-#endif +- + class ScopedCSSM_CC_HANDLE { + public: + ScopedCSSM_CC_HANDLE() : handle_(0) {} +@@ -187,109 +172,6 @@ class SSLPlatformKeyCSSM : public ThreadedSSLPrivateKey::Delegate { + DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyCSSM); + }; + +-// Returns the corresponding SecKeyAlgorithm or nullptr if unrecognized. +-API_AVAILABLE(macosx(10.12)) +-SecKeyAlgorithm GetSecKeyAlgorithm(uint16_t algorithm) { +- switch (algorithm) { +- case SSL_SIGN_RSA_PKCS1_SHA512: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA512; +- case SSL_SIGN_RSA_PKCS1_SHA384: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA384; +- case SSL_SIGN_RSA_PKCS1_SHA256: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA256; +- case SSL_SIGN_RSA_PKCS1_SHA1: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA1; +- case SSL_SIGN_RSA_PKCS1_MD5_SHA1: +- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15Raw; +- case SSL_SIGN_ECDSA_SECP521R1_SHA512: +- return kSecKeyAlgorithmECDSASignatureDigestX962SHA512; +- case SSL_SIGN_ECDSA_SECP384R1_SHA384: +- return kSecKeyAlgorithmECDSASignatureDigestX962SHA384; +- case SSL_SIGN_ECDSA_SECP256R1_SHA256: +- return kSecKeyAlgorithmECDSASignatureDigestX962SHA256; +- case SSL_SIGN_ECDSA_SHA1: +- return kSecKeyAlgorithmECDSASignatureDigestX962SHA1; +- } +- +- if (base::mac::IsAtLeastOS10_13()) { +- switch (algorithm) { +- case SSL_SIGN_RSA_PSS_SHA512: +- return kSecKeyAlgorithmRSASignatureDigestPSSSHA512; +- case SSL_SIGN_RSA_PSS_SHA384: +- return kSecKeyAlgorithmRSASignatureDigestPSSSHA384; +- case SSL_SIGN_RSA_PSS_SHA256: +- return kSecKeyAlgorithmRSASignatureDigestPSSSHA256; +- } +- } +- +- return nullptr; +-} +- +-class API_AVAILABLE(macosx(10.12)) SSLPlatformKeySecKey +- : public ThreadedSSLPrivateKey::Delegate { +- public: +- SSLPlatformKeySecKey(int type, size_t max_length, SecKeyRef key) +- : key_(key, base::scoped_policy::RETAIN) { +- // Determine the algorithms supported by the key. +- for (uint16_t algorithm : SSLPrivateKey::DefaultAlgorithmPreferences( +- type, true /* include PSS */)) { +- SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm); +- if (sec_algorithm && +- SecKeyIsAlgorithmSupported(key_.get(), kSecKeyOperationTypeSign, +- sec_algorithm)) { +- preferences_.push_back(algorithm); +- } +- } +- } +- +- ~SSLPlatformKeySecKey() override {} +- +- std::vector GetAlgorithmPreferences() override { +- return preferences_; +- } +- +- Error Sign(uint16_t algorithm, +- base::span input, +- std::vector* signature) override { +- SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm); +- if (!sec_algorithm) { +- NOTREACHED(); +- return ERR_FAILED; +- } +- +- const EVP_MD* md = SSL_get_signature_algorithm_digest(algorithm); +- uint8_t digest[EVP_MAX_MD_SIZE]; +- unsigned digest_len; +- if (!md || !EVP_Digest(input.data(), input.size(), digest, &digest_len, md, +- nullptr)) { +- return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED; +- } +- +- base::ScopedCFTypeRef digest_ref(CFDataCreateWithBytesNoCopy( +- kCFAllocatorDefault, digest, base::checked_cast(digest_len), +- kCFAllocatorNull)); +- +- base::ScopedCFTypeRef error; +- base::ScopedCFTypeRef signature_ref(SecKeyCreateSignature( +- key_, sec_algorithm, digest_ref, error.InitializeInto())); +- if (!signature_ref) { +- LOG(ERROR) << error; +- return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED; +- } +- +- signature->assign( +- CFDataGetBytePtr(signature_ref), +- CFDataGetBytePtr(signature_ref) + CFDataGetLength(signature_ref)); +- return OK; +- } +- +- private: +- std::vector preferences_; +- base::ScopedCFTypeRef key_; +- +- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeySecKey); +-}; +- + scoped_refptr CreateSSLPrivateKeyForSecKey( + const X509Certificate* certificate, + SecKeyRef private_key) { +@@ -298,13 +180,6 @@ scoped_refptr CreateSSLPrivateKeyForSecKey( + if (!GetClientCertInfo(certificate, &key_type, &max_length)) + return nullptr; + +- if (base::mac::IsAtLeastOS10_12()) { +- return base::MakeRefCounted( +- std::make_unique(key_type, max_length, +- private_key), +- GetSSLPlatformKeyTaskRunner()); +- } +- + const CSSM_KEY* cssm_key; + OSStatus status = SecKeyGetCSSMKey(private_key, &cssm_key); + if (status != noErr) { diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch deleted file mode 100644 index e1621b005c618d93673f5ba88d626c8d4cf28229..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/qt-5/5.11/qtwebengine-paxmark-mksnapshot.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/3rdparty/chromium/v8/src/v8.gyp b/chromium/v8/src/v8.gyp -index e7e19f5059..934448c7d8 100644 ---- a/src/3rdparty/chromium/v8/src/v8.gyp -+++ b/src/3rdparty/chromium/v8/src/v8.gyp -@@ -35,6 +35,7 @@ - 'v8_extra_library_files%': [], - 'v8_experimental_extra_library_files%': [], - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'v8_os_page_size%': 0, - }, - 'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi', 'inspector/inspector.gypi'], -@@ -2576,7 +2577,7 @@ - ] - }, - { -- 'target_name': 'mksnapshot', -+ 'target_name': 'mksnapshot_u', - 'type': 'executable', - 'dependencies': [ - 'v8_base', -@@ -2606,5 +2607,26 @@ - }], - ], - }, -+ { -+ 'target_name': 'mksnapshot', -+ 'type': 'executable', -+ 'dependencies': ['mksnapshot_u'], -+ 'actions': [ -+ { -+ 'action_name': 'paxmark_m_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'action': [ -+ 'sh', -+ '-c', -+ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)', -+ ], -+ }, -+ ], -+ }, - ], - } diff --git a/pkgs/development/libraries/qt-5/5.11/srcs.nix b/pkgs/development/libraries/qt-5/5.11/srcs.nix index b6668a91606c45372acca2f166b1f2fc7cb152a1..cff49b1803374a88e10ae1305f71ed39514110fa 100644 --- a/pkgs/development/libraries/qt-5/5.11/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.11/srcs.nix @@ -3,323 +3,323 @@ { qt3d = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qt3d-everywhere-src-5.11.1.tar.xz"; - sha256 = "03fkbrghj40rp8pf5r5979pcvq7qjsj7db446r6fl6slwphmk1nb"; - name = "qt3d-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz"; + sha256 = "1awyv40jgbb30yp5zxf6j9wq96nmk8zyhbh4fpn9gn35ychmr984"; + name = "qt3d-everywhere-src-5.11.3.tar.xz"; }; }; qtactiveqt = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtactiveqt-everywhere-src-5.11.1.tar.xz"; - sha256 = "1f9w3dc2wvhz7pqhrsb2p908kc2c6xrqsp82ny8akil4xx6nrvn6"; - name = "qtactiveqt-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtactiveqt-everywhere-src-5.11.3.tar.xz"; + sha256 = "0g35yhp01c34m91fp5vzzq0d2kzz0yswpjjk5cg36j0ddnfcsh4d"; + name = "qtactiveqt-everywhere-src-5.11.3.tar.xz"; }; }; qtandroidextras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtandroidextras-everywhere-src-5.11.1.tar.xz"; - sha256 = "1qiggrz2hdb7vrkvsh71hqdipj3klak0jpn2nq8qpilqxgb9dx76"; - name = "qtandroidextras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtandroidextras-everywhere-src-5.11.3.tar.xz"; + sha256 = "0clqz10ry70f0v8hbw37fhlwrsr5jddg99yjsk9db250dwbqzq27"; + name = "qtandroidextras-everywhere-src-5.11.3.tar.xz"; }; }; qtbase = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz"; - sha256 = "0ipv18ypbgpxhh49rfplqmflskmnhhwj1bjr5hrwi0jpvar4gl50"; - name = "qtbase-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz"; + sha256 = "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6"; + name = "qtbase-everywhere-src-5.11.3.tar.xz"; }; }; qtcanvas3d = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcanvas3d-everywhere-src-5.11.1.tar.xz"; - sha256 = "1pif3m1f44jrly2nh0hzid6dmdxqiy5qgx645hz6g5fmpl113d8g"; - name = "qtcanvas3d-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz"; + sha256 = "0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m"; + name = "qtcanvas3d-everywhere-src-5.11.3.tar.xz"; }; }; qtcharts = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtcharts-everywhere-src-5.11.1.tar.xz"; - sha256 = "0avscsni84zrzydilkkp456sbaypyzhkn42qygjdq7wcn045zxk2"; - name = "qtcharts-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz"; + sha256 = "1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627"; + name = "qtcharts-everywhere-src-5.11.3.tar.xz"; }; }; qtconnectivity = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtconnectivity-everywhere-src-5.11.1.tar.xz"; - sha256 = "0mz6mbf069yqdvi6mcvp6izskcn9wzig4s3dzmygwd430pmx93kk"; - name = "qtconnectivity-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz"; + sha256 = "0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l"; + name = "qtconnectivity-everywhere-src-5.11.3.tar.xz"; }; }; qtdatavis3d = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdatavis3d-everywhere-src-5.11.1.tar.xz"; - sha256 = "0gay0dsz05xfrlx190y95hp9wipzb988h02fqbqvyn00ds3s178w"; - name = "qtdatavis3d-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdatavis3d-everywhere-src-5.11.3.tar.xz"; + sha256 = "1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3"; + name = "qtdatavis3d-everywhere-src-5.11.3.tar.xz"; }; }; qtdeclarative = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdeclarative-everywhere-src-5.11.1.tar.xz"; - sha256 = "0fjg9ii64mhx2ww70rj44cy65rwwkwyjxcm435kwp3v1pzv5xkwy"; - name = "qtdeclarative-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz"; + sha256 = "1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf"; + name = "qtdeclarative-everywhere-src-5.11.3.tar.xz"; }; }; qtdoc = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtdoc-everywhere-src-5.11.1.tar.xz"; - sha256 = "1z0sqmn0pw5g4ycdi8igsi89151cw6p3kv9g97pxl2qx3my1ppmc"; - name = "qtdoc-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdoc-everywhere-src-5.11.3.tar.xz"; + sha256 = "06nl8lzrilj8yify5qy4fm9la6dh71aamg19jhvvi657cshiclsq"; + name = "qtdoc-everywhere-src-5.11.3.tar.xz"; }; }; qtgamepad = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgamepad-everywhere-src-5.11.1.tar.xz"; - sha256 = "1n97w9rcbg8mzkvjgn3i8jbfmplp7w0p80ykdchpml47gxk1kwma"; - name = "qtgamepad-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgamepad-everywhere-src-5.11.3.tar.xz"; + sha256 = "1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9"; + name = "qtgamepad-everywhere-src-5.11.3.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtgraphicaleffects-everywhere-src-5.11.1.tar.xz"; - sha256 = "1ws8aj7bq3rxpzjs370dcyqk8a5v1y6fwvrdhf70j8b2d4v75lnr"; - name = "qtgraphicaleffects-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz"; + sha256 = "1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l"; + name = "qtgraphicaleffects-everywhere-src-5.11.3.tar.xz"; }; }; qtimageformats = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtimageformats-everywhere-src-5.11.1.tar.xz"; - sha256 = "05jnyrq7klr3mdiz0r9c151vl829yc8y9cxfbw5dwbp1rkndwl7b"; - name = "qtimageformats-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz"; + sha256 = "0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4"; + name = "qtimageformats-everywhere-src-5.11.3.tar.xz"; }; }; qtlocation = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtlocation-everywhere-src-5.11.1.tar.xz"; - sha256 = "03vrbymwbn4nqsypcmr4ccqv20nvwdfs9gb01pi3jxr6x0wrlb0p"; - name = "qtlocation-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz"; + sha256 = "1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q"; + name = "qtlocation-everywhere-src-5.11.3.tar.xz"; }; }; qtmacextras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmacextras-everywhere-src-5.11.1.tar.xz"; - sha256 = "1wf3n5n4gg8gmjnjq88lmymkssg8q5s3qkrpsxd1hb6pd3n32gpn"; - name = "qtmacextras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmacextras-everywhere-src-5.11.3.tar.xz"; + sha256 = "1j9sqmcwswr8v9z8mcbm10bj7nz8nv9mir0xsc5123ik1gw2c3lk"; + name = "qtmacextras-everywhere-src-5.11.3.tar.xz"; }; }; qtmultimedia = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtmultimedia-everywhere-src-5.11.1.tar.xz"; - sha256 = "0369b0mh7sr718l119b07grb1v8xqlq6l4damyd6lrmlj1wbb2zj"; - name = "qtmultimedia-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz"; + sha256 = "0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j"; + name = "qtmultimedia-everywhere-src-5.11.3.tar.xz"; }; }; qtnetworkauth = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtnetworkauth-everywhere-src-5.11.1.tar.xz"; - sha256 = "05p4pvfp3k5612d54anvpj39bgc7v572x6kgk3fy69xgn7lhbd02"; - name = "qtnetworkauth-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtnetworkauth-everywhere-src-5.11.3.tar.xz"; + sha256 = "0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50"; + name = "qtnetworkauth-everywhere-src-5.11.3.tar.xz"; }; }; qtpurchasing = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtpurchasing-everywhere-src-5.11.1.tar.xz"; - sha256 = "0crm39fy9aqns10mjlbxvkkna9xklic49zfp3f7v7cwl66wap6dc"; - name = "qtpurchasing-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtpurchasing-everywhere-src-5.11.3.tar.xz"; + sha256 = "1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n"; + name = "qtpurchasing-everywhere-src-5.11.3.tar.xz"; }; }; qtquickcontrols = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols-everywhere-src-5.11.1.tar.xz"; - sha256 = "0mn662j0gkpama7zlrsn4h27sjrk49kpbha1h0zxxyiza5cpzsms"; - name = "qtquickcontrols-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz"; + sha256 = "0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf"; + name = "qtquickcontrols-everywhere-src-5.11.3.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtquickcontrols2-everywhere-src-5.11.1.tar.xz"; - sha256 = "0hn4kvrkz5ivwrp9p6yzwlw7cn4j72kcpm2nqyi3dbai1px6dc5x"; - name = "qtquickcontrols2-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz"; + sha256 = "11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl"; + name = "qtquickcontrols2-everywhere-src-5.11.3.tar.xz"; }; }; qtremoteobjects = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtremoteobjects-everywhere-src-5.11.1.tar.xz"; - sha256 = "1yv9f2329nv4viiyqmq7ciz51574wd11grj8s88qm0ndcb36jbgb"; - name = "qtremoteobjects-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtremoteobjects-everywhere-src-5.11.3.tar.xz"; + sha256 = "1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp"; + name = "qtremoteobjects-everywhere-src-5.11.3.tar.xz"; }; }; qtscript = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscript-everywhere-src-5.11.1.tar.xz"; - sha256 = "0z6sb4b9ds5lwkr0sxrnx6nim3aq2qx4a8illjy5vclfdv80yhqw"; - name = "qtscript-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz"; + sha256 = "027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v"; + name = "qtscript-everywhere-src-5.11.3.tar.xz"; }; }; qtscxml = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtscxml-everywhere-src-5.11.1.tar.xz"; - sha256 = "0f1k4fnk2aydagxqvkb636pcsi17sbq2zj2fn0ad50dvq013yiph"; - name = "qtscxml-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz"; + sha256 = "1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk"; + name = "qtscxml-everywhere-src-5.11.3.tar.xz"; }; }; qtsensors = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsensors-everywhere-src-5.11.1.tar.xz"; - sha256 = "1yn065l6kzs3fn74950pkxxglqi55lzk7alf15klsd1wnxc0zsfb"; - name = "qtsensors-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz"; + sha256 = "0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7"; + name = "qtsensors-everywhere-src-5.11.3.tar.xz"; }; }; qtserialbus = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialbus-everywhere-src-5.11.1.tar.xz"; - sha256 = "0jjmdd6vkvs5izqazp1rsrad0b1fzk6knrbdjl37lvcsawyfxfyk"; - name = "qtserialbus-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz"; + sha256 = "0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n"; + name = "qtserialbus-everywhere-src-5.11.3.tar.xz"; }; }; qtserialport = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtserialport-everywhere-src-5.11.1.tar.xz"; - sha256 = "18v4pbq7bnmrl81m8s11ksbjlvzbb4kw5py6ji2dhmnm44w9k9sn"; - name = "qtserialport-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz"; + sha256 = "1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n"; + name = "qtserialport-everywhere-src-5.11.3.tar.xz"; }; }; qtspeech = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtspeech-everywhere-src-5.11.1.tar.xz"; - sha256 = "1nwvbaijg35i98yaiqgnyn5vv0cn4v3wrxhwi1s0hfv9sv3q5iyw"; - name = "qtspeech-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtspeech-everywhere-src-5.11.3.tar.xz"; + sha256 = "158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr"; + name = "qtspeech-everywhere-src-5.11.3.tar.xz"; }; }; qtsvg = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtsvg-everywhere-src-5.11.1.tar.xz"; - sha256 = "0drhig0jcss3cf01aqfmafajf8gzf6bh468g1ikyrkh46czgyshx"; - name = "qtsvg-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz"; + sha256 = "14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1"; + name = "qtsvg-everywhere-src-5.11.3.tar.xz"; }; }; qttools = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttools-everywhere-src-5.11.1.tar.xz"; - sha256 = "1zhl8p29mbabf07rhaks13qcm45zdckzymvz9qn95nxfj9piiyxp"; - name = "qttools-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz"; + sha256 = "13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2"; + name = "qttools-everywhere-src-5.11.3.tar.xz"; }; }; qttranslations = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qttranslations-everywhere-src-5.11.1.tar.xz"; - sha256 = "01kid5dc20jnzjmd4ycjmacrsmrw4hsh2s4y5k9y9p34z8m9pn0j"; - name = "qttranslations-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttranslations-everywhere-src-5.11.3.tar.xz"; + sha256 = "0j8i2kabz22vqb0qj41pkjv848zblqxs71sydc3xcd5av22b517s"; + name = "qttranslations-everywhere-src-5.11.3.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz"; - sha256 = "16xzpdqn07z8j6f8iywy3967djap5bbi2myqp37s4xh9fz60scsv"; - name = "qtvirtualkeyboard-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz"; + sha256 = "17jb7cbfy5c19fr9frql6q22in3ra3a4fbff0kjykllxb8j40p4c"; + name = "qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz"; }; }; qtwayland = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwayland-everywhere-src-5.11.1.tar.xz"; - sha256 = "1sj4lsza48xji1qhmi1wqpx07jgm1mpa95gmd2w1kxw240hbr6p0"; - name = "qtwayland-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz"; + sha256 = "1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2"; + name = "qtwayland-everywhere-src-5.11.3.tar.xz"; }; }; qtwebchannel = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebchannel-everywhere-src-5.11.1.tar.xz"; - sha256 = "11rfjkb4h8dzxfmk889x7kkc73cbk26smc7h62lnh35f2nppd95r"; - name = "qtwebchannel-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz"; + sha256 = "1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w"; + name = "qtwebchannel-everywhere-src-5.11.3.tar.xz"; }; }; qtwebengine = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebengine-everywhere-src-5.11.1.tar.xz"; - sha256 = "136lc2kw4af4bilgn7vn9hdckpk62xvyjb4kr0gc2firr919z79q"; - name = "qtwebengine-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz"; + sha256 = "1zmqsdais85cdfh2jh8h4a5jcamp1mzdk3vgqm6xnldqf6nrxd2v"; + name = "qtwebengine-everywhere-src-5.11.3.tar.xz"; }; }; qtwebglplugin = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebglplugin-everywhere-src-5.11.1.tar.xz"; - sha256 = "108yhi3sj6d1ysmlpka69ivb20mx9h6jpra6yq099i3jw4gc753x"; - name = "qtwebglplugin-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebglplugin-everywhere-src-5.11.3.tar.xz"; + sha256 = "0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9"; + name = "qtwebglplugin-everywhere-src-5.11.3.tar.xz"; }; }; qtwebsockets = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebsockets-everywhere-src-5.11.1.tar.xz"; - sha256 = "1bj82y3f1nd2adnj3ljfr4vlx4bkgdlm3zvhlsas2lz837vi5aks"; - name = "qtwebsockets-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz"; + sha256 = "1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402"; + name = "qtwebsockets-everywhere-src-5.11.3.tar.xz"; }; }; qtwebview = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwebview-everywhere-src-5.11.1.tar.xz"; - sha256 = "18da6a13wpb23vb6mbg9v75gphdf5mjmch7q3v1qjrv2sdwbpjbp"; - name = "qtwebview-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebview-everywhere-src-5.11.3.tar.xz"; + sha256 = "1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh"; + name = "qtwebview-everywhere-src-5.11.3.tar.xz"; }; }; qtwinextras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtwinextras-everywhere-src-5.11.1.tar.xz"; - sha256 = "0qxwfhg962a456lb9b6y7xhi6fvvvb42z0li6v7695vfbckifbzz"; - name = "qtwinextras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwinextras-everywhere-src-5.11.3.tar.xz"; + sha256 = "1xf9gc0wqk9jz2ayx29vx0vmm72x9h4qxp2fvgpclns621wyhw72"; + name = "qtwinextras-everywhere-src-5.11.3.tar.xz"; }; }; qtx11extras = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtx11extras-everywhere-src-5.11.1.tar.xz"; - sha256 = "0rccpmhz48kq4xs441lj9mnwpbi6kxwl8y7dj7w7g5zvpv41kwmw"; - name = "qtx11extras-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz"; + sha256 = "11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr"; + name = "qtx11extras-everywhere-src-5.11.3.tar.xz"; }; }; qtxmlpatterns = { - version = "5.11.1"; + version = "5.11.3"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.11/5.11.1/submodules/qtxmlpatterns-everywhere-src-5.11.1.tar.xz"; - sha256 = "0n5gacpni019i2872m4b1p5qaqibhszsdl3xhw3xsckvr0hf25v1"; - name = "qtxmlpatterns-everywhere-src-5.11.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz"; + sha256 = "1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b"; + name = "qtxmlpatterns-everywhere-src-5.11.3.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..22535deb7678aed9add467fbfa0cd5f12f8e6f24 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -0,0 +1,146 @@ +/* + +# Updates + +Before a major version update, make a copy of this directory. (We like to +keep the old version around for a short time after major updates.) Add a +top-level attribute to `top-level/all-packages.nix`. + +1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. +2. From the top of the Nixpkgs tree, run + `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. +3. Update `qtCompatVersion` below if the minor version number changes. +4. Check that the new packages build correctly. +5. Commit the changes and open a pull request. + +*/ + +{ + newScope, + stdenv, fetchurl, fetchFromGitHub, makeSetupHook, + bison, cups ? null, harfbuzz, libGL, perl, + gstreamer, gst-plugins-base, gtk3, dconf, + cf-private, + + # options + developerBuild ? false, + decryptSslTraffic ? false, + debug ? false, +}: + +with stdenv.lib; + +let + + qtCompatVersion = "5.12"; + + 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 + ]; + qtdeclarative = [ ./qtdeclarative.patch ]; + qtscript = [ ./qtscript.patch ]; + qtserialport = [ ./qtserialport.patch ]; + qtwebkit = [ ./qtwebkit.patch ]; + }; + + mkDerivation = + import ../mkDerivation.nix + { inherit stdenv; inherit (stdenv) lib; } + { inherit debug; }; + + qtModule = + import ../qtModule.nix + { inherit mkDerivation perl; inherit (stdenv) lib; } + { inherit self srcs patches; }; + + addPackages = self: with self; + let + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + in { + + inherit mkDerivation; + + qtbase = callPackage ../modules/qtbase.nix { + inherit (srcs.qtbase) src version; + patches = patches.qtbase; + inherit bison cups harfbuzz libGL; + withGtk3 = true; inherit dconf gtk3; + inherit developerBuild decryptSslTraffic; + }; + + qtcharts = callPackage ../modules/qtcharts.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; + qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; + qtimageformats = callPackage ../modules/qtimageformats.nix {}; + qtlocation = callPackage ../modules/qtlocation.nix {}; + qtmacextras = callPackage ../modules/qtmacextras.nix { + inherit cf-private; + }; + qtmultimedia = callPackage ../modules/qtmultimedia.nix { + inherit gstreamer gst-plugins-base; + }; + qtquick1 = null; + qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; + qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; + qtscript = callPackage ../modules/qtscript.nix {}; + qtsensors = callPackage ../modules/qtsensors.nix {}; + qtserialport = callPackage ../modules/qtserialport.nix {}; + qtspeech = callPackage ../modules/qtspeech.nix {}; + qtsvg = callPackage ../modules/qtsvg.nix {}; + qttools = callPackage ../modules/qttools.nix {}; + qttranslations = callPackage ../modules/qttranslations.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; + qtwayland = callPackage ../modules/qtwayland.nix {}; + qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; + qtwebengine = callPackage ../modules/qtwebengine.nix {}; + 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 {}; + + env = callPackage ../qt-env.nix {}; + full = env "qt-full-${qtbase.version}" ([ + qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 + qtscript qtsensors qtserialport qtsvg qttools qttranslations + qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets + qtx11extras qtxmlpatterns + ] ++ optional (!stdenv.isDarwin) qtwayland + ++ optional (stdenv.isDarwin) qtmacextras); + + qmake = makeSetupHook { + deps = [ self.qtbase.dev ]; + substitutions = { + inherit (stdenv) isDarwin; + qtbase_dev = self.qtbase.dev; + fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; + }; + } ../hooks/qmake-hook.sh; + }; + + self = makeScope newScope addPackages; + +in self diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh new file mode 100644 index 0000000000000000000000000000000000000000..b77a58cafa2e38a0cd432ecfaf82fd5b9d998c11 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -0,0 +1,2 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase-darwin-nseventtype.patch b/pkgs/development/libraries/qt-5/5.12/qtbase-darwin-nseventtype.patch new file mode 100644 index 0000000000000000000000000000000000000000..9ef6e8ef0692738579f64c4729cf52dbd1172873 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtbase-darwin-nseventtype.patch @@ -0,0 +1,13 @@ +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -404,8 +404,8 @@ void QCocoaWindow::setVisible(bool visible) + removeMonitor(); + monitor = [NSEvent addGlobalMonitorForEventsMatchingMask:NSLeftMouseDownMask|NSRightMouseDownMask|NSOtherMouseDownMask|NSMouseMovedMask handler:^(NSEvent *e) { + QPointF localPoint = QCocoaScreen::mapFromNative([NSEvent mouseLocation]); +- const auto button = e.type == NSEventTypeMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]); +- const auto eventType = e.type == NSEventTypeMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress; ++ const auto button = e.type == NSMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]); ++ const auto eventType = e.type == NSMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress; + QWindowSystemInterface::handleMouseEvent(window(), window()->mapFromGlobal(localPoint.toPoint()), localPoint, + Qt::MouseButtons(uint(NSEvent.pressedMouseButtons & 0xFFFF)), button, eventType); + }]; diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.12/qtbase-darwin.patch new file mode 100644 index 0000000000000000000000000000000000000000..7ce27a99758e10b4ddec7103f1ac5041dc1bf57a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtbase-darwin.patch @@ -0,0 +1,70 @@ +diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm +index c3dd49ff3e..6871399817 100644 +--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm ++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm +@@ -283,7 +283,7 @@ void QScanThread::getUserConfigurations() + QMacAutoReleasePool pool; + userProfiles.clear(); + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + + CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; +@@ -598,7 +598,7 @@ void QCoreWlanEngine::doRequestUpdate() + + QMacAutoReleasePool pool; + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + scanThread->interfaceName = QString::fromNSString(ifName); + scanThread->start(); +diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm +index afe14e623c..74d69c2fa1 100644 +--- a/src/plugins/platforms/cocoa/qcocoascreen.mm ++++ b/src/plugins/platforms/cocoa/qcocoascreen.mm +@@ -127,7 +127,7 @@ void QCocoaScreen::updateProperties() + const qreal previousRefreshRate = m_refreshRate; + + // The reference screen for the geometry is always the primary screen +- QRectF primaryScreenGeometry = QRectF::fromCGRect([[NSScreen screens] firstObject].frame); ++ QRectF primaryScreenGeometry = QRectF::fromCGRect([[[NSScreen screens] firstObject] frame]); + m_geometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.frame), primaryScreenGeometry).toRect(); + m_availableGeometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.visibleFrame), primaryScreenGeometry).toRect(); + +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index df1ad82592..0318a4ff96 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -1704,7 +1704,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) + + if (!m_drawContentBorderGradient) { + window.styleMask = window.styleMask & ~NSWindowStyleMaskTexturedBackground; +- [window.contentView.superview setNeedsDisplay:YES]; ++ [[window.contentView superview] setNeedsDisplay:YES]; + window.titlebarAppearsTransparent = NO; + return; + } +diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm +index c17ad47aba..a0f1dd38fb 100644 +--- a/src/plugins/platforms/cocoa/qnswindow.mm ++++ b/src/plugins/platforms/cocoa/qnswindow.mm +@@ -230,7 +230,7 @@ static bool isMouseEvent(NSEvent *ev) + if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) { + NSPoint loc = [theEvent locationInWindow]; + NSRect windowFrame = [self convertRectFromScreen:self.frame]; +- NSRect contentFrame = self.contentView.frame; ++ NSRect contentFrame = [self.contentView frame]; + if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO)) + [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent]; + } +@@ -257,7 +257,7 @@ static bool isMouseEvent(NSEvent *ev) + + (void)applicationActivationChanged:(NSNotification*)notification + { + const id sender = self; +- NSEnumerator *windowEnumerator = nullptr; ++ NSEnumerator *windowEnumerator = nullptr; + NSApplication *application = [NSApplication sharedApplication]; + + // Unfortunately there's no NSWindowListOrderedBackToFront, diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.12/qtbase-fixguicmake.patch new file mode 100644 index 0000000000000000000000000000000000000000..8b46d432812a8b457deda428f33f44195ca8aae1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/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.12/qtbase-revert-no-macos10.10.patch b/pkgs/development/libraries/qt-5/5.12/qtbase-revert-no-macos10.10.patch new file mode 100644 index 0000000000000000000000000000000000000000..29776518379d254529d2e6b667a3f7efe4739fbd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtbase-revert-no-macos10.10.patch @@ -0,0 +1,102 @@ +Revert "Remove code paths for macOS < 10.11" + +This reverts commit 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3. + +From 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3 Mon Sep 17 00:00:00 2001 +From: Jake Petroules +Date: Thu, 8 Feb 2018 11:05:42 -0800 +Subject: [PATCH] Remove code paths for macOS < 10.11 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: I5ae02d88aa3dcd97d1f2ebf6255a68643e5d6daa +Reviewed-by: Tor Arne Vestbø +Reviewed-by: Gabriel de Dietrich +Reviewed-by: Konstantin Ritt +--- + .../fontdatabases/mac/qfontengine_coretext.mm | 16 +++------------- + src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | 6 +----- + src/plugins/platforms/cocoa/qnswindowdelegate.mm | 16 ---------------- + 3 files changed, 4 insertions(+), 34 deletions(-) + +diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +index 98b753eff9..489d9cd031 100644 +--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm ++++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +@@ -47,18 +47,28 @@ + + #include + +-#if defined(Q_OS_MACOS) ++#if defined(Q_OS_OSX) && !QT_OSX_DEPLOYMENT_TARGET_BELOW(__MAC_10_11) + #import + #endif + +-#if defined(QT_PLATFORM_UIKIT) ++#if defined(QT_PLATFORM_UIKIT) && !QT_IOS_DEPLOYMENT_TARGET_BELOW(__IPHONE_8_2) + #import + #endif + + // These are available cross platform, exported as kCTFontWeightXXX from CoreText.framework, + // but they are not documented and are not in public headers so are private API and exposed + // only through the NSFontWeightXXX and UIFontWeightXXX aliases in AppKit and UIKit (rdar://26109857) +-#if defined(Q_OS_MACOS) ++#if QT_MAC_DEPLOYMENT_TARGET_BELOW(__MAC_10_11, __IPHONE_8_2) ++#define kCTFontWeightUltraLight -0.8 ++#define kCTFontWeightThin -0.6 ++#define kCTFontWeightLight -0.4 ++#define kCTFontWeightRegular 0 ++#define kCTFontWeightMedium 0.23 ++#define kCTFontWeightSemibold 0.3 ++#define kCTFontWeightBold 0.4 ++#define kCTFontWeightHeavy 0.56 ++#define kCTFontWeightBlack 0.62 ++#elif defined(Q_OS_OSX) + #define kCTFontWeightUltraLight NSFontWeightUltraLight + #define kCTFontWeightThin NSFontWeightThin + #define kCTFontWeightLight NSFontWeightLight +diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +index 94f2125bad..272cd9f3dc 100644 +--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm ++++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +@@ -162,7 +162,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate); + // resetting our mCurrentDir, set the delegate + // here to make sure it gets the correct value. + [mSavePanel setDelegate:self]; +- mOpenPanel.accessoryViewDisclosed = YES; ++ ++#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11) ++ if (__builtin_available(macOS 10.11, *)) ++ mOpenPanel.accessoryViewDisclosed = YES; ++#endif + + if (mOptions->isLabelExplicitlySet(QFileDialogOptions::Accept)) + [mSavePanel setPrompt:[self strip:options->labelText(QFileDialogOptions::Accept)]]; +diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm +index 057a4c2943..eb55e50622 100644 +--- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm ++++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm +@@ -103,6 +103,22 @@ static QRegExp whitespaceRegex = QRegExp(QStringLiteral("\\s*")); + return QCocoaScreen::mapToNative(maximizedFrame); + } + ++#if QT_MACOS_DEPLOYMENT_TARGET_BELOW(__MAC_10_11) ++/* ++ AppKit on OS X 10.10 wrongly calls windowWillUseStandardFrame:defaultFrame ++ from -[NSWindow _frameForFullScreenMode] when going into fullscreen, resulting ++ in black bars on top and bottom of the window. By implementing the following ++ method, AppKit will choose that instead, and resolve the right fullscreen ++ geometry. ++*/ ++- (NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)proposedSize ++{ ++ Q_UNUSED(proposedSize); ++ Q_ASSERT(window == m_cocoaWindow->nativeWindow()); ++ return NSSizeFromCGSize(m_cocoaWindow->screen()->geometry().size().toCGSize()); ++} ++#endif ++ + - (BOOL)window:(NSWindow *)window shouldPopUpDocumentPathMenu:(NSMenu *)menu + { + Q_UNUSED(window); diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch new file mode 100644 index 0000000000000000000000000000000000000000..68ebd56b76c002f95290deba977af64c9c57ac4a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch @@ -0,0 +1,1096 @@ +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf +index 61bea952b2..9909dae726 100644 +--- a/mkspecs/common/mac.conf ++++ b/mkspecs/common/mac.conf +@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 2ed708e085..05e60ff45f 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -21,7 +21,7 @@ load(cmake_functions) + # at cmake time whether package has been found via a symlink, and correct + # that to an absolute path. This is only done for installations to + # the /usr or / prefix. +-CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) ++CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) + contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR + + CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake +@@ -51,45 +51,20 @@ split_incpath { + $$cmake_extra_source_includes.output + } + +-CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { +- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ +- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True +-} ++CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ ++CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + +-CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_LIB_DIR,"^\\.\\./.*") { +- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ +- CMAKE_LIB_DIR_IS_ABSOLUTE = True +-} else { +- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) +- # We need to go up another two levels because the CMake files are +- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} +- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" +-} ++CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ ++CMAKE_BIN_DIR_IS_ABSOLUTE = True + +-CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_BIN_DIR, "^\\.\\./.*") { +- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ +- CMAKE_BIN_DIR_IS_ABSOLUTE = True +-} ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_LIB_DIR_IS_ABSOLUTE = True + +-CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { +- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ +- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True +-} +- +-win32:!static:!staticlib { +- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) +- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { +- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ +- CMAKE_DLL_DIR_IS_ABSOLUTE = True +- } +-} else { +- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR +- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE +-} ++CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ ++CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True ++ ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_DLL_DIR_IS_ABSOLUTE = True + + static|staticlib:CMAKE_STATIC_TYPE = true + +@@ -169,7 +144,7 @@ contains(CONFIG, plugin) { + cmake_target_file + + cmake_qt5_plugin_file.files = $$cmake_target_file.output +- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + INSTALLS += cmake_qt5_plugin_file + + return() +@@ -316,7 +291,7 @@ exists($$cmake_macros_file.input) { + cmake_qt5_module_files.files += $$cmake_macros_file.output + } + +-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + + # We are generating cmake files. Most developers of Qt are not aware of cmake, + # so we require automatic tests to be available. The only module which should +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 3ed6dd5889..4c7c8da21a 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) + message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") + endif() + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") +@@ -52,11 +28,7 @@ endmacro() + macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" +@@ -69,11 +41,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + ) + + !!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) + if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +@@ -89,24 +57,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !no_module_headers + !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) + set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" + ) + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE +-!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -122,7 +79,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -272,25 +228,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -309,25 +253,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -346,11 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF + _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/mac/default_post.prf b/mkspecs/features/mac/default_post.prf +index 99f68b78f5..dde69cb7c2 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -63,199 +63,3 @@ qt { + } + } + } +- +-# Add the same default rpaths as Xcode does for new projects. +-# This is especially important for iOS/tvOS/watchOS where no other option is possible. +-!no_default_rpath { +- QMAKE_RPATHDIR += @executable_path/Frameworks +- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks +-} +- +-# Don't pass -headerpad_max_install_names when using Bitcode. +-# In that case the linker emits a warning stating that the flag is ignored when +-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). +-# Using this flag is also unnecessary in practice on UIKit platforms since they +-# are sandboxed, and only UIKit platforms support bitcode to begin with. +-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD +- +-app_extension_api_only { +- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +-} +- +-macx-xcode { +- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO +- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ +- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO +- else: \ +- qmake_pkginfo_typeinfo.value = "????" +- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo +- +- !isEmpty(VERSION) { +- l = $$split(VERSION, '.') 0 0 # make sure there are at least three +- VER_MAJ = $$member(l, 0, 0) +- VER_MIN = $$member(l, 1, 1) +- VER_PAT = $$member(l, 2, 2) +- unset(l) +- +- qmake_full_version.name = QMAKE_FULL_VERSION +- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} +- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version +- +- qmake_short_version.name = QMAKE_SHORT_VERSION +- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} +- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version +- } +- +- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { +- debug_information_format.name = DEBUG_INFORMATION_FORMAT +- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT +- debug_information_format.build = debug +- QMAKE_MAC_XCODE_SETTINGS += debug_information_format +- } +- +- QMAKE_XCODE_ARCHS = +- +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- +- simulator { +- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" +- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_simulator +- } +- +- only_active_arch.name = ONLY_ACTIVE_ARCH +- only_active_arch.value = YES +- only_active_arch.build = debug +- QMAKE_MAC_XCODE_SETTINGS += only_active_arch +-} else { +- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS +- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS +- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS +- +- isEmpty(VALID_ARCHS): \ +- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") +- +- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) +- +- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- +- arch_flags = $(EXPORT_ARCH_ARGS) +- +- QMAKE_CFLAGS += $$arch_flags +- QMAKE_CXXFLAGS += $$arch_flags +- QMAKE_LFLAGS += $$arch_flags +- +- QMAKE_PCH_ARCHS = $$VALID_ARCHS +- +- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET +- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET +- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET +- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET +- +- # If we're doing a simulator and device build, device and simulator +- # architectures use different paths and flags for the sysroot and +- # deployment target switch, so we must multiplex them across multiple +- # architectures using -Xarch. Otherwise we fall back to the simple path. +- # This is not strictly necessary, but results in cleaner command lines +- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit +- # individual rules to a different set of architecture(s) from the overall +- # build (such as machtest in QtCore). +- simulator:device { +- QMAKE_XARCH_CFLAGS = +- QMAKE_XARCH_LFLAGS = +- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS +- +- for (arch, VALID_ARCHS) { +- contains(VALID_SIMULATOR_ARCHS, $$arch) { +- sdk = $$simulator.sdk +- version_identifier = $$simulator.deployment_identifier +- } else { +- sdk = $$device.sdk +- version_identifier = $$device.deployment_identifier +- } +- +- version_min_flags = \ +- -Xarch_$${arch} \ +- -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) +- +- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) +- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) +- +- QMAKE_EXTRA_VARIABLES += \ +- QMAKE_XARCH_CFLAGS_$${arch} \ +- QMAKE_XARCH_LFLAGS_$${arch} +- } +- +- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) +- } else { +- simulator: \ +- version_identifier = $$simulator.deployment_identifier +- else: \ +- version_identifier = $$device.deployment_identifier +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag +- } +- +- # Enable precompiled headers for multiple architectures +- QMAKE_CFLAGS_USE_PRECOMPILE = +- for (arch, VALID_ARCHS) { +- icc_pch_style: \ +- use_flag = "-pch-use " +- else: \ +- use_flag = -include +- +- # Only use Xarch with multi-arch, as the option confuses ccache +- count(VALID_ARCHS, 1, greaterThan): \ +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- -Xarch_$${arch} +- +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} +- } +- icc_pch_style { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} +- QMAKE_CFLAGS_USE_PRECOMPILE = +- } else { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- } +- +- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} +-} +- +-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- cache(QMAKE_XCODE_VERSION, stash) +- +-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() +- +-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER +-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX +-isEmpty(xcode_product_bundle_identifier_setting.value): \ +- xcode_product_bundle_identifier_setting.value = "com.yourcompany" +-xcode_product_bundle_target = $$QMAKE_BUNDLE +-isEmpty(xcode_product_bundle_target): \ +- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" +-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting +diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf +index e3534561a5..3b01424e67 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf +@@ -1,60 +1,2 @@ + CONFIG = asset_catalogs rez $$CONFIG + load(default_pre) +- +-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { +- # Get path of Xcode's Developer directory +- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") +- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode path is valid +- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +-} +- +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") +- +-!isEmpty(QMAKE_XCODEBUILD_PATH) { +- # Make sure Xcode is set up properly +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") +- +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } +-} +- +-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { +- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist +- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ +- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") +- +- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ +- cache(QMAKE_TARGET_BUNDLE_PREFIX) +-} +- +-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon +- +-# Make the default debug info format for static debug builds +-# DWARF instead of DWARF with dSYM. This cuts down build times +-# for application debug builds significantly, as Xcode doesn't +-# have to pull out all the DWARF info from the Qt static libs +-# and put it into a dSYM file. We don't need that dSYM file in +-# the first place, since the information is available in the +-# object files inside the archives (static libraries). +-macx-xcode:qtConfig(static): \ +- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf +- +-# This variable is used by the xcode_dynamic_library_suffix +-# feature, which allows Xcode to choose the Qt libraries to link to +-# at build time, depending on the current Xcode SDK and configuration. +-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +- +-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP +-xcode_copy_phase_strip_setting.value = NO +-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting +diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf +index 8360dd8b38..8b13789179 100644 +--- a/mkspecs/features/mac/sdk.prf ++++ b/mkspecs/features/mac/sdk.prf +@@ -1,58 +1 @@ + +-isEmpty(QMAKE_MAC_SDK): \ +- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") +- +-contains(QMAKE_MAC_SDK, .*/.*): \ +- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") +- +-defineReplace(xcodeSDKInfo) { +- info = $$1 +- equals(info, "Path"): \ +- infoarg = --show-sdk-path +- equals(info, "PlatformPath"): \ +- infoarg = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- infoarg = --show-sdk-version +- sdk = $$2 +- isEmpty(sdk): \ +- sdk = $$QMAKE_MAC_SDK +- +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") +- # --show-sdk-platform-path won't work for Command Line Tools; this is fine +- # only used by the XCTest backend to testlib +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ +- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") +- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) +- } +- +- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) +-} +- +-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) +-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- +-sysrootified = +-for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val +-QMAKE_INCDIR_OPENGL = $$sysrootified +- +-QMAKESPEC_NAME = $$basename(QMAKESPEC) +- +-# Resolve SDK version of various tools +-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { +- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} +- !isEmpty($$tool_variable) { +- $$tool = $$eval($$tool_variable) +- next() +- } +- +- value = $$eval($$tool) +- isEmpty(value): next() +- +- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") +- isEmpty(sysrooted): next() +- +- $$tool = $$sysrooted $$member(value, 1, -1) +- cache($$tool_variable, set stash, $$tool) +-} +diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf +index 65212b2abf..accd4c07f0 100644 +--- a/mkspecs/features/qml_module.prf ++++ b/mkspecs/features/qml_module.prf +@@ -52,7 +52,7 @@ qmldir.base = $$_PRO_FILE_PWD_ + # Tools need qmldir and plugins.qmltypes always installed on the file system + qmldir.files = $$qmldir_file $$fq_aux_qml_files + install_qml_files: qmldir.files += $$fq_qml_files +-qmldir.path = $$instbase/$$TARGETPATH ++qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH + INSTALLS += qmldir + + !debug_and_release|!build_all|CONFIG(release, debug|release) { +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index cd6377dcc6..e98bf98151 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -56,7 +56,7 @@ qml1_target { + instbase = $$[QT_INSTALL_QML] + } + +-target.path = $$instbase/$$TARGETPATH ++target.path = $$NIX_OUTPUT_QML/$$TARGETPATH + INSTALLS += target + + # Some final setup +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 8354f30eea..62028fef8e 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -30,7 +30,7 @@ host_build:force_bootstrap { + target.path = $$[QT_HOST_BINS] + } else { + !build_pass:qtConfig(debug_and_release): CONFIG += release +- target.path = $$[QT_INSTALL_BINS] ++ target.path = $$NIX_OUTPUT_BIN/bin + CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable + } + INSTALLS += target +diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf +index 3bb3823a8e..655b7b7db8 100644 +--- a/mkspecs/features/qt_build_paths.prf ++++ b/mkspecs/features/qt_build_paths.prf +@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ + !force_independent { + # If the module is not built independently, everything ends up in qtbase. + # This is the case in non-prefix builds, except for selected modules. +- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] +- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] ++ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT ++ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT + } +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index 4ad9946ae0..6d66f29c26 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -34,8 +34,8 @@ contains(TEMPLATE, .*lib) { + qqt_libdir = \$\$\$\$[QT_HOST_LIBS] + qt_libdir = $$[QT_HOST_LIBS] + } else { +- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] +- qt_libdir = $$[QT_INSTALL_LIBS] ++ qqt_libdir = \$\$\$\$NIX_OUTPUT_OUT/lib ++ qt_libdir = $$NIX_OUTPUT_OUT/lib + } + contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { + lib_replace.match = "[^ ']*$$rplbase/lib" +diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf +index 3139c443c6..1b4f2fddd8 100644 +--- a/mkspecs/features/qt_docs.prf ++++ b/mkspecs/features/qt_docs.prf +@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR + + QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) + !build_online_docs: \ +- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) ++ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) + PREP_DOC_INDEXES = + DOC_INDEXES = + !isEmpty(QTREPOS) { +@@ -64,8 +64,8 @@ DOC_INDEXES = + DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) + } else { + prepare_docs: \ +- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) +- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) ++ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) ++ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) + } + + qtattributionsscanner.target = qtattributionsscanner +@@ -88,12 +88,12 @@ prepare_docs { + qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) + + inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR +- inst_html_docs.path = $$[QT_INSTALL_DOCS] ++ inst_html_docs.path = $$NIX_OUTPUT_DOC + inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build + INSTALLS += inst_html_docs + + inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch +- inst_qch_docs.path = $$[QT_INSTALL_DOCS] ++ inst_qch_docs.path = $$NIX_OUTPUT_DOC + inst_qch_docs.CONFIG += no_check_exist no_default_install no_build + INSTALLS += inst_qch_docs + +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index 43b58817fe..e635b8f67a 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -88,7 +88,7 @@ sourcefiles += \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) +-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase ++sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase + INSTALLS += sources + + check_examples { +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 1903e509c8..ae7b585989 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { + defineTest(qtPrepareTool) { + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ cmd = $$system("command -v $$2") + exists($${cmd}.pl) { + $${1}_EXE = $${cmd}.pl + cmd = perl -w $$system_path($${cmd}.pl) +diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf +index 8f98987b99..21b3bb8b32 100644 +--- a/mkspecs/features/qt_installs.prf ++++ b/mkspecs/features/qt_installs.prf +@@ -12,16 +12,10 @@ + #library + !qt_no_install_library { + win32 { +- host_build: \ +- dlltarget.path = $$[QT_HOST_BINS] +- else: \ +- dlltarget.path = $$[QT_INSTALL_BINS] ++ dlltarget.path = $$NIX_OUTPUT_BIN/bin + INSTALLS += dlltarget + } +- host_build: \ +- target.path = $$[QT_HOST_LIBS] +- else: \ +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + !static: target.CONFIG = no_dll + INSTALLS += target + } +@@ -29,33 +23,33 @@ + #headers + qt_install_headers { + gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES +- gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += gen_headers + + targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES +- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += targ_headers + + private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES +- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private ++ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + INSTALLS += private_headers + + qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES +- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa ++ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa + INSTALLS += qpa_headers + } + + #module + qt_install_module { + !isEmpty(MODULE_PRI) { +- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + pritarget.files = $$MODULE_PRI + INSTALLS += pritarget + } else: isEmpty(MODULE_PRIVATE_PRI) { + warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") + } + !isEmpty(MODULE_PRIVATE_PRI) { +- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + privpritarget.files = $$MODULE_PRIVATE_PRI + INSTALLS += privpritarget + } +diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf +index 40528a65e2..903f795284 100644 +--- a/mkspecs/features/qt_plugin.prf ++++ b/mkspecs/features/qt_plugin.prf +@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { + } + } + +-target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE ++target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE + INSTALLS += target + + TARGET = $$qt5LibraryTarget($$TARGET) +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index e0652fdcf9..450b2a2d28 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -116,7 +116,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -130,7 +130,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +index c357237d0e..6f0c75de3c 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +index 706304cf34..546420f6ad 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp +index 463e30e1c3..0e1ab669e4 100644 +--- a/src/corelib/kernel/qcoreapplication.cpp ++++ b/src/corelib/kernel/qcoreapplication.cpp +@@ -2665,6 +2665,15 @@ QStringList QCoreApplication::libraryPaths() + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); +diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp +index bed62a02bd..73158993f7 100644 +--- a/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ b/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ // Try TZDIR first, in case we're running on NixOS. ++ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); ++ // Fallback to traditional paths in case we are not on NixOS. ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first, in case we're running on NixOS ++ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) +- return; ++ // Open named tz, try modern path first, if fails try legacy path ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) ++ return; ++ } + } + } + +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 1d947159e2..b36865fc48 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -2,11 +2,7 @@ + if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbuscpp2xml PROPERTIES +@@ -17,11 +13,7 @@ endif() + if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbusxml2cpp PROPERTIES +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 07869efd7d..fb4183bada 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +index b5a0a5bbeb..6c20305f4d 100644 +--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() + m_possibleLocations.reserve(7); + if (qEnvironmentVariableIsSet("QTCOMPOSE")) + m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); +- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); ++ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE)); + } + + QString TableGenerator::findComposeFile() +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index 57629ac03a..8a7f219a98 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -316,10 +316,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) + #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp +index fb1c425d8e..bb8bab9795 100644 +--- a/src/plugins/platformthemes/gtk3/main.cpp ++++ b/src/plugins/platformthemes/gtk3/main.cpp +@@ -39,6 +39,7 @@ + + #include + #include "qgtk3theme.h" ++#include + + QT_BEGIN_NAMESPACE + +@@ -54,8 +55,22 @@ public: + QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) + { + Q_UNUSED(params); +- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) ++ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { ++ ++#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS ++ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); ++ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); ++ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); ++#endif ++ ++#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES ++ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); ++ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); ++ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); ++#endif ++ + return new QGtk3Theme; ++ } + + return 0; + } +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index 6498ea84ef..d821ced7fc 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -44,10 +44,13 @@ + + QT_BEGIN_NAMESPACE + +- ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else + #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) +- + #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 99d87e2e46..a4eab2aa72 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f5b5d4790fb15778a446d0b08d86361803bf8ac --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtdeclarative.patch @@ -0,0 +1,33 @@ +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index 005db4248..685c5b1b2 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); ++ } ++ } ++ + // env import paths + if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { + const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); +diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf +index 537eaf62e..e21de58f6 100644 +--- a/tools/qmlcachegen/qmlcache.prf ++++ b/tools/qmlcachegen/qmlcache.prf +@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) { + } + + qmlcacheinst.base = $$QMLCACHE_DESTDIR +-qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH + qmlcacheinst.CONFIG = no_check_exist + + qmlcachegen.input = CACHEGEN_FILES diff --git a/pkgs/development/libraries/qt-5/5.12/qtscript.patch b/pkgs/development/libraries/qt-5/5.12/qtscript.patch new file mode 100644 index 0000000000000000000000000000000000000000..5508dec1280e3a3f07761a942b7f9aa6ec2112d3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtscript.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +index 1f6d25e..087c3fb 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +@@ -81,7 +81,7 @@ + #include + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + diff --git a/pkgs/development/libraries/qt-5/5.12/qtserialport.patch b/pkgs/development/libraries/qt-5/5.12/qtserialport.patch new file mode 100644 index 0000000000000000000000000000000000000000..f25524e80bcfe8ca3ba93bd3562149043ab1aa97 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtserialport.patch @@ -0,0 +1,22 @@ +diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h +index af2dab2..8e17f64 100644 +--- a/src/serialport/qtudev_p.h ++++ b/src/serialport/qtudev_p.h +@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN + inline bool resolveSymbols(QLibrary *udevLibrary) + { + if (!udevLibrary->isLoaded()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); ++#endif + if (!udevLibrary->load()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); ++#endif + if (!udevLibrary->load()) { + qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); + return false; diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch new file mode 100644 index 0000000000000000000000000000000000000000..b94a4b76cbabad74ade70f051031e89d4d2897c2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebkit.patch @@ -0,0 +1,12 @@ +diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake +--- a/Source/WebKit2/PlatformQt.cmake ++++ b/Source/WebKit2/PlatformQt.cmake +@@ -261,6 +261,7 @@ + list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES + ${GLIB_INCLUDE_DIRS} + ${GSTREAMER_INCLUDE_DIRS} ++ ${GSTREAMER_PBUTILS_INCLUDE_DIRS} + ${Qt5Quick_INCLUDE_DIRS} + ${Qt5Quick_PRIVATE_INCLUDE_DIRS} + ${SQLITE_INCLUDE_DIR} + diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix new file mode 100644 index 0000000000000000000000000000000000000000..d83edc97e94f8c78feae5d37f7ca8de211590529 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix @@ -0,0 +1,325 @@ +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh +{ fetchurl, mirror }: + +{ + qt3d = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qt3d-everywhere-src-5.12.0.tar.xz"; + sha256 = "1nii8qz8791ripmqd158qah40j2dj50zn7lmqksqz8gz2jfdqam1"; + name = "qt3d-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtactiveqt-everywhere-src-5.12.0.tar.xz"; + sha256 = "0gkdx3mc6ysqlf0ci77kf9c961dc9sbi4j3z5q237d1w4js7ca52"; + name = "qtactiveqt-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtandroidextras-everywhere-src-5.12.0.tar.xz"; + sha256 = "0s083ngvya8bknp0bvgb3hyk6zr8shg8rmkzn98956dqz0xs3agm"; + name = "qtandroidextras-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtbase = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtbase-everywhere-src-5.12.0.tar.xz"; + sha256 = "1jzfx8c0hzch0kmz2m4vkn65s7ikiymnm29lsymil4hfg0fj40sy"; + name = "qtbase-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtcanvas3d = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcanvas3d-everywhere-src-5.12.0.tar.xz"; + sha256 = "0a61z5amp409aq9v7j0fyk003fbz2i247idl7lgfbl4qqh0ry6xj"; + name = "qtcanvas3d-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtcharts = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtcharts-everywhere-src-5.12.0.tar.xz"; + sha256 = "0l6lrrwqbqaf6agsghaw4ysm2vb6b4n9j5lgrs1i0q8h9i51rmww"; + name = "qtcharts-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtconnectivity-everywhere-src-5.12.0.tar.xz"; + sha256 = "1912a4my72wcqmmdyj24wkwq9p9ih4gzzzvgiq75pfwyhnxa3g4f"; + name = "qtconnectivity-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdatavis3d-everywhere-src-5.12.0.tar.xz"; + sha256 = "0czlj088gf2r6w5ahh0p8n36lbwmds86mxqijshmhzax5cspxnjf"; + name = "qtdatavis3d-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdeclarative-everywhere-src-5.12.0.tar.xz"; + sha256 = "0yr29hm3bqlwxcmna0bzyxw8k4hw3x8k3k4iiw2sw52p5c85izag"; + name = "qtdeclarative-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtdoc = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtdoc-everywhere-src-5.12.0.tar.xz"; + sha256 = "1k8caa1nmc9nrhb29vq1qzaz608klnjxy509w6ppxlzz2zbpcr9h"; + name = "qtdoc-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtgamepad = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgamepad-everywhere-src-5.12.0.tar.xz"; + sha256 = "14b0np15gm5lzvip33pg6w9dfs065wwdfz18na28bhbxj6wh06ac"; + name = "qtgamepad-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; + sha256 = "0m9l031zhw8il66ld8bj1lwqlc2xx89nl6dvssz1kl2d5nqqy1c1"; + name = "qtgraphicaleffects-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtimageformats = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtimageformats-everywhere-src-5.12.0.tar.xz"; + sha256 = "0bkkk5skpplwfbqv7g41rhgynyxs3khvf8gk2rl2gdixdplpv42z"; + name = "qtimageformats-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtlocation = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtlocation-everywhere-src-5.12.0.tar.xz"; + sha256 = "0ja4cwj59y1xhwwf4f5gzr0fdrrsxbh14g2x812n03x0yd6i78xh"; + name = "qtlocation-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtmacextras = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmacextras-everywhere-src-5.12.0.tar.xz"; + sha256 = "00xhkj66i3srwmzzin1mcx9m94l5ns08f93c1za3wl23ani7n2nr"; + name = "qtmacextras-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtmultimedia-everywhere-src-5.12.0.tar.xz"; + sha256 = "1a96x6c2w9rs6vfsdcnzmmad4w32dxy2dvismldcwmwcq2whqjsw"; + name = "qtmultimedia-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtnetworkauth = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtnetworkauth-everywhere-src-5.12.0.tar.xz"; + sha256 = "0x877ra8375pf8d8p6hgdkyw8yzjqfca6rgki6vi1q8fyi31j4a1"; + name = "qtnetworkauth-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtpurchasing-everywhere-src-5.12.0.tar.xz"; + sha256 = "1nk0dp247v1rfbnj84g99zsj6iv86pq32f478r92adz9qcgfs2yr"; + name = "qtpurchasing-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols-everywhere-src-5.12.0.tar.xz"; + sha256 = "0wyd24aphpixi3k9vbxw73z3dy1xnf8hwc99wimr5mpf1cj67yrb"; + name = "qtquickcontrols-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; + sha256 = "1ikxj32rd9pipnrz81l5ln700lnw8w6bx573w01x424sx0p7wxw9"; + name = "qtquickcontrols2-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtremoteobjects = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtremoteobjects-everywhere-src-5.12.0.tar.xz"; + sha256 = "0pwx2m17yw1qqv8qigfndgj1yd5kq8w5cbiaqlw4zdk1m6jd0h09"; + name = "qtremoteobjects-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtscript = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscript-everywhere-src-5.12.0.tar.xz"; + sha256 = "1a7ziipvy8cfmrpw2b868167sw21zrqhfv2la0w9vs6hwli1mzlp"; + name = "qtscript-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtscxml = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtscxml-everywhere-src-5.12.0.tar.xz"; + sha256 = "0syx3bx9pxxrsxanfv245ifppjhbj7sbrndh8il86xlrcr9cwvnw"; + name = "qtscxml-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtsensors = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsensors-everywhere-src-5.12.0.tar.xz"; + sha256 = "19n5vlx0j5a0h86mpgs86qzsxbyq8fcrls7yqnjdaw0zga234cf5"; + name = "qtsensors-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtserialbus = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialbus-everywhere-src-5.12.0.tar.xz"; + sha256 = "16imi82v17n18a5m0i2fcfj6hqdpnzn2z9kdcf6a8h93fv4qd4kb"; + name = "qtserialbus-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtserialport = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtserialport-everywhere-src-5.12.0.tar.xz"; + sha256 = "1fx9fm0418jq05j2hlb52lblq8nr4m0hj8sizi86p708jmb01m2r"; + name = "qtserialport-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtspeech = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtspeech-everywhere-src-5.12.0.tar.xz"; + sha256 = "1yx4wahl7iaj6lgpvnw8pdi2q4wc2fkpzfidd3j1bc98wpna4f8r"; + name = "qtspeech-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtsvg = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtsvg-everywhere-src-5.12.0.tar.xz"; + sha256 = "1kpvqd0p7dblgh26p3a99npqr0wmyg5yv0dcmf78ssrvsy58vrpb"; + name = "qtsvg-everywhere-src-5.12.0.tar.xz"; + }; + }; + qttools = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttools-everywhere-src-5.12.0.tar.xz"; + sha256 = "1hyschrj568h65m3kl35xqz25hpk61vr98r08375vkavdr5y6k2p"; + name = "qttools-everywhere-src-5.12.0.tar.xz"; + }; + }; + qttranslations = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qttranslations-everywhere-src-5.12.0.tar.xz"; + sha256 = "023m68vdjj75xnbpc1jflyg85amnjc9i6nwv650k0w4n1dp1hksv"; + name = "qttranslations-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; + sha256 = "1nnns0i577zda6qxxd7pxcy06dq0y7lnni8ghn4adh9yl6dvi4yv"; + name = "qtvirtualkeyboard-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtwayland = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwayland-everywhere-src-5.12.0.tar.xz"; + sha256 = "1mvyv4wkcxj4h3q0mqw53zb1d0pahf8mz3r29kckadvk64djsp2m"; + name = "qtwayland-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebchannel-everywhere-src-5.12.0.tar.xz"; + sha256 = "1w2b31d7xjzdcgwkb4mz3qrl9ci7c9l4c3v4h8y59isip45g66l5"; + name = "qtwebchannel-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtwebengine = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebengine-everywhere-src-5.12.0.tar.xz"; + sha256 = "0z38ad25n7ckylxnmqrxy95ds4pn7i5k7qxh856zgq1h18wiwn5x"; + name = "qtwebengine-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtwebglplugin = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebglplugin-everywhere-src-5.12.0.tar.xz"; + sha256 = "0bk5dg33kn2l5lmgd6slsrs9xg15x9h9li91lr1q7qs67b8kl8k5"; + name = "qtwebglplugin-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebsockets-everywhere-src-5.12.0.tar.xz"; + sha256 = "0gzwfjnlgcijym5bn9gi93qlvzizrhf1q9dq06576419sg0s2ka4"; + name = "qtwebsockets-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtwebview = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwebview-everywhere-src-5.12.0.tar.xz"; + sha256 = "11b16b31bxcazqzg1ag9rzh4gj9pif2cf3jz2mj1sdprxp22ra5p"; + name = "qtwebview-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtwinextras = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtwinextras-everywhere-src-5.12.0.tar.xz"; + sha256 = "1l6s140vrfxb9ar4p1dq9w2gfk3zvgrpqdxbbzs4ngfpwk6mlky6"; + name = "qtwinextras-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtx11extras = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtx11extras-everywhere-src-5.12.0.tar.xz"; + sha256 = "114b4akzpcgx57c6gkl558bl0mbasi34r22fmq3ny84dhvlv9m06"; + name = "qtx11extras-everywhere-src-5.12.0.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.12.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.12/5.12.0/submodules/qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; + sha256 = "0xckcw1j6f5l92c269pb8cx77d21sghp7m7dc05jl1dqmyy7jqpk"; + name = "qtxmlpatterns-everywhere-src-5.12.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 8732b1061342f539e71b2211b30085f85614611b..bf0ae42ea1f2c43a106442cd945c472c7309ff32 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -26,7 +26,7 @@ existing packages here and modify it as necessary. { newScope, - stdenv, fetchurl, makeSetupHook, + stdenv, fetchurl, fetchpatch, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, @@ -46,14 +46,62 @@ let srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; patches = { - qtbase = [ ./qtbase.patch ]; + qtbase = [ + ./qtbase.patch + ./qtbase-fixguicmake.patch + (fetchpatch { + name = "CVE-2018-15518.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=28a6e642af2ccb454dd019f551c2908753f76f08"; + sha256 = "0nyssg7d0br7qgzp481f1w8b4p1bj2ggv9iyfrm1mng5v9fypdd7"; + }) + (fetchpatch { + name = "CVE-2018-19873.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=c9b9f663d7243988bcb5fee9180ea9cb3a321a86"; + sha256 = "1q01cafy92c1j8cgrv4sk133mi3d48x8kbg3glbnnbijpc4k6di5"; + }) + (fetchpatch { + name = "CVE-2018-19870.patch"; + url = "http://code.qt.io/cgit/qt/qtbase.git/patch/?id=ac0a910756f91726e03c0e6a89d213bdb4f48fec"; + sha256 = "00qb9yqwvwnp202am3lqirkjxln1cj8v4wvmlyqya6hna176lj2l"; + }) + ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = [ ./qtwebengine-seccomp.patch ] - ++ optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + qtwebengine = [ ./qtwebengine-seccomp.patch ]; qtwebkit = [ ./qtwebkit.patch ]; + qtvirtualkeyboard = [ + (fetchpatch { + name = "CVE-2018-19865-A.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c02115db1de1f3aba81e109043766d600f886522"; + sha256 = "0ncnyl8f3ypi1kcb9z2i8j33snix111h28njrx8rb49ny01ap8x2"; + }) + (fetchpatch { + name = "CVE-2018-19865-B.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=01fc537adc74d5e102c8cc93384cdf5cb08b4442"; + sha256 = "19z8kxqf2lpjqr8189ingrpadch4niviw3p5v93zgx24v7950q27"; + }) + (fetchpatch { + name = "CVE-2018-19865-C.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=993a21ba03534b172d5354405cc9d50a2a822e24"; + sha256 = "1bipqxr9bvy8z402pv9kj2w1yzcsj1v03l09pg5jyg1xh6jbgiky"; + }) + ]; + qtimageformats = [ + (fetchpatch { + name = "CVE-2018-19871.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtimageformats.git;a=patch;h=9299ab07df61c56b70e047f1fe5f06b6ff541aa3"; + sha256 = "0fd3mxdlc0s405j02bc0g72fvdfvpi31a837xfwf40m5j4jbyndr"; + }) + ]; + qtsvg = [ + (fetchpatch { + name = "CVE-2018-19869.patch"; + url = "http://code.qt.io/cgit/qt/qtsvg.git/patch/?id=c5f1dd14098d1cc2cb52448fb44f53966d331443"; + sha256 = "1kgyfsxw2f0qv5fx9y7wysjsvqikam0qc7wzhklf0406zz6rhxbl"; + }) + ]; }; mkDerivation = @@ -111,6 +159,7 @@ let /* qtwinextras = not packaged */ qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" [ 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 0000000000000000000000000000000000000000..8b46d432812a8b457deda428f33f44195ca8aae1 --- /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.6/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.6/qtwebengine-paxmark-mksnapshot.patch deleted file mode 100644 index b3316188f7d9f804ff21c6ae87ae42cf94e87487..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine-paxmark-mksnapshot.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-03-04 01:48:36.000000000 +1100 -+++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-05-01 19:15:44.052770543 +1000 -@@ -33,6 +33,7 @@ - 'embed_script%': "", - 'v8_extra_library_files%': [], - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'remove_v8base_debug_symbols%': 0, - }, - 'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'], -@@ -1913,7 +1914,7 @@ - ] - }, - { -- 'target_name': 'mksnapshot', -+ 'target_name': 'mksnapshot_u', - 'type': 'executable', - 'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'], - 'include_dirs+': [ -@@ -1936,5 +1937,26 @@ - }], - ], - }, -+ { -+ 'target_name': 'mksnapshot', -+ 'type': 'executable', -+ 'dependencies': ['mksnapshot_u'], -+ 'actions': [ -+ { -+ 'action_name': 'paxmark_m_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'action': [ -+ 'sh', -+ '-c', -+ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)', -+ ], -+ }, -+ ], -+ }, - ], - } diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 755e6a9487e76acffc2b7bd9d3f4c4968f119c5b..68c6745bcb52da9e896ebf115fbaa66b542159bf 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -17,9 +17,10 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, - stdenv, fetchurl, makeSetupHook, + stdenv, fetchurl, fetchpatch, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, + cf-private, # options developerBuild ? false, @@ -37,13 +38,31 @@ 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 ]; qttools = [ ./qttools.patch ]; - qtwebengine = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; qtwebkit = [ ./qtwebkit.patch ]; + qtvirtualkeyboard = [ + (fetchpatch { + name = "CVE-2018-19865-A.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=61780a113f02b3c62fb14516fe8ea47d91f9ed9a"; + sha256 = "0jd4nzaz9ndm9ryvrkav7kjs437l661288diklhbmgh249f8gki0"; + }) + (fetchpatch { + name = "CVE-2018-19865-B.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c0ac7a4c684e2fed60a72ceee53da89eea3f95a7"; + sha256 = "0yvxrx5vx6845vgnq8ml3q93y61py5j0bvhqj7nqvpbmyj1wy1p3"; + + }) + (fetchpatch { + name = "CVE-2018-19865-C.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=a2e7b8412f56841e12ed20a39f4a38e32d3c1e30"; + sha256 = "1yijysa9gy5xbxndx5ri0dkfrjqja0d1bsx52qz4mhzi4pkbib02"; + }) + ]; + }; mkDerivation = @@ -78,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; }; diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index 103fa4e09abc7d4d3d4134cbade1122d3371f43b..e631d3ae9b00fdc7aadfcbe31edd9667162b5533 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/ \ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch index 1c3a9b05cb2457a543ab2173b81b4b162e5d5dad..875fba12e2fb7ad2fa404f1d90094650414cbf2d 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch @@ -1,16 +1,3 @@ -diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm -index 66baf16..89794ef 100644 ---- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm -+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm -@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl - - QFixed QCoreTextFontEngine::emSquareSize() const - { -- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); -+ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); - } - - QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 341d3bc..3368234 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm 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 0000000000000000000000000000000000000000..8b46d432812a8b457deda428f33f44195ca8aae1 --- /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/5.9/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-paxmark-mksnapshot.patch deleted file mode 100644 index 5e170567ce5dbce3205827e3898bbbd342674dd4..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/qt-5/5.9/qtwebengine-paxmark-mksnapshot.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/v8/src/v8.gyp -=================================================================== ---- qtwebengine-opensource-src-5.9.0.orig/src/3rdparty/chromium/v8/src/v8.gyp -+++ qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/v8/src/v8.gyp -@@ -36,6 +36,7 @@ - 'v8_experimental_extra_library_files%': [], - 'v8_enable_inspector%': 0, - 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', -+ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', - 'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)', - 'v8_os_page_size%': 0, - }, -@@ -2432,7 +2433,7 @@ - ] - }, - { -- 'target_name': 'mksnapshot', -+ 'target_name': 'mksnapshot_u', - 'type': 'executable', - 'dependencies': [ - 'v8_base', -@@ -2485,5 +2486,26 @@ - }], - ], - }, -+ { -+ 'target_name': 'mksnapshot', -+ 'type': 'executable', -+ 'dependencies': ['mksnapshot_u'], -+ 'actions': [ -+ { -+ 'action_name': 'paxmark_m_mksnapshot', -+ 'inputs': [ -+ '<(mksnapshot_u_exec)', -+ ], -+ 'outputs': [ -+ '<(mksnapshot_exec)', -+ ], -+ 'action': [ -+ 'sh', -+ '-c', -+ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)', -+ ], -+ }, -+ ], -+ }, - ], - } diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index df7846ca3866476c03cabe96f501472b8764ef50..09b6293daebc1882e96f1070e997b7307f4bdb65 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,275 +3,275 @@ { qt3d = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz"; - sha256 = "0gr7wvd3p8i2frj9nkfxffxapwqx6i4wh171ymvcsg2qy0r534lp"; - name = "qt3d-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qt3d-opensource-src-5.9.7.tar.xz"; + sha256 = "0skdp72jlfy97cw9lpa3l2ivs6f5x9w53978sf2xbkl9k1ai268l"; + name = "qt3d-opensource-src-5.9.7.tar.xz"; }; }; qtactiveqt = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtactiveqt-opensource-src-5.9.3.tar.xz"; - sha256 = "16aka3y7a6mhs0yfm7vbq8v5gbh2ifmk4v2hl04iacindq9f5v2r"; - name = "qtactiveqt-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtactiveqt-opensource-src-5.9.7.tar.xz"; + sha256 = "01yp0railyc80ldvpiy36lpsdk26rs8vfp78xca9jy1glm4cmaik"; + name = "qtactiveqt-opensource-src-5.9.7.tar.xz"; }; }; qtandroidextras = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtandroidextras-opensource-src-5.9.3.tar.xz"; - sha256 = "0f653qmzvr3rjjgipjbcxvp5wq9fbaz1b4bvj7g868s2d9gpqp9n"; - name = "qtandroidextras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtandroidextras-opensource-src-5.9.7.tar.xz"; + sha256 = "1bl05hr0zm23z7qig3kxhzyvm440wfrjfgsxvpmlvk9pbb8h2q63"; + name = "qtandroidextras-opensource-src-5.9.7.tar.xz"; }; }; qtbase = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz"; - sha256 = "10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y"; - name = "qtbase-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtbase-opensource-src-5.9.7.tar.xz"; + sha256 = "004gs95ig51jv2wz64kwzl4rvqqzs4rln3kqmzjs3sh6y1s9bp9n"; + name = "qtbase-opensource-src-5.9.7.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcanvas3d-opensource-src-5.9.3.tar.xz"; - sha256 = "1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y"; - name = "qtcanvas3d-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcanvas3d-opensource-src-5.9.7.tar.xz"; + sha256 = "131zwqddjns7cpkdbr33jahqgvnw6f8gdcr1b2hmadi0p2shrcwq"; + name = "qtcanvas3d-opensource-src-5.9.7.tar.xz"; }; }; qtcharts = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz"; - sha256 = "1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc"; - name = "qtcharts-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtcharts-opensource-src-5.9.7.tar.xz"; + sha256 = "1rkj4lkpgdqk4ygxivkj7gc8mlccb5sgi9mfr0xwvq5j85r3dk8n"; + name = "qtcharts-opensource-src-5.9.7.tar.xz"; }; }; qtconnectivity = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz"; - sha256 = "0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2"; - name = "qtconnectivity-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtconnectivity-opensource-src-5.9.7.tar.xz"; + sha256 = "0f7g2lfnfgsjka7y5hdf0lbzpfxlxh8bfhdxix44cwlmwzjizy3l"; + name = "qtconnectivity-opensource-src-5.9.7.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz"; - sha256 = "0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh"; - name = "qtdatavis3d-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdatavis3d-opensource-src-5.9.7.tar.xz"; + sha256 = "08anm8byxcym7h1n49j3cbxkh3kh3xjlxd3b8vi8fxyqqhvll4lv"; + name = "qtdatavis3d-opensource-src-5.9.7.tar.xz"; }; }; qtdeclarative = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz"; - sha256 = "01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh"; - name = "qtdeclarative-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdeclarative-opensource-src-5.9.7.tar.xz"; + sha256 = "0p26c96fb33khbf7ws91ha73n72lwmn714v8spg0bla9m1jkfhk8"; + name = "qtdeclarative-opensource-src-5.9.7.tar.xz"; }; }; qtdoc = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtdoc-opensource-src-5.9.3.tar.xz"; - sha256 = "0aki592arm3r08y9cq8863jp9zzkvgx7sc48426n30m6q9valsg5"; - name = "qtdoc-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtdoc-opensource-src-5.9.7.tar.xz"; + sha256 = "1vs6dy0mdcn65fhpl8nib0pjw9bliqkjnaahqm833ayvxr15vzyj"; + name = "qtdoc-opensource-src-5.9.7.tar.xz"; }; }; qtgamepad = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgamepad-opensource-src-5.9.3.tar.xz"; - sha256 = "14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6"; - name = "qtgamepad-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgamepad-opensource-src-5.9.7.tar.xz"; + sha256 = "0242683h9jz6b0n11s4m4ii2691dbws0gkj45n6sx6z513blfx9f"; + name = "qtgamepad-opensource-src-5.9.7.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; - sha256 = "1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr"; - name = "qtgraphicaleffects-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtgraphicaleffects-opensource-src-5.9.7.tar.xz"; + sha256 = "1yhxa3i3jvfnc9l6a3q3pyk7y702a3pp87ypshb63607xvrxrv2d"; + name = "qtgraphicaleffects-opensource-src-5.9.7.tar.xz"; }; }; qtimageformats = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz"; - sha256 = "1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl"; - name = "qtimageformats-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtimageformats-opensource-src-5.9.7.tar.xz"; + sha256 = "1an0k3rzxjc4x4rscnibdk36zff6g1n41lh5dasys4jc05k3w1b2"; + name = "qtimageformats-opensource-src-5.9.7.tar.xz"; }; }; qtlocation = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz"; - sha256 = "1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0"; - name = "qtlocation-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtlocation-opensource-src-5.9.7.tar.xz"; + sha256 = "0lp6zn630px1lj7623shq47dlv02nr0aj7iqscrk0yzhygbv7dc2"; + name = "qtlocation-opensource-src-5.9.7.tar.xz"; }; }; qtmacextras = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmacextras-opensource-src-5.9.3.tar.xz"; - sha256 = "0piv3q49vhpjxafdicizcw13am49h0ybfhb37vai0x1wbrlvhdiy"; - name = "qtmacextras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmacextras-opensource-src-5.9.7.tar.xz"; + sha256 = "0b0znccbach41la226cmps9aaigpz8mj940xj890arjf8hn4jd97"; + name = "qtmacextras-opensource-src-5.9.7.tar.xz"; }; }; qtmultimedia = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz"; - sha256 = "19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7"; - name = "qtmultimedia-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtmultimedia-opensource-src-5.9.7.tar.xz"; + sha256 = "060gic3gl27r7k4vw4n550384b4wadqfn3biajbq6lbyj3zhgxxx"; + name = "qtmultimedia-opensource-src-5.9.7.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz"; - sha256 = "0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz"; - name = "qtnetworkauth-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtnetworkauth-opensource-src-5.9.7.tar.xz"; + sha256 = "14n8wzsyq7bw67r1k442widfvszawgi5sh0b10h2jcrp5aikqr0p"; + name = "qtnetworkauth-opensource-src-5.9.7.tar.xz"; }; }; qtpurchasing = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtpurchasing-opensource-src-5.9.3.tar.xz"; - sha256 = "00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j"; - name = "qtpurchasing-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtpurchasing-opensource-src-5.9.7.tar.xz"; + sha256 = "1qvxsi0ar04qy0zajbhvwj5blldhfq2mn3laq15g0xxy1xh4m46i"; + name = "qtpurchasing-opensource-src-5.9.7.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz"; - sha256 = "09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih"; - name = "qtquickcontrols-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols-opensource-src-5.9.7.tar.xz"; + sha256 = "1jkz2b2wzxzmskvwwb4afqxz0yp0siaf3yhj2i01y865sp6q1wz0"; + name = "qtquickcontrols-opensource-src-5.9.7.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz"; - sha256 = "0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1"; - name = "qtquickcontrols2-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtquickcontrols2-opensource-src-5.9.7.tar.xz"; + sha256 = "0w9rq77a8vc9avhbwbx7swg7zw7jn21wd7si59822rw9ln1p6zb0"; + name = "qtquickcontrols2-opensource-src-5.9.7.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtremoteobjects-opensource-src-5.9.3.tar.xz"; - sha256 = "0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk"; - name = "qtremoteobjects-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtremoteobjects-opensource-src-5.9.7.tar.xz"; + sha256 = "1ninscf4jkframv585zzi76fml1lyz0mhb091r2r54lrf66wl3lw"; + name = "qtremoteobjects-opensource-src-5.9.7.tar.xz"; }; }; qtscript = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz"; - sha256 = "0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq"; - name = "qtscript-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscript-opensource-src-5.9.7.tar.xz"; + sha256 = "0mv33a1mjaahq7ixfasvjasc881bprfbkjhx8pn3z5f0l8213m67"; + name = "qtscript-opensource-src-5.9.7.tar.xz"; }; }; qtscxml = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz"; - sha256 = "06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq"; - name = "qtscxml-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtscxml-opensource-src-5.9.7.tar.xz"; + sha256 = "0xz2q2bl1n43gxx00nrzyc0bsnq4wch0k2rkj3prc9gsgmpq0bih"; + name = "qtscxml-opensource-src-5.9.7.tar.xz"; }; }; qtsensors = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz"; - sha256 = "1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr"; - name = "qtsensors-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsensors-opensource-src-5.9.7.tar.xz"; + sha256 = "0pfh4lr9zxsh9winzx1lmcgl2hgp9lr45smcvslr4an93z6mbf8r"; + name = "qtsensors-opensource-src-5.9.7.tar.xz"; }; }; qtserialbus = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz"; - sha256 = "0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg"; - name = "qtserialbus-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialbus-opensource-src-5.9.7.tar.xz"; + sha256 = "0n6z56axm0gbrxmnwbz8fv40ar9mw1rlfvmpqvpg5xb9031qil1b"; + name = "qtserialbus-opensource-src-5.9.7.tar.xz"; }; }; qtserialport = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz"; - sha256 = "1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac"; - name = "qtserialport-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtserialport-opensource-src-5.9.7.tar.xz"; + sha256 = "05qy4m1p5j5bh6af7d97iblsmgy9kppm5wif3bl63p6yghn319sh"; + name = "qtserialport-opensource-src-5.9.7.tar.xz"; }; }; qtspeech = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz"; - sha256 = "1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1"; - name = "qtspeech-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtspeech-opensource-src-5.9.7.tar.xz"; + sha256 = "0nnbqnh18vw26vphancs38vjr816xha8m6wl389kjqi01kjrcz70"; + name = "qtspeech-opensource-src-5.9.7.tar.xz"; }; }; qtsvg = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz"; - sha256 = "1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz"; - name = "qtsvg-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtsvg-opensource-src-5.9.7.tar.xz"; + sha256 = "0r2mqy6lb2ypmilf83zyp73v5d9ars314jfm6f0fv5if8yw253v2"; + name = "qtsvg-opensource-src-5.9.7.tar.xz"; }; }; qttools = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz"; - sha256 = "1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24"; - name = "qttools-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttools-opensource-src-5.9.7.tar.xz"; + sha256 = "18b7jg25434p80yr929nfihk0i124bxpd2dv9mqdcicnv5q0ybnn"; + name = "qttools-opensource-src-5.9.7.tar.xz"; }; }; qttranslations = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz"; - sha256 = "1ncvj1qlcgrm0zqdlq2bkb0hc8dyisz8m7bszxyx4kyxg7n5gb20"; - name = "qttranslations-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qttranslations-opensource-src-5.9.7.tar.xz"; + sha256 = "051a3igp1qnd7d7bg2dvjaqwh6f67fvkn19jdfjzrdis7kcsfvdk"; + name = "qttranslations-opensource-src-5.9.7.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; - sha256 = "1zrj4pjy98dskzycjswbkm4m2j6k1j4150h0w7vdrw1681s3ycdr"; - name = "qtvirtualkeyboard-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtvirtualkeyboard-opensource-src-5.9.7.tar.xz"; + sha256 = "1qcj6ncg53rv4pg4ijdq7vbkzgzfr9bn40aif7g4dndykj0zwla7"; + name = "qtvirtualkeyboard-opensource-src-5.9.7.tar.xz"; }; }; qtwayland = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz"; - sha256 = "0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih"; - name = "qtwayland-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwayland-opensource-src-5.9.7.tar.xz"; + sha256 = "0y6ky1ipg42gq390ibgr4nns9i4j648yb7bkmx6b7lhsi7mvnp2n"; + name = "qtwayland-opensource-src-5.9.7.tar.xz"; }; }; qtwebchannel = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz"; - sha256 = "0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3"; - name = "qtwebchannel-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebchannel-opensource-src-5.9.7.tar.xz"; + sha256 = "189qkfxixddfblwkaf46yrqjp91vhmw90gpafjryqfmd2141r8qj"; + name = "qtwebchannel-opensource-src-5.9.7.tar.xz"; }; }; qtwebengine = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz"; - sha256 = "0dqxawc9vfffz6ygdn5mdpl79rrqfx18jy2d1w81q9w7zm113bj5"; - name = "qtwebengine-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebengine-opensource-src-5.9.7.tar.xz"; + sha256 = "0kzpgks5h19rm7gbhr688lr5f5d9ykf062kj91q7wf6fk7qd72v2"; + name = "qtwebengine-opensource-src-5.9.7.tar.xz"; }; }; qtwebkit = { @@ -291,43 +291,43 @@ }; }; qtwebsockets = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz"; - sha256 = "1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf"; - name = "qtwebsockets-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebsockets-opensource-src-5.9.7.tar.xz"; + sha256 = "1qqvd6qf7m2xq71mdaidwabj5c03cbbi1hwc7p95fvbnz9crz79x"; + name = "qtwebsockets-opensource-src-5.9.7.tar.xz"; }; }; qtwebview = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz"; - sha256 = "1i99fy86gydpfsfc4my5d9vxjywfrzbqxk66cb3yf2ac57j66mpf"; - name = "qtwebview-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwebview-opensource-src-5.9.7.tar.xz"; + sha256 = "1zwqkmzik4f83hdffmw0hz90mzga34hkyz7d0skfbdp25y278r12"; + name = "qtwebview-opensource-src-5.9.7.tar.xz"; }; }; qtwinextras = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtwinextras-opensource-src-5.9.3.tar.xz"; - sha256 = "1lj4qa51ymhpvk0bdp6xf6b3n1k39kihns5lvp6xq1w2mljn6phl"; - name = "qtwinextras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtwinextras-opensource-src-5.9.7.tar.xz"; + sha256 = "1a57v7krglfdi4gizm402jn9pg7fqpcma7xk6sm68zg1siv11a6x"; + name = "qtwinextras-opensource-src-5.9.7.tar.xz"; }; }; qtx11extras = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz"; - sha256 = "1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74"; - name = "qtx11extras-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtx11extras-opensource-src-5.9.7.tar.xz"; + sha256 = "02jdiw94dasnkszi5w1pysfgz8xrr71pzah37nbnqg0knn4dzich"; + name = "qtx11extras-opensource-src-5.9.7.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.3"; + version = "5.9.7"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz"; - sha256 = "1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g"; - name = "qtxmlpatterns-opensource-src-5.9.3.tar.xz"; + url = "${mirror}/official_releases/qt/5.9/5.9.7/submodules/qtxmlpatterns-opensource-src-5.9.7.tar.xz"; + sha256 = "0j0rxkpyww5cgcjhy0332jsyka1d811wf6zmr16d5fdkbryp7d65"; + name = "qtxmlpatterns-opensource-src-5.9.7.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/README.md b/pkgs/development/libraries/qt-5/README.md index c13b172e82ab8f408adddd069340092fe06c1da5..b2ef74d0aef154210165ed917e788c620efe7d65 100644 --- a/pkgs/development/libraries/qt-5/README.md +++ b/pkgs/development/libraries/qt-5/README.md @@ -5,7 +5,7 @@ Let `$major` be the major version number, e.g. `5.9`. 1. Change the version number in the `$major/fetch.sh`. -2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/qt-5/$major` +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$major` from the top of the Nixpkgs tree. See below if it is necessary to update any patches. @@ -16,7 +16,7 @@ Let `$major` be the new major version number, e.g. `5.10`. 1. Copy the subdirectory from the previous major version to `$major`. 2. Change the version number in `$major/fetch.sh`. -3. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/qt-5/$major` +3. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$major` from the top of the Nixpkgs tree. 4. Add a top-level attribute in `pkgs/top-level/all-packages.nix` for the new major version. diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 0d9cb81afda93fc560e4311b6b3cf3025b225d51..f5f5c69455f5d8114b8c3bc12074c152699e40da 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/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index f9b8cdc8cf02256e0bf6cc3b4d89eb8bcb413cf0..7c1fa449ebbac0022249fa4f17b3cf6d2903577f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,10 +1,10 @@ -{ qtModule, lib, python2, qtbase, qtsvg, qtxmlpatterns }: +{ qtModule, lib, python2, qtbase, qtsvg }: with lib; qtModule { name = "qtdeclarative"; - qtInputs = [ qtbase qtsvg qtxmlpatterns ]; + qtInputs = [ qtbase qtsvg ]; nativeBuildInputs = [ python2 ]; outputs = [ "out" "dev" "bin" ]; preConfigure = '' diff --git a/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/modules/qtgraphicaleffects.nix index 888f627baab82c54a544904838eb3444876c9af2..d0be6ae776940f701c82ef6ae6dfb521d427bfed 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 5a3b1fe35cd8c8c5c564679331d560038e5b86de..3f254885986eb61699e375c7973b393217171e4d 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 ad54a49e50b7f12be4e28ae4c41368897efdf48a..ddb82832337107c105e8331fb0ceee607bdece43 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -12,9 +12,10 @@ , pciutils , systemd , enableProprietaryCodecs ? true -, gn, darwin, openbsm +, gn +, cups, darwin, openbsm, runCommand, xcbuild , ffmpeg ? null -, lib, stdenv # lib.optional, needsPax +, lib, stdenv }: with stdenv.lib; @@ -26,7 +27,7 @@ qtModule { qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ]; nativeBuildInputs = [ bison coreutils flex git gperf ninja pkgconfig python2 which gn - ]; + ] ++ optional stdenv.isDarwin xcbuild; doCheck = true; outputs = [ "bin" "dev" "out" ]; @@ -42,9 +43,8 @@ qtModule { ( cd src/3rdparty/chromium; patchShebangs . ) '' # Patch Chromium build files - + '' - substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ - --replace /bin/echo ${coreutils}/bin/echo + + optionalString (lib.versionOlder qtCompatVersion "5.12") '' + substituteInPlace ./src/3rdparty/chromium/build/common.gypi --replace /bin/echo ${coreutils}/bin/echo substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/toolchain.gypi \ --replace /bin/echo ${coreutils}/bin/echo substituteInPlace ./src/3rdparty/chromium/v8/${if qt56 then "build" else "gypfiles"}/standalone.gypi \ @@ -66,33 +66,46 @@ qtModule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' - + optionalString stdenv.isDarwin '' + + optionalString stdenv.isDarwin ('' # Remove annoying xcode check substituteInPlace mkspecs/features/platform.prf \ - --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false + --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false \ + --replace "/usr/bin/xcodebuild" "xcodebuild" + + substituteInPlace src/3rdparty/chromium/build/mac_toolchain.py \ + --replace "/usr/bin/xcode-select" "xcode-select" + substituteInPlace src/core/config/mac_osx.pri \ --replace /usr ${stdenv.cc} \ --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false - # FIXME Needed with old Apple SDKs - # Abandon all hope ye who try to make sense of this. + '' + # TODO remove when new Apple SDK is in + + (if lib.versionOlder qtCompatVersion "5.11" then '' substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \ --replace "NSArray*" "NSArray*" substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \ --replace "NSDictionary*" "NSDictionary*" \ --replace "NSArray*" "NSArray*" \ --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption" + '' else '' + substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm \ + --replace "NSDictionary *" "NSDictionary*" + substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h \ + --replace "NSDictionary *" "NSDictionary*" + '') + + '' cat < src/3rdparty/chromium/build/mac/find_sdk.py #!/usr/bin/env python +print("${darwin.apple_sdk.sdk}") print("10.10.0") -print("") EOF cat < src/3rdparty/chromium/build/config/mac/sdk_info.py #!/usr/bin/env python -print('xcode_version="9.1"') -print('xcode_version_int=9') +print('xcode_version="0910"') +print('xcode_version_int=910') print('xcode_build="9B55"') print('machine_os_build="17E199"') print('sdk_path=""') @@ -101,12 +114,32 @@ print('sdk_platform_path=""') print('sdk_build="17B41"') EOF + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ + --replace '$sysroot/usr' "${darwin.xnu}" + # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - ''; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; + substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \ + --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' + ''); + + NIX_CFLAGS_COMPILE = + lib.optionalString stdenv.isDarwin [ + "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10" + "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10" + + # + # Prevent errors like + # /nix/store/xxx-apple-framework-CoreData/Library/Frameworks/CoreData.framework/Headers/NSEntityDescription.h:51:7: + # error: pointer to non-const type 'id' with no explicit ownership + # id** _kvcPropertyAccessors; + # + # TODO remove when new Apple SDK is in + # + "-fno-objc-arc" + ]; preConfigure = '' export NINJAFLAGS=-j$NIX_BUILD_CORES @@ -161,7 +194,10 @@ EOF # frameworks ApplicationServices + AVFoundation Foundation + ForceFeedback + GameController AppKit ImageCaptureCore CoreBluetooth @@ -174,15 +210,34 @@ EOF libunwind ]); + buildInputs = optionals stdenv.isDarwin (with darwin; [ + cups + + # For sandbox.h include + (runCommand "MacOS_SDK_sandbox.h" {} '' + install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h + '') + + # For: + # _NSDefaultRunLoopMode + # _OBJC_CLASS_$_NSDate + # _OBJC_CLASS_$_NSDictionary + # _OBJC_CLASS_$_NSRunLoop + # _OBJC_CLASS_$_NSURL + darwin.cf-private + ]); + + __impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib"; + dontUseNinjaBuild = true; dontUseNinjaInstall = true; + dontUseXcbuild = true; postInstall = lib.optionalString stdenv.isLinux '' cat > $out/libexec/qt.conf <> 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; - broken = stdenv.isDarwin; # test when updating to >=3.10.3 - 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 ddacc742d142cf505a19b9064a3dab3c7064b37e..0000000000000000000000000000000000000000 --- 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 be571b94300c700b2386f82712d59579a06e355e..0000000000000000000000000000000000000000 --- 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 c1994533b78d8ec8d164384c6149e05d748f3546..d568e945202139e9f28e6a3b59a9da36fc648b95 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 0000000000000000000000000000000000000000..537fcb93a87e9a55230ad7af4563326da7157b3e --- /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 c89e9e4296cfdac4db573f4a7eec38f3323cee15..b41469c215e27f10504a72b9c950c4dfbfcbb8b1 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 4a6aabb447f3f1ba144728fa99cc21f7fe0f4fb9..7e58a4c7c982ee24b7598951fc8526f18deeb9e8 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 e6af2251b1f1880c6d54ff3ad1712169b0fa4b92..c26e9c575ab25de6b988b340e458d98c8de3f1d9 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 0000000000000000000000000000000000000000..3cf5c3619a9e578de55c364b948831c7c69b632e --- /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 0000000000000000000000000000000000000000..0801238fb12160bfeee859836324d27aae68b84b --- /dev/null +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -0,0 +1,79 @@ +{ stdenvNoCC, writeText, fetchurl, rpmextract, undmg }: +/* + For details on using mkl as a blas provider for python packages such as numpy, + numexpr, scipy, etc., see the Python section of the NixPkgs manual. +*/ +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 + rpmextract rpm/intel-openmp-19.0.0-${rel}-19.0.0-${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}/licensing/mkl/en/license.txt $out/lib/ + cp -r compilers_and_libraries_${version}/mac/compiler/lib/* $out/lib/ + cp -r compilers_and_libraries_${version}/mac/mkl/lib/* $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/compiler/lib/intel64_lin/* $out/lib/ + 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 "00d49ls9vcjan1ngq2wx2q4p6lnm05zwh67hsmj7bnq43ykrfibw" + else "1amagcaan0hk3x9v7gg03gkw02n066v4kmjb32yyzsy5rfrivb1a"; + + 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; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index d3c20258425b96e8b66a2a7fb54f0dd29ca4d9d0..badd08291de49073e967c8fddc013f10c07d1e27 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -1,24 +1,44 @@ -{ callPackage, cudatoolkit_8, cudatoolkit_9 }: +{ stdenv, fetchFromGitHub, which, cudatoolkit }: -let - generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { - inherit (args) cudatoolkit; +stdenv.mkDerivation rec { + name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; + version = "2.4.2-1"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nccl"; + rev = "v${version}"; + sha256 = "0aa4gv51nbmmdhx6vp40l249m4arp30sijrn6kwxdfi1k9kajiq5"; }; -in + outputs = [ "out" "dev" ]; -{ - nccl_cudatoolkit_8 = generic rec { - version = "2.1.4"; - cudatoolkit = cudatoolkit_8; - srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; - sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi"; - }; + nativeBuildInputs = [ which ]; + + buildInputs = [ cudatoolkit ]; + + preConfigure = '' + patchShebangs src/collectives/device/gen_rules.sh + ''; + + makeFlags = [ + "CUDA_HOME=${cudatoolkit}" + "PREFIX=$(out)" + ]; + + postFixup = '' + moveToOutput lib/libnccl_static.a $dev + ''; + + NIX_CFLAGS_COMPILE = [ "-Wno-unused-function" ]; + + enableParallelBuilding = true; - nccl_cudatoolkit_9 = generic rec { - version = "2.1.4"; - cudatoolkit = cudatoolkit_9; - srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz"; - sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p"; + meta = with stdenv.lib; { + description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; + homepage = https://developer.nvidia.com/nccl; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ mdaiter orivej ]; }; } diff --git a/pkgs/development/libraries/science/math/nccl/generic.nix b/pkgs/development/libraries/science/math/nccl/generic.nix deleted file mode 100644 index 609a7df51e58a028c2611a1b40bc8bf404660a1a..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/science/math/nccl/generic.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ version -, srcName -, sha256 -}: - -{ stdenv -, lib -, requireFile -, cudatoolkit -}: - -stdenv.mkDerivation rec { - name = "cudatoolkit-${cudatoolkit.majorVersion}-nccl-${version}"; - - inherit version; - - src = requireFile rec { - name = srcName; - inherit sha256; - message = '' - This nix expression requires that ${name} is already part of the store. - Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the NCCL library - at https://developer.nvidia.com/nccl, and run the following command in the download directory: - nix-prefetch-url file://\$PWD/${name} - ''; - }; - - unpackCmd = "tar xJf $src"; - - installPhase = '' - function fixRunPath { - p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${lib.makeLibraryPath [ stdenv.cc.cc ]}" $1 - } - fixRunPath lib/libnccl.so - - mkdir -p $out - cp -a include $out/include - cp -a lib $out/lib - ''; - - propagatedBuildInputs = [ - cudatoolkit - ]; - - passthru = { - inherit cudatoolkit; - }; - - meta = with stdenv.lib; { - description = "Multi-GPU and multi-node collective communication primitives that are performance optimized for NVIDIA GPUs"; - homepage = https://developer.nvidia.com/nccl; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter ]; - }; -} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 3f271d015027e42c9235a51fae38610328b2a3e6..f4a97b7cf854a6999642282a1febab92ccdfbb80 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,8 +1,12 @@ -{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config, coreutils +{ stdenv, fetchFromGitHub, fetchpatch, gfortran, perl, which, config # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). , blas64 ? null +, buildPackages +# Select a specific optimization target (other than the default) +# See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt +, target ? null }: with stdenv.lib; @@ -10,57 +14,51 @@ with stdenv.lib; let blas64_ = blas64; in let + setTarget = x: if target == null then x else target; + # To add support for a new platform, add an element to this set. configs = { armv6l-linux = { - BINARY = "32"; - TARGET = "ARMV6"; - DYNAMIC_ARCH = "0"; - CC = "gcc"; - USE_OPENMP = "1"; + BINARY = 32; + TARGET = setTarget "ARMV6"; + DYNAMIC_ARCH = false; + USE_OPENMP = true; }; armv7l-linux = { - BINARY = "32"; - TARGET = "ARMV7"; - DYNAMIC_ARCH = "0"; - CC = "gcc"; - USE_OPENMP = "1"; + BINARY = 32; + TARGET = setTarget "ARMV7"; + DYNAMIC_ARCH = false; + USE_OPENMP = true; }; aarch64-linux = { - BINARY = "64"; - TARGET = "ARMV8"; - DYNAMIC_ARCH = "1"; - CC = "gcc"; - USE_OPENMP = "1"; + BINARY = 64; + TARGET = setTarget "ARMV8"; + DYNAMIC_ARCH = true; + USE_OPENMP = true; }; i686-linux = { - BINARY = "32"; - TARGET = "P2"; - DYNAMIC_ARCH = "1"; - CC = "gcc"; - USE_OPENMP = "1"; + BINARY = 32; + TARGET = setTarget "P2"; + DYNAMIC_ARCH = true; + USE_OPENMP = true; }; x86_64-darwin = { - BINARY = "64"; - TARGET = "ATHLON"; - DYNAMIC_ARCH = "1"; - # Note that clang is available through the stdenv on OSX and - # thus is not an explicit dependency. - CC = "clang"; - USE_OPENMP = "0"; + BINARY = 64; + TARGET = setTarget "ATHLON"; + DYNAMIC_ARCH = true; + USE_OPENMP = false; MACOSX_DEPLOYMENT_TARGET = "10.7"; }; x86_64-linux = { - BINARY = "64"; - TARGET = "ATHLON"; - DYNAMIC_ARCH = "1"; - CC = "gcc"; - USE_OPENMP = if stdenv.hostPlatform.isMusl then "0" else "1"; + BINARY = 64; + TARGET = setTarget "ATHLON"; + DYNAMIC_ARCH = true; + USE_OPENMP = true; }; }; in @@ -76,15 +74,23 @@ let if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.hostPlatform.system; + # Convert flag values to format OpenBLAS's build expects. + # `toString` is almost what we need other than bools, + # which we need to map {true -> 1, false -> 0} + # (`toString` produces empty string `""` for false instead of `0`) + mkMakeFlagValue = val: + if !builtins.isBool val then toString val + else if val then "1" else "0"; + mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); in stdenv.mkDerivation rec { name = "openblas-${version}"; - version = "0.3.1"; + version = "0.3.5"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "1dkwp4gz1hzpmhzks9y9ipb4c5h0r6c7yff62x3s8x9z6f8knaqc"; + sha256 = "0hwfplr6ciqjvfqkya5vz92z2rx8bhdg5mkh923z246ylhs6d94k"; }; inherit blas64; @@ -104,34 +110,24 @@ stdenv.mkDerivation rec { "relro" "bindnow" ]; - nativeBuildInputs = - [gfortran perl which] - ++ optionals stdenv.isDarwin [coreutils]; - - makeFlags = - [ - "FC=gfortran" - ''PREFIX="''$(out)"'' - "NUM_THREADS=64" - "INTERFACE64=${if blas64 then "1" else "0"}" - "NO_STATIC=1" - ] ++ 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"; - }) - ]; + nativeBuildInputs = [ + perl + which + buildPackages.gfortran + buildPackages.stdenv.cc + ]; + + makeFlags = mkMakeFlagsFromConfig (config // { + FC = "${stdenv.cc.targetPrefix}gfortran"; + CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}"; + PREFIX = placeholder "out"; + NUM_THREADS = 64; + INTERFACE64 = blas64; + NO_STATIC = true; + CROSS = stdenv.hostPlatform != stdenv.buildPlatform; + HOSTCC = "cc"; + NO_BINARY_MODE = stdenv.hostPlatform != stdenv.buildPlatform; + }); doCheck = true; checkTarget = "tests"; @@ -140,7 +136,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 0000000000000000000000000000000000000000..415e57e5d3cfc832d8b509336461caf14cad0378 --- /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 0000000000000000000000000000000000000000..08f76180638b28819f955247b96b747a3ad0150e --- /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/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..65569b9f3bdb3f85ec1a0206640289bd9897e9fc --- /dev/null +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "primesieve-${version}"; + version = "7.3"; + + nativeBuildInputs = [cmake]; + + src = fetchurl { + url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz"; + sha256 = "0l7h5r4c7hijh0c0nsdxvjqzc9dbhlx535b87fglf2i2p9la1x5v"; + }; + + meta = with stdenv.lib; { + description = "Fast C/C++ prime number generator"; + homepage = "https://primesieve.org/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 83e177c66c182def778c2bbeb2d9b6c592c36986..3f37bf49de381ef4e5e0078b3628ec4ceaa99cab 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,11 +1,7 @@ -{ stdenv -, fetchurl -, gfortran -, cmake -, blas -, liblapack -, mpi -}: +{ stdenv, fetchurl, cmake, openssh +, gfortran, mpi, openblasCompat +} : + stdenv.mkDerivation rec { name = "scalapack-${version}"; @@ -16,13 +12,36 @@ stdenv.mkDerivation rec { sha256 = "0p1r61ss1fq0bs8ynnx7xq4wwsdvs32ljvwjnx6yxr8gd6pawx0c"; }; - buildInputs = [ cmake mpi liblapack blas gfortran ]; + 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.bsdOriginal; - platforms = platforms.all; + license = licenses.bsd3; + platforms = platforms.linux; maintainers = [ maintainers.costrouc ]; }; 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 0000000000000000000000000000000000000000..1ce56d1e49f7f1442211e1aa1f389de4658b5d83 --- /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 1ce56d1e49f7f1442211e1aa1f389de4658b5d83..a6c803be260a51daea1a30d74e79699598d6892b 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,31 +1,33 @@ -{ stdenv, fetchurl, gfortran, openblas +{ stdenv, fetchurl, gfortran, openblas, cmake, fixDarwinDylibNames +, gnum4 , enableCuda ? false, cudatoolkit }: let - version = "4.4.4"; + version = "5.4.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 = "1lfvjj787yqyhk25w7brlrkrl7dnnn5dq4ijxws3wrbcd4vd2k9p"; }; + 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 +49,84 @@ stdenv.mkDerivation { -e 's|^[[:space:]]*\(NVCCFLAGS =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|' ''; - makeFlags = [ - "PREFIX=\"$(out)\"" - "INSTALL_LIB=$(out)/lib" - "INSTALL_INCLUDE=$(out)/include" - "BLAS=-lopenblas" - "LAPACK=" - ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; - postInstall = '' - # Build and install shared library + buildPhase = '' + runHook preBuild + + # Build individual shared libraries + make library \ + BLAS=-lopenblas \ + LAPACK="" \ + ${stdenv.lib.optionalString openblas.blas64 "CFLAGS=-DBLAS64"} + + # Build libsuitesparse.so which bundles all the individual libraries. + # Bundling is done by building the static libraries, extracting objects from + # them and combining the objects into one shared library. + mkdir -p static + make static AR_TARGET=$(pwd)/static/'$(LIBRARY).a' ( - cd "$(mktemp -d)" - for i in "$out"/lib/lib*.a; do + cd static + for i in lib*.a; do ar -x $i done - ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"} ) - for i in umfpack cholmod amd camd colamd spqr; do - ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT} - done - - # Install documentation - outdoc=$out/share/doc/${name} - mkdir -p $outdoc - cp -r AMD/Doc $outdoc/amd - cp -r BTF/Doc $outdoc/bft - cp -r CAMD/Doc $outdoc/camd - cp -r CCOLAMD/Doc $outdoc/ccolamd - cp -r CHOLMOD/Doc $outdoc/cholmod - cp -r COLAMD/Doc $outdoc/colamd - cp -r CXSparse/Doc $outdoc/cxsparse - cp -r KLU/Doc $outdoc/klu - cp -r LDL/Doc $outdoc/ldl - cp -r RBio/Doc $outdoc/rbio - cp -r SPQR/Doc $outdoc/spqr - cp -r UMFPACK/Doc $outdoc/umfpack + ${if enableCuda then "${cudatoolkit}/bin/nvcc" else "${stdenv.cc.outPath}/bin/cc"} \ + static/*.o \ + ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} \ + -o "lib/libsuitesparse${SHLIB_EXT}" \ + -lopenblas \ + ${stdenv.lib.optionalString enableCuda "-lcublas"} + + runHook postBuild ''; - nativeBuildInputs = [ gfortran ]; - buildInputs = [ openblas ]; + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r lib $out/ + cp -r include $out/ + cp -r share $out/ + '' + + stdenv.lib.optionalString stdenv.isDarwin '' + # The fixDarwinDylibNames in nixpkgs can't seem to fix all the libraries. + # We manually fix them up here. + fixDarwinDylibNames() { + local flags=() + local old_id + + for fn in "$@"; do + flags+=(-change "$PWD/lib/$(basename "$fn")" "$fn") + done + + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + install_name_tool -id "$fn" "''${flags[@]}" "$fn" + done + } + + fixDarwinDylibNames $(find "$out" -name "*.dylib") + '' + + stdenv.lib.optionalString (!stdenv.isDarwin) '' + # Fix rpaths + cd $out + find -name \*.so\* -type f -exec \ + patchelf --set-rpath "$out/lib:${stdenv.lib.makeLibraryPath buildInputs}" {} \; + '' + + + '' + runHook postInstall + ''; + + nativeBuildInputs = [ + cmake + gnum4 + ] ++ 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/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index f421755b618222dd880fa956a1695b3cc2f5989b..080cab86ca4b0b5237cc03a85f2c340707553351 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }) (fetchpatch { name = "fix_pointer_initialization2.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sympow-datafiles.patch?h=packages/sympow&id=5088e641a45b23d0385d8e63be65315129b4cf58"; sha256 = "1m0vz048layb47r1jjf7fplw650ccc9x0w3l322iqmppzmv3022a"; }) ]; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 19d63d89834e63e2b74ca7b56d83f05f75838d20..ad4d4c017376de1b909b688974aa3e8648f4b02a 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 632380328db168dc2a049eab4e84546fd70f28f8..d5c3ca2457aad375947394713ecad38f12b458c5 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 b305fecc39334e6c1cac0e54175741853f5b74bb..c9c26ca0d66c3e22b76d4d3796171f0a479e2c9d 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 67e0ff31c8e577cd3cb2de1427dcca28cdb23cfb..533fefa9f19458b99c713125bd67cf62acd1eeeb 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 f794c3841b93278ac518a75c90e6aebe5fdd34fd..3fd47125bcb306533226b5566bc108bebc7adae2 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 03a801a324059012588db66fdb5b23ac57e6c705..ff59bdcdf92e205786badc9b36cf8e0bd8321d4d 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,26 +1,34 @@ -{ 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 +, cf-private, 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 - libXrandr libXrender xcbutilimage - ] ++ stdenv.lib.optional stdenv.isLinux udev - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ freetype libjpeg openal flac libvorbis glew ] + ++ stdenv.lib.optional stdenv.isLinux udev + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ] + ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL + # Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate + cf-private + ]; + 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 dc3f4a118f6dad27e19352c06b619d365bdd9bb8..f795dfef9e4c0b961e42bdc8f9b464ecd6b1348c 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 28b96d17aa602e1d8e4bd7c89e48b5a959fb580f..927715535b5f21aa6d2f6c4e1f61d913c7c0eefa 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi -, inputproto, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut +{ stdenv, fetchurl, plib, freeglut, xorgproto, libX11, libXext, libXi +, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr , curl }: 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 + buildInputs = [ plib freeglut xorgproto libX11 libXext libXi libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut openscenegraph openal expat cmake apr curl ]; @@ -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 c807325b155cce27da911021ebe3fd538f8b87ee..90dfe8ebfab8904cd8a1411f490b28ed7340c8c6 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "simpleitk"; - version = "1.1.0"; + version = "1.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz"; - sha256 = "01y8s73mw4yabqir2f8qp5zc1c0y6szi18rr4zwgsxz62g4drzgm"; + sha256 = "10lxsr0144li6bmfgs646cvczczqkgmvvs3ndds66q8lg9zwbnky"; }; nativeBuildInputs = [ cmake git swig ]; @@ -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/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index 2fce5b3368f77cf9a5c8575afe18d92e71540504..66bfd601a62d7dafe77c247511a3051a9bf22937 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/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 7119f76c55fdad55150d1cee40074bcb1968d74f..35d5075a949a057f910569d5dd1a2a14a887f901 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; + NIX_LDFLAGS = [ "-lX11" ]; + meta = { homepage = http://icculus.org/smpeg/; description = "MPEG decoding library"; diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index 8f37302cec50d0946a4902c8e983316e66879f56..32c93b192ef0805e655ff104c65caccbd4473051 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 6d0ca4c1d67569f0a9aec7706650ec17b686adee..4dd09776f3439ee44faab56a6ba2c1bded4526fc 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 ]; @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { description = "A library passing all socket communications through unix sockets"; homepage = "https://git.samba.org/?p=socket_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 9fe88b771be771470e41ada0ffcbdeda5d538cde..ca2ff666b7a513d3ce991a71e9d0ad2ebf51a237 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/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 465ec5b8fe8b2c9e76d68729c73269a78740e032..10258e791ba68a86bdf90bd28f73983cd8c248ee 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/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 4ea7de0b1a38fc7410b90f04bcb329bf102a74ed..2708e49eb2b6cb2a777f5b0a9ba3643581ee4fe5 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + NIX_LDFLAGS = [ "-lsqlite3" ]; + meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; homepage = https://www.gaia-gis.it/fossil/spatialite-tools; diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index a96cd455f554d5470fd4a1710804fbeebfa2475b..198c61d37b5a04adb9b556eb7e965ee6ed4c0302 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -15,7 +15,7 @@ let nativeBuildInputs = [ cmake ]; - # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ]; + cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=OFF" ]; outputs = [ "out" "doc" ]; @@ -35,12 +35,12 @@ let in { spdlog_1 = generic { - version = "1.1.0"; - sha256 = "0yckz5w02v8193jhxihk9v4i8f6jafyg2a33amql0iclhk17da8f"; + version = "1.2.1"; + sha256 = "0gdj8arfz4r9419zbcxk9y9nv47qr7kyjjzw9m3ijgmn2pmxk88n"; }; spdlog_0 = generic { - version = "0.14.0"; - sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q"; + version = "0.17.0"; + sha256 = "112kfh4fbpm5cvrmgbgz4d8s802db91mhyjpg7cwhlywffnzkwr9"; }; } diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 173b460a0ab25b310212d475df4219ce80c5a422..7bf3a5faa7d1056f96b3626b3bc0742b35a61c15 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 = '' @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index c7f8787c1fda9d6a7d6aa062497f63ec74f8c86a..16be9fa1e3b1c363d58f3526036ab30280dabddb 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index f5258c1cd6d8e3813cb5e3a340c65dd0f5bddf67..bc583f732db6b1c9f2d06920534ee0403a99579e 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 fc337f22b56fbff5f68dffc1ebd9ad096d9cc01e..08c92ee9ea48a47a849551507de91615c1f008a3 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 ba3791a8a8bdb48401feb5fdf73a34c53cfc245f..dadbe57dccdd8004505ead99cdbe42acf1db9de5 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/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index fbf7d8df53e3770dfecdcbeaca14f99666d33b5a..46c006df935720eb8ef5ef2a8b440c63bccc5f2a 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { name = "sqlcipher-${version}"; - version = "3.4.2"; + version = "4.0.1"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "168wb6fvyap7y8j86fb3xl5rd4wmhiq0dxvx9wxwi5kwm1j4vn1a"; + sha256 = "08iqj80qlcsnid2s3m6gcryhvcfc0f136frv0md2gp3rz9g3l63d"; }; buildInputs = [ readline ncurses openssl tcl ]; diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 5b68b4901f9ac9803a1515391164ea61c8086698..0a63f5e778a6c5ab63153f8d8cf65adc7c1db67c 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 166ea39493bf649401a050c54826a20bd0e1179b..100f7fec06aa483015ed26fdc2def5454da3a9ea 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/srt/default.nix b/pkgs/development/libraries/srt/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..b1882ff030b692af279ddc649f59cf393be17918 --- /dev/null +++ b/pkgs/development/libraries/srt/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, openssl +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "srt"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "Haivision"; + repo = "srt"; + rev = "v${version}"; + sha256 = "0cv73j9c8024p6pg16c4hiryiv4jpgrfj2xhfdaprsikmkdnygmz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ openssl ]; + + cmakeFlags = [ + # TODO Remove this when https://github.com/Haivision/srt/issues/538 is fixed and available to nixpkgs + # Workaround for the fact that srt incorrectly disables GNUInstallDirs when LIBDIR is specified, + # see https://github.com/NixOS/nixpkgs/pull/54463#discussion_r249878330 + "-UCMAKE_INSTALL_LIBDIR" + ]; + + meta = { + description = "Secure, Reliable, Transport"; + homepage = https://www.srtalliance.org; + license = licenses.mpl20; + maintainers = with maintainers; [ nh2 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index fc9abdc24c7c468eec63a4bf72b41335485ff07f..b33180cec4288414b42e00bcbf9518af0ff7750e 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,23 +3,23 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "3.1.2"; - name = "${pname}-${version}"; + version = "4.0.2"; src = fetchurl { - url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "05p19y3vv0vi3nggrvy6ymqkvhab2dxncl044qj0xnaix2qmp658"; + url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; + sha256 = "0xfk0icsi63yi1dby4rn02ppwkzfykciw6q03bk454gdia9xcmk6"; }; preConfigure = '' export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out -DEXAMPLES_INSTALL_PATH=$out/share/examples $cmakeFlags" ''; - - buildInputs = [ cmake python ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ python ]; meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = https://computation.llnl.gov/casc/sundials/main.html; + homepage = https://computation.llnl.gov/projects/sundials; platforms = platforms.all; maintainers = [ maintainers.idontgetoutmuch ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/svrcore/default.nix b/pkgs/development/libraries/svrcore/default.nix index f1ae1ea5db0e3510a1e77b14fef8866f250debb9..2e6e2d3fbbfd6c427bde51de6988a298080b7c61 100644 --- a/pkgs/development/libraries/svrcore/default.nix +++ b/pkgs/development/libraries/svrcore/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { description = "Secure PIN handling using NSS crypto"; license = licenses.mpl11; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 1759258e6664fa809093fc0e96ffa25ccc9963d8..c83f5b0f5ac38aa88864103eff0798fa0510f7a9 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 b74c58a2e38cdc76d99dc704e48e4de815b0d7ba..6577ebeae28e61abc677e17d0880772af21dbac4 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 8a76e886b4f6069bf4e0ded131b356eda722a97e..b8e7518cd33266dfbc3117676aad4a686e1a02ed 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 0059243890d68c604f525719c07e0da9af7340af..b667e60474006856ed20693fb35c7c5c378a8095 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 6da524c233902ccce52023dc43d32dc4365228f1..86006806baa06c69a1549b102c0ab4bb6d7fd5a0 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 1caa8a376fb1bc286bbf04c50f58c594f0d235d0..8992c7e75c0561e7dd8fd28af32b70ee91485326 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 67db6e5097d05c89e6828d1ed152573987f13c94..a2cb103a1821b38c6e34e465c4e5d57e458f743d 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 77c3c6458ade03d45135f07fb590f56dec5fa8f5..1fbbecf71a6bcc064f754b3d2d6ddc3ba9ffe2e2 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,30 +11,32 @@ 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; { description = "Hierarchical pool based memory allocator with destructors"; homepage = https://tdb.samba.org/; license = licenses.gpl3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index a92c7b74ebf78a128bbcf71cd9a0f8db8c33c69f..293baa492c56172d2387bb587dcca0692dbb88b8 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/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index f6e4a04728288a2c9856665542500e21105963d2..21f062998b4001e336320b9950f807e16e8b3213 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42 +{ stdenv, fetchurl, python2, pkgconfig, readline, libxslt +, docbook_xsl, docbook_xml_dtd_42, buildPackages }: stdenv.mkDerivation rec { @@ -10,31 +10,34 @@ stdenv.mkDerivation rec { sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig python2 ]; buildInputs = [ - python readline libxslt docbook_xsl docbook_xml_dtd_42 + readline libxslt docbook_xsl docbook_xml_dtd_42 ]; preConfigure = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf + patchShebangs buildtools/bin/waf ''; configureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; + configurePlatforms = [ ]; meta = with stdenv.lib; { description = "The trivial database"; - longDescription = - '' TDB is a Trivial Database. In concept, it is very much like GDBM, - and BSD's DB except that it allows multiple simultaneous writers and - uses locking internally to keep writers from trampling on each - other. TDB is also extremely small. - ''; + longDescription = '' + TDB is a Trivial Database. In concept, it is very much like GDBM, + and BSD's DB except that it allows multiple simultaneous writers + and uses locking internally to keep writers from trampling on each + other. TDB is also extremely small. + ''; homepage = https://tdb.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index fae51aea477e872c1b18bdcb3eedb94a4471d965..1247d9ffa843ece864f562dd0f3e7796248f4e16 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 9ca2481c3b0195d0572af2115244a77cdb24d30d..7436da503190dc4e7d7b59a220317ee492255e75 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 6ce02d588a97ef3cb41b6a95bb84baefac7ff26f..2b63bab0eade3f299838b279f0b900cfa52241a7 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 0000000000000000000000000000000000000000..eefc976a62b017c0b4723ebc5864209f37e91c82 --- /dev/null +++ b/pkgs/development/libraries/termbox/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: + +stdenv.mkDerivation rec { + name = "termbox-${version}"; + version = "1.1.2"; + src = fetchFromGitHub { + owner = "nsf"; + repo = "termbox"; + rev = "v${version}"; + sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs"; + }; + + # patch which updates the `waf` version used to build + # to make the package buildable on Python 3.7 + patches = [ + (fetchpatch { + url = https://github.com/nsf/termbox/commit/6fe63ac3ad63dc2c3ac45b770541cc8b7a1d2db7.patch; + sha256 = "1s5747v51sdwvpsg6k9y1j60yn9f63qnylkgy8zrsifjzzd5fzl6"; + }) + ]; + + 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/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index e43c626842404a06485a4fdceaa2ee7196678b4e..9f94f4f7217d62a6723412b856f341ee2b2b7d7b 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { description = "An event system based on the talloc memory management library"; homepage = https://tevent.samba.org/; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 2a1180533cea809f169c38c72a290fbcae14c9e1..881f9c033a386059a4efc8d330b2b4e523b60289 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 77c0b4a1a46098158e293fcb5747232e7cfb8bc1..d67d761857455599be20e017f9ad2a5861253e55 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 ba95da77b72ce20af01b8c7abfd5f7a102448c69..51dabbd2beb782c1e6850500a2a5c3051d23db97 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 2ec9c57e2411d8450f02905810c9d0a3f0022cd7..d61076e569bc9e270933dd55b9935e1aa99c15f2 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/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 34024b23e270ec04d524b6d669a672f0735ae25f..b3cc2b7506b1c9f55e5430b4e140489129ddceb4 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation { homepage = http://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ lovek323 vrthra wkennington ]; + maintainers = with maintainers; [ lovek323 vrthra ]; }; } diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 23ef997e5ce1568211c6a7fdebb1d7879734df04..229e4cfaa6c0f2d9dae6d67e5992f03c5e10c3ad 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/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..fe84217d9432c39535bba449458287e2533bb377 --- /dev/null +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, gobject-introspection, gnome3 }: + +stdenv.mkDerivation rec { + pname = "totem-pl-parser"; + version = "3.26.2"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "0fhwhrq5p0a8arh3lzk5bfjlkip3rlna9r6ybpi9fid4cpwsr1nk"; + }; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; + buildInputs = [ libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Videos; + description = "Simple GObject-based library to parse and save a host of playlist formats"; + maintainers = gnome3.maintainers; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index 149b2260792fb88b5582ba37c679e9d047d96b43..bcc91d058f0428f3c673272e78d56e2d4f7ed21c 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 416cf53ab49635894a1c281bee056bd017c2f5c8..53e10b468ba629d2c9bb3fd36f7b60e552245d2d 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 377ceba59e70da1c1947fe64fba78f2d2913d176..6eef95309aab5dc1df4468875d9af86fe2265d03 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/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index ccd876dfefbd4a8f5cec2e06877f7b8f686fe676..bd9fb796247d6975160d2bc08cc2135c2970d42e 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { description = "A wrapper for the user, group and hosts NSS API"; homepage = "https://git.samba.org/?p=uid_wrapper.git;a=summary;"; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 912bcac55cd028e99e03ce926f451083affe5b3d..b6f1136ea2b964fd00c1c0dbe94542cffe1b03cd 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoreconfHook, umockdev, gobject-introspection , pkgconfig, glib, systemd, libgudev, vala }: stdenv.mkDerivation rec { name = "umockdev-${version}"; - version = "0.12"; + version = "0.12.1"; outputs = [ "bin" "out" "dev" "doc" ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "martinpitt"; repo = "umockdev"; rev = version; - sha256 = "1j7kkxpqs991w3qdlb779gzv38l1vpnlk3laabi2ndk83j1wl5k2"; + sha256 = "0wnmz4jh04mvqzjnqvxrah969gg4x4v8d6ip61zc7jpbwnqb2fpg"; }; # autoreconfHook complains if we try to build the documentation @@ -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 c716ae7f8dbbd3c934581f4877612ba11b59da80..a4f99b942eaebd4900bb544d11ec4aec82c64966 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.1"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; - sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287"; + sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m"; }; - 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 0000000000000000000000000000000000000000..881e58ae61e50e96b67b6b7087c35a98ff1f5d24 --- /dev/null +++ b/pkgs/development/libraries/utmps/default.nix @@ -0,0 +1,32 @@ +{ stdenv, skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "utmps"; + version = "0.0.2.0"; + sha256 = "0fzq3qm88sm5ibl9k9k6ns6jd7iw72vh9k10bsfl5dxd2yi6iqyr"; + + 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 adebedbf2ac1e0a2637f80e62cef8b45d1a14d7f..85d0c0d91bb5268e0394b987a82c1d0998f77f1c 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 0000000000000000000000000000000000000000..8d2276def70533ee892c6355b6b4adffa6111dfe --- /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 ba763e33490545f9a0906204bfdbf1760fc2f81e..4780ffb7519c5a2822421218d2416d460478db38 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.3.0"; # generally try to match libva version, but not required src = fetchFromGitHub { owner = "intel"; repo = "intel-vaapi-driver"; rev = version; - sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763"; + sha256 = "0s6cz9grymll96s7n2rpzvb3b566a2n21nfp6b23r926db089kjd"; }; patchPhase = '' diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index e2a2af615b88706eac158d995402026ee88b6bfd..66c8e4fbc5310b4111a803ab8965b219b4b29dad 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 ddecf4a96a75de7627bf0610b22d6c98319093cd..480b8f7bcd7b2062e79e700fac7092253436af3a 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 12c166beacbd2c3185644ce47eca8e09bff51b6f..fb69d4bf63e7a7976cdb0e040aae15b342a1ca0f 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 2cd3b5a20c0c90b01e988759f205cea88f107338..4473100a9f200870b4a74085bb7e96e5a278f800 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/desktops/gnome-3/core/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix similarity index 88% rename from pkgs/desktops/gnome-3/core/vte/2.90.nix rename to pkgs/development/libraries/vte/2.90.nix index 7cd72ceee42c8e5bf0ff35d2101e341c814df355..4b2b74c5e1d57910f4b98008798a6b7c40eec56b 100644 --- a/pkgs/desktops/gnome-3/core/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { versionMajor = "0.36"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobjectIntrospection intltool gnome3.glib gnome3.gtk3 ncurses ]; + buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..97bb961c4bc56c404c44af386f7e8e9ca6bc9b11 --- /dev/null +++ b/pkgs/development/libraries/vte/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, intltool, pkgconfig +, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls +, gperf, pcre2 +}: + +stdenv.mkDerivation rec { + pname = "vte"; + version = "0.54.3"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = pname; }; + }; + + nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ]; + buildInputs = [ glib gtk3 ncurses ]; + + propagatedBuildInputs = [ + # Required by vte-2.91.pc. + gtk3 + gnutls + pcre2 + ]; + + preConfigure = "patchShebangs ."; + + configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://www.gnome.org/; + description = "A library implementing a terminal emulator widget for GTK+"; + longDescription = '' + VTE is a library (libvte) implementing a terminal emulator widget for + GTK+, and a minimal sample application (vte) using that. Vte is + mainly used in gnome-terminal, but can also be used to embed a + console/terminal in games, editors, IDEs, etc. VTE supports Unicode and + character set conversion, as well as emulating any terminal known to + the system's terminfo database. + ''; + license = licenses.lgpl2; + maintainers = with maintainers; [ astsmtl antono lethalman ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} + diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix new file mode 100644 index 0000000000000000000000000000000000000000..6231b8315cd5ec7f1a50fc11de834332dc65e7d3 --- /dev/null +++ b/pkgs/development/libraries/vte/ng.nix @@ -0,0 +1,18 @@ +{ vte, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: + +vte.overrideAttrs (oldAttrs: rec { + name = "vte-ng-${version}"; + version = "0.54.2.a"; + + src = fetchFromGitHub { + owner = "thestinger"; + repo = "vte-ng"; + rev = version; + sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags"; + }; + + preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; + + nativeBuildInputs = oldAttrs.nativeBuildInputs or [] + ++ [ gtk-doc autoconf automake gettext libtool gperf ]; +}) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index b85d76640cf066cf7820ea1552653de3318503b2..dee363f23b6a0a16be7a94f23a0deb1886508193 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xproto, libXt +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, xorgproto, libXt , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = if !stdenv.isDarwin - then [ cmake libGLU_combined libX11 xproto libXt ] ++ optional (qtLib != null) qtLib + then [ cmake libGLU_combined libX11 xorgproto libXt ] ++ optional (qtLib != null) qtLib else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT ]; @@ -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 2a07eba261b796e89ebbabc5b46a6e4fa1d969ac..c93ba1b129094cfbbb9a8f3cac2599b4621f4f28 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 5ffdc43753739433dcd4a437767ec6e210c895d7..6f720857f7cfe8b439bf9e204a6658d073b4c4ab 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/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix index 750a786c3fcac294c06b9e32a1357eb9462f5a39..3fda417d8e1ff89d592090ff11dea2bbafe08ec7 100644 --- a/pkgs/development/libraries/wayland/1.9.nix +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ codyopel wkennington ]; + maintainers = with lib.maintainers; [ codyopel ]; }; passthru.version = version; diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index fce0dae6c7313ed98a77f2af589e5bb1f67e71d2..25cbde63129b2fc0232e64152304d208e295ee21 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, libxml2 +, libffi, libxml2, wayland , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: @@ -8,16 +8,25 @@ 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" ]; + configureFlags = [ + "--disable-documentation" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-host-scanner" + ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + # for wayland-scanner during build + wayland + ]; buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ]; @@ -26,7 +35,7 @@ stdenv.mkDerivation rec { homepage = https://wayland.freedesktop.org/; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ codyopel wkennington ]; + maintainers = with lib.maintainers; [ codyopel ]; }; passthru.version = version; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 54fa944777548370ff2417d53204bd7203257331..b14dc03385cfd7dcbe40c2546658db02077be8c3 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "wayland-protocols-${version}"; - version = "1.16"; + version = "1.17"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1icqikvhgv9kcf8lcqml3w9fb8q3igr4c3471jb6mlyw3yaqa53b"; + sha256 = "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 7c4d275e05fee853f7961d4ad1eb32860375db22..187eed6ae83ae7236edfbcceb1a9c445714ccd59 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.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix deleted file mode 100644 index bb493d16a3694815ab0366fdaf3b437f0f1f85e3..0000000000000000000000000000000000000000 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja -, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls, libgcrypt -, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit -, libidn, libedit, readline, libGLU_combined, libintl -, enableGeoLocation ? true, geoclue2, sqlite -, enableGtk2Plugins ? false, gtk2 ? null -, gst-plugins-base, gst-plugins-bad, woff2 -}: - -assert enableGeoLocation -> geoclue2 != null; -assert enableGtk2Plugins -> gtk2 != null; -assert stdenv.isDarwin -> !enableGtk2Plugins; - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; - version = "2.20.5"; - - meta = { - description = "Web content rendering engine, GTK+ port"; - homepage = https://webkitgtk.org/; - license = licenses.bsd2; - platforms = platforms.linux; - hydraPlatforms = []; - maintainers = with maintainers; [ ]; - }; - - src = fetchurl { - url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"; - }; - - patches = optionals stdenv.isDarwin [ - ## TODO add necessary patches for Darwin - ]; - - postPatch = '' - patchShebangs . - ''; - - cmakeFlags = [ - "-DPORT=GTK" - "-DUSE_LIBHYPHEN=0" - "-DENABLE_INTROSPECTION=ON" - ] - ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" - ++ optionals stdenv.isDarwin [ - "-DUSE_SYSTEM_MALLOC=ON" - "-DUSE_ACCELERATE=0" - "-DENABLE_MINIBROWSER=OFF" - "-DENABLE_VIDEO=ON" - "-DENABLE_QUARTZ_TARGET=ON" - "-DENABLE_X11_TARGET=OFF" - "-DENABLE_OPENGL=OFF" - "-DENABLE_WEB_AUDIO=OFF" - "-DENABLE_WEBGL=OFF" - "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" - "-DENABLE_GTKDOC=OFF" - ]; - - nativeBuildInputs = [ - cmake ninja perl python2 ruby bison gperf - pkgconfig gettext gobjectIntrospection - ]; - - buildInputs = [ - libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 - libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit - sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core - ] ++ optional enableGeoLocation geoclue2 - ++ optional enableGtk2Plugins gtk2 - ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ]) - ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] - ++ optional stdenv.isLinux wayland; - - propagatedBuildInputs = [ - libsoup gtk3 - ]; - - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 7b62de69123d1d87916f868ef53f384075e9d47c..04758ace7fa45ea0feb26f956b21a69f51f4eb33 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, pruneLibtoolFiles +, pkgconfig, which, gettext, gobject-introspection , gtk2, gtk3, wayland, libwebp, enchant, sqlite , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg , gst-plugins-base, libobjc @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl python ruby bison gperf flex - pkgconfig which gettext gobjectIntrospection pruneLibtoolFiles + pkgconfig which gettext gobject-introspection ]; buildInputs = [ diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..aa05161d19c0b5894c275af469b0fda7bdcc0c0f --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja +, 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 +, enableGeoLocation ? true, geoclue2, sqlite +, enableGtk2Plugins ? false, gtk2 ? null +, gst-plugins-base, gst-plugins-bad, woff2 +}: + +assert enableGeoLocation -> geoclue2 != null; +assert enableGtk2Plugins -> gtk2 != null; +assert stdenv.isDarwin -> !enableGtk2Plugins; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.22.6"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = https://webkitgtk.org/; + license = licenses.bsd2; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + src = fetchurl { + url = "https://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z"; + }; + + patches = optionals stdenv.isDarwin [ + ## TODO add necessary patches for Darwin + ]; + + postPatch = '' + patchShebangs . + ''; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + "-DENABLE_INTROSPECTION=ON" + ] + ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" + ++ optional stdenv.isLinux "-DENABLE_GLES2=ON" + ++ optionals stdenv.isDarwin [ + "-DUSE_SYSTEM_MALLOC=ON" + "-DUSE_ACCELERATE=0" + "-DENABLE_MINIBROWSER=OFF" + "-DENABLE_VIDEO=ON" + "-DENABLE_QUARTZ_TARGET=ON" + "-DENABLE_X11_TARGET=OFF" + "-DENABLE_OPENGL=OFF" + "-DENABLE_WEB_AUDIO=OFF" + "-DENABLE_WEBGL=OFF" + "-DENABLE_GRAPHICS_CONTEXT_3D=OFF" + "-DENABLE_GTKDOC=OFF" + ]; + + nativeBuildInputs = [ + cmake ninja perl python2 ruby bison gperf + pkgconfig gettext gobject-introspection + ]; + + buildInputs = [ + libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2 + libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit + sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core + ] ++ optional enableGeoLocation geoclue2 + ++ optional enableGtk2Plugins gtk2 + ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ]) + ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] + ++ optional stdenv.isLinux wayland; + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 96e7b4c4a20d9f93f7078c1051a179649cdc74ae..b22d339617c2f2e729948698322f95f3b916031a 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -19,6 +19,5 @@ stdenv.mkDerivation rec { description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 8a0ec2523b94a896ecaa89f15826f4b7faed70db..d84f30aad55ba5ada4fd189f9b57f77f095a7f98 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "websocket++-${version}"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "zaphoyd"; repo = "websocketpp"; rev = version; - sha256 = "1i64sps52kvy8yffysjbmmbb109pi28kqai0qdxxz1dcj3xfckqd"; + sha256 = "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 06a4e48827edc32bdc2794893dee46e476889660..3b0a447f7376eee726e727b41779bb34618e8282 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, alsaLib, freepats }: stdenv.mkDerivation rec { - name = "wildmidi-0.4.2"; + name = "wildmidi-0.4.3"; src = fetchurl { url = "https://github.com/Mindwerks/wildmidi/archive/${name}.tar.gz"; - sha256 = "178hm2wh5h7apkcb1a0dyla2ia8569php8ikz62rh0g6dp5l67am"; + sha256 = "1igkxv4axnqap59d8pjgqj94x0khn3fdd2hq6wdvkd2v8nb5m3j9"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index c4d94af850dd567dbc6fa3de754596e68965d246..c45f521dcbb0dac28149d40c97ae360a8a9bcea0 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; @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { description = ""; license = licenses.gpl2; platforms = intersectLists platforms.unix platforms.x86_64; - maintainers = with maintainers; [ wkennington ]; broken = true; # Broken by f689a6d1c6796c4a4f116ffec6c4624379e04bc9. }; } diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a4c2b32971457ecb1ab18049e2f8c6f0b85f66a0..6e7090a9c5b7572292a55dad4c95510bb32381e2 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,39 +1,76 @@ -{ 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 }: -let pname = "wlroots"; - version = "unstable-2018-03-16"; +let + pname = "wlroots"; + version = "0.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchFromGitHub { owner = "swaywm"; repo = "wlroots"; - rev = "9cc875429b40e2567b219f8e9ffd23316d136204"; - sha256 = "1prhic3pyf9n65qfg5akzkc9qv2z3ab60dpcacr7wgr9nxrvnsdq"; + rev = version; + sha256 = "1iz5lxpiba1lcmkz3hz56r8j6ra3535zgckazqshi4c364nx94zs"; }; - # $out for the library and $bin for rootston - outputs = [ "out" "bin" ]; + # $out for the library, $bin for rootston, and $examples for the example + # programs (in examples) AND rootston + outputs = [ "out" "bin" "examples" ]; nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu + libpng ffmpeg_4 ]; - # Install rootston (the reference compositor) to $bin + mesonFlags = [ + "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled" + "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled" + ]; + + postPatch = '' + # It happens from time to time that the version wasn't updated: + sed -iE "s/version: '[0-9]\.[0-9]\.[0-9]'/version: '${version}.0'/" meson.build + ''; + 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 + # Copy the library to $bin and $examples + for output in "$bin" "$examples"; do + mkdir -p $output/lib + cp -P libwlroots* $output/lib/ + done + ''; + + postFixup = '' + # Install rootston (the reference compositor) to $bin and $examples (this + # has to be done after the fixup phase to prevent broken binaries): + for output in "$bin" "$examples"; do + mkdir -p $output/bin + cp rootston/rootston $output/bin/ + patchelf \ + --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$output,g)" \ + $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 + cp "$binary" "$examples/bin/wlroots-$binary" + patchelf \ + --set-rpath "$(patchelf --print-rpath $output/bin/rootston | sed s,$out,$examples,g)" \ + "$examples/bin/wlroots-$binary" + done ''; meta = with stdenv.lib; { @@ -42,8 +79,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 30291a1802266e71f80ae82f7113ed36d122c3f7..8f3808bffcbc4b4a57002461ba0b4f81a5581dda 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.15.3"; + version = "3.15.7"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "00mpq1z8j37a873dbk9knb835m3qlwqnd1rslirqkc44hpz1i64j"; + sha256 = "128z1f7nry278kdjzq950cr81bml8p17fgdchmpvy0awhh7r20y9"; }; configureFlags = [ "--enable-all" ]; @@ -29,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/wt/default.nix b/pkgs/development/libraries/wt/default.nix index aec64c9c33c6e9a1a1398e9c892048fe9bb63599..e1c339d1e0fe9acc97f8c38f98832dd9a4e34744 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -48,7 +48,7 @@ in { }; wt4 = generic { - version = "4.0.4"; - sha256 = "17kq9fxc0xqx7q7kyryiph3mg0d3hnd3jw0rl55zvzfsdd71220w"; + version = "4.0.5"; + sha256 = "1gn8f30mjmn9aaxdazk49wijz37nglfww15ydrjiyhl6v5xhsjdv"; }; } diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 59f6af7eddb21ed2d002b66e8fa35ed972d53eff..442e3fca77c321f9e734cabafea86401e6a5bc6c 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.16"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "0xl5ghd8yj1ciwf87f12ii7vg38ir0snrds2rhi47pv5gypfkiq5"; + sha256 = "1gnajsk73vkj7ii43ynr20ln9qck3f0lshf5gdbxsam3qgmx7gd4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index bbb3b0faf3479f4923582ede9e55c59ab3712a35..6d2e25709b5f61d0fbb31a6f0ba76df1ad05e8f7 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , gstreamer, gst-plugins-base, GConf, libX11, cairo , withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ] ++ optional withMesa libGLU; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 19c3ca307c5ee8fa67de55e3b3688bf7b77442ea..426f5cf92a19c549e92d214e7f3db67aa4bfa5b5 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto , gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true @@ -29,7 +29,7 @@ stdenv.mkDerivation { ]; buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf ] ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 5d3086fc5049f7cc1f743014fb3fc25b7cbe450d..45bf5f779c2c9e904fe284f46a55fd86bb6bccd3 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm -, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile +, xorgproto, gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf ] ++ optional withMesa libGLU ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 9c307b2d15aef5b278fc851d852d6c62e66fde31..040273e28b990cec0f7a0ada16d9ff446b179620 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 d11a93254bfba5e2986934a94d6fa61ccb7b33a7..7ea28f6b61e8a58c3f6ffae07b39bb549a5885c5 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,33 @@ 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"; + }) + # Fix build on ARM (#406) + (fetchpatch { + url = "https://bitbucket.org/multicoreware/x265/issues/attachments/406/multicoreware/x265/1527562952.26/406/X265-2.8-asm-primitives.patch"; + sha256 = "1vf8bpl37gbd9dcbassgkq9i0rp24qm3bl6hx9zv325174bn402v"; + }) + ]; + + 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 f93f7ed87460f1d25742306a7e3cb21f89802664..cf331f01456717c103b390309c09cf67ed6e1677 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.10" "1f4vf1w1yvsn9mn462q6snc8wkmfpifp8wrlzs4aqi45w0kr6rk8"; } 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 6deae76d2aa7928c694e8360c1b4b98be4b62421..0000000000000000000000000000000000000000 --- 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 79f75abfd91c1aec0faf6b2f65aeb5297749e330..3dd2cb5b874cbe9fbba6a66692906284018f0649 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 index 247b8ee45d0b2ee3bc00a423cad2a4d73916d1f6..d1605aac334257385aed67d1174899a2bf944619 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_43, dbus, glib }: -let - version = "0.1.0"; -in stdenv.mkDerivation rec { - name = "xdg-dbus-proxy-${version}"; +stdenv.mkDerivation rec { + pname = "xdg-dbus-proxy"; + version = "0.1.1"; src = fetchurl { - url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${name}.tar.xz"; - sha256 = "055wli36lvdannp6qqwbvd78353n61wn9kp8y3dchh39wq7x7vwy"; + url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "1w8yg5j51zsr9d97d4jjp9dvd7iq893p2xk54i6lf3lx01ribdqh"; }; - nativeBuildInputs = [ pkgconfig ]; - + nativeBuildInputs = [ pkgconfig libxslt docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ glib ]; + checkInputs = [ dbus ]; + + configureFlags = [ + "--enable-man" + ]; + + # dbus[2345]: Failed to start message bus: Failed to open "/etc/dbus-1/session.conf": No such file or directory + doCheck = false; meta = with stdenv.lib; { description = "DBus proxy for Flatpak and others"; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index f81461b2ac8e38262c1a8b68bf4e4b78b71b46ab..f48320148dacff768452160a983a11f9d559911a 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3 }: -let - version = "1.0.2"; -in stdenv.mkDerivation rec { - name = "xdg-desktop-portal-gtk-${version}"; +stdenv.mkDerivation rec { + pname = "xdg-desktop-portal-gtk"; + version = "1.1.0"; src = fetchFromGitHub { owner = "flatpak"; - repo = "xdg-desktop-portal-gtk"; + repo = pname; rev = version; - sha256 = "06dzh3vzq5nw3r89kb1qi3r2z8wjh9zmzc0hfnva4vnx7mwgm7ax"; + sha256 = "1djgsp3n10w6lamwwjn64p9722lvxpalj26h19zscbspnhfldb4f"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ]; - buildInputs = [ glib gtk3 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; + buildInputs = [ glib gtk3 gnome3.gsettings-desktop-schemas ]; meta = with stdenv.lib; { description = "Desktop integration portals for sandboxed apps"; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 171ef68cf569b1112aabbf55c72b5e4217b8132d..80699188fe2e2b1887d6148ad77c1827df10a46d 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,30 +1,35 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }: -let - version = "1.0.2"; -in stdenv.mkDerivation rec { - name = "xdg-desktop-portal-${version}"; +stdenv.mkDerivation rec { + pname = "xdg-desktop-portal"; + version = "1.1.0"; outputs = [ "out" "installedTests" ]; src = fetchFromGitHub { owner = "flatpak"; - repo = "xdg-desktop-portal"; + repo = pname; rev = version; - sha256 = "1vl0150gz20x106di9yfa6l3zjw0nd2lr44rkq2147n2a254p79p"; + sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx"; }; patches = [ ./respect-path-env-var.patch + # https://github.com/flatpak/xdg-desktop-portal/pull/263 + (fetchpatch { + url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch; + sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq"; + }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ]; - buildInputs = [ glib pipewire fuse ]; + nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ]; - doCheck = true; + doCheck = true; # XXX: investigate! configureFlags = [ "--enable-installed-tests" + "--disable-geoclue" # Requires 2.5.2, not released yet ]; makeFlags = [ diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 9fa1768f4dce255adf17d7b275086eb258245b1b..8ad4e6d6a8a60eac774728595eaa1a786c18a905 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 69b5b95e7613a965d32493ba9d2a8a3c2c2e5435..d86dac0507315a43ef3dc0b4725386f67fd8e206 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 0000000000000000000000000000000000000000..6305b6c03a46a5d6ab7c24e4bbca070ed0af0d32 --- /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 7acbaa260a0c05a5e64f8f6b3c10786b738d3197..c5dc775d07555e857b87389a5bc5fdac7b0787f9 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,30 +1,38 @@ -{ 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 }: stdenv.mkDerivation rec { - version = "1.0.1"; - name = "zeitgeist-${version}"; + pname = "zeitgeist"; + version = "1.0.2"; - 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 = pname; + repo = pname; rev = "v${version}"; - sha256 = "1lgqcqr5h9ba751b7ajp7h2w1bb5qza2w3k1f95j3ab15p7q0q44"; + sha256 = "0ig3d3j1n0ghaxsgfww6g2hhcdwx8cljwwfmp9jk1nrvkxd6rnmv"; }; preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; + configureFlags = [ "--with-session-bus-services-dir=${placeholder ''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,12 +40,10 @@ 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; - maintainers = with maintainers; [ lethalman ]; + homepage = https://zeitgeist.freedesktop.org/; + maintainers = with maintainers; [ lethalman worldofpeace ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 009826eef47682372f27f246b5011f5b324c71d7..2fcf8bd91791d44306f607f2405237ffc095ce5d 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 79bebd87dbc259c9d2af06d78e5dfea9bfc75c21..bc130af4c6ae185883b6f01daaa08a7cc679c812 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zeromq-${version}"; - version = "4.2.5"; + version = "4.3.0"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "18mjmbhvfhr4463dqayl5hdjfy5rx7na1xsq9dsvlaz9qlr5fskw"; + sha256 = "12a2l6dzxkk1x8yl8bihnfs6gi2vgyi4jm9q8acj46f6niryhsmr"; }; nativeBuildInputs = [ cmake asciidoc ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ wkennington fpletz ]; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 9d0065277172930bb2c18c7b82d361f249d574f7..12fb076d946be30b764a1c588e076ee07f0d7884 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 d3fb0970cd00e220e831734072839f8e25231ad9..3a5638b22814cb0c6c907ccfab7e936283cca82c 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,9 +1,10 @@ { stdenv , fetchurl -, static ? false +, static ? true +, shared ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "zlib-${version}"; version = "1.2.11"; @@ -24,13 +25,15 @@ stdenv.mkDerivation rec { --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' ''; - outputs = [ "out" "dev" "static" ]; + outputs = [ "out" "dev" ] + ++ stdenv.lib.optional (shared && static) "static"; setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page - configureFlags = stdenv.lib.optional (!static) "--shared"; + configureFlags = stdenv.lib.optional shared "--shared" + ++ stdenv.lib.optional (static && !shared) "--static"; - postInstall = '' + postInstall = stdenv.lib.optionalString (shared && static) '' moveToOutput lib/libz.a "$static" '' # jww (2015-01-06): Sometimes this library install as a .so, even on @@ -38,7 +41,7 @@ stdenv.mkDerivation rec { # what causes this difference. + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/*.so* $out/lib/*.dylib* ; do - install_name_tool -id "$file" $file + ${stdenv.cc.bintools.targetPrefix}install_name_tool -id "$file" $file done '' # Non-typical naming confuses libtool which then refuses to use zlib's DLL @@ -64,7 +67,7 @@ stdenv.mkDerivation rec { "PREFIX=${stdenv.cc.targetPrefix}" ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" - ] ++ stdenv.lib.optionals (!static) [ + ] ++ stdenv.lib.optionals shared [ "SHARED_MODE=1" ]; @@ -78,4 +81,10 @@ stdenv.mkDerivation rec { license = licenses.zlib; platforms = platforms.all; }; -} +} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + 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 1ba073943483129a942a11ca7bb1eaecc0645e46..65509d766b963a6ad4447a99ac684a8cfefb134d 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 5769ee94a1be62958d84c3f14502e346d6ac42b3..b0e97038b7b2a0c448c4e43fd42beb2d7d3455b3 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-08-31/distinfo.txt"; - sha256 = "1im4p6vcxkp5hrim28cdf5isyw8a1v9aqsz2xfsfp3z3qd49dixd"; + url = "https://beta.quicklisp.org/dist/quicklisp/2019-01-07/distinfo.txt"; + sha256 = "1f0giy182p6qlmmqljir92566c8l1g2sv41cbzv86s3kv0j640fd"; }; buildPhase = '' true; ''; postInstall = '' 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 9b9486e9758c71dbce225bae1ab6873dbf014ce3..48dd57aac54b3a364c1e9cc76f46da61d7d614e1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''alexandria''; - version = ''20170830-git''; + version = ''20181210-git''; description = ''Alexandria is a collection of portable public domain utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz''; - sha256 = ''0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9''; + url = ''http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz''; + sha256 = ''0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588''; }; packageName = "alexandria"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 - 0vprl8kg5qahwp8zyc26bk0qpdynga9hbv5qnlvk3cclfpvm8kl9 URL - http://beta.quicklisp.org/archive/alexandria/2017-08-30/alexandria-20170830-git.tgz - MD5 13ea5af7055094a87dec1e45090f894a NAME alexandria FILENAME alexandria - DEPS NIL DEPENDENCIES NIL VERSION 20170830-git SIBLINGS (alexandria-tests) + 0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588 URL + http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz + MD5 2a7530a412cd94a56b6d4e5864fb8819 NAME alexandria FILENAME alexandria + DEPS NIL DEPENDENCIES NIL VERSION 20181210-git SIBLINGS (alexandria-tests) PARASITES NIL) */ 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 9daab46784d3e7f5e08a5a5424aec5358b998b40..40d5aed49917f89a41d92a403ee1cf6884f3840b 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 @@ args @ { fetchurl, ... }: rec { baseName = ''array-utils''; - version = ''20180831-git''; + version = ''20181018-git''; description = ''A few utilities for working with arrays.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2018-08-31/array-utils-20180831-git.tgz''; - sha256 = ''1m3ciz73psy3gln5f2q1c6igfmhxjjq97bqbjsvmyj2l9f6m6bl7''; + url = ''http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz''; + sha256 = ''1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn''; }; packageName = "array-utils"; @@ -18,8 +18,8 @@ rec { overrides = x: x; } /* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. - 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) + SHA256 1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn URL + http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz + MD5 e32cc0474cf299ad1f5666e2864aa3d8 NAME array-utils FILENAME array-utils + DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (array-utils-test) PARASITES NIL) */ 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 ec4e31013f92c806fce832ea77cbff8f094620c4..5d7f3f2dd10b074ee11de7f2c9966a0d3a19f0e8 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."named-readtables" 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."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''; @@ -31,8 +31,6 @@ rec { (NAME closure-common FILENAME closure-common) (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) - (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 named-readtables FILENAME named-readtables) @@ -42,9 +40,9 @@ rec { (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 named-readtables puri split-sequence swank - symbol-munger trivial-features trivial-gray-streams) + closure-common closure-html collectors cxml 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 86bdb36c8d23823e9e0b1c4d387a7d54cdd0f532..0a2e56a9c9b882b4b87f79185f64d14b2df1c5f3 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."named-readtables" 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."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''; @@ -31,8 +31,6 @@ rec { (NAME closure-common FILENAME closure-common) (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) - (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 lisp-unit2 FILENAME lisp-unit2) (NAME named-readtables FILENAME named-readtables) @@ -42,10 +40,9 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams)) 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 - named-readtables puri split-sequence swank symbol-munger trivial-features - trivial-gray-streams) + closer-mop closure-common closure-html collectors cxml 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 f3e64cb965e482c043907e083364765ffbb9cf5e..6cf81070734322a0cd1e85837297a59fb2814525 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 = ''20180831-git''; + version = ''20181210-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-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" ]; + 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-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/2018-08-31/caveman-20180831-git.tgz''; - sha256 = ''0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s''; + url = ''http://beta.quicklisp.org/archive/caveman/2018-12-10/caveman-20181210-git.tgz''; + sha256 = ''04b5dhmdwcwpdcjk4bk25fmqx786k7g3iqsk1xc35kvsxi9ykldf''; }; packageName = "caveman"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 - 0c4qkvmjqdkm14cgdpsqcl1h5ixb92l6l08nkd4may2kpfh2xq0s URL - http://beta.quicklisp.org/archive/caveman/2018-08-31/caveman-20180831-git.tgz - MD5 b417563f04b2619172127a6abeed786a NAME caveman FILENAME caveman DEPS + 04b5dhmdwcwpdcjk4bk25fmqx786k7g3iqsk1xc35kvsxi9ykldf URL + http://beta.quicklisp.org/archive/caveman/2018-12-10/caveman-20181210-git.tgz + MD5 d3192b79636901bb0676681fc5d05748 NAME caveman FILENAME caveman DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) - (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams) + (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz) @@ -68,18 +68,18 @@ rec { (NAME trivial-types FILENAME trivial-types) (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (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-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 20180831-git SIBLINGS + (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-emb cl-fad cl-ppcre cl-project 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 20181210-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/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index 07b062b51978d484ea974328ca62da64994c34a3..1af0947627f5bc9bc6c9673c7c5b9d72512580bd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-grovel''; - version = ''cffi_0.19.0''; + version = ''cffi_0.20.0''; description = ''The CFFI Groveller''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz''; - sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; + url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; + sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; }; packageName = "cffi-grovel"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 - 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL - http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5 - 7589b6437fec19fdabc65892536c3dc3 NAME cffi-grovel FILENAME cffi-grovel DEPS + 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL + http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 + 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-grovel FILENAME cffi-grovel DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cffi cffi-toolchain trivial-features) - VERSION cffi_0.19.0 SIBLINGS + VERSION cffi_0.20.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix index f1d7e117655bf28912b16242a1c8fd03c835beb6..c440c72788fe18e64e15bc237e6ebb3aa3911062 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi-toolchain''; - version = ''cffi_0.19.0''; + version = ''cffi_0.20.0''; description = ''The CFFI toolchain''; deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz''; - sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; + url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; + sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; }; packageName = "cffi-toolchain"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256 - 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL - http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5 - 7589b6437fec19fdabc65892536c3dc3 NAME cffi-toolchain FILENAME + 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL + http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 + 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi-toolchain FILENAME cffi-toolchain DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cffi FILENAME cffi) (NAME trivial-features FILENAME trivial-features)) - DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.19.0 + DEPENDENCIES (alexandria babel cffi trivial-features) VERSION cffi_0.20.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-uffi-compat cffi) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index 8568d9a3dfab31b793687c297ed8a780b4dfda60..001c7d9a54506cfc8e19b6edccf27a1632845c65 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cffi''; - version = ''cffi_0.19.0''; + version = ''cffi_0.20.0''; parasites = [ "cffi/c2ffi" "cffi/c2ffi-generator" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz''; - sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9''; + url = ''http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz''; + sha256 = ''1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z''; }; packageName = "cffi"; @@ -20,15 +20,15 @@ rec { overrides = x: x; } /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 - 12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL - http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5 - 7589b6437fec19fdabc65892536c3dc3 NAME cffi FILENAME cffi DEPS + 1jal7r0dqp0sc5wj8a97xjlvfvayymdp1w3172hdxfppddnhhm8z URL + http://beta.quicklisp.org/archive/cffi/2018-12-10/cffi_0.20.0.tgz MD5 + 94a8b377cf1ac7d8fc73dcc98f3420c6 NAME cffi FILENAME cffi DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre) (NAME trivial-features FILENAME trivial-features) (NAME uiop FILENAME uiop)) DEPENDENCIES (alexandria babel cl-json cl-ppcre trivial-features uiop) - VERSION cffi_0.19.0 SIBLINGS + VERSION cffi_0.20.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat) PARASITES (cffi/c2ffi cffi/c2ffi-generator)) */ 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 377c8c2209bcb4e73995581a7b0c26a5672bbbed..d678fd8e9424f91f69605241e01ec62b6b5305c4 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-20180711-git''; + version = ''cl-async-20190107-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/2018-07-11/cl-async-20180711-git.tgz''; - sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; + sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; }; packageName = "cl-async-repl"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 - 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL - http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz - MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-repl FILENAME + 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL + http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz + MD5 609aa604c6940ee81f382cb249f3ca72 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-20180711-git SIBLINGS + VERSION cl-async-20190107-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 2129c7f83f7af7f18b1ff9fe71246b717f75c09d..722e05ed09c28ebac36cb8cf7fc9f5b60e7184b2 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-20180711-git''; + version = ''cl-async-20190107-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/2018-07-11/cl-async-20180711-git.tgz''; - sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; + sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; }; packageName = "cl-async-ssl"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 - 1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz URL - http://beta.quicklisp.org/archive/cl-async/2018-07-11/cl-async-20180711-git.tgz - MD5 7347a187dde464b996f9c4abd8176d2c NAME cl-async-ssl FILENAME + 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL + http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz + MD5 609aa604c6940ee81f382cb249f3ca72 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-20180711-git SIBLINGS + VERSION cl-async-20190107-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 e5a2a0bc7fd34516cb10a82b4b2b7edd89ca8a37..edb4b01b0d1d848c6a41a478182329f1f674fe51 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 = ''20180711-git''; + version = ''20190107-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/2018-07-11/cl-async-20180711-git.tgz''; - sha256 = ''1fy7qd72n1x0h44l67rwln1mxdj1hnc1xp98zc702zywxm99qabz''; + url = ''http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz''; + sha256 = ''11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b''; }; packageName = "cl-async"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 - 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 + 11hgsnms6w2s1vsphsqdwyqql11aa6bzplzrp5w4lizl2nkva82b URL + http://beta.quicklisp.org/archive/cl-async/2019-01-07/cl-async-20190107-git.tgz + MD5 609aa604c6940ee81f382cb249f3ca72 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 20180711-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test) + VERSION 20190107-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-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 40c1ac7d6a9a5c22708951eab93a90853b65fd09..a1da44a6b89613a72c3c4254ea0807766b8c7ecb 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 = ''20180831-git''; + version = ''20190107-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-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "cl-dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 - 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 + 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e 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 20180831-git SIBLINGS + VERSION 20190107-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-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix new file mode 100644 index 0000000000000000000000000000000000000000..713aff0ea405ef1d42847469fea585fefaa960cd --- /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.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index b5ede76f8178d5456c9376ca7addeb6e896938ad..f37e653bc5642820269e4d5d25360241c884a759 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -7,7 +7,7 @@ rec { description = ''Portable CL Locale Support''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."closure-common" args."cxml" args."flexi-streams" args."hu_dot_dwim_dot_stefil" args."iterate" args."local-time" args."metabang-bind" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz''; @@ -28,8 +28,6 @@ rec { (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closer-mop FILENAME closer-mop) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (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 hu.dwim.stefil FILENAME hu_dot_dwim_dot_stefil) (NAME iterate FILENAME iterate) (NAME local-time FILENAME local-time) @@ -39,7 +37,6 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel bordeaux-threads cl-fad cl-l10n-cldr cl-ppcre closer-mop - closure-common cxml cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams - hu.dwim.stefil iterate local-time metabang-bind parse-number puri - trivial-features trivial-gray-streams) + closure-common cxml flexi-streams hu.dwim.stefil iterate local-time + metabang-bind parse-number puri trivial-features trivial-gray-streams) VERSION 20161204-darcs SIBLINGS NIL PARASITES (cl-l10n/test)) */ 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 c950fa292a8bf357bb86a039d72ae5398e2fc60e..36d15673427c201ba30983b90be7f48c3d733f08 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 = ''20180831-git''; + version = ''20190107-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-08-31/cl-libuv-20180831-git.tgz''; - sha256 = ''1dxay9vw0wmlmwjq5xcs622n4m7g9ivfr46z1igdrkfqvmdz411f''; + url = ''http://beta.quicklisp.org/archive/cl-libuv/2019-01-07/cl-libuv-20190107-git.tgz''; + sha256 = ''1cfr29i5j78qy7ax2fs1z4nqyz3kx9121rlpdika12n1zvnhrcm8''; }; packageName = "cl-libuv"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. - 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 + SHA256 1cfr29i5j78qy7ax2fs1z4nqyz3kx9121rlpdika12n1zvnhrcm8 URL + http://beta.quicklisp.org/archive/cl-libuv/2019-01-07/cl-libuv-20190107-git.tgz + MD5 c09c505dc45812cc773454ffc6fdbd38 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 - 20180831-git SIBLINGS NIL PARASITES NIL) */ + 20190107-git SIBLINGS NIL PARASITES NIL) */ 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 0000000000000000000000000000000000000000..babdf04e3ec2f326d97213cc49451a33b132ba7a --- /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 a0443cb5af08209b3485667661eed1326020dc92..08b6a492e7663db1badf576ab42b3042c6d32ad1 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-20180831-git''; + version = ''postmodern-20190107-git''; - parasites = [ "cl-postgres/tests" ]; + parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ]; description = ''Low-level client library for PostgreSQL''; - deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ]; + deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz''; - sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx''; + url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz''; + sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5''; }; packageName = "cl-postgres"; @@ -20,13 +20,14 @@ rec { overrides = x: x; } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL - SHA256 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL - http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz - MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME cl-postgres FILENAME cl-postgres + SHA256 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL + http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz + MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb 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 split-sequence usocket) VERSION - postmodern-20180831-git SIBLINGS (postmodern s-sql simple-date) PARASITES - (cl-postgres/tests)) */ + DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket) + VERSION postmodern-20190107-git SIBLINGS (postmodern s-sql simple-date) + PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index d2b3de9cae181c6d90a17ec5298db43edded0656..4c97f03870fabc87c0774433797f47bcfb924b4e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-template''; - version = ''cl-unification-20171227-git''; + version = ''cl-unification-20190107-git''; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -12,8 +12,8 @@ REGULAR-EXPRESSION-TEMPLATE.''; deps = [ args."cl-ppcre" args."cl-unification" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; - sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz''; + sha256 = ''0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv''; }; packageName = "cl-ppcre-template"; @@ -27,12 +27,12 @@ REGULAR-EXPRESSION-TEMPLATE.''; This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE. - SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL - http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz - MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-ppcre-template FILENAME + SHA256 0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv URL + http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz + MD5 a7a12789cc48e571b0871d55cef11b7f NAME cl-ppcre-template FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-unification FILENAME cl-unification)) - DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20171227-git + DEPENDENCIES (cl-ppcre cl-unification) VERSION cl-unification-20190107-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification) 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 0000000000000000000000000000000000000000..358666877a6d97a046a2225114702343eb195015 --- /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 6d284b7b012089613580432c0c4a8e01bd819428..dbdd53a9346942d95b11c096807aa01a1bc952b2 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,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unification''; - version = ''20171227-git''; + version = ''20190107-git''; description = ''The CL-UNIFICATION system. @@ -10,8 +10,8 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz''; - sha256 = ''0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz''; + sha256 = ''0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv''; }; packageName = "cl-unification"; @@ -22,8 +22,8 @@ The system contains the definitions for the 'unification' machinery.''; /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. The system contains the definitions for the 'unification' machinery. - SHA256 0shwnvn5zf0iwgyqf3pa1b9cv2xghl7pss1ymrjgs95r6ijqxn2p URL - http://beta.quicklisp.org/archive/cl-unification/2017-12-27/cl-unification-20171227-git.tgz - MD5 45bfd18f8e15d16222e0f747992a6ce6 NAME cl-unification FILENAME - cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20171227-git SIBLINGS + SHA256 0mp40wh58afnpqx9i9wg5x364g35rkd6c9d5hb9g6pdxadqx0cfv URL + http://beta.quicklisp.org/archive/cl-unification/2019-01-07/cl-unification-20190107-git.tgz + MD5 a7a12789cc48e571b0871d55cef11b7f NAME cl-unification FILENAME + cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS (cl-unification-lib cl-unification-test cl-ppcre-template) PARASITES NIL) */ 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 af0e917425a10bbb51ac47507b4d94127ae07edf..f329437a75af9e002e897054dbc2cec15581918f 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-20180831-git''; + version = ''cl+ssl-20181018-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-08-31/cl+ssl-20180831-git.tgz''; - sha256 = ''1b35wz228kgcp9hc30mi38d004q2ixbv1b3krwycclnk4m65bl2r''; + url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz''; + sha256 = ''1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm''; }; packageName = "cl+ssl"; @@ -20,9 +20,9 @@ rec { overrides = x: x; } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 - 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 + 1rih343mrhhmma868bk9ip7s1gqqkwlmcq63vq8vpdr2wzv47srm URL + http://beta.quicklisp.org/archive/cl+ssl/2018-10-18/cl+ssl-20181018-git.tgz + MD5 45d92813cc134bf04725ee6a1f0c24a7 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-20180831-git SIBLINGS (cl+ssl.test) PARASITES + VERSION cl+ssl-20181018-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 index 252f9794e7691b8176ce6288af79c07462c8b9de..6de9d3f8fc9e313a857ab86ff9ca6c850171d838 100644 --- 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 @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-handler-hunchentoot''; - version = ''clack-20180831-git''; + version = ''clack-20181018-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''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack-handler-hunchentoot"; @@ -18,9 +18,9 @@ rec { 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 + SHA256 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME bordeaux-threads FILENAME bordeaux-threads) @@ -42,7 +42,7 @@ rec { 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 + VERSION clack-20181018-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 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 d5163cabe0456521dfc8828933c76ca6336a9978..745b87a65764b5d986d7d414198409508badf099 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 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-socket''; - version = ''clack-20180831-git''; + version = ''clack-20181018-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz''; - sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack-socket"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM clack-socket DESCRIPTION NIL SHA256 - 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 + 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 NAME clack-socket FILENAME + clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20181018-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 1d081fbef5819e679c9aabd7d39274c108130c85..c1c80e48cbdba4533a35a907546597ede8555538 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-20180831-git''; + version = ''clack-20181018-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."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-08-31/clack-20180831-git.tgz''; - sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack-test"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256 - 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL - http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz - MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-test FILENAME clack-test + 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 NAME clack-test FILENAME clack-test DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -71,7 +71,7 @@ rec { split-sequence static-vectors trivial-backtrace trivial-features trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket xsubseq) - VERSION clack-20180831-git SIBLINGS + VERSION clack-20181018-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 8b2e2c70453a3a32492b2aa1bc02df9f462c5bbf..5477fc5cd027258c655a1d5bfbcdaa8caec331d4 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-20180831-git''; + version = ''clack-20181018-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-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-08-31/clack-20180831-git.tgz''; - sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack-v1-compat"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 - 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL - http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz - MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack-v1-compat FILENAME + 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 NAME clack-v1-compat FILENAME clack-v1-compat DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora) (NAME babel FILENAME babel) @@ -73,7 +73,7 @@ rec { 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-20180831-git SIBLINGS + VERSION clack-20181018-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 0b2828d06dfcd9e648bd81f3c4a81c505bd32e56..612e6b5c066ee09293e50797f7683fc4dcfe5e8e 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 = ''20180831-git''; + version = ''20181018-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-08-31/clack-20180831-git.tgz''; - sha256 = ''0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647''; + url = ''http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz''; + sha256 = ''1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf''; }; packageName = "clack"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 - 0pfpm3l7l47j0mmwimy7c61ym8lg5m1dkzmz394snyywzcx54647 URL - http://beta.quicklisp.org/archive/clack/2018-08-31/clack-20180831-git.tgz - MD5 5042ece3b0a8b07cb4b318fbc250b4fe NAME clack FILENAME clack DEPS + 1f16i1pdqkh56ahnhxni3182q089d7ya8gxv4vyczsjzw93yakcf URL + http://beta.quicklisp.org/archive/clack/2018-10-18/clack-20181018-git.tgz + MD5 16121d921667ee8d0d70324da7281849 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 20180831-git SIBLINGS + VERSION 20181018-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 a13537d7e90f7c20be827a961dffe40a4e9bb2c5..ce078c3196aff892c8421d435bcc186bf2783fb9 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 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20180831-git''; + version = ''20190107-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-08-31/closer-mop-20180831-git.tgz''; - sha256 = ''01lzgh6rgbmfyfspiligkq44z56h2xgg55hxixnrgycbaipzgkbg''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz''; + sha256 = ''0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw''; }; 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 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) */ + SHA256 0h6fd0kr3g8dd782sxd7zrqljqfnw6pz1dsiadl0x853ki680gcw URL + http://beta.quicklisp.org/archive/closer-mop/2019-01-07/closer-mop-20190107-git.tgz + MD5 6aa5a1e9901b579eb50e2fb46035bc50 NAME closer-mop FILENAME closer-mop + DEPS NIL DEPENDENCIES NIL VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index fb808164aa29846362ff23a70c393d99fa5baf40..3866dd6f45941b3cc4a88c68652dff3d285a5fa5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''closure-common''; - version = ''20101107-git''; + version = ''20181018-git''; description = ''''; deps = [ args."alexandria" args."babel" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz''; - sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4''; + url = ''http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz''; + sha256 = ''18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn''; }; packageName = "closure-common"; @@ -18,12 +18,12 @@ rec { overrides = x: x; } /* (SYSTEM closure-common DESCRIPTION NIL SHA256 - 1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL - http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz - MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common FILENAME + 18bp7jnxma9hscp09fa723ws9nnynjil935rp8dy9hp6ypghpxpn URL + http://beta.quicklisp.org/archive/closure-common/2018-10-18/closure-common-20181018-git.tgz + MD5 b09ee60c258a29f0c107960ec4c04ada NAME closure-common FILENAME closure-common DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria babel trivial-features trivial-gray-streams) - VERSION 20101107-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20181018-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 685e81283688e69a96a4d62461e1157e1e517034..6f570ce5c8f0853a91dd2afbf2e53bfa7d6bb1b5 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 = ''20180711-git''; + version = ''20181210-git''; parasites = [ "clx/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."fiasco" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2018-07-11/clx-20180711-git.tgz''; - sha256 = ''0vpavllapc0j6j7iwxpxzgl8n5krvrwhmd5k2k0f3pr6sgl1y29h''; + url = ''http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz''; + sha256 = ''1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6''; }; packageName = "clx"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 - 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 + 1xaylf5j1xdyqmvpw7c3hdcc44bz8ax4rz02n8hvznwvg3xcman6 URL + http://beta.quicklisp.org/archive/clx/2018-12-10/clx-20181210-git.tgz MD5 + d6d0edd1594e6bc420b1e2ba0c453636 NAME clx FILENAME clx DEPS + ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20181210-git SIBLINGS NIL PARASITES (clx/test)) */ 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 c83b2993968749f965bbc2ef0082b014003a2b9e..98c565648dcb492bfb0eafac76e9a137c2c80fcf 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."named-readtables" 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."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''; @@ -33,8 +33,6 @@ rec { (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml) - (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 named-readtables FILENAME named-readtables) @@ -47,8 +45,7 @@ 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 - named-readtables puri split-sequence string-case swank symbol-munger - trivial-features trivial-gray-streams yacc) + 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 69ada2ce80a35cff4f86ff0fd4333c5d21b9d786..fcdb69f3c3515a3f4e2a6d2f3562e946b3689aaa 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."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" ]; + 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-stp" 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''; @@ -32,9 +32,7 @@ rec { (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml) - (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) - (NAME cxml-stp FILENAME cxml-stp) (NAME cxml-test FILENAME cxml-test) - (NAME cxml-xml FILENAME cxml-xml) + (NAME cxml-stp FILENAME cxml-stp) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate) (NAME named-readtables FILENAME named-readtables) @@ -46,9 +44,8 @@ rec { (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 - named-readtables parse-number puri split-sequence swank symbol-munger - trivial-features trivial-gray-streams xpath yacc) + closure-common closure-html collectors css-selectors cxml cxml-stp + 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 3316f59447d7c55f883e882b655055b425dcc2b0..aa523d6f838b30c5014429c3340d94795dae27b1 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."named-readtables" 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."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''; @@ -33,8 +33,6 @@ rec { (NAME closure-common FILENAME closure-common) (NAME closure-html FILENAME closure-html) (NAME collectors FILENAME collectors) (NAME cxml FILENAME cxml) - (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 lisp-unit2 FILENAME lisp-unit2) (NAME named-readtables FILENAME named-readtables) @@ -45,9 +43,8 @@ rec { (NAME yacc FILENAME yacc)) 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 - named-readtables puri split-sequence swank symbol-munger trivial-features - trivial-gray-streams yacc) + closer-mop closure-common closure-html collectors cxml 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/cxml-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix index 8fe30fa73a5eeb6c443958633ff63926a221d7f6..74648ba66a8c104e8a702b84b498b7213d8c02ce 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-stp.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cxml-stp''; - version = ''20120520-git''; + version = ''20181018-git''; parasites = [ "cxml-stp-test" ]; description = ''''; - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ]; + deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."rt" args."trivial-features" args."trivial-gray-streams" args."xpath" args."xpath_slash_test" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml-stp/2012-05-20/cxml-stp-20120520-git.tgz''; - sha256 = ''1pmh7wvkncbwwp30d445mhj21j210swq03f6hm44x1231s8r8azv''; + url = ''http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz''; + sha256 = ''0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77''; }; packageName = "cxml-stp"; @@ -20,20 +20,18 @@ rec { overrides = x: x; } /* (SYSTEM cxml-stp DESCRIPTION NIL SHA256 - 1pmh7wvkncbwwp30d445mhj21j210swq03f6hm44x1231s8r8azv URL - http://beta.quicklisp.org/archive/cxml-stp/2012-05-20/cxml-stp-20120520-git.tgz - MD5 7bc57586a91cd4d4864b8cbad3689d85 NAME cxml-stp FILENAME cxml-stp DEPS + 0xv6drasndp802mgww53n6hpf0qjh2r7d48rld1qibf20y80bz77 URL + http://beta.quicklisp.org/archive/cxml-stp/2018-10-18/cxml-stp-20181018-git.tgz + MD5 38d39fce85b270145d5a5bd4668d953f NAME cxml-stp FILENAME cxml-stp DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (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 parse-number FILENAME parse-number) (NAME puri FILENAME puri) (NAME rt FILENAME rt) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc)) + (NAME xpath FILENAME xpath) (NAME xpath/test FILENAME xpath_slash_test) + (NAME yacc FILENAME yacc)) DEPENDENCIES - (alexandria babel cl-ppcre closure-common cxml cxml-dom cxml-klacks - cxml-test cxml-xml parse-number puri rt trivial-features - trivial-gray-streams xpath yacc) - VERSION 20120520-git SIBLINGS NIL PARASITES (cxml-stp-test)) */ + (alexandria babel cl-ppcre closure-common cxml parse-number puri rt + trivial-features trivial-gray-streams xpath xpath/test yacc) + VERSION 20181018-git SIBLINGS NIL PARASITES (cxml-stp-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 56b2645c7ee2115535b3d8c6482ce071fe89c256..68a019fa027ddfae91e5918cf67db37d90e7a7d4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''cxml''; - version = ''20110619-git''; + version = ''20181018-git''; - parasites = [ "cxml-dom" "cxml-klacks" "cxml-test" "cxml-xml" ]; + parasites = [ "cxml/dom" "cxml/klacks" "cxml/test" "cxml/xml" ]; - description = ''''; + description = ''Closure XML - a Common Lisp XML parser''; deps = [ args."alexandria" args."babel" args."closure-common" args."puri" args."trivial-features" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; - sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + url = ''http://beta.quicklisp.org/archive/cxml/2018-10-18/cxml-20181018-git.tgz''; + sha256 = ''1s7nfq5zfpxsrayhn0gg3x8fj47mld00qm3cpv5whdqj3wd3krmn''; }; packageName = "cxml"; @@ -19,10 +19,10 @@ rec { asdFilesToKeep = ["cxml.asd"]; overrides = x: x; } -/* (SYSTEM cxml DESCRIPTION NIL SHA256 - 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL - http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 - 587755dff60416d4f716f4e785cf747e NAME cxml FILENAME cxml DEPS +/* (SYSTEM cxml DESCRIPTION Closure XML - a Common Lisp XML parser SHA256 + 1s7nfq5zfpxsrayhn0gg3x8fj47mld00qm3cpv5whdqj3wd3krmn URL + http://beta.quicklisp.org/archive/cxml/2018-10-18/cxml-20181018-git.tgz MD5 + 33c5546de7099d65fdb2fbb716fd3de8 NAME cxml FILENAME cxml DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME closure-common FILENAME closure-common) (NAME puri FILENAME puri) (NAME trivial-features FILENAME trivial-features) @@ -30,5 +30,5 @@ rec { DEPENDENCIES (alexandria babel closure-common puri trivial-features trivial-gray-streams) - VERSION 20110619-git SIBLINGS NIL PARASITES - (cxml-dom cxml-klacks cxml-test cxml-xml)) */ + VERSION 20181018-git SIBLINGS (cxml-dom cxml-klacks cxml-test) PARASITES + (cxml/dom cxml/klacks cxml/test cxml/xml)) */ 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 218107e95d6a1ad917eefaa52fd38298de7e3ae9..2f863a627bbc2bc25831f091a8dd18b36c483308 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-20180831-git''; + version = ''cl-dbi-20190107-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-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "dbd-mysql"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 - 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 + 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e 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-20180831-git SIBLINGS + VERSION cl-dbi-20190107-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 9387806255ac469a4a456e9eee7d897f076bb0db..f76f5e7e561db581c2be7e2e082101c4aee9cc88 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-20180831-git''; + version = ''cl-dbi-20190107-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-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "dbd-postgres"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 - 19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9 URL - http://beta.quicklisp.org/archive/cl-dbi/2018-08-31/cl-dbi-20180831-git.tgz - MD5 2fc95bff95d3cd25e3afeb003ee009d2 NAME dbd-postgres FILENAME + 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e 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-20180831-git SIBLINGS + VERSION cl-dbi-20190107-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 808914068a3594a2a7c7c7321b483e04b10ac7f9..01acb76767ea77581d7c803fcfa6e475c4f32f80 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-20180831-git''; + version = ''cl-dbi-20190107-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-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "dbd-sqlite3"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 - 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 + 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e 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-20180831-git SIBLINGS + VERSION cl-dbi-20190107-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 2de381f44b8e6e9495f1ead7e9d557cfa339ced7..382143eb8fb3ed42588d95c900723f991e63d9a9 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-20180831-git''; + version = ''cl-20190107-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-08-31/cl-dbi-20180831-git.tgz''; - sha256 = ''19cpzdzjjzm0if77dycsk8lj91ihwr51mbjmf3fx0wqwr8k5y0g9''; + url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz''; + sha256 = ''02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2''; }; packageName = "dbi"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp - 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 + SHA256 02w729jfkbd8443ia07ixr53b4asxx2gcllr84hvlibafawkkdh2 URL + http://beta.quicklisp.org/archive/cl-dbi/2019-01-07/cl-dbi-20190107-git.tgz + MD5 349829f5d0bf363b828827ad6728c54e 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-20180831-git SIBLINGS + VERSION cl-20190107-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 2e392928f4951decf8aa1aa510e5975dbd815651..c47d9f1a1aada9bbfd603010dceb2ff5e94f2ddf 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 = ''20180831-git''; + version = ''20181018-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-08-31/dexador-20180831-git.tgz''; - sha256 = ''1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs''; + url = ''http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz''; + sha256 = ''1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc''; }; packageName = "dexador"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 - 1isc4srz2ijg92lpws79ik8vgn9l2pzx4w3aqgri7n3pzfvfn6bs URL - http://beta.quicklisp.org/archive/dexador/2018-08-31/dexador-20180831-git.tgz - MD5 f2859026d90e63e79e8e4728168fab13 NAME dexador FILENAME dexador DEPS + 1pwzydf9paiqxsfawbf7j55h5fqkk0561p3rzflsfnmr1dabi9kc URL + http://beta.quicklisp.org/archive/dexador/2018-10-18/dexador-20181018-git.tgz + MD5 268ea459fac563834490247de52a6ce1 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 20180831-git SIBLINGS (dexador-test) PARASITES NIL) */ + VERSION 20181018-git SIBLINGS (dexador-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 95d335493b7d3957b3d37772f14e4e977fb6ba2e..3dbacdf0f81ad775593f7763de64fad963528ce9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''do-urlencode''; - version = ''20170830-git''; + version = ''20181018-git''; description = ''Percent Encoding (aka URL Encoding) library''; - deps = [ args."alexandria" args."babel" args."babel-streams" args."trivial-features" args."trivial-gray-streams" ]; + deps = [ args."alexandria" args."babel" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz''; - sha256 = ''1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n''; + url = ''http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz''; + sha256 = ''1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2''; }; packageName = "do-urlencode"; @@ -18,14 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library - SHA256 1584prmmz601fp396qxrivylb7nrnclg9rnwrsnwiij79v6zz40n URL - http://beta.quicklisp.org/archive/do-urlencode/2017-08-30/do-urlencode-20170830-git.tgz - MD5 071a18bb58ed5c7d5184b34e672b5d91 NAME do-urlencode FILENAME + SHA256 1cajd219s515y65kp562c6xczqaq0p4lyp13iv00z6i44rijmfp2 URL + http://beta.quicklisp.org/archive/do-urlencode/2018-10-18/do-urlencode-20181018-git.tgz + MD5 cb6ab78689fe52680ee1b94cd7738b94 NAME do-urlencode FILENAME do-urlencode DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME babel-streams FILENAME babel-streams) - (NAME trivial-features FILENAME trivial-features) - (NAME trivial-gray-streams FILENAME trivial-gray-streams)) - DEPENDENCIES - (alexandria babel babel-streams trivial-features trivial-gray-streams) - VERSION 20170830-git SIBLINGS NIL PARASITES NIL) */ + (NAME trivial-features FILENAME trivial-features)) + DEPENDENCIES (alexandria babel trivial-features) VERSION 20181018-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 36411ca057534435ee722e632f2f63d0489f6a3b..3b2d0225ff9212e706f9c155f3de8502e22944a1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20180430-git''; + version = ''20190107-git''; parasites = [ "esrap/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz''; - sha256 = ''1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav''; + url = ''http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz''; + sha256 = ''0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs''; }; packageName = "esrap"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 - 1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav URL - http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz - MD5 51efcf9b228ebfe63831db8ba797b0e8 NAME esrap FILENAME esrap DEPS + 0kb4szcd7v4qj56p0yg1abvk79is6p5myri3gakzm87l2nmg15xs URL + http://beta.quicklisp.org/archive/esrap/2019-01-07/esrap-20190107-git.tgz + MD5 b8c98e84e3c63e4e3ce2f6c8b4d4bab7 NAME esrap FILENAME esrap DEPS ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam)) - DEPENDENCIES (alexandria fiveam) VERSION 20180430-git SIBLINGS NIL + DEPENDENCIES (alexandria fiveam) VERSION 20190107-git SIBLINGS NIL PARASITES (esrap/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix index 29fd1efe2f5e3a190608e1f707122888f2f19aff..87d9fe983ec37c9190488ee41503f2989e3d3aff 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix @@ -1,17 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''fiasco''; - version = ''20180228-git''; + version = ''20181210-git''; parasites = [ "fiasco-self-tests" ]; description = ''A Common Lisp test framework that treasures your failures, logical continuation of Stefil.''; - deps = [ args."alexandria" ]; + deps = [ args."alexandria" args."trivial-gray-streams" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz''; - sha256 = ''0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy''; + url = ''http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz''; + sha256 = ''0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y''; }; packageName = "fiasco"; @@ -21,8 +21,10 @@ rec { } /* (SYSTEM fiasco DESCRIPTION A Common Lisp test framework that treasures your failures, logical continuation of Stefil. - SHA256 0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy URL - http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz - MD5 a924e43c335836d2e44731dee6a1b8e6 NAME fiasco FILENAME fiasco DEPS - ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION - 20180228-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */ + SHA256 0l4wjik8iwipy67lbdrjhcvz7zldv85nykbxasis4zmmh001777y URL + http://beta.quicklisp.org/archive/fiasco/2018-12-10/fiasco-20181210-git.tgz + MD5 9d3c0ec30c7f73490188f27eaec00fd8 NAME fiasco FILENAME fiasco DEPS + ((NAME alexandria FILENAME alexandria) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20181210-git + SIBLINGS NIL PARASITES (fiasco-self-tests)) */ 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 08b6d35a1fb96451d022766879e4403db91a2aa2..d9b25bebddc3fc564da1f73594947a67190202cc 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 = ''20180711-git''; + version = ''20190107-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-07-11/flexi-streams-20180711-git.tgz''; - sha256 = ''1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2''; + url = ''http://beta.quicklisp.org/archive/flexi-streams/2019-01-07/flexi-streams-20190107-git.tgz''; + sha256 = ''1fqkkvspsdzvrr2rkp6i631m7bwx06j68s19cjzpmnhr9zn696i5''; }; packageName = "flexi-streams"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp - SHA256 1g7a5fbl84zx3139kvvgwq6d8bnbpbvq9mr5yj4jzfa6pjfjwgz2 URL - http://beta.quicklisp.org/archive/flexi-streams/2018-07-11/flexi-streams-20180711-git.tgz - MD5 1e5bc255540dcbd71f9cba56573cfb4c NAME flexi-streams FILENAME + SHA256 1fqkkvspsdzvrr2rkp6i631m7bwx06j68s19cjzpmnhr9zn696i5 URL + http://beta.quicklisp.org/archive/flexi-streams/2019-01-07/flexi-streams-20190107-git.tgz + MD5 b59014f9f9f0d1b94f161e36e64a35c2 NAME flexi-streams FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES - (trivial-gray-streams) VERSION 20180711-git SIBLINGS NIL PARASITES + (trivial-gray-streams) VERSION 20190107-git SIBLINGS NIL PARASITES (flexi-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index 433a31be0d8b1f80ae7622f92687ff864b619954..3754829ac37b3564bd8303110e98bfd267b76b06 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''http-body''; - version = ''20161204-git''; + version = ''20181210-git''; description = ''HTTP POST data parser for Common Lisp''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz''; - sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi''; + url = ''http://beta.quicklisp.org/archive/http-body/2018-12-10/http-body-20181210-git.tgz''; + sha256 = ''170w8rcabf72yq2w9a8134n1sgy7mgirkdj9fzwbr29gqv93plcz''; }; packageName = "http-body"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 - 1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL - http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz - MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body FILENAME http-body DEPS + 170w8rcabf72yq2w9a8134n1sgy7mgirkdj9fzwbr29gqv93plcz URL + http://beta.quicklisp.org/archive/http-body/2018-12-10/http-body-20181210-git.tgz + MD5 9699bbb11386c6e4d5cf35bea30dbf7f NAME http-body FILENAME http-body 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) @@ -46,4 +46,4 @@ rec { jonathan named-readtables proc-parse quri smart-buffer split-sequence static-vectors trivial-features trivial-gray-streams trivial-types xsubseq) - VERSION 20161204-git SIBLINGS (http-body-test) PARASITES NIL) */ + VERSION 20181210-git SIBLINGS (http-body-test) 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 3d259fc5b6c5f17518a9f17ec48bc8f16cfb253b..4c3bcbb42b061e3180be3b19f22e3f9f13ed8fce 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.42''; + version = ''v0.44''; parasites = [ "ironclad/tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."nibbles" args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz''; - sha256 = ''1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr''; + url = ''http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz''; + sha256 = ''0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y''; }; packageName = "ironclad"; @@ -21,9 +21,9 @@ rec { } /* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 - 1rrw0mhvja407ycryw56wwm45cpf3dc73h965smy75ddha4xn7zr URL - http://beta.quicklisp.org/archive/ironclad/2018-08-31/ironclad-v0.42.tgz - MD5 18f2dbc9dbff97de9ea44af5344485b5 NAME ironclad FILENAME ironclad DEPS + 0qxvvv9hp6843s3n4fnj2fl26xzdpnk91j1h0sgi8v0fbfakwl2y URL + http://beta.quicklisp.org/archive/ironclad/2018-12-10/ironclad-v0.44.tgz + MD5 ebce1cbac421a5d7ad461cdaed4ac863 NAME ironclad FILENAME ironclad DEPS ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES - (nibbles rt) VERSION v0.42 SIBLINGS (ironclad-text) PARASITES + (nibbles rt) VERSION v0.44 SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index ae323790ba06a37381fe1ee905bd47274f829dc1..81493865b8643b8c565695c2138a68c98e8cf9fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''jonathan''; - version = ''20180430-git''; + version = ''20181210-git''; description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz''; - sha256 = ''0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0''; + url = ''http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz''; + sha256 = ''1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh''; }; packageName = "jonathan"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. - SHA256 0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0 URL - http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz - MD5 7dc695be1b571f19aa9cd2b13aa231bb NAME jonathan FILENAME jonathan DEPS + SHA256 1m0cz8r48zvwbsywrgj9zdlfy48iycxb4h9l8wg04gmb5xv82rxh URL + http://beta.quicklisp.org/archive/jonathan/2018-12-10/jonathan-20181210-git.tgz + MD5 eb76f293df02d1b85faf92b92cb24d53 NAME jonathan FILENAME jonathan 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) @@ -39,4 +39,4 @@ rec { (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre cl-syntax cl-syntax-annot fast-io named-readtables proc-parse static-vectors trivial-features trivial-gray-streams trivial-types) - VERSION 20180430-git SIBLINGS (jonathan-test) PARASITES NIL) */ + VERSION 20181210-git SIBLINGS (jonathan-test) PARASITES NIL) */ 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 94edb06e6aee135c031377232accf14386590ce4..b99f7867a7ac709c0a9b8c7aa3a207e7b1d6a76d 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 @@ args @ { fetchurl, ... }: rec { baseName = ''lack-component''; - version = ''lack-20180831-git''; + version = ''lack-20181210-git''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; - sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; + url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; + sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; }; packageName = "lack-component"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM lack-component DESCRIPTION NIL SHA256 - 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 + 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL + http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 + b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-component FILENAME + lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20181210-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 a98028e0c060be7f53ad22e48e854e3e9667cad8..7cce4b212941710deb08d1d166d282e62193a43b 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-20180831-git''; + version = ''lack-20181210-git''; description = ''''; deps = [ args."uiop" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; - sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; + url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; + sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; }; packageName = "lack-middleware-backtrace"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 - 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL - http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 - fd57a7185997a1a5f37bbd9d6899118d NAME lack-middleware-backtrace FILENAME + 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL + http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 + b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES - (uiop) VERSION lack-20180831-git SIBLINGS + (uiop) VERSION lack-20181210-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 3478ac8488b47450d6479c168cc80c1d9c6ae744..6da62f22f65f9549ce3018d54ef7d258aba9eb70 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-20180831-git''; + version = ''lack-20181210-git''; description = ''''; deps = [ args."ironclad" args."nibbles" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz''; - sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; + url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; + sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; }; packageName = "lack-util"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM lack-util DESCRIPTION NIL SHA256 - 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL - http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 - fd57a7185997a1a5f37bbd9d6899118d NAME lack-util FILENAME lack-util DEPS + 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL + http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 + b75ab822b0b1d7fa5ff4d47db3ec80dd NAME lack-util FILENAME lack-util DEPS ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles)) - DEPENDENCIES (ironclad nibbles) VERSION lack-20180831-git SIBLINGS + DEPENDENCIES (ironclad nibbles) VERSION lack-20181210-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 fdcda10a275f6c95d6328b154e8599dfa95e7cda..c8ef9a7f670874a2b2f5dd92d6e48edab96fa61d 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 = ''20180831-git''; + version = ''20181210-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-08-31/lack-20180831-git.tgz''; - sha256 = ''0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n''; + url = ''http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz''; + sha256 = ''00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8''; }; packageName = "lack"; @@ -18,14 +18,14 @@ rec { overrides = x: x; } /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 - 0x4b3v5qvrik5c8nn4kpxygv78srqb306jcypkhpyc65ig81gr9n URL - http://beta.quicklisp.org/archive/lack/2018-08-31/lack-20180831-git.tgz MD5 - fd57a7185997a1a5f37bbd9d6899118d NAME lack FILENAME lack DEPS + 00i36c5r5nk8abqqxhclr9nj6wawpybf5raswpm18h0kpxyf6qz8 URL + http://beta.quicklisp.org/archive/lack/2018-12-10/lack-20181210-git.tgz MD5 + b75ab822b0b1d7fa5ff4d47db3ec80dd 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 - 20180831-git SIBLINGS + 20181210-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/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index a123b7ed3c02b8a0b5229eb131b4f38bc5380508..1a94c643d8af510a704250ab1408b127d0df62c8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20180228-git''; + version = ''20181210-git''; parasites = [ "local-time/test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz''; - sha256 = ''0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1''; + url = ''http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz''; + sha256 = ''0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s''; }; packageName = "local-time"; @@ -21,12 +21,12 @@ rec { } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum - SHA256 0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1 URL - http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz - MD5 6bb475cb979c4ba004ef4f4c970dec47 NAME local-time FILENAME local-time + SHA256 0m17mjql9f2glr9f2cg5d2dk5gi2xjjqxih18dx71jpbd71m6q4s URL + http://beta.quicklisp.org/archive/local-time/2018-12-10/local-time-20181210-git.tgz + MD5 161762ecff2ffbe4dc68c8dc28472515 NAME local-time FILENAME local-time DEPS ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil)) DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION - 20180228-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */ + 20181210-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/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 ad335774cbb5331a3f5165346237ab5df86fa4a5..19382889315a418333e0a1fb4d4248b9241437c3 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 = ''20180831-git''; + version = ''20190107-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-08-31/lquery-20180831-git.tgz''; - sha256 = ''1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v''; + url = ''http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz''; + sha256 = ''023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r''; }; packageName = "lquery"; @@ -19,13 +19,13 @@ rec { } /* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 - 1nb2hvcw043qlqxch7lky67k0r9gxjwaggkm8hfznlijbkgbfy2v URL - http://beta.quicklisp.org/archive/lquery/2018-08-31/lquery-20180831-git.tgz - MD5 d0d3efa47f151afeb754c4bc0c059acf NAME lquery FILENAME lquery DEPS + 023w4hsclqhw9bg1rfva0sapqmnmgsvf9gngbfhqcfgsdf7wff9r URL + http://beta.quicklisp.org/archive/lquery/2019-01-07/lquery-20190107-git.tgz + MD5 295245984aa471d2709dcf926abd82e2 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 20180831-git SIBLINGS (lquery-test) PARASITES NIL) */ + VERSION 20190107-git SIBLINGS (lquery-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index fe2fc42a18b97f6fd469cbf13e1639baae20d950..068d0eba69dddd2b198f41a0ce356ca96963ce31 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''myway''; - version = ''20150302-git''; + version = ''20181018-git''; description = ''Sinatra-compatible routing library.''; deps = [ args."alexandria" args."babel" args."cl-ppcre" args."cl-utilities" args."map-set" args."quri" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz''; - sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh''; + url = ''http://beta.quicklisp.org/archive/myway/2018-10-18/myway-20181018-git.tgz''; + sha256 = ''0ffd92mmir2k6i4771ppqvb3xhqlk2yh5znx7i391vq5ji3k5jij''; }; packageName = "myway"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 - 1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL - http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz - MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway FILENAME myway DEPS + 0ffd92mmir2k6i4771ppqvb3xhqlk2yh5znx7i391vq5ji3k5jij URL + http://beta.quicklisp.org/archive/myway/2018-10-18/myway-20181018-git.tgz + MD5 88adecdaec89ceb262559d443512e545 NAME myway FILENAME myway DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-utilities FILENAME cl-utilities) (NAME map-set FILENAME map-set) @@ -29,4 +29,4 @@ rec { DEPENDENCIES (alexandria babel cl-ppcre cl-utilities map-set quri split-sequence trivial-features) - VERSION 20150302-git SIBLINGS (myway-test) PARASITES NIL) */ + VERSION 20181018-git SIBLINGS (myway-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index bb5121667ac659e9834aa35575f9ef1da919d863..bf6216dcaddc5069c988430c11e8cfe3f493d9ba 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''parenscript''; - version = ''Parenscript-2.6''; + version = ''Parenscript-2.7.1''; description = ''Lisp to JavaScript transpiler''; deps = [ args."anaphora" args."cl-ppcre" args."named-readtables" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz''; - sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li''; + url = ''http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz''; + sha256 = ''1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f''; }; packageName = "parenscript"; @@ -18,11 +18,11 @@ rec { overrides = x: x; } /* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 - 1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL - http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz - MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript FILENAME parenscript + 1vbldjzj9py8vqyk0f3rb795cjai0h7p858dflm4l8p0kp4mll6f URL + http://beta.quicklisp.org/archive/parenscript/2018-12-10/Parenscript-2.7.1.tgz + MD5 047c9a72bd36f1b4a5ec67af9453a0b9 NAME parenscript FILENAME parenscript DEPS ((NAME anaphora FILENAME anaphora) (NAME cl-ppcre FILENAME cl-ppcre) (NAME named-readtables FILENAME named-readtables)) - DEPENDENCIES (anaphora cl-ppcre named-readtables) VERSION Parenscript-2.6 - SIBLINGS (parenscript.test) PARASITES NIL) */ + DEPENDENCIES (anaphora cl-ppcre named-readtables) VERSION Parenscript-2.7.1 + SIBLINGS (parenscript.tests) PARASITES NIL) */ 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 0a1591d7c4249ebaa3fe7a925c52e8da7b178ecf..9f36a6717659a2280e11b7346ebb5ee9eaa68274 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 = ''20180831-git''; + version = ''20190107-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-08-31/plump-20180831-git.tgz''; - sha256 = ''0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf''; + url = ''http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz''; + sha256 = ''0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3''; }; packageName = "plump"; @@ -19,11 +19,11 @@ rec { } /* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 - 0pa4z9yjm68lpw1hdidicrwj7dfvf2jk110rnqq6p8ahxc117zbf URL - http://beta.quicklisp.org/archive/plump/2018-08-31/plump-20180831-git.tgz - MD5 5a899a19906fd22fb0cb1c65eb584891 NAME plump FILENAME plump DEPS + 0kc93374dvr9mz6k4c0xx47jjx5sjrxs151vnnpx8jxr4cc620l3 URL + http://beta.quicklisp.org/archive/plump/2019-01-07/plump-20190107-git.tgz + MD5 5b1a46b83536d5bf1a082a1ef191d3aa 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 - 20180831-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ + 20190107-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index da8cb466b4120872ad23c0516d2f9b11ff128e3e..589f69178991e01b9f89d34f8aafe7939a4a9375 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''query-fs''; - version = ''20160531-git''; + version = ''20190107-git''; description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz''; - sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a''; + url = ''http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz''; + sha256 = ''1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4''; }; packageName = "query-fs"; @@ -19,9 +19,9 @@ rec { } /* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries - SHA256 0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL - http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz - MD5 dfbb3d0e7b5d990488a17b184771d049 NAME query-fs FILENAME query-fs DEPS + SHA256 1980k3l970ma1571myr66nxaxkg2vzf81a2wn28qcx40niy6pbq4 URL + http://beta.quicklisp.org/archive/query-fs/2019-01-07/query-fs-20190107-git.tgz + MD5 3abd1f0a2f82d10d919bb5b4aa5485be NAME query-fs FILENAME query-fs 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) @@ -40,4 +40,4 @@ rec { (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall pcall-queue trivial-backtrace trivial-features trivial-utf-8) - VERSION 20160531-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20190107-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 75eade4d31715d5f15d24dea085b567eefd1ca0b..2f30db52448c921f0d40def4dfd964dbf225648b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -1,15 +1,15 @@ args @ { fetchurl, ... }: rec { baseName = ''quri''; - version = ''20161204-git''; + version = ''20181210-git''; description = ''Yet another URI library for Common Lisp''; deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz''; - sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv''; + url = ''http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz''; + sha256 = ''0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4''; }; packageName = "quri"; @@ -18,13 +18,13 @@ rec { overrides = x: x; } /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 - 14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL - http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5 - 8c87e99d4f7308d83aab361a6e36508a NAME quri FILENAME quri DEPS + 0iy2q1jg1j07sw5al6c325zkwcbs218z3dszd785vl89ms6kjyn4 URL + http://beta.quicklisp.org/archive/quri/2018-12-10/quri-20181210-git.tgz MD5 + 94f607540ccc8a15a4439527e41bf7ac NAME quri FILENAME quri DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-utilities FILENAME cl-utilities) (NAME split-sequence FILENAME split-sequence) (NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (alexandria babel cl-utilities split-sequence trivial-features) VERSION - 20161204-git SIBLINGS (quri-test) PARASITES NIL) */ + 20181210-git SIBLINGS (quri-test) PARASITES NIL) */ 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 b1e89b3eef8aae23bb008b0dc315dd501e83305e..86890d60dc5eef8836101f8f342afc818ff59451 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-20180831-git''; + version = ''postmodern-20190107-git''; - parasites = [ "simple-date/postgres-glue" ]; + parasites = [ "simple-date/postgres-glue" "simple-date/tests" ]; description = ''''; - deps = [ args."cl-postgres" args."md5" args."usocket" ]; + deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz''; - sha256 = ''062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx''; + url = ''http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz''; + sha256 = ''030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5''; }; packageName = "simple-date"; @@ -20,12 +20,12 @@ rec { overrides = x: x; } /* (SYSTEM simple-date DESCRIPTION NIL SHA256 - 062xhy6aadzgmwpz8h0n7884yv5m4nwqmxrc75m3c60k1lmccpwx URL - http://beta.quicklisp.org/archive/postmodern/2018-08-31/postmodern-20180831-git.tgz - MD5 78c3e998cff7305db5e4b4e90b9bbee6 NAME simple-date FILENAME simple-date + 030p5kp593p4z7p3k0828dlayglw2si3q187z1fafgpvspp42sd5 URL + http://beta.quicklisp.org/archive/postmodern/2019-01-07/postmodern-20190107-git.tgz + MD5 3f6f78c4fb0f5a8bb9f13247f1f3d6eb NAME simple-date FILENAME simple-date DEPS - ((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)) */ + ((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-20190107-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES + (simple-date/postgres-glue simple-date/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index 4db468081da8227a7168646c3cf6d39abe49c6a1..f0a21983f16faecff671b0549a4f309d24c52cf2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''split-sequence''; - version = ''v1.4.1''; + version = ''v1.5.0''; parasites = [ "split-sequence/tests" ]; @@ -11,8 +11,8 @@ rec { deps = [ args."fiveam" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz''; - sha256 = ''04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q''; + url = ''http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz''; + sha256 = ''0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g''; }; packageName = "split-sequence"; @@ -23,8 +23,8 @@ rec { /* (SYSTEM split-sequence DESCRIPTION Splits a sequence into a list of subsequences delimited by objects satisfying a test. - SHA256 04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q URL - http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz - MD5 b85e3ef2bc2cb2ce8a2c101759539ba7 NAME split-sequence FILENAME + SHA256 0cxdgprb8c15fydm09aqvc8sdp5n87m6khv70kzkms1n2vm6sb0g URL + http://beta.quicklisp.org/archive/split-sequence/2018-10-18/split-sequence-v1.5.0.tgz + MD5 67844853787187d993e6d530306eb2b4 NAME split-sequence FILENAME split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam) - VERSION v1.4.1 SIBLINGS NIL PARASITES (split-sequence/tests)) */ + VERSION v1.5.0 SIBLINGS NIL PARASITES (split-sequence/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix index 0dca605c1fdfde3c4529e2fa7c9640bd6e24090e..df63a5c9836af9b87bf77c91fcaea2c7e45fb694 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stefil.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''stefil''; - version = ''20101107-darcs''; + version = ''20181210-git''; parasites = [ "stefil-test" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."alexandria" args."iterate" args."metabang-bind" args."swank" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz''; - sha256 = ''0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3''; + url = ''http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz''; + sha256 = ''10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g''; }; packageName = "stefil"; @@ -20,10 +20,10 @@ rec { overrides = x: x; } /* (SYSTEM stefil DESCRIPTION Stefil - Simple Test Framework In Lisp SHA256 - 0d81js0p02plv7wy1640xmghb4s06gay76pqw2k3dnamkglcglz3 URL - http://beta.quicklisp.org/archive/stefil/2010-11-07/stefil-20101107-darcs.tgz - MD5 8c56bc03e7679e4d42bb3bb3b101de80 NAME stefil FILENAME stefil DEPS + 10dr8yjrjc2pyx55knds5llh9k716khlvbkmpxh0vn8rdmxmz96g URL + http://beta.quicklisp.org/archive/stefil/2018-12-10/stefil-20181210-git.tgz + MD5 3418bf358366748593f65e4b6e1bb8cf NAME stefil FILENAME stefil DEPS ((NAME alexandria FILENAME alexandria) (NAME iterate FILENAME iterate) (NAME metabang-bind FILENAME metabang-bind) (NAME swank FILENAME swank)) - DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION - 20101107-darcs SIBLINGS NIL PARASITES (stefil-test)) */ + DEPENDENCIES (alexandria iterate metabang-bind swank) VERSION 20181210-git + SIBLINGS NIL PARASITES (stefil-test)) */ 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 bb39c74c96253250a9ed9c99d99d64655420d5ef..e75cb087f38db7be5c710ebd4b381b0801933411 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 = ''20180831-git''; + version = ''20190107-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-08-31/stumpwm-20180831-git.tgz''; - sha256 = ''1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz''; + sha256 = ''1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar''; }; packageName = "stumpwm"; @@ -18,10 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 - 1zis6aqdr18vd78wl9jpv2fmbzn37zvhb6gj44dpfydl67hjc89w URL - http://beta.quicklisp.org/archive/stumpwm/2018-08-31/stumpwm-20180831-git.tgz - MD5 a523654c5f7ffdfe6c6c4f37e9499851 NAME stumpwm FILENAME stumpwm DEPS + 1i9l1jaxa38fp6s3wmbg5cnn27j4ry8z1mh3w5bhyq0b54zxbcar URL + http://beta.quicklisp.org/archive/stumpwm/2019-01-07/stumpwm-20190107-git.tgz + MD5 5634a308f5b40d9bab1f7c066aa6b9df 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 20180831-git SIBLINGS + DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190107-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 9734118526c61552acea4a68e25dcebbcce9f465..301b12a8998e1d022b72f300ac2942b444be116f 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 @@ args @ { fetchurl, ... }: rec { baseName = ''swank''; - version = ''slime-v2.22''; + version = ''slime-v2.23''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/slime/2018-08-31/slime-v2.22.tgz''; - sha256 = ''0ql0bjijypghi884085idq542yms2gk4rq1035j3vznkqrlnaqbk''; + url = ''http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz''; + sha256 = ''1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky''; }; packageName = "swank"; @@ -18,7 +18,7 @@ rec { overrides = x: x; } /* (SYSTEM swank DESCRIPTION NIL SHA256 - 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) */ + 1ml602yq5s38x0syg0grik8i4h01jw06yja87vpkjl3mkxqvxvky URL + http://beta.quicklisp.org/archive/slime/2019-01-07/slime-v2.23.tgz MD5 + 726724480d861d97e8b58bc8f9f27697 NAME swank FILENAME swank DEPS NIL + DEPENDENCIES NIL VERSION slime-v2.23 SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index 7c3a01f5d111c88c70692d472dc508defd4bdd30..5c3c486fb0ff1c960c0807c168a12b9605e014c1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-garbage''; - version = ''20150113-git''; + version = ''20181018-git''; parasites = [ "trivial-garbage-tests" ]; @@ -10,8 +10,8 @@ rec { deps = [ args."rt" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz''; - sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08''; + url = ''http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz''; + sha256 = ''0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl''; }; packageName = "trivial-garbage"; @@ -21,8 +21,8 @@ rec { } /* (SYSTEM trivial-garbage DESCRIPTION Portable finalizers, weak hash-tables and weak pointers. SHA256 - 1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08 URL - http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz - MD5 59153568703eed631e53092ab67f935e NAME trivial-garbage FILENAME + 0hiflg8iak99bbgv0lqj6zwqyklx85ixp7yp4r8xzzm61ya613pl URL + http://beta.quicklisp.org/archive/trivial-garbage/2018-10-18/trivial-garbage-20181018-git.tgz + MD5 4d1d1ab0518b375da21b9a6eeaa498e3 NAME trivial-garbage FILENAME trivial-garbage DEPS ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION - 20150113-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */ + 20181018-git SIBLINGS NIL PARASITES (trivial-garbage-tests)) */ 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 edb01bd2fc52d5f611eeb0d0a6315c3cac989c06..2aee236ac0cad0a3f112c600d484e2bd7b9a8b63 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 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-gray-streams''; - version = ''20180831-git''; + version = ''20181018-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-08-31/trivial-gray-streams-20180831-git.tgz''; - sha256 = ''0mh9w8inqxb6lpq787grnf72qlcrjd0a7qs6psjyfs6iazs14170''; + url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-10-18/trivial-gray-streams-20181018-git.tgz''; + sha256 = ''0a1dmf7m9zbv3p6f5mzb413cy4fz9ahaykqp3ik1a98ivy0i74iv''; }; 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 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 + SHA256 0a1dmf7m9zbv3p6f5mzb413cy4fz9ahaykqp3ik1a98ivy0i74iv URL + http://beta.quicklisp.org/archive/trivial-gray-streams/2018-10-18/trivial-gray-streams-20181018-git.tgz + MD5 0a9f564079dc41ce10d7869d82cc0952 NAME trivial-gray-streams FILENAME + trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20181018-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 4214779af3207ad7951636dc554e82944379da07..d34913b1656c3179b11ac2462821c9b308f9b7cb 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 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20180831-git''; + version = ''20181018-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-08-31/trivial-indent-20180831-git.tgz''; - sha256 = ''017ydjyp9v1bqfhg6yq73q7lf2ds3g7s8i9ng9n7iv2k9ffxm65m''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz''; + sha256 = ''0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g''; }; packageName = "trivial-indent"; @@ -19,8 +19,8 @@ rec { } /* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 - 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 + 0lrbzm1dsf28q7vh9g8n8i5gzd5lxzfaphsa5dd9k2ahdr912c2g URL + http://beta.quicklisp.org/archive/trivial-indent/2018-10-18/trivial-indent-20181018-git.tgz + MD5 87679f984544027ac939c22e288b09c5 NAME trivial-indent FILENAME + trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */ 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 4a36b6563534b5ecb3455524ec9f04d7c3152d18..0d8822c2f4fe09cd0280cfe909b7cd835a8b6c40 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 = ''20180831-git''; + version = ''20181210-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" ]; + 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."vom" args."xsubseq" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz''; - sha256 = ''142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8''; + url = ''http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz''; + sha256 = ''1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms''; }; packageName = "woo"; @@ -18,9 +18,9 @@ rec { overrides = x: x; } /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp - SHA256 142f3d9bv2zd0l9p1pavf05c2wi4jiz521wji9zyysspmibys3z8 URL - http://beta.quicklisp.org/archive/woo/2018-08-31/woo-20180831-git.tgz MD5 - 93dfbc504ebd4fa7ed5f444fcc5444e7 NAME woo FILENAME woo DEPS + SHA256 1j00hvlhc24r3zyxh3bjb3xj74lyrvmbdgsdabidjxlzihmcb4ms URL + http://beta.quicklisp.org/archive/woo/2018-12-10/woo-20181210-git.tgz MD5 + ecc4d7c194b3a941e381d9e6392d51c9 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) @@ -36,11 +36,11 @@ rec { (NAME swap-bytes FILENAME swap-bytes) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) - (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop) - (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq)) + (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME vom FILENAME vom) + (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain 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 20180831-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */ + trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq) + VERSION 20181210-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 6db21bf9005e1259b88703fd85e3954f38fb66ac..f717441068b6106a76b5b20cbcb474fb043232cb 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 = ''20180831-git''; + version = ''20181018-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" ]; + deps = [ args."alexandria" args."babel" 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-08-31/wookie-20180831-git.tgz''; - sha256 = ''1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx''; + url = ''http://beta.quicklisp.org/archive/wookie/2018-10-18/wookie-20181018-git.tgz''; + sha256 = ''0z7v7fg9dm6g4kdvfi588vnfh0dv2knb0z3rf5a9fw8yrvckifdq''; }; packageName = "wookie"; @@ -18,11 +18,10 @@ rec { overrides = x: x; } /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 - 1hy6hdfhdfnyd00q3v7ryjqvq7x8j22yy4l52p24jj0n19mx3pjx URL - http://beta.quicklisp.org/archive/wookie/2018-08-31/wookie-20180831-git.tgz - MD5 c825760241580a95c68b1ac6f428e07e NAME wookie FILENAME wookie DEPS + 0z7v7fg9dm6g4kdvfi588vnfh0dv2knb0z3rf5a9fw8yrvckifdq URL + http://beta.quicklisp.org/archive/wookie/2018-10-18/wookie-20181018-git.tgz + MD5 91e350e5aca3c3a5c56371bff8f754ae NAME wookie FILENAME wookie DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) - (NAME babel-streams FILENAME babel-streams) (NAME blackbird FILENAME blackbird) (NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) @@ -44,9 +43,9 @@ rec { (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq)) DEPENDENCIES - (alexandria babel babel-streams blackbird bordeaux-threads cffi cffi-grovel + (alexandria babel blackbird bordeaux-threads cffi cffi-grovel cffi-toolchain chunga cl-async cl-async-base cl-async-ssl cl-async-util 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 20180831-git SIBLINGS NIL PARASITES NIL) */ + VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix index 63b8e21b4a30574c53211fd6104afa0906342948..ad90b8552181e81660578ef24bf6cd43da663f4b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xpath.nix @@ -1,15 +1,17 @@ args @ { fetchurl, ... }: rec { baseName = ''xpath''; - version = ''plexippus-20120909-darcs''; + version = ''plexippus-20181210-git''; - description = ''''; + parasites = [ "xpath/test" ]; - deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; + description = ''An implementation of the XML Path Language (XPath) Version 1.0''; + + deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."parse-number" args."puri" args."trivial-features" args."trivial-gray-streams" args."yacc" ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2012-09-09/plexippus-xpath-20120909-darcs.tgz''; - sha256 = ''1zlkr7ck60gr5rxfiq22prnbblih14ywr0s5g2kss2a842zvkxn6''; + url = ''http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz''; + sha256 = ''1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn''; }; packageName = "xpath"; @@ -17,21 +19,19 @@ rec { asdFilesToKeep = ["xpath.asd"]; overrides = x: x; } -/* (SYSTEM xpath DESCRIPTION NIL SHA256 - 1zlkr7ck60gr5rxfiq22prnbblih14ywr0s5g2kss2a842zvkxn6 URL - http://beta.quicklisp.org/archive/plexippus-xpath/2012-09-09/plexippus-xpath-20120909-darcs.tgz - MD5 1d7457bffe7c4f6e1631c59bc00723d4 NAME xpath FILENAME xpath DEPS +/* (SYSTEM xpath DESCRIPTION + An implementation of the XML Path Language (XPath) Version 1.0 SHA256 + 1acg17ckl65h0xr1vv2ljkmli7jgln7qhl4zs8lwl9jcayi6fynn URL + http://beta.quicklisp.org/archive/plexippus-xpath/2018-12-10/plexippus-xpath-20181210-git.tgz + MD5 106060a6e90dd35c80385ad5a1e8554d NAME xpath FILENAME xpath DEPS ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) (NAME cl-ppcre FILENAME cl-ppcre) (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml) - (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 parse-number FILENAME parse-number) (NAME puri FILENAME puri) (NAME trivial-features FILENAME trivial-features) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME yacc FILENAME yacc)) DEPENDENCIES - (alexandria babel cl-ppcre closure-common cxml cxml-dom cxml-klacks - cxml-test cxml-xml parse-number puri trivial-features trivial-gray-streams - yacc) - VERSION plexippus-20120909-darcs SIBLINGS NIL PARASITES NIL) */ + (alexandria babel cl-ppcre closure-common cxml parse-number puri + trivial-features trivial-gray-streams yacc) + VERSION plexippus-20181210-git SIBLINGS NIL PARASITES (xpath/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 3b10d610d272120c6958773baf26926382811835..e78ec34a0a96eef9727d14a8413cd80fc0661535 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 8a126d4fd986deaef32ac3388994dbc25c1f7b16..df3700827820d8f4b788dc7c0b64b0d267d3b7e5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,6 +6,12 @@ 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"; + + + "xpath_slash_test" = quicklisp-to-nix-packages."xpath"; + + "unit-test" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."unit-test" or (x: {})) @@ -123,6 +129,7 @@ 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"; })); @@ -138,10 +145,6 @@ let quicklisp-to-nix-packages = rec { "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "closure-common" = quicklisp-to-nix-packages."closure-common"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "parse-number" = quicklisp-to-nix-packages."parse-number"; "puri" = quicklisp-to-nix-packages."puri"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; @@ -160,16 +163,13 @@ let quicklisp-to-nix-packages = rec { "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; "closure-common" = quicklisp-to-nix-packages."closure-common"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "parse-number" = quicklisp-to-nix-packages."parse-number"; "puri" = quicklisp-to-nix-packages."puri"; "rt" = quicklisp-to-nix-packages."rt"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "xpath" = quicklisp-to-nix-packages."xpath"; + "xpath_slash_test" = quicklisp-to-nix-packages."xpath_slash_test"; "yacc" = quicklisp-to-nix-packages."yacc"; })); @@ -229,10 +229,6 @@ let quicklisp-to-nix-packages = rec { "closure-html" = quicklisp-to-nix-packages."closure-html"; "collectors" = quicklisp-to-nix-packages."collectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "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"; @@ -261,10 +257,6 @@ let quicklisp-to-nix-packages = rec { "closure-html" = quicklisp-to-nix-packages."closure-html"; "collectors" = quicklisp-to-nix-packages."collectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; @@ -278,14 +270,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: {})) @@ -311,6 +295,7 @@ let quicklisp-to-nix-packages = rec { (import ./quicklisp-to-nix-output/fiasco.nix { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -359,6 +344,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: {})) @@ -394,18 +387,6 @@ let quicklisp-to-nix-packages = rec { })); - "cxml-xml" = quicklisp-to-nix-packages."cxml"; - - - "cxml-test" = quicklisp-to-nix-packages."cxml"; - - - "cxml-klacks" = quicklisp-to-nix-packages."cxml"; - - - "cxml-dom" = quicklisp-to-nix-packages."cxml"; - - "closure-common" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."closure-common" or (x: {})) @@ -647,9 +628,7 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; - "babel-streams" = quicklisp-to-nix-packages."babel-streams"; "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; })); @@ -825,18 +804,6 @@ let quicklisp-to-nix-packages = rec { })); - "babel-streams" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."babel-streams" or (x: {})) - (import ./quicklisp-to-nix-output/babel-streams.nix { - inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - })); - - "anaphora" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."anaphora" or (x: {})) @@ -907,7 +874,6 @@ let quicklisp-to-nix-packages = rec { inherit fetchurl; "alexandria" = quicklisp-to-nix-packages."alexandria"; "babel" = quicklisp-to-nix-packages."babel"; - "babel-streams" = quicklisp-to-nix-packages."babel-streams"; "blackbird" = quicklisp-to-nix-packages."blackbird"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; @@ -964,7 +930,6 @@ let quicklisp-to-nix-packages = rec { "trivial-features" = quicklisp-to-nix-packages."trivial-features"; "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; - "uiop" = quicklisp-to-nix-packages."uiop"; "vom" = quicklisp-to-nix-packages."vom"; "xsubseq" = quicklisp-to-nix-packages."xsubseq"; })); @@ -1090,6 +1055,7 @@ 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"; })); @@ -1718,11 +1684,7 @@ let quicklisp-to-nix-packages = rec { "collectors" = quicklisp-to-nix-packages."collectors"; "css-selectors" = quicklisp-to-nix-packages."css-selectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; "cxml-stp" = quicklisp-to-nix-packages."cxml-stp"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "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"; @@ -1756,10 +1718,6 @@ let quicklisp-to-nix-packages = rec { "collectors" = quicklisp-to-nix-packages."collectors"; "css-selectors" = quicklisp-to-nix-packages."css-selectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "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"; @@ -1791,10 +1749,6 @@ let quicklisp-to-nix-packages = rec { "closure-html" = quicklisp-to-nix-packages."closure-html"; "collectors" = quicklisp-to-nix-packages."collectors"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "iterate" = quicklisp-to-nix-packages."iterate"; "lisp-unit2" = quicklisp-to-nix-packages."lisp-unit2"; @@ -1907,6 +1861,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: {})) @@ -2103,6 +2068,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: {})) @@ -2165,10 +2141,6 @@ let quicklisp-to-nix-packages = rec { "closer-mop" = quicklisp-to-nix-packages."closer-mop"; "closure-common" = quicklisp-to-nix-packages."closure-common"; "cxml" = quicklisp-to-nix-packages."cxml"; - "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; - "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; - "cxml-test" = quicklisp-to-nix-packages."cxml-test"; - "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; "hu_dot_dwim_dot_stefil" = quicklisp-to-nix-packages."hu_dot_dwim_dot_stefil"; "iterate" = quicklisp-to-nix-packages."iterate"; @@ -2190,6 +2162,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: {})) @@ -2574,7 +2554,6 @@ let quicklisp-to-nix-packages = rec { "alexandria" = quicklisp-to-nix-packages."alexandria"; "anaphora" = quicklisp-to-nix-packages."anaphora"; "babel" = quicklisp-to-nix-packages."babel"; - "babel-streams" = quicklisp-to-nix-packages."babel-streams"; "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; "cffi" = quicklisp-to-nix-packages."cffi"; "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; diff --git a/pkgs/development/lua-modules/default.nix b/pkgs/development/lua-modules/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..372d609792c2997335fa638a793bd9579e9147fe --- /dev/null +++ b/pkgs/development/lua-modules/default.nix @@ -0,0 +1,30 @@ +# inspired by pkgs/development/haskell-modules/default.nix +{ pkgs, stdenv, lib +, lua +, overrides ? (self: super: {}) +}: + +let + + inherit (lib) extends; + + initialPackages = (pkgs.callPackage ../../top-level/lua-packages.nix { + inherit lua; + }); + + overridenPackages = import ./overrides.nix { inherit pkgs; }; + + generatedPackages = if (builtins.pathExists ./generated-packages.nix) then + pkgs.callPackage ./generated-packages.nix { } else (self: super: {}); + + extensible-self = lib.makeExtensible + (extends overrides + (extends overridenPackages + (extends generatedPackages + initialPackages + ) + ) + ) + ; +in + extensible-self diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix new file mode 100644 index 0000000000000000000000000000000000000000..7da4a9eeddf345f657ca18565edc0e090163a3d7 --- /dev/null +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -0,0 +1,712 @@ + +/* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! +Regenerate it with: +nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix + +These packages are manually refined in lua-overrides.nix +*/ +{ self, lua, stdenv, fetchurl, fetchgit, pkgs, ... } @ args: +self: super: +with self; +{ + +ansicolors = buildLuarocksPackage { + pname = "ansicolors"; + version = "1.0.2-3"; + + src = fetchurl { + url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; + sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/kikito/ansicolors.lua"; + description="Library for color Manipulation."; + license = { + fullName = "MIT "; + }; + }; +}; +argparse = buildLuarocksPackage { + pname = "argparse"; + version = "0.6.0-1"; + + src = fetchurl { + url = https://luarocks.org/argparse-0.6.0-1.src.rock; + sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/mpeterv/argparse"; + description="A feature-rich command-line argument parser"; + license = { + fullName = "MIT"; + }; + }; +}; +basexx = buildLuarocksPackage { + pname = "basexx"; + version = "0.4.0-1"; + + src = fetchurl { + url = https://luarocks.org/basexx-0.4.0-1.src.rock; + sha256 = "1px8yrxg1qkk3kzdqj3siry742jdv4ysp2dmicxi15mkynqpjlzz"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/aiq/basexx"; + description="A base2, base16, base32, base64 and base85 library for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; +cqueues = buildLuarocksPackage { + pname = "cqueues"; + version = "20171014.52-0"; + + src = fetchurl { + url = https://luarocks.org/cqueues-20171014.52-0.src.rock; + sha256 = "0q3iy1ja20nq2sn2n6badzhjq5kni86pfc09n5g2c46q9ja3vfzx"; + }; + disabled = ( lua.luaversion != "5.2"); + propagatedBuildInputs = [lua ]; + buildType="make"; + + meta = { + homepage = "http://25thandclement.com/~william/projects/cqueues.html"; + description="Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix."; + license = { + fullName = "MIT/X11"; + }; + }; +}; +dkjson = buildLuarocksPackage { + pname = "dkjson"; + version = "2.5-2"; + + src = fetchurl { + url = https://luarocks.org/dkjson-2.5-2.src.rock; + sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; + description="David Kolf's JSON module for Lua"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +fifo = buildLuarocksPackage { + pname = "fifo"; + version = "0.2-0"; + + src = fetchurl { + url = https://luarocks.org/fifo-0.2-0.src.rock; + sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; + }; + + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/daurnimator/fifo.lua"; + description="A lua library/'class' that implements a FIFO"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +inspect = buildLuarocksPackage { + pname = "inspect"; + version = "3.1.1-0"; + + src = fetchurl { + url = https://luarocks.org/inspect-3.1.1-0.src.rock; + sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/kikito/inspect.lua"; + description="Lua table visualizer, ideal for debugging"; + license = { + fullName = "MIT "; + }; + }; +}; +lgi = buildLuarocksPackage { + pname = "lgi"; + version = "0.9.2-1"; + + src = fetchurl { + url = https://luarocks.org/lgi-0.9.2-1.src.rock; + sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="make"; + + meta = { + homepage = "http://github.com/pavouk/lgi"; + description="Lua bindings to GObject libraries"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +lpeg_patterns = buildLuarocksPackage { + pname = "lpeg_patterns"; + version = "0.5-0"; + + src = fetchurl { + url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; + sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; + }; + + propagatedBuildInputs = [lua lpeg ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; + description="a collection of LPEG patterns"; + license = { + fullName = "MIT"; + }; + }; +}; +lpty = buildLuarocksPackage { + pname = "lpty"; + version = "1.2.2-1"; + + src = fetchurl { + url = https://luarocks.org/lpty-1.2.2-1.src.rock; + sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="make"; + + meta = { + homepage = "http://www.tset.de/lpty/"; + description="A simple facility for lua to control other programs via PTYs."; + license = { + fullName = "MIT"; + }; + }; +}; +lrexlib-gnu = buildLuarocksPackage { + pname = "lrexlib-gnu"; + version = "2.9.0-1"; + + src = fetchurl { + url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; + sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://github.com/rrthomas/lrexlib"; + description="Regular expression library binding (GNU flavour)."; + license = { + fullName = "MIT/X11"; + }; + }; +}; +lrexlib-posix = buildLuarocksPackage { + pname = "lrexlib-posix"; + version = "2.9.0-1"; + + src = fetchurl { + url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; + sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://github.com/rrthomas/lrexlib"; + description="Regular expression library binding (POSIX flavour)."; + license = { + fullName = "MIT/X11"; + }; + }; +}; +ltermbox = buildLuarocksPackage { + pname = "ltermbox"; + version = "0.2-1"; + + src = fetchurl { + url = https://luarocks.org/ltermbox-0.2-1.src.rock; + sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://code.google.com/p/termbox"; + description="A termbox library package"; + license = { + fullName = "New BSD License"; + }; + }; +}; +lua-cmsgpack = buildLuarocksPackage { + pname = "lua-cmsgpack"; + version = "0.4.0-0"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; + sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/antirez/lua-cmsgpack.git", + "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", + "date": "2018-06-14T11:56:56+02:00", + "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://github.com/antirez/lua-cmsgpack"; + description="MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; + license = { + fullName = "Two-clause BSD"; + }; + }; +}; +lua_cliargs = buildLuarocksPackage { + pname = "lua_cliargs"; + version = "3.0-2"; + + src = fetchurl { + url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; + sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/amireh/lua_cliargs"; + description="A command-line argument parser."; + license = { + fullName = "MIT "; + }; + }; +}; +lua-iconv = buildLuarocksPackage { + pname = "lua-iconv"; + version = "7-3"; + + src = fetchurl { + url = https://luarocks.org/lua-iconv-7-3.src.rock; + sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://ittner.github.com/lua-iconv/"; + description="Lua binding to the iconv"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +lua-term = buildLuarocksPackage { + pname = "lua-term"; + version = "0.7-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/lua-term-0.7-1.rockspec; + sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; + }).outPath; + + src = fetchurl { + url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; + sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; + }; + + + + buildType="builtin"; + + meta = { + homepage = "https://github.com/hoelzro/lua-term"; + description="Terminal functions for Lua"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +luaevent = buildLuarocksPackage { + pname = "luaevent"; + version = "0.4.6-1"; + + src = fetchurl { + url = https://luarocks.org/luaevent-0.4.6-1.src.rock; + sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/harningt/luaevent"; + description="libevent binding for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; +luabitop = buildLuarocksPackage { + pname = "luabitop"; + version = "1.0.2-3"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/luabitop-1.0.2-3.rockspec; + sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/LuaDist/luabitop.git", + "rev": "81bb23b0e737805442033535de8e6d204d0e5381", + "date": "2013-02-18T16:36:42+01:00", + "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.3"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://bitop.luajit.org/"; + description="Lua Bit Operations Module"; + license = { + fullName = "MIT/X license"; + }; + }; +}; +luacheck = buildLuarocksPackage { + pname = "luacheck"; + version = "0.23.0-1"; + + src = fetchurl { + url = https://luarocks.org/luacheck-0.23.0-1.src.rock; + sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; + }; + disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua argparse luafilesystem ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/mpeterv/luacheck"; + description="A static analyzer and a linter for Lua"; + license = { + fullName = "MIT"; + }; + }; +}; +luaffi = buildLuarocksPackage { + pname = "luaffi"; + version = "scm-1"; + + src = fetchurl { + url = http://luarocks.org/dev/luaffi-scm-1.src.rock; + sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/facebook/luaffifb"; + description="FFI library for calling C functions from lua"; + license = { + fullName = "BSD"; + }; + }; +}; +luuid = buildLuarocksPackage { + pname = "luuid"; + version = "20120509-2"; + + src = fetchurl { + url = https://luarocks.org/luuid-20120509-2.src.rock; + sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; + }; + disabled = ( luaOlder "5.2") || ( luaAtLeast "5.4"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; + description="A library for UUID generation"; + license = { + fullName = "Public domain"; + }; + }; +}; +penlight = buildLuarocksPackage { + pname = "penlight"; + version = "1.5.4-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/penlight-1.5.4-1.rockspec; + sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; + }).outPath; + + src = fetchurl { + url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; + sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; + }; + + + propagatedBuildInputs = [luafilesystem ]; + buildType="builtin"; + + meta = { + homepage = "http://stevedonovan.github.com/Penlight"; + description="Lua utility libraries loosely based on the Python standard libraries"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +say = buildLuarocksPackage { + pname = "say"; + version = "1.3-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/say-1.3-1.rockspec; + sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; + }).outPath; + + src = fetchurl { + url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; + sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/busted/"; + description="Lua String Hashing/Indexing Library"; + license = { + fullName = "MIT "; + }; + }; +}; +luv = buildLuarocksPackage { + pname = "luv"; + version = "1.22.0-1"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/luv-1.22.0-1.rockspec; + sha256 = "0yxjy9wj4aqbv1my8fkciy2xar5si6bcsszipgyls24rl6lnmga3"; + }).outPath; + + src = fetchurl { + url = https://github.com/luvit/luv/releases/download/1.22.0-1/luv-1.22.0-1.tar.gz; + sha256 = "1xvz4a0r6kd1xqxwm55g9n6imprxb79600x7dhyillrz7p5nm217"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="cmake"; + + meta = { + homepage = "https://github.com/luvit/luv"; + description="Bare libuv bindings for lua"; + license = { + fullName = "Apache 2.0"; + }; + }; +}; +luasystem = buildLuarocksPackage { + pname = "luasystem"; + version = "0.2.1-0"; + + src = fetchurl { + url = https://luarocks.org/luasystem-0.2.1-0.src.rock; + sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/luasystem/"; + description="Platform independent system calls for Lua."; + license = { + fullName = "MIT "; + }; + }; +}; +mediator_lua = buildLuarocksPackage { + pname = "mediator_lua"; + version = "1.1.2-0"; + + src = fetchurl { + url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; + sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/mediator_lua/"; + description="Event handling through channels"; + license = { + fullName = "MIT "; + }; + }; +}; +mpack = buildLuarocksPackage { + pname = "mpack"; + version = "1.0.7-0"; + + src = fetchurl { + url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; + sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; + }; + + + buildType="builtin"; + + meta = { + homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; + description="Lua binding to libmpack"; + license = { + fullName = "MIT"; + }; + }; +}; +nvim-client = buildLuarocksPackage { + pname = "nvim-client"; + version = "0.1.0-1"; + + src = fetchurl { + url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; + sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; + }; + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua mpack luv coxpcall ]; + buildType="builtin"; + + meta = { + homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz"; + description="Lua client to Nvim"; + license = { + fullName = "Apache"; + }; + }; +}; +busted = buildLuarocksPackage { + pname = "busted"; + version = "2.0.rc13-0"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/busted-2.0.rc13-0.rockspec; + sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; + }).outPath; + + src = fetchurl { + url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; + sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/busted/"; + description="Elegant Lua unit testing."; + license = { + fullName = "MIT "; + }; + }; +}; +luassert = buildLuarocksPackage { + pname = "luassert"; + version = "1.7.11-0"; + + knownRockspec = ( fetchurl { + url = https://luarocks.org/luassert-1.7.11-0.rockspec; + sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; + }).outPath; + + src = fetchurl { + url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; + sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; + }; + + disabled = ( luaOlder "5.1"); + propagatedBuildInputs = [lua say ]; + buildType="builtin"; + + meta = { + homepage = "http://olivinelabs.com/busted/"; + description="Lua Assertions Extension"; + license = { + fullName = "MIT "; + }; + }; +}; +coxpcall = buildLuarocksPackage { + pname = "coxpcall"; + version = "1.17.0-1"; + + src = fetchurl { + url = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock; + sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; + }; + + + buildType="builtin"; + + meta = { + homepage = "http://keplerproject.github.io/coxpcall"; + description="Coroutine safe xpcall and pcall"; + license = { + fullName = "MIT/X11"; + }; + }; +}; + +} +/* GENERATED */ + diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix index 5669eae96c5e411b186b69daa2079a55fbadcf2b..3dae32b5e15d7fbd8fa2d24db6a71c37d4debfc9 100644 --- a/pkgs/development/lua-modules/generic/default.nix +++ b/pkgs/development/lua-modules/generic/default.nix @@ -1,11 +1,11 @@ -{ lua, writeText }: +{ lua, writeText, toLuaModule }: { buildInputs ? [], disabled ? false, ... } @ attrs: if disabled then throw "${attrs.name} not supported by interpreter lua-${lua.luaversion}" else - lua.stdenv.mkDerivation ( + toLuaModule( lua.stdenv.mkDerivation ( { makeFlags = [ "PREFIX=$(out)" @@ -51,4 +51,4 @@ else addEnvHooks "$hostOffset" addLuaLibCPath ''; } - ) + ) ) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix new file mode 100644 index 0000000000000000000000000000000000000000..b78f7f9c00798e07018c840c081462260cae8e52 --- /dev/null +++ b/pkgs/development/lua-modules/overrides.nix @@ -0,0 +1,71 @@ +{ pkgs, ... }@args: +self: super: +with super; +{ + ##########################################3 + #### manual fixes for generated packages + ##########################################3 + cqueues = super.cqueues.override({ + nativeBuildInputs = [ pkgs.gnum4 ]; + buildInputs = [ pkgs.openssl ]; + extraConfig = with pkgs; '' + variables={ + CRYPTO_INCDIR="${openssl.dev}/include"; + CRYPTO_LIBDIR="${openssl.out}/lib"; + OPENSSL_INCDIR="${openssl.dev}/include"; + OPENSSL_LIBDIR="${openssl.out}/lib"; + } + ''; + }); + + lgi = super.lgi.overrideAttrs(oa: { + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; oa.buildInputs ++ [ glib gobjectIntrospection]; + patches = [ + (pkgs.fetchpatch { + name = "lgi-find-cairo-through-typelib.patch"; + url = "https://github.com/psychon/lgi/commit/46a163d9925e7877faf8a4f73996a20d7cf9202a.patch"; + sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c"; + }) + ]; + }); + + ltermbox = super.ltermbox.override( { + disabled = !isLua51 || isLuaJIT; + }); + + lua-cmsgpack = super.lua-cmsgpack.override({ + # TODO this should work with luajit once we fix luajit headers ? + disabled = (!isLua51) || isLuaJIT; + }); + + lrexlib-posix = super.lrexlib-posix.override({ + buildInputs = [ pkgs.glibc.dev ]; + }); + lrexlib-gnu = super.lrexlib-gnu.override({ + buildInputs = [ pkgs.gnulib ]; + }); + luaevent = super.luaevent.override({ + buildInputs = with pkgs; [ libevent.dev libevent ]; + propagatedBuildInputs = [ luasocket ]; + extraConfig = '' + variables={ + EVENT_INCDIR="${pkgs.libevent.dev}/include"; + EVENT_LIBDIR="${pkgs.libevent}/lib"; + } + ''; + disabled= luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; + }); + lua-iconv = super.lua-iconv.override({ + buildInputs = [ pkgs.libiconv ]; + }); + luv = super.luv.overrideAttrs(oa: { + propagatedBuildInputs = oa.propagatedBuildInputs ++ [ pkgs.libuv ]; + }); + + busted = super.busted.overrideAttrs(oa: { + postInstall = '' + install -D completions/zsh/_busted $out/share/zsh/site-functions/_busted + ''; + }); + } diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix deleted file mode 100644 index 83ba93e63b765cc98ab5ce4ddde86ac21f7b7fd2..0000000000000000000000000000000000000000 --- 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 f0ec21b7589ff780bf8b1633c163ac700d55bb8b..0000000000000000000000000000000000000000 --- 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 5c9b56c991839fec10586c2721ff5edfc833b003..0000000000000000000000000000000000000000 --- 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 039846d5fcfb826ddabf0dd57ee855edad9a227a..4527a8700f6ee8db7581b67041d3984cb8432378 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 b43deeceb8679a4ea50e2c11ef587ba601369520..4cb612523dc5f1792a42c6116372643bee909006 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 0000000000000000000000000000000000000000..693cfa093b08c33be2d062250f8d9c960b75a6f1 --- /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 0000000000000000000000000000000000000000..0ec8664dac9e511562e21c35ca33d6c789d3ea85 --- /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 0c601c7773cc5676956e8dfbbc71c1b80e470047..fbe48803f2dbcefbd580a3c40f3c3054b81d2fdd 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 cb9cc80d32525db664ce72bf5d02b11b25e052b1..102b1eb8048d3990d8fff67c2f9b870d636ebd6b 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/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index ee6ff3cecd596e90b6887701073773f77dea5434..b6d35051733a17e12ab705ae581838ef26e84208 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python3, androidsdk, makeWrapper }: +{ stdenv, fetchgit, python3, platform-tools, makeWrapper }: stdenv.mkDerivation rec { name = "adb-sync-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d"; }; - buildInputs = [ python3 androidsdk makeWrapper ]; + buildInputs = [ python3 platform-tools makeWrapper ]; phases = "installPhase"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp $src/adb-channel $src/adb-sync $out/bin/ patchShebangs $out/bin - wrapProgram $out/bin/adb-sync --suffix PATH : ${androidsdk}/bin + wrapProgram $out/bin/adb-sync --suffix PATH : ${platform-tools}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix index 18ad3048d832bb743dcc450c856dfebeeedb12ce..fffe2fbbcbedd0f0cd1ba50cb5cc80ccabcda2fc 100644 --- a/pkgs/development/mobile/adbfs-rootless/default.nix +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' # very ugly way of replacing the adb calls - sed -e 's|"adb |"${stdenv.lib.getBin adb}/bin/adb |g' \ + sed -e 's|"adb |"${adb}/bin/adb |g' \ -i adbfs.cpp ''; diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml deleted file mode 100644 index 1bc1d110db164498467d1cf60a164958ed09a9dc..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/addon.xml +++ /dev/null @@ -1,1636 +0,0 @@ - - - - Terms and Conditions - -This is the Android Software Development Kit License Agreement - -1. Introduction - -1.1 The Android Software Development Kit (referred to in the License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 A "compatible implementation" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS). - -1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - - -2. Accepting the License Agreement - -2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement. - -2.2 By clicking to accept, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK. - -2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity. - - -3. SDK License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android. - -3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose. - -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.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. - -3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. - - -4. Use of the SDK by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy. - - -7. Third Party Applications - -7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties. - - -8. Using Android APIs - -8.1 Google Data APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - - -9. Terminating the License Agreement - -9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement with you if: -(A) you have breached any provision of the License Agreement; or -(B) Google is required to do so by law; or -(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or -(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement. - - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. - - -14. General Legal Terms - -14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - - -November 20, 2015 - To get started with the Android SDK Preview, you must agree to the following terms and conditions. -As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data. - -This is the Android SDK Preview License Agreement (the "License Agreement"). - -1. Introduction - -1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting the License Agreement - -2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement. - -2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview. - -2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity. - -3. Preview License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform. - -3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "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.3 You may not use the Preview 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 Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview. - -3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview. - -3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights. - -3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview. - -4. Use of the Preview by You - -4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/. - -7. Third Party Applications - -7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. - -8. Using Google APIs - -8.1 Google APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -9. Terminating the License Agreement - -9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you. - -9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of: -(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and -(B) Google issues a final release version of the Android SDK. - -9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely. - -10. DISCLAIMERS - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available. - -14. General Legal Terms - -14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - -June 2014. - Terms and Conditions - -This is the Google TV Add-on for the Android Software Development Kit License Agreement. - -1. Introduction - -1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the "Google TV Add-on" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on. - -1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting this License Agreement - -2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement. - -2.2 You can accept this License Agreement by: - -(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or - -(B) by actually using the Google TV Add-on. In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards. - -2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on. - -2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity. - -3. Google TV Add-on License from Google - -3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform. - -3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. "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.3 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 Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on. - -3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. - -3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on. - -4. Use of the Google TV Add-on by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so. - -4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy. - -7. Third Party Applications for the Google TV Platform - -7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. - -8. Using Google TV APIs - -8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Content”) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services - -8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must: - -(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application; - -(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or - -(c) not create any commercial audience measurement tool or service using the Google TV API Content - -9. Terminating this License Agreement - -9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials. - -9.3 Google may at any time, terminate this License Agreement with you if: - -(A) you have breached any provision of this License Agreement; or - -(B) Google is required to do so by law; or - -(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or - -(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on. - -14. General Legal Terms - -14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement. - -14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party. - -14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - - -August 15, 2011 - This is a Developer Preview of the GDK that is subject to change. - -Terms and Conditions - -This is the Glass Development Kit License Agreement. - -1. Introduction - -1.1 The Glass Development Kit (referred to in this License Agreement as the "GDK" and specifically including the Android system files, packaged APIs, and GDK library files, if and when they are made available) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the GDK. - -1.2 "Glass" means Glass devices and the Glass software stack for use on Glass devices. - - -1.3 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting this License Agreement - -2.1 In order to use the GDK, you must first agree to this License Agreement. You may not use the GDK if you do not accept this License Agreement. - -2.2 By clicking to accept, you hereby agree to the terms of this License Agreement. - -2.3 You may not use the GDK and may not accept the License Agreement if you are a person barred from receiving the GDK under the laws of the United States or other countries including the country in which you are resident or from which you use the GDK. - -2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the GDK on behalf of your employer or other entity. - -3. GDK License from Google - -3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable and non-exclusive license to use the GDK solely to develop applications to run on the Glass platform for Glass devices. - -3.2 You agree that Google or third parties own all legal right, title and interest in and to the GDK, including any Intellectual Property Rights that subsist in the GDK. "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.3 You may not use the GDK for any purpose not expressly permitted by this 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 GDK or any part of the GDK; or (b) load any part of the GDK onto a mobile handset or wearable computing device or any other hardware device except a Glass device personal computer, combine any part of the GDK with other software, or distribute any software or device incorporating a part of the GDK. - -3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Glass, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the GDK. - -3.5 Use, reproduction and distribution of components of the GDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. - -3.6 You agree that the form and nature of the GDK that Google provides may change without prior notice to you and that future versions of the GDK may be incompatible with applications developed on previous versions of the GDK. You agree that Google may stop (permanently or temporarily) providing the GDK (or any features within the GDK) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the GDK. - - -3.9 Your use of any Android system files, packaged APIs, or other components of the GDK which are part of the Android Software Development Kit is subject to the terms of the Android Software Development Kit License Agreement located at http://developer.android.com/sdk/terms.html. These terms are hereby incorporated by reference into this License Agreement. - -4. Use of the GDK by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the GDK, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the GDK and write applications only for purposes that are permitted by (a) this License Agreement, (b) the Glass Platform Developer Policies (located at https://developers.google.com/glass/policies, and hereby incorporated into this License Agreement by reference), and (c) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the GDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the GDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Glass and/or applications for Glass, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - - -4.7 The GDK is in development, and your testing and feedback are an important part of the development process. By using the GDK, you acknowledge that implementation of some features are still under development and that you should not rely on the GDK, Glass devices, Glass system software, Google Mirror API, or Glass services having the full functionality of a stable release. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - - -6.1 In order to continually innovate and improve the GDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the GDK are being used and how they are being used. Before any of this information is collected, the GDK will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the GDK and is maintained in accordance with Google's Privacy Policy. - -7. Third Party Applications - -7.1 If you use the GDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. - -8. Using Google APIs - -8.1 Google APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -9. Terminating this License Agreement - -9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the GDK and any relevant developer credentials. - -9.3 Google may at any time, terminate this License Agreement with you if: -(A) you have breached any provision of this License Agreement; or -(B) Google is required to do so by law; or -(C) the partner with whom Google offered certain parts of GDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the GDK to you; or -(D) Google decides to no longer provide the GDK or certain parts of the GDK to users in the country in which you are resident or from which you use the service, or the provision of the GDK or certain GDK services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GDK IS AT YOUR SOLE RISK AND THAT THE GDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE GDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the GDK, (b) any application you develop on the GDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the GDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the GDK is made available. - -14. General Legal Terms - -14.1 This License Agreement constitutes the whole legal agreement between you and Google and governs your use of the GDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the GDK. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement. - -14.5 EXPORT RESTRICTIONS. THE GDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party. - -14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - -November 19, 2013 - Intel (R) Hardware Accelerated Execution Manager -End-User License Agreement - -Copyright (c) 2012 Intel Corporation. -All rights reserved. - -Redistribution. Redistribution and use in binary form, without modification, are permitted provided that the following conditions are met: - -1.Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution. - -2.Neither the name of Intel Corporation nor the names of its suppliers may be used to endorse or promote products derived from this software without specific prior written permission. - -3.No reverse engineering, de-compilation, or disassembly of this software is permitted. Limited patent license. Intel Corporation grants a world-wide, royalty-free, non-exclusive license under patents it now or hereafter owns or controls to make, have made, use, import, offer to sell and sell ("Utilize") this software, but solely to the extent that any such patent is necessary to Utilize the software alone. The patent license shall not apply to any combinations which include this software. No hardware per se is licensed hereunder. - -DISCLAIMER. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - - 3 - - - - 34908058 - 1f92abf3a76be66ae8032257fc7620acbd2b2e3a - google_apis-3-r03.zip - - - - google - Google Inc. - google_apis - Google APIs - 3 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - - - - - 2 - - - - 42435735 - 9b6e86d8568558de4d606a7debc4f6049608dbd0 - google_apis-4_r02.zip - - - - google - Google Inc. - google_apis - Google APIs - 4 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - - - - - 1 - - - - 49123776 - 46eaeb56b645ee7ffa24ede8fa17f3df70db0503 - google_apis-5_r01.zip - - - - google - Google Inc. - google_apis - Google APIs - 5 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - - - - - 1 - - - - 53382941 - 5ff545d96e031e09580a6cf55713015c7d4936b2 - google_apis-6_r01.zip - - - - google - Google Inc. - google_apis - Google APIs - 6 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - - - - - 1 - - - - 53691339 - 2e7f91e0fe34fef7f58aeced973c6ae52361b5ac - google_apis-7_r01.zip - - - - google - Google Inc. - google_apis - Google APIs - 7 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - - - - - 2 - - - - 59505020 - 3079958e7ec87222cac1e6b27bc471b27bf2c352 - google_apis-8_r02.zip - - - - google - Google Inc. - google_apis - Google APIs - 8 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - - - - - 2 - - - - 63401546 - 78664645a1e9accea4430814f8694291a7f1ea5d - google_apis-9_r02.zip - - - - google - Google Inc. - google_apis - Google APIs - 9 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - - - - - 2 - - - - 65781578 - cc0711857c881fa7534f90cf8cc09b8fe985484d - google_apis-10_r02.zip - - - - google - Google Inc. - google_apis - Google APIs - 10 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - - - - - 1 - - - - 83477179 - 5eab5e81addee9f3576d456d205208314b5146a5 - google_apis-11_r01.zip - - - - google - Google Inc. - google_apis - Google APIs - 11 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - - - - - 1 - - - - 86099835 - e9999f4fa978812174dfeceec0721c793a636e5d - google_apis-12_r01.zip - - - - google - Google Inc. - google_apis - Google APIs - 12 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - - - - - 1 - - - - 88615525 - 3b153edd211c27dc736c893c658418a4f9041417 - google_apis-13_r01.zip - - - - google - Google Inc. - google_apis - Google APIs - 13 - Android + Google APIs - http://developer.android.com/ - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - - - - - 2 - - - - 106533714 - f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39 - google_apis-14_r02.zip - - - - google - Google Inc. - google_apis - Google APIs - 14 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - - - - 3 - - - - 106624396 - d0d2bf26805eb271693570a1aaec33e7dc3f45e9 - google_apis-15_r03.zip - - - - google - Google Inc. - google_apis - Google APIs - 15 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - 4 - - - - 127341982 - ee6acf1b01020bfa8a8e24725dbc4478bee5e792 - google_apis-16_r04.zip - - - - google - Google Inc. - google_apis - Google APIs - 16 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - 4 - - - - 137231243 - a076be0677f38df8ca5536b44dfb411a0c808c4f - google_apis-17_r04.zip - - - - google - Google Inc. - google_apis - Google APIs - 17 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - 4 - - - - 143195183 - 6109603409debdd40854d4d4a92eaf8481462c8b - google_apis-18_r04.zip - - - - google - Google Inc. - google_apis - Google APIs - 18 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - 20 - - - - 147081 - 5b933abe830b2f25b4c0f171d45e9e0651e56311 - google_apis-19_r20.zip - - - - google - Google Inc. - google_apis - Google APIs - 19 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - 1 - - - - 154865 - 31361c2868f27343ee917fbd259c1463821b6145 - google_apis-24_r1.zip - - - - google - Google Inc. - google_apis - Google APIs - 24 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - 1 - - - - 154871 - 550e83eea9513ab11c44919ac6da54b36084a9f3 - google_apis-25_r1.zip - - - - google - Google Inc. - google_apis - Google APIs - 23 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - 1 - - - - 179499 - 66a754efb24e9bb07cc51648426443c7586c9d4a - google_apis-21_r01.zip - - - - google - Google Inc. - google_apis - Google APIs - 21 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - 1 - - - - 179259 - 5def0f42160cba8acff51b9c0c7e8be313de84f5 - google_apis-22_r01.zip - - - - google - Google Inc. - google_apis - Google APIs - 22 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - 1 - - - - 179900 - 04c5cc1a7c88967250ebba9561d81e24104167db - google_apis-23_r01.zip - - - - google - Google Inc. - google_apis - Google APIs - 23 - Android + Google APIs - - - com.google.android.maps - API for Google Maps - - - com.android.future.usb.accessory - API for USB Accessories - - - com.google.android.media.effects - Collection of video effects - - - - - - - 2 - - - - 78266751 - 92128a12e7e8b0fb5bac59153d7779b717e7b840 - google_tv-12_r02.zip - - - - google - Google Inc. - google_tv_addon - Google TV Addon - 12 - - http://developer.android.com/ - - - - - - 1 - - - - 87721879 - b73f7c66011ac8180b44aa4e83b8d78c66ea9a09 - google_tv-13_r01.zip - - - - google - Google Inc. - google_tv_addon - Google TV Addon - 13 - - http://developer.android.com/ - - - - - - 47 - 0 - 0 - - - - - 355529608 - a0d22beacc106a6977321f2b07d692ce4979e96a - android_m2repository_r47.zip - - - - android - Android - Local Maven repository for Support Libraries - Android Support Repository - m2repository - - - - - 58 - - - - - 215426029 - 05086add9e3a0eb1b67111108d7757a4337c3f10 - google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip - - - - google - Google Inc. - Local Maven repository for Support Libraries - Google Repository - m2repository - - - - - 1 - - - - - 75109 - 355e8dc304a92a5616db235af8ee7bd554356254 - market_licensing-r02.zip - - - - google - - Android Market Licensing client library - http://developer.android.com/guide/publishing/licensing.html - Google Play Licensing Library - market_licensing - - - - - 1 - - - - - 110201 - 5305399dc1a56814e86b8459ce24871916f78b8c - market_apk_expansion-r03.zip - - - - google - Google Inc. - Android Market APK Expansion library - http://developer.android.com/guide/market/expansion-files.html - Google Play APK Expansion library - market_apk_expansion - - - - - - 12 - - - - - 5265389 - 92558dbc380bba3d55d0ec181167fb05ce7c79d9 - google_play_services_3265130_r12.zip - - - - google - Google Inc. - Google Play services client library and sample code - https://developers.google.com/android/google-play-services/index - Google Play services for Froyo - google_play_services_froyo - - - - - 44 - - - - - 13796755 - d2bb583a3f62b068d448df10544c1852d910526f - google_play_services_v12_1_rc11.zip - - - - google - Google Inc. - Google Play services Javadocs and sample code - https://developers.google.com/android/google-play-services/index - Google Play services - google_play_services - - - - - 11 - - - - - 8682859 - dc8a2ed2fbd7246d4caf9ab10ffe7749dc35d1cc - usb_driver_r11-windows.zip - windows - - - - google - Google Inc. - USB Driver for Windows, revision 11 - http://developer.android.com/ - Google USB Driver - usb_driver - - - - - 5 - - - - - 436654 - bd2ac5ce7127070ac3229003eb69cfb806628ac9 - play_billing_r05.zip - - - - google - Google Inc. - Google Play Billing files and sample code - http://developer.android.com/google/play/billing/index.html - Google Play Billing Library - play_billing - market_billing - - - - - - 11 - - - - - 704512 - 0102859d9575baa0bf4fd5eb422af2ad0fe6cb82 - GoogleAdMobAdsSdkAndroid-6.4.1.zip - - - - google - Google Inc. - AdMob Ads SDK - https://developers.google.com/mobile-ads-sdk/docs/ - Google AdMob Ads SDK - admob_ads_sdk - - - - - - 3 - - - - - 211432 - dc14026bf0ce78315cb5dd00552607de0894de83 - GoogleAnalyticsAndroid_2.0beta5.zip - - - - google - Google Inc. - Analytics App Tracking SDK - http://developers.google.com/analytics/devguides/collection/ - Google Analytics App Tracking SDK - analytics_sdk_v2 - - - - - 2 - - - - - 4055193 - 13f3a3b2670a5fc04a7342861644be9a01b07e38 - webdriver_r02.zip - - - - google - Google Inc. - - http://selenium.googlecode.com - Google Web Driver - webdriver - - - - - - 3 - - - - - 5901400 - ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf - gcm_r03.zip - - - - google - Google Inc. - GCM library has been moved to Google Play Services (com.google.android.gms.gcm) and this standalone version is no longer supported - https://developers.google.com/android/gcm/index - Google Cloud Messaging for Android Library - gcm - - - - - 1 - - - - - 2167286 - 4fb5344e34e8faab4db18af07dace44c50db26a7 - simulator_r01.zip - - - - google - Google Inc. - Android Auto API testing simulators - http://developer.android.com/auto - Android Auto API Simulators - simulators - - - - - 1 - 1 - - - - - 1346009 - 202a6e1b3009a0eb815f8c672d2d5b3717de6169 - desktop-head-unit-linux_r01.1.zip - linux - - - - 2375533 - 8179cbb3914493ebc5eb65b731cba061582f2e84 - desktop-head-unit-macosx_r01.1.zip - macosx - - - - 2691901 - 99c4a7172d73673552119347bc24c58b47da177b - desktop-head-unit-windows_r01.1.zip - windows - - - - google - Google Inc. - Head unit emulator for developers targeting the Android Auto platform. - http://developer.android.com/tools/help/desktop-head-unit.html - Android Auto Desktop Head Unit emulator - auto - - - - - 1 - 0 - 0 - - - - - 450468876 - 50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53 - aiasdk-1.0.0.zip - - - - google - Google Inc. - Android Instant Apps Development SDK - https://developer.android.com/topic/instant-apps/index.html - Instant Apps Development SDK - instantapps - - diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix deleted file mode 100644 index ab5d570a3273356edf4ccc0d352db7d2fe7fc41a..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/addons.nix +++ /dev/null @@ -1,320 +0,0 @@ - -# This file is generated from generate-addons.sh. DO NOT EDIT. -# Execute generate-addons.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildGoogleApis = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - google_apis_3 = buildGoogleApis { - name = "google_apis-3"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-3-r03.zip; - sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_4 = buildGoogleApis { - name = "google_apis-4"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-4_r02.zip; - sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_5 = buildGoogleApis { - name = "google_apis-5"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-5_r01.zip; - sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_6 = buildGoogleApis { - name = "google_apis-6"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-6_r01.zip; - sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_7 = buildGoogleApis { - name = "google_apis-7"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-7_r01.zip; - sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_8 = buildGoogleApis { - name = "google_apis-8"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-8_r02.zip; - sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_9 = buildGoogleApis { - name = "google_apis-9"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-9_r02.zip; - sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_10 = buildGoogleApis { - name = "google_apis-10"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-10_r02.zip; - sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_11 = buildGoogleApis { - name = "google_apis-11"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-11_r01.zip; - sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_12 = buildGoogleApis { - name = "google_apis-12"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-12_r01.zip; - sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_13 = buildGoogleApis { - name = "google_apis-13"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-13_r01.zip; - sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; - }; - meta = { - description = "Android + Google APIs"; - url = http://developer.android.com/; - }; - }; - - google_apis_14 = buildGoogleApis { - name = "google_apis-14"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-14_r02.zip; - sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_15 = buildGoogleApis { - name = "google_apis-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-15_r03.zip; - sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_16 = buildGoogleApis { - name = "google_apis-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-16_r04.zip; - sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_17 = buildGoogleApis { - name = "google_apis-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-17_r04.zip; - sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_18 = buildGoogleApis { - name = "google_apis-18"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-18_r04.zip; - sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_19 = buildGoogleApis { - name = "google_apis-19"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-19_r20.zip; - sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_21 = buildGoogleApis { - name = "google_apis-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-21_r01.zip; - sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_22 = buildGoogleApis { - name = "google_apis-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-22_r01.zip; - sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_23 = buildGoogleApis { - name = "google_apis-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-23_r01.zip; - sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_24 = buildGoogleApis { - name = "google_apis-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-24_r1.zip; - sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - google_apis_25 = buildGoogleApis { - name = "google_apis-25"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_apis-25_r1.zip; - sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3"; - }; - meta = { - description = "Android + Google APIs"; - - }; - }; - - android_support_extra = buildGoogleApis { - name = "android_support_extra"; - src = fetchurl { - url = https://dl.google.com/android/repository/support_r23.2.1.zip; - sha1 = "41121bbc412c2fce0be170d589d20cfa3e78e857"; - }; - meta = { - description = "Android Support Library"; - url = http://developer.android.com/; - }; - }; - - - google_play_services = buildGoogleApis { - name = "google_play_services"; - src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_v12_1_rc11.zip; - sha1 = "d2bb583a3f62b068d448df10544c1852d910526f"; - }; - meta = { - description = "Google Play services client library and sample code"; - url = http://developer.android.com/; - }; - }; - - instant_apps = buildGoogleApis { - name = "instant_apps_sdk"; - src = fetchurl { - url = https://dl.google.com/android/repository/aiasdk-1.0.0.zip; - sha1 = "50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53"; - }; - meta = { - description = "Android Instant Apps Development SDK"; - url = "https://developer.android.com/"; - }; - }; - -} diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix deleted file mode 100644 index dc693accbf4b7e941864ca278ff623052fa13e95..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper -, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which -, platformTools, python3, libcxx, version, sha256, bash, runCommand -, fullNDK ? false # set to true if you want other parts of the NDK - # that is not used by Nixpkgs like sources, - # examples, docs, or LLVM toolchains -}: - -let - makeStandaloneToolchain = api: arch: let - full_ndk = (ndk true); - in runCommand "makeStandaloneToolchain-${version}" {} '' - ${full_ndk}/libexec/${full_ndk.name}/build/tools/make_standalone_toolchain.py --api ${toString api} --arch ${arch} --install-dir $out - ''; - ndk = fullNDK: stdenv.mkDerivation rec { - name = "android-ndk-r${version}"; - inherit version; - - src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip"; - inherit sha256; - } else throw "platform ${stdenv.hostPlatform.system} not supported!"; - - phases = "buildPhase"; - - nativeBuildInputs = [ unzip makeWrapper file ]; - - buildCommand = let - bin_path = "$out/bin"; - pkg_path = "$out/libexec/${name}"; - sed_script_1 = - "'s|^PROGDIR=`dirname $0`" + - "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeBinPath [ - coreutils file findutils - gawk gnugrep gnused - jdk python3 which - ]) + ":${platformTools}/platform-tools"; - in '' - mkdir -pv $out/libexec - cd $out/libexec - unzip -qq $src - - # so that it doesn't fail because of read-only permissions set - cd - - ${if (version == "10e") then - '' - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch } - '' - else - '' - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./. + "/make_standalone_toolchain.py_" + "${version}" + ".patch" } - - sed -i 's,#!/usr/bin/env python,#!${python3}/bin/python,g' ${pkg_path}/build/tools/make_standalone_toolchain.py - sed -i 's,#!/bin/bash,#!${bash}/bin/bash,g' ${pkg_path}/build/tools/make_standalone_toolchain.py - wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" - '' - } - - patchShebangs ${pkg_path} - - cd ${pkg_path} - - '' + lib.optionalString (!fullNDK) '' - # Steps to reduce output size - rm -rf docs sources tests - # We only support cross compiling with gcc for now - rm -rf toolchains/*-clang* toolchains/llvm* - '' + - - '' - find ${pkg_path}/toolchains \( \ - \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm -0100 \) \ - \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \; - # fix ineffective PROGDIR / MYNDKDIR determination - for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"} - do - sed -i -e ${sed_script_1} $i - done - - # wrap - for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"} - do - wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" - done - # make some executables available in PATH - mkdir -pv ${bin_path} - for i in \ - ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"} - do - ln -sf ${pkg_path}/$i ${bin_path}/$i - done - ''; - - meta = { - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - license = stdenv.lib.licenses.asl20; - }; - }; - passthru = { - inherit makeStandaloneToolchain; - }; -in lib.extendDerivation true passthru (ndk fullNDK) diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix deleted file mode 100644 index 68d2150f972ea4d501fe39d351716eea9ef7618a..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, fetchurl, zlib, ncurses, lib, makeWrapper -, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which -, platformTools -, fullNDK ? false # set to true if you want other parts of the NDK - # that is not used by Nixpkgs like sources, - # examples, docs, or LLVM toolchains -}: - -stdenv.mkDerivation rec { - name = "android-ndk-r8e"; - - src = if stdenv.hostPlatform.system == "i686-linux" - then fetchurl { - url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2"; - sha256 = "c2c4e0c8b3037149a0f5dbb08d72f814a52af4da9fff9d80328c675457e95a98"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2"; - sha256 = "093gf55zbh38p2gk5bdykj1vg9p5l774wjdzw5mhk4144jm1wdq7"; - } - else throw "platform ${stdenv.hostPlatform.system} not supported!"; - - phases = "buildPhase"; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = let - bin_path = "$out/bin"; - pkg_path = "$out/libexec/${name}"; - sed_script_1 = - "'s|^PROGDIR=`dirname $0`" + - "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; - sed_script_2 = - "'s|^MYNDKDIR=`dirname $0`" + - "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeBinPath [ - coreutils file findutils - gawk gnugrep gnused - jdk - which - ]) + ":${platformTools}/platform-tools"; - in '' - set -x - mkdir -pv $out/libexec - cd $out/libexec - tar -xjf $src - - # so that it doesn't fail because of read-only permissions set - cd - - patch -p1 \ - --no-backup-if-mismatch \ - -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch } - cd ${pkg_path} - - '' + lib.optionalString (!fullNDK) '' - # Steps to reduce output size - rm -rf docs sources tests - # We only support cross compiling with gcc for now - rm -rf toolchains/*-clang* toolchains/llvm-* - - '' + '' - find ${pkg_path}/toolchains \( \ - \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm -0100 \) \ - \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${stdenv.lib.makeLibraryPath [ zlib ncurses ]} {} \; - # fix ineffective PROGDIR / MYNDKDIR determination - for i in ndk-build ndk-gdb ndk-gdb-py - do - sed -i -e ${sed_script_1} $i - done - sed -i -e ${sed_script_2} ndk-which - # a bash script - patchShebangs ndk-which - # wrap - for i in ndk-build ndk-gdb ndk-gdb-py ndk-which - do - wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" - done - # make some executables available in PATH - mkdir -pv ${bin_path} - for i in \ - ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which - do - ln -sf ${pkg_path}/$i ${bin_path}/$i - done - ''; -} diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix deleted file mode 100644 index 5f61f25d54eeaf8f129bfa12275fadd22bf9c029..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ /dev/null @@ -1,272 +0,0 @@ -{ stdenv, stdenv_32bit, fetchurl, fetchzip, unzip, makeWrapper -, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib -, freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus -, zlib, glxinfo, xkeyboardconfig -, includeSources -}: -{ platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false -, useGooglePlayServices ? false, useInstantApps ? false }: - -let inherit (stdenv.lib) makeLibraryPath; - - googleRepository = let version = "gms_v9_rc41_wear_2_0_rc6"; - in fetchzip rec { - url = "https://dl-ssl.google.com/android/repository/google_m2repository_${version}.zip"; - sha256 = "0k99xmynv0k62d301zx5jnjkddflr51i5lb02l9incg7m5cn8kzx"; - }; - -in - -stdenv.mkDerivation rec { - name = "android-sdk-${version}"; - version = "25.2.5"; - - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - then fetchurl { - url = "https://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha256 = "0gnk49pkwy4m0nqwm1xnf3w4mfpi9w0kk7841xlawpwbkj0icxap"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha256 = "0yg7wjmyw70xsh8k4hgbqb5rilam2a94yc8dwbh7fjwqcmpxgwqb"; - } - else throw "platform not ${stdenv.hostPlatform.system} supported!"; - - buildCommand = '' - mkdir -p $out/libexec - cd $out/libexec - unpackFile $src - cd tools - - for f in android traceview draw9patch hierarchyviewer monitor ddms screenshot2 uiautomatorviewer monkeyrunner jobb lint - do - sed -i -e "s|/bin/ls|${coreutils}/bin/ls|" "$f" - done - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - '' - # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++ - - for i in mksdcard - do - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i - done - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - for i in bin64/{mkfs.ext4,fsck.ext4,e2fsck,tune2fs,resize2fs} - do - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i - done - ''} - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - # We must also patch the 64-bit emulator instances, if needed - - for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service emulator-check qemu/linux-x86_64/qemu-system-* - do - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i - done - ''} - - # The following scripts used SWT and wants to dynamically load some GTK+ stuff. - # Creating these wrappers ensure that they can be found: - - wrapProgram `pwd`/android \ - --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]} - - wrapProgram `pwd`/uiautomatorviewer \ - --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} - - wrapProgram `pwd`/hierarchyviewer \ - --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} - - # The emulators need additional libraries, which are dynamically loaded => let's wrap them - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") '' - for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service - do - wrapProgram `pwd`/$i \ - --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \ - --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \ - --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb - done - ''} - ''} - - patchShebangs . - - ${if stdenv.hostPlatform.system == "i686-linux" then - '' - # The monitor requires some more patching - - cd lib/monitor-x86 - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 monitor - patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so - - wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} - - cd ../.. - '' - else if stdenv.hostPlatform.system == "x86_64-linux" then - '' - # The monitor requires some more patching - - cd lib/monitor-x86_64 - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 monitor - patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so - - wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} - - cd ../.. - '' - else ""} - - # Symlink the other sub packages - - cd .. - ln -s ${platformTools}/platform-tools - ln -s ${buildTools}/build-tools - ln -s ${support}/support - - # Symlink required Google API add-ons - - mkdir -p add-ons - cd add-ons - - ${if useGoogleAPIs then - stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("google_apis_"+platformVersion) addons) then - let - googleApis = builtins.getAttr ("google_apis_"+platformVersion) addons; - in - "ln -s ${googleApis}/* addon-google_apis-${platformVersion}\n" - else "") platformVersions - else ""} - - cd .. - - # Symlink required extras - - mkdir -p extras/android - cd extras/android - - ln -s ${supportRepository}/m2repository - - ${if useExtraSupportLibs then - "ln -s ${addons.android_support_extra}/support ." - else ""} - - cd .. - mkdir -p google - cd google - - ${if useGooglePlayServices then - "ln -s ${addons.google_play_services}/google-play-services google_play_services" - else ""} - - ${stdenv.lib.optionalString useInstantApps - "ln -s ${addons.instant_apps}/whsdk instantapps"} - - ln -s ${googleRepository} m2repository - - cd ../.. - - # Symlink required sources - mkdir -p sources - cd sources - - ${if includeSources then - stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("source_"+platformVersion) sources) then - let - source = builtins.getAttr ("source_"+platformVersion) sources; - in - "ln -s ${source}/* android-${platformVersion}\n" - else "") platformVersions - else ""} - - cd .. - - # Symlink required platforms - - mkdir -p platforms - cd platforms - - ${stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("platform_"+platformVersion) platforms) then - let - platform = builtins.getAttr ("platform_"+platformVersion) platforms; - in - "ln -s ${platform}/* android-${platformVersion}\n" - else "" - ) platformVersions} - - cd .. - - # Symlink required system images - - mkdir -p system-images - cd system-images - - ${stdenv.lib.concatMapStrings (abiVersion: - stdenv.lib.concatMapStrings (platformVersion: - if (builtins.hasAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages) then - let - sysimg = builtins.getAttr ("sysimg_" + abiVersion + "_" + platformVersion) sysimages; - in - '' - mkdir -p android-${platformVersion} - cd android-${platformVersion} - ln -s ${sysimg}/* - cd .. - '' - else "" - ) platformVersions - ) abiVersions} - - # Create wrappers to the most important tools and platform tools so that we can run them if the SDK is in our PATH - - mkdir -p $out/bin - - for i in $out/libexec/tools/* - do - if [ ! -d $i ] && [ -x $i ] - then - ln -sf $i $out/bin/$(basename $i) - fi - done - - for i in $out/libexec/platform-tools/* - do - if [ ! -d $i ] && [ -x $i ] - then - ln -sf $i $out/bin/$(basename $i) - fi - done - - for i in $out/libexec/build-tools/*/* - do - if [ ! -d $i ] && [ -x $i ] - then - ln -sf $i $out/bin/$(basename $i) - fi - done - ''; - - buildInputs = [ unzip makeWrapper ]; - - meta = { - platforms = stdenv.lib.platforms.unix; - hydraPlatforms = []; - license = stdenv.lib.licenses.unfree; - }; -} diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 20b3ff3b8f509088606686589ed8662401b47c26..62cdeb43032e0bfad04c046e634400d8e5286de0 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -1,28 +1,26 @@ -{ stdenv, androidsdk, jdk, ant, androidndk, gnumake, gawk, file, which }: -args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false, antFlags ? "" +{ composeAndroidPackages, stdenv, ant, jdk, gnumake, gawk }: + +{ name , release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null -, useNDK ? false, ... -}: +, antFlags ? "" +, ... +}@args: assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; let - androidsdkComposition = androidsdk { - inherit platformVersions useGoogleAPIs; - abiVersions = []; - }; + androidSdkFormalArgs = builtins.functionArgs composeAndroidPackages; + androidArgs = builtins.intersectAttrs androidSdkFormalArgs args; + androidsdk = (composeAndroidPackages androidArgs).androidsdk; + + extraArgs = removeAttrs args ([ "name" ] ++ builtins.attrNames androidSdkFormalArgs); in stdenv.mkDerivation ({ - name = stdenv.lib.replaceChars [" "] [""] name; - - ANDROID_HOME = "${androidsdkComposition}/libexec"; - - buildInputs = [ jdk ant ] ++ - stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ]; - + name = stdenv.lib.replaceChars [" "] [""] name; # Android APKs may contain white spaces in their names, but Nix store paths cannot + ANDROID_HOME = "${androidsdk}/libexec/android-sdk"; + buildInputs = [ jdk ant ]; buildPhase = '' ${stdenv.lib.optionalString release '' - # Provide key singing attributes ( echo "key.store=${keyStore}" echo "key.alias=${keyAlias}" @@ -32,20 +30,19 @@ stdenv.mkDerivation ({ ''} export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it. - ${if useNDK then '' - export GNUMAKE=${gnumake}/bin/make - export NDK_HOST_AWK=${gawk}/bin/gawk - ${androidndk}/bin/ndk-build - '' else ""} + + ${stdenv.lib.optionalString (args ? includeNDK && args.includeNDK) '' + export GNUMAKE=${gnumake}/bin/make + export NDK_HOST_AWK=${gawk}/bin/gawk + ${androidsdk}/libexec/android-sdk/ndk-bundle/ndk-build + ''} ant ${antFlags} ${if release then "release" else "debug"} ''; - installPhase = '' mkdir -p $out mv bin/*-${if release then "release" else "debug"}.apk $out - + mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products ''; -} // -builtins.removeAttrs args ["name"]) +} // extraArgs) diff --git a/pkgs/development/mobile/androidenv/build-gradle-app.nix b/pkgs/development/mobile/androidenv/build-gradle-app.nix deleted file mode 100644 index d6a391463246ed69b2109daae25bc750b9b2753e..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/build-gradle-app.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, androidsdk, jdk, androidndk, gnumake, gawk, file -, which, gradle, fetchurl, buildEnv, runCommand }: - -args@{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false - , useExtraSupportLibs ? false, useGooglePlayServices ? false - , release ? false, keyStore ? null, keyAlias ? null - , keyStorePassword ? null, keyAliasPassword ? null - , useNDK ? false, buildInputs ? [], mavenDeps, gradleTask - , buildDirectory ? "./.", acceptAndroidSdkLicenses ? false }: - -assert release -> keyStore != null; -assert release -> keyAlias != null; -assert release -> keyStorePassword != null; -assert release -> keyAliasPassword != null; -assert acceptAndroidSdkLicenses; - -let - inherit (stdenv.lib) optionalString; - - m2install = { repo, version, artifactId, groupId - , jarSha256, pomSha256, aarSha256, suffix ? "" }: - let m2Name = "${artifactId}-${version}"; - m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; - in runCommand m2Name {} ('' - mkdir -p $out/m2/${m2Path} - '' + optionalString (jarSha256 != null) '' - install -D ${fetchurl { - url = "${repo}${m2Path}/${m2Name}${suffix}.jar"; - sha256 = jarSha256; - }} $out/m2/${m2Path}/${m2Name}${suffix}.jar - '' + optionalString (pomSha256 != null) '' - install -D ${fetchurl { - url = "${repo}${m2Path}/${m2Name}${suffix}.pom"; - sha256 = pomSha256; - }} $out/m2/${m2Path}/${m2Name}${suffix}.pom - '' + optionalString (aarSha256 != null) '' - install -D ${fetchurl { - url = "${repo}${m2Path}/${m2Name}${suffix}.aar"; - sha256 = aarSha256; - }} $out/m2/${m2Path}/${m2Name}${suffix}.aar - ''); - - androidsdkComposition = androidsdk { - inherit platformVersions useGoogleAPIs - useExtraSupportLibs useGooglePlayServices; - abiVersions = [ "armeabi-v7a" ]; - }; -in -stdenv.mkDerivation ({ - name = stdenv.lib.replaceChars [" "] [""] name; - - ANDROID_HOME = "${androidsdkComposition}/libexec"; - ANDROID_NDK_HOME = "${androidndk}/libexec/${androidndk.name}"; - - buildInputs = [ jdk gradle ] ++ - stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ] ++ - buildInputs; - - DEPENDENCIES = buildEnv { name = "${name}-maven-deps"; - paths = map m2install mavenDeps; - }; - - buildPhase = '' - ${optionalString release '' - # Provide key signing attributes - ( echo "RELEASE_STORE_FILE=${keyStore}" - echo "RELEASE_KEY_ALIAS=${keyAlias}" - echo "RELEASE_STORE_PASSWORD=${keyStorePassword}" - echo "RELEASE_KEY_PASSWORD=${keyAliasPassword}" - ) >> gradle.properties - ''} - buildDir=`pwd` - cp -r $ANDROID_HOME $buildDir/local_sdk - chmod -R 755 local_sdk - export ANDROID_HOME=$buildDir/local_sdk - # Key files cannot be stored in the user's home directory. This - # overrides it. - export ANDROID_SDK_HOME=`pwd` - - mkdir -p "$ANDROID_HOME/licenses" - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license" - - export APP_HOME=`pwd` - - mkdir -p .m2/repository - if [ -d "$DEPENDENCIES/m2" ] ; then - cp -RL "$DEPENDENCIES"/m2/* .m2/repository/ - fi - chmod -R 755 .m2 - mkdir -p .m2/repository/com/android/support - cp -RL local_sdk/extras/android/m2repository/com/android/support/* .m2/repository/com/android/support/ - cp -RL local_sdk/extras/google/m2repository/* .m2/repository/ - gradle ${gradleTask} --offline --no-daemon -g ./tmp -Dmaven.repo.local=`pwd`/.m2/repository - ''; - - installPhase = '' - mkdir -p $out - mv ${buildDirectory}/build/outputs/apk/*.apk $out - - mkdir -p $out/nix-support - echo "file binary-dist \"$(echo $out/*.apk)\"" > $out/nix-support/hydra-build-products - ''; - - meta = { - license = stdenv.lib.licenses.unfree; - }; -} // builtins.removeAttrs args ["name" "mavenDeps"]) diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 85e604bd3f4405871513c30494cb315da46d6167..976ef1416275707793c8c0a2be6a9b7c7d9fd71a 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,56 +1,19 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}: -stdenv.mkDerivation rec { - version = "26.0.2"; - name = "android-build-tools-r${version}"; - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - then fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha256 = "1kii880bwhjkc343zwx1ysxyisxhczrwhphnxbwsgi45mjgq8lm7"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha256 = "1x0ycprl6hgsm23kck5ind7x00hzydc5k3h3ch4a13407xbpvzvx"; - } - else throw "System ${stdenv.hostPlatform.system} not supported!"; +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook makeWrapper ] ++ + lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + addAutoPatchelfSearchPath $packageBaseDir/lib + addAutoPatchelfSearchPath $packageBaseDir/lib64 + autoPatchelf --no-recurse $packageBaseDir/lib64 + autoPatchelf --no-recurse $packageBaseDir + ''} - buildCommand = '' - mkdir -p $out/build-tools - cd $out/build-tools - unzip $src - mv android-* ${version} - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - '' - cd ${version} - - ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5 - - find . -type f -print0 | while IFS= read -r -d "" file - do - type=$(file "$file") - ## Patch 64-bit binaries - if grep -q "ELF 64-bit" <<< "$type" - then - if grep -q "interpreter" <<< "$type" - then - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file" - fi - patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file" - ## Patch 32-bit binaries - elif grep -q "ELF 32-bit" <<< "$type" - then - if grep -q "interpreter" <<< "$type" - then - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file" - fi - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file" - fi - done - ''} - - patchShebangs . + wrapProgram $PWD/mainDexClasses \ + --prefix PATH : ${pkgs.jdk8}/bin ''; - - buildInputs = [ unzip file ]; + noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build } diff --git a/pkgs/development/mobile/androidenv/cmake.nix b/pkgs/development/mobile/androidenv/cmake.nix new file mode 100644 index 0000000000000000000000000000000000000000..1aeef467642c9f09cd975792e4e461ce2ecc9f8e --- /dev/null +++ b/pkgs/development/mobile/androidenv/cmake.nix @@ -0,0 +1,10 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: + +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook ] + ++ lib.optional (os == "linux") [ pkgs.stdenv.glibc pkgs.stdenv.cc.cc ]; + patchInstructions = lib.optionalString (os == "linux") '' + autoPatchelf $packageBaseDir/bin + ''; +} diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix new file mode 100644 index 0000000000000000000000000000000000000000..935a4a4f2fbbb29c9baebdecffc5f37e981084aa --- /dev/null +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -0,0 +1,259 @@ +{stdenv, fetchurl, requireFile, makeWrapper, unzip, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: + +{ toolsVersion ? "25.2.5" +, platformToolsVersion ? "28.0.1" +, buildToolsVersions ? [ "28.0.3" ] +, includeEmulator ? false +, emulatorVersion ? "28.0.14" +, platformVersions ? [] +, includeSources ? false +, includeDocs ? false +, includeSystemImages ? false +, systemImageTypes ? [ "default" ] +, abiVersions ? [ "armeabi-v7a" ] +, lldbVersions ? [ ] +, cmakeVersions ? [ ] +, includeNDK ? false +, ndkVersion ? "18.1.5063045" +, useGoogleAPIs ? false +, useGoogleTVAddOns ? false +, includeExtras ? [] +}: + +let + inherit (pkgs) stdenv fetchurl makeWrapper unzip; + + # Determine the Android os identifier from Nix's system identifier + os = if stdenv.system == "x86_64-linux" then "linux" + else if stdenv.system == "x86_64-darwin" then "macosx" + else throw "No tarballs found for system architecture: ${stdenv.system}"; + + # Generated Nix packages + packages = import ./generated/packages.nix { + inherit fetchurl; + }; + + # Generated system images + system-images-packages-android = import ./generated/system-images-android.nix { + inherit fetchurl; + }; + + system-images-packages-android-tv = import ./generated/system-images-android-tv.nix { + inherit fetchurl; + }; + + system-images-packages-android-wear = import ./generated/system-images-android-wear.nix { + inherit fetchurl; + }; + + system-images-packages-android-wear-cn = import ./generated/system-images-android-wear-cn.nix { + inherit fetchurl; + }; + + system-images-packages-google_apis = import ./generated/system-images-google_apis.nix { + inherit fetchurl; + }; + + system-images-packages-google_apis_playstore = import ./generated/system-images-google_apis_playstore.nix { + inherit fetchurl; + }; + + system-images-packages = + stdenv.lib.recursiveUpdate + system-images-packages-android + (stdenv.lib.recursiveUpdate system-images-packages-android-tv + (stdenv.lib.recursiveUpdate system-images-packages-android-wear + (stdenv.lib.recursiveUpdate system-images-packages-android-wear-cn + (stdenv.lib.recursiveUpdate system-images-packages-google_apis system-images-packages-google_apis_playstore)))); + + # Generated addons + addons = import ./generated/addons.nix { + inherit fetchurl; + }; +in +rec { + deployAndroidPackage = import ./deploy-androidpackage.nix { + inherit stdenv unzip; + }; + + platform-tools = import ./platform-tools.nix { + inherit deployAndroidPackage os autoPatchelfHook pkgs; + inherit (stdenv) lib; + package = packages.platform-tools."${platformToolsVersion}"; + }; + + build-tools = map (version: + import ./build-tools.nix { + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686; + inherit (stdenv) lib; + package = packages.build-tools."${version}"; + } + ) buildToolsVersions; + + docs = deployAndroidPackage { + inherit os; + package = packages.docs."1"; + }; + + emulator = import ./emulator.nix { + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686; + inherit (stdenv) lib; + package = packages.emulator."${emulatorVersion}"."${os}"; + }; + + platforms = map (version: + deployAndroidPackage { + inherit os; + package = packages.platforms."${version}"; + } + ) platformVersions; + + sources = map (version: + deployAndroidPackage { + inherit os; + package = packages.sources."${version}"; + } + ) platformVersions; + + system-images = stdenv.lib.flatten (map (apiVersion: + map (type: + map (abiVersion: + deployAndroidPackage { + inherit os; + package = system-images-packages.${apiVersion}.${type}.${abiVersion}; + } + ) abiVersions + ) systemImageTypes + ) platformVersions); + + lldb = map (version: + import ./lldb.nix { + inherit deployAndroidPackage os autoPatchelfHook pkgs; + inherit (stdenv) lib; + package = packages.lldb."${version}"; + } + ) lldbVersions; + + cmake = map (version: + import ./cmake.nix { + inherit deployAndroidPackage os autoPatchelfHook pkgs; + inherit (stdenv) lib; + package = packages.cmake."${version}"; + } + ) cmakeVersions; + + ndk-bundle = import ./ndk-bundle { + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs platform-tools; + inherit (stdenv) lib; + package = packages.ndk-bundle."${ndkVersion}"; + }; + + google-apis = map (version: + deployAndroidPackage { + inherit os; + package = addons.addons."${version}".google_apis; + } + ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default + + google-tv-addons = map (version: + deployAndroidPackage { + inherit os; + package = addons.addons."${version}".google_tv_addon; + } + ) platformVersions; + + # Function that automatically links all plugins for which multiple versions can coexist + linkPlugins = {name, plugins}: + stdenv.lib.optionalString (plugins != []) '' + mkdir -p ${name} + ${stdenv.lib.concatMapStrings (plugin: '' + ln -s ${plugin}/libexec/android-sdk/${name}/* ${name} + '') plugins} + ''; + + # Function that automatically links a plugin for which only one version exists + linkPlugin = {name, plugin, check ? true}: + stdenv.lib.optionalString check '' + ln -s ${plugin}/libexec/android-sdk/* ${name} + ''; + + # Links all plugins related to a requested platform + linkPlatformPlugins = {name, plugins, check}: + stdenv.lib.optionalString check '' + mkdir -p ${name} + ${stdenv.lib.concatMapStrings (plugin: '' + ln -s ${plugin}/libexec/android-sdk/${name}/* ${name} + '') plugins} + ''; # */ + + # This derivation deploys the tools package and symlinks all the desired + # plugins that we want to use. + + androidsdk = if !licenseAccepted then throw '' + You must accept the Android Software Development Kit License Agreement at + https://developer.android.com/studio/terms + by setting nixpkgs config option 'android_sdk.accept_license = true;' + '' else import ./tools.nix { + inherit deployAndroidPackage requireFile packages toolsVersion autoPatchelfHook makeWrapper os pkgs pkgs_i686; + inherit (stdenv) lib; + + postInstall = '' + # Symlink all requested plugins + + ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }} + ${linkPlugins { name = "build-tools"; plugins = build-tools; }} + ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }} + ${linkPlugin { name = "docs"; plugin = docs; check = includeDocs; }} + ${linkPlugins { name = "platforms"; plugins = platforms; }} + ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }} + ${linkPlugins { name = "lldb"; plugins = lldb; }} + ${linkPlugins { name = "cmake"; plugins = cmake; }} + ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} + + ${stdenv.lib.optionalString includeSystemImages '' + mkdir -p system-images + ${stdenv.lib.concatMapStrings (system-image: '' + apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) + type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) + mkdir -p system-images/$apiVersion/$type + ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type + '') system-images} + ''} + + ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleAPIs; }} + ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }} + + # Link extras + ${stdenv.lib.concatMapStrings (identifier: + let + path = addons.extras."${identifier}".path; + addon = deployAndroidPackage { + inherit os; + package = addons.extras."${identifier}"; + }; + in + '' + targetDir=$(dirname ${path}) + mkdir -p $targetDir + ln -s ${addon}/libexec/android-sdk/${path} $targetDir + '') includeExtras} + + # Expose common executables in bin/ + mkdir -p $out/bin + find $PWD/tools -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i + do + ln -s $i $out/bin + done + + find $PWD/tools/bin -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i + do + ln -s $i $out/bin + done + + for i in ${platform-tools}/bin/* + do + ln -s $i $out/bin + done + ''; + }; +} diff --git a/pkgs/development/mobile/androidenv/convertaddons.xsl b/pkgs/development/mobile/androidenv/convertaddons.xsl new file mode 100644 index 0000000000000000000000000000000000000000..73f58ff5cdeccda7435eb39e3f480ce13346be68 --- /dev/null +++ b/pkgs/development/mobile/androidenv/convertaddons.xsl @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + https://dl.google.com/android/repository/ + + + + + + +{fetchurl}: + +{ + addons = { + + + ""."" = { + name = ""; + path = ""; + revision = ""; + displayName = ""; + archives = { + + all = fetchurl { + url = ; + sha1 = ""; + }; + + + = fetchurl { + url = ; + sha1 = ""; + }; + + }; + }; + + + + + ""."" = { + name = ""; + path = "add-ons/addon-google_apis-google-25"; + revision = ""; + displayName = ""; + archives = { + + all = fetchurl { + url = ; + sha1 = ""; + }; + + + = fetchurl { + url = ; + sha1 = ""; + }; + + }; + }; + + }; + + extras = { + + + + + + + + + + + + . + + + + . + + + + -rc + + + + + "" = { + name = ""; + path = ""; + revision = ""; + displayName = ""; + archives = { + + all = fetchurl { + url = ; + sha1 = ""; + }; + + + = fetchurl { + url = ; + sha1 = ""; + }; + + }; + }; + + }; +} + + + diff --git a/pkgs/development/mobile/androidenv/convertpackages.xsl b/pkgs/development/mobile/androidenv/convertpackages.xsl new file mode 100644 index 0000000000000000000000000000000000000000..9623e01abcd7f18f495cfc1c4076c12ec7f3113f --- /dev/null +++ b/pkgs/development/mobile/androidenv/convertpackages.xsl @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + https://dl.google.com/android/repository/ + + + + + + +{fetchurl}: + +{ + + + + + + + + + + + + + + + + + + + + + + + + + + + . + + + + . + + + + -rc + + + + + + + + + + + + + + + + + + + + + + + + ""."". = { + + + ""."" = { + + + name = ""; + path = ""; + revision = ""; + displayName = ""; + archives = { + + all = fetchurl { + url = ; + sha1 = ""; + }; + + + = fetchurl { + url = ; + sha1 = ""; + }; + + }; + }; + +} + + diff --git a/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/pkgs/development/mobile/androidenv/convertsystemimages.xsl new file mode 100644 index 0000000000000000000000000000000000000000..42d19cb69651074b7893b77b5c712b9c2817750a --- /dev/null +++ b/pkgs/development/mobile/androidenv/convertsystemimages.xsl @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + https://dl.google.com/android/repository/sys-img// + + + + + +{fetchurl}: + +{ + + + -- + + + "".."" = { + name = "system-image-"; + path = ""; + revision = ""; + displayName = ""; + archives.all = fetchurl { + + url = ; + sha1 = ""; + + }; + }; + +} + + diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 8e108f24088e7d1453b48d82d03d91a90a974a32..925601054225d28fc1c1a75eddea048fc749bd7f 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,316 +1,26 @@ -{ buildPackages, pkgs, pkgs_i686, targetPackages -, includeSources ? true +{ pkgs ? import {} +, pkgs_i686 ? import { system = "i686-linux"; } +, licenseAccepted ? false }: -# TODO: use callPackage instead of import to avoid so many inherits - rec { - platformTools = import ./platform-tools.nix { - inherit buildPackages pkgs; - }; - - buildTools = import ./build-tools.nix { - inherit (pkgs) stdenv fetchurl unzip zlib file; - stdenv_32bit = pkgs_i686.stdenv; - zlib_32bit = pkgs_i686.zlib; - ncurses_32bit = pkgs_i686.ncurses5; - ncurses = pkgs.ncurses5; - }; - - support = import ./support.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - supportRepository = import ./support-repository.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - platforms = if (pkgs.stdenv.hostPlatform.system == "i686-linux" || pkgs.stdenv.hostPlatform.system == "x86_64-linux") - then import ./platforms-linux.nix { - inherit (pkgs) stdenv fetchurl unzip; - } - else if pkgs.stdenv.hostPlatform.system == "x86_64-darwin" - then import ./platforms-macosx.nix { - inherit (pkgs) stdenv fetchurl unzip; - } - else throw "Platform: ${pkgs.stdenv.hostPlatform.system} not supported!"; - - sysimages = import ./sysimages.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - addons = import ./addons.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - sources = import ./sources.nix { - inherit (pkgs) stdenv fetchurl unzip; - }; - - androidsdk = import ./androidsdk.nix { - inherit (pkgs) stdenv fetchurl unzip makeWrapper zlib - glxinfo freetype fontconfig glib gtk2 atk - libGLU_combined file alsaLib jdk coreutils - libpulseaudio dbus fetchzip; - inherit (pkgs.xorg) libX11 libXext libXrender - libxcb libXau libXdmcp libXtst xkeyboardconfig; - - inherit platformTools buildTools support - supportRepository platforms sysimages - addons sources includeSources; - - stdenv_32bit = pkgs_i686.stdenv; - }; - - androidsdk_2_1 = androidsdk { - platformVersions = [ "7" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_2_2 = androidsdk { - platformVersions = [ "8" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_2_3_3 = androidsdk { - platformVersions = [ "10" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_3_0 = androidsdk { - platformVersions = [ "11" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_3_1 = androidsdk { - platformVersions = [ "12" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_3_2 = androidsdk { - platformVersions = [ "13" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_0 = androidsdk { - platformVersions = [ "14" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_0_3 = androidsdk { - platformVersions = [ "15" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_1 = androidsdk { - platformVersions = [ "16" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_2 = androidsdk { - platformVersions = [ "17" ]; - abiVersions = [ "armeabi-v7a" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_3 = androidsdk { - platformVersions = [ "18" ]; - abiVersions = [ "armeabi-v7a" "x86" ]; - useGoogleAPIs = true; - }; - - androidsdk_4_4 = androidsdk { - platformVersions = [ "19" ]; - abiVersions = [ "armeabi-v7a" "x86" ]; - useGoogleAPIs = true; - }; - - androidsdk_5_0_1 = androidsdk { - platformVersions = [ "21" ]; - abiVersions = [ "armeabi-v7a" "x86" ]; - useGoogleAPIs = true; - }; - - androidsdk_5_0_1_extras = androidsdk { - platformVersions = [ "21" ]; - abiVersions = [ "armeabi-v7a" "x86" ]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - }; - - androidsdk_5_1_1 = androidsdk { - platformVersions = [ "22" ]; - abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_5_1_1_extras = androidsdk { - platformVersions = [ "22" ]; - abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - }; - - androidsdk_6_0 = androidsdk { - platformVersions = [ "23" ]; - abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_6_0_extras = androidsdk { - platformVersions = [ "23" ]; - abiVersions = [ "armeabi-v7a" "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_7_0 = androidsdk { - platformVersions = [ "24" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_7_0_extras = androidsdk { - platformVersions = [ "24" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_7_1_1 = androidsdk { - platformVersions = [ "25" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_7_1_1_extras = androidsdk { - platformVersions = [ "25" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_8_0 = androidsdk { - platformVersions = [ "26" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - }; - - androidsdk_8_0_extras = androidsdk { - platformVersions = [ "26" ]; - abiVersions = [ "x86" "x86_64"]; - useGoogleAPIs = true; - useExtraSupportLibs = true; - useGooglePlayServices = true; - useInstantApps = true; - }; - - androidsdk_latest = androidsdk_8_0; - - androidndk_10e = pkgs.callPackage ./androidndk.nix { - inherit (buildPackages) - unzip makeWrapper; - inherit (pkgs) - stdenv fetchurl zlib ncurses5 lib python3 libcxx - coreutils file findutils gawk gnugrep gnused jdk which; - inherit platformTools; - version = "10e"; - sha256 = "032j3sgk93bjbkny84i17ph61dhjmsax9ddqng1zbi2p7dgl0pzf"; - }; - - androidndk_16b = pkgs.callPackage ./androidndk.nix { - inherit (buildPackages) - unzip makeWrapper; - inherit (pkgs) - stdenv fetchurl zlib ncurses5 lib python3 libcxx - coreutils file findutils gawk gnugrep gnused jdk which; - inherit platformTools; - version = "16b"; - sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw"; - }; - - androidndk_17 = pkgs.callPackage ./androidndk.nix { - inherit (buildPackages) - unzip makeWrapper; - inherit (pkgs) - stdenv fetchurl zlib ncurses5 lib python3 libcxx - coreutils file findutils gawk gnugrep gnused jdk which; - inherit platformTools; - version = "17"; - sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds"; - }; - androidndk = androidndk_17; - - androidndk_r8e = import ./androidndk_r8e.nix { - inherit (buildPackages) - makeWrapper; - inherit (pkgs) - stdenv fetchurl zlib ncurses lib - coreutils file findutils gawk gnugrep gnused jdk which; - inherit platformTools; + composeAndroidPackages = import ./compose-android-packages.nix { + inherit (pkgs) stdenv fetchurl requireFile makeWrapper unzip autoPatchelfHook; + inherit pkgs pkgs_i686 licenseAccepted; }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv jdk ant gnumake gawk file which; - inherit androidsdk androidndk; + inherit (pkgs) stdenv jdk ant gnumake gawk; + inherit composeAndroidPackages; }; emulateApp = import ./emulate-app.nix { inherit (pkgs) stdenv; - inherit androidsdk; + inherit composeAndroidPackages; }; - androidndkPkgs_17 = import ./androidndk-pkgs.nix { - inherit (buildPackages) - makeWrapper; - inherit (pkgs) - lib stdenv - runCommand wrapBintoolsWith wrapCCWith; - # buildPackages.foo rather than buildPackages.buildPackages.foo would work, - # but for splicing messing up on infinite recursion for the variants we - # *dont't* use. Using this workaround, but also making a test to ensure - # these two really are the same. - buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17; - androidndk = androidndk_17; - targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17; - }; - androidndkPkgs = androidndkPkgs_17; - - androidndkPkgs_10e = import ./androidndk-pkgs.nix { - inherit (buildPackages) - makeWrapper; - inherit (pkgs) - lib stdenv - runCommand wrapBintoolsWith wrapCCWith; - # buildPackages.foo rather than buildPackages.buildPackages.foo would work, - # but for splicing messing up on infinite recursion for the variants we - # *dont't* use. Using this workaround, but also making a test to ensure - # these two really are the same. - buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e; - androidndk = androidndk_10e; - targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e; - }; - - buildGradleApp = import ./build-gradle-app.nix { - inherit (pkgs) stdenv jdk gnumake gawk file runCommand - which gradle fetchurl buildEnv; - inherit androidsdk androidndk; + androidPkgs_9_0 = composeAndroidPackages { + platformVersions = [ "28" ]; + abiVersions = [ "x86" "x86_64"]; }; } diff --git a/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix new file mode 100644 index 0000000000000000000000000000000000000000..97fd197cb7d06a3579d03ed7c6ab6b7aeba61079 --- /dev/null +++ b/pkgs/development/mobile/androidenv/deploy-androidpackage.nix @@ -0,0 +1,44 @@ +{stdenv, unzip}: +{package, os ? null, buildInputs ? [], patchInstructions ? "", meta ? {}, ...}@args: + +let + extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ]; +in +stdenv.mkDerivation ({ + name = package.name + "-" + package.revision; + src = if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all; + buildInputs = [ unzip ] ++ buildInputs; + + # Most Android Zip packages have a root folder, but some don't. We unpack + # the zip file in a folder and we try to discover whether it has a single root + # folder. If this is the case, we adjust the current working folder. + unpackPhase = '' + mkdir extractedzip + cd extractedzip + unpackFile "$src" + if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ] + then + cd "$(find . -mindepth 1 -maxdepth 1 -type d)" + fi + sourceRoot="$PWD" + ''; + + installPhase = '' + packageBaseDir=$out/libexec/android-sdk/${package.path} + mkdir -p $packageBaseDir + cd $packageBaseDir + cp -av $sourceRoot/* . + ${patchInstructions} + ''; + + # We never attempt to strip. This is not required since we're doing binary + # deployments. Moreover, some executables that have been patched with patchelf + # may not work any longer after they have been stripped. + dontStrip = true; + dontPatchELF = true; + dontAutoPatchelf = true; + + meta = { + description = package.displayName; + } // meta; +} // extraParams) diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index 2fc753c047a9f7e58d5f142d24b88a580715d250..01669024b3b85cfa53b05a75cc2501f01ae23f54 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,33 +1,41 @@ -{stdenv, androidsdk}: +{ composeAndroidPackages, stdenv }: { name, app ? null -, platformVersion ? "8", abiVersion ? "armeabi-v7a", useGoogleAPIs ? false +, platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default", useGoogleAPIs ? false , enableGPU ? false, extraAVDFiles ? [] , package ? null, activity ? null , avdHomeDir ? null -}: +}@args: let - androidsdkComposition = androidsdk { - inherit useGoogleAPIs; + androidSdkArgNames = builtins.attrNames (builtins.functionArgs composeAndroidPackages); + extraParams = removeAttrs args ([ "name" ] ++ androidSdkArgNames); + + # Extract the parameters meant for the Android SDK + androidParams = { platformVersions = [ platformVersion ]; + includeEmulator = true; + includeSystemImages = true; + systemImageTypes = [ systemImageType ]; abiVersions = [ abiVersion ]; }; + + androidsdkComposition = (composeAndroidPackages androidParams).androidsdk; in stdenv.mkDerivation { inherit name; - + buildCommand = '' mkdir -p $out/bin - + cat > $out/bin/run-test-emulator << "EOF" #! ${stdenv.shell} -e - + # We need a TMPDIR if [ "$TMPDIR" = "" ] then export TMPDIR=/tmp fi - + ${if avdHomeDir == null then '' # Store the virtual devices somewhere else, instead of polluting a user's HOME directory export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) @@ -35,20 +43,23 @@ stdenv.mkDerivation { mkdir -p "${avdHomeDir}" export ANDROID_SDK_HOME="${avdHomeDir}" ''} - + + # We need to specify the location of the Android SDK root folder + export ANDROID_SDK_ROOT=${androidsdkComposition}/libexec/android-sdk + # We have to look for a free TCP port - + echo "Looking for a free TCP port in range 5554-5584" >&2 - + for i in $(seq 5554 2 5584) do - if [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb devices | grep emulator-$i)" ] + if [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb devices | grep emulator-$i)" ] then port=$i break fi done - + if [ -z "$port" ] then echo "Unfortunately, the emulator port space is exhausted!" >&2 @@ -56,57 +67,57 @@ stdenv.mkDerivation { else echo "We have a free TCP port: $port" >&2 fi - + export ANDROID_SERIAL="emulator-$port" - + # Create a virtual android device for testing if it does not exists - - if [ "$(${androidsdkComposition}/libexec/tools/android list avd | grep 'Name: device')" = "" ] + ${androidsdkComposition}/libexec/android-sdk/tools/android list targets + + if [ "$(${androidsdkComposition}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] then # Create a virtual android device - yes "" | ${androidsdkComposition}/libexec/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS - + yes "" | ${androidsdkComposition}/libexec/android-sdk/tools/android create avd -n device -t 1 --abi ${systemImageType}/${abiVersion} $NIX_ANDROID_AVD_FLAGS + ${stdenv.lib.optionalString enableGPU '' # Enable GPU acceleration echo "hw.gpu.enabled=yes" >> $ANDROID_SDK_HOME/.android/avd/device.avd/config.ini ''} - + ${stdenv.lib.concatMapStrings (extraAVDFile: '' ln -sf ${extraAVDFile} $ANDROID_SDK_HOME/.android/avd/device.avd '') extraAVDFiles} fi - + # Launch the emulator - ${androidsdkComposition}/libexec/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & + ${androidsdkComposition}/libexec/android-sdk/emulator/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & # Wait until the device has completely booted - echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2 - - ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port wait-for-device - + + ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port wait-for-device + echo "Device state has been reached" >&2 - - while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] + + while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] do sleep 5 done - + echo "dev.bootcomplete property is 1" >&2 - - #while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] + + #while [ -z "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] #do #sleep 5 #done - + #echo "sys.boot_completed property is 1" >&2 - + echo "ready" >&2 - + ${stdenv.lib.optionalString (app != null) '' # Install the App through the debugger, if it has not been installed yet - - if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] + + if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] then if [ -d "${app}" ] then @@ -114,13 +125,13 @@ stdenv.mkDerivation { else appPath="${app}" fi - - ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port install "$appPath" + + ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port install "$appPath" fi - + # Start the application ${stdenv.lib.optionalString (package != null && activity != null) '' - ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} + ${androidsdkComposition}/libexec/android-sdk/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} ''} ''} EOF diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix new file mode 100644 index 0000000000000000000000000000000000000000..7ba74eb900fe281e6dd4e459b8eaf8814e4bd83d --- /dev/null +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -0,0 +1,20 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}: + +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook makeWrapper ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libXfixes pkgs.xlibs.libxcb pkgs.libGL pkgs.libpulseaudio pkgs.zlib pkgs.ncurses5 pkgs.stdenv.cc.cc pkgs_i686.glibc ]; + patchInstructions = lib.optionalString (os == "linux") '' + addAutoPatchelfSearchPath $packageBaseDir/lib + addAutoPatchelfSearchPath $packageBaseDir/lib64 + addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib + autoPatchelf $out + + # Wrap emulator so that it can load libdbus-1.so at runtime and it no longer complains about XKB keymaps + wrapProgram $out/libexec/android-sdk/emulator/emulator \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.dbus ]} \ + --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ + --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale + ''; + dontMoveLib64 = true; +} diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh deleted file mode 100755 index 2edbe6bf489889ba7d2b963d9a976d42217d66d4..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/fetch.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash --pure -p androidsdk curl libxslt - -# this shows a list of available xmls -android list sdk | grep 'Parse XML:' | cut -f8- -d\ # | xargs -n 1 curl -O - -# we skip the intel addons, as they are Windows+osX only -# we skip the default sys-img (arm?) because it is empty -curl -o repository-11.xml https://dl.google.com/android/repository/repository-11.xml -curl -o addon.xml https://dl.google.com/android/repository/addon.xml -curl -o sys-img.xml https://dl.google.com/android/repository/sys-img/android/sys-img.xml - -./generate-addons.sh -./generate-platforms.sh -./generate-sysimages.sh -./generate-sources.sh diff --git a/pkgs/development/mobile/androidenv/generate-addons.sh b/pkgs/development/mobile/androidenv/generate-addons.sh deleted file mode 100755 index 9b2cf34eabccaf07c0382183e10dff6be7d8d6a8..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/generate-addons.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -xsltproc generate-addons.xsl addon.xml > addons.nix diff --git a/pkgs/development/mobile/androidenv/generate-addons.xsl b/pkgs/development/mobile/androidenv/generate-addons.xsl deleted file mode 100644 index d32ad717cd790f1de0095db726772e65cbcf4490..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/generate-addons.xsl +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - -# This file is generated from generate-addons.sh. DO NOT EDIT. -# Execute generate-addons.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildGoogleApis = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - google_apis_ = buildGoogleApis { - name = "-"; - src = fetchurl { - url = https://dl.google.com/android/repository/; - sha1 = ""; - }; - meta = { - description = ""; - url = ; - }; - }; - - - - android_support_extra = buildGoogleApis { - name = "android_support_extra"; - src = fetchurl { - url = https://dl.google.com/android/repository/; - sha1 = ""; - }; - meta = { - description = "Android Support Library"; - url = http://developer.android.com/; - }; - }; - - google_play_services = buildGoogleApis { - name = "google_play_services"; - src = fetchurl { - url = https://dl.google.com/android/repository/; - sha1 = ""; - }; - meta = { - description = "Google Play services client library and sample code"; - url = http://developer.android.com/; - }; - }; - - - - - instant_apps = buildGoogleApis { - name = "instant_apps_sdk"; - src = fetchurl { - url = https://dl.google.com/android/repository/; - sha1 = ""; - }; - meta = { - description = "Android Instant Apps Development SDK"; - url = "https://developer.android.com/"; - }; - }; - - -} - - - diff --git a/pkgs/development/mobile/androidenv/generate-platforms.sh b/pkgs/development/mobile/androidenv/generate-platforms.sh deleted file mode 100755 index ce89f6a8036eb734dc150090c6eab39da379c9d2..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/generate-platforms.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e - -xsltproc --stringparam os linux generate-platforms.xsl repository-11.xml > platforms-linux.nix -xsltproc --stringparam os macosx generate-platforms.xsl repository-11.xml > platforms-macosx.nix diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl deleted file mode 100644 index 54a165d21e4d66512124ca5f41540a6933d24117..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/generate-platforms.xsl +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - https://dl.google.com/android/repository/ - - - - - - -# This file is generated from generate-platforms.sh. DO NOT EDIT. -# Execute generate-platforms.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildPlatform = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - platform_ = buildPlatform { - name = "android-platform-"; - src = fetchurl { - url = ; - sha1 = ""; - }; - meta = { - description = ""; - homepage = ; - }; - }; - -} - - diff --git a/pkgs/development/mobile/androidenv/generate-sources.sh b/pkgs/development/mobile/androidenv/generate-sources.sh deleted file mode 100755 index 861fbbf9d2e6fb9b477953494290358b5997d13f..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/generate-sources.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -e - -xsltproc generate-sources.xsl repository-11.xml > sources.nix diff --git a/pkgs/development/mobile/androidenv/generate-sources.xsl b/pkgs/development/mobile/androidenv/generate-sources.xsl deleted file mode 100644 index ad76369b2be00be7c43481c2b46dc363907e653a..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/generate-sources.xsl +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - https://dl.google.com/android/repository/ - - - - - - -# This file is generated from generate-sources.sh. DO NOT EDIT. -# Execute generate-sources.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildSource = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - source_ = buildSource { - name = "android-source-"; - src = fetchurl { - url = ; - sha1 = ""; - }; - meta = { - description = "Source code for Android API "; - }; - }; - -} - - diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.sh b/pkgs/development/mobile/androidenv/generate-sysimages.sh deleted file mode 100755 index 586381e8ba666bfe43186e6cd811b93032fe3693..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/generate-sysimages.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -e - -cat > sysimages.nix << "EOF" -# This file is generated from generate-sysimages.sh. DO NOT EDIT. -# Execute generate-sysimages.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildSystemImage = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ -EOF - -xsltproc generate-sysimages.xsl sys-img.xml >> sysimages.nix - -cat >> sysimages.nix << "EOF" -} -EOF diff --git a/pkgs/development/mobile/androidenv/generate-sysimages.xsl b/pkgs/development/mobile/androidenv/generate-sysimages.xsl deleted file mode 100644 index 302c7d9deea526f299ae1ddb77fb8cbf35d7a1f6..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/generate-sysimages.xsl +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - sysimg__ = buildSystemImage { - name = "sysimg--"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/; - sha1 = ""; - }; - }; - - - diff --git a/pkgs/development/mobile/androidenv/generate.sh b/pkgs/development/mobile/androidenv/generate.sh new file mode 100644 index 0000000000000000000000000000000000000000..1c55734f5f427cb70b6866c4e5103a502d7ebcfa --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate.sh @@ -0,0 +1,16 @@ +#!/bin/sh -e + +# Convert base packages +curl https://dl.google.com/android/repository/repository2-1.xml -o xml/repository2-1.xml +xsltproc convertpackages.xsl xml/repository2-1.xml > generated/packages.nix + +# Convert system images +for img in android android-tv android-wear android-wear-cn google_apis google_apis_playstore +do + curl https://dl.google.com/android/repository/sys-img/$img/sys-img2-1.xml -o xml/$img-sys-img2-1.xml + xsltproc --stringparam imageType $img convertsystemimages.xsl xml/$img-sys-img2-1.xml > generated/system-images-$img.nix +done + +# Convert system addons +curl https://dl.google.com/android/repository/addon2-1.xml -o xml/addon2-1.xml +xsltproc convertaddons.xsl xml/addon2-1.xml > generated/addons.nix diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix new file mode 100644 index 0000000000000000000000000000000000000000..d902b1116658d0cf89a44f50921b6eeb0a10f263 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/addons.nix @@ -0,0 +1,1145 @@ + +{fetchurl}: + +{ + addons = { + + "10"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-10"; + revision = "10"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-10_r02.zip; + sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; + }; + + }; + }; + + "11"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-11"; + revision = "11"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-11_r01.zip; + sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; + }; + + }; + }; + + "12"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-12"; + revision = "12"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-12_r01.zip; + sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; + }; + + }; + }; + + "13"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-13"; + revision = "13"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-13_r01.zip; + sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; + }; + + }; + }; + + "14"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-14"; + revision = "14"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-14_r02.zip; + sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; + }; + + }; + }; + + "15"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-15"; + revision = "15"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-15_r03.zip; + sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9"; + }; + + }; + }; + + "16"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-16"; + revision = "16"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-16_r04.zip; + sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792"; + }; + + }; + }; + + "17"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-17"; + revision = "17"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-17_r04.zip; + sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f"; + }; + + }; + }; + + "18"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-18"; + revision = "18"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-18_r04.zip; + sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b"; + }; + + }; + }; + + "19"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-19"; + revision = "19"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-19_r20.zip; + sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311"; + }; + + }; + }; + + "21"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-21"; + revision = "21"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-21_r01.zip; + sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; + }; + + }; + }; + + "22"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-22"; + revision = "22"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-22_r01.zip; + sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; + }; + + }; + }; + + "23"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-23"; + revision = "23"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-23_r01.zip; + sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db"; + }; + + }; + }; + + "24"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-24"; + revision = "24"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-24_r1.zip; + sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; + }; + + }; + }; + + "3"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-3"; + revision = "3"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-3-r03.zip; + sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; + }; + + }; + }; + + "4"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-4"; + revision = "4"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-4_r02.zip; + sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; + }; + + }; + }; + + "5"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-5"; + revision = "5"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-5_r01.zip; + sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; + }; + + }; + }; + + "6"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-6"; + revision = "6"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-6_r01.zip; + sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; + }; + + }; + }; + + "7"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-7"; + revision = "7"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-7_r01.zip; + sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; + }; + + }; + }; + + "8"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-8"; + revision = "8"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-8_r02.zip; + sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; + }; + + }; + }; + + "9"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-9"; + revision = "9"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-9_r02.zip; + sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; + }; + + }; + }; + + "12"."google_tv_addon" = { + name = "google_tv_addon"; + path = "add-ons/addon-google_tv_addon-google-12"; + revision = "12"; + displayName = "Google TV Addon"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_tv-12_r02.zip; + sha1 = "92128a12e7e8b0fb5bac59153d7779b717e7b840"; + }; + + }; + }; + + "13"."google_tv_addon" = { + name = "google_tv_addon"; + path = "add-ons/addon-google_tv_addon-google-13"; + revision = "13"; + displayName = "Google TV Addon"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_tv-13_r01.zip; + sha1 = "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09"; + }; + + }; + }; + + "25"."google_apis" = { + name = "google_apis"; + path = "add-ons/addon-google_apis-google-25"; + revision = "25"; + displayName = "Google APIs"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_apis-25_r1.zip; + sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3"; + }; + + }; + }; + + }; + + extras = { + + + "extras;android;gapid;1" = { + name = "extras-android-gapid-1"; + path = "extras/android/gapid/1"; + revision = "1.0.3"; + displayName = "GPU Debugging tools"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/gapid_r01_linux.zip; + sha1 = "7c9ef7544cf0aea030bcc29bd8e12c04fd53e653"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/gapid_r01_osx.zip; + sha1 = "597eb271349d890566274861eba2770a84ee4c69"; + }; + + }; + }; + + + "extras;android;gapid;3" = { + name = "extras-android-gapid-3"; + path = "extras/android/gapid/3"; + revision = "3.1.0"; + displayName = "GPU Debugging tools"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/gapid_2994895_linux.zip; + sha1 = "e40371ba191f617e4e79bc760d0ab2948ba8cf46"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/gapid_2994895_osx.zip; + sha1 = "ad86a2350b7b9908300277bf03d41649659de384"; + }; + + }; + }; + + + "extras;android;m2repository" = { + name = "extras-android-m2repository"; + path = "extras/android/m2repository"; + revision = "47.0.0"; + displayName = "Android Support Repository"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android_m2repository_r47.zip; + sha1 = "a0d22beacc106a6977321f2b07d692ce4979e96a"; + }; + + }; + }; + + + "extras;google;admob_ads_sdk" = { + name = "extras-google-admob_ads_sdk"; + path = "extras/google/admob_ads_sdk"; + revision = "11"; + displayName = "Google AdMob Ads SDK"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip; + sha1 = "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82"; + }; + + }; + }; + + + "extras;google;analytics_sdk_v2" = { + name = "extras-google-analytics_sdk_v2"; + path = "extras/google/analytics_sdk_v2"; + revision = "3"; + displayName = "Google Analytics App Tracking SDK"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip; + sha1 = "dc14026bf0ce78315cb5dd00552607de0894de83"; + }; + + }; + }; + + + "extras;google;auto" = { + name = "extras-google-auto"; + path = "extras/google/auto"; + revision = "1.1"; + displayName = "Android Auto Desktop Head Unit emulator"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip; + sha1 = "202a6e1b3009a0eb815f8c672d2d5b3717de6169"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip; + sha1 = "8179cbb3914493ebc5eb65b731cba061582f2e84"; + }; + + }; + }; + + + "extras;google;gcm" = { + name = "extras-google-gcm"; + path = "extras/google/gcm"; + revision = "3"; + displayName = "Google Cloud Messaging for Android Library"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/gcm_r03.zip; + sha1 = "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf"; + }; + + }; + }; + + + "extras;google;google_play_services" = { + name = "extras-google-google_play_services"; + path = "extras/google/google_play_services"; + revision = "49"; + displayName = "Google Play services"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip; + sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9"; + }; + + }; + }; + + + "extras;google;google_play_services_froyo" = { + name = "extras-google-google_play_services_froyo"; + path = "extras/google/google_play_services_froyo"; + revision = "12"; + displayName = "Google Play services for Froyo"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_play_services_3265130_r12.zip; + sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9"; + }; + + }; + }; + + + "extras;google;instantapps" = { + name = "extras-google-instantapps"; + path = "extras/google/instantapps"; + revision = "1.5.0"; + displayName = "Google Play Instant Development SDK"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip; + sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4"; + }; + + }; + }; + + + "extras;google;m2repository" = { + name = "extras-google-m2repository"; + path = "extras/google/m2repository"; + revision = "58"; + displayName = "Google Repository"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip; + sha1 = "05086add9e3a0eb1b67111108d7757a4337c3f10"; + }; + + }; + }; + + + "extras;google;market_apk_expansion" = { + name = "extras-google-market_apk_expansion"; + path = "extras/google/market_apk_expansion"; + revision = "1"; + displayName = "Google Play APK Expansion library"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/market_apk_expansion-r03.zip; + sha1 = "5305399dc1a56814e86b8459ce24871916f78b8c"; + }; + + }; + }; + + + "extras;google;market_licensing" = { + name = "extras-google-market_licensing"; + path = "extras/google/market_licensing"; + revision = "1"; + displayName = "Google Play Licensing Library"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/market_licensing-r02.zip; + sha1 = "355e8dc304a92a5616db235af8ee7bd554356254"; + }; + + }; + }; + + + "extras;google;simulators" = { + name = "extras-google-simulators"; + path = "extras/google/simulators"; + revision = "1"; + displayName = "Android Auto API Simulators"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/simulator_r01.zip; + sha1 = "4fb5344e34e8faab4db18af07dace44c50db26a7"; + }; + + }; + }; + + + "extras;google;usb_driver" = { + name = "extras-google-usb_driver"; + path = "extras/google/usb_driver"; + revision = "11"; + displayName = "Google USB Driver"; + archives = { + + }; + }; + + + "extras;google;webdriver" = { + name = "extras-google-webdriver"; + path = "extras/google/webdriver"; + revision = "2"; + displayName = "Google Web Driver"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/webdriver_r02.zip; + sha1 = "13f3a3b2670a5fc04a7342861644be9a01b07e38"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip; + sha1 = "b621b9d5adf273bb0725948589863e60e96eeaf1"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha2"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha2.zip; + sha1 = "2e7fd5d8d158f4517ba52af824f84466ffede879"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha3" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha3"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha3"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha3"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha3.zip; + sha1 = "cd1cbbb2621c9034b835e9b69243dc558cdee4dc"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha5" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha5"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha5"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha5"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha5.zip; + sha1 = "7ba6c82c7645ac023cf45c1e27a6ae3added308a"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha6" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha6"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha6"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha6"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha6.zip; + sha1 = "b7e390f940704f4f78e1eaa5f5a5dba3bc3e81ad"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha7" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha7"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha7"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha7"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha7.zip; + sha1 = "f08be3c306bf878de31c465e46a266c52014a13f"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha8"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip; + sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha9" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha9"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha9"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha9"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha9.zip; + sha1 = "2c52ddd883d83230a17042b8f4ba03669f0f5f40"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta1"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip; + sha1 = "042c25575e7650e96f0f5f5d1d3c54ed38eb821a"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip; + sha1 = "28492fd42b20ae1586591ff906556d459cfdaae8"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta3"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip; + sha1 = "268e763fa64bd217d8d830e59ce76be19aaba631"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip; + sha1 = "2213bf37e7a2869db2635895b8e90ca6841e79d2"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.0-beta5"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip; + sha1 = "3918cfef73e64048d0b3e048068e208b414e7e91"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.1"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip; + sha1 = "76f8823def9a6da8954a54737762a6820bc1d043"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2"; + revision = "1"; + displayName = "Solver for ConstraintLayout 1.0.2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip; + sha1 = "96d7ff669f0e808e9833b2c2e320702826ccc8be"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip; + sha1 = "70acf99689b933bc6735645d5c3d92b91954b6cb"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha2"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha2.zip; + sha1 = "2edb4fc33745cc9d69d985f29fd48fefcd0aa9f0"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha3" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha3"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha3"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha3"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha3.zip; + sha1 = "1a26fb79d98421f315ead7ad15be167727533026"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; + revision = "1"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha5" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha5"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha5"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha5"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha5.zip; + sha1 = "24f78daf491dcad74bcb2acfa79ea2d8e906f53b"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha6" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha6"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha6"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha6"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha6.zip; + sha1 = "cb60e9ad4f6d3cc3c5b1b98cd3610c8d3204e651"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha7" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha7"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha7"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha7"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha7.zip; + sha1 = "17ac210c85d24d7e8ace62847f05e4e45b640b73"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha8"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip; + sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha9" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha9"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha9"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-alpha9"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha9.zip; + sha1 = "89c2bbc005d4731c7a830a4d5aa98dae121a46a4"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta1"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip; + sha1 = "11f2f5cec4ff02986bad75435e5be77b704b4c64"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip; + sha1 = "623939865ede2e5c2c975dc55963e0d182bcce95"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta3"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip; + sha1 = "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip; + sha1 = "dc60844aab93a09a54a3c107685a77b18d7c1c39"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.0-beta5"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip; + sha1 = "4660f6c7a576ea1364f0c3225db71c29ca660d9a"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.1"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip; + sha1 = "342b0894b8651fff37586f80f383733e97aba9f9"; + }; + + }; + }; + + + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2"; + revision = "1"; + displayName = "ConstraintLayout for Android 1.0.2"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip; + sha1 = "3d9688a50fe0ed7348275f85d1b02278f616d8a4"; + }; + + }; + }; + + }; +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/pkgs/development/mobile/androidenv/generated/packages.nix new file mode 100644 index 0000000000000000000000000000000000000000..db1f7f1b8d32a450646fd0591595955d2700ed79 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/packages.nix @@ -0,0 +1,1910 @@ + +{fetchurl}: + +{ + + "build-tools"."17.0.0" = { + + name = "build-tools"; + path = "build-tools/17.0.0"; + revision = "17.0.0"; + displayName = "Android SDK Build-Tools 17"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r17-linux.zip; + sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip; + sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930"; + }; + + }; + }; + + "build-tools"."18.0.1" = { + + name = "build-tools"; + path = "build-tools/18.0.1"; + revision = "18.0.1"; + displayName = "Android SDK Build-Tools 18.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip; + sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip; + sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; + }; + + }; + }; + + "build-tools"."18.1.0" = { + + name = "build-tools"; + path = "build-tools/18.1.0"; + revision = "18.1.0"; + displayName = "Android SDK Build-Tools 18.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip; + sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip; + sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; + }; + + }; + }; + + "build-tools"."18.1.1" = { + + name = "build-tools"; + path = "build-tools/18.1.1"; + revision = "18.1.1"; + displayName = "Android SDK Build-Tools 18.1.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip; + sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip; + sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4"; + }; + + }; + }; + + "build-tools"."19.0.0" = { + + name = "build-tools"; + path = "build-tools/19.0.0"; + revision = "19.0.0"; + displayName = "Android SDK Build-Tools 19"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19-linux.zip; + sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip; + sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90"; + }; + + }; + }; + + "build-tools"."19.0.1" = { + + name = "build-tools"; + path = "build-tools/19.0.1"; + revision = "19.0.1"; + displayName = "Android SDK Build-Tools 19.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip; + sha1 = "18d2312dc4368858914213087f4e61445aca4517"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip; + sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b"; + }; + + }; + }; + + "build-tools"."19.0.2" = { + + name = "build-tools"; + path = "build-tools/19.0.2"; + revision = "19.0.2"; + displayName = "Android SDK Build-Tools 19.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip; + sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip; + sha1 = "145bc43065d45f756d99d87329d899052b9a9288"; + }; + + }; + }; + + "build-tools"."19.0.3" = { + + name = "build-tools"; + path = "build-tools/19.0.3"; + revision = "19.0.3"; + displayName = "Android SDK Build-Tools 19.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip; + sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip; + sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4"; + }; + + }; + }; + + "build-tools"."19.1.0" = { + + name = "build-tools"; + path = "build-tools/19.1.0"; + revision = "19.1.0"; + displayName = "Android SDK Build-Tools 19.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip; + sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip; + sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1"; + }; + + }; + }; + + "build-tools"."20.0.0" = { + + name = "build-tools"; + path = "build-tools/20.0.0"; + revision = "20.0.0"; + displayName = "Android SDK Build-Tools 20"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r20-linux.zip; + sha1 = "b688905526a5584d1327a662d871a635ff502758"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip; + sha1 = "1240f629411c108a714c4ddd756937c7fab93f83"; + }; + + }; + }; + + "build-tools"."21.0.0" = { + + name = "build-tools"; + path = "build-tools/21.0.0"; + revision = "21.0.0"; + displayName = "Android SDK Build-Tools 21"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21-linux.zip; + sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip; + sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa"; + }; + + }; + }; + + "build-tools"."21.0.1" = { + + name = "build-tools"; + path = "build-tools/21.0.1"; + revision = "21.0.1"; + displayName = "Android SDK Build-Tools 21.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip; + sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip; + sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7"; + }; + + }; + }; + + "build-tools"."21.0.2" = { + + name = "build-tools"; + path = "build-tools/21.0.2"; + revision = "21.0.2"; + displayName = "Android SDK Build-Tools 21.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip; + sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip; + sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1"; + }; + + }; + }; + + "build-tools"."21.1.0" = { + + name = "build-tools"; + path = "build-tools/21.1.0"; + revision = "21.1.0"; + displayName = "Android SDK Build-Tools 21.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip; + sha1 = "b7455e543784d52a8925f960bc880493ed1478cb"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip; + sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246"; + }; + + }; + }; + + "build-tools"."21.1.1" = { + + name = "build-tools"; + path = "build-tools/21.1.1"; + revision = "21.1.1"; + displayName = "Android SDK Build-Tools 21.1.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip; + sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip; + sha1 = "836a146eab0504aa9387a5132e986fe7c7381571"; + }; + + }; + }; + + "build-tools"."21.1.2" = { + + name = "build-tools"; + path = "build-tools/21.1.2"; + revision = "21.1.2"; + displayName = "Android SDK Build-Tools 21.1.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip; + sha1 = "5e35259843bf2926113a38368b08458735479658"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; + sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; + }; + + }; + }; + + "build-tools"."22.0.0" = { + + name = "build-tools"; + path = "build-tools/22.0.0"; + revision = "22.0.0"; + displayName = "Android SDK Build-Tools 22"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22-linux.zip; + sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip; + sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d"; + }; + + }; + }; + + "build-tools"."22.0.1" = { + + name = "build-tools"; + path = "build-tools/22.0.1"; + revision = "22.0.1"; + displayName = "Android SDK Build-Tools 22.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip; + sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip; + sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf"; + }; + + }; + }; + + "build-tools"."23.0.0" = { + + name = "build-tools"; + path = "build-tools/23.0.0"; + revision = "23.0.0"; + displayName = "Android SDK Build-Tools 23"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23-linux.zip; + sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip; + sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03"; + }; + + }; + }; + + "build-tools"."23.0.1" = { + + name = "build-tools"; + path = "build-tools/23.0.1"; + revision = "23.0.1"; + displayName = "Android SDK Build-Tools 23.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip; + sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip; + sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; + }; + + }; + }; + + "build-tools"."23.0.2" = { + + name = "build-tools"; + path = "build-tools/23.0.2"; + revision = "23.0.2"; + displayName = "Android SDK Build-Tools 23.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip; + sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip; + sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf"; + }; + + }; + }; + + "build-tools"."23.0.3" = { + + name = "build-tools"; + path = "build-tools/23.0.3"; + revision = "23.0.3"; + displayName = "Android SDK Build-Tools 23.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip; + sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip; + sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0"; + }; + + }; + }; + + "build-tools"."24.0.0" = { + + name = "build-tools"; + path = "build-tools/24.0.0"; + revision = "24.0.0"; + displayName = "Android SDK Build-Tools 24"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24-linux.zip; + sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip; + sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de"; + }; + + }; + }; + + "build-tools"."24.0.1" = { + + name = "build-tools"; + path = "build-tools/24.0.1"; + revision = "24.0.1"; + displayName = "Android SDK Build-Tools 24.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip; + sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip; + sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848"; + }; + + }; + }; + + "build-tools"."24.0.2" = { + + name = "build-tools"; + path = "build-tools/24.0.2"; + revision = "24.0.2"; + displayName = "Android SDK Build-Tools 24.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip; + sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip; + sha1 = "8bb8fc575477491d5957de743089df412de55cda"; + }; + + }; + }; + + "build-tools"."24.0.3" = { + + name = "build-tools"; + path = "build-tools/24.0.3"; + revision = "24.0.3"; + displayName = "Android SDK Build-Tools 24.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip; + sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip; + sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c"; + }; + + }; + }; + + "build-tools"."25.0.0" = { + + name = "build-tools"; + path = "build-tools/25.0.0"; + revision = "25.0.0"; + displayName = "Android SDK Build-Tools 25"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25-linux.zip; + sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip; + sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606"; + }; + + }; + }; + + "build-tools"."25.0.1" = { + + name = "build-tools"; + path = "build-tools/25.0.1"; + revision = "25.0.1"; + displayName = "Android SDK Build-Tools 25.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip; + sha1 = "ff063d252ab750d339f5947d06ff782836f22bac"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip; + sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f"; + }; + + }; + }; + + "build-tools"."25.0.2" = { + + name = "build-tools"; + path = "build-tools/25.0.2"; + revision = "25.0.2"; + displayName = "Android SDK Build-Tools 25.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip; + sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip; + sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16"; + }; + + }; + }; + + "build-tools"."25.0.3" = { + + name = "build-tools"; + path = "build-tools/25.0.3"; + revision = "25.0.3"; + displayName = "Android SDK Build-Tools 25.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip; + sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip; + sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e"; + }; + + }; + }; + + "build-tools"."26.0.0" = { + + name = "build-tools"; + path = "build-tools/26.0.0"; + revision = "26.0.0"; + displayName = "Android SDK Build-Tools 26"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-linux.zip; + sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip; + sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086"; + }; + + }; + }; + + "build-tools"."26.0.0-rc1" = { + + name = "build-tools"; + path = "build-tools/26.0.0-rc1"; + revision = "26.0.0-rc1"; + displayName = "Android SDK Build-Tools 26-rc1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip; + sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip; + sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137"; + }; + + }; + }; + + "build-tools"."26.0.0-rc2" = { + + name = "build-tools"; + path = "build-tools/26.0.0-rc2"; + revision = "26.0.0-rc2"; + displayName = "Android SDK Build-Tools 26-rc2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip; + sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip; + sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70"; + }; + + }; + }; + + "build-tools"."26.0.1" = { + + name = "build-tools"; + path = "build-tools/26.0.1"; + revision = "26.0.1"; + displayName = "Android SDK Build-Tools 26.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip; + sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip; + sha1 = "cbde59de198916b390777dd0227921bfa2120832"; + }; + + }; + }; + + "build-tools"."26.0.2" = { + + name = "build-tools"; + path = "build-tools/26.0.2"; + revision = "26.0.2"; + displayName = "Android SDK Build-Tools 26.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip; + sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip; + sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0"; + }; + + }; + }; + + "build-tools"."26.0.3" = { + + name = "build-tools"; + path = "build-tools/26.0.3"; + revision = "26.0.3"; + displayName = "Android SDK Build-Tools 26.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip; + sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip; + sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df"; + }; + + }; + }; + + "build-tools"."27.0.0" = { + + name = "build-tools"; + path = "build-tools/27.0.0"; + revision = "27.0.0"; + displayName = "Android SDK Build-Tools 27"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27-linux.zip; + sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip; + sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1"; + }; + + }; + }; + + "build-tools"."27.0.1" = { + + name = "build-tools"; + path = "build-tools/27.0.1"; + revision = "27.0.1"; + displayName = "Android SDK Build-Tools 27.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip; + sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip; + sha1 = "1edd07bfdbadd95652d093040e16d858f7489594"; + }; + + }; + }; + + "build-tools"."27.0.2" = { + + name = "build-tools"; + path = "build-tools/27.0.2"; + revision = "27.0.2"; + displayName = "Android SDK Build-Tools 27.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip; + sha1 = "b687ddf6be84f11607871138aad32cf857d0b837"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip; + sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be"; + }; + + }; + }; + + "build-tools"."27.0.3" = { + + name = "build-tools"; + path = "build-tools/27.0.3"; + revision = "27.0.3"; + displayName = "Android SDK Build-Tools 27.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip; + sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip; + sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d"; + }; + + }; + }; + + "build-tools"."28.0.0" = { + + name = "build-tools"; + path = "build-tools/28.0.0"; + revision = "28.0.0"; + displayName = "Android SDK Build-Tools 28"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-linux.zip; + sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip; + sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade"; + }; + + }; + }; + + "build-tools"."28.0.0-rc1" = { + + name = "build-tools"; + path = "build-tools/28.0.0-rc1"; + revision = "28.0.0-rc1"; + displayName = "Android SDK Build-Tools 28-rc1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip; + sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip; + sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc"; + }; + + }; + }; + + "build-tools"."28.0.0-rc2" = { + + name = "build-tools"; + path = "build-tools/28.0.0-rc2"; + revision = "28.0.0-rc2"; + displayName = "Android SDK Build-Tools 28-rc2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip; + sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip; + sha1 = "0d0314b353589feb10e528b44c5a685b6658d797"; + }; + + }; + }; + + "build-tools"."28.0.1" = { + + name = "build-tools"; + path = "build-tools/28.0.1"; + revision = "28.0.1"; + displayName = "Android SDK Build-Tools 28.0.1"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip; + sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip; + sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462"; + }; + + }; + }; + + "build-tools"."28.0.2" = { + + name = "build-tools"; + path = "build-tools/28.0.2"; + revision = "28.0.2"; + displayName = "Android SDK Build-Tools 28.0.2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip; + sha1 = "b4492209810a3fd48deaa982f9852fef12433d55"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip; + sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9"; + }; + + }; + }; + + "build-tools"."28.0.3" = { + + name = "build-tools"; + path = "build-tools/28.0.3"; + revision = "28.0.3"; + displayName = "Android SDK Build-Tools 28.0.3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip; + sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip; + sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a"; + }; + + }; + }; + + "cmake"."3.10.2" = { + + name = "cmake"; + path = "cmake/3.10.2.4988404"; + revision = "3.10.2"; + displayName = "CMake 3.10.2.4988404"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip; + sha1 = "f227a85cb53dcb927ac52a5a717f647c4a29bf3b"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip; + sha1 = "439e8799bf59f724f104bf62784b2985f1bfe561"; + }; + + }; + }; + + "cmake"."3.6.4111459" = { + + name = "cmake"; + path = "cmake/3.6.4111459"; + revision = "3.6.4111459"; + displayName = "CMake 3.6.4111459"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip; + sha1 = "c9b02d630079783c6d67cb91488b622cfcd9765c"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip; + sha1 = "71c539b9c33f0943e9ad6251fea0b161c0b70782"; + }; + + }; + }; + + "docs"."1" = { + + name = "docs"; + path = "docs"; + revision = "1"; + displayName = "Documentation for Android SDK"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/docs-24_r01.zip; + sha1 = "eef58238949ee9544876cb3e002f2d58e4ee7b5d"; + }; + + }; + }; + + "emulator"."27.3.10".linux = { + + name = "emulator"; + path = "emulator"; + revision = "27.3.10"; + displayName = "Android Emulator"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/emulator-linux-4969155.zip; + sha1 = "5b037b25bc6567fda3071457f0009c057670d9e8"; + }; + + }; + }; + + "emulator"."27.3.10".macosx = { + + name = "emulator"; + path = "emulator"; + revision = "27.3.10"; + displayName = "Android Emulator"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/emulator-darwin-4969155.zip; + sha1 = "28d2b51ee5c84bc544deee433419f33dc9e05b66"; + }; + + }; + }; + + "emulator"."27.3.10".windows = { + + name = "emulator"; + path = "emulator"; + revision = "27.3.10"; + displayName = "Android Emulator"; + archives = { + + }; + }; + + "emulator"."28.0.14".linux = { + + name = "emulator"; + path = "emulator"; + revision = "28.0.14"; + displayName = "Android Emulator"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/emulator-linux-5092175.zip; + sha1 = "062ef9a1f6759481de897d6c5602d9d66e958a0b"; + }; + + }; + }; + + "emulator"."28.0.14".macosx = { + + name = "emulator"; + path = "emulator"; + revision = "28.0.14"; + displayName = "Android Emulator"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/emulator-darwin-5092175.zip; + sha1 = "6dc13599bddd5c2acdb559b25201c92a801d157c"; + }; + + }; + }; + + "emulator"."28.0.14".windows = { + + name = "emulator"; + path = "emulator"; + revision = "28.0.14"; + displayName = "Android Emulator"; + archives = { + + }; + }; + + "lldb"."2.0.2558144" = { + + name = "lldb"; + path = "lldb/2.0"; + revision = "2.0.2558144"; + displayName = "LLDB 2.0"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip; + sha1 = "d92e2f4c8284413eed4f27986e62b167d947033c"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip; + sha1 = "e7060d9b2ba58b28fd7b1a0ea85a151c8371a326"; + }; + + }; + }; + + "lldb"."2.1.2852477" = { + + name = "lldb"; + path = "lldb/2.1"; + revision = "2.1.2852477"; + displayName = "LLDB 2.1"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip; + sha1 = "d1e33880a53f1aa8c7e73534adef83a06f091185"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip; + sha1 = "eb9b96d320210fdfe82495b0597ad43e77f1c240"; + }; + + }; + }; + + "lldb"."2.2.3271982" = { + + name = "lldb"; + path = "lldb/2.2"; + revision = "2.2.3271982"; + displayName = "LLDB 2.2"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip; + sha1 = "62089f4e35775e6cedb82d1fa377fdc1de898005"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip; + sha1 = "413649617d97dd9ef163528f64c0500e1b7c4113"; + }; + + }; + }; + + "lldb"."2.3.3614996" = { + + name = "lldb"; + path = "lldb/2.3"; + revision = "2.3.3614996"; + displayName = "LLDB 2.3"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip; + sha1 = "6b0df112c7b9fa41654497fde2fcce990c831e52"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip; + sha1 = "d7abe655650efe9f6989df31835fa3b3f95c2d13"; + }; + + }; + }; + + "lldb"."3.0.4213617" = { + + name = "lldb"; + path = "lldb/3.0"; + revision = "3.0.4213617"; + displayName = "LLDB 3.0"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip; + sha1 = "2492651690a215317b86c755cd4d584ec9838677"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip; + sha1 = "61d49b6a58953faa61546d631409af5f60d8d9db"; + }; + + }; + }; + + "lldb"."3.1.4508709" = { + + name = "lldb"; + path = "lldb/3.1"; + revision = "3.1.4508709"; + displayName = "LLDB 3.1"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip; + sha1 = "2b37aa55b81a7e5b8a369febf1ac0bad6c7c5d58"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip; + sha1 = "462711c9ee94fec9ff8be5fa8180afec04d1af6f"; + }; + + }; + }; + + "ndk-bundle"."18.1.5063045" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "18.1.5063045"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip; + sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip; + sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; + }; + + }; + }; + + "patcher"."1" = { + + name = "patcher"; + path = "patcher/v4"; + revision = "1"; + displayName = "SDK Patch Applier v4"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip.bak; + sha1 = "046699c5e2716ae11d77e0bad814f7f33fab261e"; + }; + + }; + }; + + "platform-tools"."28.0.1" = { + + name = "platform-tools"; + path = "platform-tools"; + revision = "28.0.1"; + displayName = "Android SDK Platform-Tools"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/platform-tools_r28.0.1-darwin.zip; + sha1 = "ed1edad4a48c27655ce98d0a5821e7296e9de145"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/platform-tools_r28.0.1-linux.zip; + sha1 = "74ff83bc203f01c4f04bd9316ab5a2573f023fd1"; + }; + + }; + }; + + "platforms"."10" = { + + name = "platforms"; + path = "platforms/android-10"; + revision = "10"; + displayName = "Android SDK Platform 10"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-2.3.3_r02.zip; + sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; + }; + + }; + }; + + "platforms"."11" = { + + name = "platforms"; + path = "platforms/android-11"; + revision = "11"; + displayName = "Android SDK Platform 11"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-3.0_r02.zip; + sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; + }; + + }; + }; + + "platforms"."12" = { + + name = "platforms"; + path = "platforms/android-12"; + revision = "12"; + displayName = "Android SDK Platform 12"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-3.1_r03.zip; + sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; + }; + + }; + }; + + "platforms"."13" = { + + name = "platforms"; + path = "platforms/android-13"; + revision = "13"; + displayName = "Android SDK Platform 13"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-3.2_r01.zip; + sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; + }; + + }; + }; + + "platforms"."14" = { + + name = "platforms"; + path = "platforms/android-14"; + revision = "14"; + displayName = "Android SDK Platform 14"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-14_r04.zip; + sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; + }; + + }; + }; + + "platforms"."15" = { + + name = "platforms"; + path = "platforms/android-15"; + revision = "15"; + displayName = "Android SDK Platform 15"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-15_r05.zip; + sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; + }; + + }; + }; + + "platforms"."16" = { + + name = "platforms"; + path = "platforms/android-16"; + revision = "16"; + displayName = "Android SDK Platform 16"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-16_r05.zip; + sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; + }; + + }; + }; + + "platforms"."17" = { + + name = "platforms"; + path = "platforms/android-17"; + revision = "17"; + displayName = "Android SDK Platform 17"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-17_r03.zip; + sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; + }; + + }; + }; + + "platforms"."18" = { + + name = "platforms"; + path = "platforms/android-18"; + revision = "18"; + displayName = "Android SDK Platform 18"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-18_r03.zip; + sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; + }; + + }; + }; + + "platforms"."19" = { + + name = "platforms"; + path = "platforms/android-19"; + revision = "19"; + displayName = "Android SDK Platform 19"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-19_r04.zip; + sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; + }; + + }; + }; + + "platforms"."2" = { + + name = "platforms"; + path = "platforms/android-2"; + revision = "2"; + displayName = "Android SDK Platform 2"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip; + sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip; + sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe"; + }; + + }; + }; + + "platforms"."20" = { + + name = "platforms"; + path = "platforms/android-20"; + revision = "20"; + displayName = "Android SDK Platform 20"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-20_r02.zip; + sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; + }; + + }; + }; + + "platforms"."21" = { + + name = "platforms"; + path = "platforms/android-21"; + revision = "21"; + displayName = "Android SDK Platform 21"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-21_r02.zip; + sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; + }; + + }; + }; + + "platforms"."22" = { + + name = "platforms"; + path = "platforms/android-22"; + revision = "22"; + displayName = "Android SDK Platform 22"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-22_r02.zip; + sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; + }; + + }; + }; + + "platforms"."23" = { + + name = "platforms"; + path = "platforms/android-23"; + revision = "23"; + displayName = "Android SDK Platform 23"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-23_r03.zip; + sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0"; + }; + + }; + }; + + "platforms"."24" = { + + name = "platforms"; + path = "platforms/android-24"; + revision = "24"; + displayName = "Android SDK Platform 24"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-24_r02.zip; + sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; + }; + + }; + }; + + "platforms"."25" = { + + name = "platforms"; + path = "platforms/android-25"; + revision = "25"; + displayName = "Android SDK Platform 25"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-25_r03.zip; + sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; + }; + + }; + }; + + "platforms"."26" = { + + name = "platforms"; + path = "platforms/android-26"; + revision = "26"; + displayName = "Android SDK Platform 26"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-26_r02.zip; + sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; + }; + + }; + }; + + "platforms"."27" = { + + name = "platforms"; + path = "platforms/android-27"; + revision = "27"; + displayName = "Android SDK Platform 27"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-27_r03.zip; + sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353"; + }; + + }; + }; + + "platforms"."28" = { + + name = "platforms"; + path = "platforms/android-28"; + revision = "28"; + displayName = "Android SDK Platform 28"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/platform-28_r06.zip; + sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6"; + }; + + }; + }; + + "platforms"."3" = { + + name = "platforms"; + path = "platforms/android-3"; + revision = "3"; + displayName = "Android SDK Platform 3"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip; + sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip; + sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e"; + }; + + }; + }; + + "platforms"."4" = { + + name = "platforms"; + path = "platforms/android-4"; + revision = "4"; + displayName = "Android SDK Platform 4"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip; + sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip; + sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625"; + }; + + }; + }; + + "platforms"."5" = { + + name = "platforms"; + path = "platforms/android-5"; + revision = "5"; + displayName = "Android SDK Platform 5"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip; + sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip; + sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314"; + }; + + }; + }; + + "platforms"."6" = { + + name = "platforms"; + path = "platforms/android-6"; + revision = "6"; + displayName = "Android SDK Platform 6"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip; + sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip; + sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0"; + }; + + }; + }; + + "platforms"."7" = { + + name = "platforms"; + path = "platforms/android-7"; + revision = "7"; + displayName = "Android SDK Platform 7"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-2.1_r03.zip; + sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; + }; + + }; + }; + + "platforms"."8" = { + + name = "platforms"; + path = "platforms/android-8"; + revision = "8"; + displayName = "Android SDK Platform 8"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-2.2_r03.zip; + sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; + }; + + }; + }; + + "platforms"."9" = { + + name = "platforms"; + path = "platforms/android-9"; + revision = "9"; + displayName = "Android SDK Platform 9"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/android-2.3.1_r02.zip; + sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; + }; + + }; + }; + + "sources"."14" = { + + name = "sources"; + path = "sources/android-14"; + revision = "14"; + displayName = "Sources for Android 14"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-14_r01.zip; + sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555"; + }; + + }; + }; + + "sources"."15" = { + + name = "sources"; + path = "sources/android-15"; + revision = "15"; + displayName = "Sources for Android 15"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-15_r02.zip; + sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa"; + }; + + }; + }; + + "sources"."16" = { + + name = "sources"; + path = "sources/android-16"; + revision = "16"; + displayName = "Sources for Android 16"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-16_r02.zip; + sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84"; + }; + + }; + }; + + "sources"."17" = { + + name = "sources"; + path = "sources/android-17"; + revision = "17"; + displayName = "Sources for Android 17"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-17_r01.zip; + sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a"; + }; + + }; + }; + + "sources"."18" = { + + name = "sources"; + path = "sources/android-18"; + revision = "18"; + displayName = "Sources for Android 18"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-18_r01.zip; + sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78"; + }; + + }; + }; + + "sources"."19" = { + + name = "sources"; + path = "sources/android-19"; + revision = "19"; + displayName = "Sources for Android 19"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-19_r02.zip; + sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7"; + }; + + }; + }; + + "sources"."20" = { + + name = "sources"; + path = "sources/android-20"; + revision = "20"; + displayName = "Sources for Android 20"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-20_r01.zip; + sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76"; + }; + + }; + }; + + "sources"."21" = { + + name = "sources"; + path = "sources/android-21"; + revision = "21"; + displayName = "Sources for Android 21"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-21_r01.zip; + sha1 = "137a5044915d32bea297a8c1552684802bbc2e25"; + }; + + }; + }; + + "sources"."22" = { + + name = "sources"; + path = "sources/android-22"; + revision = "22"; + displayName = "Sources for Android 22"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-22_r01.zip; + sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6"; + }; + + }; + }; + + "sources"."23" = { + + name = "sources"; + path = "sources/android-23"; + revision = "23"; + displayName = "Sources for Android 23"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-23_r01.zip; + sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2"; + }; + + }; + }; + + "sources"."24" = { + + name = "sources"; + path = "sources/android-24"; + revision = "24"; + displayName = "Sources for Android 24"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-24_r01.zip; + sha1 = "6b96115830a83d654479f32ce4b724ca9011148b"; + }; + + }; + }; + + "sources"."25" = { + + name = "sources"; + path = "sources/android-25"; + revision = "25"; + displayName = "Sources for Android 25"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-25_r01.zip; + sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c"; + }; + + }; + }; + + "sources"."26" = { + + name = "sources"; + path = "sources/android-26"; + revision = "26"; + displayName = "Sources for Android 26"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-26_r01.zip; + sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9"; + }; + + }; + }; + + "sources"."27" = { + + name = "sources"; + path = "sources/android-27"; + revision = "27"; + displayName = "Sources for Android 27"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-27_r01.zip; + sha1 = "7b714670561d08f54751af42aca929867b806596"; + }; + + }; + }; + + "sources"."28" = { + + name = "sources"; + path = "sources/android-28"; + revision = "28"; + displayName = "Sources for Android 28"; + archives = { + + all = fetchurl { + url = https://dl.google.com/android/repository/sources-28_r01.zip; + sha1 = "5610e0c24235ee3fa343c899ddd551be30315255"; + }; + + }; + }; + + "tools"."25.2.5" = { + + name = "tools"; + path = "tools"; + revision = "25.2.5"; + displayName = "Android SDK Tools 25.2.5"; + archives = { + linux = fetchurl { + url = https://dl.google.com/android/repository/tools_r25.2.5-linux.zip; + sha1 = "72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"; + }; + macosx = fetchurl { + url = https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip; + sha1 = "d2168d963ac5b616e3d3ddaf21511d084baf3659"; + }; + + }; + }; + + "tools"."26.1.1" = { + + name = "tools"; + path = "tools"; + revision = "26.1.1"; + displayName = "Android SDK Tools"; + archives = { + macosx = fetchurl { + url = https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip; + sha1 = "ed85ea7b59bc3483ce0af4c198523ba044e083ad"; + }; + linux = fetchurl { + url = https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip; + sha1 = "8c7c28554a32318461802c1291d76fccfafde054"; + }; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix new file mode 100644 index 0000000000000000000000000000000000000000..1aa49545254db2a248c783891d332702f32a880c --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix @@ -0,0 +1,157 @@ + +{fetchurl}: + +{ + + + "21".android-tv."x86" = { + name = "system-image-21-android-tv-x86"; + path = "system-images/android-21/android-tv/x86"; + revision = "21-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip; + sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8"; + + }; + }; + + + "21".android-tv."armeabi-v7a" = { + name = "system-image-21-android-tv-armeabi-v7a"; + path = "system-images/android-21/android-tv/armeabi-v7a"; + revision = "21-android-tv-armeabi-v7a"; + displayName = "Android TV ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip; + sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331"; + + }; + }; + + + "22".android-tv."x86" = { + name = "system-image-22-android-tv-x86"; + path = "system-images/android-22/android-tv/x86"; + revision = "22-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip; + sha1 = "c78efd5a155622eb490be9d326f5783993375c35"; + + }; + }; + + + "23".android-tv."x86" = { + name = "system-image-23-android-tv-x86"; + path = "system-images/android-23/android-tv/x86"; + revision = "23-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r17.zip; + sha1 = "6d42eb8f07e1c49c000e530fdb7de894144ea19b"; + + }; + }; + + + "23".android-tv."armeabi-v7a" = { + name = "system-image-23-android-tv-armeabi-v7a"; + path = "system-images/android-23/android-tv/armeabi-v7a"; + revision = "23-android-tv-armeabi-v7a"; + displayName = "Android TV ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip; + sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52"; + + }; + }; + + + "24".android-tv."x86" = { + name = "system-image-24-android-tv-x86"; + path = "system-images/android-24/android-tv/x86"; + revision = "24-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r19.zip; + sha1 = "478e7073f9fcd588bcce89946aa632fbf302ac6a"; + + }; + }; + + + "25".android-tv."x86" = { + name = "system-image-25-android-tv-x86"; + path = "system-images/android-25/android-tv/x86"; + revision = "25-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r13.zip; + sha1 = "fda1743a87331b43b1ff35cd70f3276ae0b1836d"; + + }; + }; + + + "26".android-tv."x86" = { + name = "system-image-26-android-tv-x86"; + path = "system-images/android-26/android-tv/x86"; + revision = "26-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r11.zip; + sha1 = "5c4b0b3c0b9d04a3364956a7ba31d30c33ea57e7"; + + }; + }; + + + "27".android-tv."x86" = { + name = "system-image-27-android-tv-x86"; + path = "system-images/android-27/android-tv/x86"; + revision = "27-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r06.zip; + sha1 = "6b69f1e95a3db3d973e19a95ab5da1adc7750d54"; + + }; + }; + + + "28".android-tv."x86" = { + name = "system-image-28-android-tv-x86"; + path = "system-images/android-28/android-tv/x86"; + revision = "28-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r07.zip; + sha1 = "3ed7e51036957cf350db7fa128cb485b61cbd061"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix new file mode 100644 index 0000000000000000000000000000000000000000..372a751f41cb3643b24aeca531b31c910ba5b4ef --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix @@ -0,0 +1,67 @@ + +{fetchurl}: + +{ + + + "25".android-wear."armeabi-v7a" = { + name = "system-image-25-android-wear-armeabi-v7a"; + path = "system-images/android-25/android-wear-cn/armeabi-v7a"; + revision = "25-android-wear-armeabi-v7a"; + displayName = "China version of Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip; + sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41"; + + }; + }; + + + "25".android-wear."x86" = { + name = "system-image-25-android-wear-x86"; + path = "system-images/android-25/android-wear-cn/x86"; + revision = "25-android-wear-x86"; + displayName = "China version of Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip; + sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d"; + + }; + }; + + + "26".android-wear."x86" = { + name = "system-image-26-android-wear-x86"; + path = "system-images/android-26/android-wear-cn/x86"; + revision = "26-android-wear-x86"; + displayName = "China version of Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip; + sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096"; + + }; + }; + + + "28".android-wear."x86" = { + name = "system-image-28-android-wear-x86"; + path = "system-images/android-P/android-wear-cn/x86"; + revision = "28-android-wear-x86"; + displayName = "China version of Wear OS Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-P_r02.zip; + sha1 = "a61a2e453a11f77ab15b3e0bf1e017e0bb9d1bcc"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix new file mode 100644 index 0000000000000000000000000000000000000000..0c45a1162fefb6cda2c559cccbcdc3992f054d6a --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix @@ -0,0 +1,97 @@ + +{fetchurl}: + +{ + + + "23".android-wear."armeabi-v7a" = { + name = "system-image-23-android-wear-armeabi-v7a"; + path = "system-images/android-23/android-wear/armeabi-v7a"; + revision = "23-android-wear-armeabi-v7a"; + displayName = "Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip; + sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71"; + + }; + }; + + + "23".android-wear."x86" = { + name = "system-image-23-android-wear-x86"; + path = "system-images/android-23/android-wear/x86"; + revision = "23-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip; + sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e"; + + }; + }; + + + "25".android-wear."armeabi-v7a" = { + name = "system-image-25-android-wear-armeabi-v7a"; + path = "system-images/android-25/android-wear/armeabi-v7a"; + revision = "25-android-wear-armeabi-v7a"; + displayName = "Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip; + sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c"; + + }; + }; + + + "25".android-wear."x86" = { + name = "system-image-25-android-wear-x86"; + path = "system-images/android-25/android-wear/x86"; + revision = "25-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip; + sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6"; + + }; + }; + + + "26".android-wear."x86" = { + name = "system-image-26-android-wear-x86"; + path = "system-images/android-26/android-wear/x86"; + revision = "26-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip; + sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c"; + + }; + }; + + + "28".android-wear."x86" = { + name = "system-image-28-android-wear-x86"; + path = "system-images/android-P/android-wear/x86"; + revision = "28-android-wear-x86"; + displayName = "Wear OS Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android-wear/x86-P_r02.zip; + sha1 = "cd0d3a56e114dbb0a2a77d58942d344db464b514"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/pkgs/development/mobile/androidenv/generated/system-images-android.nix new file mode 100644 index 0000000000000000000000000000000000000000..915cceec5469e52676bbdc661ceb2f15a52eb058 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-android.nix @@ -0,0 +1,547 @@ + +{fetchurl}: + +{ + + + "10".default."armeabi-v7a" = { + name = "system-image-10-default-armeabi-v7a"; + path = "system-images/android-10/default/armeabi-v7a"; + revision = "10-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip; + sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69"; + + }; + }; + + + "14".default."armeabi-v7a" = { + name = "system-image-14-default-armeabi-v7a"; + path = "system-images/android-14/default/armeabi-v7a"; + revision = "14-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; + sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; + + }; + }; + + + "15".default."armeabi-v7a" = { + name = "system-image-15-default-armeabi-v7a"; + path = "system-images/android-15/default/armeabi-v7a"; + revision = "15-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip; + sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1"; + + }; + }; + + + "16".default."armeabi-v7a" = { + name = "system-image-16-default-armeabi-v7a"; + path = "system-images/android-16/default/armeabi-v7a"; + revision = "16-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip; + sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f"; + + }; + }; + + + "17".default."armeabi-v7a" = { + name = "system-image-17-default-armeabi-v7a"; + path = "system-images/android-17/default/armeabi-v7a"; + revision = "17-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip; + sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9"; + + }; + }; + + + "18".default."armeabi-v7a" = { + name = "system-image-18-default-armeabi-v7a"; + path = "system-images/android-18/default/armeabi-v7a"; + revision = "18-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip; + sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642"; + + }; + }; + + + "19".default."armeabi-v7a" = { + name = "system-image-19-default-armeabi-v7a"; + path = "system-images/android-19/default/armeabi-v7a"; + revision = "19-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; + sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; + + }; + }; + + + "21".default."armeabi-v7a" = { + name = "system-image-21-default-armeabi-v7a"; + path = "system-images/android-21/default/armeabi-v7a"; + revision = "21-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; + sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; + + }; + }; + + + "22".default."armeabi-v7a" = { + name = "system-image-22-default-armeabi-v7a"; + path = "system-images/android-22/default/armeabi-v7a"; + revision = "22-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; + sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; + + }; + }; + + + "23".default."armeabi-v7a" = { + name = "system-image-23-default-armeabi-v7a"; + path = "system-images/android-23/default/armeabi-v7a"; + revision = "23-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; + sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; + + }; + }; + + + "24".default."armeabi-v7a" = { + name = "system-image-24-default-armeabi-v7a"; + path = "system-images/android-24/default/armeabi-v7a"; + revision = "24-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; + sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; + + }; + }; + + + "24".default."arm64-v8a" = { + name = "system-image-24-default-arm64-v8a"; + path = "system-images/android-24/default/arm64-v8a"; + revision = "24-default-arm64-v8a"; + displayName = "ARM 64 v8a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; + sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; + + }; + }; + + + "16".default."mips" = { + name = "system-image-16-default-mips"; + path = "system-images/android-16/default/mips"; + revision = "16-default-mips"; + displayName = "MIPS System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; + sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; + + }; + }; + + + "17".default."mips" = { + name = "system-image-17-default-mips"; + path = "system-images/android-17/default/mips"; + revision = "17-default-mips"; + displayName = "MIPS System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; + sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; + + }; + }; + + + "10".default."x86" = { + name = "system-image-10-default-x86"; + path = "system-images/android-10/default/x86"; + revision = "10-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip; + sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb"; + + }; + }; + + + "15".default."x86" = { + name = "system-image-15-default-x86"; + path = "system-images/android-15/default/x86"; + revision = "15-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip; + sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1"; + + }; + }; + + + "16".default."x86" = { + name = "system-image-16-default-x86"; + path = "system-images/android-16/default/x86"; + revision = "16-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip; + sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; + + }; + }; + + + "17".default."x86" = { + name = "system-image-17-default-x86"; + path = "system-images/android-17/default/x86"; + revision = "17-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip; + sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; + + }; + }; + + + "18".default."x86" = { + name = "system-image-18-default-x86"; + path = "system-images/android-18/default/x86"; + revision = "18-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip; + sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458"; + + }; + }; + + + "19".default."x86" = { + name = "system-image-19-default-x86"; + path = "system-images/android-19/default/x86"; + revision = "19-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; + sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; + + }; + }; + + + "21".default."x86" = { + name = "system-image-21-default-x86"; + path = "system-images/android-21/default/x86"; + revision = "21-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; + sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; + + }; + }; + + + "22".default."x86" = { + name = "system-image-22-default-x86"; + path = "system-images/android-22/default/x86"; + revision = "22-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; + sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; + + }; + }; + + + "23".default."x86" = { + name = "system-image-23-default-x86"; + path = "system-images/android-23/default/x86"; + revision = "23-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; + sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; + + }; + }; + + + "24".default."x86" = { + name = "system-image-24-default-x86"; + path = "system-images/android-24/default/x86"; + revision = "24-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; + sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; + + }; + }; + + + "25".default."x86" = { + name = "system-image-25-default-x86"; + path = "system-images/android-25/default/x86"; + revision = "25-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip; + sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; + + }; + }; + + + "26".default."x86" = { + name = "system-image-26-default-x86"; + path = "system-images/android-26/default/x86"; + revision = "26-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip; + sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; + + }; + }; + + + "27".default."x86" = { + name = "system-image-27-default-x86"; + path = "system-images/android-27/default/x86"; + revision = "27-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip; + sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; + + }; + }; + + + "28".default."x86" = { + name = "system-image-28-default-x86"; + path = "system-images/android-28/default/x86"; + revision = "28-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip; + sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; + + }; + }; + + + "21".default."x86_64" = { + name = "system-image-21-default-x86_64"; + path = "system-images/android-21/default/x86_64"; + revision = "21-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; + sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; + + }; + }; + + + "22".default."x86_64" = { + name = "system-image-22-default-x86_64"; + path = "system-images/android-22/default/x86_64"; + revision = "22-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; + sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; + + }; + }; + + + "23".default."x86_64" = { + name = "system-image-23-default-x86_64"; + path = "system-images/android-23/default/x86_64"; + revision = "23-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; + sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; + + }; + }; + + + "24".default."x86_64" = { + name = "system-image-24-default-x86_64"; + path = "system-images/android-24/default/x86_64"; + revision = "24-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; + sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; + + }; + }; + + + "25".default."x86_64" = { + name = "system-image-25-default-x86_64"; + path = "system-images/android-25/default/x86_64"; + revision = "25-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip; + sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; + + }; + }; + + + "26".default."x86_64" = { + name = "system-image-26-default-x86_64"; + path = "system-images/android-26/default/x86_64"; + revision = "26-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip; + sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; + + }; + }; + + + "27".default."x86_64" = { + name = "system-image-27-default-x86_64"; + path = "system-images/android-27/default/x86_64"; + revision = "27-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip; + sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; + + }; + }; + + + "28".default."x86_64" = { + name = "system-image-28-default-x86_64"; + path = "system-images/android-28/default/x86_64"; + revision = "28-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip; + sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix new file mode 100644 index 0000000000000000000000000000000000000000..3b0303b86b4b91475db1579277ab32b6e12ec759 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix @@ -0,0 +1,502 @@ + +{fetchurl}: + +{ + + + "10".google_apis."armeabi-v7a" = { + name = "system-image-10-google_apis-armeabi-v7a"; + path = "system-images/android-10/google_apis/armeabi-v7a"; + revision = "10-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r05.zip; + sha1 = "cb60221d4ff6686ae96560970d48d9aa60e80b3f"; + + }; + }; + + + "10".google_apis."x86" = { + name = "system-image-10-google_apis-x86"; + path = "system-images/android-10/google_apis/x86"; + revision = "10-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r05.zip; + sha1 = "b8e8a4ab26890c4a395fb796bf9cb7ceb51c880e"; + + }; + }; + + + "15".google_apis."armeabi-v7a" = { + name = "system-image-15-google_apis-armeabi-v7a"; + path = "system-images/android-15/google_apis/armeabi-v7a"; + revision = "15-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r05.zip; + sha1 = "1ec4e6f9014fcbe694511280f5b497aaf7dd750f"; + + }; + }; + + + "15".google_apis."x86" = { + name = "system-image-15-google_apis-x86"; + path = "system-images/android-15/google_apis/x86"; + revision = "15-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r05.zip; + sha1 = "f2b98baaf847ff5b82b82fdc6c396b229067307b"; + + }; + }; + + + "16".google_apis."x86" = { + name = "system-image-16-google_apis-x86"; + path = "system-images/android-16/google_apis/x86"; + revision = "16-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r05.zip; + sha1 = "7edc5c0836fa32f8d453788c002ca0ee1bc5a0a2"; + + }; + }; + + + "17".google_apis."armeabi-v7a" = { + name = "system-image-17-google_apis-armeabi-v7a"; + path = "system-images/android-17/google_apis/armeabi-v7a"; + revision = "17-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r05.zip; + sha1 = "c990f2a81c24a61f9f1da5d5d205f2924ce548ae"; + + }; + }; + + + "17".google_apis."x86" = { + name = "system-image-17-google_apis-x86"; + path = "system-images/android-17/google_apis/x86"; + revision = "17-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip; + sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6"; + + }; + }; + + + "18".google_apis."armeabi-v7a" = { + name = "system-image-18-google_apis-armeabi-v7a"; + path = "system-images/android-18/google_apis/armeabi-v7a"; + revision = "18-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r05.zip; + sha1 = "c4e69a96d4584f7e311e358fe4ad0e5d1bf1605b"; + + }; + }; + + + "18".google_apis."x86" = { + name = "system-image-18-google_apis-x86"; + path = "system-images/android-18/google_apis/x86"; + revision = "18-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r05.zip; + sha1 = "2b34741693eba9419cb6bf1a467596783234d37a"; + + }; + }; + + + "19".google_apis."x86" = { + name = "system-image-19-google_apis-x86"; + path = "system-images/android-19/google_apis/x86"; + revision = "19-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r37.zip; + sha1 = "f02473420a166b3df7821d8ae5a623524058b4b8"; + + }; + }; + + + "19".google_apis."armeabi-v7a" = { + name = "system-image-19-google_apis-armeabi-v7a"; + path = "system-images/android-19/google_apis/armeabi-v7a"; + revision = "19-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r37.zip; + sha1 = "b388072493ed010fe2ddf607c8c4239f54ce1a0b"; + + }; + }; + + + "21".google_apis."x86" = { + name = "system-image-21-google_apis-x86"; + path = "system-images/android-21/google_apis/x86"; + revision = "21-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r29.zip; + sha1 = "1f5ac49e0ae603b0bfeda0c94cd7e0b850b9b50e"; + + }; + }; + + + "21".google_apis."x86_64" = { + name = "system-image-21-google_apis-x86_64"; + path = "system-images/android-21/google_apis/x86_64"; + revision = "21-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r29.zip; + sha1 = "74ac387aec286fcee01259dcccd4762cbdb4b517"; + + }; + }; + + + "21".google_apis."armeabi-v7a" = { + name = "system-image-21-google_apis-armeabi-v7a"; + path = "system-images/android-21/google_apis/armeabi-v7a"; + revision = "21-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r29.zip; + sha1 = "1d0c428ac7f5eb49c7389ad0beb09f07cb989b45"; + + }; + }; + + + "22".google_apis."x86" = { + name = "system-image-22-google_apis-x86"; + path = "system-images/android-22/google_apis/x86"; + revision = "22-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r23.zip; + sha1 = "4ceda9ffd69d5b827a8cc2f56ccac62e72982b33"; + + }; + }; + + + "22".google_apis."armeabi-v7a" = { + name = "system-image-22-google_apis-armeabi-v7a"; + path = "system-images/android-22/google_apis/armeabi-v7a"; + revision = "22-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r23.zip; + sha1 = "0a11bdffa6132303baf87e4a531987a74d5f0792"; + + }; + }; + + + "22".google_apis."x86_64" = { + name = "system-image-22-google_apis-x86_64"; + path = "system-images/android-22/google_apis/x86_64"; + revision = "22-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r23.zip; + sha1 = "1dfee1c382574c18e3aa2bc2047793169f3ab125"; + + }; + }; + + + "23".google_apis."x86" = { + name = "system-image-23-google_apis-x86"; + path = "system-images/android-23/google_apis/x86"; + revision = "23-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r30.zip; + sha1 = "1b8fd61e7e7c76d8c05a41b19370edfb015ed240"; + + }; + }; + + + "23".google_apis."x86_64" = { + name = "system-image-23-google_apis-x86_64"; + path = "system-images/android-23/google_apis/x86_64"; + revision = "23-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r30.zip; + sha1 = "69a17c23c4e05e81a2820fe49884807fcebba546"; + + }; + }; + + + "23".google_apis."armeabi-v7a" = { + name = "system-image-23-google_apis-armeabi-v7a"; + path = "system-images/android-23/google_apis/armeabi-v7a"; + revision = "23-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r30.zip; + sha1 = "c3966e3a25623a915902d879f90f6d9253dbb619"; + + }; + }; + + + "24".google_apis."x86" = { + name = "system-image-24-google_apis-x86"; + path = "system-images/android-24/google_apis/x86"; + revision = "24-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r24.zip; + sha1 = "7a1adb4aa13946830763644d014fc9c6cc1f921d"; + + }; + }; + + + "24".google_apis."x86_64" = { + name = "system-image-24-google_apis-x86_64"; + path = "system-images/android-24/google_apis/x86_64"; + revision = "24-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r24.zip; + sha1 = "53b26e8868c7cd27dda31c71ee2bcf999d6b9ce2"; + + }; + }; + + + "24".google_apis."armeabi-v7a" = { + name = "system-image-24-google_apis-armeabi-v7a"; + path = "system-images/android-24/google_apis/armeabi-v7a"; + revision = "24-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r24.zip; + sha1 = "85068d55673bbf9417db8d70107ceed0952b5a28"; + + }; + }; + + + "24".google_apis."arm64-v8a" = { + name = "system-image-24-google_apis-arm64-v8a"; + path = "system-images/android-24/google_apis/arm64-v8a"; + revision = "24-google_apis-arm64-v8a"; + displayName = "Google APIs ARM 64 v8a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r24.zip; + sha1 = "93ab33d90fcdbb30ca2e927cd3eea447e933dfd9"; + + }; + }; + + + "25".google_apis."x86" = { + name = "system-image-25-google_apis-x86"; + path = "system-images/android-25/google_apis/x86"; + revision = "25-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r15.zip; + sha1 = "5948473077341265a0b21a53a7e0afc2f980187c"; + + }; + }; + + + "25".google_apis."x86_64" = { + name = "system-image-25-google_apis-x86_64"; + path = "system-images/android-25/google_apis/x86_64"; + revision = "25-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r15.zip; + sha1 = "5a81fc218a7fe82cc6af01f7fae54a8000900443"; + + }; + }; + + + "25".google_apis."armeabi-v7a" = { + name = "system-image-25-google_apis-armeabi-v7a"; + path = "system-images/android-25/google_apis/armeabi-v7a"; + revision = "25-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r15.zip; + sha1 = "813e25f9a5f6d775670ed6c5e67a39bffa1411bf"; + + }; + }; + + + "25".google_apis."arm64-v8a" = { + name = "system-image-25-google_apis-arm64-v8a"; + path = "system-images/android-25/google_apis/arm64-v8a"; + revision = "25-google_apis-arm64-v8a"; + displayName = "Google APIs ARM 64 v8a System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r15.zip; + sha1 = "c3049e32f031140757f71acb5b8f0179e6f27303"; + + }; + }; + + + "26".google_apis."x86" = { + name = "system-image-26-google_apis-x86"; + path = "system-images/android-26/google_apis/x86"; + revision = "26-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r12.zip; + sha1 = "167c83bcfd87127c7376ce986b34701f74fe87ff"; + + }; + }; + + + "26".google_apis."x86_64" = { + name = "system-image-26-google_apis-x86_64"; + path = "system-images/android-26/google_apis/x86_64"; + revision = "26-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r12.zip; + sha1 = "fcd46121c3486e2a759d0707c015e0b12bbab9db"; + + }; + }; + + + "27".google_apis."x86" = { + name = "system-image-27-google_apis-x86"; + path = "system-images/android-27/google_apis/x86"; + revision = "27-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r08.zip; + sha1 = "623ee2638713b7dfde8044c91280c2afad5a1ade"; + + }; + }; + + + "28".google_apis."x86" = { + name = "system-image-28-google_apis-x86"; + path = "system-images/android-28/google_apis/x86"; + revision = "28-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r07.zip; + sha1 = "fe5d58355545ae82b0e6a55adc1d41573ac7dec1"; + + }; + }; + + + "28".google_apis."x86_64" = { + name = "system-image-28-google_apis-x86_64"; + path = "system-images/android-28/google_apis/x86_64"; + revision = "28-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r07.zip; + sha1 = "068468683a56725326f741f75b6913ee1e7955ff"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix new file mode 100644 index 0000000000000000000000000000000000000000..a8bea61ff548cedd5ceea955e2118ae2ba139c13 --- /dev/null +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix @@ -0,0 +1,97 @@ + +{fetchurl}: + +{ + + + "24".google_apis_playstore."x86" = { + name = "system-image-24-google_apis_playstore-x86"; + path = "system-images/android-24/google_apis_playstore/x86"; + revision = "24-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip; + sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22"; + + }; + }; + + + "25".google_apis_playstore."x86" = { + name = "system-image-25-google_apis_playstore-x86"; + path = "system-images/android-25/google_apis_playstore/x86"; + revision = "25-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip; + sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c"; + + }; + }; + + + "26".google_apis_playstore."x86" = { + name = "system-image-26-google_apis_playstore-x86"; + path = "system-images/android-26/google_apis_playstore/x86"; + revision = "26-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip; + sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19"; + + }; + }; + + + "27".google_apis_playstore."x86" = { + name = "system-image-27-google_apis_playstore-x86"; + path = "system-images/android-27/google_apis_playstore/x86"; + revision = "27-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip; + sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d"; + + }; + }; + + + "28".google_apis_playstore."x86" = { + name = "system-image-28-google_apis_playstore-x86"; + path = "system-images/android-28/google_apis_playstore/x86"; + revision = "28-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r05.zip; + sha1 = "4c570d259e93b0b27f97bad1aca2ac47f1e9b51a"; + + }; + }; + + + "28".google_apis_playstore."x86_64" = { + name = "system-image-28-google_apis_playstore-x86_64"; + path = "system-images/android-28/google_apis_playstore/x86_64"; + revision = "28-google_apis_playstore-x86_64"; + displayName = "Google Play Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + + url = + https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r05.zip; + sha1 = "5f6b238e4c7de41fd2a1c66841093bcf517255a1"; + + }; + }; + +} + \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/lldb.nix b/pkgs/development/mobile/androidenv/lldb.nix new file mode 100644 index 0000000000000000000000000000000000000000..d812a679c0211e413950f30ba8acea48677823f9 --- /dev/null +++ b/pkgs/development/mobile/androidenv/lldb.nix @@ -0,0 +1,12 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: + +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.zlib pkgs.openssl.out pkgs.ncurses5 ]; + patchInstructions = lib.optionalString (os == "linux") '' + addAutoPatchelfSearchPath $packageBaseDir/lib + autoPatchelf $packageBaseDir/lib + autoPatchelf $packageBaseDir/bin + ''; +} diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch deleted file mode 100644 index 5eeadbbd12da3c53ce026b9942749ee1e5983ff2..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh android-ndk-r10c/build/tools/make-standalone-toolchain.sh ---- android-ndk-r10c.old/build/tools/make-standalone-toolchain.sh 2014-10-16 03:46:32.000000000 +0200 -+++ android-ndk-r10c/build/tools/make-standalone-toolchain.sh 2014-10-24 23:46:22.544928306 +0200 -@@ -310,6 +310,9 @@ - # Now copy the GCC toolchain prebuilt binaries - run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR" - -+# Making it writable again -+chmod -R +w "$TMPDIR" -+ - # Replace soft-link mcld by real file - ALL_LDS=`find $TMPDIR -name "*mcld"` - for LD in $ALL_LDS; do diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch deleted file mode 100644 index 4a9f9a4a9dd3c163137739da5d356c0873f92fb7..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh android-ndk-r8e/build/tools/make-standalone-toolchain.sh ---- android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh 2014-10-16 03:46:32.000000000 +0200 -+++ android-ndk-r8e/build/tools/make-standalone-toolchain.sh 2014-10-24 23:46:22.544928306 +0200 -@@ -194,6 +194,9 @@ - # Now copy the GCC toolchain prebuilt binaries - run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR" - -+# Making it writable again -+chmod -R +w "$TMPDIR" -+ - if [ -n "$LLVM_VERSION" ]; then - # Copy the clang/llvm toolchain prebuilt binaries - run copy_directory "$LLVM_TOOLCHAIN_PATH" "$TMPDIR" diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch deleted file mode 100644 index 70b1f7e7f4a59b4f9b690a64f0fc2239034acbbd..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py -index a6ae8448..2739912e 100755 ---- a/build/tools/make_standalone_toolchain.py -+++ b/build/tools/make_standalone_toolchain.py -@@ -398,7 +398,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - sysroot_path, stl, host_tag): - """Create a standalone toolchain.""" - copy_directory_contents(gcc_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_directory_contents(clang_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - triple = get_triple(arch) - make_clang_scripts( - install_path, triple, api, host_tag.startswith('windows')) -@@ -406,23 +408,28 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - sysroot = os.path.join(NDK_DIR, 'sysroot') - install_sysroot = os.path.join(install_path, 'sysroot') - shutil.copytree(sysroot, install_sysroot) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - arch_headers = os.path.join(sysroot, 'usr/include', triple) - copy_directory_contents( - arch_headers, os.path.join(install_sysroot, 'usr/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - lib_path = os.path.join(sysroot_path, 'usr/lib') - lib_install = os.path.join(install_sysroot, 'usr/lib') - if os.path.exists(lib_path): - shutil.copytree(lib_path, lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - lib64_path = os.path.join(sysroot_path, 'usr/lib64') - lib64_install = os.path.join(install_sysroot, 'usr/lib64') - if os.path.exists(lib64_path): - shutil.copytree(lib64_path, lib64_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag) - copy_directory_contents(prebuilt_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) - dirs = os.listdir(toolchain_lib_dir) -@@ -444,29 +451,37 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - if stl == 'gnustl': - gnustl_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gnu-libstdc++/4.9') - shutil.copytree(os.path.join(gnustl_dir, 'include'), cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - for abi in get_abis(arch): - copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple, - abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_gnustl_libs(gnustl_dir, install_path, triple, abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, - triple, abi, thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_gnustl_libs(gnustl_dir, install_path, triple, abi, - thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - elif stl == 'libc++': - libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++') - libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi') - support_dir = os.path.join(NDK_DIR, 'sources/android/support') - copy_directory_contents(os.path.join(libcxx_dir, 'include'), - cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_directory_contents(os.path.join(support_dir, 'include'), - support_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # I have no idea why we need this, but the old one does it too. - copy_directory_contents( - os.path.join(libcxxabi_dir, 'include'), - os.path.join(install_path, 'include/llvm-libc++abi/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -482,21 +497,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - dest_libdir = get_dest_libdir(install_path, triple, abi) - include_libunwind = arch == 'arm' - copy_libcxx_libs(src_libdir, dest_libdir, include_libunwind) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - thumb_libdir = os.path.join(dest_libdir, 'thumb') - copy_libcxx_libs(src_libdir, thumb_libdir, include_libunwind) -+ os.system('chmod -R +w "{}"'.format(install_path)) - elif stl == 'stlport': - stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport') - gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++') - - copy_directory_contents( - os.path.join(stlport_dir, 'stlport'), cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # Same as for libc++. Not sure why we have this extra directory, but - # keep the cruft for diff. - copy_directory_contents( - os.path.join(gabixx_dir, 'include'), - os.path.join(install_path, 'include/gabi++/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -512,9 +531,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - - for abi in get_abis(arch): - copy_stlport_libs(stlport_dir, install_path, triple, abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - copy_stlport_libs(stlport_dir, install_path, triple, abi, - thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - else: - raise ValueError(stl) - diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch deleted file mode 100644 index 88ce69be3e8cd194e7c9030963d9069a2da109e6..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py -index daba3351..424b7fef 100755 ---- a/build/tools/make_standalone_toolchain.py -+++ b/build/tools/make_standalone_toolchain.py -@@ -421,7 +421,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - platforms_path, stl, host_tag): - """Create a standalone toolchain.""" - copy_directory_contents(gcc_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_directory_contents(clang_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - triple = get_triple(arch) - make_clang_scripts( - install_path, triple, api, host_tag.startswith('windows')) -@@ -432,9 +434,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - install_headers = os.path.join(install_sysroot, 'usr/include') - os.makedirs(os.path.dirname(install_headers)) - shutil.copytree(headers, install_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - arch_headers = os.path.join(sysroot, 'usr/include', triple) - copy_directory_contents(arch_headers, os.path.join(install_headers)) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - for lib_suffix in ('', '64'): - lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix)) -@@ -442,20 +446,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - install_sysroot, 'usr/lib{}'.format(lib_suffix)) - if os.path.exists(lib_path): - shutil.copytree(lib_path, lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - static_lib_path = os.path.join(sysroot, 'usr/lib', triple) - static_lib_install = os.path.join(install_sysroot, 'usr/lib') - if arch == 'x86_64': - static_lib_install += '64' - copy_directory_contents(static_lib_path, static_lib_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag) - copy_directory_contents(prebuilt_path, install_path) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - gdbserver_path = os.path.join( - NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver') - gdbserver_install = os.path.join(install_path, 'share', 'gdbserver') - shutil.copytree(gdbserver_path, gdbserver_install) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) - dirs = os.listdir(toolchain_lib_dir) -@@ -481,26 +489,33 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - for abi in get_abis(arch): - copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple, - abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_gnustl_libs(gnustl_dir, install_path, triple, abi) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, - triple, abi, thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - copy_gnustl_libs(gnustl_dir, install_path, triple, abi, - thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - elif stl == 'libc++': - libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++') - libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi') - copy_directory_contents(os.path.join(libcxx_dir, 'include'), - cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if api < 21: - support_dir = os.path.join(NDK_DIR, 'sources/android/support') - copy_directory_contents(os.path.join(support_dir, 'include'), - support_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # I have no idea why we need this, but the old one does it too. - copy_directory_contents( - os.path.join(libcxxabi_dir, 'include'), - os.path.join(install_path, 'include/llvm-libc++abi/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -515,21 +530,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - src_libdir = get_src_libdir(libcxx_dir, abi) - dest_libdir = get_dest_libdir(install_path, triple, abi) - copy_libcxx_libs(src_libdir, dest_libdir, abi, api) -+ os.system('chmod -R +w "{}"'.format(install_path)) - if arch == 'arm': - thumb_libdir = os.path.join(dest_libdir, 'thumb') - copy_libcxx_libs(src_libdir, thumb_libdir, abi, api) -+ os.system('chmod -R +w "{}"'.format(install_path)) - elif stl == 'stlport': - stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport') - gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++') - - copy_directory_contents( - os.path.join(stlport_dir, 'stlport'), cxx_headers) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - # Same as for libc++. Not sure why we have this extra directory, but - # keep the cruft for diff. - copy_directory_contents( - os.path.join(gabixx_dir, 'include'), - os.path.join(install_path, 'include/gabi++/include')) -+ os.system('chmod -R +w "{}"'.format(install_path)) - - headers = [ - 'cxxabi.h', -@@ -548,6 +567,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path, - if arch == 'arm': - copy_stlport_libs(stlport_dir, install_path, triple, abi, - thumb=True) -+ os.system('chmod -R +w "{}"'.format(install_path)) - else: - raise ValueError(stl) - diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix new file mode 100644 index 0000000000000000000000000000000000000000..5d70a9f0a1cefdad5027d05edfd9b0b6c00a62fd --- /dev/null +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -0,0 +1,51 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, platform-tools}: + +let + runtime_paths = lib.makeBinPath [ pkgs.coreutils pkgs.file pkgs.findutils pkgs.gawk pkgs.gnugrep pkgs.gnused pkgs.jdk pkgs.python3 pkgs.which ] + ":${platform-tools}/platform-tools"; +in +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ]; + patchInstructions = lib.optionalString (os == "linux") '' + patchShebangs . + + patch -p1 \ + --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} + wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + + # TODO: allow this stuff + rm -rf docs tests + + # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling + + addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 + find toolchains -type d -name bin | while read dir + do + autoPatchelf "$dir" + done + + # fix ineffective PROGDIR / MYNDKDIR determination + for i in ndk-build + do + sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $i + done + + # Patch executables + autoPatchelf prebuilt/linux-x86_64 + + # wrap + for i in ndk-build + do + wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}" + done + + # make some executables available in PATH + mkdir -p $out/bin + for i in ndk-build + do + ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i + done + ''; + noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script +} diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch b/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch new file mode 100644 index 0000000000000000000000000000000000000000..7af2d44a0f202ce1a48447615c1cbef0ee498fcb --- /dev/null +++ b/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch @@ -0,0 +1,44 @@ +diff -Naur android-ndk-r18b/build/tools/make_standalone_toolchain.py android-ndk-r18b-new/build/tools/make_standalone_toolchain.py +--- android-ndk-r18b/build/tools/make_standalone_toolchain.py 2018-10-11 12:49:38.000000000 +0200 ++++ android-ndk-r18b-new/build/tools/make_standalone_toolchain.py 2018-11-20 21:55:52.689991420 +0100 +@@ -30,7 +30,7 @@ + import sys + import tempfile + import textwrap +- ++import subprocess + + THIS_DIR = os.path.realpath(os.path.dirname(__file__)) + NDK_DIR = os.path.realpath(os.path.join(THIS_DIR, '../..')) +@@ -173,6 +173,7 @@ + logger().debug('Copying %s', src_file) + shutil.copy2(src_file, dst_dir) + ++ subprocess.check_call(["chmod", "-R", "+w", dst]) + + def make_clang_scripts(install_dir, triple, api, windows): + """Creates Clang wrapper scripts. +@@ -365,6 +366,7 @@ + install_headers = os.path.join(install_sysroot, 'usr/include') + os.makedirs(os.path.dirname(install_headers)) + shutil.copytree(headers, install_headers) ++ subprocess.check_call(["chmod", "-R", "+w", install_path]) + + arch_headers = os.path.join(sysroot, 'usr/include', triple) + copy_directory_contents(arch_headers, os.path.join(install_headers)) +@@ -375,6 +377,7 @@ + install_sysroot, 'usr/lib{}'.format(lib_suffix)) + if os.path.exists(lib_path): + shutil.copytree(lib_path, lib_install) ++ subprocess.check_call(["chmod", "-R", "+w", install_path]) + + static_lib_path = os.path.join(sysroot, 'usr/lib', triple) + static_lib_install = os.path.join(install_sysroot, 'usr/lib') +@@ -389,6 +392,7 @@ + NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver') + gdbserver_install = os.path.join(install_path, 'share', 'gdbserver') + shutil.copytree(gdbserver_path, gdbserver_install) ++ subprocess.check_call(["chmod", "-R", "+w", install_path]) + + toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) + dirs = os.listdir(toolchain_lib_dir) diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 22b5cd81f8704e078257e7276a9e1da1f6b73f92..9d2f6eb6075ef7d1d7951395654d5bd0b285cfb7 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,51 +1,19 @@ -{ buildPackages, pkgs }: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs}: -let - inherit (buildPackages) fetchurl unzip; - inherit (pkgs) stdenv zlib; -in - -stdenv.mkDerivation rec { - version = "26.0.2"; - name = "android-platform-tools-r${version}"; - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - then fetchurl { - url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha256 = "0695npvxljbbh8xwfm65k34fcpyfkzvfkssgnp46wkmnq8w5mcb3"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://dl.google.com/android/repository/platform-tools_r${version}-darwin.zip"; - sha256 = "0gy7apw9pmnnm41z6ywglw5va4ghmny4j57778may4q7ar751l56"; - } - else throw "System ${stdenv.hostPlatform.system} not supported!"; - - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - cd platform-tools - - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") - '' - for i in adb dmtracedump fastboot hprof-conv sqlite3 - do - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:`pwd`/lib64 $i - done - - for i in etc1tool - do - patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib:${zlib.out}/lib:`pwd`/lib64 $i - done - ''} +deployAndroidPackage { + inherit package os; + buildInputs = [ autoPatchelfHook ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + patchInstructions = lib.optionalString (os == "linux") '' + addAutoPatchelfSearchPath $packageBaseDir/lib64 + autoPatchelf --no-recurse $packageBaseDir/lib64 + autoPatchelf --no-recurse $packageBaseDir mkdir -p $out/bin - for i in adb fastboot + cd $out/bin + find $out/libexec/android-sdk/platform-tools -type f -executable -mindepth 1 -maxdepth 1 -not -name sqlite3 | while read i do - ln -sf $out/platform-tools/$i $out/bin/$i + ln -s $i done ''; - - nativeBuildInputs = [ unzip ]; } diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix deleted file mode 100644 index e24a9c4316024600a36ca2bd24878aaf2348e1db..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ /dev/null @@ -1,319 +0,0 @@ - -# This file is generated from generate-platforms.sh. DO NOT EDIT. -# Execute generate-platforms.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildPlatform = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - platform_2 = buildPlatform { - name = "android-platform-1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip; - sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe"; - }; - meta = { - description = "Android SDK Platform 2"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_3 = buildPlatform { - name = "android-platform-1.5"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip; - sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c"; - }; - meta = { - description = "Android SDK Platform 3"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_4 = buildPlatform { - name = "android-platform-1.6"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip; - sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0"; - }; - meta = { - description = "Android SDK Platform 4"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_5 = buildPlatform { - name = "android-platform-2.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip; - sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d"; - }; - meta = { - description = "Android SDK Platform 5"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_6 = buildPlatform { - name = "android-platform-2.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip; - sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a"; - }; - meta = { - description = "Android SDK Platform 6"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_7 = buildPlatform { - name = "android-platform-2.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.1_r03.zip; - sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; - }; - meta = { - description = "Android SDK Platform 7"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_8 = buildPlatform { - name = "android-platform-2.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.2_r03.zip; - sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; - }; - meta = { - description = "Android SDK Platform 8"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_9 = buildPlatform { - name = "android-platform-2.3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.1_r02.zip; - sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; - }; - meta = { - description = "Android SDK Platform 9"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_10 = buildPlatform { - name = "android-platform-2.3.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.3_r02.zip; - sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; - }; - meta = { - description = "Android SDK Platform 10"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_11 = buildPlatform { - name = "android-platform-3.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.0_r02.zip; - sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; - }; - meta = { - description = "Android SDK Platform 11"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_12 = buildPlatform { - name = "android-platform-3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.1_r03.zip; - sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; - }; - meta = { - description = "Android SDK Platform 12"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_13 = buildPlatform { - name = "android-platform-3.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.2_r01.zip; - sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; - }; - meta = { - description = "Android SDK Platform 13"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_14 = buildPlatform { - name = "android-platform-4.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-14_r04.zip; - sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; - }; - meta = { - description = "Android SDK Platform 14"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_15 = buildPlatform { - name = "android-platform-4.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-15_r05.zip; - sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; - }; - meta = { - description = "Android SDK Platform 15"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_16 = buildPlatform { - name = "android-platform-4.1.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-16_r05.zip; - sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; - }; - meta = { - description = "Android SDK Platform 16"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_17 = buildPlatform { - name = "android-platform-4.2.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-17_r03.zip; - sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; - }; - meta = { - description = "Android SDK Platform 17"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_18 = buildPlatform { - name = "android-platform-4.3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-18_r03.zip; - sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; - }; - meta = { - description = "Android SDK Platform 18"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_19 = buildPlatform { - name = "android-platform-4.4.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-19_r04.zip; - sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; - }; - meta = { - description = "Android SDK Platform 19"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_20 = buildPlatform { - name = "android-platform-4.4W.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-20_r02.zip; - sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; - }; - meta = { - description = "Android SDK Platform 20"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_21 = buildPlatform { - name = "android-platform-5.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-21_r02.zip; - sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; - }; - meta = { - description = "Android SDK Platform 21"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_22 = buildPlatform { - name = "android-platform-5.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-22_r02.zip; - sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; - }; - meta = { - description = "Android SDK Platform 22"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_23 = buildPlatform { - name = "android-platform-6.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-23_r03.zip; - sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0"; - }; - meta = { - description = "Android SDK Platform 23"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_24 = buildPlatform { - name = "android-platform-7.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r02.zip; - sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; - }; - meta = { - description = "Android SDK Platform 24"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_25 = buildPlatform { - name = "android-platform-7.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-25_r03.zip; - sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; - }; - meta = { - description = "Android SDK Platform 25"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_26 = buildPlatform { - name = "android-platform-8.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r02.zip; - sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; - }; - meta = { - description = "Android SDK Platform 26"; - homepage = http://developer.android.com/sdk/; - }; - }; - -} diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix deleted file mode 100644 index 3775872514ca3e8d05b0f6d8b211639dcd9d3ed8..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ /dev/null @@ -1,319 +0,0 @@ - -# This file is generated from generate-platforms.sh. DO NOT EDIT. -# Execute generate-platforms.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildPlatform = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - platform_2 = buildPlatform { - name = "android-platform-1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip; - sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe"; - }; - meta = { - description = "Android SDK Platform 2"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_3 = buildPlatform { - name = "android-platform-1.5"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip; - sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e"; - }; - meta = { - description = "Android SDK Platform 3"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_4 = buildPlatform { - name = "android-platform-1.6"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip; - sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625"; - }; - meta = { - description = "Android SDK Platform 4"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_5 = buildPlatform { - name = "android-platform-2.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip; - sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314"; - }; - meta = { - description = "Android SDK Platform 5"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_6 = buildPlatform { - name = "android-platform-2.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip; - sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0"; - }; - meta = { - description = "Android SDK Platform 6"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_7 = buildPlatform { - name = "android-platform-2.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.1_r03.zip; - sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; - }; - meta = { - description = "Android SDK Platform 7"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_8 = buildPlatform { - name = "android-platform-2.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.2_r03.zip; - sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; - }; - meta = { - description = "Android SDK Platform 8"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_9 = buildPlatform { - name = "android-platform-2.3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.1_r02.zip; - sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; - }; - meta = { - description = "Android SDK Platform 9"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_10 = buildPlatform { - name = "android-platform-2.3.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.3_r02.zip; - sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; - }; - meta = { - description = "Android SDK Platform 10"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_11 = buildPlatform { - name = "android-platform-3.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.0_r02.zip; - sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; - }; - meta = { - description = "Android SDK Platform 11"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_12 = buildPlatform { - name = "android-platform-3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.1_r03.zip; - sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; - }; - meta = { - description = "Android SDK Platform 12"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_13 = buildPlatform { - name = "android-platform-3.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-3.2_r01.zip; - sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; - }; - meta = { - description = "Android SDK Platform 13"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_14 = buildPlatform { - name = "android-platform-4.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-14_r04.zip; - sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; - }; - meta = { - description = "Android SDK Platform 14"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_15 = buildPlatform { - name = "android-platform-4.0.3"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-15_r05.zip; - sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; - }; - meta = { - description = "Android SDK Platform 15"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_16 = buildPlatform { - name = "android-platform-4.1.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-16_r05.zip; - sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; - }; - meta = { - description = "Android SDK Platform 16"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_17 = buildPlatform { - name = "android-platform-4.2.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-17_r03.zip; - sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; - }; - meta = { - description = "Android SDK Platform 17"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_18 = buildPlatform { - name = "android-platform-4.3.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-18_r03.zip; - sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; - }; - meta = { - description = "Android SDK Platform 18"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_19 = buildPlatform { - name = "android-platform-4.4.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-19_r04.zip; - sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; - }; - meta = { - description = "Android SDK Platform 19"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_20 = buildPlatform { - name = "android-platform-4.4W.2"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-20_r02.zip; - sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; - }; - meta = { - description = "Android SDK Platform 20"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_21 = buildPlatform { - name = "android-platform-5.0.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-21_r02.zip; - sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; - }; - meta = { - description = "Android SDK Platform 21"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_22 = buildPlatform { - name = "android-platform-5.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/android-22_r02.zip; - sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; - }; - meta = { - description = "Android SDK Platform 22"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_23 = buildPlatform { - name = "android-platform-6.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-23_r03.zip; - sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0"; - }; - meta = { - description = "Android SDK Platform 23"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_24 = buildPlatform { - name = "android-platform-7.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r02.zip; - sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; - }; - meta = { - description = "Android SDK Platform 24"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_25 = buildPlatform { - name = "android-platform-7.1.1"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-25_r03.zip; - sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; - }; - meta = { - description = "Android SDK Platform 25"; - homepage = http://developer.android.com/sdk/; - }; - }; - - platform_26 = buildPlatform { - name = "android-platform-8.0.0"; - src = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r02.zip; - sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; - }; - meta = { - description = "Android SDK Platform 26"; - homepage = http://developer.android.com/sdk/; - }; - }; - -} diff --git a/pkgs/development/mobile/androidenv/querypackages.sh b/pkgs/development/mobile/androidenv/querypackages.sh new file mode 100644 index 0000000000000000000000000000000000000000..0f31396b87662cbd6749a88e7e081c56fed2f101 --- /dev/null +++ b/pkgs/development/mobile/androidenv/querypackages.sh @@ -0,0 +1,27 @@ +#!/bin/sh -e + +if [ "$1" = "" ] +then + echo "Please select a package set: 'packages', 'addons', 'system-images'" >&2 + exit 1 +fi + +if [ "$2" = "" ] +then + echo "Please select a package group:" >&2 + ( cat < - - - - Terms and Conditions - -This is the Android Software Development Kit License Agreement - -1. Introduction - -1.1 The Android Software Development Kit (referred to in the License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 A "compatible implementation" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS). - -1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - - -2. Accepting the License Agreement - -2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement. - -2.2 By clicking to accept, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK. - -2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity. - - -3. SDK License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android. - -3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose. - -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.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. - -3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. - - -4. Use of the SDK by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy. - - -7. Third Party Applications - -7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties. - - -8. Using Android APIs - -8.1 Google Data APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - - -9. Terminating the License Agreement - -9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement with you if: -(A) you have breached any provision of the License Agreement; or -(B) Google is required to do so by law; or -(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or -(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement. - - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. - - -14. General Legal Terms - -14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - - -November 20, 2015 - To get started with the Android SDK Preview, you must agree to the following terms and conditions. -As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data. - -This is the Android SDK Preview License Agreement (the "License Agreement"). - -1. Introduction - -1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting the License Agreement - -2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement. - -2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview. - -2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity. - -3. Preview License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform. - -3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "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.3 You may not use the Preview 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 Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview. - -3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview. - -3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights. - -3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview. - -4. Use of the Preview by You - -4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/. - -7. Third Party Applications - -7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. - -8. Using Google APIs - -8.1 Google APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -9. Terminating the License Agreement - -9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you. - -9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of: -(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and -(B) Google issues a final release version of the Android SDK. - -9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely. - -10. DISCLAIMERS - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available. - -14. General Legal Terms - -14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - -June 2014. - - - NDK - 15 - - - - 960251267 - ea4b5d76475db84745aa8828000d009625fc1f98 - android-ndk-r15c-darwin-x86_64.zip - macosx - 64 - - - - 974976754 - 0bf02d4e8b85fd770fd7b9b2cdec57f9441f27a2 - android-ndk-r15c-linux-x86_64.zip - linux - 64 - - - - 784778144 - f2e47121feb73ec34ced5e947cbf1adc6b56246e - android-ndk-r15c-windows-x86.zip - windows - 32 - - - - 849733996 - 970bb2496de0eada74674bb1b06d79165f725696 - android-ndk-r15c-windows-x86_64.zip - windows - 64 - - - - - - - 8.0.0 - 26 - Android SDK Platform 26 - 2 - - - - 63623734 - e4ae5d7aa557a3c827135838ee400da8443ac4ef - platform-26_r02.zip - - - - - 22 - - http://developer.android.com/sdk/ - - 15 - 1 - - - - - 7.1.1 - 25 - Android SDK Platform 25 - 3 - - - - 85424763 - 00c2c5765e8988504be10a1eb66ed71fcdbd7fe8 - platform-25_r03.zip - - - - - 22 - - http://developer.android.com/sdk/ - - 16 - 2 - - - - - 7.0 - 24 - Android SDK Platform 24 - 2 - - - - 82648154 - 8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee - platform-24_r02.zip - - - - - 22 - - http://developer.android.com/sdk/ - - 16 - 2 - - - - - 6.0 - 23 - Android SDK Platform 23 - 3 - - - - 70433421 - 027fede3de6aa1649115bbd0bffff30ccd51c9a0 - platform-23_r03.zip - - - - - 22 - - http://developer.android.com/sdk/ - - 16 - 3 - - - - - 5.1.1 - 22 - Android SDK Platform 22 - 2 - - - - 66852371 - 5d1bd10fea962b216a0dece1247070164760a9fc - android-22_r02.zip - - - - - 22 - - http://developer.android.com/sdk/ - - 14 - 2 - - - - - 5.0.1 - 21 - Android SDK Platform 21 - 2 - - - - 65897960 - 53536556059bb29ae82f414fd2e14bc335a4eb4c - android-21_r02.zip - - - - - 22 - - http://developer.android.com/sdk/ - - 12 - 2 - - - - - 4.4W.2 - 20 - Android SDK Platform 20 - 2 - - - - 63567784 - a9251f8a3f313ab05834a07a963000927637e01d - android-20_r02.zip - - - - - 22 - - http://developer.android.com/sdk/ - - 12 - 1 - - - - - 4.4.2 - 19 - Android SDK Platform 19 - 4 - - - - 63871092 - 2ff20d89e68f2f5390981342e009db5a2d456aaa - android-19_r04.zip - - - - - 22 - - http://developer.android.com/sdk/ - - 12 - 1 - - - - - 4.3.1 - 18 - Android SDK Platform 18 - 3 - - - - 57771739 - e6b09b3505754cbbeb4a5622008b907262ee91cb - android-18_r03.zip - - - - - 21 - - http://developer.android.com/sdk/ - - 12 - 1 - - - - - 4.2.2 - 17 - Android SDK Platform 17 - 3 - - - - 57030216 - dbe14101c06e6cdb34e300393e64e64f8c92168a - android-17_r03.zip - - - - - 21 - - http://developer.android.com/sdk/ - - 12 - 1 - - - - - 4.1.2 - 16 - Android SDK Platform 16 - 5 - - - - 48128695 - 12a5ce6235a76bc30f62c26bda1b680e336abd07 - android-16_r05.zip - - - - - 21 - - http://developer.android.com/sdk/ - - 12 - 1 - - - - - 4.0.3 - 15 - Android SDK Platform 15 - 5 - - - - 44533475 - 69ab4c443b37184b2883af1fd38cc20cbeffd0f3 - android-15_r05.zip - - - - - 21 - - http://developer.android.com/sdk/ - - 12 - 1 - - - - - 4.0 - 14 - Android SDK Platform 14 - 4 - - - - 46038082 - d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c - android-14_r04.zip - - - - http://developer.android.com/sdk/ - - 12 - 1 - - - - - 3.2 - 13 - Android SDK Platform 13 - 1 - - - - 108426536 - 6189a500a8c44ae73a439604363de93591163cd9 - android-3.2_r01.zip - - - - - 12 - - http://developer.android.com/sdk/ - - 4 - - - - - 3.1 - 12 - Android SDK Platform 12 - 3 - - - - 106472351 - 4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf - android-3.1_r03.zip - - - - - 11 - - http://developer.android.com/sdk/ - - 4 - - - - - 3.0 - 11 - Android SDK Platform 11 - 2 - - - - 104513908 - 2c7d4bd13f276e76f6bbd87315fe27aba351dd37 - android-3.0_r02.zip - - - - - 10 - - http://developer.android.com/sdk/ - - 4 - - - - - 2.3.3 - 10 - Android SDK Platform 10 - 2 - - - - 85470907 - 887e37783ec32f541ea33c2c649dda648e8e6fb3 - android-2.3.3_r02.zip - - - - - 4 - - http://developer.android.com/sdk/ - - 4 - - - - - 2.3.1 - 9 - Android SDK Platform 9 - 2 - - - - 78732563 - 209f8a7a8b2cb093fce858b8b55fed3ba5206773 - android-2.3.1_r02.zip - - - - - 4 - - http://developer.android.com/sdk/ - - 4 - - - - - 2.2 - 8 - Android SDK Platform 8 - 3 - - - - 74652366 - 231262c63eefdff8fd0386e9ccfefeb27a8f9202 - android-2.2_r03.zip - - - - - 4 - - http://developer.android.com/sdk/ - - 4 - - - - - 2.1 - 7 - Android SDK Platform 7 - 3 - - - - 70142829 - 5ce51b023ac19f8738500b1007a1da5de2349a1e - android-2.1_r03.zip - - - - - 8 - - http://developer.android.com/sdk/ - - 4 - - - - - 2.0.1 - 6 - Android SDK Platform 6 - - 1 - - - - 79192618 - ce2c971dce352aa28af06bda92a070116aa5ae1a - android-2.0.1_r01-linux.zip - linux - - - - 79035527 - c3096f80d75a6fc8cb38ef8a18aec920e53d42c0 - android-2.0.1_r01-macosx.zip - macosx - - - - 80385601 - 255781ebe4509d9707d0e77edda2815e2bc216e6 - android-2.0.1_r01-windows.zip - windows - - - - - 4 - - http://developer.android.com/sdk/ - - 4 - - - - - 2.0 - 5 - Android SDK Platform 5 - - 1 - - - - 75095268 - be9be6a99ca32875c96ec7f91160ca9fce7e3c7d - android-2.0_r01-linux.zip - linux - - - - 74956356 - 2a866d0870dbba18e0503cd41e5fae988a21b314 - android-2.0_r01-macosx.zip - macosx - - - - 76288040 - aeb623217ff88b87216d6eb7dbc846ed53f68f57 - android-2.0_r01-windows.zip - windows - - - - - 3 - - http://developer.android.com/sdk/ - - 4 - - - - - 1.6 - 4 - Android SDK Platform 4 - - 3 - - - - 63454485 - 483ed088e45bbdf3444baaf9250c8b02e5383cb0 - android-1.6_r03-linux.zip - linux - - - - 62418496 - bdafad44f5df9f127979bdb21a1fdd87ee3cd625 - android-1.6_r03-macosx.zip - macosx - - - - 64654625 - ce0b5e4ffaf12ca4fd07c2da71a8a1ab4a03dc22 - android-1.6_r03-windows.zip - windows - - - - - 6 - - http://developer.android.com/sdk/ - - 4 - - - - - 1.5 - 3 - Android SDK Platform 3 - - 4 - - - - 53348669 - 5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c - android-1.5_r04-linux.zip - linux - - - - 52440607 - d3a67c2369afa48b6c3c7624de5031c262018d1e - android-1.5_r04-macosx.zip - macosx - - - - 54624370 - 5bb106d2e40d481edd337b0833093843e15fe49a - android-1.5_r04-windows.zip - windows - - - - - 6 - - http://developer.android.com/sdk/ - - 4 - - - - - 1.1 - 2 - Android SDK Platform 2 - - 1 - - - - 45476658 - c054d25c9b4c6251fa49c2f9c54336998679d3fe - android-1.1_r1-linux.zip - linux - - - - 45584305 - e21dbcff45b7356657449ebb3c7e941be2bb5ebe - android-1.1_r1-macosx.zip - macosx - - - - 46828615 - a4060f29ed39fc929c302836d488998c53c3002e - android-1.1_r1-windows.zip - windows - - - - - 6 - - http://developer.android.com/sdk/ - - 4 - - - - - 25 - 1 - - - - 30822685 - bbc72efd1a9bad87cc507e308f0d29aad438c52c - sources-25_r01.zip - - - - - - - 24 - 1 - - - - 30270410 - 6b96115830a83d654479f32ce4b724ca9011148b - sources-24_r01.zip - - - - - - - 23 - 1 - - - - 31771965 - b0f15da2762b42f543c5e364c2b15b198cc99cc2 - sources-23_r01.zip - - - - - - - 22 - 1 - - - - 28861236 - 98320e13976d11597a4a730a8d203ac9a03ed5a6 - sources-22_r01.zip - - - - - - - 21 - 1 - - - - 28274751 - 137a5044915d32bea297a8c1552684802bbc2e25 - sources-21_r01.zip - - - - - - - 20 - 1 - - - - 23367603 - 8da3e40f2625f9f7ef38b7e403f49f67226c0d76 - sources-20_r01.zip - - - - - - - 19 - 2 - - - - 21819439 - 433a1d043ef77561571250e94cb7a0ef24a202e7 - sources-19_r02.zip - - - - - - - 18 - 1 - - - - 20226735 - 8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78 - sources-18_r01.zip - - - - - - - 17 - 1 - - - - 18976816 - 6f1f18cd2d2b1852d7f6892df9cee3823349d43a - sources-17_r01.zip - - - - - - - 16 - 2 - - - - 17876720 - 0f83c14ed333c45d962279ab5d6bc98a0269ef84 - sources-16_r02.zip - - - - - - - 15 - 2 - - - - 16468746 - e5992a5747c9590783fbbdd700337bf0c9f6b1fa - sources-15_r02.zip - - - - - - - 14 - - 1 - - - - 16152383 - eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555 - sources-14_r01.zip - - - - - - - - 26 - 0 - 1 - - - - - 54113329 - 5378c2c78091b414d0eac40a6bd37f2faa31a365 - build-tools_r26.0.1-linux.zip - linux - - - - 53266653 - cbde59de198916b390777dd0227921bfa2120832 - build-tools_r26.0.1-macosx.zip - macosx - - - - 54936185 - 02494c80ffbe65bfff0aaa7463c9692693327b7d - build-tools_r26.0.1-windows.zip - windows - - - - - - - - 26 - 0 - 0 - - - - - 53854197 - 1cbe72929876f8a872ab1f1b1040a9f720261f59 - build-tools_r26-linux.zip - linux - - - - 53010814 - d01a1aeca03747245f1f5936b3cb01759c66d086 - build-tools_r26-macosx.zip - macosx - - - - 54681641 - 896ebd31117c09db220f7a3116cc0e5121c78b9d - build-tools_r26-windows.zip - windows - - - - - - - - 26 - 0 - 0 - 2 - - - - - 53847560 - 629bbd8d2e415bf64871fb0b4c0540fd6d0347a0 - build-tools_r26-rc2-linux.zip - linux - - - - 53003874 - cb1eb738a1f7003025af267a9b8cc2d259533c70 - build-tools_r26-rc2-macosx.zip - macosx - - - - 54678375 - ddaba77db0557a98f6330fbd579ad0bd12cbb152 - build-tools_r26-rc2-windows.zip - windows - - - - - - - - 26 - 0 - 0 - 1 - - - - - 53648603 - 8cd6388dc96db2d7a49d06159cf990d3bbc78d04 - build-tools_r26-rc1-linux.zip - linux - - - - 52821129 - 5c5a1de7d5f4f000d36ae349229fe0be846d6137 - build-tools_r26-rc1-macosx.zip - macosx - - - - 54379108 - 43c2ddad3b67a5c33712ae14331a60673e69be91 - build-tools_r26-rc1-windows.zip - windows - - - - - - - - 25 - 0 - 3 - - - - - 50757258 - db95f3a0ae376534d4d69f4cdb6fad20649f3509 - build-tools_r25.0.3-linux.zip - linux - - - - 50545085 - 160d2fefb5ce68e443427fc30a793a703b63e26e - build-tools_r25.0.3-macosx.zip - macosx - - - - 51337442 - 1edcb109ae5133aebfed573cf0bc84e0c353c28d - build-tools_r25.0.3-windows.zip - windows - - - - - - - - 25 - 0 - 2 - - - - - 49880329 - ff953c0177e317618fda40516f3e9d95fd43c7ae - build-tools_r25.0.2-linux.zip - linux - - - - 49667185 - 12a5204bb3b6e39437535469fde7ddf42da46b16 - build-tools_r25.0.2-macosx.zip - macosx - - - - 50458908 - 2fee3c0704d6ecc480570450d8b8069b2c4a2dd4 - build-tools_r25.0.2-windows.zip - windows - - - - - - - - 25 - 0 - 1 - - - - - 49880178 - ff063d252ab750d339f5947d06ff782836f22bac - build-tools_r25.0.1-linux.zip - linux - - - - 49667353 - 7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f - build-tools_r25.0.1-macosx.zip - macosx - - - - 50458759 - c6c61393565ccf46349e7f44511e5db7c1c6169d - build-tools_r25.0.1-windows.zip - windows - - - - - - - - 25 - 0 - 0 - - - - - 49872921 - f2bbda60403e75cabd0f238598c3b4dfca56ea44 - build-tools_r25-linux.zip - linux - - - - 49659466 - 273c5c29a65cbed00e44f3aa470bbd7dce556606 - build-tools_r25-macosx.zip - macosx - - - - 50451378 - f9258f2308ff8b62cfc4513d40cb961612d07b6a - build-tools_r25-windows.zip - windows - - - - - - - - 24 - 0 - 3 - - - - - 49779151 - 9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304 - build-tools_r24.0.3-linux.zip - linux - - - - 49568967 - a01c15f1b105c34595681075e1895d58b3fff48c - build-tools_r24.0.3-macosx.zip - macosx - - - - 50354788 - 8b960d693fd4163caeb8dc5f5f5f80b10987089c - build-tools_r24.0.3-windows.zip - windows - - - - - - - - 24 - 0 - 2 - - - - - 48936295 - f199a7a788c3fefbed102eea34d6007737b803cf - build-tools_r24.0.2-linux.zip - linux - - - - 48726190 - 8bb8fc575477491d5957de743089df412de55cda - build-tools_r24.0.2-macosx.zip - macosx - - - - 49512513 - 09586a1f1c39bcfa7db5205c9a07837247deb67e - build-tools_r24.0.2-windows.zip - windows - - - - - - - - 24 - 0 - 1 - - - - - 48936286 - 84f18c392919a074fcbb9b1d967984e6b2fef8b4 - build-tools_r24.0.1-linux.zip - linux - - - - 48726085 - 5c6457fcdfa07724fb086d8ff4e8316fc0742848 - build-tools_r24.0.1-macosx.zip - macosx - - - - 49511883 - ac4a7cea42c3ef74d7fbf1b992fad311c550034e - build-tools_r24.0.1-windows.zip - windows - - - - - - - - 24 - 0 - 0 - - - - - 48960919 - c6271c4d78a5612ea6c7150688bcd5b7313de8d1 - build-tools_r24-linux.zip - linux - - - - 48747930 - 97fc4ed442f23989cc488d02c1d1de9bdde241de - build-tools_r24-macosx.zip - macosx - - - - 49535326 - dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7 - build-tools_r24-windows.zip - windows - - - - - - - - 23 - 0 - 2 - - - - - 39071201 - 8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3 - build-tools_r23.0.2-linux.zip - linux - - - - 38060914 - 482c4cbceef8ff58aefd92d8155a38610158fdaf - build-tools_r23.0.2-macosx.zip - macosx - - - - 38217626 - fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96 - build-tools_r23.0.2-windows.zip - windows - - - - - - - - 23 - 0 - 3 - - - - - 40733174 - 368f2600feac7e9b511b82f53d1f2240ae4a91a3 - build-tools_r23.0.3-linux.zip - linux - - - - 39679533 - fbc98cd303fd15a31d472de6c03bd707829f00b0 - build-tools_r23.0.3-macosx.zip - macosx - - - - 39869945 - c6d8266c6a3243c8f1e41b786c0e3cee4c781263 - build-tools_r23.0.3-windows.zip - windows - - - - - - - - 23 - 0 - 1 - - - - - 39069295 - b6ba7c399d5fa487d95289d8832e4ad943aed556 - build-tools_r23.0.1-linux.zip - linux - - - - 38059328 - d96ec1522721e9a179ae2c591c99f75d31d39718 - build-tools_r23.0.1-macosx.zip - macosx - - - - 38558889 - cc1d37231d228f7a6f130e1f8d8c940052f0f8ab - build-tools_r23.0.1-windows.zip - windows - - - - - - - - - 23 - 0 - 0 - - - - - 39080519 - c1d6209212b01469f80fa804e0c1d39a06bc9060 - build-tools_r23-linux.zip - linux - - - - 38070540 - 90ba6e716f7703a236cd44b2e71c5ff430855a03 - build-tools_r23-macosx.zip - macosx - - - - 38570715 - 3874948f35f2f8946597679cc6e9151449f23b5d - build-tools_r23-windows.zip - windows - - - - - - - - 22 - 0 - 1 - - - - - 33104577 - da8b9c5c3ede39298e6cf0283c000c2ee9029646 - build-tools_r22.0.1-linux.zip - linux - - - - 33646102 - 53dad7f608e01d53b17176ba11165acbfccc5bbf - build-tools_r22.0.1-macosx.zip - macosx - - - - 33254137 - 61d8cbe069d9e0a57872a83e5e5abe164b7d52cf - build-tools_r22.0.1-windows.zip - windows - - - - - - - - - 22 - 0 - 0 - - - - - 33104280 - a8a1619dd090e44fac957bce6842e62abf87965b - build-tools_r22-linux.zip - linux - - - - 33646090 - af95429b24088d704bc5db9bd606e34ac1b82c0d - build-tools_r22-macosx.zip - macosx - - - - 33254114 - 08fcca41e81b172bd9f570963b90d3a84929e043 - build-tools_r22-windows.zip - windows - - - - - - - - 21 - 1 - 2 - - - - - 32637678 - 5e35259843bf2926113a38368b08458735479658 - build-tools_r21.1.2-linux.zip - linux - - - - 33152878 - e7c906b4ba0eea93b32ba36c610dbd6b204bff48 - build-tools_r21.1.2-macosx.zip - macosx - - - - 32792587 - 1d944759c47f60e634d2b8a1f3a4259be2f8d652 - build-tools_r21.1.2-windows.zip - windows - - - - - - - - - 21 - 1 - 1 - - - - - 32642454 - 1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d - build-tools_r21.1.1-linux.zip - linux - - - - 33157676 - 836a146eab0504aa9387a5132e986fe7c7381571 - build-tools_r21.1.1-macosx.zip - macosx - - - - 32797356 - 53fc4201237f899d5cd92f0b76ad41fb89da188b - build-tools_r21.1.1-windows.zip - windows - - - - - - - - - 21 - 1 - 0 - - - - - 32642820 - b7455e543784d52a8925f960bc880493ed1478cb - build-tools_r21.1-linux.zip - linux - - - - 33158159 - df619356c2359aa5eacdd48699d15b335d9bd246 - build-tools_r21.1-macosx.zip - macosx - - - - 32797810 - c79d63ac6b713a1e326ad4dae43f2ee76708a2f4 - build-tools_r21.1-windows.zip - windows - - - - - - - - - 21 - 0 - 2 - - - - - 22153122 - e1236ab8897b62b57414adcf04c132567b2612a5 - build-tools_r21.0.2-linux.zip - linux - - - - 22668597 - f17471c154058f3734729ef3cc363399b1cd3de1 - build-tools_r21.0.2-macosx.zip - macosx - - - - 22306371 - 37496141b23cbe633167927b7abe6e22d9f1a1c1 - build-tools_r21.0.2-windows.zip - windows - - - - - - - - - 21 - 0 - 1 - - - - - 22153013 - e573069eea3e5255e7a65bedeb767f4fd0a5f49a - build-tools_r21.0.1-linux.zip - linux - - - - 22668616 - b60c8f9b810c980abafa04896706f3911be1ade7 - build-tools_r21.0.1-macosx.zip - macosx - - - - 22306243 - d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df - build-tools_r21.0.1-windows.zip - windows - - - - - - - - - 21 - 0 - 0 - - - - - 22153145 - 4933328fdeecbd554a29528f254f4993468e1cf4 - build-tools_r21-linux.zip - linux - - - - 22668456 - 9bef7989b51436bd4e5114d8a0330359f077cbfa - build-tools_r21-macosx.zip - macosx - - - - 22306371 - 5bc8fd399bc0135a9bc91eec78ddc5af4f54bf32 - build-tools_r21-windows.zip - windows - - - - - - - - 20 - 0 - 0 - - - - - 21445463 - b688905526a5584d1327a662d871a635ff502758 - build-tools_r20-linux.zip - linux - - - - 21650508 - 1240f629411c108a714c4ddd756937c7fab93f83 - build-tools_r20-macosx.zip - macosx - - - - 20828006 - cf20720e452b642d5eb59dabe05c0c729b36ec75 - build-tools_r20-windows.zip - windows - - - - - - - - 19 - 1 - 0 - - - - - 21490972 - 1ff20ac15fa47a75d00346ec12f180d531b3ca89 - build-tools_r19.1-linux.zip - linux - - - - 21590160 - 0d11aae3417de1efb4b9a0e0a7855904a61bcec1 - build-tools_r19.1-macosx.zip - macosx - - - - 20812533 - 13b367fbdbff8132cb4356f716e8dc8a8df745c5 - build-tools_r19.1-windows.zip - windows - - - - - - - - - 19 - 0 - 3 - - - - - 21462150 - c2d6055478e9d2d4fba476ee85f99181ddd1160c - build-tools_r19.0.3-linux.zip - linux - - - - 21563992 - 651cf8754373b2d52e7f6aab2c52eabffe4e9ea4 - build-tools_r19.0.3-macosx.zip - macosx - - - - 20730715 - cb46b433b67a0a6910ff00db84be8b527ea3102f - build-tools_r19.0.3-windows.zip - windows - - - - - - - - - 19 - 0 - 2 - - - - - 21352552 - a03a6bdea0091aea32e1b35b90a7294c9f04e3dd - build-tools_r19.0.2-linux.zip - linux - - - - 21453726 - 145bc43065d45f756d99d87329d899052b9a9288 - build-tools_r19.0.2-macosx.zip - macosx - - - - 20621117 - af664672d0d709c9ae30937b1062317d3ade7f95 - build-tools_r19.0.2-windows.zip - windows - - - - - - - - - 19 - 0 - 1 - - - - - 21229048 - 18d2312dc4368858914213087f4e61445aca4517 - build-tools_r19.0.1-linux.zip - linux - - - - 21450597 - efaf50fb19a3edb8d03efbff76f89a249ad2920b - build-tools_r19.0.1-macosx.zip - macosx - - - - 20500648 - 5ef422bac5b28f4ced108319ed4a6bc7050a6234 - build-tools_r19.0.1-windows.zip - windows - - - - - - - - - 19 - 0 - 0 - - - - - 21339943 - 55c1a6cf632e7d346f0002b275ec41fd3137fd83 - build-tools_r19-linux.zip - linux - - - - 21441270 - 86ec1c12db1bc446b7bcaefc5cc14eb361044e90 - build-tools_r19-macosx.zip - macosx - - - - 20611447 - 6edf505c20f5ece9c48fa0aff9a90488f9654d52 - build-tools_r19-windows.zip - windows - - - - - - - - - 18 - 1 - 1 - - - - - 20229760 - 68c9acbfc0cec2d51b19efaed39831a17055d998 - build-tools_r18.1.1-linux.zip - linux - - - - 20452157 - a9d9d37f6ddf859e57abc78802a77aaa166e48d4 - build-tools_r18.1.1-macosx.zip - macosx - - - - 19660000 - c4605066e2f851387ea70bc1442b1968bd7b4a15 - build-tools_r18.1.1-windows.zip - windows - - - - - - - - - 18 - 1 - 0 - - - - - 20229298 - f314a0599e51397f0886fe888b50dd98f2f050d8 - build-tools_r18.1-linux.zip - linux - - - - 20451524 - 16ddb299b8b43063e5bb3387ec17147c5053dfd8 - build-tools_r18.1-macosx.zip - macosx - - - - 19659547 - 3a9810fc8559ab03c09378f07531e8cae2f1db30 - build-tools_r18.1-windows.zip - windows - - - - - - - - - 18 - 0 - 1 - - - - - 16627330 - f11618492b0d2270c332325d45d752d3656a9640 - build-tools_r18.0.1-linux.zip - linux - - - - 16633121 - d84f5692fb44d60fc53e5b2507cebf9f24626902 - build-tools_r18.0.1-macosx.zip - macosx - - - - 15413527 - a6c2afd0b6289d589351956d2f5212b37014ca7d - build-tools_r18.0.1-windows.zip - windows - - - - - - - - - 17 - 0 - 0 - - - - - 11696007 - 2c2872bc3806aabf16a12e3959c2183ddc866e6d - build-tools_r17-linux.zip - linux - - - - 12208114 - 602ee709be9dbb8f179b1e4075148a57f9419930 - build-tools_r17-macosx.zip - macosx - - - - 11004914 - 899897d327b0bad492d3a40d3db4d96119c15bc0 - build-tools_r17-windows.zip - windows - - - - - - - - 26 - 0 - 0 - - - - - 7771750 - e75b6137dc444f777eb02f44a6d9819b3aabff82 - platform-tools_r26.0.0-darwin.zip - macosx - - - - 7859155 - 00de8a6631405b617c10f68cd11ff2e1cd528e23 - platform-tools_r26.0.0-linux.zip - linux - - - - 7511554 - a4128ebc3d1b6372d981810920e3fa01637f891a - platform-tools_r26.0.0-windows.zip - windows - - - - - - - - 25 - 2 - 5 - - - - - 277894900 - 72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1 - tools_r25.2.5-linux.zip - linux - - - - 200529982 - d2168d963ac5b616e3d3ddaf21511d084baf3659 - tools_r25.2.5-macosx.zip - macosx - - - - 306785944 - a7f7ebeae1c8d8f62d3a8466e9c81baee7cc31ca - tools_r25.2.5-windows.zip - windows - - - - - 20 - - - - - 24 - 1 - - - - 419477967 - eef58238949ee9544876cb3e002f2d58e4ee7b5d - docs-24_r01.zip - - - - - diff --git a/pkgs/development/mobile/androidenv/sources.nix b/pkgs/development/mobile/androidenv/sources.nix deleted file mode 100644 index e4fe3cf0ff5d82a7d87bf1c26e47002c3587f742..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/sources.nix +++ /dev/null @@ -1,151 +0,0 @@ - -# This file is generated from generate-sources.sh. DO NOT EDIT. -# Execute generate-sources.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildSource = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - source_14 = buildSource { - name = "android-source-14"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-14_r01.zip; - sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555"; - }; - meta = { - description = "Source code for Android API 14"; - }; - }; - - source_15 = buildSource { - name = "android-source-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-15_r02.zip; - sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa"; - }; - meta = { - description = "Source code for Android API 15"; - }; - }; - - source_16 = buildSource { - name = "android-source-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-16_r02.zip; - sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84"; - }; - meta = { - description = "Source code for Android API 16"; - }; - }; - - source_17 = buildSource { - name = "android-source-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-17_r01.zip; - sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a"; - }; - meta = { - description = "Source code for Android API 17"; - }; - }; - - source_18 = buildSource { - name = "android-source-18"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-18_r01.zip; - sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78"; - }; - meta = { - description = "Source code for Android API 18"; - }; - }; - - source_19 = buildSource { - name = "android-source-19"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-19_r02.zip; - sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7"; - }; - meta = { - description = "Source code for Android API 19"; - }; - }; - - source_20 = buildSource { - name = "android-source-20"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-20_r01.zip; - sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76"; - }; - meta = { - description = "Source code for Android API 20"; - }; - }; - - source_21 = buildSource { - name = "android-source-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-21_r01.zip; - sha1 = "137a5044915d32bea297a8c1552684802bbc2e25"; - }; - meta = { - description = "Source code for Android API 21"; - }; - }; - - source_22 = buildSource { - name = "android-source-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-22_r01.zip; - sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6"; - }; - meta = { - description = "Source code for Android API 22"; - }; - }; - - source_23 = buildSource { - name = "android-source-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-23_r01.zip; - sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2"; - }; - meta = { - description = "Source code for Android API 23"; - }; - }; - - source_24 = buildSource { - name = "android-source-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-24_r01.zip; - sha1 = "6b96115830a83d654479f32ce4b724ca9011148b"; - }; - meta = { - description = "Source code for Android API 24"; - }; - }; - - source_25 = buildSource { - name = "android-source-25"; - src = fetchurl { - url = https://dl.google.com/android/repository/sources-25_r01.zip; - sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c"; - }; - meta = { - description = "Source code for Android API 25"; - }; - }; - -} diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix deleted file mode 100644 index 55c1b60e965d10e0609084ed9ec73dd1ec4aeeb7..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - version = "47"; - name = "android-support-repository-r${version}"; - src = fetchurl { - url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha256 = "1l13a6myff6i8x99h1ky2j5sglwy8wc0rsbxfcbif375vh41iyd3"; - }; - - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - - buildInputs = [ unzip ]; -} diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix deleted file mode 100644 index 8198e96f7e735bdb483590e530f1f7102b435c4e..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/support.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation rec { - version = "23.2.1"; - name = "android-support-r${version}"; - src = fetchurl { - url = "https://dl.google.com/android/repository/support_r${version}.zip"; - sha1 = "azl7hgps1k98kmbhw45wwbrc86y1n4j1"; - }; - - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - - buildInputs = [ unzip ]; -} diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml deleted file mode 100644 index 2a720918c23a22cc81d697088e9d0fee9564a6cb..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ /dev/null @@ -1,901 +0,0 @@ - - - - Terms and Conditions - -This is the Android Software Development Kit License Agreement - -1. Introduction - -1.1 The Android Software Development Kit (referred to in the License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 A "compatible implementation" means any Android device that (i) complies with the Android Compatibility Definition document, which can be found at the Android compatibility website (http://source.android.com/compatibility) and which may be updated from time to time; and (ii) successfully passes the Android Compatibility Test Suite (CTS). - -1.4 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - - -2. Accepting the License Agreement - -2.1 In order to use the SDK, you must first agree to the License Agreement. You may not use the SDK if you do not accept the License Agreement. - -2.2 By clicking to accept, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the SDK and may not accept the License Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries, including the country in which you are resident or from which you use the SDK. - -2.4 If you are agreeing to be bound by the License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the SDK on behalf of your employer or other entity. - - -3. SDK License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a limited, worldwide, royalty-free, non-assignable, non-exclusive, and non-sublicensable license to use the SDK solely to develop applications for compatible implementations of Android. - -3.2 You may not use this SDK to develop applications for other platforms (including non-compatible implementations of Android) or to develop another SDK. You are of course free to develop applications for other platforms, including non-compatible implementations of Android, provided that this SDK is not used for that purpose. - -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.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. - -3.6 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. - - -4. Use of the SDK by You - -4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) the License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy. - - -7. Third Party Applications - -7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, the License Agreement does not affect your legal relationship with these third parties. - - -8. Using Android APIs - -8.1 Google Data APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - - -9. Terminating the License Agreement - -9.1 The License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement with you if: -(A) you have breached any provision of the License Agreement; or -(B) Google is required to do so by law; or -(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or -(D) Google decides to no longer provide the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. - -9.4 When the License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst the License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. - - -10. DISCLAIMER OF WARRANTIES - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with the License Agreement. - - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. - - -14. General Legal Terms - -14.1 The License Agreement constitutes the whole legal agreement between you and Google and governs your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the SDK. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The rights granted in the License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under the License Agreement without the prior written approval of the other party. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - - -November 20, 2015 - To get started with the Android SDK Preview, you must agree to the following terms and conditions. -As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data. - -This is the Android SDK Preview License Agreement (the "License Agreement"). - -1. Introduction - -1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting the License Agreement - -2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement. - -2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview. - -2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity. - -3. Preview License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform. - -3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "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.3 You may not use the Preview 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 Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview. - -3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview. - -3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights. - -3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview. - -4. Use of the Preview by You - -4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/. - -7. Third Party Applications - -7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. - -8. Using Google APIs - -8.1 Google APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -9. Terminating the License Agreement - -9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you. - -9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of: -(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and -(B) Google issues a final release version of the Android SDK. - -9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely. - -10. DISCLAIMERS - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available. - -14. General Legal Terms - -14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - -June 2014. - Intel Corporation Internal Evaluation License Agreement for x86 Android* System Images for Android Software Development Kit (SDK) -This Internal Evaluation License Agreement (this "Agreement") is entered into by and between Intel and you (as an individual developer or a legal entity -- identified below as Recipient). Intel shall provide the Evaluation Software to Recipient as described in accordance with the Internal Evaluation License Terms and Conditions. - -Definitions. -These terms shall have the following meanings: - -"Intel" or "INTEL" -Intel Corporation -With an Address of: -2200 Mission College Blvd. -Santa Clara, CA 95052 -Office of the General Counsel -Mail Stop: RNB-4-51 -Attn: Software and Services Group Legal - -"Evaluation Software" -The x86 Android* emulator system images for Android Software Development Kit (SDK), as provided by Intel. - -INTERNAL EVALUATION LICENSE TERMS AND CONDITIONS - -1. DEFINITIONS. - -1.1 Additional Defined Terms. "Agreement", "Evaluation Software", "Intel", "Non-disclosure Agreement", "Recipient", and "Effective Date" shall have the meanings ascribed to them on the signature page(s) of this Agreement. - -1.2 Evaluation Materials means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications and other related materials) related to the Evaluation Software. - -1.3 "Open Source Software" means any software that requires as a condition of use, modification and/or distribution of such software that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL). - -1.4 "Pre-Release Materials" means "alpha" or "beta" designated pre-release features, which may not be fully functional, which Intel may substantially modify in producing any production version of the Evaluation Materials and/or is still under development by Intel and/or Intel’s suppliers. - -2. PURPOSE. Intel desires to provide the Evaluation Materials to Recipient solely for Recipient's internal evaluation of the Evaluation Software and other Intel products, to evaluate the desirability of cooperating with Intel in developing products based on the Evaluation Software and/or to advise Intel as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute or make commercial use of the Evaluation Materials or any modifications to the Evaluation Materials. -THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT AN INTEL SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERICAL VERSION OF THE EVALUATION SOFTWARE. - -3. TITLE. Title to the Evaluation Materials remains with Intel or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement. - -4. LICENSE. Intel grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above. Unless otherwise communicated in writing by Intel to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a "Release") the license grant in this Section 4 and the Evaluation Period shall apply to each Release. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software not provided to Recipient in source code form. -EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. - -5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from Intel. Intel and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it. - -6. MODIFICATIONS. This Agreement does NOT obligate Recipient to provide Intel with comments or suggestions regarding Evaluation Materials. However, should Recipient provide Intel with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) Intel products or processes which may embody the Evaluation Materials, Recipient grants to Intel a non-exclusive, irrevocable, worldwide, royalty-free license, with the right to sublicense Intel’s licensees and customers, under Recipient intellectual property rights, the rights to use and disclose such comments and suggestions in any manner Intel chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of Intel’s and its sublicensee’s products embodying such comments and suggestions in any manner and via any media Intel chooses, without reference to the source. - -7. WARRANTY DISCLAIMER. INTEL AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT. THE EVALUATION MATERIALS ARE PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. - -8. LIMITATION OF LIABILITY. INTEL AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR ANY SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE. INTEL AND ITS SUPPLIERS DISCLAIM ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS RELATING TO THE EVALUATION MATERIALS. - -9. EXPIRATION. Intel may terminate this Agreement immediately after a breach by Recipient. - -10. GENERAL. - -10.1 Controlling Law. Any claims arising under or relating to this Agreement shall be governed by the internal substantive laws of the State of Delaware or federal courts located in Delaware, without regard to principles of conflict of laws. Each party hereby agrees to jurisdiction and venue in the courts of the State of Delaware for all disputes and litigation arising under or relating to this Agreement. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts. - -10.2 Remedies. Recipient acknowledges that any disclosure, commercialization, or public use of the Evaluation Materials would cause irreparable injury to Intel and consents to the grant of an injunction by any court of competent jurisdiction in the event of a threatened breach. - -10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without Intel’s express prior written consent, shall be null and void. Intel may assign this Agreement, and its rights and obligations hereunder, in its sole discretion. - -10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and Intel and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and Intel with respect to the subject matter hereof. This Agreement supersedes any and all "click-to-accept" or shrink-wrapped licenses, in hard-copy or electronic form, embedded in or included with the Evaluation Materials. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed by duly authorized representatives of Recipient and Intel. Without limiting the foregoing, terms and conditions on any purchase orders or similar materials submitted by Recipient to Intel, and any terms contained in Intel’s standard acknowledgment form that are in conflict with these terms, shall be of no force or effect. - -10.5 Severability. In the event that any provision of this Agreement shall be unenforceable or invalid under any applicable law or be so held by applicable court decision, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such provision shall be changed and interpreted so as to best accomplish the objectives of such unenforceable or invalid provision within the limits of applicable law or applicable court decisions. - -10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other approval from the U.S. Department of Commerce or any other agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located. - -10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments and (iv) Intel can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . Intel is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person. - -10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header provided with Evaluation Software. Additional detail may be provided (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. -ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED POSSIBLY WITH FAULTS - MIPS Technologies, Inc. (“MIPS”) Internal Evaluation License Agreement for MIPS Android™ System Images for Android Software Development Kit (SDK): -This Internal Evaluation License Agreement (this "Agreement") is entered into by and between MIPS and you (as an individual developer or a legal entity -- identified below as “Recipient”). MIPS shall make the Evaluation Software available to Recipient as described in accordance with the terms and conditions set forth below. - -By clicking on the “Accept” button, downloading, installing, or otherwise using the Evaluation Materials (defined below), you agree to be bound by the terms of this Agreement effective as of the date you click “Accept” (the “Effective Date”), and if doing so on behalf of an entity, you represent that you are authorized to bind the entity to the terms and conditions of this Agreement. If you do not agree to be bound by the terms and conditions of this Agreement, do not download, install, or use the Evaluation Materials. - -1. DEFINITIONS. These terms shall have the following meanings: - -1.1 “MIPS” shall mean MIPS Technologies, Inc., a Delaware corporation having a principal place of business at: 955 East Arques Ave., Sunnyvale, CA 94085 - -1.2 “Evaluation Software” shall mean MIPS Android™ emulator system images for Android Software Development Kit (SDK), as made available to Recipient. - -1.3 “Evaluation Materials" means, collectively, the Evaluation Software (in source and/or object code form) and documentation (including, without limitation, any design documents, specifications, reference manuals, and other related materials) related to the Evaluation Software as made available to Recipient. - -1.4 “Open Source Software” means any software that requires (as a condition of use, modification and/or distribution of such software) that such software or other software incorporated into, derived from or distributed with such software (a) be disclosed or distributed in source code form; or (b) be licensed by the user to third parties for the purpose of making and/or distributing derivative works; or (c) be redistributable at no charge. Open Source Software includes, without limitation, software licensed or distributed under any of the following licenses or distribution models, or licenses or distribution models substantially similar to any of the following: (a) GNU’s General Public License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g., PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e) the Sun Community Source License (SCSL), (f) the Sun Industry Source License (SISL), (g) the Apache Software license and (h) the Common Public License (CPL). - -1.5 “Pre-Release Materials” means “alpha” or “beta” designated pre-release features, which may not be fully functional, which MIPS may substantially modify in producing any production version of the Evaluation Materials, and/or which is still under development by MIPS and/or MIPS’ suppliers. - -2. PURPOSE. MIPS desires to make the Evaluation Materials available to Recipient solely for Recipient's internal evaluation of the Evaluation Software to evaluate the desirability of cooperating with MIPS in developing products that are compatible with the Evaluation Software and/or to advise MIPS as to possible modifications to the Evaluation Software. Recipient may not disclose, distribute, modify (except to facilitate the above-mentioned internal evaluation), or make commercial use of the Evaluation Materials or any modifications of the Evaluation Materials. - -THE EVALUATION MATERIALS ARE PROVIDED FOR EVALUATION PURPOSES ONLY AND MAY NOT BE MODIFIED (EXCEPT TO FACILITATE THE INTERNAL EVALUATION) OR DISTRIBUTED BY RECIPIENT OR INCORPORATED INTO RECIPIENT’S PRODUCTS OR SOFTWARE. PLEASE CONTACT A MIPS SALES REPRESENTATIVE TO LEARN ABOUT THE AVAILABILITY AND COST OF A COMMERCIAL VERSION OF THE EVALUATION SOFTWARE. - -3. TITLE. Title to the Evaluation Materials remains with MIPS or its suppliers. Recipient shall not mortgage, pledge or encumber the Evaluation Materials in any way. Recipient shall return all Evaluation Materials, keeping no copies, upon termination or expiration of this Agreement. - -4. LICENSE. MIPS grants Recipient a royalty-free, personal, nontransferable, nonexclusive license under its copyrights to use the Evaluation Software only for the purposes described in paragraph 2 above and only for a period beginning on the Effective Date and extending to the first anniversary of the Effective Date (the “Evaluation Period”). Unless otherwise communicated in writing by MIPS to Recipient, to the extent the Evaluation Software is provided in more than one delivery or release (each, a “Release”) the license grant in this Section 4 and the Evaluation Period shall apply to each Release, in which case the Evaluation Period shall begin on the date that the Release is made generally available and continue to the first anniversary of such date. Recipient may not make modifications to the Evaluation Software. Recipient shall not disassemble, reverse-engineer, or decompile any software that is not provided to Recipient in source code form. - - -EXCEPT AS PROVIDED HEREIN, NO OTHER LICENSE, EXPRESS OR IMPLIED, BY ESTOPPEL OR OTHERWISE, TO ANY OTHER MIPS INTELLECTUAL PROPERTY RIGHTS IS GRANTED TO THE RECIPIENT. OTHER THAN AS EXPLICITLY SET FORTH IN PARAGRAPH 2 ABOVE, NO RIGHT TO COPY, TO REPRODUCE, TO MODIFY, OR TO CREATE DERIVATIVE WORKS OF, THE EVALUATION MATERIALS IS GRANTED HEREIN. - -5. NO OBLIGATION. Recipient shall have no duty to purchase or license any product from MIPS. MIPS and its suppliers shall have no obligation to provide support for, or develop a non-evaluation version of, the Evaluation Software or to license any version of it. - -6. MODIFICATIONS. This Agreement does not obligate Recipient to provide MIPS with comments or suggestions regarding Evaluation Materials. However, should Recipient provide MIPS with comments or suggestions for the modification, correction, improvement or enhancement of (a) the Evaluation Materials or (b) MIPS products or processes which may embody the Evaluation Materials, then Recipient agrees to grant and hereby grants to MIPS a non-exclusive, irrevocable, worldwide, fully paid-up, royalty-free license, with the right to sublicense MIPS’ licensees and customers, under Recipient’s Intellectual property rights, to use and disclose such comments and suggestions in any manner MIPS chooses and to display, perform, copy, make, have made, use, sell, offer to sell, import, and otherwise dispose of MIPS’ and its sublicensee’s products embodying such comments and suggestions in any manner and via any media MIPS chooses, without reference to the source. - -7. WARRANTY DISCLAIMER. MIPS AND ITS SUPPLIERS MAKE NO WARRANTIES WITH RESPECT TO EVALUATION MATERIALS, EITHER EXPRESS OR IMPLIED, INCLUDING ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY IMPLIED WARRANTY OF NONINFRINGEMENT WITH RESPECT TO THIRD PARTY INTELLECTUAL PROPERTY. RECIPIENT ACKNOWLEDGES AND AGREES THAT THE EVALUATION MATERIALS ARE PROVIDED “AS IS,” WITHOUT WARRANTY OF ANY KIND. - -8. LIMITATION OF LIABILITY. MIPS AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR ANY PROPERTY DAMAGE, PERSONAL INJURY, LOSS OF PROFITS, INTERRUPTION OF BUSINESS OR FOR ANY DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL DAMAGES, HOWEVER CAUSED OR ALLEGED, WHETHER FOR BREACH OF WARRANTY, CONTRACT, STRICT LIABILITY OR OTHERWISE, INCLUDING WITHOUT LIMITATION, UNDER TORT OR OTHER LEGAL THEORY. MIPS AND ITS SUPPLIERS DISCLAIM ANY AND ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY INTELLECTUAL PROPERTY RIGHTS OF ANY KIND RELATING TO THE EVALUATION MATERIALS. - -9. EXPIRATION. MIPS may terminate this Agreement immediately after a breach by Recipient or otherwise at MIPS’ reasonable discretion and upon five (5) business days’ notice to Recipient. - -10. GENERAL. - -10.1 Controlling Law. This Agreement shall be governed by California law excluding its choice of law rules. With the exception of MIPS’ rights to enforce its intellectual property rights and any confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, all disputes and any claims arising under or relating to this Agreement shall be subject to the exclusive jurisdiction and venue of the state and federal courts located in Santa Clara County, California. Each party hereby agrees to jurisdiction and venue in the courts set forth in the preceding sentence. The parties agree that the United Nations Convention on Contracts for the International Sale of Goods is specifically excluded from application to this Agreement. The parties consent to the personal jurisdiction of the above courts. - -10.2 Remedies. Recipient acknowledges and agrees that any breach of confidentiality obligations under this Agreement or any licenses distributed with the Evaluation Materials, as well as any disclosure, commercialization, or public use of the Evaluation Materials, would cause irreparable injury to MIPS, and therefore Recipient agrees to consent to, and hereby consents to, the grant of an injunction by any court of competent jurisdiction in the event of an actual or threatened breach. - -10.3 Assignment. Recipient may not delegate, assign or transfer this Agreement, the license granted or any of Recipient’s rights, obligations, or duties hereunder, expressly, by implication, by operation of law, by way of merger (regardless of whether Recipient is the surviving entity) or acquisition, or otherwise and any attempt to do so, without MIPS’ express prior written consent, shall be ineffective, null and void. MIPS may freely assign this Agreement, and its rights and obligations hereunder, in its sole discretion. - -10.4 Entire Agreement. This Agreement constitutes the entire agreement between Recipient and MIPS and supersedes in their entirety any and all oral or written agreements previously existing between Recipient and MIPS with respect to the subject matter hereof. This Agreement may only be amended or supplemented by a writing that refers explicitly to this Agreement and that is signed or otherwise accepted by duly authorized representatives of Recipient and MIPS. - -10.5 Severability. In the event that any provision of this Agreement is finally adjudicated to be unenforceable or invalid under any applicable law, such unenforceability or invalidity shall not render this Agreement unenforceable or invalid as a whole, and, in such event, such unenforceable or invalid provision shall be interpreted so as to best accomplish the objectives of such provision within the limits of applicable law or applicable court decisions. - -10.6 Export Regulations / Export Control. Recipient shall not export, either directly or indirectly, any product, service or technical data or system incorporating the Evaluation Materials without first obtaining any required license or other necessary approval from the U.S. Department of Commerce or any other governing agency or department of the United States Government. In the event any product is exported from the United States or re-exported from a foreign destination by Recipient, Recipient shall ensure that the distribution and export/re-export or import of the product is in compliance with all applicable laws, regulations, orders, or other restrictions of the U.S. Export Administration Regulations and the appropriate foreign government. Recipient agrees that neither it nor any of its subsidiaries will export/re-export any technical data, process, product, or service, directly or indirectly, to any country for which the United States government or any agency thereof or the foreign government from where it is shipping requires an export license, or other governmental approval, without first obtaining such license or approval. Recipient also agrees to implement measures to ensure that foreign national employees are authorized to receive any information controlled by U.S. export control laws. An export is "deemed" to take place when information is released to a foreign national wherever located. - -10.7 Special Terms for Pre-Release Materials. If so indicated in the description of the Evaluation Software, the Evaluation Software may contain Pre-Release Materials. Recipient hereby understands, acknowledges and agrees that: (i) Pre-Release Materials may not be fully tested and may contain bugs or errors; (ii) Pre-Release materials are not suitable for commercial release in their current state; (iii) regulatory approvals for Pre-Release Materials (such as UL or FCC) have not been obtained, and Pre-Release Materials may therefore not be certified for use in certain countries or environments or may not be suitable for certain applications and (iv) MIPS can provide no assurance that it will ever produce or make generally available a production version of the Pre-Release Materials . MIPS is not under any obligation to develop and/or release or offer for sale or license a final product based upon the Pre-Release Materials and may unilaterally elect to abandon the Pre-Release Materials or any such development platform at any time and without any obligation or liability whatsoever to Recipient or any other person. - -ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS” AND “AS AVAILABLE”, POSSIBLY WITH FAULTS, AND WITHOUT REPRESENTATION OR WARRANTY OF ANY KIND. - -10.8 Open Source Software. In the event Open Source software is included with Evaluation Software, such Open Source software is licensed pursuant to the applicable Open Source software license agreement identified in the Open Source software comments in the applicable source code file(s) and/or file header as indicated in the Evaluation Software. Additional detail may be available (where applicable) in the accompanying on-line documentation. With respect to the Open Source software, nothing in this Agreement limits any rights under, or grants rights that supersede, the terms of any applicable Open Source software license agreement. - - - - 10 - ARM EABI v7a System Image - 4 - - - - 67918042 - 54680383118eb5c95a11e1cc2a14aa572c86ee69 - armv7-10_r04.zip - - - - armeabi-v7a - default - - - - 14 - ARM EABI v7a System Image - 2 - - - - 99621822 - d8991b0c06b18d7d6ed4169d67460ee1add6661b - sysimg_armv7a-14_r02.zip - - - - armeabi-v7a - default - - - - 15 - ARM EABI v7a System Image - 4 - - - - 102079727 - 363223bd62f5afc0b2bd760b54ce9d26b31eacf1 - armeabi-v7a-15_r04.zip - - - - armeabi-v7a - default - - - - 16 - ARM EABI v7a System Image - 4 - - - - 112608076 - 39c093ea755098f0ee79f607be7df9e54ba4943f - sysimg_armv7a-16_r04.zip - - - - armeabi-v7a - default - - - - 17 - ARM EABI v7a System Image - 5 - - - - 124238679 - 7460e8110f4a87f9644f1bdb5511a66872d50fd9 - armeabi-v7a-17_r05.zip - - - - armeabi-v7a - default - - - - 18 - ARM EABI v7a System Image - 4 - - - - 130394401 - 0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642 - armeabi-v7a-18_r04.zip - - - - armeabi-v7a - default - - - - 19 - ARM EABI v7a System Image - 5 - - - - 159871567 - d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa - armeabi-v7a-19_r05.zip - - - - armeabi-v7a - default - - - - 21 - ARM EABI v7a System Image - 4 - - - - 187163871 - 8c606f81306564b65e41303d2603e4c42ded0d10 - armeabi-v7a-21_r04.zip - - - - armeabi-v7a - default - - - - 22 - ARM EABI v7a System Image - 2 - - - - 194596267 - 2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1 - armeabi-v7a-22_r02.zip - - - - armeabi-v7a - default - - - - 23 - ARM EABI v7a System Image - 6 - - - - 238333358 - 7cf2ad756e54a3acfd81064b63cb0cb9dff2798d - armeabi-v7a-23_r06.zip - windows - - - - armeabi-v7a - default - - - - 24 - ARM EABI v7a System Image - 7 - - - - 283677512 - 3454546b4eed2d6c3dd06d47757d6da9f4176033 - armeabi-v7a-24_r07.zip - - - - armeabi-v7a - default - - - - 24 - ARM 64 v8a System Image - 7 - - - - 384556503 - e8ab2e49e4efe4b064232b33b5eeaded61437d7f - arm64-v8a-24_r07.zip - - - - arm64-v8a - default - - - - 15 - MIPS System Image - 1 - - - - 117503178 - a753bb4a6783124dad726c500ce9aec9d2c1b2d9 - sysimg_mips-15_r01.zip - - - - mips - default - - - - 16 - MIPS System Image - 1 - - - - 122482530 - 67943c54fb3943943ffeb05fdd39c0b753681f6e - sysimg_mips-16_r04.zip - - - - mips - default - - - - 17 - MIPS System Image - 1 - - - - 131781761 - f0c6e153bd584c29e51b5c9723cfbf30f996a05d - sysimg_mips-17_r01.zip - - - - mips - default - - - - 10 - Intel x86 Atom System Image - 4 - - - - 75382637 - 655ffc5cc89dd45a3aca154b254009016e473aeb - x86-10_r04.zip - - - - x86 - default - - - - 15 - Intel x86 Atom System Image - 4 - - - - 115324561 - e45c728b64881c0e86529a8f7ea9c103a3cd14c1 - x86-15_r04.zip - - - - x86 - default - - - - 16 - Intel x86 Atom System Image - 5 - - - - 134339698 - 7ea16da3a8fdb880b1b290190fcc1bde2821c1e0 - x86-16_r05.zip - - - - x86 - default - - - - 17 - Intel x86 Atom System Image - 3 - - - - 142951842 - eb30274460ff0d61f3ed37862b567811bebd8270 - x86-17_r03.zip - - - - x86 - default - - - - 18 - Intel x86 Atom System Image - 3 - - - - 149657535 - 03a0cb23465c3de15215934a1dbc9715b56e9458 - x86-18_r03.zip - - - - x86 - default - - - - 19 - Intel x86 Atom System Image - 6 - - - - 185886274 - 2ac82153aae97f7eae4c5a0761224fe04321d03d - x86-19_r06.zip - - - - x86 - default - - - - 21 - Intel x86 Atom System Image - 5 - - - - 208212529 - 00f0eb0a1003efe3316347f762e20a85d8749cff - x86-21_r05.zip - - - - x86 - default - - - - 22 - Intel x86 Atom System Image - 6 - - - - 214268954 - e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e - x86-22_r06.zip - - - - x86 - default - - - - 23 - Intel x86 Atom System Image - 10 - - - - 260804863 - f6c3e3dd7bd951454795aa75c3a145fd05ac25bb - x86-23_r10.zip - - - - x86 - default - - - - 24 - Intel x86 Atom System Image - 8 - - - - 313489224 - c1cae7634b0216c0b5990f2c144eb8ca948e3511 - x86-24_r08.zip - - - - x86 - default - - - - 21 - Intel x86 Atom_64 System Image - 5 - - - - 292623982 - 9078a095825a69e5e215713f0866c83cef65a342 - x86_64-21_r05.zip - - - - x86_64 - default - - - - 22 - Intel x86 Atom_64 System Image - 6 - - - - 299976630 - 5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4 - x86_64-22_r06.zip - - - - x86_64 - default - - - - 23 - Intel x86 Atom_64 System Image - 10 - - - - 365009313 - 7cbc291483ca07dc67b71268c5f08a5755f50f51 - x86_64-23_r10.zip - - - - x86_64 - default - - - - 24 - Intel x86 Atom_64 System Image - 8 - - - - 419261998 - f6559e1949a5879f31a9662f4f0e50ad60181684 - x86_64-24_r08.zip - - - - x86_64 - default - - diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix deleted file mode 100644 index c5d075d630760df5eaea4365367b402b7683343f..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ /dev/null @@ -1,266 +0,0 @@ -# This file is generated from generate-sysimages.sh. DO NOT EDIT. -# Execute generate-sysimages.sh or fetch.sh to update the file. -{stdenv, fetchurl, unzip}: - -let - buildSystemImage = args: - stdenv.mkDerivation (args // { - buildInputs = [ unzip ]; - buildCommand = '' - mkdir -p $out - cd $out - unzip $src - ''; - }); -in -{ - - sysimg_armeabi-v7a_10 = buildSystemImage { - name = "sysimg-armeabi-v7a-10"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip; - sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69"; - }; - }; - - sysimg_x86_10 = buildSystemImage { - name = "sysimg-x86-10"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip; - sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb"; - }; - }; - - sysimg_armeabi-v7a_14 = buildSystemImage { - name = "sysimg-armeabi-v7a-14"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; - sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; - }; - }; - - sysimg_armeabi-v7a_15 = buildSystemImage { - name = "sysimg-armeabi-v7a-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip; - sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1"; - }; - }; - - sysimg_mips_15 = buildSystemImage { - name = "sysimg-mips-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-15_r01.zip; - sha1 = "a753bb4a6783124dad726c500ce9aec9d2c1b2d9"; - }; - }; - - sysimg_x86_15 = buildSystemImage { - name = "sysimg-x86-15"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip; - sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1"; - }; - }; - - sysimg_armeabi-v7a_16 = buildSystemImage { - name = "sysimg-armeabi-v7a-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip; - sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f"; - }; - }; - - sysimg_mips_16 = buildSystemImage { - name = "sysimg-mips-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; - sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; - }; - }; - - sysimg_x86_16 = buildSystemImage { - name = "sysimg-x86-16"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-16_r05.zip; - sha1 = "7ea16da3a8fdb880b1b290190fcc1bde2821c1e0"; - }; - }; - - sysimg_armeabi-v7a_17 = buildSystemImage { - name = "sysimg-armeabi-v7a-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip; - sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9"; - }; - }; - - sysimg_mips_17 = buildSystemImage { - name = "sysimg-mips-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; - sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; - }; - }; - - sysimg_x86_17 = buildSystemImage { - name = "sysimg-x86-17"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-17_r03.zip; - sha1 = "eb30274460ff0d61f3ed37862b567811bebd8270"; - }; - }; - - sysimg_armeabi-v7a_18 = buildSystemImage { - name = "sysimg-armeabi-v7a-18"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip; - sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642"; - }; - }; - - sysimg_x86_18 = buildSystemImage { - name = "sysimg-x86-18"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip; - sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458"; - }; - }; - - sysimg_armeabi-v7a_19 = buildSystemImage { - name = "sysimg-armeabi-v7a-19"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; - sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; - }; - }; - - sysimg_x86_19 = buildSystemImage { - name = "sysimg-x86-19"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; - sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; - }; - }; - - sysimg_armeabi-v7a_21 = buildSystemImage { - name = "sysimg-armeabi-v7a-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; - sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; - }; - }; - - sysimg_x86_21 = buildSystemImage { - name = "sysimg-x86-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; - sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; - }; - }; - - sysimg_x86_64_21 = buildSystemImage { - name = "sysimg-x86_64-21"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; - sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; - }; - }; - - sysimg_armeabi-v7a_22 = buildSystemImage { - name = "sysimg-armeabi-v7a-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; - sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; - }; - }; - - sysimg_x86_22 = buildSystemImage { - name = "sysimg-x86-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; - sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; - }; - }; - - sysimg_x86_64_22 = buildSystemImage { - name = "sysimg-x86_64-22"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; - sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; - }; - }; - - sysimg_armeabi-v7a_23 = buildSystemImage { - name = "sysimg-armeabi-v7a-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; - sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; - }; - }; - - sysimg_x86_23 = buildSystemImage { - name = "sysimg-x86-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; - sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; - }; - }; - - sysimg_x86_64_23 = buildSystemImage { - name = "sysimg-x86_64-23"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; - sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; - }; - }; - - sysimg_arm64-v8a_24 = buildSystemImage { - name = "sysimg-arm64-v8a-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; - sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; - }; - }; - - sysimg_armeabi-v7a_24 = buildSystemImage { - name = "sysimg-armeabi-v7a-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; - sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; - }; - }; - - sysimg_x86_24 = buildSystemImage { - name = "sysimg-x86-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; - sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; - }; - }; - - sysimg_x86_64_24 = buildSystemImage { - name = "sysimg-x86_64-24"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; - sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; - }; - }; - - sysimg_x86_25 = buildSystemImage { - name = "sysimg-x86-25"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86-25_r03.zip; - sha1 = "7dd19cfee4e43a1f60e0f5f058404d92d9544b33"; - }; - }; - - sysimg_x86_64_25 = buildSystemImage { - name = "sysimg-x86_64-25"; - src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/x86_64-25_r03.zip; - sha1 = "4593ee04811df21c339f3374fc5917843db06f8d"; - }; - }; -} - diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix new file mode 100644 index 0000000000000000000000000000000000000000..9957168f7af366f5187251f19c86c38cc8820f27 --- /dev/null +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -0,0 +1,26 @@ +{deployAndroidPackage, requireFile, lib, packages, toolsVersion, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}: + +if toolsVersion == "26.0.1" then import ./tools/26.nix { + inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; + package = { + name = "tools"; + path = "tools"; + revision = "26.0.1"; + archives = { + linux = requireFile { + url = https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip; + sha256 = "185yq7qwxflw24ccm5d6zziwlc9pxmsm3f54pm9p7xm0ik724kj4"; + }; + macosx = requireFile { + url = https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip; + sha256 = "1ycx9gzdaqaw6n19yvxjawywacavn1jc6sadlz5qikhgfr57b0aa"; + }; + }; + }; +} else if toolsVersion == "26.1.1" then import ./tools/26.nix { + inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; + package = packages.tools."${toolsVersion}"; +} else import ./tools/25.nix { + inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; + package = packages.tools."${toolsVersion}"; +} diff --git a/pkgs/development/mobile/androidenv/tools/25.nix b/pkgs/development/mobile/androidenv/tools/25.nix new file mode 100644 index 0000000000000000000000000000000000000000..80b5858031d269336c12b1be35c357b495b0ddfb --- /dev/null +++ b/pkgs/development/mobile/androidenv/tools/25.nix @@ -0,0 +1,62 @@ +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}: + +deployAndroidPackage { + name = "androidsdk"; + buildInputs = [ autoPatchelfHook makeWrapper ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libxcb pkgs.xlibs.libXfixes pkgs.xlibs.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.fontconfig pkgs_i686.freetype pkgs_i686.zlib ]; + inherit package os; + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + addAutoPatchelfSearchPath $PWD/lib64 + addAutoPatchelfSearchPath $PWD/lib64/libstdc++ + addAutoPatchelfSearchPath $PWD/lib64/qt/lib + addAutoPatchelfSearchPath $PWD/lib + addAutoPatchelfSearchPath $PWD/lib/libstdc++ + autoPatchelf . + ''} + + # Wrap all scripts that require JAVA_HOME + for i in bin + do + find $i -maxdepth 1 -type f -executable | while read program + do + if grep -q "JAVA_HOME" $program + then + wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin + fi + done + done + + # Wrap programs that require java + for i in draw9patch jobb lint screenshot2 + do + wrapProgram $PWD/$i \ + --prefix PATH : ${pkgs.jdk8}/bin + done + + # Wrap programs that require java and SWT + for i in android ddms hierarchyviewer monitor monkeyrunner traceview uiautomatorviewer + do + wrapProgram $PWD/$i \ + --prefix PATH : ${pkgs.jdk8}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} + done + + ${lib.optionalString (os == "linux") '' + wrapProgram $PWD/emulator \ + --prefix PATH : ${pkgs.file}/bin:${pkgs.glxinfo}/bin:${pkgs.pciutils}/bin \ + --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ + --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale + ''} + + # Patch all script shebangs + patchShebangs . + + cd .. + ${postInstall} + ''; + + meta.licenses = lib.licenses.unfree; +} diff --git a/pkgs/development/mobile/androidenv/tools/26.nix b/pkgs/development/mobile/androidenv/tools/26.nix new file mode 100644 index 0000000000000000000000000000000000000000..0234c9f3d04b8359e27c075b57877bdae4f975d6 --- /dev/null +++ b/pkgs/development/mobile/androidenv/tools/26.nix @@ -0,0 +1,40 @@ +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgs_i686, postInstall ? ""}: + +deployAndroidPackage { + name = "androidsdk"; + inherit os package; + buildInputs = [ autoPatchelfHook makeWrapper ] + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + autoPatchelf . + ''} + + # Wrap all scripts that require JAVA_HOME + for i in bin + do + find $i -maxdepth 1 -type f -executable | while read program + do + if grep -q "JAVA_HOME" $program + then + wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin + fi + done + done + + # Wrap monitor script + wrapProgram $PWD/monitor \ + --prefix PATH : ${pkgs.jdk8}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} + + # Patch all script shebangs + patchShebangs . + + cd .. + ${postInstall} + ''; + + meta.licenses = lib.licenses.unfree; +} diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 601b0b319bc88edcbd7ee1e51a00e772bd0f70f2..f78a10d8266314c81698803f23904abb36dafa76 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }: +{ stdenv, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }: # TODO: # @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux - ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux + ln -s ${platform-tools}/libexec/android-sdk/platform-tools/adb x10flasher_lib/adb.linux + ln -s ${platform-tools}/libexec/android-sdk/platform-tools/fastboot x10flasher_lib/fastboot.linux ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 0250e5bf2e282ba2a63fb9f67688396965c97b28..aac94fe6130b2a01f4ba16a595205a891e1a0590 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,200 +1,189 @@ -{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, file, xcodeBaseDir}: -{ name, src, preBuild ? "", target, androidPlatformVersions ? [ "25" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null +{stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}: +{ name, src, preBuild ? "", target, tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null -, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "11.2" -, enableWirelessDistribution ? false, iosBuildStore ? false, installURL ? null -}: +, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false +, enableWirelessDistribution ? false, installURL ? null +, xcodeBaseDir ? "/Applications/Xcode.app" +, androidsdkArgs ? {} +, xcodewrapperArgs ? {} +, ... +}@args: assert (release && target == "android") -> androidKeyStore != null && androidKeyAlias != null && androidKeyStorePassword != null; assert (release && target == "iphone") -> iosMobileProvisioningProfile != null && iosCertificateName != null && iosCertificate != null && iosCertificatePassword != null; assert enableWirelessDistribution -> installURL != null; let - androidsdkComposition = androidsdk { - platformVersions = androidPlatformVersions; - abiVersions = androidAbiVersions; - useGoogleAPIs = true; - }; + realAndroidsdkArgs = { + platformVersions = [ "28" ]; + } // androidsdkArgs; + + androidsdk = (composeAndroidPackages realAndroidsdkArgs).androidsdk; + + realXcodewrapperArgs = { + inherit xcodeBaseDir; + } // xcodewrapperArgs; + + xcodewrapper = composeXcodeWrapper xcodewrapperArgs; deleteKeychain = '' - security default-keychain -s login.keychain - security delete-keychain $keychainName - rm -f $HOME/lock-keychain + if [ -f $HOME/lock-keychain ] + then + security default-keychain -s login.keychain + security delete-keychain $keychainName + rm -f $HOME/lock-keychain + fi ''; + + extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ]; in -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = stdenv.lib.replaceChars [" "] [""] name; - inherit src; - buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") xcodewrapper; - + buildInputs = [ nodejs titanium alloy python which file jdk ] + ++ stdenv.lib.optional (target == "iphone") xcodewrapper; + buildPhase = '' ${preBuild} - export HOME=$TMPDIR - + ${stdenv.lib.optionalString stdenv.isDarwin '' + # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error. + alloy=$(dirname $(type -p alloy))/.. + cp -rv $alloy/* alloy + chmod -R u+w alloy + export PATH=$(pwd)/alloy/bin:$PATH + ''} + + export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"} + ${stdenv.lib.optionalString (tiVersion != null) '' # Replace titanium version by the provided one sed -i -e "s|[0-9a-zA-Z\.]*|${tiVersion}|" tiapp.xml ''} - + # Simulate a login mkdir -p $HOME/.titanium cat > $HOME/.titanium/auth_session.json < $TMPDIR/config.json titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk} titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk} - + mkdir -p $out - - ${if target == "android" then - '' - titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec - - export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH - export GRADLE_USER_HOME=$TMPDIR/gradle - - ${if release then - '' - ${stdenv.lib.optionalString stdenv.isDarwin '' - # Signing the app does not work with OpenJDK on macOS, use host SDK instead - export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" - ''} - titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out - '' - else - ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''} - '' - else if target == "iphone" then - '' - ${if release then - '' - export HOME=/Users/$(whoami) - export keychainName=$(basename $out) - - # Create a keychain with the component hash name (should always be unique) - security create-keychain -p "" $keychainName - security default-keychain -s $keychainName - security unlock-keychain -p "" $keychainName - security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A - security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName - provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") - - # Ensure that the requested provisioning profile can be found - - if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" ] - then - mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" - cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision" - fi - - # Simulate a login - mkdir -p $HOME/.titanium - cat > $HOME/.titanium/auth_session.json < $out/nix-support/hydra-build-products - - ${stdenv.lib.optionalString enableWirelessDistribution '' - appname=$(basename $out/*.ipa .ipa) - bundleId=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') - version=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') - - sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&version=$version\&title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html" - echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products - ''} - '' - else if target == "iphone" then "" - else throw "Target: ${target} is not supported!"} - ${if target == "android" then '' + ${if release then "" + else '' + cp "$(ls build/android/bin/*.apk | grep -v '\-unsigned.apk')" $out + ''} + + mkdir -p $out/nix-support + echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products + '' + else if target == "iphone" then + if release then '' mkdir -p $out/nix-support - echo "file binary-dist \"$(ls $out/*.apk)\"" > $out/nix-support/hydra-build-products - '' else ""} + echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products + + ${stdenv.lib.optionalString enableWirelessDistribution '' + appname="$(basename "$out/*.ipa" .ipa)" + bundleId=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') + version=$(grep '[a-zA-Z0-9.]*' tiapp.xml | sed -e 's|||' -e 's|||' -e 's/ //g') + + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&version=$version\&title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html" + echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products + ''} + '' + else "" + else throw "Target: ${target} is not supported!"} ''; - + failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain; -} +} // extraArgs) diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index f411a8d61fd0d92711854e023f8ce9314ecb99ef..336194cf0a811472dda372ff51db36078b3041ed 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,27 +1,20 @@ -{pkgs, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}: +{pkgs, pkgs_i686, androidenv, xcodeenv, tiVersion ? "7.1.0.GA"}: rec { - androidenv = pkgs.androidenv; - - xcodeenv = if pkgs.stdenv.hostPlatform.system == "x86_64-darwin" then pkgs.xcodeenv.override { - version = xcodeVersion; - inherit xcodeBaseDir; - } else null; - titaniumsdk = let - titaniumSdkFile = if tiVersion == "6.3.1.GA" then ./titaniumsdk-6.3.nix - else if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix + titaniumSdkFile = if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix + else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { - inherit (pkgs) stdenv fetchurl unzip makeWrapper python jdk; + inherit (pkgs) stdenv fetchurl unzip makeWrapper; }; - + buildApp = import ./build-app.nix { inherit (pkgs) stdenv python which file jdk nodejs; - inherit (pkgs.nodePackages_6_x) alloy titanium; - inherit (androidenv) androidsdk; - inherit (xcodeenv) xcodewrapper; - inherit titaniumsdk xcodeBaseDir; + inherit (pkgs.nodePackages_8_x) alloy titanium; + inherit (androidenv) composeAndroidPackages; + inherit (xcodeenv) composeXcodeWrapper; + inherit titaniumsdk; }; } diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix deleted file mode 100644 index 78f91dd39fb845abb30dd580157088eb480d04b1..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ nixpkgs ? -, systems ? [ "x86_64-linux" "x86_64-darwin" ] -, xcodeVersion ? "9.2" -, xcodeBaseDir ? "/Applications/Xcode.app" -, tiVersion ? "7.1.0.GA" -, rename ? false -, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "11.2" -, enableWirelessDistribution ? false, installURL ? null -}: - -let - pkgs = import nixpkgs {}; -in -rec { - kitchensink_android_debug = pkgs.lib.genAttrs systems (system: - let - pkgs = import nixpkgs { inherit system; }; - in - import ./kitchensink { - inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; - inherit tiVersion; - target = "android"; - }); - - kitchensink_android_release = pkgs.lib.genAttrs systems (system: - let - pkgs = import nixpkgs { inherit system; }; - in - import ./kitchensink { - inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; - inherit tiVersion; - target = "android"; - release = true; - }); - - emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system: - let - pkgs = import nixpkgs { inherit system; }; - in - import ./emulate-kitchensink { - inherit (pkgs) androidenv; - kitchensink = builtins.getAttr system kitchensink_android_debug; - }); - - emulate_kitchensink_release = pkgs.lib.genAttrs systems (system: - let - pkgs = import nixpkgs { inherit system; }; - in - import ./emulate-kitchensink { - inherit (pkgs) androidenv; - kitchensink = builtins.getAttr system kitchensink_android_release; - }); - -} // (if builtins.elem "x86_64-darwin" systems then - let - pkgs = import nixpkgs { system = "x86_64-darwin"; }; - in - rec { - kitchensink_ios_development = import ./kitchensink { - inherit (pkgs) fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; - inherit tiVersion iosVersion; - target = "iphone"; - }; - - simulate_kitchensink = import ./simulate-kitchensink { - inherit (pkgs) stdenv; - xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; }; - kitchensink = kitchensink_ios_development; - bundleId = if rename then newBundleId else "com.appcelerator.kitchensink"; - }; -} else {}) // (if rename then - let - pkgs = import nixpkgs { system = "x86_64-darwin"; }; - in - { - kitchensink_ipa = import ./kitchensink { - inherit (pkgs) stdenv fetchgit; - titaniumenv = pkgs.titaniumenv.override { inherit xcodeVersion xcodeBaseDir tiVersion; }; - target = "iphone"; - inherit tiVersion; - release = true; - rename = true; - inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion; - inherit enableWirelessDistribution installURL; - }; - } - -else {}) diff --git a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix deleted file mode 100644 index cad4503dc96ee9631050130882bf06956a40345d..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/titaniumenv/examples/emulate-kitchensink/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{androidenv, kitchensink}: - -androidenv.emulateApp { - name = "emulate-${kitchensink.name}"; - app = kitchensink; - platformVersion = "16"; - useGoogleAPIs = true; - package = "com.appcelerator.kitchensink"; - activity = ".KitchensinkActivity"; -} diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix deleted file mode 100644 index 70ab1b168c4226cdb593223f85ea67dafb9307e5..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "7.1.0.GA", release ? false -, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2" -, enableWirelessDistribution ? false, installURL ? null -}: - -assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioningProfile != null && iosCertificate != null && iosCertificateName != null && iosCertificatePassword != null); - -let - src = fetchgit { - url = https://github.com/appcelerator/kitchensink-v2.git; - rev = "94364df2ef60a80bd354a4273e3cb5f4c5185537"; - sha256 = "0q4gzidpsq401frkngy4yk5kqvm8dz00ls74bw3fnpvg4714d6gf"; - }; - - # Rename the bundle id to something else - renamedSrc = stdenv.mkDerivation { - name = "KitchenSink-renamedsrc"; - inherit src; - buildPhase = '' - sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" tiapp.xml - ''; - installPhase = '' - mkdir -p $out - mv * $out - ''; - }; -in -titaniumenv.buildApp { - name = "KitchenSink-${target}-${if release then "release" else "debug"}"; - src = if rename then renamedSrc else src; - preBuild = '' - sed -i -e "s|23|25|" tiapp.xml - ''; # Raise minimum android SDK from 23 to 25 - inherit tiVersion; - - inherit target androidPlatformVersions release; - - androidKeyStore = ./keystore; - androidKeyAlias = "myfirstapp"; - androidKeyStorePassword = "mykeystore"; - - inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion; - inherit enableWirelessDistribution installURL; -} diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh b/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh deleted file mode 100755 index 57451e8a5075dab4bbdd5046bb17a44282c58423..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/generatekeystore.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -e - -( echo "John Doe" - echo "My Company" - echo "My Organization" - echo "My City" - echo "My State" - echo "US" - echo "yes" -) | keytool --genkeypair --alias myfirstapp --keystore ./keystore --storepass mykeystore diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore b/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore deleted file mode 100644 index ee0a9c7989badede112afd57b011d1d53206425b..0000000000000000000000000000000000000000 Binary files a/pkgs/development/mobile/titaniumenv/examples/kitchensink/keystore and /dev/null differ diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix deleted file mode 100644 index bbd94cb7882ad59ef0c0d25fcfa50912ce0e2877..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{xcodeenv, kitchensink, bundleId}: - -xcodeenv.simulateApp { - name = "simulate-${kitchensink.name}"; - inherit bundleId; - app = "${kitchensink}/build/iphone/build/Products/Debug-iphonesimulator"; -} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix deleted file mode 100644 index b8c2688708bb391bb9e64c7cea0db5912688f717..0000000000000000000000000000000000000000 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-6.3.nix +++ /dev/null @@ -1,43 +0,0 @@ -{stdenv, fetchurl, unzip, makeWrapper}: - -stdenv.mkDerivation { - name = "mobilesdk-6.3.1.GA"; - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-linux.zip; - sha256 = "0g8dqqf5ffa7ll3rqm5naywipnv2vvfxcj9fmqg1wnvvxf0rflqj"; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com/mobile/6_3_X/mobilesdk-6.3.1.v20171101154403-osx.zip; - sha256 = "00bm8vv70mg4kd7jvmxd1bfqafv6zdpdx816i0hvf801zwnak4nj"; - } - else throw "Platform: ${stdenv.hostPlatform.system} not supported!"; - - buildInputs = [ unzip makeWrapper ]; - - buildCommand = '' - mkdir -p $out - cd $out - (yes y | unzip $src) || true - - # Rename ugly version number - cd mobilesdk/* - mv * 6.3.1.GA - cd * - ${stdenv.lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' - # Fixes a bad archive copying error when generating an IPA file - sed -i -e "s|cp -rf|/bin/cp -rf|" iphone/cli/commands/_build.js - ''} - - # Patch some executables - - ${if stdenv.hostPlatform.system == "i686-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 - '' - else if stdenv.hostPlatform.system == "x86_64-linux" then - '' - patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 - '' - else ""} - ''; -} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix index 4d3bd420969cd82e21c5dc2315f0438484a9ac75..13abc18f76ecf8d6da41d3b5b7c5adaa211a6efb 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix @@ -35,7 +35,7 @@ let sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx"; }; - # Put the download plugins in a fake Maven repository + # Put the downloaded plugins in a fake Maven repository fakeMavenRepo = stdenv.mkDerivation { name = "fake-maven-repo"; buildCommand = '' @@ -54,15 +54,15 @@ let in stdenv.mkDerivation { name = "mobilesdk-7.1.0.GA"; - src = if (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") then fetchurl { + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip; sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn"; } - else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { + else if stdenv.system == "x86_64-darwin" then fetchurl { url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip; sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m"; } - else throw "Platform: ${stdenv.hostPlatform.system} not supported!"; + else throw "Platform: ${stdenv.system} not supported!"; buildInputs = [ unzip makeWrapper ]; @@ -89,11 +89,11 @@ stdenv.mkDerivation { # Patch some executables - ${if stdenv.hostPlatform.system == "i686-linux" then + ${if stdenv.system == "i686-linux" then '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 '' - else if stdenv.hostPlatform.system == "x86_64-linux" then + else if stdenv.system == "x86_64-linux" then '' patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 '' diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix new file mode 100644 index 0000000000000000000000000000000000000000..cff1d73d30249c10959f0ac602d9d978287b2571 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -0,0 +1,102 @@ +{stdenv, fetchurl, unzip, makeWrapper}: + +let + # Gradle is a build system that bootstraps itself. This is what it actually + # downloads in the bootstrap phase. + gradleAllZip = fetchurl { + url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; + }; + + # A Titanium-Android build requires proguard plugins. We create a fake + # repository so that Gradle does not attempt to download them in the builder. + # Since there are only 3 plugins required, this is still (sort of) manageable + # without a generator. + proguardVersion = "5.3.3"; + + proguardGradlePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom"; + sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj"; + }; + proguardGradleJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar"; + sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk"; + }; + proguardParentPOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom"; + sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202"; + }; + proguardBasePOM = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom"; + sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5"; + }; + proguardBaseJAR = fetchurl { + url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar"; + sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx"; + }; + + # Put the downloaded plugins in a fake Maven repository + fakeMavenRepo = stdenv.mkDerivation { + name = "fake-maven-repo"; + buildCommand = '' + mkdir -p $out + cd $out + mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion} + cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom + cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar + mkdir -p net/sf/proguard/proguard-parent/${proguardVersion} + cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom + mkdir -p net/sf/proguard/proguard-base/${proguardVersion} + cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom + cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar + ''; + }; +in +stdenv.mkDerivation { + name = "mobilesdk-7.5.1.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-linux.zip; + sha256 = "1ihyh6szl9a2gbdgv13msd3g7i3xi9ifmgsh6v562hqlfi4lixng"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-osx.zip; + sha256 = "1whs1j7fkk2hxr4nxq50d7ic5wj83b1i1jl0p722sqbvkmgxssa2"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + (yes y | unzip $src) || true + + # Rename ugly version number + cd mobilesdk/* + mv * 7.5.1.GA + cd * + + # Patch bundled gradle build infrastructure to make shebangs work + patchShebangs android/templates/gradle + + # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app + sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip + echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties + + # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts + sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 + '' + else ""} + ''; +} diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index a94f2745894ba11743d62ebd5da2a88709e5e0b7..b88f806d5866418a947fff62a88b440083c40286 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -1,40 +1,40 @@ -{stdenv, xcodewrapper}: +{stdenv, composeXcodeWrapper}: { name , src -, sdkVersion ? "11.2" +, sdkVersion ? "12.1" , target ? null , configuration ? null , scheme ? null , sdk ? null , xcodeFlags ? "" , release ? false -, codeSignIdentity ? null , certificateFile ? null , certificatePassword ? null , provisioningProfile ? null +, codeSignIdentity ? null , signMethod ? null , generateIPA ? false , generateXCArchive ? false , enableWirelessDistribution ? false , installURL ? null , bundleId ? null -, version ? null -, title ? null -}: +, appVersion ? null +, ... +}@args: -assert release -> codeSignIdentity != null && certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null; -assert enableWirelessDistribution -> installURL != null && bundleId != null && version != null && title != null; +assert release -> certificateFile != null && certificatePassword != null && provisioningProfile != null && signMethod != null && codeSignIdentity != null; +assert enableWirelessDistribution -> installURL != null && bundleId != null && appVersion != null; let # Set some default values here - + _target = if target == null then name else target; _configuration = if configuration == null then if release then "Release" else "Debug" else configuration; - + _sdk = if sdk == null then if release then "iphoneos" + sdkVersion else "iphonesimulator" + sdkVersion @@ -45,45 +45,53 @@ let security default-keychain -s login.keychain security delete-keychain $keychainName ''; + + xcodewrapperFormalArgs = builtins.functionArgs composeXcodeWrapper; + xcodewrapperArgs = builtins.intersectAttrs xcodewrapperFormalArgs args; + xcodewrapper = composeXcodeWrapper xcodewrapperArgs; + + extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs); in -stdenv.mkDerivation { - name = stdenv.lib.replaceChars [" "] [""] name; - inherit src; - buildInputs = [ xcodewrapper ]; +stdenv.mkDerivation ({ + name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed buildPhase = '' + # Be sure that the Xcode wrapper has priority over everything else. + # When using buildInputs this does not seem to be the case. + export PATH=${xcodewrapper}/bin:$PATH + ${stdenv.lib.optionalString release '' - export HOME=/Users/$(whoami) - keychainName="$(basename $out)" - - # Create a keychain - security create-keychain -p "" $keychainName - security default-keychain -s $keychainName - security unlock-keychain -p "" $keychainName - - # Import the certificate into the keychain - security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A - - # Grant the codesign utility permissions to read from the keychain - security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName - - # Determine provisioning ID - PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") - - if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ] - then - # Copy provisioning profile into the home directory - mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" - cp ${provisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" - fi - - # Check whether the identity can be found - security find-identity -p codesigning $keychainName - ''} + export HOME=/Users/$(whoami) + keychainName="$(basename $out)" + + # Create a keychain + security create-keychain -p "" $keychainName + security default-keychain -s $keychainName + security unlock-keychain -p "" $keychainName + + # Import the certificate into the keychain + security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A + + # Grant the codesign utility permissions to read from the keychain + security set-key-partition-list -S apple-tool:,apple: -s -k "" $keychainName + + # Determine provisioning ID + PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") + + if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ] + then + # Copy provisioning profile into the home directory + mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" + cp ${provisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" + fi + + # Check whether the identity can be found + security find-identity -p codesigning $keychainName + ''} # Do the building - export LD=clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works + export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags} ${stdenv.lib.optionalString release '' ${stdenv.lib.optionalString generateIPA '' @@ -93,11 +101,15 @@ stdenv.mkDerivation { + signingCertificate + ${codeSignIdentity} provisioningProfiles - ${bundleId} + ${stdenv.lib.toLower bundleId} $PROVISIONING_PROFILE + signingStyle + manual method ${signMethod} ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") '' @@ -114,10 +126,11 @@ stdenv.mkDerivation { # Add IPA to Hydra build products mkdir -p $out/nix-support echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products - + ${stdenv.lib.optionalString enableWirelessDistribution '' - appname=$(basename $out/*.ipa .ipa) - sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${version}\&title=$appname|" ${./install.html.template} > $out/$appname.html + # Add another hacky build product that enables wireless adhoc installations + appname="$(basename "$out/*.ipa" .ipa)" + sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&version=${appVersion}\&title=$appname|" ${./install.html.template} > $out/$appname.html echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products ''} ''} @@ -125,13 +138,13 @@ stdenv.mkDerivation { mkdir -p $out mv "${name}.xcarchive" $out ''} - + # Delete our temp keychain ${deleteKeychain} ''} ''; - + failureHook = stdenv.lib.optionalString release deleteKeychain; - + installPhase = "true"; -} +} // extraArgs) diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix new file mode 100644 index 0000000000000000000000000000000000000000..dea1b77211bd4596a195c27ec08dc28fb294dd8b --- /dev/null +++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -0,0 +1,30 @@ +{stdenv}: +{version ? "10.1", xcodeBaseDir ? "/Applications/Xcode.app"}: + +assert stdenv.isDarwin; + +stdenv.mkDerivation { + name = "xcode-wrapper-"+version; + buildCommand = '' + mkdir -p $out/bin + cd $out/bin + ln -s /usr/bin/xcode-select + ln -s /usr/bin/security + ln -s /usr/bin/codesign + ln -s /usr/bin/xcrun + ln -s /usr/bin/plutil + ln -s /usr/bin/clang + ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" + ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator" + + cd .. + ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" + + # Check if we have the xcodebuild version that we want + if [ -z "$($out/bin/xcodebuild -version | grep -x 'Xcode ${version}')" ] + then + echo "We require xcodebuild version: ${version}" + exit 1 + fi + ''; +} diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix index b3b9dbdf07ac0130f9d80ac06503c3a279905ae0..47686e6d69e9a82d8c64717c64e2915e5054c0ac 100644 --- a/pkgs/development/mobile/xcodeenv/default.nix +++ b/pkgs/development/mobile/xcodeenv/default.nix @@ -1,15 +1,15 @@ -{stdenv, version ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app"}: +{stdenv}: rec { - xcodewrapper = import ./xcodewrapper.nix { - inherit stdenv version xcodeBaseDir; + composeXcodeWrapper = import ./compose-xcodewrapper.nix { + inherit stdenv; }; buildApp = import ./build-app.nix { - inherit stdenv xcodewrapper; + inherit stdenv composeXcodeWrapper; }; simulateApp = import ./simulate-app.nix { - inherit stdenv xcodewrapper; + inherit stdenv composeXcodeWrapper; }; } diff --git a/pkgs/development/mobile/xcodeenv/install.html.template b/pkgs/development/mobile/xcodeenv/install.html.template index 833b1994162c827d91d2f80b61f65ddc83fb2f2c..d48fda7f38b92b4388e1cf14840f67bb431a61ae 100644 --- a/pkgs/development/mobile/xcodeenv/install.html.template +++ b/pkgs/development/mobile/xcodeenv/install.html.template @@ -4,14 +4,14 @@ Install IPA - + Go to the install page or wait a second - +